@konemono/nostr-login 1.15.8 → 1.16.1

package/dist/utils/index.d.ts

@@ -19,7 +19,6 @@ export declare const checkNip05: (nip05: string) => Promise<{
 }>;
 export declare const localStorageAddAccount: (info: Info) => void;
 export declare const localStorageRemoveCurrentAccount: () => void;
-export declare const localStorageRemoveAccount: (user: Info) => void;
 export declare const localStorageRemoveRecent: (user: RecentType) => void;
 export declare const localStorageGetRecents: () => RecentType[];
 export declare const localStorageGetAccounts: () => Info[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.15.8",
+  "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",
@@ -27,7 +27,7 @@
     "tseep": "^1.2.1"
   },
   "devDependencies": {
-    "@konemono/nostr-login-components": "^1.4.8",
+    "@konemono/nostr-login-components": "^1.5.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",

package/src/index.ts

@@ -1,7 +1,7 @@
 import '@konemono/nostr-login-components';
 import { AuthNostrService, NostrExtensionService, Popup, NostrParams, Nostr, ProcessManager, BannerManager, ModalManager } from './modules';
 import { NostrLoginAuthOptions, NostrLoginOptions, StartScreens } from './types';
-import { localStorageGetAccounts, localStorageGetCurrent, localStorageGetRecents, localStorageRemoveAccount, localStorageSetItem } from './utils';
+import { localStorageGetAccounts, localStorageGetCurrent, localStorageGetRecents, localStorageSetItem } from './utils';
 import { Info } from '@konemono/nostr-login-components/dist/types/types';
 import { NostrObjectParams } from './modules/Nostr';
 
@@ -105,10 +105,6 @@ export class NostrLoginInitializer {
       this.switchAccount(info);
     });
 
-    this.modalManager.on('onRemoveAccount', async (info: Info) => {
-      this.removeAccount(info);
-    });
-
     this.modalManager.on('onLogoutBanner', async (info: Info) => {
       logout();
     });
@@ -133,10 +129,6 @@ export class NostrLoginInitializer {
       this.switchAccount(info);
     });
 
-    this.bannerManager.on('onRemoveAccount', async (info: Info) => {
-      this.removeAccount(info);
-    });
-
     this.bannerManager.on('import', () => {
       this.launch('import');
     });
@@ -189,19 +181,6 @@ export class NostrLoginInitializer {
     }
   }
 
-  private async removeAccount(info: Info) {
-    const current = this.params.userInfo || localStorageGetCurrent();
-    const isCurrent = current?.pubkey === info.pubkey && current?.authMethod === info.authMethod;
-
-    if (isCurrent) {
-      await this.logout();
-      return;
-    }
-
-    localStorageRemoveAccount(info);
-    this.updateAccounts();
-  }
-
   private updateAccounts() {
     const accounts = localStorageGetAccounts();
     const recents = localStorageGetRecents();

package/src/modules/AuthNostrService.ts

@@ -456,6 +456,15 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async logout(keepSigner = false) {
+    // NIP-46 logout を送信（signer が session を削除）
+    if (this.signer && !keepSigner) {
+      try {
+        await this.signer.logout();
+      } catch (e) {
+        console.warn('NIP-46 logout RPC failed (non-fatal):', e);
+      }
+    }
+
     if (!keepSigner) this.releaseSigner();
 
     localStorageRemoveCurrentAccount();
@@ -693,6 +702,27 @@ class AuthNostrService extends EventEmitter implements Signer {
           await this.signer!.initUserPubkey(info.pubkey);
         }
 
+        // 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();
+          }
+        } catch (e) {
+          console.warn('NIP-46 switch_relays failed (non-fatal):', e);
+        }
+
         info.pubkey = this.signer!.userPubkey as string;
         info.signerPubkey = this.signer!.bunkerPubkey;
 
@@ -862,7 +892,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       return this.localSigner.decrypt({ pubkey }, ciphertext);
     }
     await this.ensureRelayConnection();
-    return this.codec_call('nip04_decrypt', pubkey, ciphertext);
+    return this.signer!.decrypt(pubkey, ciphertext);
   }
 
   public async encrypt44(pubkey: string, plaintext: string) {
@@ -870,7 +900,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       return this.nip44Codec.encrypt(this.localSigner.privateKey!, pubkey, plaintext);
     }
     await this.ensureRelayConnection();
-    return this.codec_call('nip44_encrypt', pubkey, plaintext);
+    return this.signer!.nip44Encrypt(pubkey, plaintext);
   }
 
   public async decrypt44(pubkey: string, ciphertext: string) {
@@ -878,7 +908,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       return this.nip44Codec.decrypt(this.localSigner.privateKey!, pubkey, ciphertext);
     }
     await this.ensureRelayConnection();
-    return this.codec_call('nip44_decrypt', pubkey, ciphertext);
+    return this.signer!.nip44Decrypt(pubkey, ciphertext);
   }
 }
 

package/src/modules/BannerManager.ts

@@ -130,10 +130,6 @@ class BannerManager extends EventEmitter {
       this.emit('onSwitchAccount', event.detail);
     });
 
