applesauce-accounts 0.0.0-next-20250128154531 → 0.0.0-next-20250128165956

package/dist/account.d.ts

@@ -23,6 +23,8 @@ export declare class BaseAccount<Signer extends Nip07Interface, SignerData, Meta
     } | undefined;
     constructor(pubkey: string, signer: Signer);
     toJSON(): SerializedAccount<SignerData, Metadata>;
+    /** Sets an accounts id and metadata. NOTE: This should only be used in fromJSON methods */
+    static loadCommonFields<T extends IAccount<any, any, any>>(account: T, json: SerializedAccount<any, any>): T;
     /** Gets the pubkey from the signer */
     getPublicKey(): string | Promise<string>;
     /** sign the event and make sure its signed with the correct pubkey */

package/dist/account.js

@@ -68,6 +68,14 @@ export class BaseAccount {
     toJSON() {
         throw new Error("Not implemented");
     }
+    /** Sets an accounts id and metadata. NOTE: This should only be used in fromJSON methods */
+    static loadCommonFields(account, json) {
+        if (json.id)
+            account.id = json.id;
+        if (json.metadata)
+            account.metadata = json.metadata;
+        return account;
+    }
     /** Gets the pubkey from the signer */
     getPublicKey() {
         const result = this.signer.getPublicKey();

package/dist/accounts/amber-clipboard-account.d.ts

@@ -5,5 +5,5 @@ import { SerializedAccount } from "../types.js";
 export declare class AmberClipboardAccount<Metadata extends unknown> extends BaseAccount<AmberClipboardSigner, void, Metadata> {
     static type: string;
     toJSON(): SerializedAccount<void, Metadata>;
-    static fromJSON<MD extends unknown>(json: SerializedAccount<void, MD>): AmberClipboardAccount<MD>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<void, Metadata>): AmberClipboardAccount<Metadata>;
 }

package/dist/accounts/amber-clipboard-account.js

@@ -13,6 +13,7 @@ export class AmberClipboardAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new AmberClipboardAccount(json.pubkey, new AmberClipboardSigner());
+        const account = new AmberClipboardAccount(json.pubkey, new AmberClipboardSigner());
+        return super.loadCommonFields(account, json);
     }
 }

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

@@ -12,5 +12,5 @@ export declare class ExtensionAccount<Metadata extends unknown> extends BaseAcco
         metadata: Metadata | undefined;
         signer: undefined;
     };
-    static fromJSON<MD extends unknown>(json: SerializedAccount<void, MD>): ExtensionAccount<unknown>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<void, Metadata>): ExtensionAccount<Metadata>;
 }

package/dist/accounts/extension-account.js

@@ -17,6 +17,7 @@ export class ExtensionAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new ExtensionAccount(json.pubkey, new ExtensionSigner());
+        const account = new ExtensionAccount(json.pubkey, new ExtensionSigner());
+        return super.loadCommonFields(account, json);
     }
 }

package/dist/accounts/nostr-connect-account.d.ts

@@ -1,17 +1,16 @@
 import { NostrConnectConnectionMethods, NostrConnectSigner } from "applesauce-signers";
 import { BaseAccount } from "../account.js";
 import { SerializedAccount } from "../types.js";
-type SignerData = {
+export type NostrConnectAccountSignerData = {
     clientKey: string;
     remote: string;
     relays: string[];
 };
 /** An account type for NIP-46 signers */
-export declare class NostrConnectAccount<Metadata extends unknown> extends BaseAccount<NostrConnectSigner, SignerData, Metadata> {
+export declare class NostrConnectAccount<Metadata extends unknown> extends BaseAccount<NostrConnectSigner, NostrConnectAccountSignerData, Metadata> {
     static type: string;
-    toJSON(): SerializedAccount<SignerData, Metadata>;
+    toJSON(): SerializedAccount<NostrConnectAccountSignerData, Metadata>;
     /** This is called when NostrConnectAccount.fromJSON needs new connection methods for NostrConnectSigner */
     static createConnectionMethods(): NostrConnectConnectionMethods;
-    static fromJSON<Metadata extends unknown>(json: SerializedAccount<SignerData, Metadata>, connection?: NostrConnectConnectionMethods): NostrConnectAccount<Metadata>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<NostrConnectAccountSignerData, Metadata>, connection?: NostrConnectConnectionMethods): NostrConnectAccount<Metadata>;
 }
-export {};

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

@@ -27,6 +27,7 @@ export class NostrConnectAccount extends BaseAccount {
             remote: json.signer.remote,
             signer: new SimpleSigner(hexToBytes(json.signer.clientKey)),
         });
