@konemono/nostr-login 1.15.6 → 1.15.8

package/dist/utils/index.d.ts

@@ -19,6 +19,7 @@ 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.6",
+  "version": "1.15.8",
   "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.6",
+    "@konemono/nostr-login-components": "^1.4.8",
     "@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, localStorageSetItem } from './utils';
+import { localStorageGetAccounts, localStorageGetCurrent, localStorageGetRecents, localStorageRemoveAccount, localStorageSetItem } from './utils';
 import { Info } from '@konemono/nostr-login-components/dist/types/types';
 import { NostrObjectParams } from './modules/Nostr';
 
@@ -105,6 +105,10 @@ export class NostrLoginInitializer {
       this.switchAccount(info);
     });
 
+    this.modalManager.on('onRemoveAccount', async (info: Info) => {
+      this.removeAccount(info);
+    });
+
     this.modalManager.on('onLogoutBanner', async (info: Info) => {
       logout();
     });
@@ -129,6 +133,10 @@ export class NostrLoginInitializer {
       this.switchAccount(info);
     });
 
+    this.bannerManager.on('onRemoveAccount', async (info: Info) => {
+      this.removeAccount(info);
+    });
+
     this.bannerManager.on('import', () => {
       this.launch('import');
     });
@@ -181,6 +189,19 @@ 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

@@ -292,10 +292,9 @@ class AuthNostrService extends EventEmitter implements Signer {
           a.iframeUrl = info.nip46.iframe_url || '';
           // サービス固有のリレーがあればURLを再構築
           if (fetchedRelays && fetchedRelays.length && (!customRelays || customRelays.length === 0)) {
-            const serviceNostrconnect = this.replaceRelayHints(nostrconnect, fetchedRelays);
-            a.link = a.iframeUrl ? serviceNostrconnect : a.link;
-          } else {
-            a.link = a.iframeUrl ? nostrconnect : a.link;
+            a.link = this.replaceRelayHints(a.iframeUrl ? nostrconnect : a.link, fetchedRelays);
+          } else if (a.iframeUrl) {
+            a.link = nostrconnect;
           }
           a.available = true;
         } catch (e) {
@@ -311,13 +310,13 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   private replaceRelayHints(nostrconnectUrl: string, newRelays: string[]): string {
-    // 既存のrelay=パラメータを除去して新しいリレーに置換
-    const url = new URL(nostrconnectUrl);
-    url.searchParams.delete('relay');
+    // 文字列操作でrelay=パラメータだけを置換（searchParams経由の再エンコードを回避）
+    const [base, query] = nostrconnectUrl.split('?');
+    const params = (query || '').split('&').filter(p => !p.startsWith('relay='));
     for (const r of newRelays) {
-      url.searchParams.append('relay', r);
+      params.push(`relay=${encodeURIComponent(r)}`);
     }
-    return url.toString();
+    return `${base}?${params.join('&')}`;
   }
 
   public async localSignup(name: string, sk?: string) {
@@ -735,7 +734,7 @@ class AuthNostrService extends EventEmitter implements Signer {
       if (iframeUrl) info.iframeUrl = iframeUrl;
 
       // カスタムリレーが指定されていれば使用する
-      if (customRelays && customRelays.length > 0) {
+      if ((!info.relays || info.relays.length === 0) && customRelays && customRelays.length > 0) {
         info.relays = customRelays;
       }
 

package/src/modules/BannerManager.ts

@@ -130,6 +130,10 @@ 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,6 +492,10 @@ 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/utils/index.ts

@@ -303,6 +303,48 @@ 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));