@konemono/nostr-login 1.11.1 → 1.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.11.1",
+  "version": "1.11.4",
   "description": "",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -12,6 +12,7 @@
   "author": "a-fralou",
   "dependencies": {
     "@nostr-dev-kit/ndk": "^2.3.1",
+    "events": "^3.3.0",
     "nostr-tools": "^1.17.0",
     "tseep": "^1.2.1"
   },

package/src/modules/AuthNostrService.ts

@@ -1,16 +1,15 @@
 import { localStorageAddAccount, bunkerUrlToInfo, isBunkerUrl, fetchProfile, getBunkerUrl, localStorageRemoveCurrentAccount, createProfile, getIcon } from '../utils';
 import { ConnectionString, Info } from 'nostr-login-components/dist/types/types';
-import { generateSecretKey, getEventHash, getPublicKey, nip19 } from 'nostr-tools';
+import { generatePrivateKey, getEventHash, getPublicKey, nip19 } from 'nostr-tools';
 import { NostrLoginAuthOptions, Response } from '../types';
 import NDK, { NDKEvent, NDKNip46Signer, NDKRpcResponse, NDKUser, NostrEvent } from '@nostr-dev-kit/ndk';
 import { NostrParams } from './';
 import { EventEmitter } from 'tseep';
 import { Signer } from './Nostr';
 import { Nip44 } from '../utils/nip44';
-import { IframeNostrRpc, Nip46Signer, ReadyListener, ensureNIP46Connection } from './Nip46';
+import { IframeNostrRpc, Nip46Signer, ReadyListener } from './Nip46';
 import { PrivateKeySigner } from './Signer';
 import { DEFAULT_NIP46_RELAYS } from '../const';
