@freesignal/protocol 0.2.6 → 0.2.8

package/api.d.ts

@@ -17,21 +17,21 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  */
 import { Crypto, KeyExchangeData, KeyExchangeDataBundle, KeyExchangeSynMessage, LocalStorage } from "@freesignal/interfaces";
-import { KeySession } from "./double-ratchet";
+import { ExportedKeySession } from "./double-ratchet";
 import { KeyExchange } from "./x3dh";
 import { Datagram, IdentityKeys, EncryptedData, UserId } from "./types";
 type DatagramId = string;
 export declare class FreeSignalAPI {
     protected readonly signKey: Crypto.KeyPair;
     protected readonly boxKey: Crypto.KeyPair;
-    protected readonly sessions: LocalStorage<UserId, KeySession>;
+    protected readonly sessions: LocalStorage<UserId, ExportedKeySession>;
     protected readonly keyExchange: KeyExchange;
     protected readonly users: LocalStorage<UserId, IdentityKeys>;
     readonly userId: UserId;
     constructor(opts: {
         secretSignKey: Uint8Array;
         secretBoxKey: Uint8Array;
-        sessions: LocalStorage<UserId, KeySession>;
+        sessions: LocalStorage<UserId, ExportedKeySession>;
         keyExchange: LocalStorage<string, Crypto.KeyPair>;
         users: LocalStorage<UserId, IdentityKeys>;
     });

package/api.js

@@ -32,6 +32,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeSignalAPI = void 0;
 const crypto_1 = __importDefault(require("@freesignal/crypto"));
+const double_ratchet_1 = require("./double-ratchet");
 const x3dh_1 = require("./x3dh");
 const utils_1 = require("@freesignal/utils");
 const types_1 = require("./types");
@@ -53,23 +54,25 @@ class FreeSignalAPI {
     }
     encryptData(data, userId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const session = yield this.sessions.get(userId);
-            if (!session)
+            const sessionJson = yield this.sessions.get(userId);
+            if (!sessionJson)
                 throw new Error('Session not found for user: ' + userId);
+            const session = double_ratchet_1.KeySession.from(sessionJson);
             const encrypted = session.encrypt(data);
-            this.sessions.set(userId, session); // Ensure session is updated
+            this.sessions.set(userId, session.toJSON()); // Ensure session is updated
             return encrypted;
         });
     }
     decryptData(data, userId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const session = yield this.sessions.get(userId);
-            if (!session)
+            const sessionJson = yield this.sessions.get(userId);
+            if (!sessionJson)
                 throw new Error('Session not found for user: ' + userId);
+            const session = double_ratchet_1.KeySession.from(sessionJson);
             const decrypted = session.decrypt(data);
             if (!decrypted)
                 throw new Error('Decryption failed for user: ' + userId);
-            this.sessions.set(userId, session); // Ensure session is updated
+            this.sessions.set(userId, session.toJSON()); // Ensure session is updated
             return decrypted;
         });
     }
@@ -78,7 +81,10 @@ class FreeSignalAPI {
             const res = yield fetch(`${url}/${userId !== null && userId !== void 0 ? userId : ''}`, {
                 method: 'GET'
             });
-            return (0, utils_1.decodeJSON)(new Uint8Array(yield res.arrayBuffer()));
+            const body = types_1.XFreeSignal.decodeBody(new Uint8Array(yield res.arrayBuffer()));
+            if (body.type === 'error')
+                throw new Error(body.data);
+            return body.data;
         });
     }
     postHandshake(url, message) {
@@ -125,7 +131,10 @@ class FreeSignalAPI {
                     authorization: this.createToken(publicKey instanceof Uint8Array ? publicKey : (0, utils_1.encodeBase64)(publicKey))
                 }
             });
-            return types_1.DataEncoder.from(yield this.decryptData(new Uint8Array(yield res.arrayBuffer()), types_1.UserId.getUserId(publicKey).toString())).data.map(array => types_1.Datagram.from(array));
+            const body = types_1.XFreeSignal.decodeBody(new Uint8Array(yield res.arrayBuffer()));
+            if (body.type === 'error')
+                throw new Error(body.data);
+            return types_1.DataEncoder.from(yield this.decryptData(body.data, types_1.UserId.getUserId(publicKey).toString())).data.map(array => types_1.Datagram.from(array));
         });
     }
     postDatagrams(datagrams, publicKey, url) {
@@ -139,7 +148,10 @@ class FreeSignalAPI {
                 },
                 body: types_1.XFreeSignal.encodeBody('data', data.encode())
             });
