@konemono/nostr-login 1.10.16 → 1.11.1

package/package.json

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

package/src/modules/AuthNostrService.ts

@@ -1,15 +1,16 @@
 import { localStorageAddAccount, bunkerUrlToInfo, isBunkerUrl, fetchProfile, getBunkerUrl, localStorageRemoveCurrentAccount, createProfile, getIcon } from '../utils';
 import { ConnectionString, Info } from 'nostr-login-components/dist/types/types';
-import { generatePrivateKey, getEventHash, getPublicKey, nip19 } from 'nostr-tools';
+import { generateSecretKey, 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 } from './Nip46';
+import { IframeNostrRpc, Nip46Signer, ReadyListener, ensureNIP46Connection } 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[] = [
@@ -63,6 +64,8 @@ class AuthNostrService extends EventEmitter implements Signer {
     this.params = params;
     this.ndk = new NDK({
       enableOutboxModel: false,
+      autoConnectUserRelays: false,
+      autoFetchUserMutelist: false,
     });
 
     this.profileNdk = new NDK({
@@ -89,13 +92,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 { }
     }
   }
 
@@ -169,10 +172,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async createNostrConnect() {
-    this.nostrConnectKey = generatePrivateKey();
+    this.nostrConnectKey = bytesToHex(generateSecretKey());
     this.nostrConnectSecret = Math.random().toString(36).substring(7);
 
-    const pubkey = getPublicKey(this.nostrConnectKey);
+    const pubkey = getPublicKey(hexToBytes(this.nostrConnectKey));
     const meta = {
       name: encodeURIComponent(document.location.host),
       url: encodeURIComponent(document.location.origin),
@@ -231,8 +234,8 @@ class AuthNostrService extends EventEmitter implements Signer {
 
   public async localSignup(name: string, sk?: string) {
     const signup = !sk;
-    sk = sk || generatePrivateKey();
-    const pubkey = getPublicKey(sk);
+    sk = sk || bytesToHex(generateSecretKey());
+    const pubkey = getPublicKey(hexToBytes(sk));
     const info: Info = {
       pubkey,
       sk,
@@ -258,7 +261,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(this.localSigner.privateKey!);
+    return url + '#import=' + nip19.nsecEncode(hexToBytes(this.localSigner.privateKey!));
   }
 
   public async importAndConnect(cs: ConnectionString) {
@@ -361,7 +364,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   public exportKeys() {
     if (!this.params.userInfo) return '';
     if (this.params.userInfo.authMethod !== 'local') return '';
-    return nip19.nsecEncode(this.params.userInfo.sk!);
+    return nip19.nsecEncode(hexToBytes(this.params.userInfo.sk!));
   }
 
   private onAuth(type: 'login' | 'signup' | 'logout', info: Info | null = null) {
@@ -411,7 +414,7 @@ class AuthNostrService extends EventEmitter implements Signer {
         options.name = info!.name;
 
         if (info!.sk) {
-          options.localNsec = nip19.nsecEncode(info!.sk);
+          options.localNsec = nip19.nsecEncode(hexToBytes(info!.sk));
         }
 
         if (info!.relays) {
@@ -552,7 +555,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,
@@ -604,7 +607,8 @@ class AuthNostrService extends EventEmitter implements Signer {
 
     // wait until we connect, otherwise
     // signer won't start properly
-    await this.ndk.connect();
+    // NOTE: Deferred connection. ensureNIP46Connection will be called on demand.
+    // await this.ndk.connect();
 
     // create and prepare the signer
     const localSigner = new PrivateKeySigner(info.sk!);
@@ -699,12 +703,15 @@ class AuthNostrService extends EventEmitter implements Signer {
 
   public async signEvent(event: any) {
     if (this.localSigner) {
-      event.pubkey = getPublicKey(this.localSigner.privateKey!);
+      event.pubkey = getPublicKey(hexToBytes(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);
@@ -718,41 +725,15 @@ 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; // initSignerで接続も行われるので終了
+      return;
     }
 
     if (!this.signer) {
       throw new Error('No signer available');
     }
 
-    // リレー接続を確認・再接続
-    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');
-      }
-    }
+    // 接続確立は署名時またはRPCリクエスト時に行われるため、
+    // ここでの冗長な接続チェックは削除
   }
 
   private async codec_call(method: string, pubkey: string, param: string) {

package/src/modules/ModalManager.ts

@@ -5,6 +5,7 @@ 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;
@@ -28,7 +29,7 @@ class ModalManager extends EventEmitter {
     if (this.launcherPromise) {
       try {
         await this.launcherPromise;
-      } catch {}
+      } catch { }
       this.launcherPromise = undefined;
     }
   }
@@ -281,7 +282,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('', decoded.data);
+                await this.authNostrService.localSignup('', bytesToHex(decoded.data));
                 ok();
               } else if (nsecOrBunker.startsWith('bunker:')) {
                 await this.authNostrService.authNip46('login', { name: '', bunkerUrl: nsecOrBunker });

package/src/modules/Nip46.ts

@@ -1,5 +1,5 @@
 import NDK, { NDKEvent, NDKFilter, NDKNip46Signer, NDKNostrRpc, NDKRpcRequest, NDKRpcResponse, NDKSubscription, NDKSubscriptionCacheUsage, NostrEvent } from '@nostr-dev-kit/ndk';
-import { validateEvent, verifySignature } from 'nostr-tools';
+import { validateEvent } from 'nostr-tools';
 import { PrivateKeySigner } from './Signer';
 import { NIP46_REQUEST_TIMEOUT, NIP46_CONNECT_TIMEOUT } from '../const';
 
@@ -8,6 +8,82 @@ function withTimeout<T>(promise: Promise<T>, timeoutMs: number, errorMessage: st
   return Promise.race([promise, new Promise<T>((_, reject) => setTimeout(() => reject(new Error(errorMessage)), timeoutMs))]);
 }
 
+/**
+ * NDKのリレー接続を待機する
+ */
+export function waitForConnection(ndk: NDK, timeout: number): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const start = Date.now();
+
+    const check = () => {
+      // 接続済みリレーがあるか確認
+      const connected = Array.from(ndk.pool.relays.values()).some(relay => relay.status === 1); // 1 = CONNECTED
+
+      if (connected) {
+        resolve();
+      } else if (Date.now() - start > timeout) {
+        reject(new Error(`接続タイムアウト: ${timeout}ms`));
+      } else {
+        setTimeout(check, 100);
+      }
+    };
+
+    check();
+  });
+}
+
+/**
+ * NDKの接続を強制的に確立する
+ */
+export async function ensureNDKConnection(ndk: NDK, timeout: number): Promise<void> {
+  // connect()は冪等なので安全
+  await ndk.connect();
+  await waitForConnection(ndk, timeout);
+}
+
+/**
+ * NIP-46専用リレーも含めて接続を確立する
+ */
+export async function ensureNIP46Connection(ndk: NDK, timeout: number): Promise<void> {
+  try {
+    await ensureNDKConnection(ndk, timeout);
+  } catch (e) {
+    console.warn('Initial connection attempt failed, retrying with force disconnect...', e);
+    // 接続数0なら明示的に全切断して再試行
+    if (Array.from(ndk.pool.relays.values()).filter(r => r.status === 1).length === 0) {
+      ndk.pool.relays.forEach(relay => {
+        try {
+          relay.disconnect();
+        } catch (err) {
+          console.error('Error disconnecting relay:', err);
+        }
+      });
+      // タイムアウトを延長して再試行
+      await ensureNDKConnection(ndk, timeout * 2);
+    } else {
+      throw e;
+    }
+  }
+
+  // NIP-46用リレーが個別に定義されている場合の接続確認
+  // @ts-ignore
+  const signerRelays = ndk.signer?.relayUrls;
+  if (signerRelays && Array.isArray(signerRelays)) {
+    for (const url of signerRelays) {
+      const relay = ndk.pool.getRelay(url);
+      if (relay && relay.status !== 1) {
+        await relay.connect();
+      }
+    }
+  }
+
+  // 最終チェック
+  const connectedRelays = Array.from(ndk.pool.relays.values()).filter(r => r.status === 1);
+  if (connectedRelays.length === 0) {
+    throw new Error('リレー接続に失敗しました');
+  }
+}
+
 class NostrRpc extends NDKNostrRpc {
   protected _ndk: NDK;
   protected _signer: PrivateKeySigner;
@@ -235,6 +311,9 @@ class NostrRpc extends NDKNostrRpc {
   }
 
   public async sendRequest(remotePubkey: string, method: string, params: string[] = [], kind = 24133, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse> {
+    // リクエスト送信前に接続を確認
+    await ensureNIP46Connection(this._ndk, 5000);
+
     const id = this.getId();
 
     // response handler will deduplicate auth urls and responses
@@ -376,7 +455,6 @@ export class IframeNostrRpc extends NostrRpc {
         const event = ev.data;
 
         if (!validateEvent(event)) throw new Error('Invalid event from iframe');
-        if (!verifySignature(event)) throw new Error('Invalid event signature from iframe');
         const nevent = new NDKEvent(this._ndk, event);
         const parsedEvent = await this.parseEvent(nevent);
         // レスポンス受信時にタイムスタンプを更新
@@ -393,6 +471,11 @@ export class IframeNostrRpc extends NostrRpc {
   }
 
   public async sendRequest(remotePubkey: string, method: string, params: string[] = [], kind = 24133, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse> {
+    // リクエスト送信前に接続を確認 (relayを使用する場合に備えて)
+    if (!this.iframePort) {
+      await ensureNIP46Connection(this._ndk, 5000);
+    }
+
     const id = this.getId();
 
     // create and sign request event

package/src/modules/Signer.ts

@@ -1,6 +1,7 @@
 import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
 import { Nip44 } from '../utils/nip44';
 import { getPublicKey } from 'nostr-tools';
+import { hexToBytes } from 'nostr-tools/lib/types/utils';
 
 export class PrivateKeySigner extends NDKPrivateKeySigner {
   private nip44: Nip44 = new Nip44();
@@ -8,7 +9,7 @@ export class PrivateKeySigner extends NDKPrivateKeySigner {
 
   constructor(privateKey: string) {
     super(privateKey);
-    this._pubkey = getPublicKey(privateKey);
+    this._pubkey = getPublicKey(hexToBytes(privateKey));
   }
 
   get pubkey() {

package/src/utils/index.ts

@@ -1,7 +1,8 @@
 import { Info, RecentType } from 'nostr-login-components/dist/types/types';
 import NDK, { NDKEvent, NDKRelaySet, NDKSigner, NDKUser } from '@nostr-dev-kit/ndk';
-import { generatePrivateKey } from 'nostr-tools';
+import { generateSecretKey } from 'nostr-tools';
 import { NostrLoginOptions } from '../types';
+import { bytesToHex } from 'nostr-tools/lib/types/utils';
 
 const LOCAL_STORE_KEY = '__nostrlogin_nip46';
 const LOGGED_IN_ACCOUNTS = '__nostrlogin_accounts';
@@ -19,7 +20,7 @@ export const localStorageGetItem = (key: string) => {
   if (value) {
     try {
       return JSON.parse(value);
-    } catch {}
+    } catch { }
   }
 
   return null;
@@ -92,7 +93,7 @@ export const bunkerUrlToInfo = (bunkerUrl: string, sk = ''): Info => {
   return {
     pubkey: '',
     signerPubkey: url.hostname || url.pathname.split('//')[1],
-    sk: sk || generatePrivateKey(),
+    sk: sk || bytesToHex(generateSecretKey()),
     relays: url.searchParams.getAll('relay'),
     token: url.searchParams.get('secret') || '',
     authMethod: 'connect',
@@ -165,7 +166,7 @@ export const checkNip05 = async (nip05: string) => {
         pubkey = d.names[name];
         return;
       }
-    } catch {}
+    } catch { }
 
     available = true;
   })();

package/src/utils/nip44.ts

@@ -10,6 +10,7 @@ import { sha256 } from "@noble/hashes/sha256"
 import { hmac } from "@noble/hashes/hmac";
 import { base64 } from "@scure/base";
 import { getPublicKey } from 'nostr-tools'
+import { hexToBytes } from "nostr-tools/lib/types/utils";
 
 // from https://github.com/nbd-wtf/nostr-tools
 
@@ -164,7 +165,7 @@ export class Nip44 {
   }
 
   private getKey(privkey: string, pubkey: string, extractable?: boolean) {
-    const id = getPublicKey(privkey) + pubkey
+    const id = getPublicKey(hexToBytes(privkey)) + pubkey
     let cryptoKey = this.cache.get(id)
     if (cryptoKey) return cryptoKey