@welshman/domain 0.9.0-pre3 → 0.9.0-pre5

package/dist/signer/src/signers/nip55.js

@@ -1,28 +1,67 @@
-import { NostrSignerPlugin } from "nostr-signer-capacitor-plugin";
+import { noop } from "@welshman/lib";
 import { hash, own, Pubkey } from "@welshman/util";
 import { signWithOptions } from "../util.js";
+let plugin;
+/**
+ * Register the NIP-55 plugin. Capacitor apps should call this once at startup:
+ *
+ *     import {NostrSignerPlugin} from "nostr-signer-capacitor-plugin"
+ *     import {setNip55Plugin} from "@welshman/signer"
+ *
+ *     setNip55Plugin(NostrSignerPlugin)
+ */
+export const setNip55Plugin = (nip55) => {
+    plugin = nip55;
+};
+export const getNip55Plugin = () => plugin;
+/** Installed signer apps, or an empty list if no plugin has been registered. */
 export const getNip55 = async () => {
-    const { apps } = await NostrSignerPlugin.getInstalledSignerApps();
+    if (!plugin)
+        return [];
+    const { apps } = await plugin.getInstalledSignerApps();
     return apps;
 };
+const makeRequestId = () => `${Date.now()}-${Math.random().toString(36).slice(2)}`;
 export class Nip55Signer {
     packageName;
     #pubkey;
-    #lock;
+    #lock = Promise.resolve();
+    #setup;
     constructor(packageName, pubkey) {
         this.packageName = packageName;
         this.#pubkey = pubkey;
-        this.#lock = NostrSignerPlugin.setPackageName(packageName);
     }
     #then = async (f) => {
-        const promise = this.#lock.then(f);
-        this.#lock = promise.then(() => Promise.resolve());
+        const promise = this.#lock.then(async () => {
+            const nip55 = plugin;
+            if (!nip55)
+                throw new Error("Nip55 is not enabled");
+            if (!this.#setup) {
+                this.#setup = nip55.setPackageName(this.packageName);
+                this.#setup.catch(() => {
+                    this.#setup = undefined;
+                });
+            }
+            await this.#setup;
+            return f(nip55);
+        });
+        // Swallow the result either way — a failed call must not poison the lock
+        this.#lock = promise.then(noop, noop);
         return promise;
     };