-        return new NostrConnectAccount(json.pubkey, signer);
+        const account = new NostrConnectAccount(json.pubkey, signer);
+        return super.loadCommonFields(account, json);
     }
 }

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

@@ -1,10 +1,10 @@
 import { PasswordSigner } from "applesauce-signers/signers/password-signer";
 import { BaseAccount } from "../account.js";
 import { SerializedAccount } from "../types.js";
-type SignerData = {
+export type PasswordAccountSignerData = {
     ncryptsec: string;
 };
-export declare class PasswordAccount<Metadata extends unknown> extends BaseAccount<PasswordSigner, SignerData, Metadata> {
+export declare class PasswordAccount<Metadata extends unknown> extends BaseAccount<PasswordSigner, PasswordAccountSignerData, Metadata> {
     static type: string;
     get unlocked(): boolean;
     /** called when PasswordAccount.unlock is called without a password */
@@ -14,9 +14,8 @@ export declare class PasswordAccount<Metadata extends unknown> extends BaseAccou
      * @throws
      */
     unlock(password?: string): Promise<void>;
-    toJSON(): SerializedAccount<SignerData, Metadata>;
-    static fromJSON<Metadata extends unknown>(json: SerializedAccount<SignerData, Metadata>): PasswordAccount<Metadata>;
+    toJSON(): SerializedAccount<PasswordAccountSignerData, Metadata>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<PasswordAccountSignerData, Metadata>): PasswordAccount<Metadata>;
     /** Creates a new PasswordAccount from a ncryptsec string */
     static fromNcryptsec<Metadata extends unknown>(pubkey: string, ncryptsec: string): PasswordAccount<Metadata>;
 }
-export {};

package/dist/accounts/password-account.js

@@ -31,7 +31,8 @@ export class PasswordAccount extends BaseAccount {
     static fromJSON(json) {
         const signer = new PasswordSigner();
         signer.ncryptsec = json.signer.ncryptsec;
-        return new PasswordAccount(json.pubkey, signer);
+        const account = new PasswordAccount(json.pubkey, signer);
+        return super.loadCommonFields(account, json);
     }
     /** Creates a new PasswordAccount from a ncryptsec string */
     static fromNcryptsec(pubkey, ncryptsec) {

package/dist/accounts/readonly-account.js

@@ -13,6 +13,7 @@ export class ReadonlyAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new ReadonlyAccount(json.pubkey, new ReadonlySigner(json.pubkey));
+        const account = new ReadonlyAccount(json.pubkey, new ReadonlySigner(json.pubkey));
+        return super.loadCommonFields(account, json);
     }
 }

package/dist/accounts/serial-port-account.js

@@ -24,6 +24,8 @@ export class SerialPortAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new SerialPortAccount(json.pubkey, new SerialPortSigner());
+        const signer = new SerialPortSigner();
+        const account = new SerialPortAccount(json.pubkey, signer);
+        return super.loadCommonFields(account, json);
     }
 }

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

@@ -1,13 +1,12 @@
 import { SimpleSigner } from "applesauce-signers/signers/simple-signer";
 import { BaseAccount } from "../account.js";
 import { SerializedAccount } from "../types.js";
