@konemono/nostr-login 1.12.13 → 1.12.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.12.13",
+  "version": "1.12.14",
   "description": "Extended fork of nostr-login with multi-relay support, QR scanner, and improved stability",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@konemono/nostr-login-components": "^1.1.13",
+    "@konemono/nostr-login-components": "^1.1.14",
     "prettier": "^3.2.2",
     "rollup": "^4.9.6",
     "rollup-plugin-typescript2": "^0.36.0"

package/src/modules/AuthNostrService.ts

@@ -865,12 +865,17 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   /**
-   * subscriptionを再開する
+   * subscriptionを再開する。
+   * タイムアウト付きで、ハングを防止する。
    */
   private async ensureSubscription() {
     if (this.signer && this.signer.rpc) {
       try {
-        await (this.signer.rpc as any).resubscribe?.();
+        const resubscribePromise = (this.signer.rpc as any).resubscribe?.();
+        if (resubscribePromise) {
+          const timeoutMs = 10000;
+          await Promise.race([resubscribePromise, new Promise<never>((_, reject) => setTimeout(() => reject(new Error('ensureSubscription timed out')), timeoutMs))]);
+        }
         console.log('ensureSubscription: subscription re-established');
       } catch (e) {
         console.warn('ensureSubscription: failed to resubscribe', e);

package/src/modules/Nip46.ts

@@ -37,8 +37,31 @@ class NostrRpc extends NDKNostrRpc {
   public async subscribe(filter: NDKFilter): Promise<NDKSubscription> {
     filter.kinds = filter.kinds?.filter(k => k === 24133);
     this.lastSubscribeFilter = { ...filter };
-    this.sub = await super.subscribe(filter);
-    return this.sub;
+
+    // NDKNostrRpc.subscribe() はEOSE待ちのPromiseを返すが、
+    // リレーが不安定な状態ではEOSEが届かず無限にハングする。
+    // NIP-46ではリアルタイムのレスポンスのみ必要なので、
+    // EOSE待ちをスキップして直接subscribeする。
+    const sub = this._ndk.subscribe(filter, {
+      closeOnEose: false,
+      groupable: false,
+    });
+
+    sub.on('event', async (event: NDKEvent) => {
+      try {
+        const parsedEvent = await this.parseEvent(event);
+        if ((parsedEvent as NDKRpcRequest).method) {
+          this.emit('request', parsedEvent);
+        } else {
+          this.emit(`response-${parsedEvent.id}`, parsedEvent);
+        }
+      } catch (e) {
+        console.error('error parsing event in subscription', e);
+      }
+    });
+
+    this.sub = sub;
+    return sub;
   }
 
   public stop() {