feat: worker-relay pkg

packages/app/package.json

@@ -14,6 +14,7 @@
     "@snort/system-react": "workspace:*",
     "@snort/system-wasm": "workspace:*",
     "@snort/system-web": "workspace:*",
+    "@snort/worker-relay": "workspace:*",
     "@szhsin/react-menu": "^3.3.1",
     "@uidotdev/usehooks": "^2.4.1",
     "@void-cat/api": "^1.0.12",

packages/app/src/Utils/Login/Preferences.ts

@@ -122,5 +122,5 @@ export const DefaultPreferences = {
   checkSigs: true,
   autoTranslate: true,
   hideMutedNotes: false,
-  ...CONFIG.defaultPreferences,
+  ...(CONFIG ?? {})?.defaultPreferences,
 } as UserPreferences;

packages/app/vite.config.ts

@@ -47,6 +47,16 @@ export default defineConfig({
       "@": "/src",
     },
   },
+  server: {
+    headers: {
+      "Cross-Origin-Resource-Policy": "corss-origin",
+      "Cross-Origin-Opener-Policy": "same-origin",
+      "Cross-Origin-Embedder-Policy": "credentialless",
+    },
+  },
+  optimizeDeps: {
+    exclude: ["@sqlite.org/sqlite-wasm"],
+  },
   define: {
     CONFIG: JSON.stringify(appConfig),
     global: {}, // needed for custom-event lib

packages/worker-relay/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@snort/worker-relay",
+  "version": "1.0.0",
+  "description": "A nostr relay in a service worker",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "module": "src/index.ts",
+  "repository": "https://git.v0l.io/Kieran/snort",
+  "author": "Kieran",
+  "license": "MIT",
+  "scripts": {
+    "build": "rm -rf dist && tsc"
+  },
+  "files": [
+    "src",
+    "dist"
+  ],
+  "dependencies": {
+    "@sqlite.org/sqlite-wasm": "^3.44.2-build3",
+    "debug": "^4.3.4",
+    "uuid": "^9.0.1"
+  },
+  "devDependencies": {
+    "@types/debug": "^4.1.12",
+    "@types/uuid": "^9.0.7",
+    "typescript": "^5.2.2"
+  }
+}

packages/worker-relay/src/index.ts

@@ -0,0 +1 @@
+export * from "./interface";

packages/worker-relay/src/interface.ts

@@ -0,0 +1,63 @@
+import debug from "debug";
+import { NostrEvent, ReqCommand, WorkerMessage } from "./types";
+import { v4 as uuid } from "uuid";
+
+export class WorkerRelayInterface {
+  #worker: Worker;
+  #log = (msg: any) => console.debug(msg);
+  #commandQueue: Map<string, (v: unknown) => void> = new Map();
+
+  constructor(path: string) {
+    this.#log(`Module path: ${path}`);
+    this.#worker = new Worker(path, { type: "module" });
+    this.#worker.onmessage = e => {
+      const cmd = e.data as WorkerMessage<any>;
+      if (cmd.cmd === "reply") {
+        const q = this.#commandQueue.get(cmd.id);
+        q?.(cmd);
+        this.#commandQueue.delete(cmd.id);
+      }
+    };
+  }
+
+  async init() {
+    return await this.#workerRpc<void, boolean>("init");
+  }
+
+  async open() {
+    return await this.#workerRpc<void, boolean>("open");
+  }
+
+  async migrate() {
+    return await this.#workerRpc<void, boolean>("migrate");
+  }
+
+  async event(ev: NostrEvent) {
+    return await this.#workerRpc<NostrEvent, boolean>("event", ev);
+  }
+
+  async req(req: ReqCommand) {
+    return await this.#workerRpc<ReqCommand, Array<NostrEvent>>("req", req);
+  }
+
+  #workerRpc<T, R>(cmd: string, args?: T, timeout = 5_000) {
+    const id = uuid();
+    const msg = {
+      id,
+      cmd,
+      args,
+    } as WorkerMessage<T>;
+    this.#worker.postMessage(msg);
+    return new Promise<R>((resolve, reject) => {
+      let t: ReturnType<typeof setTimeout>;
+      this.#commandQueue.set(id, v => {
+        clearTimeout(t);
+        const cmdReply = v as WorkerMessage<R>;
+        resolve(cmdReply.args);
+      });
+      t = setTimeout(() => {
+        reject("timeout");
+      }, timeout);
+    });
+  }
+}

packages/worker-relay/src/relay.ts