+    #crypt = async (method, pubkey, message) => {
+        if (!this.#pubkey) {
+            await this.getPubkey();
+        }
+        return this.#then(async (plugin) => {
+            const { result } = await plugin[method](this.packageName, message, makeRequestId(), pubkey, this.#pubkey);
+            return result;
+        });
+    };
     getPubkey = async () => {
-        return this.#then(async () => {
+        return this.#then(async (plugin) => {
             if (!this.#pubkey) {
-                const { npub } = await NostrSignerPlugin.getPublicKey(this.packageName);
+                const { npub } = await plugin.getPublicKey(this.packageName);
                 this.#pubkey = Pubkey.from(npub).toString();
             }
             return this.#pubkey;
@@ -30,58 +69,18 @@ export class Nip55Signer {
     };
     sign = (template, options = {}) => signWithOptions(this.getPubkey().then(pubkey => {
         const hashedEvent = hash(own(template, pubkey));
-        return this.#then(async () => {
-            const { event: json } = await NostrSignerPlugin.signEvent(this.packageName, JSON.stringify({ sig: "", ...hashedEvent }), hashedEvent.id, this.#pubkey);
+        return this.#then(async (plugin) => {
+            const { event: json } = await plugin.signEvent(this.packageName, JSON.stringify({ sig: "", ...hashedEvent }), hashedEvent.id, this.#pubkey);
             return JSON.parse(json);
         });
     }), options);
     nip04 = {
-        encrypt: async (recipientPubKey, message) => {
-            const myPubkey = this.#pubkey;
-            if (!myPubkey) {
-                await this.getPubkey();
-            }
-            return this.#then(async () => {
-                const id = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-                const { result } = await NostrSignerPlugin.nip04Encrypt(this.packageName, message, id, recipientPubKey, this.#pubkey);
-                return result;
-            });
-        },
-        decrypt: async (senderPubKey, message) => {
-            const myPubkey = this.#pubkey;
-            if (!myPubkey) {
-                await this.getPubkey();
-            }
-            return this.#then(async () => {
-                const id = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-                const { result } = await NostrSignerPlugin.nip04Decrypt(this.packageName, message, id, senderPubKey, this.#pubkey);
-                return result;
-            });
-        },
+        encrypt: (pubkey, message) => this.#crypt("nip04Encrypt", pubkey, message),
+        decrypt: (pubkey, message) => this.#crypt("nip04Decrypt", pubkey, message),
     };
     nip44 = {
-        encrypt: async (recipientPubKey, message) => {
-            const myPubkey = this.#pubkey;
-            if (!myPubkey) {
-                await this.getPubkey();
-            }
-            return this.#then(async () => {
-                const id = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-                const { result } = await NostrSignerPlugin.nip44Encrypt(this.packageName, message, id, recipientPubKey, this.#pubkey);
-                return result;
-            });
-        },
-        decrypt: async (senderPubKey, message) => {
-            const myPubkey = this.#pubkey;
-            if (!myPubkey) {
-                await this.getPubkey();
-            }
-            return this.#then(async () => {
-                const id = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-                const { result } = await NostrSignerPlugin.nip44Decrypt(this.packageName, message, id, senderPubKey, this.#pubkey);
-                return result;
-            });
-        },
+        encrypt: (pubkey, message) => this.#crypt("nip44Encrypt", pubkey, message),
+        decrypt: (pubkey, message) => this.#crypt("nip44Decrypt", pubkey, message),
     };
 }
 //# sourceMappingURL=nip55.js.map

package/dist/signer/src/signers/nip55.js.map

