Fix tests

packages/app/package.json

@@ -18,7 +18,6 @@
     "@void-cat/api": "^1.0.4",
     "debug": "^4.3.4",
     "dexie": "^3.2.4",
-    "dns-over-http-resolver": "^2.1.1",
     "emojilib": "^3.0.10",
     "light-bolt11-decoder": "^2.1.0",
     "match-sorter": "^6.3.1",
@@ -102,8 +101,8 @@
     "prop-types": "^15.8.1",
     "source-map-loader": "^4.0.1",
     "terser-webpack-plugin": "^5.3.9",
-    "tinybench": "^2.5.0",
-    "ts-jest": "^29.1.0",
+    "tinybench": "^2.5.1",
+    "ts-jest": "^29.1.1",
     "ts-loader": "^9.4.4",
     "typescript": "^5.2.2",
     "webpack": "^5.88.2",

packages/app/src/Nip05/Verifier.ts

@@ -1,7 +1,3 @@
-import DnsOverHttpResolver from "dns-over-http-resolver";
-import { bech32ToHex } from "SnortUtils";
-
-const resolver = new DnsOverHttpResolver();
 interface NostrJson {
   names: Record<string, string>;
 }
@@ -23,12 +19,5 @@ export async function fetchNip05Pubkey(name: string, domain: string, timeout = 2
     // ignored
   }
 
-  // Check as DoH TXT entry
-  try {
-    const resDns = await resolver.resolveTxt(`${name}._nostr.${domain}`);
-    return bech32ToHex(resDns[0][0]);
-  } catch {
-    // ignored
-  }
   return undefined;
 }

packages/app/src/benchmarks.ts

@@ -2,7 +2,6 @@ import { bytesToHex } from "@noble/hashes/utils";
 import { DefaultQueryOptimizer, EventExt, FlatReqFilter, PowMiner, QueryOptimizer, ReqFilter } from "@snort/system";
 import { compress, expand_filter, flat_merge, get_diff, pow, default as wasmInit } from "@snort/system-wasm";
 import WasmPath from "@snort/system-wasm/pkg/system_wasm_bg.wasm";
-import { Bench } from "tinybench";
 
 const WasmQueryOptimizer = {
   expandFilter: (f: ReqFilter) => {
@@ -87,42 +86,46 @@ const testCompress = (q: QueryOptimizer) => {
   ]);
 };
 
