nostr-tools 2.23.12 → 2.24.0

package/lib/esm/index.js

@@ -8,47 +8,6 @@ var __export = (target, all) => {
 import { schnorr } from "@noble/curves/secp256k1.js";
 import { bytesToHex as bytesToHex2, hexToBytes as hexToBytes2 } from "@noble/hashes/utils.js";
 
-// core.ts
-var verifiedSymbol = Symbol("verified");
-var isRecord = (obj) => obj instanceof Object;
-function validateEvent(event) {
-  if (!isRecord(event))
-    return false;
-  if (typeof event.kind !== "number")
-    return false;
-  if (typeof event.content !== "string")
-    return false;
-  if (typeof event.created_at !== "number")
-    return false;
-  if (typeof event.pubkey !== "string")
-    return false;
-  if (!event.pubkey.match(/^[a-f0-9]{64}$/))
-    return false;
-  if (!Array.isArray(event.tags))
-    return false;
-  for (let i2 = 0; i2 < event.tags.length; i2++) {
-    let tag = event.tags[i2];
-    if (!Array.isArray(tag))
-      return false;
-    for (let j = 0; j < tag.length; j++) {
-      if (typeof tag[j] !== "string")
-        return false;
-    }
-  }
-  return true;
-}
-function sortEvents(events) {
-  return events.sort((a, b) => {
-    if (a.created_at !== b.created_at) {
-      return b.created_at - a.created_at;
-    }
-    return a.id.localeCompare(b.id);
-  });
-}
-
-// pure.ts
-import { sha256 } from "@noble/hashes/sha2.js";
-
 // utils.ts
 var utils_exports = {};
 __export(utils_exports, {
@@ -57,6 +16,7 @@ __export(utils_exports, {
   hexToBytes: () => hexToBytes,
   insertEventIntoAscendingList: () => insertEventIntoAscendingList,
   insertEventIntoDescendingList: () => insertEventIntoDescendingList,
+  isHex32: () => isHex32,
   mergeReverseSortedLists: () => mergeReverseSortedLists,
   normalizeURL: () => normalizeURL,
   utf8Decoder: () => utf8Decoder,
@@ -179,8 +139,56 @@ function mergeReverseSortedLists(list1, list2) {
   }
   return result;
 }
+function isHex32(input) {
+  for (let i2 = 0; i2 < 64; i2++) {
+    let cc = input.charCodeAt(i2);
+    if (isNaN(cc) || cc < 48 || cc > 102 || cc > 57 && cc < 97) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// core.ts
+var verifiedSymbol = Symbol("verified");
+var isRecord = (obj) => obj instanceof Object;
+function validateEvent(event) {
+  if (!isRecord(event))
+    return false;
+  if (typeof event.kind !== "number")
+    return false;
+  if (typeof event.content !== "string")
+    return false;
+  if (typeof event.created_at !== "number")
+    return false;
+  if (typeof event.pubkey !== "string")
+    return false;
+  if (!isHex32(event.pubkey))
+    return false;
+  if (!Array.isArray(event.tags))
+    return false;
+  for (let i2 = 0; i2 < event.tags.length; i2++) {
+    let tag = event.tags[i2];
+    if (!Array.isArray(tag))
+      return false;
+    for (let j = 0; j < tag.length; j++) {
+      if (typeof tag[j] !== "string")
+        return false;
+    }
+  }
+  return true;
+}
+function sortEvents(events) {
+  return events.sort((a, b) => {
+    if (a.created_at !== b.created_at) {
+      return b.created_at - a.created_at;
+    }
+    return a.id.localeCompare(b.id);
+  });
+}
 
 // pure.ts
+import { sha256 } from "@noble/hashes/sha2.js";
 var JS = class {
   generateSecretKey() {
     return schnorr.utils.randomSecretKey();
@@ -283,6 +291,7 @@ __export(kinds_exports, {
   Emojisets: () => Emojisets,
   EncryptedDirectMessage: () => EncryptedDirectMessage,
   EventDeletion: () => EventDeletion,
+  FavoriteFollowSets: () => FavoriteFollowSets,
   FavoritePodcasts: () => FavoritePodcasts,
   FavoriteRelays: () => FavoriteRelays,
   FedimintAnnouncement: () => FedimintAnnouncement,
@@ -555,6 +564,7 @@ var PrivateEventRelayList = 10013;
 var InterestsList = 10015;
 var NutZapInfo = 10019;
 var MediaFollows = 10020;
+var FavoriteFollowSets = 10021;
 var UserEmojiList = 10030;
 var DecoupledKeyAnnouncement = 10044;
 var DirectMessageRelaysList = 10050;
@@ -1154,7 +1164,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);
@@ -1327,12 +1337,6 @@ var Relay = class extends AbstractRelay {
   }
 };
 
-// helpers.ts
-var alwaysTrue = (t) => {
-  t[verifiedSymbol] = true;
-  return true;
-};
-
 // nip45.ts
 import { sha256 as sha2562 } from "@noble/hashes/sha2.js";
 import { bytesToHex as bytesToHex3 } from "@noble/hashes/utils.js";
@@ -1359,7 +1363,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 i2 = 0; i2 < M; i2++) {
@@ -1400,7 +1404,6 @@ var AbstractSimplePool = class {
   enableReconnect;
   idleTimeout = 2e4;
   automaticallyAuth;
-  trustedRelayURLs = /* @__PURE__ */ new Set();
   onRelayConnectionFailure;
   onRelayConnectionSuccess;
   allowConnectingToRelay;
@@ -1424,7 +1427,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,
@@ -1508,11 +1511,11 @@ var AbstractSimplePool = class {
       }
     };
     const closesReceived = [];
-    let handleClose = (i2, reason) => {
+    let handleClose = (i2, url, reason) => {
       if (closesReceived[i2])
         return;
       handleEose(i2);
-      closesReceived[i2] = reason;
+      closesReceived[i2] = { url, reason };
       if (closesReceived.filter((a) => a).length === groupedRequests.length) {
         params.onclose?.(closesReceived);
         handleClose = () => {
@@ -1530,7 +1533,7 @@ var AbstractSimplePool = class {
     const allOpened = Promise.all(
       groupedRequests.map(async ({ url, filters }, i2) => {
         if (this.allowConnectingToRelay?.(url, ["read", filters]) === false) {
-          handleClose(i2, "connection skipped by allowConnectingToRelay");
+          handleClose(i2, url, "connection skipped by allowConnectingToRelay");
           return;
         }
         let relay;
@@ -1541,7 +1544,7 @@ var AbstractSimplePool = class {
           });
         } catch (err) {
           this.onRelayConnectionFailure?.(url);
-          handleClose(i2, err?.message || String(err));
+          handleClose(i2, url, err?.message || String(err));
           return;
         }
         this.onRelayConnectionSuccess?.(url);
@@ -1555,17 +1558,17 @@ var AbstractSimplePool = class {
                   ...params,
                   oneose: () => handleEose(i2),
                   onclose: (reason2) => {
-                    handleClose(i2, reason2);
+                    handleClose(i2, url, reason2);
                   },
                   alreadyHaveEvent: localAlreadyHaveEventHandler,
                   eoseTimeout: params.maxWait,
                   abort: params.abort
                 });
               }).catch((err) => {
-                handleClose(i2, `auth was required and attempted, but failed with: ${err}`);
+                handleClose(i2, url, `auth was required and attempted, but failed with: ${err}`);
               });
             } else {
-              handleClose(i2, reason);
+              handleClose(i2, url, reason);
             }
           },
           alreadyHaveEvent: localAlreadyHaveEventHandler,
@@ -1593,7 +1596,7 @@ var AbstractSimplePool = class {
         if (subcloser)
           subcloser.close(reason);
         else
-          params.onclose?.(relays.map((_) => reason));
+          params.onclose?.(relays.map((url) => ({ url, reason })));
       }
     });
     return subcloser;
@@ -2113,7 +2116,6 @@ var nip10_exports = {};
 __export(nip10_exports, {
   parse: () => parse
 });
-var HEX64 = /^[0-9a-fA-F]{64}$/;
 function parse(event) {
   const result = {
     reply: void 0,
@@ -2126,12 +2128,12 @@ function parse(event) {
   let maybeRoot;
   for (let i2 = event.tags.length - 1; i2 >= 0; i2--) {
     const tag = event.tags[i2];
-    if (tag[0] === "e" && tag[1] && HEX64.test(tag[1])) {
+    if (tag[0] === "e" && tag[1] && isHex32(tag[1])) {
       const [_, eTagEventId, eTagRelayUrl, eTagMarker, eTagAuthor] = tag;
       const eventPointer = {
         id: eTagEventId,
         relays: eTagRelayUrl ? [eTagRelayUrl] : [],
-        author: eTagAuthor && HEX64.test(eTagAuthor) ? eTagAuthor : void 0
+        author: eTagAuthor && isHex32(eTagAuthor) ? eTagAuthor : void 0
       };
       if (eTagMarker === "root") {
         result.root = eventPointer;
@@ -2153,14 +2155,14 @@ function parse(event) {
       result.mentions.push(eventPointer);
       continue;
     }
-    if (tag[0] === "q" && tag[1] && HEX64.test(tag[1])) {
+    if (tag[0] === "q" && tag[1] && isHex32(tag[1])) {
       const [_, eTagEventId, eTagRelayUrl] = tag;
       result.quotes.push({
         id: eTagEventId,
         relays: eTagRelayUrl ? [eTagRelayUrl] : []
       });
     }
-    if (tag[0] === "p" && tag[1] && HEX64.test(tag[1])) {
+    if (tag[0] === "p" && tag[1] && isHex32(tag[1])) {
       result.profiles.push({
         pubkey: tag[1],
         relays: tag[2] ? [tag[2]] : []
@@ -2657,7 +2659,6 @@ var nip22_exports = {};
 __export(nip22_exports, {
   parse: () => parse3
 });
-var HEX642 = /^[0-9a-fA-F]{64}$/;
 function parseKind(kind) {
   if (!kind)
     return void 0;
@@ -2672,7 +2673,7 @@ function parseAddressPointer(value, relayUrl) {
   if (Number.isNaN(kind))
     return void 0;
   const pubkey = value.slice(idx + 1, idx2);
-  if (!HEX642.test(pubkey))
+  if (!isHex32(pubkey))
     return void 0;
   return {
     kind,
@@ -2685,12 +2686,12 @@ function parsePointer(tag) {
   switch (tag[0]) {
     case "E":
     case "e":
-      if (!tag[1] || !HEX642.test(tag[1]))
+      if (!tag[1] || !isHex32(tag[1]))
         return void 0;
       return {
         id: tag[1],
         relays: tag[2] ? [tag[2]] : [],
-        author: tag[3] && HEX642.test(tag[3]) ? tag[3] : void 0
+        author: tag[3] && isHex32(tag[3]) ? tag[3] : void 0
       };
     case "A":
     case "a":
@@ -2713,12 +2714,12 @@ function parseQuote(tag) {
   if (tag[1].includes(":")) {
     return parseAddressPointer(tag[1], tag[2]);
   }
-  if (!HEX642.test(tag[1]))
+  if (!isHex32(tag[1]))
     return void 0;
   return {
     id: tag[1],
     relays: tag[2] ? [tag[2]] : [],
-    author: tag[3] && HEX642.test(tag[3]) ? tag[3] : void 0
+    author: tag[3] && isHex32(tag[3]) ? tag[3] : void 0
   };
 }
 function choosePointer(candidates) {
@@ -2778,7 +2779,7 @@ function parse3(event) {
         result.quotes.push(pointer);
       continue;
     }
-    if ((tag[0] === "P" || tag[0] === "p") && tag[1] && HEX642.test(tag[1])) {
+    if ((tag[0] === "P" || tag[0] === "p") && tag[1] && isHex32(tag[1])) {
       result.profiles.push({
         pubkey: tag[1],
         relays: tag[2] ? [tag[2]] : []
@@ -3279,10 +3280,10 @@ function validateZapRequest(zapRequestString) {
   let p = zapRequest.tags.find(([t, v]) => t === "p" && v);
   if (!p)
     return "Zap request doesn't have a 'p' tag.";
-  if (!p[1].match(/^[a-f0-9]{64}$/))
+  if (!isHex32(p[1]))
     return "Zap request 'p' tag is not valid hex.";
   let e = zapRequest.tags.find(([t, v]) => t === "e" && v);
-  if (e && !e[1].match(/^[a-f0-9]{64}$/))
+  if (e && !isHex32(e[1]))
     return "Zap request 'e' tag is not valid hex.";
   let relays = zapRequest.tags.find(([t, v]) => t === "relays" && v);
   if (!relays)