@konemono/nostr-login 1.9.8 → 1.9.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.9.8",
+  "version": "1.9.10",
   "description": "",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",

package/src/modules/AuthNostrService.ts

@@ -73,6 +73,9 @@ class AuthNostrService extends EventEmitter implements Signer {
       encrypt: this.encrypt44.bind(this),
       decrypt: this.decrypt44.bind(this),
     };
+
+    // ページロード時にAmberフローを復元
+    this.checkAndResumeAmberFlow();
   }
 
   public isIframe() {
@@ -96,6 +99,58 @@ class AuthNostrService extends EventEmitter implements Signer {
   public cancelNostrConnect() {
     this.releaseSigner();
     this.resetAuth();
+    // Amber pending状態もクリア
+    localStorage.removeItem('nostr-login-amber-pending');
+  }
+
+  /**
+   * Amberから戻ってきた際に保存された状態を確認して復元する
+   */
+  private async checkAndResumeAmberFlow() {
+    try {
+      const pendingData = localStorage.getItem('nostr-login-amber-pending');
+      if (!pendingData) return;
+
+      const { nostrConnectKey, nostrConnectSecret, relays, domain, timestamp } = JSON.parse(pendingData);
+
+      // タイムアウトチェック（10分以内なら有効）
+      if (Date.now() - timestamp > 10 * 60 * 1000) {
+        console.log('[Amber] Pending flow expired, clearing');
+        localStorage.removeItem('nostr-login-amber-pending');
+        return;
+      }
+
+      console.log('[Amber] Resuming pending flow from localStorage');
+
+      // 状態を復元
+      this.nostrConnectKey = nostrConnectKey;
+      this.nostrConnectSecret = nostrConnectSecret;
+
+      const info: Info = {
+        authMethod: 'connect',
+        pubkey: '',
+        signerPubkey: '',
+        sk: this.nostrConnectKey,
+        domain: domain,
+        relays: relays,
+      };
+
+      // リスナーを再開してAmberからの接続を待つ
+      await this.startAuth();
+      await this.initSigner(info, { listen: true });
+
+      // 接続が成功したらlocalStorageをクリア
+      if (info.pubkey && info.signerPubkey) {
+        info.bunkerUrl = `bunker://${info.signerPubkey}?${relays.map((r: string, i: number) => `${i !== 0 ? '&' : ''}relay=${r}`).join('')}`;
+        this.onAuth('login', info);
+        await this.endAuth();
+        localStorage.removeItem('nostr-login-amber-pending');
+        console.log('[Amber] Flow resumed successfully');
+      }
+    } catch (error) {
+      console.error('[Amber] Failed to resume flow:', error);
+      localStorage.removeItem('nostr-login-amber-pending');
+    }
   }
 
   public async nostrConnect(
@@ -132,7 +187,32 @@ class AuthNostrService extends EventEmitter implements Signer {
         // Amber に nostrconnect:// URL を渡す
         const nostrconnectUrl = await this.createNostrConnect(relays);
         console.log('Amber flow via NIP-46, opening:', nostrconnectUrl);
-        window.location.href = nostrconnectUrl;
+
+        // 状態を保存してAmberから戻ってきたときに復元できるようにする
+        localStorage.setItem(
+          'nostr-login-amber-pending',
+          JSON.stringify({
+            nostrConnectKey: this.nostrConnectKey,
+            nostrConnectSecret: this.nostrConnectSecret,
+            relays: relays,
+            domain: domain,
+            timestamp: Date.now(),
+          }),
+        );
+
+        // AndroidではIntent URLを使用してAmberを開く（ページコンテキストを保持しようと試みる）
+        try {
+          const intentUrl = `intent://${nostrconnectUrl.replace('nostrconnect://', '')}#Intent;scheme=nostrconnect;package=com.greenart7c3.nostrsigner;end;`;
+          const opened = window.open(intentUrl, '_system');
+
+          // window.openが失敗した場合は従来の方法にフォールバック
+          if (!opened) {
+            window.location.href = nostrconnectUrl;
+          }
+        } catch (e) {
+          // エラー時はdirect schemeにフォールバック
+          window.location.href = nostrconnectUrl;
+        }
       } else {
         window.open(link, '_blank', 'width=400,height=700');
       }
@@ -171,7 +251,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       perms: encodeURIComponent(this.params.optionsModal.perms || ''),
     };
 
-    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${(relays || []).length > 0 ? (relays || []).map((r, i) => `&relay=${r}`) : ''}`;
+    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${(relays || []).length > 0 ? (relays || []).map((r, i) => `&relay=${r}`).join('') : ''}`;
   }
 
   public async getNostrConnectServices(): Promise<[string, ConnectionString[]]> {