@konemono/nostr-login 1.7.50 → 1.7.51

package/package.json

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

package/src/modules/AmberDirectSigner.ts

@@ -0,0 +1,106 @@
+import { NDKUser } from '@nostr-dev-kit/ndk';
+import { Signer } from './Nostr';
+
+export class AmberDirectSigner implements Signer {
+  private _pubkey: string = '';
+
+  constructor(pubkey?: string) {
+    this._pubkey = pubkey || '';
+  }
+
+  get pubkey() {
+    return this._pubkey;
+  }
+
+  public set pubkey(v: string) {
+    this._pubkey = v;
+  }
+
+  nip04 = {
+    encrypt: (pubkey: string, plaintext: string) => this.encrypt04(pubkey, plaintext),
+    decrypt: (pubkey: string, ciphertext: string) => this.decrypt04(pubkey, ciphertext),
+  };
+
+  nip44 = {
+    encrypt: (pubkey: string, plaintext: string) => this.encrypt44(pubkey, plaintext),
+    decrypt: (pubkey: string, ciphertext: string) => this.decrypt44(pubkey, ciphertext),
+  };
+
+  async signEvent(event: any): Promise<any> {
+    const id = Math.random().toString(36).substring(7);
+    const url = this.generateUrl(JSON.stringify(event), 'sign_event', id);
+    window.location.href = url;
+    // This will never resolve because of page reload
+    return new Promise(() => {});
+  }
+
+  async encrypt04(pubkey: string, plaintext: string): Promise<string> {
+    const id = Math.random().toString(36).substring(7);
+    const url = this.generateUrl(plaintext, 'nip04_encrypt', id, pubkey);
+    window.location.href = url;
+    return new Promise(() => {});
+  }
+
+  async decrypt04(pubkey: string, ciphertext: string): Promise<string> {
+    const id = Math.random().toString(36).substring(7);
+    const url = this.generateUrl(ciphertext, 'nip04_decrypt', id, pubkey);
+    window.location.href = url;
+    return new Promise(() => {});
+  }
+
+  async encrypt44(pubkey: string, plaintext: string): Promise<string> {
+    const id = Math.random().toString(36).substring(7);
+    const url = this.generateUrl(plaintext, 'nip44_encrypt', id, pubkey);
+    window.location.href = url;
+    return new Promise(() => {});
+  }
+
+  async decrypt44(pubkey: string, ciphertext: string): Promise<string> {
+    const id = Math.random().toString(36).substring(7);
+    const url = this.generateUrl(ciphertext, 'nip44_decrypt', id, pubkey);
+    window.location.href = url;
+    return new Promise(() => {});
+  }
+
+  public async getPublicKey(): Promise<string> {
+    const id = Math.random().toString(36).substring(7);
+    const url = this.generateUrl('', 'get_public_key', id);
+    window.location.href = url;
+    return new Promise(() => {});
+  }
+
+  private generateUrl(content: string, type: string, id: string, recipient?: string): string {
+    const callbackUrl = new URL(window.location.href);
+    callbackUrl.searchParams.set('amberType', type);
+    callbackUrl.searchParams.set('amberId', id);
+
+    const params = new URLSearchParams();
+    params.set('type', type);
+    params.set('id', id);
+    params.set('callbackUrl', callbackUrl.toString());
+    if (this._pubkey) params.set('pubkey', this._pubkey);
+    if (recipient) params.set('pubkey', recipient); // Amber uses pubkey param for recipient in encrypt/decrypt
+
+    return `nostrsigner:${encodeURIComponent(content)}?${params.toString()}`;
+  }
+
+  public static parseResponse(): { type: string; id: string; result: string } | null {
+    const params = new URLSearchParams(window.location.search);
+    const type = params.get('amberType');
+    const id = params.get('amberId');
+    const result = params.get('signature') || params.get('result'); // Amber uses signature for events, result for others?
+
+    if (type && id && result) {
+      // Clean up URL
+      const newUrl = new URL(window.location.href);
+      newUrl.searchParams.delete('amberType');
+      newUrl.searchParams.delete('amberId');
+      newUrl.searchParams.delete('signature');
+      newUrl.searchParams.delete('result');
+      window.history.replaceState({}, '', newUrl.toString());
+
+      return { type, id, result };
+    }
+    return null;
+  }
+}

package/src/modules/AuthNostrService.ts

@@ -9,6 +9,8 @@ import { Signer } from './Nostr';
 import { Nip44 } from '../utils/nip44';
 import { IframeNostrRpc, Nip46Signer, ReadyListener } from './Nip46';
 import { PrivateKeySigner } from './Signer';