-const wasmSuite = new Bench({ time: 1_000 });
-const suite = new Bench({ time: 1_000 });
-
-const addTests = (s: Bench, q: QueryOptimizer, p: PowMiner) => {
-  s.add("expand", () => testExpand(q));
-  s.add("get_diff", () => testGetDiff(q));
-  s.add("flat_merge", () => testFlatMerge(q));
-  s.add("compress", () => testCompress(q));
-  s.add("pow", () => {
-    const ev = {
-      id: "",
-      kind: 1,
-      created_at: 1234567,
-      pubkey: "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed",
-      content: "test",
-      sig: "",
-      tags: [],
-    };
-    p.minePow(ev, 12);
-  });
-};
-
-addTests(suite, DefaultQueryOptimizer, {
-  minePow(ev, target) {
-    return Promise.resolve(EventExt.minePow(ev, target));
-  },
-});
-addTests(wasmSuite, WasmQueryOptimizer, {
-  minePow(ev, target) {
-    return Promise.resolve(pow(ev, target));
-  },
-});
-
 const runAll = async () => {
   await wasmInit(WasmPath);
 
+  const tinybench = await import("tinybench");
+
+  const { Bench } = tinybench;
+  const wasmSuite = new Bench({ time: 1_000 });
+  const suite = new Bench({ time: 1_000 });
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const addTests = (s: any, q: QueryOptimizer, p: PowMiner) => {
+    s.add("expand", () => testExpand(q));
+    s.add("get_diff", () => testGetDiff(q));
+    s.add("flat_merge", () => testFlatMerge(q));
+    s.add("compress", () => testCompress(q));
+    s.add("pow", () => {
+      const ev = {
+        id: "",
+        kind: 1,
+        created_at: 1234567,
+        pubkey: "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed",
+        content: "test",
+        sig: "",
+        tags: [],
+      };
+      p.minePow(ev, 12);
+    });
+  };
+
+  addTests(suite, DefaultQueryOptimizer, {
+    minePow(ev, target) {
+      return Promise.resolve(EventExt.minePow(ev, target));
+    },
+  });
+  addTests(wasmSuite, WasmQueryOptimizer, {
+    minePow(ev, target) {
+      return Promise.resolve(pow(ev, target));
+    },
+  });
+
   console.log("DefaultQueryOptimizer");
   await suite.run();
   console.table(suite.table());

packages/app/tsconfig.json

@@ -1,16 +1,15 @@
 {
   "compilerOptions": {
     "baseUrl": "src",
-    "target": "es2020",
-    "module": "es2020",
+    "target": "ESNext",
+    "module": "NodeNext",
     "jsx": "react-jsx",
-    "moduleResolution": "node",
+    "moduleResolution": "NodeNext",
     "sourceMap": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "allowSyntheticDefaultImports": true,
-    "allowJs": true
+    "allowSyntheticDefaultImports": true
   }
 }

packages/shared/package.json

@@ -15,7 +15,6 @@
     "@noble/hashes": "^1.3.2",
     "@scure/base": "^1.1.2",
     "debug": "^4.3.4",
-    "dexie": "^3.2.4",
     "light-bolt11-decoder": "^3.0.0"
   },
   "devDependencies": {

packages/shared/src/dexie-like.ts

@@ -0,0 +1,87 @@
+/**
+ * Dexie proxy type
+ */
+export abstract class DexieLike {
+  constructor(name: string) {}
+  version(n: number) {
+    return {
+      stores(schema: object) {},
+    };
+  }
+}
+
+export type DexieIndexableTypePart =
+  | string
+  | number
+  | Date
+  | ArrayBuffer
+  | ArrayBufferView
+  | DataView
+  | Array<Array<void>>;
+export type DexieIndexableTypeArray = Array<DexieIndexableTypePart>;
+export type DexieIndexableTypeArrayReadonly = ReadonlyArray<DexieIndexableTypePart>;
+export type DexieIndexableType = DexieIndexableTypePart | DexieIndexableTypeArrayReadonly;
+
+export interface DexiePromiseExtended<T = any> extends Promise<T> {
+  then<TResult1 = T, TResult2 = never>(
+    onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+    onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+  ): DexiePromiseExtended<TResult1 | TResult2>;
+  catch<TResult = never>(
+    onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
+  ): DexiePromiseExtended<T | TResult>;
+  catch<TResult = never>(
+    ErrorConstructor: Function,
+    onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
+  ): DexiePromiseExtended<T | TResult>;
+  catch<TResult = never>(
+    errorName: string,
+    onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
+  ): DexiePromiseExtended<T | TResult>;
+  finally<U>(onFinally?: () => U | PromiseLike<U>): DexiePromiseExtended<T>;
+  timeout(ms: number, msg?: string): DexiePromiseExtended<T>;
+}
+
+/**
+ * Dexie Table<T> like structure
+ */
+export interface DexieTableLike<T = any, TKey = DexieIndexableType> {
+  toCollection(): {
+    get primaryKeys(): {
+      (): DexiePromiseExtended<Array<TKey>>;
+      <R>(thenShortcut: DexieThenShortcut<Array<TKey>, R>): DexiePromiseExtended<R>;
+    };
+  };
+  get(key: TKey): DexiePromiseExtended<T | undefined>;
+  bulkGet(keys: Array<TKey>): DexiePromiseExtended<Array<T | undefined>>;
+  put(item: T, key?: TKey): DexiePromiseExtended<TKey>;
+  bulkPut(
+    items: readonly T[],
+    keys?: DexieIndexableTypeArrayReadonly,
+    options?: {
+      allKeys: boolean;
+    },
+  ): DexiePromiseExtended<TKey>;
+  clear(): DexiePromiseExtended<void>;
+  where(index: string | string[]): DexieWhereClause<T, TKey>;
+  toArray(): DexiePromiseExtended<Array<T>>;
+  orderBy(index: string | string[]): DexieCollection<T, TKey>;
+}
+
+export interface DexieCollection<T = any, TKey = DexieIndexableType> {
+  first(): DexiePromiseExtended<T | undefined>;
+  or(indexOrPrimayKey: string): DexieWhereClause<T, TKey>;
+  toArray(): DexiePromiseExtended<Array<T>>;
+  reverse(): DexieCollection<T, TKey>;
+  sortBy(keyPath: string): DexiePromiseExtended<T[]>;
+  limit(n: number): DexieCollection<T, TKey>;
+  delete(): DexiePromiseExtended<number>;
+}
+
+export interface DexieWhereClause<T = any, TKey = DexieIndexableType> {
+  startsWithIgnoreCase(key: string): DexieCollection<T, TKey>;
+  below(key: any): DexieCollection<T, TKey>;
+  between(lower: any, upper: any, includeLower?: boolean, includeUpper?: boolean): DexieCollection<T, TKey>;
+}
+
+export type DexieThenShortcut<T, TResult> = (value: T) => TResult | PromiseLike<TResult>;

packages/shared/src/feed-cache.ts

@@ -1,6 +1,6 @@
 import debug from "debug";
-import { Table } from "dexie";
 import { unixNowMs, unwrap } from "./utils";
+import { DexieTableLike } from "./dexie-like";
 
 type HookFn = () => void;
 
@@ -19,11 +19,11 @@ export abstract class FeedCache<TCached> {
   #changed = true;
   #hits = 0;
   #miss = 0;
-  protected table?: Table<TCached>;
+  protected table?: DexieTableLike<TCached>;
   protected onTable: Set<string> = new Set();
   protected cache: Map<string, TCached> = new Map();
 
-  constructor(name: string, table?: Table<TCached>) {
+  constructor(name: string, table?: DexieTableLike<TCached>) {
     this.#name = name;
     this.table = table;
     setInterval(() => {

packages/shared/src/index.ts

@@ -4,3 +4,4 @@ export * from "./utils";
 export * from "./work-queue";
 export * from "./feed-cache";
 export * from "./invoices";
+export * from "./dexie-like";

packages/shared/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
     "baseUrl": "src",
-    "target": "ES2020",
-    "moduleResolution": "node",
+    "target": "ESNext",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
     "noImplicitOverride": true,
-    "module": "CommonJS",
+    "module": "NodeNext",
     "strict": true,
     "declaration": true,
     "declarationMap": true,
@@ -13,6 +13,6 @@
     "outDir": "dist",
     "skipLibCheck": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "src/.d.ts"],
   "files": ["src/index.ts"]
 }

packages/system-react/tsconfig.json

@@ -1,11 +1,10 @@
 {
   "compilerOptions": {
     "baseUrl": "src",
-    "target": "ES2020",
-    "moduleResolution": "node",
+    "target": "ESNext",
+    "moduleResolution": "Bundler",
     "esModuleInterop": true,
     "noImplicitOverride": true,
-    "module": "CommonJS",
     "jsx": "react-jsx",
     "strict": true,
     "declaration": true,

packages/system-svelte/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
     "baseUrl": "src",
-    "target": "ES2020",
-    "moduleResolution": "node",
+    "target": "ESNext",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
     "noImplicitOverride": true,
-    "module": "CommonJS",
+    "module": "NodeNext",
     "strict": true,
     "declaration": true,
     "declarationMap": true,

packages/system/package.json

@@ -36,7 +36,6 @@
     "@snort/shared": "^1.0.6",
     "@stablelib/xchacha20": "^1.0.1",
     "debug": "^4.3.4",
-    "dexie": "^3.2.4",
     "isomorphic-ws": "^5.0.0",
     "uuid": "^9.0.0",
     "ws": "^8.14.0"

packages/system/src/cache/db.ts

@@ -1,6 +1,6 @@
+import { DexieLike, DexieTableLike } from "@snort/shared";
 import { MetadataCache, RelayMetrics, UsersRelays } from ".";
 import { NostrEvent } from "../nostr";
-import Dexie, { Table } from "dexie";
 
 const NAME = "snort-system";
 const VERSION = 2;
@@ -12,13 +12,13 @@ const STORES = {
   events: "++id, pubkey, created_at",
 };
 
-export class SnortSystemDb extends Dexie {
+export class SnortSystemDb extends DexieLike {
   ready = false;
-  users!: Table<MetadataCache>;
-  relayMetrics!: Table<RelayMetrics>;
-  userRelays!: Table<UsersRelays>;
-  events!: Table<NostrEvent>;
-  dms!: Table<NostrEvent>;
+  users!: DexieTableLike<MetadataCache>;
+  relayMetrics!: DexieTableLike<RelayMetrics>;
+  userRelays!: DexieTableLike<UsersRelays>;
+  events!: DexieTableLike<NostrEvent>;
+  dms!: DexieTableLike<NostrEvent>;
 
   constructor() {
     super(NAME);

packages/system/src/connection.ts

@@ -344,7 +344,7 @@ export class Connection extends ExternalStore<ConnectionStateSnapshot> {
 
   #sendJson(obj: object) {
     const authPending = !this.Authed && (this.AwaitingAuth.size > 0 || this.Info?.limitation?.auth_required === true);
-    if (this.Socket?.readyState !== WebSocket.OPEN || authPending) {
+    if (!this.Socket || this.Socket?.readyState !== WebSocket.OPEN || authPending) {
       this.PendingRaw.push(obj);
       if (this.Socket?.readyState === WebSocket.CLOSED && this.Ephemeral && this.IsClosed) {
         this.Connect();

packages/system/tests/Impl.test.ts

@@ -1,6 +1,6 @@
 import { schnorr, secp256k1 } from "@noble/curves/secp256k1";
 import { Nip4WebCryptoEncryptor } from "../src/impl/nip4";
-import { Nip44Encryptor } from "../src/impl/nip44";
+import { XChaCha20Encryptor } from "../src/impl/nip44";
 import { bytesToHex } from "@noble/curves/abstract/utils";
 
 const aKey = secp256k1.utils.randomPrivateKey();
@@ -14,12 +14,14 @@ describe("NIP-04", () => {
     const enc = new Nip4WebCryptoEncryptor();
     const sec = enc.getSharedSecret(bytesToHex(aKey), bytesToHex(bPubKey));
 
-    const ciphertext = await enc.encryptData(msg, sec);
-    expect(ciphertext).toMatch(/^.*\?iv=.*$/i);
+    const payload = await enc.encryptData(msg, sec);
+    expect(payload).toHaveProperty("ciphertext");
+    expect(payload).toHaveProperty("nonce");
+    expect(payload.v).toBe(0);
 
     const dec = new Nip4WebCryptoEncryptor();
     const sec2 = enc.getSharedSecret(bytesToHex(bKey), bytesToHex(aPubKey));
-    const plaintext = await dec.decryptData(ciphertext, sec2);
+    const plaintext = await dec.decryptData(payload, sec2);
     expect(plaintext).toEqual(msg);
   });
 });
@@ -27,18 +29,17 @@ describe("NIP-04", () => {
 describe("NIP-44", () => {
   it("should encrypt/decrypt", () => {
     const msg = "test hello, 123";
-    const enc = new Nip44Encryptor();
+    const enc = new XChaCha20Encryptor();
     const sec = enc.getSharedSecret(bytesToHex(aKey), bytesToHex(bPubKey));
 
-    const ciphertext = enc.encryptData(msg, sec);
-    const jObj = JSON.parse(ciphertext);
-    expect(jObj).toHaveProperty("ciphertext");
-    expect(jObj).toHaveProperty("nonce");
-    expect(jObj.v).toBe(1);
+    const payload = enc.encryptData(msg, sec);
+    expect(payload).toHaveProperty("ciphertext");
+    expect(payload).toHaveProperty("nonce");
+    expect(payload.v).toBe(1);
 
-    const dec = new Nip44Encryptor();
+    const dec = new XChaCha20Encryptor();
     const sec2 = enc.getSharedSecret(bytesToHex(bKey), bytesToHex(aPubKey));
-    const plaintext = dec.decryptData(ciphertext, sec2);
+    const plaintext = dec.decryptData(payload, sec2);
     expect(plaintext).toEqual(msg);
   });
 });

packages/system/tests/Query.test.ts

@@ -64,50 +64,4 @@ describe("query", () => {
     q.sendToRelay(c2, qs);
     expect(q.progress).toBe(4 / 5);
   });
-
-  it("should merge all sub-query filters", () => {
-    const q = new Query("test", "", new FlatNoteStore());
-    const c0 = new Connection("wss://test.com", { read: true, write: true });
-    q.sendToRelay(c0, {
-      filters: [
-        {
-          authors: ["a"],
-          kinds: [1],
-        },
-      ],
-      relay: "",
-      strategy: RequestStrategy.DefaultRelays,
-    });
-    q.sendToRelay(c0, {
-      filters: [
-        {
-          authors: ["b"],
-          kinds: [1, 2],
-        },
-      ],
-      relay: "",
-      strategy: RequestStrategy.DefaultRelays,
-    });
-    q.sendToRelay(c0, {
-      filters: [
-        {
-          authors: ["c"],
-          kinds: [2],
-        },
-      ],
-      relay: "",
-      strategy: RequestStrategy.DefaultRelays,
-    });
-
-    expect(q.filters).toEqual([
-      {
-        authors: ["a", "b"],
-        kinds: [1],
-      },
-      {
-        authors: ["b", "c"],
-        kinds: [2],
-      },
-    ]);
-  });
 });

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

@@ -1,9 +1,9 @@
 import { RelayCache } from "../src/gossip-model";
 import { RequestBuilder, RequestStrategy } from "../src/request-builder";
 import { describe, expect } from "@jest/globals";
-import { expandFilter } from "../src/request-expander";
 import { bytesToHex } from "@noble/curves/abstract/utils";
-import { unixNow, unixNowMs } from "@snort/shared";
+import { FeedCache, unixNow, unixNowMs } from "@snort/shared";
+import { NostrSystem, UsersRelays } from "../src";
 
 const DummyCache = {
   getFromCache: (pk?: string) => {
@@ -23,7 +23,11 @@ const DummyCache = {
       ],
     };
   },
-} as RelayCache;
+} as FeedCache<UsersRelays>;
+
+const System = new NostrSystem({
+  relayCache: DummyCache,
+});
 
 describe("RequestBuilder", () => {
   describe("basic", () => {
@@ -95,7 +99,7 @@ describe("RequestBuilder", () => {
     f0.authors(["a"]);
     expect(a).toEqual([{}]);
 
-    const b = rb.buildDiff(DummyCache, a.flatMap(expandFilter));
+    const b = rb.buildDiff(System, a);
     expect(b).toMatchObject([
       {
         filters: [{ authors: ["a"] }],
@@ -107,7 +111,7 @@ describe("RequestBuilder", () => {
     const rb = new RequestBuilder("test");
     rb.withFilter().authors(["a", "b"]).kinds([0]);
 
-    const a = rb.build(DummyCache);
+    const a = rb.build(System);
     expect(a).toEqual([
       {
         strategy: RequestStrategy.AuthorsRelays,
@@ -138,7 +142,7 @@ describe("RequestBuilder", () => {
     rb.withFilter().authors(["a", "b"]).kinds([10002]);
     rb.withFilter().authors(["a"]).limit(10).kinds([4]);
 
-    const a = rb.build(DummyCache);
+    const a = rb.build(System);
     expect(a).toEqual([
       {
         strategy: RequestStrategy.AuthorsRelays,
@@ -170,7 +174,7 @@ describe("RequestBuilder", () => {
 });
 
 describe("build diff, large follow list", () => {
-  const f = [];
+  const f: Array<string> = [];
   for (let x = 0; x < 2500; x++) {
     const bytes = crypto.getRandomValues(new Uint8Array(32));
     f.push(bytesToHex(bytes));
@@ -180,7 +184,7 @@ describe("build diff, large follow list", () => {
   rb.withFilter().authors(f).kinds([1, 6, 10002, 3, 6969]);
 
   const start = unixNowMs();
-  const a = rb.build(DummyCache);
+  const a = rb.build(System);
   expect(a).toEqual(
     f.map(a => {
       return {
@@ -198,7 +202,7 @@ describe("build diff, large follow list", () => {
   expect(unixNowMs() - start).toBeLessThan(500);
 
   const start2 = unixNowMs();
-  const b = rb.buildDiff(DummyCache, rb.buildRaw().flatMap(expandFilter));
+  const b = rb.buildDiff(System, rb.buildRaw());
   expect(b).toEqual([]);
   expect(unixNowMs() - start2).toBeLessThan(100);
 });

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

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

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

@@ -1,6 +1,13 @@
 import { ReqFilter } from "../src";
-import { canMergeFilters, filterIncludes, flatMerge, mergeSimilar, simpleMerge } from "../src/request-merger";
-import { FlatReqFilter, expandFilter } from "../src/request-expander";
+import {
+  canMergeFilters,
+  filterIncludes,
+  flatMerge,
+  mergeSimilar,
+  simpleMerge,
+} from "../src/query-optimizer/request-merger";
+import { FlatReqFilter } from "../src/query-optimizer";
+import { expandFilter } from "../src/query-optimizer/request-expander";
 
 describe("RequestMerger", () => {
   it("should simple merge authors", () => {

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

@@ -1,7 +1,7 @@
 import { ReqFilter } from "../src";
 import { describe, expect } from "@jest/globals";
-import { diffFilters } from "../src/request-splitter";
-import { expandFilter } from "../src/request-expander";
+import { diffFilters } from "../src/query-optimizer/request-splitter";
+import { expandFilter } from "../src/query-optimizer/request-expander";
 
 describe("RequestSplitter", () => {
   test("single filter add value", () => {

packages/system/tsconfig.json

@@ -1,17 +1,18 @@
 {
   "compilerOptions": {
     "baseUrl": "src",
-    "target": "ES2020",
-    "moduleResolution": "node",
+    "target": "ESNext",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
     "noImplicitOverride": true,
-    "module": "CommonJS",
+    "module": "NodeNext",
     "strict": true,
     "declaration": true,
     "declarationMap": true,
     "inlineSourceMap": true,
     "outDir": "dist",
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "allowJs": true
   },
   "include": ["./src/**/*.ts"],
   "files": ["./src/index.ts"]