@thezelijah/majik-message 1.0.5 → 1.0.6

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

@@ -1,3 +1,4 @@
+import { MajikMessageIdentityJSON } from "../database/system/identity";
 import { ISODateString } from "../types";
 export type SerializedMajikContact = Omit<MajikContactData, "publicKey"> & {
     publicKeyBase64: string;
@@ -48,6 +49,18 @@ export declare class MajikContact {
     setBlocked(blocked: boolean): this;
     block(): this;
     unblock(): this;
+    /**
+     * Support both CryptoKey and raw-key wrappers (fallbacks when WebCrypto X25519 unsupported)
+     */
+    getPublicKeyBase64(): Promise<string>;
     toJSON(): Promise<SerializedMajikContact>;
+    /**
+     * Reconstruct a MajikContact from its serialized form
+     */
+    static fromJSON(serialized: SerializedMajikContact): MajikContact;
+    /**
+     * Create a new MajikContact from a MajikMessageIdentityJSON
+     */
+    static fromIdentityJSON(identityJSON: MajikMessageIdentityJSON): Promise<MajikContact>;
     static isBlocked(contact: MajikContact): boolean;
 }

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

@@ -1,4 +1,4 @@
-import { arrayBufferToBase64 } from "../utils/utilities";
+import { arrayBufferToBase64, base64ToArrayBuffer } from "../utils/utilities";
 /* -------------------------------
  * Errors
  * ------------------------------- */
@@ -103,32 +103,72 @@ export class MajikContact {
             this.setBlocked(false);
         return this;
     }
-    async toJSON() {
-        // Support both CryptoKey and raw-key wrappers (fallbacks when WebCrypto X25519 unsupported)
+    /**
+     * Support both CryptoKey and raw-key wrappers (fallbacks when WebCrypto X25519 unsupported)
+     */
+    async getPublicKeyBase64() {
         try {
             // If it's a CryptoKey, export with SubtleCrypto
             const raw = await crypto.subtle.exportKey("raw", this.publicKey);
-            return {
-                id: this.id,
-                fingerprint: this.fingerprint,
-                meta: { ...this.meta },
-                publicKeyBase64: arrayBufferToBase64(raw),
-            };
+            return arrayBufferToBase64(raw);
         }
         catch (e) {
             // Fallback: publicKey may be a wrapper with `raw` Uint8Array
             const maybe = this.publicKey;
             if (maybe && maybe.raw instanceof Uint8Array) {
-                return {
-                    id: this.id,
-                    fingerprint: this.fingerprint,
-                    meta: { ...this.meta },
-                    publicKeyBase64: arrayBufferToBase64(maybe.raw.buffer),
-                };
+                return arrayBufferToBase64(maybe.raw.buffer);
             }
             throw e;
         }
     }
+    async toJSON() {
+        return {
+            id: this.id,
+            fingerprint: this.fingerprint,
+            meta: { ...this.meta },
+            publicKeyBase64: await this.getPublicKeyBase64(),
+        };
+    }
+    /**
+     * Reconstruct a MajikContact from its serialized form
+     */
+    static fromJSON(serialized) {
+        try {
+            const publicKeyRaw = new Uint8Array(base64ToArrayBuffer(serialized.publicKeyBase64));
+            return new MajikContact({
+                id: serialized.id,
+                fingerprint: serialized.fingerprint,
+                meta: serialized.meta,
+                publicKey: { raw: publicKeyRaw },
+            });
+        }
+        catch (err) {
+            throw new MajikContactError("Failed to deserialize MajikContact", err);
+        }
+    }
+    /**
+     * Create a new MajikContact from a MajikMessageIdentityJSON
+     */
+    static async fromIdentityJSON(identityJSON) {
+        try {
+            const publicKeyRaw = new Uint8Array(base64ToArrayBuffer(identityJSON.public_key));
+            const contactData = {
+                id: identityJSON.id,
+                publicKey: { raw: publicKeyRaw },
+                fingerprint: identityJSON.id,
+                meta: {
+                    label: identityJSON.label,
+                    createdAt: identityJSON.timestamp,
+                    updatedAt: identityJSON.timestamp,
+                    blocked: identityJSON.restricted,
+                },
+            };
+            return new MajikContact(contactData);
+        }
+        catch (err) {
+            throw new MajikContactError("Failed to create MajikContact from MajikMessageIdentityJSON", err);
+        }
+    }
     static isBlocked(contact) {
         return !!contact.meta.blocked;
     }

package/dist/core/database/system/identity.js

@@ -70,10 +70,11 @@ export class MajikMessageIdentity {
         const generatedID = autogenerateID();
         const timestamp = new Date().toISOString();
         const phash = sha256(`${user.id}:${account.id}:${generatedID}`);
+        const publicKey = account.publicKeyBase64;
         return new MajikMessageIdentity({
             id: generatedID,
             userId: user.id,
-            publicKey: account.id,
+            publicKey: publicKey,
             phash,
             label,
             timestamp,

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.5",
+  "version": "1.0.6",
   "license": "Apache-2.0",
   "author": "Zelijah",
   "main": "./dist/index.js",