@@ -0,0 +1,179 @@
+import sqlite3InitModule, { Database, Sqlite3Static } from "@sqlite.org/sqlite-wasm";
+import debug from "debug";
+import { NostrEvent, ReqFilter } from "types";
+
+export class WorkerRelay {
+  #sqlite?: Sqlite3Static;
+  #log = (msg: string) => console.debug(msg);
+  #db?: Database;
+
+  /**
+   * Initialize the SQLite driver
+   */
+  async init() {
+    this.#sqlite = await sqlite3InitModule();
+    this.#log(`Got SQLite version: ${this.#sqlite.version.libVersion}`);
+  }
+
+  /**
+   * Open the database from its path
+   */
+  async open(path: string) {
+    if (!this.#sqlite) throw new Error("Must call init first");
+
+    if ("opfs" in this.#sqlite) {
+      this.#db = new this.#sqlite.oo1.OpfsDb(path, "cw");
+      this.#log(`Opened ${this.#db.filename}`);
+    } else {
+      throw new Error("OPFS not supported!");
+    }
+  }
+
+  /**
+   * Do database migration
+   */
+  migrate() {
+    if (!this.#db) throw new Error("DB must be open");
+
+    this.#db.exec(
+      'CREATE TABLE IF NOT EXISTS "__migration" (version INTEGER,migrated NUMERIC, CONSTRAINT "__migration_PK" PRIMARY KEY (version))',
+    );
+    const res = this.#db.exec("select max(version) from __migration", {
+      returnValue: "resultRows",
+    });
+
+    const version = (res[0][0] as number | undefined) ?? 0;
+    this.#log(`Starting migration from: v${version}`);
+    if (version < 1) {
+      this.#migrate_v1();
+      this.#log("Migrated to v1");
+    }
+  }
+
+  /**
+   * Insert an event to the database
+   */
+  event(ev: NostrEvent) {
+    let eventInserted = false;
+    this.#db?.transaction(db => {
+      const legacyReplacable = [0, 3, 41];
+      if (legacyReplacable.includes(ev.kind) || (ev.kind >= 10_000 && ev.kind < 20_000)) {
+        db.exec("delete from events where kind = ? and pubkey = ?", {
+          bind: [ev.kind, ev.pubkey],
+        });
+        this.#log(`Deleted old kind=${ev.kind}, author=${ev.pubkey} (rows=${db.changes()})`);
+      }
+      if (ev.kind >= 30_000 && ev.kind < 40_000) {
+        const dTag = ev.tags.find(a => a[0] === "d")![1];
+        db.exec(
+          "delete from events where id in (select id from events, tags where events.id = tags.event_id and tags.key = ? and tags.value = ?)",
+          {
+            bind: ["d", dTag],
+          },
+        );
+        this.#log(`Deleted old versions of: d=${dTag}, kind=${ev.kind}, author=${ev.pubkey} (rows=${db.changes()})`);
+      }
+      db.exec("insert or ignore into events(id, pubkey, created, kind, json) values(?,?,?,?,?)", {
+        bind: [ev.id, ev.pubkey, ev.created_at, ev.kind, JSON.stringify(ev)],
+      });
+      eventInserted = (this.#db?.changes() as number) > 0;
+      if (eventInserted) {
+        for (const t of ev.tags.filter(a => a[0].length === 1)) {
+          db.exec("insert into tags(event_id, key, value) values(?, ?, ?)", {
+            bind: [ev.id, t[0], t[1]],
+          });
+        }
+      }
+    });
+    if (eventInserted) {
+      this.#log(`Inserted: kind=${ev.kind},authors=${ev.pubkey},id=${ev.id}`);
+    }
+    return eventInserted;
+  }
+
+  /**
+   * Query relay by nostr filter
+   */
+  req(req: ReqFilter) {
+    const conditions: Array<string> = [];
+    const params: Array<any> = [];
+
+    const repeatParams = (n: number) => {
+      const ret = [];
+      for (let x = 0; x < n; x++) {
+        ret.push("?");
+      }
+      return ret.join(", ");
+    };
+
+    let sql = `select json from events`;
+    const tags = Object.entries(req).filter(([k]) => k.startsWith("#"));
+    for (const [key, values] of tags) {
+      const vArray = values as Array<string>;
+      sql += ` inner join tags on events.id = tags.event_id and tags.key = ? and tags.value in (${repeatParams(
+        vArray.length,
+      )})`;
+      params.push(key);
+      params.push(...vArray);
+    }
+    if (req.ids) {
+      conditions.push(`id in (${repeatParams(req.ids.length)})`);
+      params.push(...req.ids);
+    }
+    if (req.authors) {
+      conditions.push(`pubkey in (${repeatParams(req.authors.length)})`);
+      params.push(...req.authors);
+    }
+    if (req.kinds) {
+      conditions.push(`kind in (${repeatParams(req.kinds.length)})`);
+      params.push(...req.kinds);
+    }
+    if (req.since) {
+      conditions.push("created >= ?");
+      params.push(req.since);
+    }
+    if (req.until) {
+      conditions.push("created < ?");
+      params.push(req.until);
+    }
+    if (conditions.length > 0) {
+      sql += ` where ${conditions.join(" and ")}`;
+    }
+    if (req.limit) {
+      sql += ` order by created desc limit ${req.limit}`;
+    }
+
+    this.#log(`Made query ${sql} from ${JSON.stringify(req)}`);
+    const rows = this.#db?.exec(sql, {
+      bind: params,
+      returnValue: "resultRows",
+    });
+    return rows?.map(a => JSON.parse(a[0] as string) as NostrEvent) ?? [];
+  }
+
+  #migrate_v1() {
+    this.#db?.transaction(db => {
+      db.exec(
+        "CREATE TABLE events (\
+        id TEXT(64) PRIMARY KEY, \
+        pubkey TEXT(64), \
+        created INTEGER, \
+        kind INTEGER, \
+        json TEXT \
+      )",
+      );
+      db.exec(
+        "CREATE TABLE tags (\
+        event_id TEXT(64), \
+        key TEXT, \
+        value TEXT, \
+        CONSTRAINT tags_FK FOREIGN KEY (event_id) REFERENCES events(id) ON DELETE CASCADE \
+        )",
+      );
+      db.exec("CREATE INDEX tags_key_IDX ON tags (key,value)");
+      db.exec("insert into __migration values(1, ?)", {
+        bind: [new Date().getTime() / 1000],
+      });
+    });
+  }
+}

