divine-signer 0.3.2 → 0.4.1

package/dist/bunker-signer.d.ts

@@ -1,6 +1,12 @@
 import { type BunkerSignerParams } from 'nostr-tools/nip46';
 import type { EventTemplate, VerifiedEvent } from 'nostr-tools/pure';
 import type { NostrSigner, SignerType } from './types';
+export interface NostrConnectHandle {
+    /** Call after showing the QR code. Resolves when the remote signer acks. */
+    waitForSigner(): Promise<BunkerNIP44Signer>;
+    /** Abort the connection attempt. */
+    abort(): void;
+}
 export declare class BunkerNIP44Signer implements NostrSigner {
     readonly type: SignerType;
     private readonly inner;
@@ -14,14 +20,20 @@ export declare class BunkerNIP44Signer implements NostrSigner {
      * and calls getPublicKey() to verify the channel is alive (and prime the cache).
      */
     static reconnect(clientSecretKey: Uint8Array, bunkerUrl: string, params?: BunkerSignerParams, connectTimeout?: number): Promise<BunkerNIP44Signer>;
+    /**
+     * Two-phase nostrconnect: sets up relay connections and subscription,
+     * then returns a handle. Show the QR code, then call handle.waitForSigner().
+     *
+     * This avoids a race where the user scans before the subscription is live.
+     */
+    static prepareNostrConnect(connectionURI: string, clientSecretKey: Uint8Array, params?: BunkerSignerParams, timeoutOrAbort?: number | AbortSignal): Promise<NostrConnectHandle>;
     /**
      * Connect via a nostrconnect:// URI (QR code flow).
      *
-     * Implements the connect handshake manually instead of using
-     * BunkerSigner.fromURI, which sends a `switch_relays` RPC that
-     * signers like Primal don't understand (causing a parse error and
-     * potentially disrupting the session). After the handshake we create
-     * the signer via BunkerSigner.fromBunker which skips switch_relays.
+     * Convenience wrapper around prepareNostrConnect() — connects to relays,
+     * subscribes, and waits for the ack in one call. If you need to show a
+     * QR code only after the subscription is live, use prepareNostrConnect()
+     * instead.
      */
     static fromNostrConnect(connectionURI: string, clientSecretKey: Uint8Array, params?: BunkerSignerParams, timeoutOrAbort?: number | AbortSignal): Promise<BunkerNIP44Signer>;
     getPublicKey(): Promise<string>;

package/dist/bunker-signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bunker-signer.d.ts","sourceRoot":"","sources":["../src/bunker-signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEvD,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,OAAO;IAKP,wDAAwD;WAC3C,aAAa,CACxB,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,kBAAkB,EAC3B,YAAY,CAAC,EAAE,UAAU,EACzB,cAAc,SAAS,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAgB7B;;;;;OAKG;WACU,SAAS,CACpB,eAAe,EAAE,UAAU,EAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,cAAc,SAAS,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAoB7B;;;;;;;;OAQG;WACU,gBAAgB,CAC3B,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,UAAU,EAC3B,MAAM,CAAC,EAAE,kBAAkB,EAC3B,cAAc,CAAC,EAAE,MAAM,GAAG,WAAW,GACpC,OAAO,CAAC,iBAAiB,CAAC;IAgFvB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAW/B,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIvD,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvE,YAAY,IAAI,MAAM;IAIhB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
+{"version":3,"file":"bunker-signer.d.ts","sourceRoot":"","sources":["../src/bunker-signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,4EAA4E;IAC5E,aAAa,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC5C,oCAAoC;IACpC,KAAK,IAAI,IAAI,CAAC;CACf;AAED,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,OAAO;IAKP,wDAAwD;WAC3C,aAAa,CACxB,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,kBAAkB,EAC3B,YAAY,CAAC,EAAE,UAAU,EACzB,cAAc,SAAS,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAgB7B;;;;;OAKG;WACU,SAAS,CACpB,eAAe,EAAE,UAAU,EAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,cAAc,SAAS,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAoB7B;;;;;OAKG;WACU,mBAAmB,CAC9B,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,UAAU,EAC3B,MAAM,CAAC,EAAE,kBAAkB,EAC3B,cAAc,CAAC,EAAE,MAAM,GAAG,WAAW,GACpC,OAAO,CAAC,kBAAkB,CAAC;IA0G9B;;;;;;;OAOG;WACU,gBAAgB,CAC3B,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,UAAU,EAC3B,MAAM,CAAC,EAAE,kBAAkB,EAC3B,cAAc,CAAC,EAAE,MAAM,GAAG,WAAW,GACpC,OAAO,CAAC,iBAAiB,CAAC;IAUvB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAW/B,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIvD,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvE,YAAY,IAAI,MAAM;IAIhB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export type { TokenRefreshResult } from './oauth-signer';
 export { NsecSigner } from './nsec-signer';
 export { ExtensionSigner } from './extension-signer';
 export { BunkerNIP44Signer } from './bunker-signer';
+export type { NostrConnectHandle } from './bunker-signer';
 export { OAuthSigner, OAuthError } from './oauth-signer';
 export { createSessionStore, restoreSession } from './session';
 export { buildOAuthUrl, exchangeCode } from './oauth';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC7E,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC7E,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC"}

package/dist/index.js

@@ -129,15 +129,12 @@ var BunkerNIP44Signer = class _BunkerNIP44Signer {
     return new _BunkerNIP44Signer(inner, "nostrconnect");
   }
   /**
-   * Connect via a nostrconnect:// URI (QR code flow).
+   * Two-phase nostrconnect: sets up relay connections and subscription,
+   * then returns a handle. Show the QR code, then call handle.waitForSigner().
    *
-   * Implements the connect handshake manually instead of using
-   * BunkerSigner.fromURI, which sends a `switch_relays` RPC that
-   * signers like Primal don't understand (causing a parse error and
-   * potentially disrupting the session). After the handshake we create
-   * the signer via BunkerSigner.fromBunker which skips switch_relays.
+   * This avoids a race where the user scans before the subscription is live.
    */
-  static async fromNostrConnect(connectionURI, clientSecretKey, params, timeoutOrAbort) {
+  static async prepareNostrConnect(connectionURI, clientSecretKey, params, timeoutOrAbort) {
     const uri = new URL(connectionURI);
     const relays = uri.searchParams.getAll("relay");
     const secret = uri.searchParams.get("secret");
@@ -146,13 +143,29 @@ var BunkerNIP44Signer = class _BunkerNIP44Signer {
       throw new Error("No relays specified in nostrconnect URI");
     }
     const abort = typeof timeoutOrAbort === "number" ? AbortSignal.timeout(timeoutOrAbort) : timeoutOrAbort;
+    const ac = new AbortController();
+    const effectiveAbort = abort ?? ac.signal;
     const pool = new SimplePool();
-    const signerPubkey = await new Promise((resolve, reject) => {
-      if (abort?.aborted) {
+    const RELAY_CONNECT_TIMEOUT = 5e3;
+    const results = await Promise.allSettled(
+      relays.map(
+        (r) => Promise.race([
+          pool.ensureRelay(r),
+          new Promise(
+            (_, rej) => setTimeout(() => rej(new Error(`Relay ${r} connect timeout`)), RELAY_CONNECT_TIMEOUT)
+          )
+        ])
+      )
+    );
+    if (results.every((r) => r.status === "rejected")) {
+      throw new Error("Failed to connect to any relay");
+    }
+    let settled = false;
+    const signerPromise = new Promise((resolve, reject) => {
+      if (effectiveAbort.aborted) {
         reject(new Error("Aborted"));
         return;
       }
-      let settled = false;
       const sub = pool.subscribe(
         relays,
         { kinds: [24133], "#p": [clientPubkey], limit: 0 },
@@ -179,10 +192,10 @@ var BunkerNIP44Signer = class _BunkerNIP44Signer {
               );
             }
           },
-          abort
+          abort: effectiveAbort
         }
       );
-      abort?.addEventListener(
+      effectiveAbort.addEventListener(
         "abort",
         () => {
           if (!settled) {
@@ -194,12 +207,37 @@ var BunkerNIP44Signer = class _BunkerNIP44Signer {
         { once: true }
       );
     });
-    const bp = { pubkey: signerPubkey, relays, secret: secret || "" };
-    const inner = BunkerSigner.fromBunker(clientSecretKey, bp, {
-      ...params,
-      pool
-    });
-    return new _BunkerNIP44Signer(inner, "nostrconnect");
+    return {
+      async waitForSigner() {
+        const signerPubkey = await signerPromise;
+        const bp = { pubkey: signerPubkey, relays, secret: secret || "" };
+        const inner = BunkerSigner.fromBunker(clientSecretKey, bp, {
+          ...params,
+          pool
+        });
+        return new _BunkerNIP44Signer(inner, "nostrconnect");
+      },
+      abort() {
+        ac.abort();
+      }
+    };
+  }
+  /**
+   * Connect via a nostrconnect:// URI (QR code flow).
+   *
+   * Convenience wrapper around prepareNostrConnect() — connects to relays,
+   * subscribes, and waits for the ack in one call. If you need to show a
+   * QR code only after the subscription is live, use prepareNostrConnect()
+   * instead.
+   */
+  static async fromNostrConnect(connectionURI, clientSecretKey, params, timeoutOrAbort) {
+    const handle = await _BunkerNIP44Signer.prepareNostrConnect(
+      connectionURI,
+      clientSecretKey,
+      params,
+      timeoutOrAbort
+    );
+    return handle.waitForSigner();
   }
   async getPublicKey() {
     return Promise.race([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "divine-signer",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",