@konemono/nostr-login 1.16.0 → 1.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "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",

package/src/modules/AuthNostrService.ts

@@ -702,14 +702,25 @@ class AuthNostrService extends EventEmitter implements Signer {
           await this.signer!.initUserPubkey(info.pubkey);
         }
 
-        // NIP-46 Spec: 接続確立後に switch_relays を即時送信
-        const newRelays = await this.signer!.switchRelays();
-        if (newRelays && newRelays.length > 0) {
-          this.pool.removeAllRelays();
-          for (const r of newRelays) {
-            this.pool.addRelay(r);
+        // NIP-46 Spec: 接続確立後に switch_relays を即時送信（should、非致命的）
+        try {
+          const newRelays = await this.signer!.switchRelays();
+          if (newRelays && newRelays.length > 0) {
+            // 一時的にリレーゼロにならないよう、先に追加してから削除
+            const oldRelays = this.pool.relayUrls;
+            for (const r of newRelays) {
+              this.pool.addRelay(r);
+            }
+            // 古いリレーを削除（新規に含まれないものを除外）
+            for (const r of oldRelays) {
+              if (!newRelays.includes(r)) {
+                this.pool.removeRelay(r);
+              }
+            }
+            this.signer!.rpc.resubscribe();
           }
-          this.signer!.rpc.resubscribe();
+        } catch (e) {
+          console.warn('NIP-46 switch_relays failed (non-fatal):', e);
         }
 
         info.pubkey = this.signer!.userPubkey as string;

package/src/modules/nip46/Nip46Signer.ts

@@ -158,7 +158,7 @@ export class Nip46Signer extends EventEmitter {
     return new Promise<boolean>((resolve, reject) => {
       this.rpc.sendRequest(this.bunkerPubkey, 'ping', [], 24133, (response: RpcResponse) => {
         if (response.error) {
-          reject(new Nip46Error(response.error, 'TIMEOUT'));
+          reject(new Nip46Error(response.error, 'SIGNER_REJECTED'));
         } else {
           resolve(response.result === 'pong');
         }
@@ -174,7 +174,7 @@ export class Nip46Signer extends EventEmitter {
     return new Promise<string[] | null>((resolve, reject) => {
       this.rpc.sendRequest(this.bunkerPubkey, 'switch_relays', [], 24133, (response: RpcResponse) => {
         if (response.error) {
-          reject(new Nip46Error(response.error, 'TIMEOUT'));
+          reject(new Nip46Error(response.error, 'SIGNER_REJECTED'));
         } else {
           // result は JSON 文字列: ["wss://...", ...] または "null"
           try {
@@ -195,7 +195,7 @@ export class Nip46Signer extends EventEmitter {
     return new Promise<void>((resolve, reject) => {
       this.rpc.sendRequest(this.bunkerPubkey, 'logout', [], 24133, (response: RpcResponse) => {
         if (response.error) {
-          reject(new Nip46Error(response.error, 'TIMEOUT'));
+          reject(new Nip46Error(response.error, 'SIGNER_REJECTED'));
         } else {
           resolve();
         }