-type SignerData = {
+export type SimpleAccountSignerData = {
     key: string;
 };
-export declare class SimpleAccount<Metadata extends unknown> extends BaseAccount<SimpleSigner, SignerData, Metadata> {
+export declare class SimpleAccount<Metadata extends unknown> extends BaseAccount<SimpleSigner, SimpleAccountSignerData, Metadata> {
     static type: string;
-    toJSON(): SerializedAccount<SignerData, Metadata>;
-    static fromJSON<Metadata extends unknown>(json: SerializedAccount<SignerData, Metadata>): SimpleAccount<Metadata>;
+    toJSON(): SerializedAccount<SimpleAccountSignerData, Metadata>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<SimpleAccountSignerData, Metadata>): SimpleAccount<Metadata>;
     static fromKey<Metadata extends unknown>(key: Uint8Array | string): SimpleAccount<Metadata>;
 }
-export {};

package/dist/accounts/simple-account.js

@@ -15,7 +15,8 @@ export class SimpleAccount extends BaseAccount {
     }
     static fromJSON(json) {
         const key = hexToBytes(json.signer.key);
-        return new SimpleAccount(json.pubkey, new SimpleSigner(key));
+        const account = new SimpleAccount(json.pubkey, new SimpleSigner(key));
+        return super.loadCommonFields(account, json);
     }
     static fromKey(key) {
         if (typeof key === "string")

package/dist/manager.d.ts

@@ -33,6 +33,8 @@ export declare class AccountManager<Metadata extends unknown = any> {
     clearActive(): void;
     /** sets the metadata on an account */
     setAccountMetadata(id: string | IAccount<any, any, Metadata>, metadata: Metadata): void;
+    /** sets the metadata on an account */
+    getAccountMetadata(id: string | IAccount<any, any, Metadata>): Metadata | undefined;
     /** Removes all metadata on the account */
     clearAccountMetadata(id: string | IAccount<any, any, Metadata>): void;
     /** Returns an array of serialized accounts */

package/dist/manager.js

@@ -50,10 +50,7 @@ export class AccountManager {
         if (this.disableQueue !== undefined && account.disableQueue !== undefined) {
             account.disableQueue = this.disableQueue;
         }
-        this.accounts$.next({
-            ...this.accounts$.value,
-            [account.id]: account,
-        });
+        this.accounts$.next([...this.accounts$.value, account]);
     }
     /** Removes an account from the manager */
     removeAccount(account) {
@@ -95,6 +92,13 @@ export class AccountManager {
             throw new Error("Cant find account with that ID");
         account.metadata = metadata;
     }
+    /** sets the metadata on an account */
+    getAccountMetadata(id) {
+        const account = this.getAccount(id);
+        if (!account)
+            throw new Error("Cant find account with that ID");
+        return account.metadata;
+    }
     /** Removes all metadata on the account */
     clearAccountMetadata(id) {
         const account = this.getAccount(id);
@@ -105,7 +109,7 @@ export class AccountManager {
     // Serialize / Deserialize
     /** Returns an array of serialized accounts */
     toJSON() {
-        return Array.from(Object.values(this.accounts$)).map((account) => account.toJSON());
+        return Array.from(this.accounts$.value).map((account) => account.toJSON());
     }
     /**
      * Restores all accounts from an array of serialized accounts

package/dist/manager.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/manager.test.js

@@ -0,0 +1,45 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { AccountManager } from "./manager.js";
+import { SimpleAccount } from "./accounts/simple-account.js";
+import { generateSecretKey, getPublicKey } from "nostr-tools";
+import { bytesToHex } from "@noble/hashes/utils";
+describe("AccountManager", () => {
+    let manager;
+    beforeEach(() => {
+        manager = new AccountManager();
+    });
+    describe("toJSON", () => {
+        it("should return an array of serialized accounts", () => {
+            manager.addAccount(SimpleAccount.fromKey(generateSecretKey()));
+            manager.setAccountMetadata(manager.accounts[0], { name: "testing" });
+            expect(manager.toJSON()).toEqual([
+                {
+                    id: expect.any(String),
+                    type: "nsec",
+                    pubkey: expect.any(String),
+                    metadata: { name: "testing" },
+                    signer: { key: expect.any(String) },
+                },
+            ]);
+        });
+    });
+    describe("fromJSON", () => {
+        it("should recreate accounts", () => {
+            const key = generateSecretKey();
+            const json = [
+                {
+                    id: "custom-id",
+                    type: "nsec",
+                    pubkey: getPublicKey(key),
+                    metadata: { name: "testing" },
+                    signer: { key: bytesToHex(key) },
+                },
+            ];
+            manager.registerType(SimpleAccount);
+            manager.fromJSON(json);
+            expect(manager.getAccount("custom-id")).toBeInstanceOf(SimpleAccount);
+            expect(manager.getAccountForPubkey(getPublicKey(key))).toBeInstanceOf(SimpleAccount);
+            expect(manager.getAccountMetadata("custom-id")).toEqual({ name: "testing" });
+        });
+    });
+});

package/dist/types.d.ts

@@ -10,8 +10,6 @@ export type SerializedAccount<SignerData, Metadata extends unknown> = {
     id: string;
     /** account type */
     type: string;
-    /** local name of the account */
-    name?: string;
     /** pubkey of the account */
     pubkey: string;
     /** Signer data */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-accounts",
-  "version": "0.0.0-next-20250128154531",
+  "version": "0.0.0-next-20250128165956",
   "description": "A simple nostr account management system",
   "type": "module",
   "main": "dist/index.js",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.5.0",
-    "applesauce-signers": "0.0.0-next-20250128154531",
+    "applesauce-signers": "0.0.0-next-20250128165956",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.3",
     "rxjs": "^7.8.1"