applesauce-accounts 3.1.0 → 4.1.0

package/dist/accounts/common.js

@@ -2,12 +2,12 @@ import { ExtensionAccount } from "./extension-account.js";
 import { NostrConnectAccount } from "./nostr-connect-account.js";
 import { PasswordAccount } from "./password-account.js";
 import { ReadonlyAccount } from "./readonly-account.js";
-import { SimpleAccount } from "./simple-account.js";
+import { PrivateKeyAccount } from "./private-key-account.js";
 /** Registers the most common account types to a account manager */
 export function registerCommonAccountTypes(manager) {
     manager.registerType(ExtensionAccount);
     manager.registerType(PasswordAccount);
     manager.registerType(ReadonlyAccount);
-    manager.registerType(SimpleAccount);
+    manager.registerType(PrivateKeyAccount);
     manager.registerType(NostrConnectAccount);
 }

package/dist/accounts/index.d.ts

@@ -3,6 +3,7 @@ export * from "./extension-account.js";
 export * from "./password-account.js";
 export * from "./readonly-account.js";
 export * from "./serial-port-account.js";
-export * from "./simple-account.js";
+export * from "./private-key-account.js";
 export * from "./nostr-connect-account.js";
+export * from "./simple-account.js";
 export * from "./common.js";

package/dist/accounts/index.js

@@ -3,6 +3,7 @@ export * from "./extension-account.js";
 export * from "./password-account.js";
 export * from "./readonly-account.js";
 export * from "./serial-port-account.js";
-export * from "./simple-account.js";
+export * from "./private-key-account.js";
 export * from "./nostr-connect-account.js";
+export * from "./simple-account.js";
 export * from "./common.js";

package/dist/accounts/nostr-connect-account.js

@@ -1,4 +1,4 @@
-import { NostrConnectSigner, SimpleSigner } from "applesauce-signers";
+import { NostrConnectSigner, PrivateKeySigner } from "applesauce-signers";
 import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
 import { BaseAccount } from "../account.js";
 /** An account type for NIP-46 signers */
@@ -20,7 +20,7 @@ export class NostrConnectAccount extends BaseAccount {
             relays: json.signer.relays,
             pubkey: json.pubkey,
             remote: json.signer.remote,
-            signer: new SimpleSigner(hexToBytes(json.signer.clientKey)),
+            signer: new PrivateKeySigner(hexToBytes(json.signer.clientKey)),
         });
         const account = new NostrConnectAccount(json.pubkey, signer);
         return super.loadCommonFields(account, json);

package/dist/accounts/private-key-account.d.ts

@@ -0,0 +1,16 @@
+import { PrivateKeySigner } from "applesauce-signers/signers/private-key-signer";
+import { BaseAccount } from "../account.js";
+import { SerializedAccount } from "../types.js";
+export type PrivateKeyAccountSignerData = {
+    key: string;
+};
+/** A simple account that hold the private key in memory */
+export declare class PrivateKeyAccount<Metadata extends unknown> extends BaseAccount<PrivateKeySigner, PrivateKeyAccountSignerData, Metadata> {
+    static readonly type = "nsec";
+    toJSON(): SerializedAccount<PrivateKeyAccountSignerData, Metadata>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<PrivateKeyAccountSignerData, Metadata>): PrivateKeyAccount<Metadata>;
+    /** Creates a PrivateKeyAccount from a hex private key or NIP-19 nsec */
+    static fromKey<Metadata extends unknown>(privateKey: Uint8Array | string): PrivateKeyAccount<Metadata>;
+    /** Creates a new PrivateKeyAccount with a random private key */
+    static generateNew<Metadata extends unknown>(): PrivateKeyAccount<Metadata>;
+}

package/dist/accounts/private-key-account.js

@@ -0,0 +1,29 @@
+import { generateSecretKey, getPublicKey } from "nostr-tools";
+import { PrivateKeySigner } from "applesauce-signers/signers/private-key-signer";
+import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
+import { BaseAccount } from "../account.js";
+/** A simple account that hold the private key in memory */
+export class PrivateKeyAccount extends BaseAccount {
+    static type = "nsec";
+    toJSON() {
+        return super.saveCommonFields({
+            signer: { key: bytesToHex(this.signer.key) },
+        });
+    }
+    static fromJSON(json) {
+        const key = hexToBytes(json.signer.key);
+        const account = new PrivateKeyAccount(json.pubkey, new PrivateKeySigner(key));
+        return super.loadCommonFields(account, json);
+    }
+    /** Creates a PrivateKeyAccount from a hex private key or NIP-19 nsec */
+    static fromKey(privateKey) {
+        const signer = PrivateKeySigner.fromKey(privateKey);
+        const pubkey = getPublicKey(signer.key);
+        return new PrivateKeyAccount(pubkey, signer);
+    }
+    /** Creates a new PrivateKeyAccount with a random private key */
+    static generateNew() {
+        const key = generateSecretKey();
+        return PrivateKeyAccount.fromKey(key);
+    }
+}

package/dist/accounts/simple-account.d.ts

