nostr-tools 1.2.0 → 1.2.3

package/README.md

@@ -120,6 +120,22 @@ To use this on Node.js you first must install `websocket-polyfill` and import it
 import 'websocket-polyfill'
 ```
 
+### Interacting with multiple relays
+
+```js
+import {pool} from 'nostr-tools'
+
+const p = pool()
+
+["wss://relay.example.com", "wss://relay.example2.com"].forEach(async url => {
+  let relay = pool.ensureRelay(url)
+  await relay.connect()
+
+  relay.sub(...) // same as above
+  relay.publish(...) // etc
+})
+```
+
 ### Querying profile data from a NIP-05 address
 
 ```js
@@ -195,7 +211,7 @@ let event = {
 sendEvent(event)
 
 // on the receiver side
-sub.on('event', (event) => {
+sub.on('event', event => {
   let sender = event.tags.find(([k, v]) => k === 'p' && v && v !== '')[1]
   pk1 === sender
   let plaintext = await nip04.decrypt(sk2, pk1, event.content)

package/index.ts

@@ -2,8 +2,7 @@ export * from './keys'
 export * from './relay'
 export * from './event'
 export * from './filter'
-
-export * as fj from './fakejson'
+export * from './pool'
 
 export * as nip04 from './nip04'
 export * as nip05 from './nip05'
@@ -11,6 +10,9 @@ export * as nip06 from './nip06'
 export * as nip19 from './nip19'
 export * as nip26 from './nip26'
 
+export * as fj from './fakejson'
+export * as utils from './utils'
+
 // monkey patch secp256k1
 import * as secp256k1 from '@noble/secp256k1'
 import {hmac} from '@noble/hashes/hmac'

package/lib/nostr.bundle.js

@@ -3558,7 +3558,7 @@ zoo`.split("\n");
         return new Uint8Array([(0, sha256_1.sha256)(entropy)[0] >> bitsLeft << bitsLeft]);
       };
       function getCoder(wordlist2) {
-        if (!Array.isArray(wordlist2) || wordlist2.length !== 2 ** 11 || typeof wordlist2[0] !== "string")
+        if (!Array.isArray(wordlist2) || wordlist2.length !== 2048 || typeof wordlist2[0] !== "string")
           throw new Error("Worlist: expected array of 2048 strings");
         wordlist2.forEach((i) => {
           if (typeof i !== "string")
@@ -3616,9 +3616,11 @@ zoo`.split("\n");
     nip06: () => nip06_exports,
     nip19: () => nip19_exports,
     nip26: () => nip26_exports,
+    pool: () => pool,
     relayInit: () => relayInit,
     serializeEvent: () => serializeEvent,
     signEvent: () => signEvent,
+    utils: () => utils_exports,
     validateEvent: () => validateEvent,
     verifySignature: () => verifySignature
   });
@@ -5159,9 +5161,100 @@ zoo`.split("\n");
   var sha256 = wrapConstructor(() => new SHA256());
 
   // utils.ts
+  var utils_exports = {};
+  __export(utils_exports, {
+    insertEventIntoAscendingList: () => insertEventIntoAscendingList,
+    insertEventIntoDescendingList: () => insertEventIntoDescendingList,
+    normalizeURL: () => normalizeURL,
+    utf8Decoder: () => utf8Decoder,
+    utf8Encoder: () => utf8Encoder
+  });
   init_define_process();
   var utf8Decoder = new TextDecoder("utf-8");
   var utf8Encoder = new TextEncoder();
+  function normalizeURL(url) {
+    let p = new URL(url);
+    p.pathname = p.pathname.replace(/\/+/g, "/");
+    if (p.pathname.endsWith("/"))
+      p.pathname = p.pathname.slice(0, -1);
+    if (p.port === "80" && p.protocol === "ws:" || p.port === "443" && p.protocol === "wss:")
+      p.port = "";
+    p.searchParams.sort();
+    p.hash = "";
+    return p.toString();
+  }
+  function insertEventIntoDescendingList(sortedArray, event) {
+    let start = 0;
+    let end = sortedArray.length - 1;
+    let midPoint;
+    let position = start;
+    if (end < 0) {
+      position = 0;
+    } else if (event.created_at < sortedArray[end].created_at) {
+      position = end + 1;
+    } else if (event.created_at >= sortedArray[start].created_at) {
+      position = start;
+    } else
+      while (true) {
+        if (end <= start + 1) {
+          position = end;
+          break;
+        }
+        midPoint = Math.floor(start + (end - start) / 2);
+        if (sortedArray[midPoint].created_at > event.created_at) {
+          start = midPoint;
+        } else if (sortedArray[midPoint].created_at < event.created_at) {
+          end = midPoint;
+        } else {
+          position = midPoint;
+          break;
+        }
+      }
+    if (sortedArray[position]?.id !== event.id) {
+      return [
+        ...sortedArray.slice(0, position),
+        event,
+        ...sortedArray.slice(position)
+      ];
+    }
+    return sortedArray;
+  }
+  function insertEventIntoAscendingList(sortedArray, event) {
+    let start = 0;
+    let end = sortedArray.length - 1;
+    let midPoint;
+    let position = start;
+    if (end < 0) {
+      position = 0;
+    } else if (event.created_at > sortedArray[end].created_at) {
+      position = end + 1;
+    } else if (event.created_at <= sortedArray[start].created_at) {
+      position = start;
+    } else
+      while (true) {
+        if (end <= start + 1) {
+          position = end;
+          break;
+        }
+        midPoint = Math.floor(start + (end - start) / 2);
+        if (sortedArray[midPoint].created_at < event.created_at) {
+          start = midPoint;
+        } else if (sortedArray[midPoint].created_at > event.created_at) {
+          end = midPoint;
+        } else {
+          position = midPoint;
+          break;
+        }
+      }
+    if (sortedArray[position]?.id !== event.id) {
+      return [
+        ...sortedArray.slice(0, position),
+        event,
+        ...sortedArray.slice(position)
+      ];
+    }
+    return sortedArray;
+  }
 
   // event.ts
   var Kind = /* @__PURE__ */ ((Kind2) => {
@@ -5330,9 +5423,9 @@ zoo`.split("\n");
           setOpen();
           resolve();
         };
-        ws.onerror = () => {
-          listeners.error.forEach((cb) => cb());
-          reject();
+        ws.onerror = (e) => {
+          listeners.error.forEach((cb) => cb(e));
+          reject(e);
         };
         ws.onclose = async () => {
           listeners.disconnect.forEach((cb) => cb());
@@ -5525,6 +5618,30 @@ zoo`.split("\n");
     };
   }
 
+  // pool.ts
+  init_define_process();
+  function pool(defaultRelays = []) {
+    return new SimplePool(defaultRelays);
+  }
+  var SimplePool = class {
+    _conn;
+    _knownIds = /* @__PURE__ */ new Set();
+    constructor(defaultRelays) {
+      this._conn = {};
+      defaultRelays.forEach(this.ensureRelay);
+    }
+    ensureRelay(url) {
+      const nm = normalizeURL(url);
+      const existing = this._conn[nm];
+      if (existing)
+        return existing;
+      const hasEventId = (id) => this._knownIds.has(id);
+      const relay = relayInit(nm, hasEventId);
+      this._conn[nm] = relay;
+      return relay;
+    }
+  };
+
   // nip04.ts
   var nip04_exports = {};
   __export(nip04_exports, {
@@ -5992,7 +6109,7 @@ zoo`.split("\n");
       domain = name;
       name = "_";
     }
-    if (!name.match(/^[a-z0-9-_]+$/))
+    if (!name.match(/^[A-Za-z0-9-_]+$/))
       return null;
     let res = await (await _fetch(`https://${domain}/.well-known/nostr.json?name=${name}`)).json();
     if (!res?.names?.[name])