@thezelijah/majik-message 1.1.1 → 1.1.3

package/dist/majik-message.js

@@ -7,12 +7,13 @@ import { EnvelopeCache, } from "./core/messages/envelope-cache";
 import { EncryptionEngine } from "./core/crypto/encryption-engine";
 import { KeyStore } from "./core/crypto/keystore";
 import { MajikContactDirectory, } from "./core/contacts/majik-contact-directory";
-import { arrayBufferToBase64, arrayToBase64, base64ToArrayBuffer, base64ToUtf8, utf8ToBase64, } from "./core/utils/utilities";
+import { arrayBufferToBase64, arrayToBase64, base64ToArrayBuffer, base64ToUtf8, seedStringToArray, utf8ToBase64, } from "./core/utils/utilities";
 import { autoSaveMajikFileData, loadSavedMajikFileData, } from "./core/utils/majik-file-utils";
 import { randomBytes } from "@stablelib/random";
 import { clearAllBlobs, idbLoadBlob, idbSaveBlob, } from "./core/utils/idb-majik-system";
 import { MajikMessageChat } from "./core/database/chat/majik-message-chat";
 import { MajikCompressor } from "./core/compressor/majik-compressor";
+import { MajikKey } from "@thezelijah/majik-key";
 export class MajikMessage {
     userProfile = "default";
     // Optional PIN protection (hashed). If set, UI should prompt for PIN to unlock.
@@ -114,37 +115,38 @@ export class MajikMessage {
      * Import an account from a mnemonic-encrypted backup blob and store it using `passphrase`.
      */
     async importAccountFromMnemonicBackup(backupBase64, mnemonic, passphrase, label) {
-        const identity = await KeyStore.importIdentityFromMnemonicBackup(backupBase64, mnemonic, passphrase);
-        const contact = new MajikContact({
-            id: identity.id,
-            publicKey: identity.publicKey,
-            fingerprint: identity.fingerprint,
-            meta: { label: label || "" },
-        });
-        if (!!this.getOwnAccountById(identity.id)) {
+        const mJSON = {
+            id: backupBase64,
+            seed: seedStringToArray(mnemonic),
+            phrase: passphrase,
+        };
+        const importedIdentity = await MajikKey.fromMnemonicJSON(mJSON, passphrase, label);
+        await KeyStore.addMajikKey(importedIdentity);
+        const accountContact = await importedIdentity.toContact().toJSON();
+        const contact = MajikContact.fromJSON(accountContact);
+        if (!!this.getOwnAccountById(importedIdentity.id)) {
             throw new Error("Account with the same ID already exists");
         }
         this.addOwnAccount(contact);
-        return { id: identity.id, fingerprint: identity.fingerprint };
+        return {
+            id: importedIdentity.id,
+            fingerprint: importedIdentity.fingerprint,
+        };
     }
     /**
      * Create a new account deterministically from `mnemonic` and store it encrypted with `passphrase`.
      * Returns the created identity id (which equals fingerprint) and fingerprint.
      */
     async createAccountFromMnemonic(mnemonic, passphrase, label) {
-        const identity = await KeyStore.createIdentityFromMnemonic(mnemonic, passphrase);
-        const contact = new MajikContact({
-            id: identity.id,
-            publicKey: identity.publicKey,
-            fingerprint: identity.fingerprint,
-            meta: { label: label || "" },
-        });
-        const backup = await KeyStore.exportIdentityMnemonicBackup(identity.id, mnemonic);
+        const newAccount = await MajikKey.create(mnemonic, passphrase, label);
+        await KeyStore.addMajikKey(newAccount);
+        const accountContact = await newAccount.toContact().toJSON();
+        const contact = MajikContact.fromJSON(accountContact);
         this.addOwnAccount(contact);
         return {
-            id: identity.id,
-            fingerprint: identity.fingerprint,
-            backup: backup,
+            id: newAccount.id,
+            fingerprint: newAccount.fingerprint,
+            backup: newAccount.backup,
         };
     }
     addOwnAccount(account) {

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.1.1",
+  "version": "1.1.3",
   "license": "Apache-2.0",
   "author": "Zelijah",
   "main": "./dist/index.js",
@@ -15,6 +15,10 @@
     "type": "git",
     "url": "git+https://github.com/jedlsf/majik-message.git"
   },
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/jedlsf"
+  },
   "keywords": [
     "majik",
     "majik-message",
@@ -84,6 +88,7 @@
     "@stablelib/random": "^2.0.1",
     "@stablelib/sha256": "^2.0.1",
     "@stablelib/x25519": "^2.0.1",
+    "@thezelijah/majik-key": "^1.0.5",
     "@thezelijah/majik-user": "^1.0.0",
     "ed2curve": "^0.3.0",
     "fernet": "^0.3.3",

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

@@ -1,44 +0,0 @@
-/**
- * Target gender brackets for the audience.
- */
-export declare const UserGenderOptions: {
-    readonly MALE: "Male";
-    readonly FEMALE: "Female";
-    readonly OTHER: "Other";
-};
-export type UserGenderOptions = (typeof UserGenderOptions)[keyof typeof UserGenderOptions];
-/**
- * Enum representing different types of social media platforms.
- */
-export declare const SocialLinkType: {
-    readonly FACEBOOK: "Facebook";
-    readonly X: "X";
-    readonly TIKTOK: "Tik-Tok";
-    readonly THREADS: "Threads";
-    readonly INSTAGRAM: "Instagram";
-    readonly YOUTUBE: "Youtube";
-    readonly SPOTIFY: "Spotify";
-    readonly APPLE_MUSIC: "Apple Music";
-    readonly LINKEDIN: "LinkedIn";
-    readonly WEBSITE: "Website URL";
-};
-export type SocialLinkType = (typeof SocialLinkType)[keyof typeof SocialLinkType];
-/** Payment methods accepted for the invoice */
-export declare const PaymentMethod: {
-    /** Payment is made in cash */
-    readonly CASH: "Cash";
-    /** Payment is made via bank transfer or deposit */
-    readonly BANK: "Bank";
-    /** Payment is made via e-wallet transfer */
-    readonly EWALLET: "E-Wallet";
-    /** Payment is made using a check */
-    readonly CHECK: "Check";
-};
-export type PaymentMethod = (typeof PaymentMethod)[keyof typeof PaymentMethod];
-export declare const Visibility: {
-    readonly PRIVATE: "Private";
-    readonly PUBLIC: "Public";
-    readonly LIMITED: "Limited";
-    readonly UNLISTED: "Unlisted";
-};
-export type Visibility = (typeof Visibility)[keyof typeof Visibility];

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

@@ -1,40 +0,0 @@
-/**
- * Target gender brackets for the audience.
- */
-export const UserGenderOptions = {
-    MALE: 'Male',
-    FEMALE: 'Female',
-    OTHER: 'Other'
-};
-/**
- * Enum representing different types of social media platforms.
- */
-export const SocialLinkType = {
-    FACEBOOK: 'Facebook',
-    X: 'X',
-    TIKTOK: 'Tik-Tok',
-    THREADS: 'Threads',
-    INSTAGRAM: 'Instagram',
-    YOUTUBE: 'Youtube',
-    SPOTIFY: 'Spotify',
-    APPLE_MUSIC: 'Apple Music',
-    LINKEDIN: 'LinkedIn',
-    WEBSITE: 'Website URL'
-};
-/** Payment methods accepted for the invoice */
-export const PaymentMethod = {
-    /** Payment is made in cash */
-    CASH: 'Cash',
-    /** Payment is made via bank transfer or deposit */
-    BANK: 'Bank',
-    /** Payment is made via e-wallet transfer */
-    EWALLET: 'E-Wallet',
-    /** Payment is made using a check */
-    CHECK: 'Check'
-};
-export const Visibility = {
-    PRIVATE: 'Private',
-    PUBLIC: 'Public',
-    LIMITED: 'Limited',
-    UNLISTED: 'Unlisted'
-};

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

@@ -1,261 +0,0 @@
-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;
-    displayName: string;
-    hash: string;
-    metadata: TMetadata;
-    settings: UserSettings;
-    createdAt: Date;
-    lastUpdate: Date;
-}
-/**
- * Base user class for database persistence
- * Designed to be extended by subclasses with additional metadata
- */
-export declare class MajikUser<TMetadata extends UserBasicInformation = UserBasicInformation> {
-    readonly id: string;
-    protected _email: string;
-    protected _displayName: string;
-    protected _hash: string;
-    protected _metadata: TMetadata;
-    protected _settings: UserSettings;
-    readonly createdAt: Date;
-    protected _lastUpdate: Date;
-    constructor(data: MajikUserData<TMetadata>);
-    /**
-     * Initialize a new user with email and display name
-     * Generates a UUID for the id if unset and sets timestamps
-     */
-    static initialize<T extends MajikUser>(this: new (data: MajikUserData<any>) => T, email: string, displayName: string, id?: string): T;
-    /**
-     * Deserialize user from JSON object or JSON string
-     */
-    static fromJSON<T extends MajikUser>(this: new (data: MajikUserData<any>) => T, json: MajikUserJSON<any> | string): T;
-    /**
-     * Create MajikUser from Supabase User object
-     * Maps Supabase user fields to MajikUser structure
-     */
-    static fromSupabase<T extends MajikUser>(this: new (data: MajikUserData<any>) => T, supabaseUser: SupabaseUser): T;
-    get email(): string;
-    get displayName(): string;
-    get hash(): string;
-    get metadata(): Readonly<TMetadata>;
-    get settings(): Readonly<UserSettings>;
-    get lastUpdate(): Date;
-    /**
-     * Get user's full name if available
-     */
-    get fullName(): string | null;
-    get fullNameObject(): FullName | null;
-    set fullNameObject(name: FullName);
-    /**
-     * Get user's formatted name (first + last)
-     */
-    get formattedName(): string;
-    /**
-     * Get user's first name if available
-     */
-    get firstName(): string | null;
-    /**
-     * Get user's last name if available
-     */
-    get lastName(): string | null;
-    /**
-     * Get user's gender
-     */
-    get gender(): string;
-    /**
-     * Calculate user's age from birthdate
-     */
-    get age(): number | null;
-    /**
-     * 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
-     */
-    get isEmailVerified(): boolean;
-    /**
-     * Check if phone is verified
-     */
-    get isPhoneVerified(): boolean;
-    /**
-     * Check if identity is verified
-     */
-    get isIdentityVerified(): boolean;
-    /**
-     * Check if all verification steps are complete
-     */
-    get isFullyVerified(): boolean;
-    /**
-     * Get user's initials from name or display name
-     */
-    get initials(): string;
-    set email(value: string);
-    set displayName(value: string);
-    set hash(value: string);
-    /**
-     * Update user's full name
-     */
-    setName(name: FullName): void;
-    /**
-     * Update user's profile picture
-     */
-    setPicture(url: string): void;
-    /**
-     * Update user's phone number
-     */
-    setPhone(phone: string): void;
-    /**
-     * Update user's address
-     */
-    setAddress(address: Address): void;
-    /**
-     * Update user's birthdate
-     * Accepts either YYYY-MM-DD string or Date object
-     */
-    setBirthdate(birthdate: YYYYMMDD | Date): void;
-    /**
-     * Update user's address
-     */
-    setGender(gender: UserGenderOptions): void;
-    /**
-     * Update user's bio
-     */
-    setBio(bio: string): void;
-    /**
-     * Update user's language preference
-     */
-    setLanguage(language: string): void;
-    /**
-     * Update user's timezone
-     */
-    setTimezone(timezone: string): void;
-    /**
-     * Add or update a social link
-     */
-    setSocialLink(platform: string, url: string): void;
-    /**
-     * Remove a social link
-     */
-    removeSocialLink(platform: string): void;
-    /**
-     * Update a specific metadata field
-     */
-    setMetadata(key: keyof TMetadata, value: TMetadata[typeof key]): void;
-    /**
-     * Merge multiple metadata fields
-     */
-    updateMetadata(updates: Partial<TMetadata>): void;
-    /**
-     * Mark email as verified
-     */
-    verifyEmail(): void;
-    /**
-     * Mark email as unverified
-     */
-    unverifyEmail(): void;
-    /**
-     * Mark phone as verified
-     */
-    verifyPhone(): void;
-    /**
-     * Mark phone as unverified
-     */
-    unverifyPhone(): void;
-    /**
-     * Mark identity as verified (KYC)
-     */
-    verifyIdentity(): void;
-    /**
-     * Mark identity as unverified
-     */
-    unverifyIdentity(): void;
-    /**
-     * Update a specific setting
-     */
-    setSetting(key: string, value: unknown): void;
-    /**
-     * Merge multiple settings
-     */
-    updateSettings(updates: Partial<UserSettings>): void;
-    /**
-     * Enable notifications
-     */
-    enableNotifications(): void;
-    /**
-     * Disable notifications
-     */
-    disableNotifications(): void;
-    /**
-     * Check if user is currently restricted
-     */
-    isCurrentlyRestricted(): boolean;
-    /**
-     * Restrict user until a specific date (or indefinitely)
-     */
-    restrict(until?: Date): void;
-    /**
-     * Remove restriction from user
-     */
-    unrestrict(): void;
-    /**
-     * Check if this user has the same ID as another user
-     */
-    equals(other: MajikUser): boolean;
-    /**
-     * Check if user has complete profile information
-     */
-    hasCompleteProfile(): boolean;
-    /**
-     * Get profile completion percentage (0-100)
-     */
-    getProfileCompletionPercentage(): number;
-    validate(): {
-        isValid: boolean;
-        errors: string[];
-    };
-    /**
-     * Create a shallow clone of the user
-     */
-    clone(): MajikUser<TMetadata>;
-    /**
-     * Get a supabase ready version of user data (metadata)
-     */
-    toSupabaseJSON(): Record<string, unknown>;
-    /**
-     * Get a sanitized version of user data (removes sensitive info)
-     */
-    toPublicJSON(): Record<string, unknown>;
-    /**
-     * Serialize user to JSON-compatible object
-     */
-    toJSON(): MajikUserJSON<TMetadata>;
-    /**
-     * Updates the lastUpdate timestamp
-     */
-    protected updateTimestamp(): void;
-    /**
-     * Validates email format
-     */
-    protected validateEmail(email: string): void;
-    /**
-     * Generate a cryptographically secure unique identifier
-     */
-    protected static generateID(): string;
-    /**
-     * Validate ID format
-     */
-    protected static validateID(id: string): boolean;
-    /**
-     * Hash an ID using SHA-256
-     */
-    protected static hashID(id: string): string;
-}