nostr-tools 1.2.1 → 1.2.4

package/.github/workflows/npm-publish.yml

@@ -12,9 +12,10 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - run: yarn --ignore-engines
-      - run: node build.js
-      - run: yarn test
+      - uses: extractions/setup-just@v1
+      - run: just install-dependencies
+      - run: just build
+      - run: just test
       - uses: JS-DevTools/npm-publish@v1
         with:
           token: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/test.yml

@@ -11,6 +11,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - run: yarn --ignore-engines
-      - run: node build.js
-      - run: yarn test
+      - uses: extractions/setup-just@v1
+      - run: just install-dependencies
+      - run: just build
+      - run: just test

package/README.md

@@ -120,6 +120,41 @@ 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 pool = new SimplePool()
+
+let relays = ['wss://relay.example.com', 'wss://relay.example2.com']
+
+relays.forEach(async url => {
+  let relay = pool.ensureRelay(url)
+  await relay.connect()
+})
+
+let relay = pool.ensureRelay('wss://relay.example3.com')
+
+let subs = pool.sub([...relays, relay], {
+  authors: ['32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245']
+})
+
+subs.forEach(sub =>
+  sub.on('event', event => {
+    // this will only be called once the first time the event is received
+    // ...
+  })
+)
+
+let pubs = pool.publish(newEvent)
+pubs.forEach(pub =>
+  pub.on('ok', () => {
+    // ...
+  })
+)
+```
+
 ### Querying profile data from a NIP-05 address
 
 ```js
@@ -195,7 +230,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/fakejson.test.js

@@ -33,3 +33,17 @@ test('match kind', () => {
     )
   ).toBeTruthy()
 })
+
+test('match subscription id', () => {
+  expect(fj.getSubscriptionId('["EVENT","",{}]')).toEqual('')
+  expect(fj.getSubscriptionId('["EVENT","_",{}]')).toEqual('_')
+  expect(fj.getSubscriptionId('["EVENT","subname",{}]')).toEqual('subname')
+  expect(fj.getSubscriptionId('["EVENT", "kasjbdjkav", {}]')).toEqual(
+    'kasjbdjkav'
+  )
+  expect(
+    fj.getSubscriptionId(
+      '  [ \n\n "EVENT"  , \n\n "y4d5ow45gfwoiudfÇA VSADLKAN KLDASB[12312535]SFMZSNJKLH" , {}]'
+    )
+  ).toEqual('y4d5ow45gfwoiudfÇA VSADLKAN KLDASB[12312535]SFMZSNJKLH')
+})

package/fakejson.ts

@@ -13,6 +13,21 @@ export function getInt(json: string, field: string): number {
   return parseInt(sliced.slice(0, end), 10)
 }
 
+export function getSubscriptionId(json: string): string | null {
+  let idx = json.slice(0, 22).indexOf(`"EVENT"`)
+  if (idx === -1) return null
+
+  let pstart = json.slice(idx + 7 + 1).indexOf(`"`)
+  if (pstart === -1) return null
+  let start = idx + 7 + 1 + pstart
+
+  let pend = json.slice(start + 1, 80).indexOf(`"`)
+  if (pend === -1) return null
+  let end = start + 1 + pend
+
+  return json.slice(start + 1, end)
+}
+
 export function matchEventId(json: string, id: string): boolean {
   return id === getHex64(json, 'id')
 }

package/index.ts

@@ -2,6 +2,7 @@ export * from './keys'
 export * from './relay'
 export * from './event'
 export * from './filter'
+export * from './pool'
 
 export * as nip04 from './nip04'
 export * as nip05 from './nip05'

package/justfile

@@ -0,0 +1,13 @@
+export PATH := "./node_modules/.bin:" + env_var('PATH')
+
+install-dependencies:
+    yarn --ignore-engines
+
+build:
+    node build.js
+
+test: build
+    jest
+
+testOnly file: build
+    jest {{file}}

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")
@@ -3604,6 +3604,7 @@ zoo`.split("\n");
   var nostr_tools_exports = {};
   __export(nostr_tools_exports, {
     Kind: () => Kind,
+    SimplePool: () => SimplePool,
     fj: () => fakejson_exports,
     generatePrivateKey: () => generatePrivateKey,
     getBlankEvent: () => getBlankEvent,
@@ -5164,12 +5165,24 @@ zoo`.split("\n");
   __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;
