@konemono/nostr-login 1.7.37 → 1.7.39

package/dist/utils/nip44.d.ts

@@ -2,7 +2,7 @@ export declare function encryptNip44(plaintext: string, conversationKey: Uint8Ar
 export declare function decryptNip44(payload: string, conversationKey: Uint8Array): string;
 export declare class Nip44 {
     private cache;
-    createKey(privkey: string, pubkey: string): Uint8Array;
+    createKey(privkey: string, pubkey: string): Uint8Array<ArrayBufferLike>;
     private getKey;
     encrypt(privkey: string, pubkey: string, text: string): string;
     decrypt(privkey: string, pubkey: string, data: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.7.37",
+  "version": "1.7.39",
   "description": "",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -11,17 +11,17 @@
   },
   "author": "a-fralou",
   "dependencies": {
-    "@nostr-dev-kit/ndk": "^2.3.1",
+    "@nostr-dev-kit/ndk": "^2.18.1",
     "nostr-tools": "^1.17.0",
-    "tseep": "^1.2.1"
+    "tseep": "^1.3.1"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-commonjs": "^25.0.8",
+    "@rollup/plugin-node-resolve": "^15.3.1",
     "@rollup/plugin-terser": "^0.4.4",
     "nostr-login-components": "^1.0.3",
-    "prettier": "^3.2.2",
-    "rollup": "^4.9.6",
+    "prettier": "^3.7.4",
+    "rollup": "^4.53.5",
     "rollup-plugin-typescript2": "^0.36.0"
   },
   "license": "MIT"

package/src/modules/AuthNostrService.ts

@@ -1,14 +1,15 @@
+//AuthNostrService.ts
 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 { NostrLoginAuthOptions, Response } from '../types';
-import NDK, { NDKEvent, NDKNip46Signer, NDKRpcResponse, NDKUser, NostrEvent } from '@nostr-dev-kit/ndk';
+import NDK, { NDKEvent, NDKNip46Signer, NDKPrivateKeySigner, 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 { PrivateKeySigner } from './Signer';
+//import { PrivateKeySigner } from './Signer';
 
 const OUTBOX_RELAYS = ['wss://user.kindpag.es', 'wss://purplepag.es', 'wss://relay.nos.social'];
 const DEFAULT_NOSTRCONNECT_RELAYS = ['wss://relay.nsec.app/', 'wss://ephemeral.snowflare.cc/'];
@@ -40,7 +41,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   private ndk: NDK;
   private profileNdk: NDK;
   private signer: Nip46Signer | null = null;
-  private localSigner: PrivateKeySigner | null = null;
+  private localSigner: NDKPrivateKeySigner | null = null;
   private params: NostrParams;
   private signerPromise?: Promise<void>;
   private signerErrCallback?: (err: string) => void;
@@ -92,13 +93,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 {}
     }
   }
 
@@ -123,7 +124,6 @@ class AuthNostrService extends EventEmitter implements Signer {
   ) {
     relays = relays && relays.length > 0 ? relays : DEFAULT_NOSTRCONNECT_RELAYS;
 
-
     const info: Info = {
       authMethod: 'connect',
       pubkey: '', // unknown yet!
@@ -154,13 +154,6 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async createNostrConnect(relays?: string[]) {
-    /*const relayList = relays
-      ? relays
-        .split(",")
-        .map(r => r.trim().replace(/['"]/g, ""))
-        .filter(r => r.length > 0)
-      : [];*/
-
     this.nostrConnectKey = generatePrivateKey();
     this.nostrConnectSecret = Math.random().toString(36).substring(7);
 
@@ -172,24 +165,13 @@ class AuthNostrService extends EventEmitter implements Signer {
       perms: encodeURIComponent(this.params.optionsModal.perms || ''),
     };
 
-    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${(relays || []).length > 0 ? (relays || []).map((r, i) => `&relay=${r}`) : ""}`;
+    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${(relays || []).length > 0 ? (relays || []).map((r, i) => `&relay=${r}`) : ''}`;
   }
 
   public async getNostrConnectServices(): Promise<[string, ConnectionString[]]> {
-    const nostrconnect = await this.createNostrConnect();
+    const nostrconnect = await this.createNostrConnect(DEFAULT_NOSTRCONNECT_RELAYS);
 
-    // copy defaults
     const apps = NOSTRCONNECT_APPS.map(a => ({ ...a }));
-    // if (this.params.optionsModal.dev) {
-    //   apps.push({
-    //     name: 'Dev.Nsec.app',
-    //     domain: 'new.nsec.app',
-    //     canImport: true,
-    //     img: 'https://new.nsec.app/assets/favicon.ico',
-    //     link: 'https://dev.nsec.app/<nostrconnect>',
-    //     relay: 'wss://relay.nsec.app/',
-    //   });
-    // }
 
     for (const a of apps) {
       let relays: string[] = [...DEFAULT_NOSTRCONNECT_RELAYS];
@@ -211,18 +193,12 @@ class AuthNostrService extends EventEmitter implements Signer {
         }
       }
 
-      const relayParams = relays
-        .map(r => r.replace(/['"]/g, ''))
-        .map(r => `&relay=${encodeURIComponent(r)}`)
-        .join('');
-
-      const nc = nostrconnect + relayParams;
+      // nostrconnectから既存のリレーを削除して新しいリレーを追加
+      const baseUrl = nostrconnect.split('&relay=')[0];
+      const relayParams = relays.map(r => `&relay=${encodeURIComponent(r)}`).join('');
+      const nc = baseUrl + relayParams;
 
-      if (a.iframeUrl) {
-        a.link = nc;
-      } else {
-        a.link = a.link.replace('<nostrconnect>', nc);
-      }
+      a.link = a.iframeUrl ? nc : a.link.replace('<nostrconnect>', nc);
     }
 
     return [nostrconnect, apps];
@@ -244,7 +220,7 @@ class AuthNostrService extends EventEmitter implements Signer {
 
   public async setLocal(info: Info, signup?: boolean) {
     this.releaseSigner();
-    this.localSigner = new PrivateKeySigner(info.sk!);
+    this.localSigner = new NDKPrivateKeySigner(info.sk!);
 
     if (signup) await createProfile(info, this.profileNdk, this.localSigner, this.params.optionsModal.signupRelays, this.params.optionsModal.outboxRelays);
 
@@ -318,9 +294,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     const userPubkey = await this.signer!.createAccount2({ bunkerPubkey: info.signerPubkey!, name, domain, perms: this.params.optionsModal.perms });
 
     return {
-      bunkerUrl:
-        `bunker://${userPubkey}?` +
-        (info.relays ?? []).map((r: string) => `relay=${encodeURIComponent(r)}`).join('&'),
+      bunkerUrl: `bunker://${userPubkey}?` + (info.relays ?? []).map((r: string) => `relay=${encodeURIComponent(r)}`).join('&'),
       sk: info.sk,
     };
   }
@@ -371,7 +345,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (info && this.params.userInfo && (info.pubkey !== this.params.userInfo.pubkey || info.authMethod !== this.params.userInfo.authMethod)) {
       const event = new CustomEvent('nlAuth', { detail: { type: 'logout' } });
       console.log('nostr-login auth', event.detail);
-      document.dispatchEvent(event)
+      document.dispatchEvent(event);
     }
 
     this.setUserInfo(info);
@@ -508,7 +482,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async startAuth() {
-    console.log("startAuth");
+    console.log('startAuth');
     if (this.readyCallback) throw new Error('Already started');
 
     // start the new promise
@@ -552,7 +526,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,
@@ -584,7 +558,7 @@ class AuthNostrService extends EventEmitter implements Signer {
         await this.ndk.connect(CONNECT_TIMEOUT);
 
         // create and prepare the signer
-        const localSigner = new PrivateKeySigner(info.sk!);
+        const localSigner = new NDKPrivateKeySigner(info.sk!);
         this.signer = new Nip46Signer(this.ndk, localSigner, info.signerPubkey!, iframeOrigin);
 
         // we should notify the banner the same way as
@@ -619,7 +593,7 @@ class AuthNostrService extends EventEmitter implements Signer {
 
         // ensure, we're using it in callbacks above
         // and expect info to be valid after this call
-        info.pubkey = this.signer!.userPubkey;
+        info.pubkey = this.signer!.userPubkey!;
         // learned after nostrconnect flow
         info.signerPubkey = this.signer!.remotePubkey;
 

package/src/modules/Nip46.ts

@@ -1,15 +1,27 @@
-import NDK, { NDKEvent, NDKFilter, NDKNip46Signer, NDKNostrRpc, NDKRpcRequest, NDKRpcResponse, NDKSubscription, NDKSubscriptionCacheUsage, NostrEvent } from '@nostr-dev-kit/ndk';
+//Nip46.ts
+import NDK, {
+  NDKEvent,
+  NDKFilter,
+  NDKNip46Signer,
+  NDKNostrRpc,
+  NDKPrivateKeySigner,
+  NDKRpcRequest,
+  NDKRpcResponse,
+  NDKSubscription,
+  NDKSubscriptionCacheUsage,
+  NostrEvent,
+} from '@nostr-dev-kit/ndk';
 import { validateEvent, verifySignature } from 'nostr-tools';
-import { PrivateKeySigner } from './Signer';
+//import { PrivateKeySigner } from './Signer';
 
 class NostrRpc extends NDKNostrRpc {
   protected _ndk: NDK;
-  protected _signer: PrivateKeySigner;
+  protected _signer: NDKPrivateKeySigner;
   protected requests: Set<string> = new Set();
   private sub?: NDKSubscription;
   protected _useNip44: boolean = false;
 
-  public constructor(ndk: NDK, signer: PrivateKeySigner) {
+  public constructor(ndk: NDK, signer: NDKPrivateKeySigner) {
     super(ndk, signer, ndk.debug.extend('nip46:signer:rpc'));
     this._ndk = ndk;
     this._signer = signer;
@@ -43,8 +55,10 @@ class NostrRpc extends NDKNostrRpc {
   public async parseEvent(event: NDKEvent): Promise<NDKRpcRequest | NDKRpcResponse> {
     const remoteUser = this._ndk.getUser({ pubkey: event.pubkey });
     remoteUser.ndk = this._ndk;
-    const decrypt = this.isNip04(event.content) ? this._signer.decrypt : this._signer.decryptNip44;
-    const decryptedContent = await decrypt.call(this._signer, remoteUser, event.content);
+    const decryptedContent = this.isNip04(event.content)
+      ? await this._signer.decrypt(remoteUser, event.content, 'nip04')
+      : await this._signer.decrypt(remoteUser, event.content, 'nip44');
+    //const decryptedContent = await decrypt.call(this._signer, remoteUser, event.content);
     const parsedContent = JSON.parse(decryptedContent);
     const { id, method, params, result, error } = parsedContent;
 
@@ -134,7 +148,7 @@ class NostrRpc extends NDKNostrRpc {
 
     // create and sign request
     const event = await this.createRequestEvent(id, remotePubkey, method, params, kind);
-    console.log("sendRequest", { event, method, remotePubkey, params });
+    console.log('sendRequest', { event, method, remotePubkey, params });
 
     // send to relays
     await event.publish();
@@ -186,8 +200,8 @@ class NostrRpc extends NDKNostrRpc {
     } as NostrEvent);
 
     const useNip44 = this._useNip44 && method !== 'create_account';
-    const encrypt = useNip44 ? this._signer.encryptNip44 : this._signer.encrypt;
-    event.content = await encrypt.call(this._signer, remoteUser, event.content);
+    event.content = useNip44 ? await this._signer.encrypt(remoteUser, event.content, 'nip44') : await this._signer.encrypt(remoteUser, event.content, 'nip04');
+    //event.content = await encrypt.call(this._signer, remoteUser, event.content);
     await event.sign(this._signer);
 
     return event;
@@ -199,7 +213,7 @@ export class IframeNostrRpc extends NostrRpc {
   private iframePort?: MessagePort;
   private iframeRequests = new Map<string, { id: string; pubkey: string }>();
 
-  public constructor(ndk: NDK, localSigner: PrivateKeySigner, iframePeerOrigin?: string) {
+  public constructor(ndk: NDK, localSigner: NDKPrivateKeySigner, iframePeerOrigin?: string) {
     super(ndk, localSigner);
     this._ndk = ndk;
     this.peerOrigin = iframePeerOrigin;
@@ -338,53 +352,54 @@ export class ReadyListener {
 }
 
 export class Nip46Signer extends NDKNip46Signer {
-  private _userPubkey: string = '';
   private _rpc: IframeNostrRpc;
+  private _remotePubkey: string = '';
 
-  constructor(ndk: NDK, localSigner: PrivateKeySigner, signerPubkey: string, iframeOrigin?: string) {
+  constructor(ndk: NDK, localSigner: NDKPrivateKeySigner, signerPubkey: string, iframeOrigin?: string) {
     super(ndk, signerPubkey, localSigner);
+    this._remotePubkey = signerPubkey;
 
-    // override with our own rpc implementation
     this._rpc = new IframeNostrRpc(ndk, localSigner, iframeOrigin);
-    this._rpc.setUseNip44(true); // !!this.params.optionsModal.dev);
+    this._rpc.setUseNip44(true);
     this._rpc.on('authUrl', (url: string) => {
       this.emit('authUrl', url);
     });
-
     this.rpc = this._rpc;
   }
 
-  get userPubkey() {
-    return this._userPubkey;
+  get remotePubkey(): string {
+    return this._remotePubkey;
   }
 
-  private async setSignerPubkey(signerPubkey: string, sameAsUser: boolean = false) {
-    console.log("setSignerPubkey", signerPubkey);
+  set remotePubkey(value: string) {
+    this._remotePubkey = value;
+  }
+
+  // userPubkeyのgetterを削除し、親クラスのプロパティを直接使用
 
-    // ensure it's set
+  private async setSignerPubkey(signerPubkey: string, sameAsUser: boolean = false) {
+    console.log('setSignerPubkey', signerPubkey);
     this.remotePubkey = signerPubkey;
 
-    // when we're sure it's known
     this._rpc.on(`iframeRestart-${signerPubkey}`, () => {
       this.emit('iframeRestart');
     });
 
-    // now call getPublicKey and swap remotePubkey w/ that
     await this.initUserPubkey(sameAsUser ? signerPubkey : '');
   }
 
   public async initUserPubkey(hintPubkey?: string) {
-    if (this._userPubkey) throw new Error('Already called initUserPubkey');
+    // 親クラスのuserPubkeyプロパティを直接設定
+    if (this.userPubkey) throw new Error('Already called initUserPubkey');
 
     if (hintPubkey) {
-      this._userPubkey = hintPubkey;
+      this.userPubkey = hintPubkey;
       return;
     }
 
-    this._userPubkey = await new Promise<string>((ok, err) => {
+    this.userPubkey = await new Promise((ok, err) => {
       if (!this.remotePubkey) throw new Error('Signer pubkey not set');
-
-      console.log("get_public_key", this.remotePubkey);
+      console.log('get_public_key', this.remotePubkey);
       this._rpc.sendRequest(this.remotePubkey, 'get_public_key', [], 24133, (response: NDKRpcResponse) => {
         ok(response.result);
       });
@@ -408,12 +423,7 @@ export class Nip46Signer extends NDKNip46Signer {
   }
 
   public async createAccount2({ bunkerPubkey, name, domain, perms = '' }: { bunkerPubkey: string; name: string; domain: string; perms?: string }) {
-    const params = [
-      name,
-      domain,
-      '', // email
-      perms,
-    ];
+    const params = [name, domain, '', perms];
 
     const r = await new Promise<NDKRpcResponse>(ok => {
       this.rpc.sendRequest(bunkerPubkey, 'create_account', params, undefined, ok);
@@ -423,7 +433,6 @@ export class Nip46Signer extends NDKNip46Signer {
     if (r.result === 'error') {
       throw new Error(r.error);
     }
-
     return r.result;
   }
 }

package/src/modules/Signer.ts

@@ -1,4 +1,4 @@
-import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
+/* import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
 import { Nip44 } from '../utils/nip44';
 import { getPublicKey } from 'nostr-tools';
 
@@ -23,3 +23,4 @@ export class PrivateKeySigner extends NDKPrivateKeySigner {
     return Promise.resolve(this.nip44.decrypt(this.privateKey!, sender.pubkey, value));
   }
 }
+ */