-    this.banner.addEventListener('nlRemoveAccount', (event: any) => {
-      this.emit('onRemoveAccount', event.detail);
-    });
-
     this.banner.addEventListener('nlOpenWelcomeModal', () => {
       this.emit('launch');
 

package/src/modules/ModalManager.ts

@@ -492,10 +492,6 @@ class ModalManager extends EventEmitter {
         this.emit('updateAccounts');
       });
 
-      this.modal.addEventListener('nlRemoveAccount', (event: any) => {
-        this.emit('onRemoveAccount', event.detail as Info);
-      });
-
       const nameToPubkey = async (nameNpub: string) => {
         let pubkey = '';
         if (nameNpub.includes('@')) {

package/src/modules/nip46/Nip46Signer.ts

@@ -151,7 +151,94 @@ export class Nip46Signer extends EventEmitter {
     });
   }
 
+  /**
+   * NIP-46 ping — signer の死活確認
+   */
+  public async ping(): Promise<boolean> {
+    return new Promise<boolean>((resolve, reject) => {
+      this.rpc.sendRequest(this.bunkerPubkey, 'ping', [], 24133, (response: RpcResponse) => {
+        if (response.error) {
+          reject(new Nip46Error(response.error, 'SIGNER_REJECTED'));
+        } else {
+          resolve(response.result === 'pong');
+        }
+      });
+    });
+  }
+
+  /**
+   * NIP-46 switch_relays — リレーリストの更新
+   * Spec: 接続確立後に client が即時送信、signer が relay リストを返す
+   */
+  public async switchRelays(): Promise<string[] | null> {
+    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, 'SIGNER_REJECTED'));
+        } else {
+          // result は JSON 文字列: ["wss://...", ...] または "null"
+          try {
+            const parsed = JSON.parse(response.result);
+            resolve(Array.isArray(parsed) ? parsed : null);
+          } catch {
+            resolve(null);
+          }
+        }
+      });
+    });
+  }
+
+  /**
+   * NIP-46 logout — リモート signer にセッション終了を通知
+   */
+  public async logout(): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      this.rpc.sendRequest(this.bunkerPubkey, 'logout', [], 24133, (response: RpcResponse) => {
+        if (response.error) {
+          reject(new Nip46Error(response.error, 'SIGNER_REJECTED'));
+        } else {
+          resolve();
+        }
+      });
+    });
+  }
+
+  /**
+   * NIP-46 remote encrypt (NIP-44)
+   */
+  public async nip44Encrypt(recipientPubkey: string, plaintext: string): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+      this.rpc.sendRequest(this.bunkerPubkey, 'nip44_encrypt', [recipientPubkey, plaintext], 24133, (response: RpcResponse) => {
+        if (response.error) {
+          reject(new Nip46Error(response.error, 'SIGNER_REJECTED'));
+        } else {
+          resolve(response.result);
+        }
+      });
+    });
+  }
+
+  /**
+   * NIP-46 remote decrypt (NIP-44)
+   */
+  public async nip44Decrypt(senderPubkey: string, ciphertext: string): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+      this.rpc.sendRequest(this.bunkerPubkey, 'nip44_decrypt', [senderPubkey, ciphertext], 24133, (response: RpcResponse) => {
+        if (response.error) {
+          reject(new Nip46Error(response.error, 'SIGNER_REJECTED'));
+        } else {
+          resolve(response.result);
+        }
+      });
+    });
+  }
+
+  /**
+   * @deprecated NIP-46 spec から create_account は別 NIP へ移動済み。
+   * 将来的に削除されます。
+   */
   public async createAccount2({ bunkerPubkey, name, domain, perms = '' }: { bunkerPubkey: string; name: string; domain: string; perms?: string }) {
+    console.warn('[DEPRECATED] createAccount2 is deprecated per NIP-46 spec. Will be removed in a future version.');
     const params = [name, domain, '', perms];
 
     const r = await new Promise<RpcResponse>((ok, err) => {

package/src/utils/index.ts

@@ -303,48 +303,6 @@ export const localStorageRemoveCurrentAccount = () => {
   localStorageRemoveItem(LOCAL_STORE_KEY);
 };
 
-export const localStorageRemoveAccount = (user: Info) => {
-  if (!user) return;
-
-  upgradeInfo(user);
-
-  const current: Info | null = localStorageGetItem(LOCAL_STORE_KEY);
-  if (current) upgradeInfo(current);
-
-  const recentUser: RecentType = { ...user };
-  delete (recentUser as Record<string, unknown>)['sk'];
-  delete (recentUser as Record<string, unknown>)['otpData'];
-
-  const loggedInAccounts: Info[] = localStorageGetItem(LOGGED_IN_ACCOUNTS) || [];
-  const recentsAccounts: RecentType[] = localStorageGetItem(RECENT_ACCOUNTS) || [];
-
-  loggedInAccounts.forEach(a => upgradeInfo(a));
-  recentsAccounts.forEach(a => upgradeInfo(a));
-
-  const accounts = loggedInAccounts.filter(el => el.pubkey !== user.pubkey || el.authMethod !== user.authMethod);
-  const recents: RecentType[] = recentsAccounts;
-
-  if (recentUser.authMethod === 'connect' && recentUser.bunkerUrl && recentUser.bunkerUrl.includes('secret=')) {
-    console.log('nostr login bunker conn with a secret not saved to recent');
-  } else if (recentUser.authMethod === 'local') {
-    console.log('nostr login temporary local keys not save to recent');
-  } else {
-    const index = recentsAccounts.findIndex((el: RecentType) => el.pubkey === recentUser.pubkey && el.authMethod === recentUser.authMethod);
-    if (index !== -1) {
-      recents[index] = recentUser;
-    } else {
-      recents.push(recentUser);
-    }
-  }
-
-  localStorageSetItem(RECENT_ACCOUNTS, JSON.stringify(recents));
-  localStorageSetItem(LOGGED_IN_ACCOUNTS, JSON.stringify(accounts));
-
-  if (current && current.pubkey === user.pubkey && current.authMethod === user.authMethod) {
-    localStorageRemoveItem(LOCAL_STORE_KEY);
-  }
-};
-
 export const localStorageRemoveRecent = (user: RecentType) => {
   const recentsAccounts: RecentType[] = localStorageGetItem(RECENT_ACCOUNTS) || [];
   recentsAccounts.forEach(a => upgradeInfo(a));