@konemono/nostr-login 1.7.64 → 1.7.66

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -30,7 +30,8 @@ export class AmberDirectSigner implements Signer {
     public async getPublicKey(id?: string): Promise<string> {
         id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl('', 'get_public_key', id);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
             AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
@@ -39,7 +40,8 @@ export class AmberDirectSigner implements Signer {
     public async signEvent(event: any, id?: string): Promise<any> {
         id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(JSON.stringify(event), 'sign_event', id);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
             AmberDirectSigner.pendingResolves.set(id!, (result: string) => {
                 resolve(JSON.parse(result));
@@ -50,7 +52,8 @@ export class AmberDirectSigner implements Signer {
     public async encrypt04(pubkey: string, plaintext: string, id?: string): Promise<string> {
         id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(plaintext, 'nip04_encrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
             AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
@@ -59,7 +62,8 @@ export class AmberDirectSigner implements Signer {
     public async decrypt04(pubkey: string, ciphertext: string, id?: string): Promise<string> {
         id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(ciphertext, 'nip04_decrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
             AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
@@ -68,7 +72,8 @@ export class AmberDirectSigner implements Signer {
     public async encrypt44(pubkey: string, plaintext: string, id?: string): Promise<string> {
         id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(plaintext, 'nip44_encrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
             AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
@@ -77,7 +82,8 @@ export class AmberDirectSigner implements Signer {
     public async decrypt44(pubkey: string, ciphertext: string, id?: string): Promise<string> {
         id = id || Math.random().toString(36).substring(7);
         const url = this.generateUrl(ciphertext, 'nip44_decrypt', id, pubkey);
-        window.location.href = url;
+        console.log('Amber redirecting to:', url);
+        window.location.assign(url);
         return new Promise((resolve) => {
             AmberDirectSigner.pendingResolves.set(id!, resolve);
         });
@@ -89,21 +95,21 @@ export class AmberDirectSigner implements Signer {
         const encodedContent = encodeURIComponent(content || '');
         const encodedCallback = encodeURIComponent(callbackUrl);
 
-        // ★ 追加: sessionStorageに保存（これが無い）
-        sessionStorage.setItem('amber_last_type', type);
-        sessionStorage.setItem('amber_last_id', id);
-        sessionStorage.setItem('amber_last_timestamp', Date.now().toString());
+        localStorage.setItem('amber_last_type', type);
+        localStorage.setItem('amber_last_id', id);
+        localStorage.setItem('amber_last_timestamp', Date.now().toString());
 
         // NIP-55準拠: nostrsigner: スキーム
         let url = `nostrsigner:${encodedContent}`;
-        url += `?compressionType=none`;
-        url += `&returnType=signature`;
-        url += `&type=${type}`;
-        url += `&callbackUrl=${encodedCallback}`;
-        if (pubkey) url += `&pubkey=${pubkey}`;
-        if (this._pubkey) url += `&current_user=${this._pubkey}`; // ★ 追加
-
-        return url;
+        const params = new URLSearchParams();
+        params.append('compressionType', 'none');
+        params.append('returnType', 'signature');
+        params.append('type', type);
+        params.append('callbackUrl', callbackUrl);
+        if (pubkey) params.append('pubkey', pubkey);
+        if (this._pubkey) params.append('current_user', this._pubkey);
+
+        return `${url}?${params.toString()}`;
     }
 
     // AmberDirectSigner.ts の parseResponse を拡張
@@ -130,18 +136,18 @@ export class AmberDirectSigner implements Signer {
             href: window.location.href,
             eventParam: url.searchParams.get('event'),
             pathResult: result,
-            sessionId: sessionStorage.getItem('amber_last_id'),
-            sessionType: sessionStorage.getItem('amber_last_type')
+            sessionId: localStorage.getItem('amber_last_id'),
+            sessionType: localStorage.getItem('amber_last_type')
         });
 
         if (!result) return null;
 
-        const id = sessionStorage.getItem('amber_last_id');
-        const type = sessionStorage.getItem('amber_last_type');
+        const id = localStorage.getItem('amber_last_id');
+        const type = localStorage.getItem('amber_last_type');
 
-        sessionStorage.removeItem('amber_last_id');
-        sessionStorage.removeItem('amber_last_type');
-        sessionStorage.removeItem('amber_last_timestamp');
+        localStorage.removeItem('amber_last_id');
+        localStorage.removeItem('amber_last_type');
+        localStorage.removeItem('amber_last_timestamp');
 
         if (id && type) {
             return { id, type, result };

package/src/modules/AuthNostrService.ts

@@ -130,10 +130,26 @@ class AuthNostrService extends EventEmitter implements Signer {
         // NIP-55では直接resultを使用するため、追加のキャッシュは不要
       }
 
-      // ★ 追加: URLクエリパラメータをクリーンアップ
+      // ★ 追加: URLクリーンアップをより徹底的に
       const url = new URL(window.location.href);
-      url.searchParams.delete('event');
-      window.history.replaceState({}, '', url.toString());
+      let changed = false;
+      if (url.searchParams.has('event')) {
+        url.searchParams.delete('event');
+        changed = true;
+      }
+
+      // パス末尾が結果と一致する場合はパスもクリア
+      const pathParts = url.pathname.split('/');
+      if (pathParts.length > 0 && pathParts[pathParts.length - 1] === response.result) {
+        pathParts.pop();
+        url.pathname = pathParts.join('/') || '/';
+        changed = true;
+      }
+
+      if (changed) {
+        console.log('Cleaning up Amber response URL', url.toString());
+        window.history.replaceState({}, '', url.toString());
+      }
     }
   }
 
@@ -587,7 +603,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     return !!this.readyCallback;
   }
 
-  public async startAuth() {
+  public startAuth() {
     console.log("startAuth");
     if (this.readyCallback) throw new Error('Already started');
 

package/src/modules/ModalManager.ts

@@ -27,7 +27,7 @@ class ModalManager extends EventEmitter {
     if (this.launcherPromise) {
       try {
         await this.launcherPromise;
-      } catch {}
+      } catch { }
       this.launcherPromise = undefined;
     }
   }
@@ -141,7 +141,7 @@ class ModalManager extends EventEmitter {
         }
 
         try {
-          if (!options || options.start) await this.authNostrService.startAuth();
+          if (!options || options.start) this.authNostrService.startAuth();
           await body();
           if (!options || options.end) await done(ok);
         } catch (e: any) {