@@ -1 +1 @@
-{"version":3,"file":"nip55.js","sourceRoot":"","sources":["../../../../../signer/src/signers/nip55.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nip55.js","sourceRoot":"","sources":["../../../../../signer/src/signers/nip55.ts"],"names":[],"mappings":"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"}

package/dist/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/behaviors/emoji.ts","../src/behaviors/zapsplits.ts","../src/core/eventreader.ts","../src/core/eventwriter.ts","../src/core/kind.ts","../src/core/listreader.ts","../src/core/listwriter.ts","../src/kinds/appdata.ts","../src/kinds/blockedrelaylist.ts","../src/kinds/blossomserverlist.ts","../src/kinds/bookmarklist.ts","../src/kinds/classified.ts","../src/kinds/comment.ts","../src/kinds/communitylist.ts","../src/kinds/delete.ts","../src/kinds/emojilist.ts","../src/kinds/feed.ts","../src/kinds/feedlist.ts","../src/kinds/followlist.ts","../src/kinds/handler.ts","../src/kinds/handlerrecommendation.ts","../src/kinds/messagingrelaylist.ts","../src/kinds/mutelist.ts","../src/kinds/note.ts","../src/kinds/pin.ts","../src/kinds/pinlist.ts","../src/kinds/pinboard.ts","../src/kinds/poll.ts","../src/kinds/pollresponse.ts","../src/kinds/profile.ts","../src/kinds/reaction.ts","../src/kinds/relayaddmember.ts","../src/kinds/relayinvite.ts","../src/kinds/relayjoin.ts","../src/kinds/relayleave.ts","../src/kinds/relaylist.ts","../src/kinds/relaymembers.ts","../src/kinds/relayremovemember.ts","../src/kinds/relayrole.ts","../src/kinds/relayset.ts","../src/kinds/report.ts","../src/kinds/roomaddmember.ts","../src/kinds/roomadmins.ts","../src/kinds/roomcreate.ts","../src/kinds/roomcreatepermission.ts","../src/kinds/roomdelete.ts","../src/kinds/roomedit.ts","../src/kinds/roomjoin.ts","../src/kinds/roomleave.ts","../src/kinds/roomlist.ts","../src/kinds/roommembers.ts","../src/kinds/roommeta.ts","../src/kinds/roompins.ts","../src/kinds/roomremovemember.ts","../src/kinds/roomupdatepins.ts","../src/kinds/searchrelaylist.ts","../src/kinds/thread.ts","../src/kinds/timeevent.ts","../src/kinds/topiclist.ts","../src/kinds/zapgoal.ts","../src/kinds/zapreceipt.ts","../src/kinds/zaprequest.ts","../src/other/relay.ts","../src/other/zapper.ts"],"version":"5.8.2"}
+{"root":["../src/index.ts","../src/behaviors/emoji.ts","../src/behaviors/zapsplits.ts","../src/core/eventreader.ts","../src/core/eventwriter.ts","../src/core/kind.ts","../src/core/listreader.ts","../src/core/listwriter.ts","../src/kinds/appdata.ts","../src/kinds/blockedrelaylist.ts","../src/kinds/blossomserverlist.ts","../src/kinds/bookmarklist.ts","../src/kinds/classified.ts","../src/kinds/comment.ts","../src/kinds/communitylist.ts","../src/kinds/delete.ts","../src/kinds/directmessage.ts","../src/kinds/emojilist.ts","../src/kinds/feed.ts","../src/kinds/feedlist.ts","../src/kinds/followlist.ts","../src/kinds/handler.ts","../src/kinds/handlerrecommendation.ts","../src/kinds/messagingrelaylist.ts","../src/kinds/mutelist.ts","../src/kinds/note.ts","../src/kinds/pin.ts","../src/kinds/pinlist.ts","../src/kinds/pinboard.ts","../src/kinds/poll.ts","../src/kinds/pollresponse.ts","../src/kinds/profile.ts","../src/kinds/reaction.ts","../src/kinds/relayaddmember.ts","../src/kinds/relayinvite.ts","../src/kinds/relayjoin.ts","../src/kinds/relayleave.ts","../src/kinds/relaylist.ts","../src/kinds/relaymembers.ts","../src/kinds/relayremovemember.ts","../src/kinds/relayrole.ts","../src/kinds/relayset.ts","../src/kinds/report.ts","../src/kinds/roomaddmember.ts","../src/kinds/roomadmins.ts","../src/kinds/roomcreate.ts","../src/kinds/roomcreatepermission.ts","../src/kinds/roomdelete.ts","../src/kinds/roomedit.ts","../src/kinds/roomjoin.ts","../src/kinds/roomleave.ts","../src/kinds/roomlist.ts","../src/kinds/roommembers.ts","../src/kinds/roommeta.ts","../src/kinds/roompins.ts","../src/kinds/roomremovemember.ts","../src/kinds/roomupdatepins.ts","../src/kinds/searchrelaylist.ts","../src/kinds/thread.ts","../src/kinds/timeevent.ts","../src/kinds/topiclist.ts","../src/kinds/zapgoal.ts","../src/kinds/zapreceipt.ts","../src/kinds/zaprequest.ts","../src/other/relay.ts","../src/other/zapper.ts"],"version":"5.8.2"}

package/dist/util/src/Pow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pow.d.ts","sourceRoot":"","sources":["../../../../util/src/Pow.ts"],"names":[],"mappings":"AAGA,OAAO,EAAY,UAAU,EAAE,WAAW,EAAC,MAAM,aAAa,CAAA;AAE9D,eAAO,IAAI,SAAS,QAAI,CAAA;AAExB,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,eAAO,MAAM,YAAY,GAAI,YAAY,MAAM,WACuB,CAAA;AA8EtE,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,OAAO,UAAU,EAAE,YAAY,MAAM,KAAG,WAkB/D,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,OAAO,WAAW,KAAG,MAmB3C,CAAA"}
+{"version":3,"file":"Pow.d.ts","sourceRoot":"","sources":["../../../../util/src/Pow.ts"],"names":[],"mappings":"AAGA,OAAO,EAAY,UAAU,EAAE,WAAW,EAAC,MAAM,aAAa,CAAA;AAE9D,eAAO,IAAI,SAAS,QAAI,CAAA;AAExB,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,eAAO,MAAM,YAAY,GAAI,YAAY,MAAM,WACuB,CAAA;AA0EtE,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,OAAO,UAAU,EAAE,YAAY,MAAM,KAAG,WAyB/D,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,OAAO,WAAW,KAAG,MAmB3C,CAAA"}

package/dist/util/src/Pow.js

@@ -71,21 +71,24 @@ const createPowWorker = () => {
     }
     const blob = new Blob([workerCode], { type: "application/javascript" });
     const url = URL.createObjectURL(blob);
-    const worker = new Worker(url, { type: "module" });
-    // Clean up the blob URL after worker is created
-    URL.revokeObjectURL(url);
-    return worker;
+    return { worker: new Worker(url), url };
 };
 export const makePow = (event, difficulty) => {
-    const worker = createPowWorker();
+    const { worker, url } = createPowWorker();
     const result = new Promise((resolve, reject) => {
+        // Firefox fetches the worker script asynchronously, so revoking the blob url any
+        // earlier than this aborts the load and fires an error event with no error on it
+        const finish = () => {
+            worker.terminate();
+            URL.revokeObjectURL(url);
+        };
         worker.onmessage = (e) => {
             resolve(e.data);
-            worker.terminate();
+            finish();
         };
         worker.onerror = (e) => {
-            reject(e.error || e);
-            worker.terminate();
+            reject(e.error || new Error("Proof of work worker failed to run"));
+            finish();
         };
         worker.postMessage({ difficulty, event });
     });
@@ -122,6 +125,8 @@ call(() => {
     const start = Date.now();
     pow.result.then(() => {
         benchmark = Date.now() - start;
+    }, () => {
+        // Leave the benchmark at zero; failures get reported when pow is actually requested
     });
 });
 //# sourceMappingURL=Pow.js.map

package/dist/util/src/Pow.js.map

@@ -1 +1 @@
-{"version":3,"file":"Pow.js","sourceRoot":"","sources":["../../../../util/src/Pow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Pow.js","sourceRoot":"","sources":["../../../../util/src/Pow.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/domain",
-  "version": "0.9.0-pre3",
+  "version": "0.9.0-pre5",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Stateless utilities for translating nostr events to and from domain objects.",
@@ -15,21 +15,21 @@
   ],
   "peerDependencies": {
     "nostr-tools": "^2.19.4",
-    "@welshman/feeds": "0.9.0-pre3",
-    "@welshman/net": "0.9.0-pre3",
-    "@welshman/signer": "0.9.0-pre3",
-    "@welshman/util": "0.9.0-pre3",
-    "@welshman/lib": "0.9.0-pre3"
+    "@welshman/feeds": "0.9.0-pre5",
+    "@welshman/lib": "0.9.0-pre5",
+    "@welshman/net": "0.9.0-pre5",
+    "@welshman/signer": "0.9.0-pre5",
+    "@welshman/util": "0.9.0-pre5"
   },
   "devDependencies": {
     "nostr-tools": "^2.19.4",
     "rimraf": "~6.0.0",
     "typescript": "~5.8.0",
-    "@welshman/feeds": "0.9.0-pre3",
-    "@welshman/signer": "0.9.0-pre3",
-    "@welshman/util": "0.9.0-pre3",
-    "@welshman/net": "0.9.0-pre3",
-    "@welshman/lib": "0.9.0-pre3"
+    "@welshman/feeds": "0.9.0-pre5",
+    "@welshman/lib": "0.9.0-pre5",
+    "@welshman/signer": "0.9.0-pre5",
+    "@welshman/net": "0.9.0-pre5",
+    "@welshman/util": "0.9.0-pre5"
   },
   "scripts": {
     "build": "pnpm run clean && pnpm run compile --force",