@thezelijah/majik-message 1.0.13 → 1.0.15

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

@@ -18,6 +18,11 @@ export declare class MajikContactDirectory {
     updateContactMeta(id: string, meta: Partial<MajikContactData["meta"]>): MajikContact;
     getContact(id: string): MajikContact | undefined;
     getContactByFingerprint(fingerprint: string): MajikContact | undefined;
+    /**
+     * Get contact by public key (base64)
+     * Uses MajikContact.getPublicKeyBase64() for canonical comparison
+     */
+    getContactByPublicKeyBase64(publicKeyBase64: string): Promise<MajikContact | undefined>;
     hasFingerprint(fingerprint: string): boolean;
     listContacts(sortedByLabel?: boolean): MajikContact[];
     blockContact(id: string): MajikContact;

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

@@ -81,6 +81,22 @@ export class MajikContactDirectory {
         const contactId = this.fingerprintMap.get(fingerprint);
         return contactId ? this.contacts.get(contactId) : undefined;
     }
+    /**
+     * Get contact by public key (base64)
+     * Uses MajikContact.getPublicKeyBase64() for canonical comparison
+     */
+    async getContactByPublicKeyBase64(publicKeyBase64) {
+        if (!publicKeyBase64 || typeof publicKeyBase64 !== "string") {
+            throw new MajikContactDirectoryError("Public key must be a non-empty base64 string");
+        }
+        for (const contact of this.contacts.values()) {
+            const contactKey = await contact.getPublicKeyBase64();
+            if (contactKey === publicKeyBase64) {
+                return contact;
+            }
+        }
+        return undefined;
+    }
     hasFingerprint(fingerprint) {
         return this.fingerprintMap.has(fingerprint);
     }

package/dist/core/database/chat/majik-message-chat.d.ts

@@ -1,6 +1,6 @@
 import { MajikMessageAccountID, MajikMessageChatID, MajikMessagePublicKey } from "../../types";
 import { MajikMessageIdentity } from "../system/identity";
-import { MajikMessageChatJSON } from "./types";
+import { MajikMessageChatJSON, RedisKey } from "./types";
 /**
  * Represents a temporary, compressed message with automatic expiration.
  * Messages are automatically compressed on creation and stored in Redis by default.
@@ -88,8 +88,13 @@ export declare class MajikMessageChat {
     getUnreadRecipients(): string[];
     toJSON(): MajikMessageChatJSON;
     static fromJSON(json: string | MajikMessageChatJSON): MajikMessageChat;
-    getRedisKey(): string;
+    getRedisKey(): RedisKey;
+    getRedisMessageKey(): RedisKey;
+    getRedisConversationIndexKey(): RedisKey;
+    getRedisInboxIndexKey(publicKey: MajikMessagePublicKey): RedisKey;
+    getTTLUnixTimestamp(): number;
     getTTLSeconds(): number;
+    toRedisPayload(): string;
     clone(): MajikMessageChat;
     /**
      * Validates raw message length before compression.

package/dist/core/database/chat/majik-message-chat.js

@@ -365,15 +365,29 @@ export class MajikMessageChat {
         return new MajikMessageChat(rawParse.id, rawParse.account, rawParse.message, rawParse.sender, rawParse.recipients || [], rawParse.timestamp, rawParse.expires_at, rawParse.read_by || [], rawParse?.conversation_id);
     }
     // ============= REDIS METHODS =============
-    // Generate Redis key
     getRedisKey() {
-        return `majik_message:${this.id}`;
+        return `majik_message:${this.conversation_id}:${this.id}`;
     }
-    // Get TTL in seconds for Redis EXPIREAT
-    getTTLSeconds() {
+    // Generate Redis key
+    getRedisMessageKey() {
+        return `msg:${this.id}`;
+    }
+    getRedisConversationIndexKey() {
+        return `conv:${this.conversation_id}:msgs`;
+    }
+    getRedisInboxIndexKey(publicKey) {
+        return `inbox:${publicKey}`;
+    }
+    getTTLUnixTimestamp() {
         const expiresAt = new Date(this.expires_at);
         return Math.floor(expiresAt.getTime() / 1000);
     }
+    getTTLSeconds() {
+        return Math.max(0, Math.floor((new Date(this.expires_at).getTime() - Date.now()) / 1000));
+    }
+    toRedisPayload() {
+        return JSON.stringify(this.toJSON());
+    }
     // Clone method for updates
     clone() {
         return MajikMessageChat.fromJSON(this.toJSON());

package/dist/core/database/chat/types.d.ts

@@ -10,3 +10,4 @@ export interface MajikMessageChatJSON {
     expires_at: string;
     read_by: string[];
 }
+export type RedisKey = string;

package/dist/core/database/system/majik-user/majik-user.d.ts

@@ -1,5 +1,5 @@
-import type { UserBasicInformation, FullName, Address, UserSettings, MajikUserJSON, SupabaseUser, YYYYMMDD } from './types';
-import type { UserGenderOptions } from './enums';
+import type { UserBasicInformation, FullName, Address, UserSettings, MajikUserJSON, SupabaseUser, YYYYMMDD } from "./types";
+import type { UserGenderOptions } from "./enums";
 export interface MajikUserData<TMetadata extends UserBasicInformation = UserBasicInformation> {
     id: string;
     email: string;
@@ -74,6 +74,10 @@ export declare class MajikUser<TMetadata extends UserBasicInformation = UserBasi
      * Get user's first name if available
      */
     get birthday(): YYYYMMDD | null;
+    /**
+     * Get user's full address if available
+     */
+    get address(): string | null;
     /**
      * Check if email is verified
      */

package/dist/core/database/system/majik-user/majik-user.js

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { arrayBufferToBase64, arrayToBase64, dateToYYYYMMDD, stripUndefined } from './utils';
-import { generateMnemonic, mnemonicToSeedSync } from '@scure/bip39';
-import * as ed25519 from '@stablelib/ed25519';
-import ed2curve from 'ed2curve';
-import { hash } from '@stablelib/sha256';
-import { wordlist } from '@scure/bip39/wordlists/english';
+import { arrayBufferToBase64, arrayToBase64, dateToYYYYMMDD, stripUndefined, } from "./utils";
+import { generateMnemonic, mnemonicToSeedSync } from "@scure/bip39";
+import * as ed25519 from "@stablelib/ed25519";
+import ed2curve from "ed2curve";
+import { hash } from "@stablelib/sha256";
+import { wordlist } from "@scure/bip39/wordlists/english";
 /**
  * Base user class for database persistence
  * Designed to be extended by subclasses with additional metadata
@@ -35,10 +35,10 @@ export class MajikUser {
      */
     static initialize(email, displayName, id) {
         if (!email) {
-            throw new Error('Email cannot be empty');
+            throw new Error("Email cannot be empty");
         }
         if (!displayName) {
-            throw new Error('Display name cannot be empty');
+            throw new Error("Display name cannot be empty");
         }
         const userID = !id?.trim() ? MajikUser.generateID() : id;
         const instance = new this({
@@ -70,18 +70,18 @@ export class MajikUser {
      */
     static fromJSON(json) {
         // Parse string to object if needed
-        const data = typeof json === 'string' ? JSON.parse(json) : json;
-        if (!data.id || typeof data.id !== 'string') {
-            throw new Error('Invalid user data: missing or invalid id');
+        const data = typeof json === "string" ? JSON.parse(json) : json;
+        if (!data.id || typeof data.id !== "string") {
+            throw new Error("Invalid user data: missing or invalid id");
         }
-        if (!data.email || typeof data.email !== 'string') {
-            throw new Error('Invalid user data: missing or invalid email');
+        if (!data.email || typeof data.email !== "string") {
+            throw new Error("Invalid user data: missing or invalid email");
         }
-        if (!data.displayName || typeof data.displayName !== 'string') {
-            throw new Error('Invalid user data: missing or invalid displayName');
+        if (!data.displayName || typeof data.displayName !== "string") {
+            throw new Error("Invalid user data: missing or invalid displayName");
         }
-        if (!data.hash || typeof data.hash !== 'string') {
-            throw new Error('Invalid user data: missing or invalid hash');
+        if (!data.hash || typeof data.hash !== "string") {
+            throw new Error("Invalid user data: missing or invalid hash");
         }
         const userData = {
             id: data.id,
@@ -106,16 +106,16 @@ export class MajikUser {
      */
     static fromSupabase(supabaseUser) {
         if (!supabaseUser.id) {
-            throw new Error('Invalid Supabase user: missing id');
+            throw new Error("Invalid Supabase user: missing id");
         }
         if (!supabaseUser.email) {
-            throw new Error('Invalid Supabase user: missing email');
+            throw new Error("Invalid Supabase user: missing email");
         }
         // Extract display name from user_metadata or email
         const displayName = supabaseUser.user_metadata?.display_name ||
             supabaseUser.user_metadata?.full_name ||
             supabaseUser.user_metadata?.name ||
-            supabaseUser.email.split('@')[0];
+            supabaseUser.email.split("@")[0];
         // Map user_metadata to MajikUser metadata
         const metadata = {
             verification: {
@@ -130,8 +130,8 @@ export class MajikUser {
             // Name mapping
             if (userMeta.first_name || userMeta.family_name) {
                 metadata.name = {
-                    first_name: userMeta.first_name || '',
-                    last_name: userMeta.family_name || '',
+                    first_name: userMeta.first_name || "",
+                    last_name: userMeta.family_name || "",
                     middle_name: userMeta.middle_name,
                     suffix: userMeta.suffix,
                 };
@@ -172,13 +172,15 @@ export class MajikUser {
             notifications: supabaseUser.app_metadata?.notifications ?? true,
             system: {
                 isRestricted: supabaseUser.app_metadata?.is_restricted ?? false,
-                restrictedUntil: supabaseUser.app_metadata?.restricted_until ? new Date(supabaseUser.app_metadata.restricted_until) : undefined,
+                restrictedUntil: supabaseUser.app_metadata?.restricted_until
+                    ? new Date(supabaseUser.app_metadata.restricted_until)
+                    : undefined,
             },
         };
         // Add any additional app_metadata to settings
         if (supabaseUser.app_metadata) {
             Object.keys(supabaseUser.app_metadata).forEach((key) => {
-                if (!['notifications', 'is_restricted', 'restricted_until'].includes(key)) {
+                if (!["notifications", "is_restricted", "restricted_until"].includes(key)) {
                     settings[key] = supabaseUser.app_metadata[key];
                 }
             });
@@ -222,7 +224,7 @@ export class MajikUser {
             return null;
         const { first_name, middle_name, last_name, suffix } = this._metadata.name;
         const parts = [first_name, middle_name, last_name, suffix].filter(Boolean);
-        return parts.join(' ');
+        return parts.join(" ");
     }
     get fullNameObject() {
         if (!this._metadata.name)
@@ -231,7 +233,7 @@ export class MajikUser {
     }
     set fullNameObject(name) {
         if (!name || !name?.first_name?.trim() || !name?.last_name?.trim()) {
-            throw new Error('Full name must contain first and last names');
+            throw new Error("Full name must contain first and last names");
         }
         this._metadata.name = name;
         this.updateTimestamp();
@@ -268,7 +270,7 @@ export class MajikUser {
      * Get user's gender
      */
     get gender() {
-        return this._metadata.gender || 'Unspecified';
+        return this._metadata.gender || "Unspecified";
     }
     /**
      * Calculate user's age from birthdate
@@ -281,7 +283,8 @@ export class MajikUser {
         const birth = new Date(birthdate);
         let age = today.getFullYear() - birth.getFullYear();
         const monthDiff = today.getMonth() - birth.getMonth();
-        if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birth.getDate())) {
+        if (monthDiff < 0 ||
+            (monthDiff === 0 && today.getDate() < birth.getDate())) {
             age--;
         }
         return age;
@@ -294,6 +297,16 @@ export class MajikUser {
             return null;
         return this._metadata.birthdate;
     }
+    /**
+     * Get user's full address if available
+     */
+    get address() {
+        if (!this._metadata.address)
+            return null;
+        const { building, street, area, city, region, zip, country } = this._metadata.address;
+        const parts = [building, street, area, city, region, zip, country].filter(Boolean);
+        return parts.join(", ");
+    }
     /**
      * Check if email is verified
      */
@@ -316,7 +329,7 @@ export class MajikUser {
      * Check if all verification steps are complete
      */
     get isFullyVerified() {
-        return this.isEmailVerified && this.isPhoneVerified && this.isIdentityVerified;
+        return (this.isEmailVerified && this.isPhoneVerified && this.isIdentityVerified);
     }
     /**
      * Get user's initials from name or display name
@@ -324,11 +337,12 @@ export class MajikUser {
     get initials() {
         if (this._metadata.name) {
             const { first_name, last_name } = this._metadata.name;
-            const firstInitial = first_name?.[0]?.toUpperCase() || '';
-            const lastInitial = last_name?.[0]?.toUpperCase() || '';
-            return `${firstInitial}${lastInitial}`.trim() || this._displayName[0].toUpperCase();
+            const firstInitial = first_name?.[0]?.toUpperCase() || "";
+            const lastInitial = last_name?.[0]?.toUpperCase() || "";
+            return (`${firstInitial}${lastInitial}`.trim() ||
+                this._displayName[0].toUpperCase());
         }
-        const names = this._displayName.split(' ');
+        const names = this._displayName.split(" ");
         if (names.length >= 2) {
             return `${names[0][0]}${names[names.length - 1][0]}`.toUpperCase();
         }
@@ -346,14 +360,14 @@ export class MajikUser {
     }
     set displayName(value) {
         if (!value || value.trim().length === 0) {
-            throw new Error('Display name cannot be empty');
+            throw new Error("Display name cannot be empty");
         }
         this._displayName = value;
         this.updateTimestamp();
     }
     set hash(value) {
         if (!value || value.length === 0) {
-            throw new Error('Hash cannot be empty');
+            throw new Error("Hash cannot be empty");
         }
         this._hash = value;
         this.updateTimestamp();
@@ -395,7 +409,7 @@ export class MajikUser {
         let formatted;
         if (birthdate instanceof Date) {
             if (Number.isNaN(birthdate.getTime())) {
-                throw new Error('Invalid Date object');
+                throw new Error("Invalid Date object");
             }
             // Format to YYYY-MM-DD (UTC-safe)
             formatted = dateToYYYYMMDD(birthdate);
@@ -403,7 +417,7 @@ export class MajikUser {
         else {
             // Validate ISO date format YYYY-MM-DD
             if (!/^\d{4}-\d{2}-\d{2}$/.test(birthdate)) {
-                throw new Error('Invalid birthdate format. Use YYYY-MM-DD');
+                throw new Error("Invalid birthdate format. Use YYYY-MM-DD");
             }
             formatted = birthdate;
         }
@@ -639,16 +653,28 @@ export class MajikUser {
      * Check if user has complete profile information
      */
     hasCompleteProfile() {
-        return !!(this._metadata.name && this._metadata.phone && this._metadata.birthdate && this._metadata.address && this._metadata.gender);
+        return !!(this._metadata.name &&
+            this._metadata.phone &&
+            this._metadata.birthdate &&
+            this._metadata.address &&
+            this._metadata.gender);
     }
     /**
      * Get profile completion percentage (0-100)
      */
     getProfileCompletionPercentage() {
-        const fields = ['name', 'picture', 'phone', 'gender', 'birthdate', 'address', 'bio'];
+        const fields = [
+            "name",
+            "picture",
+            "phone",
+            "gender",
+            "birthdate",
+            "address",
+            "bio",
+        ];
         const completedFields = fields.filter((field) => {
             const value = this._metadata[field];
-            if (typeof value === 'object' && value !== null) {
+            if (typeof value === "object" && value !== null) {
                 return Object.keys(value).length > 0;
             }
             return !!value;
@@ -660,13 +686,13 @@ export class MajikUser {
         const errors = [];
         // Required fields
         if (!this.id)
-            errors.push('ID is required');
+            errors.push("ID is required");
         if (!this._email)
-            errors.push('Email is required');
+            errors.push("Email is required");
         if (!this._displayName)
-            errors.push('Display name is required');
+            errors.push("Display name is required");
         if (!this._hash)
-            errors.push('Hash is required');
+            errors.push("Hash is required");
         // Format validation
         try {
             this.validateEmail(this._email);
@@ -676,20 +702,21 @@ export class MajikUser {
         }
         // Date validation
         if (!(this.createdAt instanceof Date) || isNaN(this.createdAt.getTime())) {
-            errors.push('Invalid createdAt date');
+            errors.push("Invalid createdAt date");
         }
-        if (!(this._lastUpdate instanceof Date) || isNaN(this._lastUpdate.getTime())) {
-            errors.push('Invalid lastUpdate date');
+        if (!(this._lastUpdate instanceof Date) ||
+            isNaN(this._lastUpdate.getTime())) {
+            errors.push("Invalid lastUpdate date");
         }
         // Metadata validation
         if (this._metadata.phone) {
             if (!/^\+?[1-9]\d{1,14}$/.test(this._metadata.phone)) {
-                errors.push('Invalid phone number format');
+                errors.push("Invalid phone number format");
             }
         }
         if (this._metadata.birthdate) {
             if (!/^\d{4}-\d{2}-\d{2}$/.test(this._metadata.birthdate)) {
-                errors.push('Invalid birthdate format');
+                errors.push("Invalid birthdate format");
             }
         }
         return {
@@ -770,7 +797,7 @@ export class MajikUser {
     validateEmail(email) {
         const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
         if (!emailRegex.test(email)) {
-            throw new Error('Invalid email format');
+            throw new Error("Invalid email format");
         }
     }
     // ==================== STATIC CRYPTOGRAPHIC METHODS ====================
@@ -786,7 +813,7 @@ export class MajikUser {
             const skCurve = ed2curve.convertSecretKey(ed.secretKey);
             const pkCurve = ed2curve.convertPublicKey(ed.publicKey);
             if (!skCurve || !pkCurve) {
-                throw new Error('Failed to convert derived Ed25519 keys to Curve25519');
+                throw new Error("Failed to convert derived Ed25519 keys to Curve25519");
             }
             const pkCurveBytes = new Uint8Array(pkCurve);
             const publicKey = arrayBufferToBase64(pkCurveBytes.buffer);

package/dist/majik-message.d.ts

@@ -7,6 +7,10 @@ import type { MAJIK_API_RESPONSE } from "./core/types";
 import { MajikMessageChat } from "./core/database/chat/majik-message-chat";
 import { MajikMessageIdentity } from "./core/database/system/identity";
 type MajikMessageEvents = "message" | "envelope" | "untrusted" | "error";
+interface MajikMessageStatic<T extends MajikMessage> {
+    new (config: MajikMessageConfig, id?: string): T;
+    fromJSON(json: MajikMessageJSON): Promise<T>;
+}
 export interface MajikMessageConfig {
     keyStore: KeyStore;
     contactDirectory?: MajikContactDirectory;
@@ -81,7 +85,7 @@ export declare class MajikMessage {
     /**
      * Set an active account (moves it to index 0)
      */
-    setActiveAccount(id: string): boolean;
+    setActiveAccount(id: string): Promise<boolean>;
     getActiveAccount(): MajikContact | null;
     isAccountActive(id: string): boolean;
     /**
@@ -94,6 +98,12 @@ export declare class MajikMessage {
      * Returns the MajikContact instance or null if not found.
      */
     getContactByID(id: string): MajikContact | null;
+    /**
+     * Retrieve a contact from the directory by its public key.
+     * Validates that the input is a non-empty string.
+     * Returns the MajikContact instance or null if not found.
+     */
+    getContactByPublicKey(id: string): Promise<MajikContact | null>;
     /**
      * Returns a JSON string representation of a contact
      * suitable for sharing.
@@ -194,7 +204,7 @@ export declare class MajikMessage {
     }>;
     isPassphraseValid(passphrase: string, id?: string): Promise<boolean>;
     toJSON(): Promise<MajikMessageJSON>;
-    static fromJSON(json: MajikMessageJSON): Promise<MajikMessage>;
+    static fromJSON<T extends MajikMessage>(this: new (config: MajikMessageConfig, id?: string) => T, json: MajikMessageJSON): Promise<T>;
     /**
      * Set a PIN (stores hash). Passphrase is any string; we store SHA-256(base64) of it.
      */
@@ -215,6 +225,6 @@ export declare class MajikMessage {
     /**
      * Try to load an existing state from IDB; if none exists, create a fresh instance and save it.
      */
-    static loadOrCreate(config: MajikMessageConfig): Promise<MajikMessage>;
+    static loadOrCreate<T extends MajikMessage>(this: MajikMessageStatic<T>, config: MajikMessageConfig): Promise<T>;
 }
 export {};

package/dist/majik-message.js

@@ -160,9 +160,17 @@ export class MajikMessage {
     /**
      * Set an active account (moves it to index 0)
      */
-    setActiveAccount(id) {
+    async setActiveAccount(id) {
         if (!this.ownAccounts.has(id))
             return false;
+        // Ensure identity is unlocked
+        try {
+            await this.ensureIdentityUnlocked(id);
+        }
+        catch (err) {
+            console.warn("Failed to unlock account:", err);
+            return false; // don't set as active if unlock fails
+        }
         // Remove ID from current position
         const index = this.ownAccountsOrder.indexOf(id);
         if (index > -1)
@@ -216,6 +224,17 @@ export class MajikMessage {
         }
         return this.contactDirectory.getContact(id) ?? null;
     }
+    /**
+     * Retrieve a contact from the directory by its public key.
+     * Validates that the input is a non-empty string.
+     * Returns the MajikContact instance or null if not found.
+     */
+    async getContactByPublicKey(id) {
+        if (typeof id !== "string" || !id.trim()) {
+            throw new Error("Invalid contact ID: must be a non-empty string");
+        }
+        return ((await this.contactDirectory.getContactByPublicKeyBase64(id)) ?? null);
+    }
     /**
      * Returns a JSON string representation of a contact
      * suitable for sharing.
@@ -830,7 +849,7 @@ export class MajikMessage {
         const newDirectory = new MajikContactDirectory();
         const parsedContacts = await newDirectory.fromJSON(json.contacts);
         const parsedEnvelopeCache = EnvelopeCache.fromJSON(json.envelopeCache);
-        const parsedInstance = new MajikMessage({
+        const parsedInstance = new this({
             contactDirectory: parsedContacts,
             envelopeCache: parsedEnvelopeCache,
             keyStore: KeyStore,
@@ -1027,7 +1046,7 @@ export class MajikMessage {
             if (saved?.data) {
                 const loaded = await loadSavedMajikFileData(saved.data);
                 const parsedJSON = loaded.j;
-                const instance = await MajikMessage.fromJSON(parsedJSON);
+                const instance = (await this.fromJSON(parsedJSON));
                 console.log("Account Loaded Successfully");
                 instance.attachAutosaveHandlers();
                 return instance;
@@ -1036,8 +1055,8 @@ export class MajikMessage {
         catch (err) {
             console.warn("Error trying to load saved MajikMessage state:", err);
         }
-        // No saved state; create new and persist initial state
-        const created = new MajikMessage(config);
+        // No saved state → create new subclass instance
+        const created = new this(config);
         await created.saveState();
         created.attachAutosaveHandlers();
         return created;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@thezelijah/majik-message",
   "type": "module",
   "description": "Encrypt and decrypt messages on any website. Secure chats with keypairs and seed-based accounts. Open source.",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "license": "Apache-2.0",
   "author": "Zelijah",
   "main": "./dist/index.js",