Merge pull request 'Gossip tweaks' (#609) from new-gossip into main

Reviewed-on: #609

.drone.yml

@@ -34,7 +34,7 @@ steps:
       - img build -t voidic/snort:latest --platform linux/amd64,linux/arm64 -f Dockerfile.prebuilt .
       - img push voidic/snort:latest
 volumes:
-- name: cache
+  - name: cache
     claim:
       name: docker-cache
 ---
@@ -60,7 +60,7 @@ steps:
       - yarn workspace @snort/app eslint
       - yarn workspace @snort/app prettier --check .
 volumes:
-- name: cache
+  - name: cache
     claim:
       name: docker-cache
 ---
@@ -98,7 +98,7 @@ steps:
       - 'git commit -a -m "chore: Update translations"'
       - git push -u origin main
 volumes:
-- name: cache
+  - name: cache
     claim:
       name: docker-cache
 ---
@@ -137,6 +137,6 @@ steps:
       - img build -t voidic/snort:$DRONE_TAG --platform linux/amd64,linux/arm64 -f Dockerfile.prebuilt .
       - img push voidic/snort:$DRONE_TAG
 volumes:
-- name: cache
+  - name: cache
     claim:
       name: docker-cache

.github/workflows/release.yml

@@ -29,13 +29,13 @@ jobs:
       - name: Rust cache
         uses: swatinem/rust-cache@v2
         with:
-          workspaces: './src-tauri -> target'
+          workspaces: "./src-tauri -> target"
 
       - name: Sync node version and setup cache
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
-          cache: 'yarn'
+          node-version: "16"
+          cache: "yarn"
       - name: Install frontend dependencies
         run: yarn install
       - name: Build the app
@@ -44,7 +44,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tagName: ${{ github.ref_name }}
-          releaseName: 'Snort v__VERSION__'
-          releaseBody: 'See the assets to download and install this version.'
+          releaseName: "Snort v__VERSION__"
+          releaseBody: "See the assets to download and install this version."
           releaseDraft: true
           prerelease: false

README.md

@@ -63,6 +63,7 @@ $ yarn build
 Translations are managed on [Crowdin](https://crowdin.com/project/snort)
 
 To extract translations run:
+
 ```bash
 yarn workspace @snort/app intl-extract
 yarn workspace @snort/app intl-compile

functions/e/[id].ts

@@ -1,7 +1,6 @@
-interface Env {
-}
+interface Env {}
 
-export const onRequest: PagesFunction<Env> = async (context) => {
+export const onRequest: PagesFunction<Env> = async context => {
   const id = context.params.id as string;
 
   const next = await context.next();
@@ -11,16 +10,16 @@ export const onRequest: PagesFunction<Env> = async (context) => {
       body: await next.arrayBuffer(),
       headers: {
         "user-agent": "Snort-Functions/1.0 (https://snort.social)",
-        "content-type": "text/plain"
-      }
+        "content-type": "text/plain",
+      },
     });
     if (rsp.ok) {
       const body = await rsp.text();
       if (body.length > 0) {
         return new Response(body, {
           headers: {
-            "content-type": "text/html"
-          }
+            "content-type": "text/html",
+          },
         });
       }
     }
@@ -28,4 +27,4 @@ export const onRequest: PagesFunction<Env> = async (context) => {
     // ignore
   }
   return next;
-}
+};

functions/p/[id].ts

@@ -1,7 +1,6 @@
-interface Env {
-}
+interface Env {}
 
-export const onRequest: PagesFunction<Env> = async (context) => {
+export const onRequest: PagesFunction<Env> = async context => {
   const id = context.params.id as string;
 
   const next = await context.next();
@@ -11,16 +10,16 @@ export const onRequest: PagesFunction<Env> = async (context) => {
       body: await next.arrayBuffer(),
       headers: {
         "user-agent": "Snort-Functions/1.0 (https://snort.social)",
-        "content-type": "text/plain"
-      }
+        "content-type": "text/plain",
+      },
     });
     if (rsp.ok) {
       const body = await rsp.text();
       if (body.length > 0) {
         return new Response(body, {
           headers: {
-            "content-type": "text/html"
-          }
+            "content-type": "text/html",
+          },
         });
       }
     }
@@ -28,4 +27,4 @@ export const onRequest: PagesFunction<Env> = async (context) => {
     // ignore
   }
   return next;
-}
+};

functions/tsconfig.json

@@ -5,4 +5,4 @@
     "lib": ["esnext"],
     "types": ["@cloudflare/workers-types"]
   }
-  }
+}

package.json

@@ -11,5 +11,10 @@
   "devDependencies": {
     "@tauri-apps/cli": "^1.2.3",
     "@cloudflare/workers-types": "^4.20230307.0"
+  },
+  "prettier": {
+    "printWidth": 120,
+    "bracketSameLine": true,
+    "arrowParens": "avoid"
   }
 }

packages/app/.prettierrc.json

@@ -1,5 +0,0 @@
-{
-  "printWidth": 120,
-  "bracketSameLine": true,
-  "arrowParens": "avoid"
-}

packages/app/src/Element/Timeline.tsx

@@ -8,13 +8,11 @@ import Icon from "Icons/Icon";
 import { dedupeByPubkey, findTag, tagFilterOfTextRepost } from "SnortUtils";
 import ProfileImage from "Element/ProfileImage";
 import useTimelineFeed, { TimelineFeed, TimelineSubject } from "Feed/TimelineFeed";
-import LoadMore from "Element/LoadMore";
 import Zap from "Element/Zap";
 import Note from "Element/Note";
 import NoteReaction from "Element/NoteReaction";
 import useModeration from "Hooks/useModeration";
 import ProfilePreview from "Element/ProfilePreview";
-import Skeleton from "Element/Skeleton";
 import { UserCache } from "Cache";
 
 export interface TimelineProps {
@@ -142,11 +140,11 @@ const Timeline = (props: TimelineProps) => {
       )}
       {mainFeed.map(eventElement)}
       {(props.loadMore === undefined || props.loadMore === true) && (
-        <LoadMore onLoadMore={() => feed.loadMore()} shouldLoadMore={!feed.loading}>
-          <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
-          <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
-          <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
-        </LoadMore>
+        <div className="flex f-center">
+          <button type="button" onClick={() => feed.loadMore()}>
+            <FormattedMessage defaultMessage="Load more" />
+          </button>
+        </div>
       )}
     </>
   );

packages/app/src/Feed/TimelineFeed.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo } from "react";
-import { EventKind, u256, FlatNoteStore, RequestBuilder } from "@snort/system";
+import { EventKind, FlatNoteStore, RequestBuilder } from "@snort/system";
 import { useRequestBuilder } from "@snort/system-react";
 
 import { unixNow, unwrap, tagFilterOfTextRepost } from "SnortUtils";

packages/nostr/src/client/index.ts

@@ -1,7 +1,7 @@
 import { NostrError } from "../common"
 import { RawEvent, parseEvent } from "../event"
 import { Conn } from "./conn"
-import * as utils from "@noble/curves/abstract/utils";
+import * as utils from "@noble/curves/abstract/utils"
 import { EventEmitter } from "./emitter"
 import { fetchRelayInfo, ReadyState, Relay } from "./relay"
 import { Filters } from "../filters"
@@ -128,7 +128,8 @@ export class Nostr extends EventEmitter {
           if (conn.relay.readyState !== ReadyState.CONNECTING) {
             this.#error(
               new NostrError(
-                `bug: expected connection to ${relayUrl.toString()} to have readyState CONNECTING, got ${conn.relay.readyState
+                `bug: expected connection to ${relayUrl.toString()} to have readyState CONNECTING, got ${
+                  conn.relay.readyState
                 }`
               )
             )

packages/nostr/src/crypto.ts

@@ -1,6 +1,6 @@
 import * as secp from "@noble/curves/secp256k1"
-import * as utils from "@noble/curves/abstract/utils";
-import {sha256 as sha} from "@noble/hashes/sha256";
+import * as utils from "@noble/curves/abstract/utils"
+import { sha256 as sha } from "@noble/hashes/sha256"
 import base64 from "base64-js"
 import { bech32 } from "bech32"
 
@@ -92,11 +92,7 @@ export function schnorrSign(data: Hex, priv: PrivateKey): Hex {
 /**
  * Verify that the elliptic curve signature is correct.
  */
-export function schnorrVerify(
-  sig: Hex,
-  data: Hex,
-  key: PublicKey
-): boolean {
+export function schnorrVerify(sig: Hex, data: Hex, key: PublicKey): boolean {
   return secp.schnorr.verify(sig.toString(), data.toString(), key.toString())
 }
 

packages/nostr/src/event/index.ts

@@ -159,14 +159,14 @@ export async function signEvent<T extends RawEvent>(
  * Parse an event from its raw format.
  */
 export function parseEvent(event: RawEvent): Event {
-  if (event.id !== (serializeEventId(event))) {
+  if (event.id !== serializeEventId(event)) {
     throw new NostrError(
       `invalid id ${event.id} for event ${JSON.stringify(
         event
       )}, expected ${serializeEventId(event)}`
     )
   }
-  if (!(schnorrVerify(event.sig, event.id, event.pubkey))) {
+  if (!schnorrVerify(event.sig, event.id, event.pubkey)) {
     throw new NostrError(`invalid signature for event ${JSON.stringify(event)}`)
   }
 
@@ -221,9 +221,7 @@ export function parseEvent(event: RawEvent): Event {
   }
 }
 
-function serializeEventId(
-  event: UnsignedWithPubkey<RawEvent>
-): EventId {
+function serializeEventId(event: UnsignedWithPubkey<RawEvent>): EventId {
   const serialized = JSON.stringify([
     0,
     event.pubkey,

packages/nostr/webpack.config.js

@@ -1,6 +1,6 @@
 const fs = require("fs")
 
-const isProduction = process.env.NODE_ENV == "production";
+const isProduction = process.env.NODE_ENV == "production"
 
 const entry = {
   lib: "./src/index.ts",

packages/shared/src/const.ts

@@ -1,8 +1,6 @@
-
 /**
  * Regex to match email address
  */
- export const EmailRegex =
+export const EmailRegex =
   // eslint-disable-next-line no-useless-escape
   /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
- 

packages/shared/src/d.ts

@@ -1,4 +1,3 @@
-
 declare module "light-bolt11-decoder" {
   export function decode(pr?: string): ParsedInvoice;
 

packages/shared/src/feed-cache.ts

@@ -38,7 +38,7 @@ export abstract class FeedCache<TCached> {
   }
 
   async preload() {
-    const keys = await this.table?.toCollection().primaryKeys() ?? [];
+    const keys = (await this.table?.toCollection().primaryKeys()) ?? [];
     this.onTable = new Set<string>(keys.map(a => a as string));
   }
 

packages/shared/src/invoices.ts

@@ -1,4 +1,3 @@
-
 import { bytesToHex } from "@noble/hashes/utils";
 import { decode as invoiceDecode } from "light-bolt11-decoder";
 
@@ -34,8 +33,16 @@ export function decodeInvoice(pr: string): InvoiceDetails | undefined {
       expire: timestamp && expire ? timestamp + expire : undefined,
       timestamp: timestamp,
       description: descriptionSection as string | undefined,
-            descriptionHash: descriptionHashSection ? (typeof descriptionHashSection === "string" ? descriptionHashSection as string : bytesToHex(descriptionHashSection as Uint8Array)) : undefined,
-            paymentHash: paymentHashSection ? (typeof paymentHashSection === "string" ? paymentHashSection as string : bytesToHex(paymentHashSection as Uint8Array)) : undefined,
+      descriptionHash: descriptionHashSection
+        ? typeof descriptionHashSection === "string"
+          ? (descriptionHashSection as string)
+          : bytesToHex(descriptionHashSection as Uint8Array)
+        : undefined,
+      paymentHash: paymentHashSection
+        ? typeof paymentHashSection === "string"
+          ? (paymentHashSection as string)
+          : bytesToHex(paymentHashSection as Uint8Array)
+        : undefined,
       expired: false,
     };
     if (ret.expire) {

packages/shared/src/lnurl.ts

@@ -205,26 +205,26 @@ export class LNURL {
 }
 
 export interface LNURLService {
-  tag: string
-  nostrPubkey?: string
-  minSendable?: number
-  maxSendable?: number
-  metadata: string
-  callback: string
-  commentAllowed?: number
+  tag: string;
+  nostrPubkey?: string;
+  minSendable?: number;
+  maxSendable?: number;
+  metadata: string;
+  callback: string;
+  commentAllowed?: number;
 }
 
 export interface LNURLStatus {
-  status: "SUCCESS" | "ERROR"
-  reason?: string
+  status: "SUCCESS" | "ERROR";
+  reason?: string;
 }
 
 export interface LNURLInvoice extends LNURLStatus {
-  pr?: string
-  successAction?: LNURLSuccessAction
+  pr?: string;
+  successAction?: LNURLSuccessAction;
 }
 
 export interface LNURLSuccessAction {
-  description?: string
-  url?: string
+  description?: string;
+  url?: string;
 }

packages/shared/src/utils.ts

@@ -71,7 +71,10 @@ export function countMembers(a: any) {
   return ret;
 }
 
-export function equalProp(a: string | number | Array<string | number> | undefined, b: string | number | Array<string | number> | undefined) {
+export function equalProp(
+  a: string | number | Array<string | number> | undefined,
+  b: string | number | Array<string | number> | undefined
+) {
   if ((a !== undefined && b === undefined) || (a === undefined && b !== undefined)) {
     return false;
   }
@@ -130,7 +133,7 @@ export function appendDedupe<T>(a?: Array<T>, b?: Array<T>) {
 
 export const sha256 = (str: string | Uint8Array): string => {
   return utils.bytesToHex(sha2(str));
-}
+};
 
 export function getPublicKey(privKey: string) {
   return utils.bytesToHex(secp.schnorr.getPublicKey(privKey));

packages/system-react/README.md

@@ -3,54 +3,49 @@
 React hooks for @snort/system
 
 Sample:
+
 ```js
-import { useMemo } from "react"
+import { useMemo } from "react";
 import { useRequestBuilder, useUserProfile } from "@snort/system-react";
-import { FlatNoteStore, NostrSystem, RequestBuilder, TaggedRawEvent } from "@snort/system"
+import { FlatNoteStore, NostrSystem, RequestBuilder, TaggedRawEvent } from "@snort/system";
 
 // singleton nostr system class
 const System = new NostrSystem({});
 
 // some bootstrap relays
-[
-    "wss://relay.snort.social",
-    "wss://nos.lol"
-].forEach(r => System.ConnectToRelay(r, { read: true, write: false }));
+["wss://relay.snort.social", "wss://nos.lol"].forEach(r => System.ConnectToRelay(r, { read: true, write: false }));
 
 export function Note({ ev }: { ev: TaggedRawEvent }) {
   // get profile from cache or request a profile from relays
   const profile = useUserProfile(System, ev.pubkey);
 
-    return <div>
+  return (
+    <div>
       Post by: {profile.name ?? profile.display_name}
-        <p>
-            {ev.content}
-        </p>
+      <p>{ev.content}</p>
     </div>
+  );
 }
 
 export function UserPosts(props: { pubkey: string }) {
   const sub = useMemo(() => {
     const rb = new RequestBuilder("get-posts");
-        rb.withFilter()
-            .authors([props.pubkey])
-            .kinds([1])
-            .limit(10);
+    rb.withFilter().authors([props.pubkey]).kinds([1]).limit(10);
 
     return rb;
   }, [props.pubkey]);
 
-    const data = useRequestBuilder<FlatNoteStore>(System, FlatNoteStore, sub);
+  const data = useRequestBuilder < FlatNoteStore > (System, FlatNoteStore, sub);
   return (
     <>
-            {data.data.map(a => <Note ev={a} />)}
+      {data.data.map(a => (
+        <Note ev={a} />
+      ))}
     </>
-    )
+  );
 }
 
 export function MyApp() {
-    return (
-        <UserPosts pubkey="63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed" />
-    )
+  return <UserPosts pubkey="63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed" />;
 }
 ```

packages/system-react/example/example.tsx

@@ -1,34 +1,28 @@
-import { useMemo } from "react"
+import { useMemo } from "react";
 import { useRequestBuilder, useUserProfile } from "../src";
 
-import { FlatNoteStore, NostrSystem, RequestBuilder, TaggedRawEvent } from "@snort/system"
+import { FlatNoteStore, NostrSystem, RequestBuilder, TaggedRawEvent } from "@snort/system";
 
 const System = new NostrSystem({});
 
 // some bootstrap relays
-[
-    "wss://relay.snort.social",
-    "wss://nos.lol"
-].forEach(r => System.ConnectToRelay(r, { read: true, write: false }));
+["wss://relay.snort.social", "wss://nos.lol"].forEach(r => System.ConnectToRelay(r, { read: true, write: false }));
 
 export function Note({ ev }: { ev: TaggedRawEvent }) {
   const profile = useUserProfile(System, ev.pubkey);
 
-    return <div>
+  return (
+    <div>
       Post by: {profile.name ?? profile.display_name}
-        <p>
-            {ev.content}
-        </p>
+      <p>{ev.content}</p>
     </div>
+  );
 }
 
 export function UserPosts(props: { pubkey: string }) {
   const sub = useMemo(() => {
     const rb = new RequestBuilder("get-posts");
-        rb.withFilter()
-            .authors([props.pubkey])
-            .kinds([1])
-            .limit(10);
+    rb.withFilter().authors([props.pubkey]).kinds([1]).limit(10);
 
     return rb;
   }, [props.pubkey]);
@@ -36,13 +30,13 @@ export function UserPosts(props: { pubkey: string }) {
   const data = useRequestBuilder<FlatNoteStore>(System, FlatNoteStore, sub);
   return (
     <>
-            {data.data.map(a => <Note ev={a} />)}
+      {data.data.map(a => (
+        <Note ev={a} />
+      ))}
     </>
-    )
+  );
 }
 
 export function MyApp() {
-    return (
-        <UserPosts pubkey="63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed" />
-    )
+  return <UserPosts pubkey="63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed" />;
 }

packages/system-react/src/useRequestBuilder.tsx

@@ -7,7 +7,7 @@ import { unwrap } from "@snort/shared";
  */
 const useRequestBuilder = <TStore extends NoteStore, TSnapshot = ReturnType<TStore["getSnapshotData"]>>(
   system: SystemInterface,
-  type: { new(): TStore },
+  type: { new (): TStore },
   rb: RequestBuilder | null
 ) => {
   const subscribe = (onChanged: () => void) => {

packages/system-react/src/useUserProfile.ts

@@ -16,7 +16,7 @@ export function useUserProfile(system: NostrSystem, pubKey?: HexKey): MetadataCa
         if (pubKey) {
           system.ProfileLoader.UntrackMetadata(pubKey);
         }
-      }
+      };
     },
     () => system.ProfileLoader.Cache.getFromCache(pubKey)
   );

packages/system/README.md

@@ -3,6 +3,7 @@
 A collection of caching and querying techniquies used by https://snort.social to serve all content from the nostr protocol.
 
 Simple example:
+
 ```js
 import {
     NostrSystem,

packages/system/examples/simple.ts

@@ -1,4 +1,4 @@
-import { NostrSystem, EventPublisher, UserRelaysCache, RequestBuilder, FlatNoteStore, StoreSnapshot } from "../src"
+import { NostrSystem, EventPublisher, UserRelaysCache, RequestBuilder, FlatNoteStore, StoreSnapshot } from "../src";
 
 // Provided in-memory / indexedDb cache for relays
 // You can also implement your own with "RelayCache" interface
@@ -10,12 +10,12 @@ const AuthHandler = async (challenge: string, relay: string) => {
   if (pub) {
     return await pub.nip42Auth(challenge, relay);
   }
-}
+};
 
 // Singleton instance to store all connections and access query fetching system
 const System = new NostrSystem({
   relayCache: RelaysCache,
-    authHandler: AuthHandler // can be left undefined if you dont care about NIP-42 Auth
+  authHandler: AuthHandler, // can be left undefined if you dont care about NIP-42 Auth
 });
 
 (async () => {
@@ -34,7 +34,7 @@ const System = new NostrSystem({
   // basic usage using "onEvent", fired for every event added to the store
   q.onEvent = (sub, e) => {
     console.debug(sub, e);
-    }
+  };
 
   // Hookable type using change notification, limited to every 500ms
   const release = q.feed.hook(() => {
@@ -43,7 +43,7 @@ const System = new NostrSystem({
     const state = q.feed.snapshot as StoreSnapshot<ReturnType<FlatNoteStore["getSnapshotData"]>>;
 
     // do something with snapshot of store
-        console.log(`We have ${state.data.length} events now!`)
+    console.log(`We have ${state.data.length} events now!`);
   });
 
   // release the hook when its not needed anymore

packages/system/package.json

@@ -9,7 +9,7 @@
   "license": "GPL-3.0-or-later",
   "scripts": {
     "build": "rm -rf dist && tsc",
-    "test": "jest"
+    "test": "jest --runInBand"
   },
   "files": [
     "src",

packages/system/src/cache/db.ts

@@ -9,7 +9,7 @@ const STORES = {
   users: "++pubkey, name, display_name, picture, nip05, npub",
   relayMetrics: "++addr",
   userRelays: "++pubkey",
-    events: "++id, pubkey, created_at"
+  events: "++id, pubkey, created_at",
 };
 
 export class SnortSystemDb extends Dexie {

packages/system/src/connection.ts

@@ -421,7 +421,12 @@ export class Connection extends ExternalStore<ConnectionStateSnapshot> {
         const lastActivity = unixNowMs() - this.#activity;
         if (lastActivity > 30_000 && !this.IsClosed) {
           if (this.ActiveRequests.size > 0) {
-            this.#log("%s Inactive connection has %d active requests! %O", this.Address, this.ActiveRequests.size, this.ActiveRequests);
+            this.#log(
+              "%s Inactive connection has %d active requests! %O",
+              this.Address,
+              this.ActiveRequests.size,
+              this.ActiveRequests
+            );
           } else {
             this.Close();
           }

packages/system/src/const.ts

@@ -9,7 +9,6 @@ export const DefaultConnectTimeout = 2000;
 // eslint-disable-next-line no-useless-escape
 export const HashtagRegex = /(#[^\s!@#$%^&*()=+.\/,\[{\]};:'"?><]+)/g;
 
-
 /**
  * How long profile cache should be considered valid for
  */

packages/system/src/event-ext.ts

@@ -6,17 +6,17 @@ import { EventKind, HexKey, NostrEvent } from ".";
 import { Nip4WebCryptoEncryptor } from "./impl/nip4";
 
 export interface Tag {
-  key: string
-  value?: string
-  relay?: string
-  marker?: string // NIP-10
+  key: string;
+  value?: string;
+  relay?: string;
+  marker?: string; // NIP-10
 }
 
 export interface Thread {
-  root?: Tag
-  replyTo?: Tag
-  mentions: Array<Tag>
-  pubKeys: Array<HexKey>
+  root?: Tag;
+  replyTo?: Tag;
+  mentions: Array<Tag>;
+  pubKeys: Array<HexKey>;
 }
 
 export abstract class EventExt {
@@ -41,7 +41,7 @@ export abstract class EventExt {
 
     const sig = secp.schnorr.sign(e.id, key);
     e.sig = utils.bytesToHex(sig);
-    if (!(secp.schnorr.verify(e.sig, e.id, e.pubkey))) {
+    if (!secp.schnorr.verify(e.sig, e.id, e.pubkey)) {
       throw new Error("Signing failed");
     }
   }
@@ -84,12 +84,12 @@ export abstract class EventExt {
 
   static parseTag(tag: Array<string>) {
     if (tag.length < 1) {
-      throw new Error("Invalid tag, must have more than 2 items")
+      throw new Error("Invalid tag, must have more than 2 items");
     }
 
     const ret = {
       key: tag[0],
-      value: tag[1]
+      value: tag[1],
     } as Tag;
     switch (ret.key) {
       case "e": {

packages/system/src/event-publisher.ts

@@ -95,7 +95,7 @@ export class EventPublisher {
    * Create an EventPublisher for a private key
    */
   static privateKey(privateKey: string) {
-    const signer = new PrivateKeySigner(privateKey)
+    const signer = new PrivateKeySigner(privateKey);
     return new EventPublisher(signer, signer.getPubKey());
   }
 

packages/system/src/gossip-model.ts

@@ -1,6 +1,7 @@
 import { ReqFilter, UsersRelays } from ".";
-import { unwrap } from "@snort/shared";
+import { dedupe, unwrap } from "@snort/shared";
 import debug from "debug";
+import { FlatReqFilter } from "request-expander";
 
 const PickNRelays = 2;
 
@@ -9,6 +10,11 @@ export interface RelayTaggedFilter {
   filter: ReqFilter;
 }
 
+export interface RelayTaggedFlatFilters {
+  relay: string;
+  filters: Array<FlatReqFilter>;
+}
+
 export interface RelayTaggedFilters {
   relay: string;
   filters: Array<ReqFilter>;
@@ -43,11 +49,10 @@ export function splitAllByWriteRelays(cache: RelayCache, filters: Array<ReqFilte
 
 /**
  * Split filters by authors
- * @param filter
- * @returns
  */
 export function splitByWriteRelays(cache: RelayCache, filter: ReqFilter): Array<RelayTaggedFilter> {
-  if ((filter.authors?.length ?? 0) === 0) {
+  const authors = filter.authors;
+  if ((authors?.length ?? 0) === 0) {
     return [
       {
         relay: "",
@@ -56,15 +61,87 @@ export function splitByWriteRelays(cache: RelayCache, filter: ReqFilter): Array<
     ];
   }
 
-  const allRelays = unwrap(filter.authors).map(a => {
+  const topRelays = pickTopRelays(cache, unwrap(authors), PickNRelays);
+  const pickedRelays = dedupe(topRelays.flatMap(a => a.relays));
+
+  const picked = pickedRelays.map(a => {
+    const keysOnPickedRelay = dedupe(topRelays.filter(b => b.relays.includes(a)).map(b => b.key));
+    return {
+      relay: a,
+      filter: {
+        ...filter,
+        authors: keysOnPickedRelay,
+      },
+    } as RelayTaggedFilter;
+  });
+  const noRelays = dedupe(topRelays.filter(a => a.relays.length === 0).map(a => a.key));
+  if (noRelays.length > 0) {
+    picked.push({
+      relay: "",
+      filter: {
+        ...filter,
+        authors: noRelays,
+      },
+    });
+  }
+  debug("GOSSIP")("Picked %o", picked);
+  return picked;
+}
+
+/**
+ * Split filters by author
+ */
+export function splitFlatByWriteRelays(cache: RelayCache, input: Array<FlatReqFilter>): Array<RelayTaggedFlatFilters> {
+  const authors = input.filter(a => a.authors).map(a => unwrap(a.authors));
+  if (authors.length === 0) {
+    return [
+      {
+        relay: "",
+        filters: input,
+      },
+    ];
+  }
+  const topRelays = pickTopRelays(cache, authors, PickNRelays);
+  const pickedRelays = dedupe(topRelays.flatMap(a => a.relays));
+
+  const picked = pickedRelays.map(a => {
+    const authorsOnRelay = new Set(topRelays.filter(v => v.relays.includes(a)).map(v => v.key));
+    return {
+      relay: a,
+      filters: input.filter(v => v.authors && authorsOnRelay.has(v.authors)),
+    } as RelayTaggedFlatFilters;
+  });
+  const noRelays = new Set(topRelays.filter(v => v.relays.length === 0).map(v => v.key));
+  if (noRelays.size > 0) {
+    picked.push({
+      relay: "",
+      filters: input.filter(v => !v.authors || noRelays.has(v.authors)),
+    } as RelayTaggedFlatFilters);
+  }
+
+  debug("GOSSIP")("Picked %o", picked);
+  return picked;
+}
+
+/**
+ * Pick most popular relays for each authors
+ */
+function pickTopRelays(cache: RelayCache, authors: Array<string>, n: number) {
+  // map of pubkey -> [write relays]
+  const allRelays = authors.map(a => {
     return {
       key: a,
-      relays: cache.getFromCache(a)?.relays?.filter(a => a.settings.write).sort(() => Math.random() < 0.5 ? 1 : -1),
+      relays: cache
+        .getFromCache(a)
+        ?.relays?.filter(a => a.settings.write)
+        .sort(() => (Math.random() < 0.5 ? 1 : -1)),
     };
   });
 
   const missing = allRelays.filter(a => a.relays === undefined || a.relays.length === 0);
   const hasRelays = allRelays.filter(a => a.relays !== undefined && a.relays.length > 0);
+
+  // map of relay -> [pubkeys]
   const relayUserMap = hasRelays.reduce((acc, v) => {
     for (const r of unwrap(v.relays)) {
       if (!acc.has(r.url)) {
@@ -83,36 +160,21 @@ export function splitByWriteRelays(cache: RelayCache, filter: ReqFilter): Array<
   // <key, relay[]> - pick n top relays
   // <relay, key[]> - map keys per relay (for subscription filter)
 
-  const userPickedRelays = unwrap(filter.authors).map(k => {
-    // pick top 3 relays for this key
+  return hasRelays
+    .map(k => {
+      // pick top N relays for this key
       const relaysForKey = topRelays
-      .filter(([, v]) => v.has(k))
-      .slice(0, PickNRelays)
+        .filter(([, v]) => v.has(k.key))
+        .slice(0, n)
         .map(([k]) => k);
-    return { k, relaysForKey };
-  });
-
-  const pickedRelays = new Set(userPickedRelays.map(a => a.relaysForKey).flat());
-
-  const picked = [...pickedRelays].map(a => {
-    const keysOnPickedRelay = new Set(userPickedRelays.filter(b => b.relaysForKey.includes(a)).map(b => b.k));
+      return { key: k.key, relays: relaysForKey };
+    })
+    .concat(
+      missing.map(a => {
         return {
-      relay: a,
-      filter: {
-        ...filter,
-        authors: [...keysOnPickedRelay],
-      },
-    } as RelayTaggedFilter;
-  });
-  if (missing.length > 0) {
-    picked.push({
-      relay: "",
-      filter: {
-        ...filter,
-        authors: missing.map(a => a.key),
-      },
-    });
-  }
-  debug("GOSSIP")("Picked %o", picked);
-  return picked;
+          key: a.key,
+          relays: [],
+        };
+      })
+    );
 }

packages/system/src/impl/nip44.ts

@@ -1,40 +1,39 @@
 import { MessageEncryptor } from "index";
 
 import { base64 } from "@scure/base";
-import { randomBytes } from '@noble/hashes/utils'
-import { streamXOR as xchacha20 } from '@stablelib/xchacha20'
+import { randomBytes } from "@noble/hashes/utils";
+import { streamXOR as xchacha20 } from "@stablelib/xchacha20";
 import { secp256k1 } from "@noble/curves/secp256k1";
-import { sha256 } from '@noble/hashes/sha256'
+import { sha256 } from "@noble/hashes/sha256";
 
 export enum Nip44Version {
   Reserved = 0x00,
-    XChaCha20 = 0x01
+  XChaCha20 = 0x01,
 }
 
 export class Nip44Encryptor implements MessageEncryptor {
   getSharedSecret(privateKey: string, publicKey: string) {
-        const key = secp256k1.getSharedSecret(privateKey, '02' + publicKey)
+    const key = secp256k1.getSharedSecret(privateKey, "02" + publicKey);
     return sha256(key.slice(1, 33));
   }
 
   encryptData(content: string, sharedSecret: Uint8Array) {
-        const nonce = randomBytes(24)
-        const plaintext = new TextEncoder().encode(content)
+    const nonce = randomBytes(24);
+    const plaintext = new TextEncoder().encode(content);
     const ciphertext = xchacha20(sharedSecret, nonce, plaintext, plaintext);
-        const ctb64 = base64.encode(Uint8Array.from(ciphertext))
-        const nonceb64 = base64.encode(nonce)
-        return JSON.stringify({ ciphertext: ctb64, nonce: nonceb64, v: Nip44Version.XChaCha20 })
+    const ctb64 = base64.encode(Uint8Array.from(ciphertext));
+    const nonceb64 = base64.encode(nonce);
+    return JSON.stringify({ ciphertext: ctb64, nonce: nonceb64, v: Nip44Version.XChaCha20 });
   }
 
   decryptData(cyphertext: string, sharedSecret: Uint8Array) {
-        const dt = JSON.parse(cyphertext)
-        if (dt.v !== 1) throw new Error('NIP44: unknown encryption version')
+    const dt = JSON.parse(cyphertext);
+    if (dt.v !== 1) throw new Error("NIP44: unknown encryption version");
 
-        const ciphertext = base64.decode(dt.ciphertext)
-        const nonce = base64.decode(dt.nonce)
-        const plaintext = xchacha20(sharedSecret, nonce, ciphertext, ciphertext)
-        const text = new TextDecoder().decode(plaintext)
+    const ciphertext = base64.decode(dt.ciphertext);
+    const nonce = base64.decode(dt.nonce);
+    const plaintext = xchacha20(sharedSecret, nonce, ciphertext, ciphertext);
+    const text = new TextDecoder().decode(plaintext);
     return text;
   }
-
 }

packages/system/src/impl/nip46.ts

@@ -12,22 +12,22 @@ import EventKind from "../event-kind";
 const NIP46_KIND = 24_133;
 
 interface Nip46Metadata {
-    name: string
-    url?: string
-    description?: string
-    icons?: Array<string>
+  name: string;
+  url?: string;
+  description?: string;
+  icons?: Array<string>;
 }
 
 interface Nip46Request {
-    id: string
-    method: string
-    params: Array<any>
+  id: string;
+  method: string;
+  params: Array<any>;
 }
 
 interface Nip46Response {
-    id: string
-    result: any
-    error: string
+  id: string;
+  result: any;
+  error: string;
 }
 
 interface QueueObj {
@@ -60,7 +60,7 @@ export class Nip46Signer implements EventSigner {
     }
 
     this.#relay = unwrap(u.searchParams.get("relay"));
-        this.#insideSigner = insideSigner ?? new PrivateKeySigner(secp256k1.utils.randomPrivateKey())
+    this.#insideSigner = insideSigner ?? new PrivateKeySigner(secp256k1.utils.randomPrivateKey());
   }
 
   get relays() {
@@ -68,7 +68,7 @@ export class Nip46Signer implements EventSigner {
   }
 
   get privateKey() {
-        if(this.#insideSigner instanceof PrivateKeySigner) {
+    if (this.#insideSigner instanceof PrivateKeySigner) {
       return this.#insideSigner.privateKey;
     }
   }
@@ -83,12 +83,19 @@ export class Nip46Signer implements EventSigner {
       this.#conn = new Connection(this.#relay, { read: true, write: true });
       this.#conn.OnEvent = async (sub, e) => {
         await this.#onReply(e);
-            }
+      };
       this.#conn.OnConnected = async () => {
-                this.#conn!.QueueReq(["REQ", "reply", {
+        this.#conn!.QueueReq(
+          [
+            "REQ",
+            "reply",
+            {
               kinds: [NIP46_KIND],
-                    "#p": [this.#localPubkey]
-                }], () => { });
+              "#p": [this.#localPubkey],
+            },
+          ],
+          () => {}
+        );
 
         if (isBunker) {
           await this.#connect(unwrap(this.#remotePubkey));
@@ -96,14 +103,13 @@ export class Nip46Signer implements EventSigner {
         } else {
           this.#commandQueue.set("connect", {
             reject,
-                        resolve
-                    })
-                }
+            resolve,
+          });
         }
+      };
       this.#conn.Connect();
       this.#didInit = true;
-        })
-
+    });
   }
 
   async close() {
@@ -161,11 +167,14 @@ export class Nip46Signer implements EventSigner {
     this.#log("Recv: %O", reply);
     if ("method" in reply && reply.method === "connect") {
       this.#remotePubkey = reply.params[0];
-            await this.#sendCommand({
+      await this.#sendCommand(
+        {
           id: reply.id,
           result: "ack",
-                error: ""
-            }, unwrap(this.#remotePubkey));
+          error: "",
+        },
+        unwrap(this.#remotePubkey)
+      );
       id = "connect";
     }
     const pending = this.#commandQueue.get(id);

packages/system/src/impl/nip7.ts

@@ -57,5 +57,4 @@ export class Nip7Signer implements EventSigner {
     }
     return await barrierQueue(Nip7Queue, () => unwrap(window.nostr).signEvent(ev));
   }
-
 }

packages/system/src/index.ts

@@ -37,7 +37,7 @@ export interface SystemInterface {
   HandleAuth?: AuthHandler;
   get Sockets(): Array<ConnectionStateSnapshot>;
   GetQuery(id: string): Query | undefined;
-  Query<T extends NoteStore>(type: { new(): T }, req: RequestBuilder | null): Query;
+  Query<T extends NoteStore>(type: { new (): T }, req: RequestBuilder | null): Query;
   ConnectToRelay(address: string, options: RelaySettings): Promise<void>;
   DisconnectRelay(address: string): void;
   BroadcastEvent(ev: NostrEvent): void;
@@ -53,7 +53,7 @@ export interface SystemSnapshot {
 }
 
 export interface MessageEncryptor {
-  getSharedSecret(privateKey: string, publicKey: string): Promise<Uint8Array> | Uint8Array
-  encryptData(plaintext: string, sharedSecet: Uint8Array): Promise<string> | string
-  decryptData(cyphertext: string, sharedSecet: Uint8Array): Promise<string> | string
+  getSharedSecret(privateKey: string, publicKey: string): Promise<Uint8Array> | Uint8Array;
+  encryptData(plaintext: string, sharedSecet: Uint8Array): Promise<string> | string;
+  decryptData(cyphertext: string, sharedSecet: Uint8Array): Promise<string> | string;
 }

packages/system/src/nostr-link.ts

@@ -8,9 +8,9 @@ export interface NostrLink {
   author?: string;
   relays?: Array<string>;
   encode(): string;
-  }
+}
 
-  export function validateNostrLink(link: string): boolean {
+export function validateNostrLink(link: string): boolean {
   try {
     const parsedLink = parseNostrLink(link);
     if (!parsedLink) {
@@ -24,17 +24,17 @@ export interface NostrLink {
   } catch {
     return false;
   }
-  }
+}
 
-  export function tryParseNostrLink(link: string, prefixHint?: NostrPrefix): NostrLink | undefined {
+export function tryParseNostrLink(link: string, prefixHint?: NostrPrefix): NostrLink | undefined {
   try {
     return parseNostrLink(link, prefixHint);
   } catch {
     return undefined;
   }
-  }
+}
 
-  export function parseNostrLink(link: string, prefixHint?: NostrPrefix): NostrLink {
+export function parseNostrLink(link: string, prefixHint?: NostrPrefix): NostrLink {
   const entity = link.startsWith("web+nostr:") || link.startsWith("nostr:") ? link.split(":")[1] : link;
 
   const isPrefix = (prefix: NostrPrefix) => {
@@ -106,5 +106,4 @@ export interface NostrLink {
     };
   }
   throw new Error("Invalid nostr link");
-  }
-  
+}

packages/system/src/nostr-system.ts

@@ -17,7 +17,7 @@ import {
   UserRelaysCache,
   RelayMetricCache,
   db,
-  UsersRelays
+  UsersRelays,
 } from ".";
 
 /**
@@ -67,10 +67,10 @@ export class NostrSystem extends ExternalStore<SystemSnapshot> implements System
   #relayMetrics: RelayMetricHandler;
 
   constructor(props: {
-    authHandler?: AuthHandler,
-    relayCache?: FeedCache<UsersRelays>,
-    profileCache?: FeedCache<MetadataCache>
-    relayMetrics?: FeedCache<RelayMetrics>
+    authHandler?: AuthHandler;
+    relayCache?: FeedCache<UsersRelays>;
+    profileCache?: FeedCache<MetadataCache>;
+    relayMetrics?: FeedCache<RelayMetrics>;
   }) {
     super();
     this.#handleAuth = props.authHandler;
@@ -99,11 +99,7 @@ export class NostrSystem extends ExternalStore<SystemSnapshot> implements System
    */
   async Init() {
     db.ready = await db.isAvailable();
-    const t = [
-      this.#relayCache.preload(),
-      this.#profileCache.preload(),
-      this.#relayMetricsCache.preload()
-    ];
+    const t = [this.#relayCache.preload(), this.#profileCache.preload(), this.#relayMetricsCache.preload()];
     await Promise.all(t);
   }
 
@@ -118,8 +114,8 @@ export class NostrSystem extends ExternalStore<SystemSnapshot> implements System
         this.#sockets.set(addr, c);
         c.OnEvent = (s, e) => this.OnEvent(s, e);
         c.OnEose = s => this.OnEndOfStoredEvents(c, s);
-        c.OnDisconnect = (code) => this.OnRelayDisconnect(c, code);
-        c.OnConnected = (r) => this.OnRelayConnected(c, r);
+        c.OnDisconnect = code => this.OnRelayDisconnect(c, code);
+        c.OnConnected = r => this.OnRelayConnected(c, r);
         await c.Connect();
       } else {
         // update settings if already connected
@@ -170,7 +166,7 @@ export class NostrSystem extends ExternalStore<SystemSnapshot> implements System
         c.OnEvent = (s, e) => this.OnEvent(s, e);
         c.OnEose = s => this.OnEndOfStoredEvents(c, s);
         c.OnDisconnect = code => this.OnRelayDisconnect(c, code);
-        c.OnConnected = (r) => this.OnRelayConnected(c, r);
+        c.OnConnected = r => this.OnRelayConnected(c, r);
         await c.Connect();
         return c;
       }
@@ -194,7 +190,7 @@ export class NostrSystem extends ExternalStore<SystemSnapshot> implements System
     return this.Queries.get(id);
   }
 
-  Query<T extends NoteStore>(type: { new(): T }, req: RequestBuilder): Query {
+  Query<T extends NoteStore>(type: { new (): T }, req: RequestBuilder): Query {
     const existing = this.Queries.get(req.id);
     if (existing) {
       // if same instance, just return query

packages/system/src/nostr.ts

@@ -38,21 +38,21 @@ export type ReqCommand = [cmd: "REQ", id: string, ...filters: Array<ReqFilter>];
  * Raw REQ filter object
  */
 export interface ReqFilter {
-  ids?: u256[]
-  authors?: u256[]
-  kinds?: number[]
-  "#e"?: u256[]
-  "#p"?: u256[]
-  "#t"?: string[]
-  "#d"?: string[]
-  "#r"?: string[]
-  "#a"?: string[]
-  "#g"?: string[]
-  search?: string
-  since?: number
-  until?: number
-  limit?: number
-  [key: string]: Array<string> | Array<number> | string | number | undefined
+  ids?: u256[];
+  authors?: u256[];
+  kinds?: number[];
+  "#e"?: u256[];
+  "#p"?: u256[];
+  "#t"?: string[];
+  "#d"?: string[];
+  "#r"?: string[];
+  "#a"?: string[];
+  "#g"?: string[];
+  search?: string;
+  since?: number;
+  until?: number;
+  limit?: number;
+  [key: string]: Array<string> | Array<number> | string | number | undefined;
 }
 
 /**

packages/system/src/note-collection.ts

@@ -249,8 +249,8 @@ export class ReplaceableNoteStore extends HookedNoteStore<Readonly<TaggedRawEven
  */
 export class NoteCollection extends KeyedReplaceableNoteStore {
   constructor() {
-    super((e) => {
-      const legacyReplaceable = [0, 3, 41]
+    super(e => {
+      const legacyReplaceable = [0, 3, 41];
       if (e.kind >= 30_000 && e.kind < 40_000) {
         return `${e.kind}:${e.pubkey}:${findTag(e, "d")}`; // Parameterized replaceable
       } else if (e.kind >= 10_000 && e.kind < 20_000) {
@@ -263,6 +263,6 @@ export class NoteCollection extends KeyedReplaceableNoteStore {
         // unknown kind
         return e.id;
       }
-    })
+    });
   }
 }

packages/system/src/profile-cache.ts

@@ -1,13 +1,10 @@
-
 import debug from "debug";
 import { unixNowMs, FeedCache } from "@snort/shared";
 import { EventKind, HexKey, SystemInterface, TaggedRawEvent, NoteCollection, RequestBuilder } from ".";
 import { ProfileCacheExpire } from "./const";
 import { mapEventToProfile, MetadataCache } from "./cache";
 
-const MetadataRelays = [
-  "wss://purplepag.es"
-]
+const MetadataRelays = ["wss://purplepag.es"];
 
 export class ProfileLoaderService {
   #system: SystemInterface;
@@ -88,7 +85,8 @@ export class ProfileLoaderService {
         .authors([...missing]);
 
       if (this.#missingLastRun.size > 0) {
-        const fMissing = sub.withFilter()
+        const fMissing = sub
+          .withFilter()
           .kinds([EventKind.SetMetadata])
           .authors([...this.#missingLastRun]);
         MetadataRelays.forEach(r => fMissing.relay(r));
@@ -128,7 +126,7 @@ export class ProfileLoaderService {
         const empty = couldNotFetch.map(a =>
           this.#cache.update({
             pubkey: a,
-            loaded: unixNowMs() - ProfileCacheExpire + 5_000, // expire in 5s
+            loaded: unixNowMs() - ProfileCacheExpire + 30_000, // expire in 30s
             created: 69,
           } as MetadataCache)
         );

packages/system/src/query.ts

@@ -3,11 +3,10 @@ import debug from "debug";
 import { unixNowMs, unwrap } from "@snort/shared";
 
 import { Connection, ReqFilter, Nips, TaggedRawEvent } from ".";
-import { reqFilterEq } from "./utils";
 import { NoteStore } from "./note-collection";
 import { flatMerge } from "./request-merger";
 import { BuiltRawReqFilter } from "./request-builder";
-import { expandFilter } from "./request-expander";
+import { FlatReqFilter, expandFilter } from "./request-expander";
 
 /**
  * Tracing for relay query status
@@ -19,6 +18,7 @@ class QueryTrace {
   eose?: number;
   close?: number;
   #wasForceClosed = false;
+  readonly flatFilters: Array<FlatReqFilter>;
   readonly #fnClose: (id: string) => void;
   readonly #fnProgress: () => void;
 
@@ -33,6 +33,7 @@ class QueryTrace {
     this.start = unixNowMs();
     this.#fnClose = fnClose;
     this.#fnProgress = fnProgress;
+    this.flatFilters = filters.flatMap(expandFilter);
   }
 
   sentToRelay() {
@@ -168,13 +169,7 @@ export class Query implements QueryBase {
   }
 
   get flatFilters() {
-    const f: Array<ReqFilter> = [];
-    for (const x of this.#tracing.flatMap(a => a.filters)) {
-      if (!f.some(a => reqFilterEq(a, x))) {
-        f.push(x);
-      }
-    }
-    return f.flatMap(expandFilter);
+    return this.#tracing.flatMap(a => a.flatFilters);
   }
 
   get feed() {
@@ -255,7 +250,7 @@ export class Query implements QueryBase {
   #onProgress() {
     const isFinished = this.progress === 1;
     if (this.feed.loading !== isFinished) {
-      this.#log("%s loading=%s, progress=%d", this.id, this.feed.loading, this.progress);
+      this.#log("%s loading=%s, progress=%d, traces=%O", this.id, this.feed.loading, this.progress, this.#tracing);
       this.feed.loading = isFinished;
     }
   }

packages/system/src/relay-metric-handler.ts

@@ -9,7 +9,5 @@ export class RelayMetricHandler {
     this.#cache = cache;
   }
 
-    onDisconnect(c: Connection, code: number) {
-        
-    }
+  onDisconnect(c: Connection, code: number) {}
 }

packages/system/src/request-builder.ts

@@ -4,8 +4,8 @@ import { appendDedupe, sanitizeRelayUrl, unixNowMs } from "@snort/shared";
 
 import { ReqFilter, u256, HexKey, EventKind } from ".";
 import { diffFilters } from "./request-splitter";
-import { RelayCache, splitAllByWriteRelays, splitByWriteRelays } from "./gossip-model";
-import { mergeSimilar } from "./request-merger";
+import { RelayCache, splitByWriteRelays, splitFlatByWriteRelays } from "./gossip-model";
+import { flatMerge, mergeSimilar } from "./request-merger";
 import { FlatReqFilter, expandFilter } from "./request-expander";
 
 /**
@@ -108,14 +108,13 @@ export class RequestBuilder {
 
     const next = this.#builders.flatMap(f => expandFilter(f.filter));
     const diff = diffFilters(prev, next);
-    const ts = (unixNowMs() - start);
+    const ts = unixNowMs() - start;
     this.#log("buildDiff %s %d ms", this.id, ts);
     if (diff.changed) {
-      this.#log(diff);
-      return splitAllByWriteRelays(relays, diff.added).map(a => {
+      return splitFlatByWriteRelays(relays, diff.added).map(a => {
         return {
           strategy: RequestStrategy.AuthorsRelays,
-          filters: a.filters,
+          filters: flatMerge(a.filters),
           relay: a.relay,
         };
       });

packages/system/src/request-expander.ts

@@ -1,19 +1,19 @@
 import { ReqFilter } from "./nostr";
 
 export interface FlatReqFilter {
-  keys: number
-  ids?: string
-  authors?: string
-  kinds?: number
-  "#e"?: string
-  "#p"?: string
-  "#t"?: string
-  "#d"?: string
-  "#r"?: string
-  search?: string
-  since?: number
-  until?: number
-  limit?: number
+  keys: number;
+  ids?: string;
+  authors?: string;
+  kinds?: number;
+  "#e"?: string;
+  "#p"?: string;
+  "#t"?: string;
+  "#d"?: string;
+  "#r"?: string;
+  search?: string;
+  since?: number;
+  until?: number;
+  limit?: number;
 }
 
 /**

packages/system/src/request-merger.ts

@@ -114,7 +114,7 @@ export function flatMerge(all: Array<FlatReqFilter>): Array<ReqFilter> {
             acc[k].push(v);
           }
         }
-      })
+      });
       return acc;
     }, {} as any) as ReqFilter;
   }

packages/system/src/request-splitter.ts

@@ -1,13 +1,10 @@
 import { flatFilterEq } from "./utils";
 import { FlatReqFilter } from "./request-expander";
-import { flatMerge } from "./request-merger";
 
 export function diffFilters(prev: Array<FlatReqFilter>, next: Array<FlatReqFilter>, calcRemoved?: boolean) {
   const added = [];
   const removed = [];
 
-  prev = [...prev];
-  next = [...next];
   for (const n of next) {
     const px = prev.findIndex(a => flatFilterEq(a, n));
     if (px !== -1) {
@@ -28,8 +25,8 @@ export function diffFilters(prev: Array<FlatReqFilter>, next: Array<FlatReqFilte
   }
   const changed = added.length > 0 || removed.length > 0;
   return {
-    added: changed ? flatMerge(added) : [],
-    removed: changed ? flatMerge(removed) : [],
+    added: changed ? added : [],
+    removed: changed ? removed : [],
     changed,
   };
 }

packages/system/src/utils.ts

@@ -1,4 +1,3 @@
-
 import { equalProp } from "@snort/shared";
 import { FlatReqFilter } from "./request-expander";
 import { NostrEvent, ReqFilter } from "./nostr";
@@ -11,32 +10,36 @@ export function findTag(e: NostrEvent, tag: string) {
 }
 
 export function reqFilterEq(a: FlatReqFilter | ReqFilter, b: FlatReqFilter | ReqFilter): boolean {
-    return equalProp(a.ids, b.ids)
-        && equalProp(a.kinds, b.kinds)
-        && equalProp(a.authors, b.authors)
-        && equalProp(a.limit, b.limit)
-        && equalProp(a.since, b.since)
-        && equalProp(a.until, b.until)
-        && equalProp(a.search, b.search)
-        && equalProp(a["#e"], b["#e"])
-        && equalProp(a["#p"], b["#p"])
-        && equalProp(a["#t"], b["#t"])
-        && equalProp(a["#d"], b["#d"])
-        && equalProp(a["#r"], b["#r"]);
+  return (
+    equalProp(a.ids, b.ids) &&
+    equalProp(a.kinds, b.kinds) &&
+    equalProp(a.authors, b.authors) &&
+    equalProp(a.limit, b.limit) &&
+    equalProp(a.since, b.since) &&
+    equalProp(a.until, b.until) &&
+    equalProp(a.search, b.search) &&
+    equalProp(a["#e"], b["#e"]) &&
+    equalProp(a["#p"], b["#p"]) &&
+    equalProp(a["#t"], b["#t"]) &&
+    equalProp(a["#d"], b["#d"]) &&
+    equalProp(a["#r"], b["#r"])
+  );
 }
 
 export function flatFilterEq(a: FlatReqFilter, b: FlatReqFilter): boolean {
-    return a.keys === b.keys
-        && a.since === b.since
-        && a.until === b.until
-        && a.limit === b.limit
-        && a.search === b.search
-        && a.ids === b.ids
-        && a.kinds === b.kinds
-        && a.authors === b.authors
-        && a["#e"] === b["#e"]
-        && a["#p"] === b["#p"]
-        && a["#t"] === b["#t"]
-        && a["#d"] === b["#d"]
-        && a["#r"] === b["#r"];
+  return (
+    a.keys === b.keys &&
+    a.since === b.since &&
+    a.until === b.until &&
+    a.limit === b.limit &&
+    a.search === b.search &&
+    a.ids === b.ids &&
+    a.kinds === b.kinds &&
+    a.authors === b.authors &&
+    a["#e"] === b["#e"] &&
+    a["#p"] === b["#p"] &&
+    a["#t"] === b["#t"] &&
+    a["#d"] === b["#d"] &&
+    a["#r"] === b["#r"]
+  );
 }

packages/system/tests/EventExt.test.ts

@@ -1,62 +0,0 @@
-import { EventExt } from "../src/EventExt";
-
-describe("NIP-10", () => {
-    it("should extract thread", () => {
-        const a = {
-            content: "This is the problem with Lightning....",
-            id: "868187063f...",
-            kind: 1,
-            created_at: 1,
-            pubkey: "test",
-            sig: "test",
-            "tags": [
-                ["e", "cbf2375078..."],
-                ["e", "977ac5d3b6..."],
-                ["e", "8f99ca1363..."],
-            ]
-        }
-
-        const b = {
-            "content": "This is a good point, but your ...",
-            "id": "434ad4a646...",
-            kind: 1,
-            created_at: 1,
-            pubkey: "test",
-            sig: "test",
-            "tags": [
-                ["e", "cbf2375078..."],
-                ["e", "868187063f..."],
-                ["e", "6834ffc491..."],
-            ]
-        }
-
-        const c = {
-            "content": "There is some middle ground ...",
-            "id": "6834ffc491...",
-            kind: 1,
-            created_at: 1,
-            pubkey: "test",
-            sig: "test",
-            "tags": [
-                ["e", "cbf2375078...", "", "root"],
-                ["e", "868187063f...", "", "reply"],
-            ]
-        }
-
-        expect(EventExt.extractThread(a)).toMatchObject({
-            root: { key: "e", value: "cbf2375078...", marker: "root" },
-            replyTo: { key: "e", value: "8f99ca1363...", marker: "reply" },
-            mentions: [{ key: "e", value: "977ac5d3b6...", marker: "mention" }]
-        })
-        expect(EventExt.extractThread(b)).toMatchObject({
-            root: { key: "e", value: "cbf2375078...", marker: "root" },
-            replyTo: { key: "e", value: "6834ffc491...", marker: "reply" },
-            mentions: [{ key: "e", value: "868187063f...", marker: "mention" }]
-        })
-        expect(EventExt.extractThread(c)).toMatchObject({
-            root: { key: "e", value: "cbf2375078...", relay: "", marker: "root" },
-            replyTo: { key: "e", value: "868187063f...", relay: "", marker: "reply" },
-            mentions: []
-        })
-    })
-})

packages/system/tests/GossipModel.test.ts

@@ -1,37 +0,0 @@
-import { splitAllByWriteRelays } from "../src/GossipModel"
-
-describe("GossipModel", () => {
-    it("should not output empty", () => {
-        const Relays = {
-            getFromCache: (pk?: string) => {
-                if (pk) {
-                    return {
-                        pubkey: pk,
-                        created_at: 0,
-                        relays: []
-                    };
-                }
-            }
-        }
-        const a = [{
-            "until": 1686651693,
-            "limit": 200,
-            "kinds": [
-                1,
-                6,
-                6969
-            ],
-            "authors": [
-                "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"
-            ]
-        }];
-
-        const output = splitAllByWriteRelays(Relays, a);
-        expect(output).toEqual([
-            {
-                relay: "",
-                filters: a
-            }
-        ])
-    })
-})

packages/system/tests/Impl.test.ts

@@ -1,4 +1,3 @@
-
 import { schnorr, secp256k1 } from "@noble/curves/secp256k1";
 import { Nip4WebCryptoEncryptor } from "../src/impl/nip4";
 import { Nip44Encryptor } from "../src/impl/nip44";
@@ -22,8 +21,8 @@ describe("NIP-04", () => {
     const sec2 = enc.getSharedSecret(bytesToHex(bKey), bytesToHex(aPubKey));
     const plaintext = await dec.decryptData(ciphertext, sec2);
     expect(plaintext).toEqual(msg);
-    })
-})
+  });
+});
 
 describe("NIP-44", () => {
   it("should encrypt/decrypt", () => {
@@ -33,13 +32,13 @@ describe("NIP-44", () => {
 
     const ciphertext = enc.encryptData(msg, sec);
     const jObj = JSON.parse(ciphertext);
-        expect(jObj).toHaveProperty("ciphertext")
-        expect(jObj).toHaveProperty("nonce")
+    expect(jObj).toHaveProperty("ciphertext");
+    expect(jObj).toHaveProperty("nonce");
     expect(jObj.v).toBe(1);
 
     const dec = new Nip44Encryptor();
     const sec2 = enc.getSharedSecret(bytesToHex(bKey), bytesToHex(aPubKey));
     const plaintext = dec.decryptData(ciphertext, sec2);
     expect(plaintext).toEqual(msg);
-    })
-})
+  });
+});

packages/system/tests/Query.test.ts

@@ -1,9 +1,9 @@
 import { Connection } from "../src";
 import { describe, expect } from "@jest/globals";
-import { Query } from "../src/Query";
+import { Query } from "../src/query";
 import { getRandomValues } from "crypto";
-import { FlatNoteStore } from "../src/NoteCollection";
-import { RequestStrategy } from "../src/RequestBuilder";
+import { FlatNoteStore } from "../src/note-collection";
+import { RequestStrategy } from "../src/request-builder";
 
 window.crypto = {} as any;
 window.crypto.getRandomValues = getRandomValues as any;

packages/system/tests/event-ext.test.ts

@@ -0,0 +1,62 @@
+import { EventExt } from "../src/event-ext";
+
+describe("NIP-10", () => {
+  it("should extract thread", () => {
+    const a = {
+      content: "This is the problem with Lightning....",
+      id: "868187063f...",
+      kind: 1,
+      created_at: 1,
+      pubkey: "test",
+      sig: "test",
+      tags: [
+        ["e", "cbf2375078..."],
+        ["e", "977ac5d3b6..."],
+        ["e", "8f99ca1363..."],
+      ],
+    };
+
+    const b = {
+      content: "This is a good point, but your ...",
+      id: "434ad4a646...",
+      kind: 1,
+      created_at: 1,
+      pubkey: "test",
+      sig: "test",
+      tags: [
+        ["e", "cbf2375078..."],
+        ["e", "868187063f..."],
+        ["e", "6834ffc491..."],
+      ],
+    };
+
+    const c = {
+      content: "There is some middle ground ...",
+      id: "6834ffc491...",
+      kind: 1,
+      created_at: 1,
+      pubkey: "test",
+      sig: "test",
+      tags: [
+        ["e", "cbf2375078...", "", "root"],
+        ["e", "868187063f...", "", "reply"],
+      ],
+    };
+
+    expect(EventExt.extractThread(a)).toMatchObject({
+      root: { key: "e", value: "cbf2375078...", marker: "root" },
+      replyTo: { key: "e", value: "8f99ca1363...", marker: "reply" },
+      mentions: [{ key: "e", value: "977ac5d3b6...", marker: "mention" }],
+    });
+    expect(EventExt.extractThread(b)).toMatchObject({
+      root: { key: "e", value: "cbf2375078...", marker: "root" },
+      replyTo: { key: "e", value: "6834ffc491...", marker: "reply" },
+      mentions: [{ key: "e", value: "868187063f...", marker: "mention" }],
+    });
+    expect(EventExt.extractThread(c)).toMatchObject({
+      root: { key: "e", value: "cbf2375078...", relay: "", marker: "root" },
+      replyTo: { key: "e", value: "868187063f...", relay: "", marker: "reply" },
+      mentions: [],
+    });
+  });
+});

packages/system/tests/gossip-model.test.ts

@@ -0,0 +1,33 @@
+import { splitAllByWriteRelays } from "../src/gossip-model";
+
+describe("GossipModel", () => {
+  it("should not output empty", () => {
+    const Relays = {
+      getFromCache: (pk?: string) => {
+        if (pk) {
+          return {
+            pubkey: pk,
+            created_at: 0,
+            relays: [],
+          };
+        }
+      },
+    };
+    const a = [
+      {
+        until: 1686651693,
+        limit: 200,
+        kinds: [1, 6, 6969],
+        authors: ["3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"],
+      },
+    ];
+
+    const output = splitAllByWriteRelays(Relays, a);
+    expect(output).toEqual([
+      {
+        relay: "",
+        filters: a,
+      },
+    ]);
+  });
+});

packages/system/tests/note-collection.test.ts

@@ -1,6 +1,6 @@
-import { TaggedRawEvent } from "../src/Nostr";
+import { TaggedRawEvent } from "../src/nostr";
 import { describe, expect } from "@jest/globals";
-import { FlatNoteStore, ReplaceableNoteStore } from "../src/NoteCollection";
+import { FlatNoteStore, ReplaceableNoteStore } from "../src/note-collection";
 
 describe("NoteStore", () => {
   describe("flat", () => {

packages/system/tests/request-builder.test.ts

@@ -1,7 +1,7 @@
-import { RelayCache } from "../src/GossipModel";
-import { RequestBuilder, RequestStrategy } from "../src/RequestBuilder";
+import { RelayCache } from "../src/gossip-model";
+import { RequestBuilder, RequestStrategy } from "../src/request-builder";
 import { describe, expect } from "@jest/globals";
-import { expandFilter } from "../src/RequestExpander";
+import { expandFilter } from "../src/request-expander";
 import { bytesToHex } from "@noble/curves/abstract/utils";
 import { unixNow, unixNowMs } from "@snort/shared";
 
@@ -20,7 +20,7 @@ const DummyCache = {
             write: true,
           },
         },
-      ]
+      ],
     };
   },
 } as RelayCache;
@@ -181,7 +181,8 @@ describe("build diff, large follow list", () => {
 
   const start = unixNowMs();
   const a = rb.build(DummyCache);
-  expect(a).toEqual(f.map(a => {
+  expect(a).toEqual(
+    f.map(a => {
       return {
         strategy: RequestStrategy.AuthorsRelays,
         relay: `wss://${a}.com/`,
@@ -189,15 +190,15 @@ describe("build diff, large follow list", () => {
           {
             kinds: [1, 6, 10002, 3, 6969],
             authors: [a],
-        }
+          },
         ],
-    }
-  }));
+      };
+    })
+  );
   expect(unixNowMs() - start).toBeLessThan(500);
 
   const start2 = unixNowMs();
   const b = rb.buildDiff(DummyCache, rb.buildRaw().flatMap(expandFilter));
   expect(b).toEqual([]);
   expect(unixNowMs() - start2).toBeLessThan(100);
-
-})
+});

packages/system/tests/request-expander.test.ts

@@ -1,4 +1,4 @@
-import { expandFilter } from "../src/RequestExpander";
+import { expandFilter } from "../src/request-expander";
 
 describe("RequestExpander", () => {
   test("expand filter", () => {

packages/system/tests/request-matcher.test.ts

@@ -1,4 +1,4 @@
-import { eventMatchesFilter } from "../src/RequestMatcher";
+import { eventMatchesFilter } from "../src/request-matcher";
 
 describe("RequestMatcher", () => {
   it("should match simple filter", () => {

packages/system/tests/request-merger.test.ts

@@ -1,6 +1,6 @@
 import { ReqFilter } from "../src";
-import { canMergeFilters, filterIncludes, flatMerge, mergeSimilar, simpleMerge } from "../src/RequestMerger";
-import { FlatReqFilter, expandFilter } from "../src/RequestExpander";
+import { canMergeFilters, filterIncludes, flatMerge, mergeSimilar, simpleMerge } from "../src/request-merger";
+import { FlatReqFilter, expandFilter } from "../src/request-expander";
 
 describe("RequestMerger", () => {
   it("should simple merge authors", () => {
@@ -108,50 +108,50 @@ describe("flatMerge", () => {
   });
 });
 
-describe('canMerge', () => {
+describe("canMerge", () => {
   it("should have 0 distance", () => {
     const a = {
       ids: "a",
-      keys: 1
+      keys: 1,
     };
     const b = {
       ids: "a",
-      keys: 1
+      keys: 1,
     };
     expect(canMergeFilters(a, b)).toEqual(true);
   });
   it("should have 1 distance", () => {
     const a = {
       ids: "a",
-      keys: 1
+      keys: 1,
     };
     const b = {
       ids: "b",
-      keys: 1
+      keys: 1,
     };
     expect(canMergeFilters(a, b)).toEqual(true);
   });
   it("should have 10 distance", () => {
     const a = {
       ids: "a",
-      keys: 1
+      keys: 1,
     };
     const b = {
       ids: "a",
       kinds: 1,
-      keys: 2
+      keys: 2,
     };
     expect(canMergeFilters(a, b)).toEqual(false);
   });
   it("should have 11 distance", () => {
     const a = {
       ids: "a",
-      keys: 1
+      keys: 1,
     };
     const b = {
       ids: "b",
       kinds: 1,
-      keys: 2
+      keys: 2,
     };
     expect(canMergeFilters(a, b)).toEqual(false);
   });
@@ -160,13 +160,13 @@ describe('canMerge', () => {
       since: 1,
       until: 100,
       kinds: [1],
-      authors: ["kieran", "snort", "c", "d", "e"]
+      authors: ["kieran", "snort", "c", "d", "e"],
     };
     const b = {
       since: 1,
       until: 100,
       kinds: [6969],
-      authors: ["kieran", "snort", "c", "d", "e"]
+      authors: ["kieran", "snort", "c", "d", "e"],
     };
     expect(canMergeFilters(a, b)).toEqual(true);
   });
@@ -175,14 +175,14 @@ describe('canMerge', () => {
       since: 1,
       until: 100,
       kinds: [1],
-      authors: ["f", "kieran", "snort", "c", "d"]
+      authors: ["f", "kieran", "snort", "c", "d"],
     };
     const b = {
       since: 1,
       until: 100,
       kinds: [1],
-      authors: ["kieran", "snort", "c", "d", "e"]
+      authors: ["kieran", "snort", "c", "d", "e"],
     };
     expect(canMergeFilters(a, b)).toEqual(true);
   });
-})
+});

packages/system/tests/request-splitter.test.ts

@@ -1,15 +1,15 @@
 import { ReqFilter } from "../src";
 import { describe, expect } from "@jest/globals";
-import { diffFilters } from "../src/RequestSplitter";
-import { expandFilter } from "../src/RequestExpander";
+import { diffFilters } from "../src/request-splitter";
+import { expandFilter } from "../src/request-expander";
 
 describe("RequestSplitter", () => {
   test("single filter add value", () => {
     const a: Array<ReqFilter> = [{ kinds: [0], authors: ["a"] }];
     const b: Array<ReqFilter> = [{ kinds: [0], authors: ["a", "b"] }];
     const diff = diffFilters(a.flatMap(expandFilter), b.flatMap(expandFilter), true);
-    expect(diff).toEqual({
-      added: [{ kinds: [0], authors: ["b"] }],
+    expect(diff).toMatchObject({
+      added: [{ kinds: 0, authors: "b" }],
       removed: [],
       changed: true,
     });
@@ -18,9 +18,9 @@ describe("RequestSplitter", () => {
     const a: Array<ReqFilter> = [{ kinds: [0], authors: ["a"] }];
     const b: Array<ReqFilter> = [{ kinds: [0], authors: ["b"] }];
     const diff = diffFilters(a.flatMap(expandFilter), b.flatMap(expandFilter), true);
-    expect(diff).toEqual({
-      added: [{ kinds: [0], authors: ["b"] }],
-      removed: [{ kinds: [0], authors: ["a"] }],
+    expect(diff).toMatchObject({
+      added: [{ kinds: 0, authors: "b" }],
+      removed: [{ kinds: 0, authors: "a" }],
       changed: true,
     });
   });
@@ -28,9 +28,12 @@ describe("RequestSplitter", () => {
     const a: Array<ReqFilter> = [{ kinds: [0], authors: ["a"], since: 100 }];
     const b: Array<ReqFilter> = [{ kinds: [0], authors: ["a", "b"], since: 101 }];
     const diff = diffFilters(a.flatMap(expandFilter), b.flatMap(expandFilter), true);
-    expect(diff).toEqual({
-      added: [{ kinds: [0], authors: ["a", "b"], since: 101 }],
-      removed: [{ kinds: [0], authors: ["a"], since: 100 }],
+    expect(diff).toMatchObject({
+      added: [
+        { kinds: 0, authors: "a", since: 101 },
+        { kinds: 0, authors: "b", since: 101 },
+      ],
+      removed: [{ kinds: 0, authors: "a", since: 100 }],
       changed: true,
     });
   });
@@ -44,10 +47,10 @@ describe("RequestSplitter", () => {
       { kinds: [69], authors: ["a", "c"] },
     ];
     const diff = diffFilters(a.flatMap(expandFilter), b.flatMap(expandFilter), true);
-    expect(diff).toEqual({
+    expect(diff).toMatchObject({
       added: [
-        { kinds: [0], authors: ["b"] },
-        { kinds: [69], authors: ["c"] },
+        { kinds: 0, authors: "b" },
+        { kinds: 69, authors: "c" },
       ],
       removed: [],
       changed: true,
@@ -63,12 +66,15 @@ describe("RequestSplitter", () => {
       { kinds: [69], authors: ["c"] },
     ];
     const diff = diffFilters(a.flatMap(expandFilter), b.flatMap(expandFilter), true);
-    expect(diff).toEqual({
+    expect(diff).toMatchObject({
       added: [
-        { kinds: [0], authors: ["b"] },
-        { kinds: [69], authors: ["c"] },
+        { kinds: 0, authors: "b" },
+        { kinds: 69, authors: "c" },
+      ],
+      removed: [
+        { kinds: 0, authors: "a" },
+        { kinds: 69, authors: "a" },
       ],
-      removed: [{ kinds: [0, 69], authors: ["a"] }],
       changed: true,
     });
   });
@@ -79,8 +85,8 @@ describe("RequestSplitter", () => {
       { kinds: [69], authors: ["c"] },
     ];
     const diff = diffFilters(a.flatMap(expandFilter), b.flatMap(expandFilter), true);
-    expect(diff).toEqual({
-      added: [{ kinds: [69], authors: ["c"] }],
+    expect(diff).toMatchObject({
+      added: [{ kinds: 69, authors: "c" }],
       removed: [],
       changed: true,
     });

packages/system/tests/utils.test.ts

@@ -1,5 +1,5 @@
-import { NostrPrefix } from "../src/Links";
-import { parseNostrLink, tryParseNostrLink } from "../src/NostrLink";
+import { NostrPrefix } from "../src/links";
+import { parseNostrLink, tryParseNostrLink } from "../src/nostr-link";
 
 describe("tryParseNostrLink", () => {
   it("is a valid nostr link", () => {

src-tauri/tauri.conf.json

@@ -22,10 +22,7 @@
         "depends": []
       },
       "externalBin": [],
-      "icon": [
-        "icons/128x128.png",
-        "icons/128x128@2x.png"
-      ],
+      "icon": ["icons/128x128.png", "icons/128x128@2x.png"],
       "identifier": "social.snort.app",
       "longDescription": "",
       "macOS": {