@@ -5357,6 +5370,7 @@ zoo`.split("\n");
   __export(fakejson_exports, {
     getHex64: () => getHex64,
     getInt: () => getInt,
+    getSubscriptionId: () => getSubscriptionId,
     matchEventId: () => matchEventId,
     matchEventKind: () => matchEventKind,
     matchEventPubkey: () => matchEventPubkey
@@ -5375,6 +5389,20 @@ zoo`.split("\n");
     let end = Math.min(sliced.indexOf(","), sliced.indexOf("}"));
     return parseInt(sliced.slice(0, end), 10);
   }
+  function getSubscriptionId(json) {
+    let idx = json.slice(0, 22).indexOf(`"EVENT"`);
+    if (idx === -1)
+      return null;
+    let pstart = json.slice(idx + 7 + 1).indexOf(`"`);
+    if (pstart === -1)
+      return null;
+    let start = idx + 7 + 1 + pstart;
+    let pend = json.slice(start + 1, 80).indexOf(`"`);
+    if (pend === -1)
+      return null;
+    let end = start + 1 + pend;
+    return json.slice(start + 1, end);
+  }
   function matchEventId(json, id) {
     return id === getHex64(json, "id");
   }
@@ -5386,7 +5414,7 @@ zoo`.split("\n");
   }
 
   // relay.ts
-  function relayInit(url, alreadyHaveEvent = () => false) {
+  function relayInit(url) {
     var ws;
     var resolveClose;
     var setOpen;
@@ -5433,8 +5461,14 @@ zoo`.split("\n");
             return;
           }
           var json = incomingMessageQueue.shift();
-          if (!json || alreadyHaveEvent(getHex64(json, "id"))) {
+          if (!json)
             return;
+          let subid = getSubscriptionId(json);
+          if (subid) {
+            let { alreadyHaveEvent } = openSubs[subid];
+            if (alreadyHaveEvent && alreadyHaveEvent(getHex64(json, "id"))) {
+              return;
+            }
           }
           try {
             let data = JSON.parse(json);
@@ -5489,18 +5523,21 @@ zoo`.split("\n");
     }
     const sub = (filters, {
       skipVerification = false,
+      alreadyHaveEvent = null,
       id = Math.random().toString().slice(2)
     } = {}) => {
       let subid = id;
       openSubs[subid] = {
         id: subid,
         filters,
-        skipVerification
+        skipVerification,
+        alreadyHaveEvent
       };
       trySend(["REQ", subid, ...filters]);
       return {
         sub: (newFilters, newOpts = {}) => sub(newFilters || filters, {
           skipVerification: newOpts.skipVerification || skipVerification,
+          alreadyHaveEvent: newOpts.alreadyHaveEvent || alreadyHaveEvent,
           id: subid
         }),
         unsub: () => {
@@ -5605,6 +5642,70 @@ zoo`.split("\n");
     };
   }
 
+  // pool.ts
+  init_define_process();
+  var SimplePool = class {
+    _conn;
+    constructor(defaultRelays = []) {
+      this._conn = {};
+      defaultRelays.forEach(this.ensureRelay);
+    }
+    ensureRelay(url) {
+      const nm = normalizeURL(url);
+      const existing = this._conn[nm];
+      if (existing)
+        return existing;
+      const relay = relayInit(nm);
+      this._conn[nm] = relay;
+      return relay;
+    }
+    sub(relays, filters, opts) {
+      let _knownIds = /* @__PURE__ */ new Set();
+      let modifiedOpts = opts || {};
+      modifiedOpts.alreadyHaveEvent = (id) => _knownIds.has(id);
+      return relays.map((relay) => {
+        let r = this._conn[relay];
+        if (!r)
+          return badSub();
+        let s = r.sub(filters, modifiedOpts);
+        s.on("event", (event) => _knownIds.add(event.id));
+        return s;
+      });
+    }
+    publish(relays, event) {
+      return relays.map((relay) => {
+        let r = this._conn[relay];
+        if (!r)
+          return badPub(relay);
+        let s = r.publish(event);
+        return s;
+      });
+    }
+  };
+  function badSub() {
+    return {
+      on() {
+      },
+      off() {
+      },
+      sub() {
+        return badSub();
+      },
+      unsub() {
+      }
+    };
+  }
+  function badPub(relay) {
+    return {
+      on(typ, cb) {
+        if (typ === "failed")
+          cb(`relay ${relay} not connected`);
+      },
+      off() {
+      }
+    };
+  }
+
   // nip04.ts
   var nip04_exports = {};
   __export(nip04_exports, {
@@ -6072,7 +6173,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])