@majikah/majik-message 0.3.6 → 0.3.8

package/dist/index.d.ts

@@ -5,13 +5,11 @@ export * from "./core/contacts/majik-contact-directory";
 export * from "./core/contacts/majik-contact-groups";
 export * from "./core/crypto/constants";
 export * from "./core/crypto/crypto-provider";
-export * from "./core/crypto/encryption-engine";
-export * from "./core/crypto/keystore";
 export * from "./core/messages/message-envelope";
 export * from "./core/messages/envelope-cache";
-export * from "./core/scanner/scanner-engine";
-export * from "./core/utils/APITranscoder";
 export * from "./core/utils/utilities";
+export * from "./core/crypto/keystore-manager";
+export * from "./core/storage";
 export * from "./core/database/chat/majik-message-chat";
 export type * from "./core/database/chat/types";
 export * from "./core/database/system/identity";

package/dist/index.js

@@ -4,13 +4,11 @@ export * from "./core/contacts/majik-contact-directory";
 export * from "./core/contacts/majik-contact-groups";
 export * from "./core/crypto/constants";
 export * from "./core/crypto/crypto-provider";
-export * from "./core/crypto/encryption-engine";
-export * from "./core/crypto/keystore";
 export * from "./core/messages/message-envelope";
 export * from "./core/messages/envelope-cache";
-export * from "./core/scanner/scanner-engine";
-export * from "./core/utils/APITranscoder";
 export * from "./core/utils/utilities";
+export * from "./core/crypto/keystore-manager";
+export * from "./core/storage";
 export * from "./core/database/chat/majik-message-chat";
 export * from "./core/database/system/identity";
 export * from "./core/compressor/majik-compressor";

package/dist/majik-message.d.ts

@@ -1,29 +1,48 @@
 import { MajikContact, MajikContactGroup, MajikContactGroupMeta, type MajikContactMeta, type SerializedMajikContact } from "@majikah/majik-contact";
 import { MessageEnvelope } from "./core/messages/message-envelope";
 import { EnvelopeCache, type EnvelopeCacheItem, type EnvelopeCacheJSON } from "./core/messages/envelope-cache";
-import { MajikKeyStore } from "./core/crypto/keystore";
 import type { DecryptFileOptions, EncryptFileOptions, EncryptFileResult, MAJIK_API_RESPONSE, MajikMessagePublicKey } from "./core/types";
 import { MajikMessageChat } from "./core/database/chat/majik-message-chat";
 import { MajikMessageIdentity } from "./core/database/system/identity";
 import { MajikKey } from "@majikah/majik-key";
+import { type MajikRecipient } from "@majikah/majik-envelope";
 import { MajikFile, MajikFileJSON } from "@majikah/majik-file";
 import { EnvelopeInfo, ExpectedSigner, MajikSignature, SealInfo, SealVerificationResult, SignatoriesFilter, SignatoriesResult, SignatoryInfo, type MajikSignatureJSON, type MajikSignerPublicKeys, type VerificationResult } from "@majikah/majik-signature";
-import { MajikContactManager } from "./core/contacts/majik-contact-manager";
+import { MajikContactManager, MajikContactManagerAdapters } from "./core/contacts/majik-contact-manager";
 import { MajikContactManagerJSON } from "./core/contacts/types";
+import { ClientStateStorageAdapter, MajikKeyStorageAdapter, SQLiteDatabase } from "./core/storage";
+import { MajikKeyManager } from "./core/crypto/keystore-manager";
+import { ClientStateManager } from "./core/client-state-manager";
 type MajikMessageEvents = "message" | "envelope" | "untrusted" | "error" | "new-account" | "new-contact" | "new-contact-group" | "removed-account" | "removed-contact" | "removed-contact-group" | "contact-group-change" | "active-account-change";
