applesauce-signers 0.0.0-next-20251030145720 → 0.0.0-next-20251205152544

package/dist/helpers/nostr-connect.js

@@ -1,6 +1,6 @@
-import { setHiddenContentEncryptionMethod } from "applesauce-core/helpers";
+import { setHiddenContentEncryptionMethod } from "applesauce-core/helpers/hidden-content";
 import { isHexKey } from "applesauce-core/helpers/string";
-import { kinds } from "nostr-tools";
+import { kinds } from "applesauce-core/helpers/event";
 // Set encryption types for nostr connect events
 setHiddenContentEncryptionMethod(kinds.NostrConnect, "nip44");
 export function isErrorResponse(response) {

package/dist/interop.d.ts

@@ -1,4 +1,5 @@
-import { EventTemplate, Filter, NostrEvent } from "nostr-tools";
+import { EventTemplate, NostrEvent } from "applesauce-core/helpers/event";
+import { Filter } from "applesauce-core/helpers/filter";
 import { ObservableInput } from "rxjs";
 export type ISigner = {
     getPublicKey: () => Promise<string>;

package/dist/signers/amber-clipboard-signer.d.ts

@@ -1,4 +1,4 @@
-import { EventTemplate, VerifiedEvent, verifyEvent } from "nostr-tools";
+import { EventTemplate, VerifiedEvent, verifyEvent } from "applesauce-core/helpers/event";
 import { ISigner } from "../interop.js";
 /**
  * A Signer for [amber](https://github.com/greenart7c3/Amber) clipboard API

package/dist/signers/amber-clipboard-signer.js

@@ -1,5 +1,5 @@
-import { getEventHash, nip19, verifyEvent } from "nostr-tools";
-import { getPubkeyFromDecodeResult, isHexKey, isHex } from "applesauce-core/helpers";
+import { decodeProfilePointer, isHex, isHexKey } from "applesauce-core/helpers";
+import { getEventHash, verifyEvent } from "applesauce-core/helpers/event";
 import { createDefer } from "applesauce-core/promise";
 /**
  * A Signer for [amber](https://github.com/greenart7c3/Amber) clipboard API
@@ -78,8 +78,7 @@ export class AmberClipboardSigner {
             return result;
         }
         else if (result.startsWith("npub") || result.startsWith("nprofile")) {
-            const decode = nip19.decode(result);
-            const pubkey = getPubkeyFromDecodeResult(decode);
+            const pubkey = decodeProfilePointer(result)?.pubkey;
             if (!pubkey)
                 throw new Error("Expected npub from clipboard");
             this.pubkey = pubkey;

package/dist/signers/extension-signer.d.ts

@@ -1,4 +1,4 @@
-import { EventTemplate, VerifiedEvent } from "nostr-tools";
+import { EventTemplate, VerifiedEvent } from "applesauce-core/helpers/event";
 import { ISigner } from "../interop.js";
 /** AN error that is throw when the window.nostr extension is missing */
 export declare class ExtensionMissingError extends Error {

package/dist/signers/extension-signer.js

@@ -1,5 +1,5 @@
-import { verifyEvent } from "nostr-tools";
 import { isHexKey } from "applesauce-core/helpers";
+import { verifyEvent } from "applesauce-core/helpers/event";
 /** AN error that is throw when the window.nostr extension is missing */
 export class ExtensionMissingError extends Error {
 }

package/dist/signers/nostr-connect-provider.d.ts

@@ -1,4 +1,4 @@
-import { EventTemplate, NostrEvent } from "nostr-tools";
+import { EventTemplate, NostrEvent } from "applesauce-core/helpers/event";
 import { Subscription } from "rxjs";
 import { ConnectRequestParams, ConnectResponseResults, NostrConnectMethod, NostrConnectResponse, NostrConnectURI } from "../helpers/nostr-connect.js";
 import { ISigner, NostrConnectionMethodsOptions, NostrPool, NostrPublishMethod, NostrSubscriptionMethod } from "../interop.js";

package/dist/signers/nostr-connect-provider.js

@@ -1,8 +1,8 @@
 import { logger } from "applesauce-core";
 import { getEncryptedContentEncryptionMethods, getHiddenContent, isEvent, unixNow, unlockHiddenContent, } from "applesauce-core/helpers";
+import { kinds, verifyEvent } from "applesauce-core/helpers/event";
 import { createDefer } from "applesauce-core/promise";
 import { nanoid } from "nanoid";
-import { kinds, verifyEvent } from "nostr-tools";
 import { filter, from, repeat, retry } from "rxjs";
 import { isNIP04 } from "../helpers/encryption.js";
 import { createBunkerURI, NostrConnectMethod, parseNostrConnectURI, } from "../helpers/nostr-connect.js";

package/dist/signers/nostr-connect-signer.d.ts

@@ -1,6 +1,6 @@
+import { EventTemplate, NostrEvent, verifyEvent } from "applesauce-core/helpers/event";
 import { Deferred } from "applesauce-core/promise";
 import { ISigner, NostrConnectionMethodsOptions, NostrPool, NostrPublishMethod, NostrSubscriptionMethod, PrivateKeySigner } from "applesauce-signers";
-import { EventTemplate, NostrEvent, verifyEvent } from "nostr-tools";
 import { Subscription } from "rxjs";
 import { BunkerURI, NostrConnectAppMetadata } from "../helpers/nostr-connect.js";
 export type NostrConnectSignerOptions = NostrConnectionMethodsOptions & {
@@ -67,7 +67,7 @@ export declare class NostrConnectSigner implements ISigner {
     protected auths: Set<string>;
     /** Call this method with incoming events */
     handleEvent(event: NostrEvent): Promise<void>;
-    protected createRequestEvent(content: string, target?: string | undefined, kind?: number): Promise<import("nostr-tools").VerifiedEvent>;
+    protected createRequestEvent(content: string, target?: string | undefined, kind?: number): Promise<import("nostr-tools/core").VerifiedEvent>;
     private makeRequest;
     /** Connect to remote signer */
     connect(secret?: string | undefined, permissions?: string[]): Promise<string>;
@@ -83,7 +83,7 @@ export declare class NostrConnectSigner implements ISigner {
     /** Request to sign an event */
     signEvent(template: EventTemplate & {
         pubkey?: string;
-    }): Promise<import("nostr-tools").VerifiedEvent>;
+    }): Promise<import("nostr-tools/core").VerifiedEvent>;
     nip04Encrypt(pubkey: string, plaintext: string): Promise<string>;
     nip04Decrypt(pubkey: string, ciphertext: string): Promise<string>;
     nip44Encrypt(pubkey: string, plaintext: string): Promise<string>;

package/dist/signers/nostr-connect-signer.js

@@ -1,9 +1,10 @@
 import { logger } from "applesauce-core";
 import { getHiddenContent, isHexKey, unixNow } from "applesauce-core/helpers";
+import { kinds, verifyEvent } from "applesauce-core/helpers/event";
+import { getPublicKey } from "applesauce-core/helpers/keys";
 import { createDefer } from "applesauce-core/promise";
 import { PrivateKeySigner, getConnectionMethods, } from "applesauce-signers";
 import { nanoid } from "nanoid";
-import { getPublicKey, kinds, verifyEvent } from "nostr-tools";
 import { filter, from, repeat, retry } from "rxjs";
 import { isNIP04 } from "../helpers/encryption.js";
 import { NostrConnectMethod, buildSigningPermissions, createNostrConnectURI, parseBunkerURI, } from "../helpers/nostr-connect.js";

package/dist/signers/password-signer.d.ts

@@ -1,4 +1,4 @@
-import { EventTemplate } from "nostr-tools";
+import { EventTemplate } from "applesauce-core/helpers/event";
 import { Deferred } from "applesauce-core/promise";
 import { ISigner } from "../interop.js";
 /** A NIP-49 (Private Key Encryption) signer */
@@ -26,7 +26,7 @@ export declare class PasswordSigner implements ISigner {
     /** Locks the signer by removing the unencrypted key from memory */
     lock(): void;
     getPublicKey(): Promise<string>;
-    signEvent(event: EventTemplate): Promise<import("nostr-tools").VerifiedEvent>;
+    signEvent(event: EventTemplate): Promise<import("nostr-tools/core").VerifiedEvent>;
     nip04Encrypt(pubkey: string, plaintext: string): Promise<string>;
     nip04Decrypt(pubkey: string, ciphertext: string): Promise<string>;
     nip44Encrypt(pubkey: string, plaintext: string): Promise<string>;

package/dist/signers/password-signer.js

@@ -1,7 +1,8 @@
-import { finalizeEvent, getPublicKey, nip04, nip44 } from "nostr-tools";
-import { encrypt, decrypt } from "nostr-tools/nip49";
-import { createDefer } from "applesauce-core/promise";
 import { normalizeToSecretKey } from "applesauce-core/helpers";
+import { nip04, nip44 } from "applesauce-core/helpers/encryption";
+import { finalizeEvent } from "applesauce-core/helpers/event";
+import { decryptSecretKey, encryptSecretKey, getPublicKey } from "applesauce-core/helpers/keys";
+import { createDefer } from "applesauce-core/promise";
 /** A NIP-49 (Private Key Encryption) signer */
 export class PasswordSigner {
     key = null;
@@ -35,12 +36,12 @@ export class PasswordSigner {
     async setPassword(password) {
         if (!this.key)
             throw new Error("Cant set password until unlocked");
-        this.ncryptsec = encrypt(this.key, password);
+        this.ncryptsec = encryptSecretKey(this.key, password);
     }
     /** Tests if the provided password is correct by decrypting the ncryptsec */
     async testPassword(password) {
         if (this.ncryptsec) {
-            const key = decrypt(this.ncryptsec, password);
+            const key = decryptSecretKey(this.ncryptsec, password);
             if (!key)
                 throw new Error("Failed to decrypt key");
         }
@@ -53,7 +54,7 @@ export class PasswordSigner {
             return;
         if (this.ncryptsec) {
             try {
-                this.key = decrypt(this.ncryptsec, password);
+                this.key = decryptSecretKey(this.ncryptsec, password);
                 if (!this.key)
                     throw new Error("Failed to decrypt key");
             }

package/dist/signers/private-key-signer.d.ts

@@ -1,11 +1,11 @@
-import { EventTemplate } from "nostr-tools";
+import { EventTemplate } from "applesauce-core/helpers/event";
 import { ISigner } from "../interop.js";
 /** A Simple signer that holds the private key in memory */
 export declare class PrivateKeySigner implements ISigner {
     key: Uint8Array;
     constructor(key?: Uint8Array);
     getPublicKey(): Promise<string>;
-    signEvent(event: EventTemplate): Promise<import("nostr-tools").VerifiedEvent>;
+    signEvent(event: EventTemplate): Promise<import("nostr-tools/core").VerifiedEvent>;
     nip04: {
         encrypt: (pubkey: string, plaintext: string) => Promise<string>;
         decrypt: (pubkey: string, ciphertext: string) => Promise<string>;

package/dist/signers/private-key-signer.js

@@ -1,5 +1,6 @@
-import { normalizeToSecretKey } from "applesauce-core/helpers";
-import { finalizeEvent, generateSecretKey, getPublicKey, nip04, nip44 } from "nostr-tools";
+import { finalizeEvent, normalizeToSecretKey } from "applesauce-core/helpers";
+import { nip04, nip44 } from "applesauce-core/helpers/encryption";
+import { generateSecretKey, getPublicKey } from "applesauce-core/helpers/keys";
 /** A Simple signer that holds the private key in memory */
 export class PrivateKeySigner {
     key;

package/dist/signers/readonly-signer.d.ts

@@ -1,4 +1,4 @@
-import { VerifiedEvent } from "nostr-tools";
+import { VerifiedEvent } from "applesauce-core/helpers/event";
 import { ISigner } from "../interop.js";
 /** A signer that only implements getPublicKey and throws on ever other method */
 export declare class ReadonlySigner implements ISigner {

package/dist/signers/serial-port-signer.d.ts

@@ -1,5 +1,5 @@
+import { EventTemplate, verifyEvent } from "applesauce-core/helpers/event";
 import { Deferred } from "applesauce-core/promise";
-import { EventTemplate, verifyEvent } from "nostr-tools";
 import { ISigner } from "../interop.js";
 type Callback = () => void;
 type DeviceOpts = {
@@ -41,7 +41,7 @@ export declare class SerialPortSigner implements ISigner {
     /** Requires the device to sign an event */
     signEvent(draft: EventTemplate & {
         pubkey?: string;
-    }): Promise<import("nostr-tools").VerifiedEvent>;
+    }): Promise<import("nostr-tools/core").VerifiedEvent>;
     /** Pings to device to see if the connection is open */
     ping(): void;
     static SUPPORTED: boolean;

package/dist/signers/serial-port-signer.js

@@ -1,16 +1,23 @@
 /// <reference types="@types/dom-serial" />
-import { bytesToHex, hexToBytes, randomBytes } from "@noble/hashes/utils";
 import { Point } from "@noble/secp256k1";
-import { base64 } from "@scure/base";
 import { logger } from "applesauce-core";
+import { bytesToHex, getEventHash, hexToBytes, verifyEvent, } from "applesauce-core/helpers/event";
 import { createDefer } from "applesauce-core/promise";
-import { getEventHash, verifyEvent } from "nostr-tools";
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 function xOnlyToXY(p) {
     return Point.fromHex(p).toHex().substring(2);
 }
 const utf8Decoder = new TextDecoder("utf-8");
 const utf8Encoder = new TextEncoder();
+// Helper functions for base64 encoding/decoding using built-in browser APIs
+function base64Encode(uint8Array) {
+    return btoa(String.fromCharCode(...uint8Array));
+}
+function base64Decode(base64) {
+    return new Uint8Array(atob(base64)
+        .split("")
+        .map((c) => c.charCodeAt(0)));
+}
 /** A signer that works with [nostr-signing-device](https://github.com/lnbits/nostr-signing-device) */
 export class SerialPortSigner {
     log = logger.extend("SerialPortSigner");
@@ -167,13 +174,13 @@ export class SerialPortSigner {
     async nip04Encrypt(pubkey, text) {
         const sharedSecretStr = await this.callMethodOnDevice(SerialPortSigner.METHOD_SHARED_SECRET, [xOnlyToXY(pubkey)]);
         const sharedSecret = hexToBytes(sharedSecretStr);
-        let iv = Uint8Array.from(randomBytes(16));
+        let iv = Uint8Array.from(window.crypto.getRandomValues(new Uint8Array(16)));
         let plaintext = utf8Encoder.encode(text);
         // @ts-ignore
         let cryptoKey = await crypto.subtle.importKey("raw", sharedSecret, { name: "AES-CBC" }, false, ["encrypt"]);
         let ciphertext = await crypto.subtle.encrypt({ name: "AES-CBC", iv }, cryptoKey, plaintext);
-        let ctb64 = base64.encode(new Uint8Array(ciphertext));
-        let ivb64 = base64.encode(new Uint8Array(iv.buffer));
+        let ctb64 = base64Encode(new Uint8Array(ciphertext));
+        let ivb64 = base64Encode(new Uint8Array(iv.buffer));
         return `${ctb64}?iv=${ivb64}`;
     }
     async nip04Decrypt(pubkey, data) {
@@ -182,8 +189,8 @@ export class SerialPortSigner {
         const sharedSecret = hexToBytes(sharedSecretStr);
         // @ts-ignore
         let cryptoKey = await crypto.subtle.importKey("raw", sharedSecret, { name: "AES-CBC" }, false, ["decrypt"]);
-        let ciphertext = base64.decode(ctb64);
-        let iv = base64.decode(ivb64);
+        let ciphertext = base64Decode(ctb64);
+        let iv = base64Decode(ivb64);
         // @ts-ignore
         let plaintext = await crypto.subtle.decrypt({ name: "AES-CBC", iv }, cryptoKey, ciphertext);
         let text = utf8Decoder.decode(plaintext);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-signers",
-  "version": "0.0.0-next-20251030145720",
+  "version": "0.0.0-next-20251205152544",
   "description": "Signer classes for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -44,13 +44,10 @@
     }
   },
   "dependencies": {
-    "@noble/hashes": "^1.7.1",
     "@noble/secp256k1": "^1.7.1",
-    "@scure/base": "^1.2.4",
-    "applesauce-core": "0.0.0-next-20251030145720",
+    "applesauce-core": "0.0.0-next-20251205152544",
     "debug": "^4.4.0",
     "nanoid": "^5.0.9",
-    "nostr-tools": "~2.17",
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
@@ -58,7 +55,7 @@
     "@types/dom-serial": "^1.0.6",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.3",
+    "vitest": "^4.0.15",
     "vitest-websocket-mock": "^0.5.0"
   },
   "funding": {