-import { bytesToHex, hexToBytes } from 'nostr-tools/lib/types/utils';
 
 const OUTBOX_RELAYS = ['wss://user.kindpag.es', 'wss://purplepag.es', 'wss://relay.nos.social'];
 const NOSTRCONNECT_APPS: ConnectionString[] = [
@@ -64,8 +63,6 @@ class AuthNostrService extends EventEmitter implements Signer {
     this.params = params;
     this.ndk = new NDK({
       enableOutboxModel: false,
-      autoConnectUserRelays: false,
-      autoFetchUserMutelist: false,
     });
 
     this.profileNdk = new NDK({
@@ -92,13 +89,13 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (this.signerPromise) {
       try {
         await this.signerPromise;
-      } catch { }
+      } catch {}
     }
 
     if (this.readyPromise) {
       try {
         await this.readyPromise;
-      } catch { }
+      } catch {}
     }
   }
 
@@ -172,10 +169,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async createNostrConnect() {
-    this.nostrConnectKey = bytesToHex(generateSecretKey());
+    this.nostrConnectKey = generatePrivateKey();
     this.nostrConnectSecret = Math.random().toString(36).substring(7);
 
-    const pubkey = getPublicKey(hexToBytes(this.nostrConnectKey));
+    const pubkey = getPublicKey(this.nostrConnectKey);
     const meta = {
       name: encodeURIComponent(document.location.host),
       url: encodeURIComponent(document.location.origin),
@@ -234,8 +231,8 @@ class AuthNostrService extends EventEmitter implements Signer {
 
   public async localSignup(name: string, sk?: string) {
     const signup = !sk;
-    sk = sk || bytesToHex(generateSecretKey());
-    const pubkey = getPublicKey(hexToBytes(sk));
+    sk = sk || generatePrivateKey();
+    const pubkey = getPublicKey(sk);
     const info: Info = {
       pubkey,
       sk,
@@ -261,7 +258,7 @@ class AuthNostrService extends EventEmitter implements Signer {
 
     // for local we export our existing key
     if (!this.localSigner || this.params.userInfo?.authMethod !== 'local') throw new Error('Most be local keys');
-    return url + '#import=' + nip19.nsecEncode(hexToBytes(this.localSigner.privateKey!));
+    return url + '#import=' + nip19.nsecEncode(this.localSigner.privateKey!);
   }
 
   public async importAndConnect(cs: ConnectionString) {
@@ -364,7 +361,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   public exportKeys() {
     if (!this.params.userInfo) return '';
     if (this.params.userInfo.authMethod !== 'local') return '';
-    return nip19.nsecEncode(hexToBytes(this.params.userInfo.sk!));
+    return nip19.nsecEncode(this.params.userInfo.sk!);
   }
 
   private onAuth(type: 'login' | 'signup' | 'logout', info: Info | null = null) {
@@ -414,7 +411,7 @@ class AuthNostrService extends EventEmitter implements Signer {
         options.name = info!.name;
 
         if (info!.sk) {
-          options.localNsec = nip19.nsecEncode(hexToBytes(info!.sk));
+          options.localNsec = nip19.nsecEncode(info!.sk);
         }
 
         if (info!.relays) {
@@ -555,7 +552,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (this.signerPromise) {
       try {
         await this.signerPromise;
-      } catch { }
+      } catch {}
     }
 
     // we remove support for iframe from nip05 and bunker-url methods,
@@ -607,8 +604,7 @@ class AuthNostrService extends EventEmitter implements Signer {
 
     // wait until we connect, otherwise
     // signer won't start properly
-    // NOTE: Deferred connection. ensureNIP46Connection will be called on demand.
-    // await this.ndk.connect();
+    await this.ndk.connect();
 
     // create and prepare the signer
     const localSigner = new PrivateKeySigner(info.sk!);
@@ -703,15 +699,12 @@ class AuthNostrService extends EventEmitter implements Signer {
 
   public async signEvent(event: any) {
     if (this.localSigner) {
-      event.pubkey = getPublicKey(hexToBytes(this.localSigner.privateKey!));
+      event.pubkey = getPublicKey(this.localSigner.privateKey!);
       event.id = getEventHash(event);
       event.sig = await this.localSigner.sign(event);
     } else {
       await this.ensureSigner();
 
-      // 署名前に接続を確認 (rpc.sendRequest内でも行われるが、安全のため)
-      await ensureNIP46Connection(this.ndk, 5000);
-
       event.pubkey = this.signer!.remotePubkey;
       event.id = getEventHash(event);
       event.sig = await this.signer!.sign(event);
@@ -725,15 +718,41 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (!this.signer && this.params.userInfo) {
       console.log('Signer was destroyed, reinitializing...');
       await this.initSigner(this.params.userInfo);
-      return;
+      return; // initSignerで接続も行われるので終了
     }
 
     if (!this.signer) {
       throw new Error('No signer available');
     }
 
-    // 接続確立は署名時またはRPCリクエスト時に行われるため、
-    // ここでの冗長な接続チェックは削除
+    // リレー接続を確認・再接続
+    const stats = this.ndk.pool.stats();
+    console.log('NDK pool stats:', stats);
+
+    if (stats.connected === 0) {
+      console.log('NDK relays disconnected, reinitializing signer...');
+
+      // リレーが完全に切断されている場合、signerも再初期化する必要がある
+      // （RPCサブスクリプションも切断されているため）
+      if (this.params.userInfo) {
+        // 古いsignerを破棄
+        this.signer = null;
+
+        // 既存のリレーを一度切断
+        for (const relay of this.ndk.pool.relays.values()) {
+          try {
+            relay.disconnect();
+          } catch (e) {
+            console.log('Error disconnecting relay:', e);
+          }
+        }
+
+        // signerを再初期化（リレー接続も含む）
+        await this.initSigner(this.params.userInfo);
+      } else {
+        throw new Error('Cannot reconnect: no user info');
+      }
+    }
   }
 
   private async codec_call(method: string, pubkey: string, param: string) {

package/src/modules/ModalManager.ts

@@ -5,7 +5,6 @@ import { EventEmitter } from 'tseep';
 import { ConnectionString, Info, RecentType } from 'nostr-login-components/dist/types/types';
 import { nip19 } from 'nostr-tools';
 import { setDarkMode } from '..';
-import { bytesToHex } from 'nostr-tools/lib/types/utils';
 
 class ModalManager extends EventEmitter {
   private modal: TypeModal | null = null;
@@ -29,7 +28,7 @@ class ModalManager extends EventEmitter {
     if (this.launcherPromise) {
       try {
         await this.launcherPromise;
-      } catch { }
+      } catch {}
       this.launcherPromise = undefined;
     }
   }
@@ -282,7 +281,7 @@ class ModalManager extends EventEmitter {
                   throw new Error('Bad nsec value');
                 }
                 if (decoded.type !== 'nsec') throw new Error('Bad bech32 type');
-                await this.authNostrService.localSignup('', bytesToHex(decoded.data));
+                await this.authNostrService.localSignup('', decoded.data);
                 ok();
               } else if (nsecOrBunker.startsWith('bunker:')) {
                 await this.authNostrService.authNip46('login', { name: '', bunkerUrl: nsecOrBunker });