@@ -1,15 +1,4 @@
-import { SimpleSigner } from "applesauce-signers/signers/simple-signer";
-import { BaseAccount } from "../account.js";
-import { SerializedAccount } from "../types.js";
-export type SimpleAccountSignerData = {
-    key: string;
-};
-export declare class SimpleAccount<Metadata extends unknown> extends BaseAccount<SimpleSigner, SimpleAccountSignerData, Metadata> {
-    static readonly type = "nsec";
-    toJSON(): SerializedAccount<SimpleAccountSignerData, Metadata>;
-    static fromJSON<Metadata extends unknown>(json: SerializedAccount<SimpleAccountSignerData, Metadata>): SimpleAccount<Metadata>;
-    /** Creates a SimpleAccount from a hex private key or NIP-19 nsec */
-    static fromKey<Metadata extends unknown>(privateKey: Uint8Array | string): SimpleAccount<Metadata>;
-    /** Creates a new SimpleAccount with a random private key */
-    static generateNew<Metadata extends unknown>(): SimpleAccount<Metadata>;
-}
+import { PrivateKeyAccount } from "./private-key-account.js";
+/** @deprecated Use PrivateKeyAccount instead */
+declare const SimpleAccount: typeof PrivateKeyAccount;
+export { SimpleAccount };

package/dist/accounts/simple-account.js

@@ -1,28 +1,4 @@
-import { generateSecretKey, getPublicKey } from "nostr-tools";
-import { SimpleSigner } from "applesauce-signers/signers/simple-signer";
-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
-import { BaseAccount } from "../account.js";
-export class SimpleAccount extends BaseAccount {
-    static type = "nsec";
-    toJSON() {
-        return super.saveCommonFields({
-            signer: { key: bytesToHex(this.signer.key) },
-        });
-    }
-    static fromJSON(json) {
-        const key = hexToBytes(json.signer.key);
-        const account = new SimpleAccount(json.pubkey, new SimpleSigner(key));
-        return super.loadCommonFields(account, json);
-    }
-    /** Creates a SimpleAccount from a hex private key or NIP-19 nsec */
-    static fromKey(privateKey) {
-        const signer = SimpleSigner.fromKey(privateKey);
-        const pubkey = getPublicKey(signer.key);
-        return new SimpleAccount(pubkey, signer);
-    }
-    /** Creates a new SimpleAccount with a random private key */
-    static generateNew() {
-        const key = generateSecretKey();
-        return SimpleAccount.fromKey(key);
-    }
-}
+import { PrivateKeyAccount } from "./private-key-account.js";
+/** @deprecated Use PrivateKeyAccount instead */
+const SimpleAccount = PrivateKeyAccount;
+export { SimpleAccount };

package/dist/manager.d.ts

@@ -47,4 +47,6 @@ export declare class AccountManager<Metadata extends unknown = any> {
      * NOTE: this will clear all existing accounts
      */
     fromJSON(accounts: SerializedAccount<any, Metadata>[], quite?: boolean): void;
+    /** Create an account from a types array and a serialized account */
+    static deserialize<Signer extends ISigner = ISigner, SignerData extends unknown = any, Metadata extends unknown = any>(types: IAccountConstructor<any, any, any>[], json: SerializedAccount<SignerData, Metadata>): IAccount<Signer, SignerData, Metadata>;
 }

package/dist/manager.js

@@ -155,4 +155,11 @@ export class AccountManager {
             }
         }
     }
+    /** Create an account from a types array and a serialized account */
+    static deserialize(types, json) {
+        const account = types.find((type) => type.type === json.type)?.fromJSON(json);
+        if (!account)
+            throw new Error(`Missing account type ${json.type}`);
+        return account;
+    }
 }

package/dist/types.d.ts

@@ -7,7 +7,7 @@ export type EventTemplate = {
     created_at: number;
 };
 /** A type for serializing an account */
-export type SerializedAccount<SignerData, Metadata extends unknown> = {
+export type SerializedAccount<SignerData extends unknown = any, Metadata extends unknown = any> = {
     /** Internal account ID */
     id: string;
     /** account type */
@@ -20,7 +20,7 @@ export type SerializedAccount<SignerData, Metadata extends unknown> = {
     metadata?: Metadata;
 };
 /** An interface for an account */
-export interface IAccount<Signer extends ISigner = ISigner, SignerData = any, Metadata extends unknown = any> extends ISigner {
+export interface IAccount<Signer extends ISigner = ISigner, SignerData extends unknown = any, Metadata extends unknown = any> extends ISigner {
     id: string;
     name?: string;
     pubkey: string;
@@ -31,7 +31,7 @@ export interface IAccount<Signer extends ISigner = ISigner, SignerData = any, Me
     toJSON(): SerializedAccount<SignerData, Metadata>;
 }
 /** A constructor for an account */
-export interface IAccountConstructor<Signer extends ISigner, SignerData, Metadata extends unknown> {
+export interface IAccountConstructor<Signer extends ISigner, SignerData extends unknown = any, Metadata extends unknown = any> {
     readonly type: string;
     new (pubkey: string, signer: Signer): IAccount<Signer, SignerData, Metadata>;
     fromJSON(json: SerializedAccount<SignerData, Metadata>): IAccount<Signer, SignerData, Metadata>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-accounts",
-  "version": "3.1.0",
+  "version": "4.1.0",
   "description": "A simple nostr account management system",
   "type": "module",
   "main": "dist/index.js",
@@ -33,21 +33,23 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-signers": "^3.1.0",
-    "applesauce-core": "^3.1.0",
+    "applesauce-core": "^4.1.0",
+    "applesauce-signers": "^4.1.0",
     "nanoid": "^5.1.5",
-    "nostr-tools": "~2.15",
+    "nostr-tools": "~2.17",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
+    "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.3"
+    "vitest": "^3.2.4"
   },
   "funding": {
     "type": "lightning",
     "url": "lightning:nostrudel@geyser.fund"
   },
   "scripts": {
+    "prebuild": "rimraf dist",
     "build": "tsc",
     "watch:build": "tsc --watch > /dev/null",
     "test": "vitest run --passWithNoTests",