-interface MajikMessageStatic<T extends MajikMessage> {
-    new (config: MajikMessageConfig, id?: string): T;
-    fromJSON(json: MajikMessageJSON): Promise<T>;
-}
 export interface MajikMessageConfig {
-    keyStore?: typeof MajikKeyStore;
+    dbSQL?: SQLiteDatabase;
     /**
-     * Optional pre-constructed MajikContactManager.
-     * When omitted, MajikMessage creates a fresh one internally.
-     * Pass one when restoring state from fromJSON() or loadState().
+     * Shared contact directory.
+     * Pass the same instance used by MajikMessage to keep contacts in sync.
      */
     contactManager?: MajikContactManager;
+    /**
+     * Pre-constructed key manager. If provided, adapters.keys is ignored.
+     * Pass the same instance used by MajikMessage / MajikSignatureClient
+     * to share a single keystore across clients.
+     */
+    keyManager?: MajikKeyManager;
     envelopeCache?: EnvelopeCache;
+    /**
+     * Pre-constructed client state manager. If provided, adapters.clientState
+     * is ignored.
+     */
+    clientStateManager?: ClientStateManager;
+    adapters?: {
+        contacts?: MajikContactManagerAdapters;
+        keys?: MajikKeyStorageAdapter;
+        /**
+         * Adapter for client-level state (account order, invoice defaults, etc.).
+         * Defaults to IDB_ADAPTER_CLIENT_STATE in browser environments.
+         * Pass InMemoryClientStateAdapter for tests or non-browser runtimes.
+         */
+        clientState?: ClientStateStorageAdapter;
+    };
 }
 export interface MajikMessageJSON {
     id: string;
@@ -36,21 +55,48 @@ export interface MajikMessageJSON {
 }
 type EventCallback = (...args: any[]) => void;
 export declare class MajikMessage {
-    private userProfile;
-    private id;
-    private contacts;
+    private readonly _id;
+    private _db;
+    private _contacts;
+    private _keys;
+    private _state;
     private envelopeCache;
-    private listeners;
-    private ownAccounts;
-    private ownAccountsOrder;
-    private autosaveTimer;
-    private autosaveIntervalId;
-    private readonly autosaveIntervalMs;
-    private readonly autosaveDebounceMs;
-    constructor(config: MajikMessageConfig, id?: string, userProfile?: string);
+    private _listeners;
+    /** MajikContact instances for accounts this client owns. */
+    private _ownAccounts;
+    /**
+     * Ordered list of own account IDs — head is the active account.
+     * Source of truth is ClientStateManager; this array is the in-memory
+     * working copy kept in sync on every mutation.
+     */
+    private _ownAccountsOrder;
+    private _autosaveOrderTimer;
+    constructor(config: MajikMessageConfig, id?: string);
+    /** Expose the key manager so callers can share it with other clients. */
+    get keyManager(): MajikKeyManager;
+    /** Expose the client state manager for direct access if needed. */
+    get stateManager(): ClientStateManager;
+    /**
+     * Load all domains from their adapters and restore client state.
+     * Call once on startup.
+     *
+     * ```ts
+     * const client = new MajikBuwizClient({ adapters: { keys: idbAdapter, ... } });
+     * await client.hydrate();
+     * ```
+     */
+    hydrate(): Promise<void>;
+    private _hydrateOwnAccounts;
+    private _restoreAccountOrder;
+    private _scheduleOrderSave;
+    private _persistAccountOrder;
+    /**
+     * Construct a client and immediately hydrate it.
+     */
+    static create<T extends MajikMessage>(this: new (config: MajikMessageConfig) => T, config?: MajikMessageConfig): Promise<T>;
     /**
      * Resolve a list of account/contact IDs into MajikRecipient objects.
-     * Each recipient needs their ML-KEM public key from MajikKeyStore.
+     * Each recipient needs their ML-KEM public key from this.keyManager.
      */
     private _resolveRecipientsByPublicKey;
     /**
@@ -79,180 +125,78 @@ export declare class MajikMessage {
     private _resolveFileRecipientsByPublicKey;
     /** Canonical source for the scanner hostname tag. */
     private get _source();
-    generateMnemonic(): string;
-    exportAccountMnemonicBackup(id: string, mnemonic: string): Promise<string>;
-    /**
-     * Import an account from a mnemonic-encrypted backup.
-     * Fully upgrades to Argon2id KDF + ML-KEM keys in one step.
-     */
+    generateMnemonic(strength?: 128 | 256): string;
+    createAccount(mnemonic: string, passphrase: string, label?: string): Promise<{
+        id: string;
+        fingerprint: string;
+        backup: string;
+    }>;
     importAccountFromMnemonicBackup(backupBase64: string, mnemonic: string, passphrase: string, label?: string): Promise<{
         id: string;
         fingerprint: string;
     }>;
-    /**
-     * Create a new account from a mnemonic, store it encrypted with passphrase.
-     */
-    createAccountFromMnemonic(mnemonic: string, passphrase: string, label?: string): Promise<{
+    replaceAccountFromMnemonicBackup(backupBase64: string, mnemonic: string, passphrase: string, label?: string): Promise<{
         id: string;
         fingerprint: string;
-        backup: string;
     }>;
+    exportAccountMnemonicBackup(id: string, mnemonic: string): Promise<string>;
     addOwnAccount(account: MajikContact): void;
-    listOwnAccounts(majikahOnly?: boolean): MajikContact[];
+    removeOwnAccount(id: string): Promise<boolean>;
     getOwnAccountById(id: string): MajikContact | undefined;
-    setActiveAccount(id: string, bypassIdentity?: boolean): Promise<boolean>;
     getActiveAccount(): MajikContact | null;
+    getActiveAccountKey(): MajikKey | null;
     isAccountActive(id: string): boolean;
-    removeOwnAccount(id: string): boolean;
+    setActiveAccount(id: string, bypassIdentity?: boolean): Promise<boolean>;
+    listOwnAccounts(majikahOnly?: boolean): MajikContact[];
+    isContactMajikahRegistered(id: string): boolean;
+    isContactMajikahIdentityChecked(id: string): boolean;
+    setContactMajikahStatus(id: string, status: boolean): void;
     hasOwnIdentity(fingerprint: string): Promise<boolean>;
-    updatePassphrase(currentPassphrase: string, newPassphrase: string, id?: string): Promise<void>;
     getContactByID(id: string): MajikContact | null;
-    hasContact(id: string): boolean;
-    hasContactByPublicKeyBase64(publicKey: MajikMessagePublicKey): Promise<boolean>;
-    getContactByPublicKey(publicKeyBase64: MajikMessagePublicKey): Promise<MajikContact | null>;
-    exportContactAsJSON(contactID: string): Promise<string | null>;
-    exportContactAsString(contactID: string): Promise<string | null>;
+    getContactByPublicKey(publicKeyBase64: string): Promise<MajikContact | null>;
+    getContactsByID(ids: string[], strict?: boolean): MajikContact[];
+    getContactsByPublicKey(publicKeys: string[]): Promise<MajikContact[]>;
+    getMajikRecipientsByPublicKey(publicKeys: string[], strict?: boolean): Promise<MajikRecipient[]>;
+    getExpectedSignersByPublicKey(publicKeys: string[], strict?: boolean): Promise<ExpectedSigner[]>;
+    exportContactAsJSON(id: string): Promise<string | null>;
+    exportContactAsString(id: string): Promise<string | null>;
     importContactFromJSON(jsonStr: string): Promise<MAJIK_API_RESPONSE>;
     importContactFromString(base64Str: string): Promise<MAJIK_API_RESPONSE>;
     exportContactCompressed(contact: MajikContact): Promise<string>;
     importContactCompressed(base64Str: string): Promise<MajikContact>;
-    addContact(contact: MajikContact): void;
-    removeContact(id: string): void;
-    updateContactMeta(id: string, meta: Partial<MajikContactMeta>): void;
-    blockContact(id: string): void;
-    unblockContact(id: string): void;
-    listContacts(all?: boolean, majikahOnly?: boolean): MajikContact[];
-    isContactMajikahRegistered(id: string): boolean;
-    isContactMajikahIdentityChecked(id: string): boolean;
-    setContactMajikahStatus(id: string, status: boolean): void;
-    /**
-     * Creates and registers a new user-defined group.
-     * Throws if a group with the same ID already exists.
-     */
-    createGroup(id: string, name: string, meta?: Partial<Omit<MajikContactGroupMeta, "name">>, initialMemberIds?: string[]): this;
-    /**
-     * Registers an already-constructed MajikContactGroup instance.
-     * Throws if a group with the same ID already exists.
-     */
-    addGroup(group: MajikContactGroup): this;
-    /**
-     * Removes a user group by ID.
-     * System groups (Favorites, Blocked) cannot be deleted.
-     */
-    removeGroup(id: string): MAJIK_API_RESPONSE;
-    /**
-     * Returns a group by ID, or undefined if not found.
-     */
+    addContact(contact: MajikContact): Promise<void>;
+    removeContact(id: string): Promise<void>;
+    listContacts(includeOwnAccounts?: boolean): MajikContact[];
+    updateContactMeta(id: string, meta: Partial<MajikContactMeta>): Promise<void>;
+    createGroup(id: string, name: string, meta?: Partial<Omit<MajikContactGroupMeta, "name">>, initialMemberIds?: string[]): Promise<this>;
+    addGroup(group: MajikContactGroup): Promise<this>;
+    removeGroup(id: string): Promise<MAJIK_API_RESPONSE>;
     getContactGroup(id: string): MajikContactGroup | undefined;
-    /**
-     * Returns a group by ID. Throws if not found.
-     */
     getGroupOrThrow(id: string): MajikContactGroup;
-    /**
-     * Returns true if a group with the given ID exists.
-     */
     hasGroup(id: string): boolean;
-    /**
-     * Returns all groups.
-     *
-     * @param includeSystem  Include system groups (Favorites, Blocked). Default: true.
-     * @param sortedByName   Sort results alphabetically by group name. Default: false.
-     */
     listContactGroups(includeSystem?: boolean, sortedByName?: boolean): MajikContactGroup[];
-    /**
-     * Returns only user-created groups (excludes Favorites and Blocked).
-     * Sorted alphabetically by name.
-     */
     listUserGroups(sortedByName?: boolean): MajikContactGroup[];
-    /**
-     * Returns only system groups (Favorites and Blocked).
-     */
     listSystemGroups(): MajikContactGroup[];
-    /**
-     * Updates mutable metadata on a group (name, description).
-     * Name is locked on system groups — will throw if attempted.
-     */
-    updateGroupMeta(id: string, meta: Partial<Pick<MajikContactGroupMeta, "name" | "description" | "color">>): this;
-    /**
-     * Adds a contact to a group.
-     * Validates the contact exists in the directory.
-     * If the group is the system Blocked group, also calls contact.block().
-     * Throws if the contact is already a member — use addContactToGroupIfAbsent for idempotent.
-     */
-    addContactToGroup(groupID: string, contactID: string): this;
-    /**
-     * Adds multiple contacts to a group in one call (all-or-nothing).
-     */
-    addContactsToGroup(groupID: string, contactIds: string[]): this;
-    /**
-     * Removes a contact from a group.
-     * If the group is the system Blocked group, also calls contact.unblock().
-     * Throws if the contact is not a member — use removeContactFromGroupIfPresent for idempotent.
-     */
-    removeContactFromGroup(groupID: string, contactID: string): this;
-    /**
-     * Moves a contact from one group to another atomically.
-     * Throws if the contact is not a member of the source group.
-     */
-    moveContactBetweenGroups(contactID: string, fromGroupId: string, toGroupId: string): this;
-    /**
-     * Returns all hydrated MajikContact instances in the given group.
-     * Contacts removed from the directory since last save are silently skipped.
-     */
+    updateGroupMeta(id: string, meta: Partial<Pick<MajikContactGroupMeta, "name" | "description" | "color">>): Promise<this>;
+    addContactToGroup(groupID: string, contactID: string): Promise<this>;
+    addContactsToGroup(groupID: string, contactIds: string[]): Promise<this>;
+    removeContactFromGroup(groupID: string, contactID: string): Promise<this>;
+    moveContactBetweenGroups(contactID: string, fromGroupId: string, toGroupId: string): Promise<this>;
     getContactsInGroup(groupID: string): MajikContact[];
-    /**
-     * Returns hydrated contacts in the group, sorted by label (or ID if no label).
-     */
     getContactsInGroupSorted(groupID: string): MajikContact[];
-    /**
-     * Returns true if the contact is a member of the given group.
-     */
     isContactInGroup(groupID: string, contactID: string): boolean;
-    /**
-     * Returns all groups the contact belongs to.
-     */
     getGroupsForContact(contactID: string): MajikContactGroup[];
-    /**
-     * Returns all group IDs the contact belongs to.
-     */
     getGroupIdsForContact(contactID: string): string[];
-    /**
-     * Adds the contact to the Favorites group (idempotent).
-     */
-    addContactToFavorites(contactID: string): this;
-    /**
-     * Removes the contact from the Favorites group (idempotent).
-     */
-    removeContactFromFavorites(contactID: string): this;
-    /**
-     * Returns true if the contact is in the Favorites group.
-     */
+    addContactToFavorites(contactID: string): Promise<this>;
+    removeContactFromFavorites(contactID: string): Promise<this>;
     isContactFavorite(contactID: string): boolean;
-    /**
-     * Returns true if the contact is in the Blocked group.
-     */
     isContactBlocked(contactID: string): boolean;
-    /**
-     * Returns the Favorites system group instance.
-     */
     getFavoritesGroup(): MajikContactGroup;
-    /**
-     * Returns the Blocked system group instance.
-     */
     getBlockedGroup(): MajikContactGroup;
-    /**
-     * Returns all contacts in the Favorites group as hydrated MajikContact instances.
-     */
     getFavoriteContacts(): MajikContact[];
-    /**
-     * Returns all contacts in the Blocked group as hydrated MajikContact instances.
-     */
     getBlockedContacts(): MajikContact[];
-    /**
-     * Clears both the directory and all group memberships.
-     * System groups are preserved (re-bootstrapped by the group manager).
-     */
-    clearDirectory(): this;
+    clearDirectory(): Promise<this>;
+    resolveSignerLabel(signerId: string): string;
     /**
      * Compose and encrypt a message for one or more recipients.
      * Single recipient → solo envelope. Two or more → group envelope.
@@ -680,7 +624,7 @@ export declare class MajikMessage {
     clearCachedEnvelopes(): Promise<boolean>;
     /**
      * Ensure an identity is unlocked.
-     * Delegates entirely to MajikKeyStore.ensureUnlocked() — passphrase prompting
+     * Delegates entirely to this.keyManager.ensureUnlocked() — passphrase prompting
      * is handled there via onUnlockRequested or the optional promptFn.
      */
     ensureIdentityUnlocked(id: string, promptFn?: (id: string) => string | Promise<string>): Promise<CryptoKey | {
@@ -689,7 +633,7 @@ export declare class MajikMessage {
     isPassphraseValid(passphrase: string, id?: string): Promise<boolean>;
     on(event: MajikMessageEvents, callback: EventCallback): void;
     off(event: MajikMessageEvents, callback?: EventCallback): void;
-    private emit;
+    private _emit;
     /**
      * Sign raw bytes or a string using the active account.
      *
@@ -1123,15 +1067,11 @@ export declare class MajikMessage {
      * throughout MajikMessage — consistent account/contact resolution in one place.
      */
     private _resolveSignerPublicKeys;
-    toJSON(): Promise<MajikMessageJSON>;
-    static fromJSON<T extends MajikMessage>(this: new (config: MajikMessageConfig, id?: string) => T, json: MajikMessageJSON): Promise<T>;
-    private attachAutosaveHandlers;
-    startAutosave(): void;
-    stopAutosave(): void;
-    private scheduleAutosave;
-    saveState(): Promise<void>;
-    loadState(): Promise<void>;
-    static loadOrCreate<T extends MajikMessage>(this: MajikMessageStatic<T>, config: MajikMessageConfig, userProfile?: string): Promise<T>;
-    resetData(userProfile?: string): Promise<void>;
+    /**
+     * Wipe all data from every adapter and reset in-memory state.
+     * The client remains usable — call hydrate() or add new accounts after reset.
+     */
+    resetData(): Promise<void>;
+    private _registerOwnAccount;
 }
 export {};