packages/worker-relay/src/types.ts

@@ -0,0 +1,29 @@
+export interface WorkerMessage<T> {
+  id: string;
+  cmd: "reply" | "init" | "open" | "migrate" | "event" | "req";
+  args: T;
+}
+
+export interface NostrEvent {
+  id: string;
+  pubkey: string;
+  created_at: number;
+  kind: number;
+  tags: Array<Array<string>>;
+  content: string;
+  sig: string;
+}
+
+export type ReqCommand = [cmd: "REQ", id: string, ...filters: Array<ReqFilter>];
+
+export interface ReqFilter {
+  ids?: string[];
+  authors?: string[];
+  kinds?: number[];
+  search?: string;
+  since?: number;
+  until?: number;
+  limit?: number;
+  not?: ReqFilter;
+  [key: string]: Array<string> | Array<number> | string | number | undefined | ReqFilter;
+}

packages/worker-relay/src/worker.ts

@@ -0,0 +1,55 @@
+/// <reference lib="webworker" />
+
+import { WorkerRelay } from "./relay";
+import { NostrEvent, ReqCommand, ReqFilter, WorkerMessage } from "./types";
+
+const relay = new WorkerRelay();
+
+async function reply<T>(id: string, obj?: T) {
+  globalThis.postMessage({
+    id,
+    cmd: "reply",
+    args: obj,
+  } as WorkerMessage<T>);
+}
+
+globalThis.onmessage = async ev => {
+  //console.debug(ev);
+
+  const msg = ev.data as WorkerMessage<any>;
+  switch (msg.cmd) {
+    case "init": {
+      await relay.init();
+      reply(msg.id, true);
+      break;
+    }
+    case "open": {
+      await relay.open("/relay.db");
+      reply(msg.id, true);
+      break;
+    }
+    case "migrate": {
+      await relay.migrate();
+      reply(msg.id, true);
+      break;
+    }
+    case "event": {
+      await relay.event(msg.args as NostrEvent);
+      reply(msg.id, true);
+      break;
+    }
+    case "req": {
+      const req = msg.args as ReqCommand;
+      const results = [];
+      for (const r of req.slice(2)) {
+        results.push(...(await relay.req(r as ReqFilter)));
+      }
+      reply(msg.id, results);
+      break;
+    }
+    default: {
+      reply(msg.id, { error: "Unknown command" });
+      break;
+    }
+  }
+};

packages/worker-relay/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "baseUrl": "src",
+    "target": "ESNext",
+    "moduleResolution": "Bundler",
+    "esModuleInterop": true,
+    "noImplicitOverride": true,
+    "jsx": "react-jsx",
+    "strict": true,
+    "declaration": true,
+    "declarationMap": true,
+    "inlineSourceMap": true,
+    "outDir": "dist",
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*.ts"],
+  "files": ["src/index.ts"]
+}

packages/worker-relay/typedoc.json

@@ -0,0 +1,3 @@
+{
+  "entryPoints": ["src/index.ts"]
+}

yarn.lock

@@ -2936,6 +2936,7 @@ __metadata:
     "@snort/system-react": "workspace:*"
     "@snort/system-wasm": "workspace:*"
     "@snort/system-web": "workspace:*"
