@majikah/majik-message 0.3.7 → 0.3.9

package/dist/core/contacts/majik-contact-manager.d.ts

@@ -2,9 +2,11 @@ import { MajikContact, MajikContactData, MajikContactGroup, MajikContactGroupMet
 import { MajikContactDirectory } from "./majik-contact-directory";
 import { MajikContactGroupManager } from "./majik-contact-groups";
 import { MAJIK_API_RESPONSE } from "../types";
-import { MajikContactManagerJSON } from "./types";
+import { ContactManagerQueryMode, MajikContactManagerJSON } from "./types";
 import { MajikContactStorageAdapter } from "../storage/contact-directory/contacts/_types";
 import { MajikContactGroupStorageAdapter } from "../storage/contact-directory/groups/_types";
+import { MajikRecipient } from "@majikah/majik-envelope";
+import { ExpectedSigner } from "@majikah/majik-signature";
 export interface MajikContactManagerAdapters {
     contacts?: MajikContactStorageAdapter;
     groups?: MajikContactGroupStorageAdapter;
@@ -83,6 +85,10 @@ export declare class MajikContactManager {
     getContact(id: string): MajikContact | undefined;
     getContactByFingerprint(fingerprint: string): MajikContact | undefined;
     getContactByPublicKeyBase64(publicKeyBase64: string): Promise<MajikContact | undefined>;
+    getContactsByIds(ids: string[], strict?: boolean): MajikContact[];
+    getContactsByPublicKeys(publicKeys: string[], strict?: boolean): Promise<MajikContact[]>;
+    getMajikRecipients(mode: ContactManagerQueryMode | undefined, input: string[], strict?: boolean): Promise<MajikRecipient[]>;
+    getExpectedSigners(mode: ContactManagerQueryMode | undefined, input: string[], strict?: boolean): Promise<ExpectedSigner[]>;
     hasContact(id: string): boolean;
     hasFingerprint(fingerprint: string): boolean;
     hasContactByPublicKeyBase64(publicKeyBase64: string): Promise<boolean>;

package/dist/core/contacts/majik-contact-manager.js

@@ -2,11 +2,12 @@ import { MajikContact, } from "@majikah/majik-contact";
 import { MajikContactDirectory } from "./majik-contact-directory";
 import { MajikContactGroupManager } from "./majik-contact-groups";
 import { MajikContactManagerError } from "./errors";
-import { arrayBufferToBase64, arrayToBase64, base64ToArrayBuffer, } from "../utils/utilities";
+import { arrayBufferToBase64, arrayToBase64, base64ToArrayBuffer, base64ToUint8Array, } from "../utils/utilities";
 import { KEY_ALGO } from "../crypto/constants";
 import { gunzipSync, gzipSync } from "fflate";
 import { InMemoryContactAdapter } from "../storage/contact-directory/contacts/adapter-memory";
 import { InMemoryContactGroupAdapter } from "../storage/contact-directory/groups/adapter-memory";
+import { MajikEnvelope } from "@majikah/majik-envelope";
 export class MajikContactManager {
     directory;
     groupManager;
@@ -191,7 +192,106 @@ export class MajikContactManager {
         return this.directory.getContactByFingerprint(fingerprint);
     }
     async getContactByPublicKeyBase64(publicKeyBase64) {
-        return this.directory.getContactByPublicKeyBase64(publicKeyBase64);
+        return await this.directory.getContactByPublicKeyBase64(publicKeyBase64);
+    }
+    getContactsByIds(ids, strict = false) {
+        if (!ids?.length)
+            return [];
+        const seen = new Set();
+        const results = [];
+        for (const id of ids) {
+            if (seen.has(id))
+                continue;
+            seen.add(id);
+            const contact = this.directory.getContact(id);
+            if (!contact) {
+                if (strict) {
+                    throw new MajikContactManagerError(`Contact not found: ${id}`);
+                }
+                continue;
+            }
+            results.push(contact);
+        }
+        return results;
+    }
+    async getContactsByPublicKeys(publicKeys, strict = false) {
+        if (!publicKeys?.length)
+            return [];
+        const uniqueKeys = [...new Set(publicKeys)];
+        const contacts = await Promise.all(uniqueKeys.map(async (key) => {
+            const contact = await this.directory.getContactByPublicKeyBase64(key);
+            if (!contact && strict) {
+                throw new MajikContactManagerError(`Contact not found for publicKey: ${key}`);
+            }
+            return contact;
+        }));
+        return contacts.filter((c) => Boolean(c));
+    }
+    async getMajikRecipients(mode = "id", input, strict) {
+        if (!input?.length)
+            throw new MajikContactManagerError("At least 1 id/key is required");
+        const contacts = mode === "public_key"
+            ? await this.getContactsByPublicKeys(input, strict)
+            : this.getContactsByIds(input, strict);
+        if (!contacts || contacts.length === 0)
+            return [];
+        const recipients = [];
+        const seen = new Set();
+        const invalidContacts = [];
+        for (const contact of contacts) {
+            if (!contact)
+                continue;
+            // dedupe by fingerprint
+            if (seen.has(contact.fingerprint))
+                continue;
+            const mlPubKey = base64ToUint8Array(contact.mlKey);
+            if (!mlPubKey) {
+                invalidContacts.push(contact.fingerprint);
+                continue;
+            }
+            const builtMajikRecipient = await MajikEnvelope.buildMajikRecipientFromContact(contact);
+            recipients.push(builtMajikRecipient);
+            seen.add(contact.fingerprint);
+        }
+        if (invalidContacts.length > 0) {
+            throw new MajikContactManagerError(`Invalid ML-KEM public key for contact(s): ${invalidContacts.join(", ")}`);
+        }
+        return recipients;
+    }
+    async getExpectedSigners(mode = "id", input, strict) {
+        if (!input?.length)
+            throw new MajikContactManagerError("At least 1 id/key is required");
+        const contacts = mode === "public_key"
+            ? await this.getContactsByPublicKeys(input, strict)
+            : this.getContactsByIds(input, strict);
+        if (!contacts || contacts.length === 0)
+            return [];
+        const signers = [];
+        const seen = new Set();
+        const invalidContacts = [];
+        for (const contact of contacts) {
+            if (!contact)
+                continue;
+            // dedupe by fingerprint
+            if (seen.has(contact.fingerprint))
+                continue;
+            const mlDsaPublicKey = contact.mlDsaPublicKeyBase64;
+            if (!mlDsaPublicKey?.trim()) {
+                invalidContacts.push(contact.fingerprint);
+                continue;
+            }
+            const expectedSigner = {
+                edPublicKey: contact.edPublicKeyBase64,
+                mlDsaPublicKey: contact.mlDsaPublicKeyBase64,
+                signerId: contact.fingerprint,
+            };
+            signers.push(expectedSigner);
+            seen.add(contact.fingerprint);
+        }
+        if (invalidContacts.length > 0) {
+            throw new MajikContactManagerError(`Invalid ML-KEM public key for contact(s): ${invalidContacts.join(", ")}`);
+        }
+        return signers;
     }
     hasContact(id) {
         return this.directory.hasContact(id);

package/dist/core/contacts/types.d.ts

@@ -1,4 +1,5 @@
 import { SerializedMajikContact, SerializedMajikContactGroup } from "@majikah/majik-contact";
+export type ContactManagerQueryMode = "id" | "public_key";
 export interface MajikContactManagerJSON {
     contacts: MajikContactDirectoryData;
     groups: MajikContactGroupManagerData;

package/dist/core/storage/chats/adapter-sql.d.ts

@@ -2,7 +2,7 @@ import { MajikMessageChatJSON } from "../../database/chat/types";
 import { SQLiteDatabase } from "../sql-db-manager";
 import { StorageSource } from "../storage-adapter";
 import { MajikMessageChatStorageAdapter } from "./_types";
-export declare class SQLiteInvoiceAdapter implements MajikMessageChatStorageAdapter {
+export declare class SQLiteMessageChatsAdapter implements MajikMessageChatStorageAdapter {
     private db;
     constructor(db: SQLiteDatabase);
     save(message: MajikMessageChatJSON, source?: StorageSource): Promise<void>;

package/dist/core/storage/chats/adapter-sql.js

@@ -1,24 +1,25 @@
-export class SQLiteInvoiceAdapter {
+import { MAJIKAH_SQL_TABLES } from "../sql-schema";
+export class SQLiteMessageChatsAdapter {
     db;
     constructor(db) {
         this.db = db;
     }
-    async save(message, source = "local") {
-        const resolvedSource = source ?? "local";
-        await this.db.run(`INSERT OR REPLACE INTO majik_message_chats 
+    async save(message, source = `local`) {
+        const resolvedSource = source ?? `local`;
+        await this.db.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} 
      (id, json, created_at, source)
      VALUES (?, ?, ?, ?)`, [message.id, JSON.stringify(message), message.timestamp, resolvedSource]);
     }
     async getById(id, source) {
         const row = source
-            ? await this.db.get("SELECT json FROM majik_messages WHERE id = ? AND source = ?", [id, source])
-            : await this.db.get("SELECT json FROM majik_messages WHERE id = ?", [id]);
+            ? await this.db.get(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ? AND source = ?`, [id, source])
+            : await this.db.get(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ?`, [id]);
         return row ? JSON.parse(row.json) : null;
     }
     async list(source) {
         const rows = source
-            ? await this.db.all("SELECT json FROM majik_messages WHERE source = ?", [source])
-            : await this.db.all("SELECT json FROM majik_messages");
+            ? await this.db.all(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE source = ?`, [source])
+            : await this.db.all(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS}`);
         return rows.map((r) => JSON.parse(r.json));
     }
     async remove(id, source) {
@@ -26,42 +27,42 @@ export class SQLiteInvoiceAdapter {
         if (!exists)
             return false;
         if (source) {
-            await this.db.run("DELETE FROM majik_messages WHERE id = ? AND source = ?", [id, source]);
+            await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ? AND source = ?`, [id, source]);
         }
         else {
-            await this.db.run("DELETE FROM majik_messages WHERE id = ?", [id]);
+            await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ?`, [id]);
         }
         return true;
     }
     async clear(source) {
         if (source) {
-            await this.db.run("DELETE FROM majik_messages WHERE source = ?", [
+            await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE source = ?`, [
                 source,
             ]);
         }
         else {
-            await this.db.run("DELETE FROM majik_messages");
+            await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS}`);
         }
     }
     async count(source) {
         const row = source
-            ? await this.db.get("SELECT COUNT(*) as n FROM majik_messages WHERE source = ?", [source])
-            : await this.db.get("SELECT COUNT(*) as n FROM majik_messages");
+            ? await this.db.get(`SELECT COUNT(*) as n FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE source = ?`, [source])
+            : await this.db.get(`SELECT COUNT(*) as n FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS}`);
         return row?.n ?? 0;
     }
     async exists(id, source) {
         const row = source
-            ? await this.db.get("SELECT 1 FROM majik_messages WHERE id = ? AND source = ?", [id, source])
-            : await this.db.get("SELECT 1 FROM majik_messages WHERE id = ?", [id]);
+            ? await this.db.get(`SELECT 1 FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ? AND source = ?`, [id, source])
+            : await this.db.get(`SELECT 1 FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ?`, [id]);
         return !!row;
     }
-    async bulkSave(messages, source = "local") {
+    async bulkSave(messages, source = `local`) {
         if (messages.length === 0)
             return;
-        const resolvedSource = source ?? "local";
+        const resolvedSource = source ?? `local`;
         await this.db.transaction(async (tx) => {
             for (const msg of messages) {
-                await tx.run(`INSERT OR REPLACE INTO majik_message_chats 
+                await tx.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} 
          (id, json, created_at, source)
          VALUES (?, ?, ?, ?, ?, ?)`, [msg.id, JSON.stringify(msg), msg.timestamp, resolvedSource]);
             }
@@ -73,10 +74,10 @@ export class SQLiteInvoiceAdapter {
         await this.db.transaction(async (tx) => {
             for (const id of ids) {
                 if (source) {
-                    await tx.run("DELETE FROM majik_messages WHERE id = ? AND source = ?", [id, source]);
+                    await tx.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ? AND source = ?`, [id, source]);
                 }
                 else {
-                    await tx.run("DELETE FROM majik_messages WHERE id = ?", [id]);
+                    await tx.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} WHERE id = ?`, [id]);
                 }
             }
         });

package/dist/core/storage/contact-directory/contacts/adapter-sql.d.ts

@@ -1,6 +1,7 @@
 import { SerializedMajikContact } from "@majikah/majik-contact";
 import { MajikContactStorageAdapter } from "./_types";
 import { SQLiteDatabase } from "../../sql-db-manager";
+import { StorageQuery } from "../../storage-adapter";
 export declare class SQLiteContactAdapter implements MajikContactStorageAdapter {
     private db;
     constructor(db: SQLiteDatabase);
@@ -13,4 +14,5 @@ export declare class SQLiteContactAdapter implements MajikContactStorageAdapter
     exists(id: string): Promise<boolean>;
     bulkSave(contacts: SerializedMajikContact[]): Promise<void>;
     bulkRemove(ids: string[]): Promise<void>;
+    query(query: StorageQuery<SerializedMajikContact>): Promise<SerializedMajikContact[]>;
 }

package/dist/core/storage/contact-directory/contacts/adapter-sql.js

@@ -1,10 +1,11 @@
+import { MAJIKAH_SQL_TABLES } from "../../sql-schema";
 export class SQLiteContactAdapter {
     db;
     constructor(db) {
         this.db = db;
     }
     async save(contact) {
-        await this.db.run(`INSERT OR REPLACE INTO majik_contacts 
+        await this.db.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS} 
        (id, json, fingerprint, label, created_at, updated_at)
        VALUES (?, ?, ?, ?, ?, ?)`, [
             contact.id,
@@ -16,31 +17,29 @@ export class SQLiteContactAdapter {
         ]);
     }
     async getById(id) {
-        const row = await this.db.get("SELECT json FROM majik_contacts WHERE id = ?", [id]);
+        const row = await this.db.get(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS} WHERE id = ?`, [id]);
         return row ? JSON.parse(row.json) : null;
     }
     async list() {
-        const rows = await this.db.all("SELECT json FROM majik_contacts");
+        const rows = await this.db.all(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS}`);
         return rows.map((r) => JSON.parse(r.json));
     }
     async remove(id) {
         const exists = await this.exists(id);
         if (!exists)
             return false;
-        await this.db.run("DELETE FROM majik_contacts WHERE id = ?", [id]);
+        await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS} WHERE id = ?`, [id]);
         return true;
     }
     async clear() {
-        await this.db.run("DELETE FROM majik_contacts");
+        await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS}`);
     }
     async count() {
-        const row = await this.db.get("SELECT COUNT(*) as n FROM majik_contacts");
+        const row = await this.db.get(`SELECT COUNT(*) as n FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS}`);
         return row?.n ?? 0;
     }
     async exists(id) {
-        const row = await this.db.get("SELECT 1 FROM majik_contacts WHERE id = ?", [
-            id,
-        ]);
+        const row = await this.db.get(`SELECT 1 FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS} WHERE id = ?`, [id]);
         return !!row;
     }
     async bulkSave(contacts) {
@@ -48,7 +47,7 @@ export class SQLiteContactAdapter {
             return;
         await this.db.transaction(async (tx) => {
             for (const c of contacts) {
-                await tx.run(`INSERT OR REPLACE INTO majik_contacts 
+                await tx.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS} 
            (id, json, fingerprint, label, created_at, updated_at)
            VALUES (?, ?, ?, ?, ?, ?)`, [
                     c.id,
@@ -66,8 +65,33 @@ export class SQLiteContactAdapter {
             return;
         await this.db.transaction(async (tx) => {
             for (const id of ids) {
-                await tx.run("DELETE FROM majik_contacts WHERE id = ?", [id]);
+                await tx.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS} WHERE id = ?`, [id]);
             }
         });
     }
+    async query(query) {
+        const clauses = [];
+        const values = [];
+        if (query.where) {
+            for (const [key, value] of Object.entries(query.where)) {
+                clauses.push(`${key} = ?`);
+                values.push(value);
+            }
+        }
+        let sql = `SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS}`;
+        if (clauses.length > 0) {
+            sql += ` WHERE ${clauses.join(" AND ")}`;
+        }
+        if (query.orderBy) {
+            sql += ` ORDER BY ${String(query.orderBy)} ${query.orderDirection ?? "asc"}`;
+        }
+        if (query.limit) {
+            sql += ` LIMIT ${query.limit}`;
+        }
+        if (query.offset) {
+            sql += ` OFFSET ${query.offset}`;
+        }
+        const rows = await this.db.all(sql, values);
+        return rows.map((r) => JSON.parse(r.json));
+    }
 }

package/dist/core/storage/contact-directory/groups/adapter-sql.js

@@ -1,10 +1,11 @@
+import { MAJIKAH_SQL_TABLES } from "../../sql-schema";
 export class SQLiteContactGroupAdapter {
     db;
     constructor(db) {
         this.db = db;
     }
     async save(group) {
-        await this.db.run(`INSERT OR REPLACE INTO majik_contact_groups 
+        await this.db.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS} 
        (id, json, name, created_at, updated_at, is_system)
        VALUES (?, ?, ?, ?, ?, ?)`, [
             group.id,
@@ -16,29 +17,29 @@ export class SQLiteContactGroupAdapter {
         ]);
     }
     async getById(id) {
-        const row = await this.db.get("SELECT json FROM majik_contact_groups WHERE id = ?", [id]);
+        const row = await this.db.get(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS} WHERE id = ?`, [id]);
         return row ? JSON.parse(row.json) : null;
     }
     async list() {
-        const rows = await this.db.all("SELECT json FROM majik_contact_groups");
+        const rows = await this.db.all(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS}`);
         return rows.map((r) => JSON.parse(r.json));
     }
     async remove(id) {
         const exists = await this.exists(id);
         if (!exists)
             return false;
-        await this.db.run("DELETE FROM majik_contact_groups WHERE id = ?", [id]);
+        await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS} WHERE id = ?`, [id]);
         return true;
     }
     async clear() {
-        await this.db.run("DELETE FROM majik_contact_groups");
+        await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS}`);
     }
     async count() {
-        const row = await this.db.get("SELECT COUNT(*) as n FROM majik_contact_groups");
+        const row = await this.db.get(`SELECT COUNT(*) as n FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS}`);
         return row?.n ?? 0;
     }
     async exists(id) {
-        const row = await this.db.get("SELECT 1 FROM majik_contact_groups WHERE id = ?", [id]);
+        const row = await this.db.get(`SELECT 1 FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS} WHERE id = ?`, [id]);
         return !!row;
     }
     async bulkSave(groups) {
@@ -46,7 +47,7 @@ export class SQLiteContactGroupAdapter {
             return;
         await this.db.transaction(async (tx) => {
             for (const g of groups) {
-                await tx.run(`INSERT OR REPLACE INTO majik_contact_groups 
+                await tx.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS} 
            (id, json, name, created_at, updated_at, is_system)
            VALUES (?, ?, ?, ?, ?, ?)`, [
                     g.id,
@@ -64,7 +65,7 @@ export class SQLiteContactGroupAdapter {
             return;
         await this.db.transaction(async (tx) => {
             for (const id of ids) {
-                await tx.run("DELETE FROM majik_contact_groups WHERE id = ?", [id]);
+                await tx.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS} WHERE id = ?`, [id]);
             }
         });
     }

package/dist/core/storage/keystore/adapter-sql.d.ts

@@ -1,6 +1,7 @@
 import { MajikKeyJSON } from "@majikah/majik-key";
 import { MajikKeyStorageAdapter } from "./_types";
 import { SQLiteDatabase } from "../sql-db-manager";
+import { StorageQuery } from "../storage-adapter";
 export declare class SQLiteKeystoreAdapter implements MajikKeyStorageAdapter {
     private db;
     constructor(db: SQLiteDatabase);
@@ -13,4 +14,5 @@ export declare class SQLiteKeystoreAdapter implements MajikKeyStorageAdapter {
     exists(id: string): Promise<boolean>;
     bulkSave(keys: MajikKeyJSON[]): Promise<void>;
     bulkRemove(ids: string[]): Promise<void>;
+    query(query: StorageQuery<MajikKeyJSON>): Promise<MajikKeyJSON[]>;
 }

package/dist/core/storage/keystore/adapter-sql.js

@@ -1,10 +1,11 @@
+import { MAJIKAH_SQL_TABLES } from "../sql-schema";
 export class SQLiteKeystoreAdapter {
     db;
     constructor(db) {
         this.db = db;
     }
     async save(key) {
-        await this.db.run(`INSERT OR REPLACE INTO majik_keys 
+        await this.db.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_KEYS} 
        (id, json, timestamp, public_key)
        VALUES (?, ?, ?, ?)`, [
             key.id,
@@ -14,31 +15,29 @@ export class SQLiteKeystoreAdapter {
         ]);
     }
     async getById(id) {
-        const row = await this.db.get("SELECT json FROM majik_keys WHERE id = ?", [id]);
+        const row = await this.db.get("SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS} WHERE id = ?", [id]);
         return row ? JSON.parse(row.json) : null;
     }
     async list() {
-        const rows = await this.db.all("SELECT json FROM majik_keys");
+        const rows = await this.db.all(`SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS}`);
         return rows.map((r) => JSON.parse(r.json));
     }
     async remove(id) {
         const exists = await this.exists(id);
         if (!exists)
             return false;
-        await this.db.run("DELETE FROM majik_keys WHERE id = ?", [id]);
+        await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS} WHERE id = ?`, [id]);
         return true;
     }
     async clear() {
-        await this.db.run("DELETE FROM majik_keys");
+        await this.db.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS}`);
     }
     async count() {
-        const row = await this.db.get("SELECT COUNT(*) as n FROM majik_keys");
+        const row = await this.db.get(`SELECT COUNT(*) as n FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS}`);
         return row?.n ?? 0;
     }
     async exists(id) {
-        const row = await this.db.get("SELECT 1 FROM majik_keys WHERE id = ?", [
-            id,
-        ]);
+        const row = await this.db.get(`SELECT 1 FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS} WHERE id = ?`, [id]);
         return !!row;
     }
     async bulkSave(keys) {
@@ -46,7 +45,7 @@ export class SQLiteKeystoreAdapter {
             return;
         await this.db.transaction(async (tx) => {
             for (const g of keys) {
-                await tx.run(`INSERT OR REPLACE INTO majik_keys 
+                await tx.run(`INSERT OR REPLACE INTO ${MAJIKAH_SQL_TABLES.MAJIK_KEYS} 
            (id, json, timestamp, public_key)
            VALUES (?, ?, ?, ?)`, [
                     g.id,
@@ -62,8 +61,33 @@ export class SQLiteKeystoreAdapter {
             return;
         await this.db.transaction(async (tx) => {
             for (const id of ids) {
-                await tx.run("DELETE FROM majik_keys WHERE id = ?", [id]);
+                await tx.run(`DELETE FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS} WHERE id = ?`, [id]);
             }
         });
     }
+    async query(query) {
+        const clauses = [];
+        const values = [];
+        if (query.where) {
+            for (const [key, value] of Object.entries(query.where)) {
+                clauses.push(`${key} = ?`);
+                values.push(value);
+            }
+        }
+        let sql = `SELECT json FROM ${MAJIKAH_SQL_TABLES.MAJIK_KEYS}`;
+        if (clauses.length > 0) {
+            sql += ` WHERE ${clauses.join(" AND ")}`;
+        }
+        if (query.orderBy) {
+            sql += ` ORDER BY ${String(query.orderBy)} ${query.orderDirection ?? "asc"}`;
+        }
+        if (query.limit) {
+            sql += ` LIMIT ${query.limit}`;
+        }
+        if (query.offset) {
+            sql += ` OFFSET ${query.offset}`;
+        }
+        const rows = await this.db.all(sql, values);
+        return rows.map((r) => JSON.parse(r.json));
+    }
 }

package/dist/core/storage/sql-schema.d.ts

@@ -1,4 +1,19 @@
 type MajikahSQLSchema = string;
+/**
+ * Centralized SQLite table registry.
+ * - `as const` keeps literal types
+ * - `MajikahSQLTable` becomes a strict union type
+ */
+export declare const MAJIKAH_SQL_TABLES: {
+    readonly MAJIK_CLIENT_STATE: "majik_client_state";
+    readonly MAJIK_KEYS: "majik_keys";
+    readonly MAJIK_MESSAGE_CHATS: "majik_message_chats";
+    readonly MAJIK_MESSAGE_FILES: "majik_message_files";
+    readonly MAJIK_MESSAGE_THREAD_MAILS: "majik_message_thread_mails";
+    readonly MAJIK_CONTACTS: "majik_contacts";
+    readonly MAJIK_CONTACT_GROUPS: "majik_contact_groups";
+};
+export type MajikahSQLTable = (typeof MAJIKAH_SQL_TABLES)[keyof typeof MAJIKAH_SQL_TABLES];
 export declare function buildSchemaSQL(schemas: MajikahSQLSchema[]): MajikahSQLSchema;
 export declare const MAJIKAH_SQL_SCHEMA_MAJIK_CLIENT_STATE: MajikahSQLSchema;
 export declare const MAJIKAH_SQL_SCHEMA_MAJIK_KEYS: MajikahSQLSchema;

package/dist/core/storage/sql-schema.js

@@ -1,3 +1,17 @@
+/**
+ * Centralized SQLite table registry.
+ * - `as const` keeps literal types
+ * - `MajikahSQLTable` becomes a strict union type
+ */
+export const MAJIKAH_SQL_TABLES = {
+    MAJIK_CLIENT_STATE: "majik_client_state",
+    MAJIK_KEYS: "majik_keys",
+    MAJIK_MESSAGE_CHATS: "majik_message_chats",
+    MAJIK_MESSAGE_FILES: "majik_message_files",
+    MAJIK_MESSAGE_THREAD_MAILS: "majik_message_thread_mails",
+    MAJIK_CONTACTS: "majik_contacts",
+    MAJIK_CONTACT_GROUPS: "majik_contact_groups",
+};
 function normalizeSQL(sql) {
     return sql
         .trim()
@@ -19,28 +33,28 @@ export function buildSchemaSQL(schemas) {
         .join("\n\n");
 }
 export const MAJIKAH_SQL_SCHEMA_MAJIK_CLIENT_STATE = `
-CREATE TABLE IF NOT EXISTS majik_client_state (
+CREATE TABLE IF NOT EXISTS ${MAJIKAH_SQL_TABLES.MAJIK_CLIENT_STATE} (
   key TEXT PRIMARY KEY,
   value TEXT NOT NULL,
   updated_at TEXT DEFAULT (datetime('now'))
 );
 `;
 export const MAJIKAH_SQL_SCHEMA_MAJIK_KEYS = `
-CREATE TABLE IF NOT EXISTS majik_keys (
+CREATE TABLE IF NOT EXISTS ${MAJIKAH_SQL_TABLES.MAJIK_KEYS} (
   id TEXT PRIMARY KEY,
   json TEXT NOT NULL,
   timestamp TEXT NOT NULL,
   public_key TEXT NOT NULL
 );
 
-CREATE INDEX IF NOT EXISTS idx_majik_keys_timestamp 
-ON majik_keys(timestamp);
+CREATE INDEX IF NOT EXISTS idx_majik_keys_timestamp
+ON ${MAJIKAH_SQL_TABLES.MAJIK_KEYS}(timestamp);
 
-CREATE INDEX IF NOT EXISTS idx_majik_keys_public_key 
-ON majik_keys(public_key);
+CREATE INDEX IF NOT EXISTS idx_majik_keys_public_key
+ON ${MAJIKAH_SQL_TABLES.MAJIK_KEYS}(public_key);
 `;
 export const MAJIKAH_SQL_SCHEMA_MAJIK_MESSAGE_CHATS = `
-CREATE TABLE IF NOT EXISTS majik_message_chats (
+CREATE TABLE IF NOT EXISTS ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS} (
   id TEXT PRIMARY KEY,
   json TEXT NOT NULL,
   created_at TEXT NOT NULL,
@@ -49,14 +63,14 @@ CREATE TABLE IF NOT EXISTS majik_message_chats (
 );
 
 CREATE INDEX IF NOT EXISTS idx_majik_message_chats_created_at 
-ON majik_message_chats(created_at);
+ON ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS}(created_at);
 
 
 CREATE INDEX IF NOT EXISTS idx_majik_message_chats_source 
-ON majik_message_chats(source);
+ON ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_CHATS}(source);
 `;
 export const MAJIKAH_SQL_SCHEMA_MAJIK_MESSAGE_FILES = `
-CREATE TABLE IF NOT EXISTS majik_message_files (
+CREATE TABLE IF NOT EXISTS ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_FILES} (
   id TEXT PRIMARY KEY,
   json TEXT NOT NULL,
   created_at TEXT NOT NULL,
@@ -66,14 +80,14 @@ CREATE TABLE IF NOT EXISTS majik_message_files (
 );
 
 CREATE INDEX IF NOT EXISTS idx_majik_message_files_created_at 
-ON majik_message_files(created_at);
+ON ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_FILES}(created_at);
 
 
 CREATE INDEX IF NOT EXISTS idx_majik_message_files_source 
-ON majik_message_files(source);
+ON ${MAJIKAH_SQL_TABLES.MAJIK_MESSAGE_FILES}(source);
 `;
 export const MAJIKAH_SQL_SCHEMA_MAJIK_CONTACTS = `
-CREATE TABLE IF NOT EXISTS majik_contacts (
+CREATE TABLE IF NOT EXISTS ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS} (
   id TEXT PRIMARY KEY,
   json TEXT NOT NULL,
   fingerprint TEXT,
@@ -82,11 +96,11 @@ CREATE TABLE IF NOT EXISTS majik_contacts (
   updated_at TEXT
 );
 
-CREATE INDEX IF NOT EXISTS idx_majik_contacts_created_at 
-ON majik_contacts(created_at);
+CREATE INDEX IF NOT EXISTS idx_majik_contacts_created_at
+ON ${MAJIKAH_SQL_TABLES.MAJIK_CONTACTS}(created_at);
 `;
 export const MAJIKAH_SQL_SCHEMA_MAJIK_CONTACT_GROUPS = `
-CREATE TABLE IF NOT EXISTS majik_contact_groups (
+CREATE TABLE IF NOT EXISTS ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS} (
   id TEXT PRIMARY KEY,
   json TEXT NOT NULL,
   name TEXT,
@@ -95,8 +109,8 @@ CREATE TABLE IF NOT EXISTS majik_contact_groups (
   is_system INTEGER DEFAULT 0 CHECK(is_system IN (0,1))
 );
 
-CREATE INDEX IF NOT EXISTS idx_majik_contact_groups_created_at 
-ON majik_contact_groups(created_at);
+CREATE INDEX IF NOT EXISTS idx_majik_contact_groups_created_at
+ON ${MAJIKAH_SQL_TABLES.MAJIK_CONTACT_GROUPS}(created_at);
 `;
 export const MAJIKAH_SQL_SCHEMA_FULL = buildSchemaSQL([
     MAJIKAH_SQL_SCHEMA_MAJIK_CLIENT_STATE,

package/dist/core/storage/storage-adapter.d.ts

@@ -1,4 +1,11 @@
 export type StorageSource = "local" | "cloud";
+export interface StorageQuery<T> {
+    where?: Partial<T>;
+    limit?: number;
+    offset?: number;
+    orderBy?: keyof T;
+    orderDirection?: "asc" | "desc";
+}
 export interface MajikStorageAdapter<T extends {
     id: string;
 }> {
@@ -11,4 +18,5 @@ export interface MajikStorageAdapter<T extends {
     exists(id: string, source?: StorageSource): Promise<boolean>;
     bulkSave(items: T[], source?: StorageSource): Promise<void>;
     bulkRemove(ids: string[], source?: StorageSource): Promise<void>;
+    query?(query: StorageQuery<T>, source?: StorageSource): Promise<T[]>;
 }

package/dist/majik-message.d.ts

@@ -5,6 +5,7 @@ import type { DecryptFileOptions, EncryptFileOptions, EncryptFileResult, MAJIK_A
 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, MajikContactManagerAdapters } from "./core/contacts/majik-contact-manager";
@@ -153,6 +154,10 @@ export declare class MajikMessage {
     hasOwnIdentity(fingerprint: string): Promise<boolean>;
     getContactByID(id: string): MajikContact | 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>;

package/dist/majik-message.js

@@ -408,6 +408,22 @@ export class MajikMessage {
         return ((await this._contacts.getContactByPublicKeyBase64(publicKeyBase64)) ??
             null);
     }
+    getContactsByID(ids, strict = false) {
+        if (!ids?.length)
+            throw new Error("At least 1 id is required");
+        return this._contacts.getContactsByIds(ids, strict);
+    }
+    async getContactsByPublicKey(publicKeys) {
+        if (!publicKeys?.length)
+            throw new Error("At least 1 public key is required");
+        return await this._contacts.getContactsByPublicKeys(publicKeys);
+    }
+    async getMajikRecipientsByPublicKey(publicKeys, strict) {
+        return await this._contacts.getMajikRecipients("public_key", publicKeys, strict);
+    }
+    async getExpectedSignersByPublicKey(publicKeys, strict) {
+        return await this._contacts.getExpectedSigners("public_key", publicKeys, strict);
+    }
     async exportContactAsJSON(id) {
         if (!id?.trim())
             throw new Error("Invalid contact ID");
@@ -426,7 +442,14 @@ export class MajikMessage {
     async importContactFromString(base64Str) {
         if (!base64Str?.trim())
             throw new Error("Invalid contact string");
-        return this._contacts.importContactFromString(base64Str);
+        const response = await this._contacts.importContactFromString(base64Str);
+        if (response.success) {
+            this._emit("new-contact", response.data);
+        }
+        else {
+            this._emit("error", response.message);
+        }
+        return response;
     }
     async exportContactCompressed(contact) {
         if (!contact?.id?.trim())

package/package.json

@@ -2,7 +2,7 @@
   "name": "@majikah/majik-message",
   "type": "module",
   "description": "Post-quantum end-to-end encryption with ML-KEM-768. Seed phrase–based accounts. Auto-expiring messages. Offline-ready. Exportable encrypted messages. Tamper-proof threads with blockchain-like integrity. Quantum-resistant messaging.",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "license": "Apache-2.0",
   "author": "Zelijah",
   "main": "./dist/index.js",
@@ -81,7 +81,7 @@
   "dependencies": {
     "@bokuweb/zstd-wasm": "^0.0.27",
     "@majikah/majik-contact": "^0.0.4",
-    "@majikah/majik-envelope": "^0.0.2",
+    "@majikah/majik-envelope": "^0.0.4",
     "@majikah/majik-file": "^0.1.4",
     "@majikah/majik-key": "^0.2.7",
     "@majikah/majik-signature": "^0.0.17",
@@ -89,7 +89,7 @@
     "@noble/post-quantum": "^0.5.4",
     "@scure/bip39": "^1.6.0",
     "@stablelib/aes": "^2.0.1",
-    "@stablelib/ed25519": "^2.0.2",
+    "@stablelib/ed25519": "^2.1.0",
     "@stablelib/gcm": "^2.0.1",
     "@stablelib/pbkdf2": "^2.0.1",
     "@stablelib/random": "^2.0.1",