+import { AmberDirectSigner } from './AmberDirectSigner';
+
 
 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,6 +42,7 @@ class AuthNostrService extends EventEmitter implements Signer {
   private ndk: NDK;
   private profileNdk: NDK;
   private signer: Nip46Signer | null = null;
+  private amberSigner: AmberDirectSigner | null = null;
   private localSigner: PrivateKeySigner | null = null;
   private params: NostrParams;
   private signerPromise?: Promise<void>;
@@ -82,6 +85,31 @@ class AuthNostrService extends EventEmitter implements Signer {
       encrypt: this.encrypt44.bind(this),
       decrypt: this.decrypt44.bind(this),
     };
+
+    this.checkAmberResponse();
+  }
+
+  private checkAmberResponse() {
+    const response = AmberDirectSigner.parseResponse();
+    if (response) {
+      if (response.type === 'get_public_key') {
+        const info: Info = {
+          pubkey: response.result,
+          authMethod: 'amber' as any,
+        };
+        this.onAuth('login', info);
+      } else {
+        // For other types, we might want to store the result in a way 
+        // that the next call to the same method can return it immediately
+        // but for now, we just log it.
+        console.log('Amber response', response);
+        if (response.type === 'sign_event') {
+            // If it's a signed event, we could potentially use it if someone asks for it.
+            // But usually the app will re-request signing.
+            // A better way would be to have a session-based cache.
+        }
+      }
+    }
   }
 
   public isIframe() {
@@ -137,7 +165,13 @@ class AuthNostrService extends EventEmitter implements Signer {
     console.log('nostrconnect info', info, link);
 
     // non-iframe flow
-    if (link && !iframeUrl) window.open(link, '_blank', 'width=400,height=700');
+    if (link && !iframeUrl) {
+      if (link === 'amber') {
+        const signer = new AmberDirectSigner();
+        return (signer as any).getPublicKey(); // will redirect
+      }
+      window.open(link, '_blank', 'width=400,height=700');
+    }
 
     // init nip46 signer
     await this.initSigner(info, { listen: true });
@@ -299,6 +333,12 @@ class AuthNostrService extends EventEmitter implements Signer {
     await this.endAuth();
   }
 
+  public async setAmber(info: Info) {
+    this.releaseSigner();
+    this.amberSigner = new AmberDirectSigner(info.pubkey);
+    this.onAuth('login', info);
+  }
+
   public async createAccount(nip05: string) {
     const [name, domain] = nip05.split('@');
 
@@ -329,6 +369,7 @@ class AuthNostrService extends EventEmitter implements Signer {
     this.signer = null;
     this.signerErrCallback?.('cancelled');
     this.localSigner = null;
+    this.amberSigner = null;
 
     // disconnect from signer relays
     for (const r of this.ndk.pool.relays.keys()) {
@@ -678,6 +719,10 @@ class AuthNostrService extends EventEmitter implements Signer {
         event.pubkey = getPublicKey(this.localSigner.privateKey!);
         event.id = getEventHash(event);
         event.sig = await this.localSigner.sign(event);
+      } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+        const userInfo = this.params.userInfo!;
+        if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+        return this.amberSigner.signEvent(event);
       } else {
         event.pubkey = this.signer?.remotePubkey;
         event.id = getEventHash(event);
@@ -710,6 +755,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async encrypt04(pubkey: string, plaintext: string) {
     if (this.localSigner) {
       return this.localSigner.encrypt(new NDKUser({ pubkey }), plaintext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.encrypt04(pubkey, plaintext);
     } else {
       return this.signer!.encrypt(new NDKUser({ pubkey }), plaintext);
     }
@@ -718,6 +767,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async decrypt04(pubkey: string, ciphertext: string) {
     if (this.localSigner) {
       return this.localSigner.decrypt(new NDKUser({ pubkey }), ciphertext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.decrypt04(pubkey, ciphertext);
     } else {
       // decrypt is broken in ndk v2.3.1, and latest
       // ndk v2.8.1 doesn't allow to override connect easily,
@@ -730,6 +783,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async encrypt44(pubkey: string, plaintext: string) {
     if (this.localSigner) {
       return this.nip44Codec.encrypt(this.localSigner.privateKey!, pubkey, plaintext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.encrypt44(pubkey, plaintext);
     } else {
       // no support of nip44 in ndk yet
       return this.codec_call('nip44_encrypt', pubkey, plaintext);
@@ -739,6 +796,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async decrypt44(pubkey: string, ciphertext: string) {
     if (this.localSigner) {
       return this.nip44Codec.decrypt(this.localSigner.privateKey!, pubkey, ciphertext);
+    } else if (this.params.userInfo?.authMethod === ('amber' as any)) {
+      const userInfo = this.params.userInfo!;
+      if (!this.amberSigner) this.amberSigner = new AmberDirectSigner(userInfo.pubkey);
+      return this.amberSigner.decrypt44(pubkey, ciphertext);
     } else {
       // no support of nip44 in ndk yet
       return this.codec_call('nip44_decrypt', pubkey, ciphertext);

package/src/modules/ModalManager.ts

@@ -402,6 +402,9 @@ class ModalManager extends EventEmitter {
         } else if (userInfo.authMethod === 'extension') {
           await this.extensionService.trySetExtensionForPubkey(userInfo.pubkey);
           dialog.close();
+        } else if (userInfo.authMethod === ('amber' as any)) {
+          this.authNostrService.setAmber(userInfo);
+          dialog.close();
         } else {
           const input = userInfo.bunkerUrl || userInfo.nip05;
           if (!input) throw new Error('Bad connect info');