+    "@snort/worker-relay": "workspace:*"
     "@szhsin/react-menu": ^3.3.1
     "@types/config": ^3.3.3
     "@types/debug": ^4.1.8
@@ -3011,7 +3012,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@snort/shared@^1.0.10, @snort/shared@^1.0.6, @snort/shared@workspace:*, @snort/shared@workspace:packages/shared":
+"@snort/shared@^1.0.11, @snort/shared@^1.0.6, @snort/shared@workspace:*, @snort/shared@workspace:packages/shared":
   version: 0.0.0-use.local
   resolution: "@snort/shared@workspace:packages/shared"
   dependencies:
@@ -3030,8 +3031,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@snort/system-react@workspace:packages/system-react"
   dependencies:
-    "@snort/shared": ^1.0.10
+    "@snort/shared": ^1.0.11
-    "@snort/system": ^1.1.8
+    "@snort/system": ^1.2.0
     "@types/react": ^18.2.14
     react: ^18.2.0
     typescript: ^5.2.2
@@ -3059,14 +3060,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@snort/system-web@workspace:packages/system-web"
   dependencies:
-    "@snort/shared": ^1.0.10
+    "@snort/shared": ^1.0.11
-    "@snort/system": ^1.1.5
+    "@snort/system": ^1.2.0
     dexie: ^3.2.4
     typescript: ^5.2.2
   languageName: unknown
   linkType: soft
 
-"@snort/system@^1.0.21, @snort/system@^1.1.5, @snort/system@^1.1.8, @snort/system@workspace:*, @snort/system@workspace:packages/system":
+"@snort/system@^1.0.21, @snort/system@^1.2.0, @snort/system@workspace:*, @snort/system@workspace:packages/system":
   version: 0.0.0-use.local
   resolution: "@snort/system@workspace:packages/system"
   dependencies:
@@ -3075,7 +3076,7 @@ __metadata:
     "@noble/hashes": ^1.3.2
     "@peculiar/webcrypto": ^1.4.3
     "@scure/base": ^1.1.2
-    "@snort/shared": ^1.0.10
+    "@snort/shared": ^1.0.11
     "@stablelib/xchacha20": ^1.0.1
     "@types/debug": ^4.1.8
     "@types/jest": ^29.5.1
@@ -3097,6 +3098,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@snort/worker-relay@workspace:*, @snort/worker-relay@workspace:packages/worker-relay":
+  version: 0.0.0-use.local
+  resolution: "@snort/worker-relay@workspace:packages/worker-relay"
+  dependencies:
+    "@sqlite.org/sqlite-wasm": ^3.44.2-build3
+    "@types/debug": ^4.1.12
+    "@types/uuid": ^9.0.7
+    debug: ^4.3.4
+    typescript: ^5.2.2
+    uuid: ^9.0.1
+  languageName: unknown
+  linkType: soft
+
 "@socket.io/component-emitter@npm:~3.1.0":
   version: 3.1.0
   resolution: "@socket.io/component-emitter@npm:3.1.0"
@@ -3104,6 +3118,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sqlite.org/sqlite-wasm@npm:^3.44.2-build3":
+  version: 3.44.2-build3
+  resolution: "@sqlite.org/sqlite-wasm@npm:3.44.2-build3"
+  bin:
+    sqlite-wasm: bin/index.js
+  checksum: 6df10114fcd5d41d61706496a4ad3ea303b71e844ccda6ded62009ec8f2b0f97547a1713b7a4c4e2e8b0691fca2d9127d0e099fff6802dd699bb7f3d0af2191c
+  languageName: node
+  linkType: hard
+
 "@stablelib/binary@npm:^1.0.1":
   version: 1.0.1
   resolution: "@stablelib/binary@npm:1.0.1"
@@ -3484,7 +3507,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/debug@npm:^4.1.8":
+"@types/debug@npm:^4.1.12, @types/debug@npm:^4.1.8":
   version: 4.1.12
   resolution: "@types/debug@npm:4.1.12"
   dependencies:
@@ -3777,7 +3800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^9.0.2":
+"@types/uuid@npm:^9.0.2, @types/uuid@npm:^9.0.7":
   version: 9.0.7
   resolution: "@types/uuid@npm:9.0.7"
   checksum: c7321194aeba9ea173efd1e721403bdf4e7ae6945f8f8cdbc87c791f4b505ccf3dbc4a8883d90b394ef13b7c2dc778045792b05dbb23b3c746f8ea347804d448
@@ -11578,7 +11601,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^9.0.0":
+"uuid@npm:^9.0.0, uuid@npm:^9.0.1":
   version: 9.0.1
   resolution: "uuid@npm:9.0.1"
   bin: