nostr-tools 2.23.12 → 2.24.0

package/lib/cjs/wasm.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../wasm.ts", "../../core.ts"],
-  "sourcesContent": ["import { bytesToHex } from '@noble/hashes/utils.js'\nimport { Nostr as NostrWasm } from 'nostr-wasm'\nimport { EventTemplate, Event, Nostr, VerifiedEvent, verifiedSymbol } from './core.ts'\n\nlet nw: NostrWasm\n\nexport function setNostrWasm(x: NostrWasm) {\n  nw = x\n}\n\nclass Wasm implements Nostr {\n  generateSecretKey(): Uint8Array {\n    return nw.generateSecretKey()\n  }\n  getPublicKey(secretKey: Uint8Array): string {\n    return bytesToHex(nw.getPublicKey(secretKey))\n  }\n  finalizeEvent(t: EventTemplate, secretKey: Uint8Array): VerifiedEvent {\n    nw.finalizeEvent(t as any, secretKey)\n    return t as VerifiedEvent\n  }\n  verifyEvent(event: Event): event is VerifiedEvent {\n    try {\n      nw.verifyEvent(event)\n      event[verifiedSymbol] = true\n      return true\n    } catch (err) {\n      return false\n    }\n  }\n}\n\nconst i: Wasm = new Wasm()\nexport const generateSecretKey = i.generateSecretKey\nexport const getPublicKey = i.getPublicKey\nexport const finalizeEvent = i.finalizeEvent\nexport const verifyEvent = i.verifyEvent\nexport * from './core.ts'\n", "export interface Nostr {\n  generateSecretKey(): Uint8Array\n  getPublicKey(secretKey: Uint8Array): string\n  finalizeEvent(event: EventTemplate, secretKey: Uint8Array): VerifiedEvent\n  verifyEvent(event: Event): event is VerifiedEvent\n}\n\n/** Designates a verified event signature. */\nexport const verifiedSymbol = Symbol('verified')\n\nexport type NostrEvent = {\n  kind: number\n  tags: string[][]\n  content: string\n  created_at: number\n  pubkey: string\n  id: string\n  sig: string\n  [verifiedSymbol]?: boolean\n}\n\nexport type Event = NostrEvent\nexport type EventTemplate = Pick<Event, 'kind' | 'tags' | 'content' | 'created_at'>\nexport type UnsignedEvent = Pick<Event, 'kind' | 'tags' | 'content' | 'created_at' | 'pubkey'>\n\n/** An event whose signature has been verified. */\nexport interface VerifiedEvent extends Event {\n  [verifiedSymbol]: true\n}\n\nconst isRecord = (obj: unknown): obj is Record<string, unknown> => obj instanceof Object\n\nexport function validateEvent<T>(event: T): event is T & UnsignedEvent {\n  if (!isRecord(event)) return false\n  if (typeof event.kind !== 'number') return false\n  if (typeof event.content !== 'string') return false\n  if (typeof event.created_at !== 'number') return false\n  if (typeof event.pubkey !== 'string') return false\n  if (!event.pubkey.match(/^[a-f0-9]{64}$/)) return false\n\n  if (!Array.isArray(event.tags)) return false\n  for (let i = 0; i < event.tags.length; i++) {\n    let tag = event.tags[i]\n    if (!Array.isArray(tag)) return false\n    for (let j = 0; j < tag.length; j++) {\n      if (typeof tag[j] !== 'string') return false\n    }\n  }\n\n  return true\n}\n\n/**\n * Sort events in reverse-chronological order by the `created_at` timestamp,\n * and then by the event `id` (lexicographically) in case of ties.\n * This mutates the array.\n */\nexport function sortEvents(events: Event[]): Event[] {\n  return events.sort((a: NostrEvent, b: NostrEvent): number => {\n    if (a.created_at !== b.created_at) {\n      return b.created_at - a.created_at\n    }\n    return a.id.localeCompare(b.id)\n  })\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B;;;ACQpB,IAAM,iBAAiB,OAAO,UAAU;AAsB/C,IAAM,WAAW,CAAC,QAAiD,eAAe;AAE3E,SAAS,cAAiB,OAAsC;AACrE,MAAI,CAAC,SAAS,KAAK;AAAG,WAAO;AAC7B,MAAI,OAAO,MAAM,SAAS;AAAU,WAAO;AAC3C,MAAI,OAAO,MAAM,YAAY;AAAU,WAAO;AAC9C,MAAI,OAAO,MAAM,eAAe;AAAU,WAAO;AACjD,MAAI,OAAO,MAAM,WAAW;AAAU,WAAO;AAC7C,MAAI,CAAC,MAAM,OAAO,MAAM,gBAAgB;AAAG,WAAO;AAElD,MAAI,CAAC,MAAM,QAAQ,MAAM,IAAI;AAAG,WAAO;AACvC,WAASA,KAAI,GAAGA,KAAI,MAAM,KAAK,QAAQA,MAAK;AAC1C,QAAI,MAAM,MAAM,KAAKA;AACrB,QAAI,CAAC,MAAM,QAAQ,GAAG;AAAG,aAAO;AAChC,aAAS,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK;AACnC,UAAI,OAAO,IAAI,OAAO;AAAU,eAAO;AAAA,IACzC;AAAA,EACF;AAEA,SAAO;AACT;AAOO,SAAS,WAAW,QAA0B;AACnD,SAAO,OAAO,KAAK,CAAC,GAAe,MAA0B;AAC3D,QAAI,EAAE,eAAe,EAAE,YAAY;AACjC,aAAO,EAAE,aAAa,EAAE;AAAA,IAC1B;AACA,WAAO,EAAE,GAAG,cAAc,EAAE,EAAE;AAAA,EAChC,CAAC;AACH;;;AD5DA,IAAI;AAEG,SAAS,aAAa,GAAc;AACzC,OAAK;AACP;AAEA,IAAM,OAAN,MAA4B;AAAA,EAC1B,oBAAgC;AAC9B,WAAO,GAAG,kBAAkB;AAAA,EAC9B;AAAA,EACA,aAAa,WAA+B;AAC1C,eAAO,yBAAW,GAAG,aAAa,SAAS,CAAC;AAAA,EAC9C;AAAA,EACA,cAAc,GAAkB,WAAsC;AACpE,OAAG,cAAc,GAAU,SAAS;AACpC,WAAO;AAAA,EACT;AAAA,EACA,YAAY,OAAsC;AAChD,QAAI;AACF,SAAG,YAAY,KAAK;AACpB,YAAM,kBAAkB;AACxB,aAAO;AAAA,IACT,SAAS,KAAP;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,IAAM,IAAU,IAAI,KAAK;AAClB,IAAM,oBAAoB,EAAE;AAC5B,IAAM,eAAe,EAAE;AACvB,IAAM,gBAAgB,EAAE;AACxB,IAAM,cAAc,EAAE;",
-  "names": ["i"]
+  "sources": ["../../wasm.ts", "../../utils.ts", "../../core.ts"],
+  "sourcesContent": ["import { bytesToHex } from '@noble/hashes/utils.js'\nimport { Nostr as NostrWasm } from 'nostr-wasm'\nimport { EventTemplate, Event, Nostr, VerifiedEvent, verifiedSymbol } from './core.ts'\n\nlet nw: NostrWasm\n\nexport function setNostrWasm(x: NostrWasm) {\n  nw = x\n}\n\nclass Wasm implements Nostr {\n  generateSecretKey(): Uint8Array {\n    return nw.generateSecretKey()\n  }\n  getPublicKey(secretKey: Uint8Array): string {\n    return bytesToHex(nw.getPublicKey(secretKey))\n  }\n  finalizeEvent(t: EventTemplate, secretKey: Uint8Array): VerifiedEvent {\n    nw.finalizeEvent(t as any, secretKey)\n    return t as VerifiedEvent\n  }\n  verifyEvent(event: Event): event is VerifiedEvent {\n    try {\n      nw.verifyEvent(event)\n      event[verifiedSymbol] = true\n      return true\n    } catch (err) {\n      return false\n    }\n  }\n}\n\nconst i: Wasm = new Wasm()\nexport const generateSecretKey = i.generateSecretKey\nexport const getPublicKey = i.getPublicKey\nexport const finalizeEvent = i.finalizeEvent\nexport const verifyEvent = i.verifyEvent\nexport * from './core.ts'\n", "import type { NostrEvent } from './core.ts'\n\nexport const utf8Decoder: TextDecoder = new TextDecoder('utf-8')\nexport const utf8Encoder: TextEncoder = new TextEncoder()\n\nexport { bytesToHex, hexToBytes } from '@noble/hashes/utils.js'\n\nexport function normalizeURL(url: string): string {\n  try {\n    if (url.indexOf('://') === -1) url = 'wss://' + url\n    let p = new URL(url)\n    if (p.protocol === 'http:') p.protocol = 'ws:'\n    else if (p.protocol === 'https:') p.protocol = 'wss:'\n    p.pathname = p.pathname.replace(/\\/+/g, '/')\n    if (p.pathname.endsWith('/')) p.pathname = p.pathname.slice(0, -1)\n    if ((p.port === '80' && p.protocol === 'ws:') || (p.port === '443' && p.protocol === 'wss:')) p.port = ''\n    p.searchParams.sort()\n    p.hash = ''\n    return p.toString()\n  } catch (e) {\n    throw new Error(`Invalid URL: ${url}`)\n  }\n}\n\nexport function insertEventIntoDescendingList(sortedArray: NostrEvent[], event: NostrEvent): NostrEvent[] {\n  const [idx, found] = binarySearch(sortedArray, b => {\n    if (event.id === b.id) return 0\n    if (event.created_at === b.created_at) return -1\n    return b.created_at - event.created_at\n  })\n  if (!found) {\n    sortedArray.splice(idx, 0, event)\n  }\n  return sortedArray\n}\n\nexport function insertEventIntoAscendingList(sortedArray: NostrEvent[], event: NostrEvent): NostrEvent[] {\n  const [idx, found] = binarySearch(sortedArray, b => {\n    if (event.id === b.id) return 0\n    if (event.created_at === b.created_at) return -1\n    return event.created_at - b.created_at\n  })\n  if (!found) {\n    sortedArray.splice(idx, 0, event)\n  }\n  return sortedArray\n}\n\nexport function binarySearch<T>(arr: T[], compare: (b: T) => number): [number, boolean] {\n  let start = 0\n  let end = arr.length - 1\n\n  while (start <= end) {\n    const mid = Math.floor((start + end) / 2)\n    const cmp = compare(arr[mid])\n\n    if (cmp === 0) {\n      return [mid, true]\n    }\n\n    if (cmp < 0) {\n      end = mid - 1\n    } else {\n      start = mid + 1\n    }\n  }\n\n  return [start, false]\n}\n\nexport function mergeReverseSortedLists(list1: NostrEvent[], list2: NostrEvent[]): NostrEvent[] {\n  const result: NostrEvent[] = new Array(list1.length + list2.length)\n  result.length = 0\n  let i1 = 0\n  let i2 = 0\n  let sameTimestampIds: string[] = []\n\n  while (i1 < list1.length && i2 < list2.length) {\n    let next: NostrEvent\n    if (list1[i1]?.created_at > list2[i2]?.created_at) {\n      next = list1[i1]\n      i1++\n    } else {\n      next = list2[i2]\n      i2++\n    }\n\n    if (result.length > 0 && result[result.length - 1].created_at === next.created_at) {\n      if (sameTimestampIds.includes(next.id)) continue\n    } else {\n      sameTimestampIds.length = 0\n    }\n\n    result.push(next)\n    sameTimestampIds.push(next.id)\n  }\n\n  while (i1 < list1.length) {\n    const next = list1[i1]\n    i1++\n\n    if (result.length > 0 && result[result.length - 1].created_at === next.created_at) {\n      if (sameTimestampIds.includes(next.id)) continue\n    } else {\n      sameTimestampIds.length = 0\n    }\n    result.push(next)\n    sameTimestampIds.push(next.id)\n  }\n\n  while (i2 < list2.length) {\n    const next = list2[i2]\n    i2++\n\n    if (result.length > 0 && result[result.length - 1].created_at === next.created_at) {\n      if (sameTimestampIds.includes(next.id)) continue\n    } else {\n      sameTimestampIds.length = 0\n    }\n    result.push(next)\n    sameTimestampIds.push(next.id)\n  }\n\n  return result\n}\n\n/**\n * Checks if a string is a 64-char lowercase hex string as most Nostr ids and pubkeys.\n */\nexport function isHex32(input: string): boolean {\n  for (let i = 0; i < 64; i++) {\n    let cc = input.charCodeAt(i)\n    if (isNaN(cc) || cc < 48 || cc > 102 || (cc > 57 && cc < 97)) {\n      return false\n    }\n  }\n  return true\n}\n", "import { isHex32 } from './utils.ts'\n\nexport interface Nostr {\n  generateSecretKey(): Uint8Array\n  getPublicKey(secretKey: Uint8Array): string\n  finalizeEvent(event: EventTemplate, secretKey: Uint8Array): VerifiedEvent\n  verifyEvent(event: Event): event is VerifiedEvent\n}\n\n/** Designates a verified event signature. */\nexport const verifiedSymbol = Symbol('verified')\n\nexport type NostrEvent = {\n  kind: number\n  tags: string[][]\n  content: string\n  created_at: number\n  pubkey: string\n  id: string\n  sig: string\n  [verifiedSymbol]?: boolean\n}\n\nexport type Event = NostrEvent\nexport type EventTemplate = Pick<Event, 'kind' | 'tags' | 'content' | 'created_at'>\nexport type UnsignedEvent = Pick<Event, 'kind' | 'tags' | 'content' | 'created_at' | 'pubkey'>\n\n/** An event whose signature has been verified. */\nexport interface VerifiedEvent extends Event {\n  [verifiedSymbol]: true\n}\n\nconst isRecord = (obj: unknown): obj is Record<string, unknown> => obj instanceof Object\n\nexport function validateEvent<T>(event: T): event is T & UnsignedEvent {\n  if (!isRecord(event)) return false\n  if (typeof event.kind !== 'number') return false\n  if (typeof event.content !== 'string') return false\n  if (typeof event.created_at !== 'number') return false\n  if (typeof event.pubkey !== 'string') return false\n  if (!isHex32(event.pubkey)) return false\n\n  if (!Array.isArray(event.tags)) return false\n  for (let i = 0; i < event.tags.length; i++) {\n    let tag = event.tags[i]\n    if (!Array.isArray(tag)) return false\n    for (let j = 0; j < tag.length; j++) {\n      if (typeof tag[j] !== 'string') return false\n    }\n  }\n\n  return true\n}\n\n/**\n * Sort events in reverse-chronological order by the `created_at` timestamp,\n * and then by the event `id` (lexicographically) in case of ties.\n * This mutates the array.\n */\nexport function sortEvents(events: Event[]): Event[] {\n  return events.sort((a: NostrEvent, b: NostrEvent): number => {\n    if (a.created_at !== b.created_at) {\n      return b.created_at - a.created_at\n    }\n    return a.id.localeCompare(b.id)\n  })\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAAA,gBAA2B;;;ACK3B,mBAAuC;AAHhC,IAAM,cAA2B,IAAI,YAAY,OAAO;AACxD,IAAM,cAA2B,IAAI,YAAY;AA8HjD,SAAS,QAAQ,OAAwB;AAC9C,WAASC,KAAI,GAAGA,KAAI,IAAIA,MAAK;AAC3B,QAAI,KAAK,MAAM,WAAWA,EAAC;AAC3B,QAAI,MAAM,EAAE,KAAK,KAAK,MAAM,KAAK,OAAQ,KAAK,MAAM,KAAK,IAAK;AAC5D,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;;;AC/HO,IAAM,iBAAiB,OAAO,UAAU;AAsB/C,IAAM,WAAW,CAAC,QAAiD,eAAe;AAE3E,SAAS,cAAiB,OAAsC;AACrE,MAAI,CAAC,SAAS,KAAK;AAAG,WAAO;AAC7B,MAAI,OAAO,MAAM,SAAS;AAAU,WAAO;AAC3C,MAAI,OAAO,MAAM,YAAY;AAAU,WAAO;AAC9C,MAAI,OAAO,MAAM,eAAe;AAAU,WAAO;AACjD,MAAI,OAAO,MAAM,WAAW;AAAU,WAAO;AAC7C,MAAI,CAAC,QAAQ,MAAM,MAAM;AAAG,WAAO;AAEnC,MAAI,CAAC,MAAM,QAAQ,MAAM,IAAI;AAAG,WAAO;AACvC,WAASC,KAAI,GAAGA,KAAI,MAAM,KAAK,QAAQA,MAAK;AAC1C,QAAI,MAAM,MAAM,KAAKA;AACrB,QAAI,CAAC,MAAM,QAAQ,GAAG;AAAG,aAAO;AAChC,aAAS,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK;AACnC,UAAI,OAAO,IAAI,OAAO;AAAU,eAAO;AAAA,IACzC;AAAA,EACF;AAEA,SAAO;AACT;AAOO,SAAS,WAAW,QAA0B;AACnD,SAAO,OAAO,KAAK,CAAC,GAAe,MAA0B;AAC3D,QAAI,EAAE,eAAe,EAAE,YAAY;AACjC,aAAO,EAAE,aAAa,EAAE;AAAA,IAC1B;AACA,WAAO,EAAE,GAAG,cAAc,EAAE,EAAE;AAAA,EAChC,CAAC;AACH;;;AF9DA,IAAI;AAEG,SAAS,aAAa,GAAc;AACzC,OAAK;AACP;AAEA,IAAM,OAAN,MAA4B;AAAA,EAC1B,oBAAgC;AAC9B,WAAO,GAAG,kBAAkB;AAAA,EAC9B;AAAA,EACA,aAAa,WAA+B;AAC1C,eAAO,0BAAW,GAAG,aAAa,SAAS,CAAC;AAAA,EAC9C;AAAA,EACA,cAAc,GAAkB,WAAsC;AACpE,OAAG,cAAc,GAAU,SAAS;AACpC,WAAO;AAAA,EACT;AAAA,EACA,YAAY,OAAsC;AAChD,QAAI;AACF,SAAG,YAAY,KAAK;AACpB,YAAM,kBAAkB;AACxB,aAAO;AAAA,IACT,SAAS,KAAP;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,IAAM,IAAU,IAAI,KAAK;AAClB,IAAM,oBAAoB,EAAE;AAC5B,IAAM,eAAe,EAAE;AACvB,IAAM,gBAAgB,EAAE;AACxB,IAAM,cAAc,EAAE;",
+  "names": ["import_utils", "i", "i"]
 }

package/lib/esm/abstract-pool.js

@@ -1,6 +1,3 @@
-// core.ts
-var verifiedSymbol = Symbol("verified");
-
 // utils.ts
 import { bytesToHex, hexToBytes } from "@noble/hashes/utils.js";
 var utf8Decoder = new TextDecoder("utf-8");
@@ -471,7 +468,7 @@ var AbstractRelay = class {
         case "EVENT": {
           const so = this.openSubs.get(data[1]);
           const event = data[2];
-          if (this.verifyEvent(event) && matchFilters(so.filters, event)) {
+          if (matchFilters(so.filters, event) && this.verifyEvent(event, this.url)) {
             so.onevent(event);
           } else {
             so.oninvalidevent?.(event);
@@ -627,12 +624,6 @@ var Subscription = class {
   }
 };
 
-// helpers.ts
-var alwaysTrue = (t) => {
-  t[verifiedSymbol] = true;
-  return true;
-};
-
 // nip45.ts
 import { sha256 } from "@noble/hashes/sha2.js";
 import { bytesToHex as bytesToHex2 } from "@noble/hashes/utils.js";
@@ -659,7 +650,7 @@ function newHll() {
   return new Uint8Array(M);
 }
 function hllDecode(hex) {
-  if (hex.length !== HLL_HEX_LENGTH || !/^[0-9a-fA-F]+$/.test(hex))
+  if (hex.length !== HLL_HEX_LENGTH || !/^[0-9a-f]+$/.test(hex))
     return void 0;
   const registers = new Uint8Array(M);
   for (let i = 0; i < M; i++) {
@@ -700,7 +691,6 @@ var AbstractSimplePool = class {
   enableReconnect;
   idleTimeout = 2e4;
   automaticallyAuth;
-  trustedRelayURLs = /* @__PURE__ */ new Set();
   onRelayConnectionFailure;
   onRelayConnectionSuccess;
   allowConnectingToRelay;
@@ -724,7 +714,7 @@ var AbstractSimplePool = class {
     let relay = this.relays.get(url);
     if (!relay) {
       relay = new AbstractRelay(url, {
-        verifyEvent: this.trustedRelayURLs.has(url) ? alwaysTrue : this.verifyEvent,
+        verifyEvent: this.verifyEvent,
         websocketImplementation: this._WebSocket,
         enablePing: this.enablePing,
         enableReconnect: this.enableReconnect,
@@ -808,11 +798,11 @@ var AbstractSimplePool = class {
       }
     };
     const closesReceived = [];
-    let handleClose = (i, reason) => {
+    let handleClose = (i, url, reason) => {
       if (closesReceived[i])
         return;
       handleEose(i);
-      closesReceived[i] = reason;
+      closesReceived[i] = { url, reason };
       if (closesReceived.filter((a) => a).length === groupedRequests.length) {
         params.onclose?.(closesReceived);
         handleClose = () => {
@@ -830,7 +820,7 @@ var AbstractSimplePool = class {
     const allOpened = Promise.all(
       groupedRequests.map(async ({ url, filters }, i) => {
         if (this.allowConnectingToRelay?.(url, ["read", filters]) === false) {
-          handleClose(i, "connection skipped by allowConnectingToRelay");
+          handleClose(i, url, "connection skipped by allowConnectingToRelay");
           return;
         }
         let relay;
@@ -841,7 +831,7 @@ var AbstractSimplePool = class {
           });
         } catch (err) {
           this.onRelayConnectionFailure?.(url);
-          handleClose(i, err?.message || String(err));
+          handleClose(i, url, err?.message || String(err));
           return;
         }
         this.onRelayConnectionSuccess?.(url);
@@ -855,17 +845,17 @@ var AbstractSimplePool = class {
                   ...params,
                   oneose: () => handleEose(i),
                   onclose: (reason2) => {
-                    handleClose(i, reason2);
+                    handleClose(i, url, reason2);
                   },
                   alreadyHaveEvent: localAlreadyHaveEventHandler,
                   eoseTimeout: params.maxWait,
                   abort: params.abort
                 });
               }).catch((err) => {
-                handleClose(i, `auth was required and attempted, but failed with: ${err}`);
+                handleClose(i, url, `auth was required and attempted, but failed with: ${err}`);
               });
             } else {
-              handleClose(i, reason);
+              handleClose(i, url, reason);
             }
           },
           alreadyHaveEvent: localAlreadyHaveEventHandler,
@@ -893,7 +883,7 @@ var AbstractSimplePool = class {
         if (subcloser)
           subcloser.close(reason);
         else
-          params.onclose?.(relays.map((_) => reason));
+          params.onclose?.(relays.map((url) => ({ url, reason })));
       }
     });
     return subcloser;