-            return (0, utils_1.numberFromArray)(yield this.decryptData(new Uint8Array(yield res.arrayBuffer()), types_1.UserId.getUserId(publicKey).toString()));
+            const body = types_1.XFreeSignal.decodeBody(new Uint8Array(yield res.arrayBuffer()));
+            if (body.type === 'error')
+                throw new Error(body.data);
+            return types_1.DataEncoder.from(yield this.decryptData(body.data, types_1.UserId.getUserId(publicKey).toString())).data;
         });
     }
     deleteDatagrams(datagramIds, publicKey, url) {
@@ -153,7 +165,10 @@ class FreeSignalAPI {
                 },
                 body: types_1.XFreeSignal.encodeBody('data', data.encode())
             });
-            return (0, utils_1.numberFromArray)(yield this.decryptData(new Uint8Array(yield res.arrayBuffer()), types_1.UserId.getUserId(publicKey).toString()));
+            const body = types_1.XFreeSignal.decodeBody(new Uint8Array(yield res.arrayBuffer()));
+            if (body.type === 'error')
+                throw new Error(body.data);
+            return types_1.DataEncoder.from(yield this.decryptData(body.data, types_1.UserId.getUserId(publicKey).toString())).data;
         });
     }
     createToken(publicKey) {

package/double-ratchet.d.ts

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  */
 import { EncryptedData } from "./types";
-type ExportedKeySession = {
+export interface ExportedKeySession {
     secretKey: string;
     remoteKey: string;
     rootKey: string;
@@ -27,7 +27,7 @@ type ExportedKeySession = {
     receivingCount: number;
     previousCount: number;
     previousKeys: [number, Uint8Array][];
-};
+}
 /**
  * Represents a secure Double Ratchet session.
  * Used for forward-secure encryption and decryption of messages.
@@ -90,7 +90,7 @@ export declare class KeySession {
      * @param json string returned by `export()` method.
      * @returns session with the state parsed.
      */
-    static parse(json: string): KeySession;
+    static from(data: ExportedKeySession): KeySession;
     /**
      * The fixed key length (in bytes) used throughout the Double Ratchet session.
      * Typically 32 bytes (256 bits) for symmetric keys.
@@ -98,4 +98,3 @@ export declare class KeySession {
     static readonly keyLength = 32;
     private static symmetricRatchet;
 }
-export {};

package/double-ratchet.js

@@ -162,8 +162,7 @@ class KeySession {
      * @param json string returned by `export()` method.
      * @returns session with the state parsed.
      */
-    static parse(json) {
-        const data = JSON.parse(json);
+    static from(data) {
         const session = new KeySession({ secretKey: (0, utils_1.encodeBase64)(data.secretKey), rootKey: (0, utils_1.encodeBase64)(data.rootKey) });
         session._remoteKey = (0, utils_1.encodeBase64)(data.remoteKey);
         session.sendingChain = (0, utils_1.encodeBase64)(data.sendingChain);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freesignal/protocol",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Signal Protocol implementation in javascript",
   "license": "GPL-3.0-or-later",
   "author": "Christian Braghette",

package/types.d.ts

@@ -144,7 +144,14 @@ export interface EncryptedData extends Encodable {
     /**
      * Returns the decoded object as a JSON string.
      */
-    toJSON(): string;
+    toJSON(): {
+        version: number;
+        count: number;
+        previous: number;
+        publicKey: string;
+        nonce: string;
+        ciphertext: string;
+    };
 }
 export declare class EncryptedData {
     /**
@@ -174,7 +181,14 @@ export declare class EncryptedDataConstructor implements EncryptedData {
     get ciphertext(): Uint8Array;
     encode(): Uint8Array;
     toString(): string;
-    toJSON(): string;
+    toJSON(): {
+        version: number;
+        count: number;
+        previous: number;
+        publicKey: string;
+        nonce: string;
+        ciphertext: string;
+    };
 }
 declare enum DataType {
     UKNOWN = -1,
@@ -196,7 +210,7 @@ export declare class DataEncoder<T> implements Encodable {
     protected get _type(): DataType;
     encode(): Uint8Array;
     toString(): string;
-    toJSON(): string;
+    toJSON(): T;
     static from<T = any>(array: Uint8Array): DataEncoder<T>;
 }
 export declare namespace XFreeSignal {
@@ -210,7 +224,10 @@ export declare namespace XFreeSignal {
         constructor(type: 'data' | 'error', data: T);
         encode(compressed?: boolean): Uint8Array;
         toString(): string;
-        toJSON(): string;
+        toJSON(): {
+            type: "data" | "error";
+            data: T;
+        };
         static from<T = any>(array: Uint8Array): Body<T>;
     }
     export {};

package/types.js

@@ -37,7 +37,7 @@ var UserId;
             return (0, utils_1.decodeBase64)(this.array);
         }
         toJSON() {
-            return JSON.stringify(this.toString());
+            return this.toString();
         }
         toUint8Array() {
             return this.array;
@@ -75,7 +75,7 @@ var IdentityKeys;
             throw (0, utils_1.decodeBase64)(this.encode());
         }
         toJSON() {
-            throw JSON.stringify(this.toString());
+            throw this.toString();
         }
     }
     function isIdentityKeys(obj) {
@@ -197,7 +197,7 @@ var Datagram;
             return (0, utils_1.decodeBase64)(this.encode());
         }
         toJSON() {
-            return JSON.stringify(this.toString());
+            return this.toString();
         }
     }
     DatagramConstructor.headerOffset = 26 + crypto_1.default.EdDSA.publicKeyLength * 2;
@@ -265,14 +265,14 @@ class EncryptedDataConstructor {
         return (0, utils_1.decodeBase64)(this.raw);
     }
     toJSON() {
-        return JSON.stringify({
+        return {
             version: this.version,
             count: this.count,
             previous: this.previous,
             publicKey: (0, utils_1.decodeBase64)(this.publicKey),
             nonce: (0, utils_1.decodeBase64)(this.nonce),
             ciphertext: (0, utils_1.decodeBase64)(this.ciphertext)
-        });
+        };
     }
 }
 exports.EncryptedDataConstructor = EncryptedDataConstructor;
@@ -368,7 +368,7 @@ class DataEncoder {
         return "[Object XFreeSignalData]";
     }
     toJSON() {
-        return JSON.stringify(this.data);
+        return this.data;
     }
     static from(array) {
         const type = array[0];
@@ -448,10 +448,10 @@ var XFreeSignal;
             return "[Object XFreeSignalBody]";
         }
         toJSON() {
-            return JSON.stringify({
+            return {
                 type: this.type,
                 data: this.data
-            });
+            };
         }
         static from(array) {
             return new Body(BodyType.getName((array[0] & 64) >> 6), DataEncoder.from((array[0] & 32) >> 5 === 1 ? fflate_1.default.inflateSync(array.subarray(1)) : array.subarray(1)).data);

package/x3dh.d.ts

@@ -19,6 +19,11 @@
 import { KeyExchangeData, KeyExchangeDataBundle, KeyExchangeSynMessage, LocalStorage, Crypto } from "@freesignal/interfaces";
 import { KeySession } from "./double-ratchet";
 import { IdentityKeys } from "./types";
+export interface ExportedKeyExchange {
+    signatureKey: Crypto.KeyPair;
+    identityKey: Crypto.KeyPair;
+    bundleStore: Array<[string, Crypto.KeyPair]>;
+}
 export declare class KeyExchange {
     static readonly version = 1;
     private static readonly hkdfInfo;
@@ -42,4 +47,6 @@ export declare class KeyExchange {
         session: KeySession;
         identityKeys: IdentityKeys;
     }>;
+    toJSON(): ExportedKeyExchange;
+    static from(data: ExportedKeyExchange): KeyExchange;
 }

package/x3dh.js

@@ -146,19 +146,29 @@ class KeyExchange {
             };
         });
     }
+    toJSON() {
+        return {
+            identityKey: this._identityKey,
+            signatureKey: this._signatureKey,
+            bundleStore: Array.from(this.bundleStore.entries())
+        };
+    }
+    static from(data) {
+        return new KeyExchange(data.signatureKey.secretKey, data.identityKey.secretKey, new AsyncMap(data.bundleStore));
+    }
 }
 exports.KeyExchange = KeyExchange;
 KeyExchange.version = 1;
 KeyExchange.hkdfInfo = (0, utils_1.encodeUTF8)("freesignal/x3dh/" + KeyExchange.version);
 KeyExchange.maxOPK = 10;
 class AsyncMap {
-    constructor() {
-        this.map = new Map();
+    constructor(iterable) {
+        this.map = new Map(iterable);
     }
     set(key, value) {
         return __awaiter(this, void 0, void 0, function* () {
             this.map.set(key, value);
-            return this;
+            return;
         });
     }
     get(key) {
@@ -177,8 +187,6 @@ class AsyncMap {
         });
     }
     entries() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.map.entries();
-        });
+        return this.map.entries();
     }
 }