supunmd-bail 2.0.2 → 2.1.3

package/lib/Signal/Group/group_cipher.js

@@ -1,44 +1,55 @@
-import { decrypt, encrypt } from 'libsignal/src/crypto.js';
-import { SenderKeyMessage } from './sender-key-message.js';
-import { SenderKeyName } from './sender-key-name.js';
-import { SenderKeyRecord } from './sender-key-record.js';
-import { SenderKeyState } from './sender-key-state.js';
-export class GroupCipher {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GroupCipher = void 0;
+const crypto_1 = require("libsignal/src/crypto");
+const queue_job_1 = __importDefault(require("./queue-job"));
+const sender_key_message_1 = require("./sender-key-message");
+class GroupCipher {
     constructor(senderKeyStore, senderKeyName) {
         this.senderKeyStore = senderKeyStore;
         this.senderKeyName = senderKeyName;
     }
+    queueJob(awaitable) {
+        return (0, queue_job_1.default)(this.senderKeyName.toString(), awaitable);
+    }
     async encrypt(paddedPlaintext) {
-        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
-        if (!record) {
-            throw new Error('No SenderKeyRecord found for encryption');
-        }
-        const senderKeyState = record.getSenderKeyState();
-        if (!senderKeyState) {
-            throw new Error('No session to encrypt message');
-        }
-        const iteration = senderKeyState.getSenderChainKey().getIteration();
-        const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
-        const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
-        const senderKeyMessage = new SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
-        await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
-        return senderKeyMessage.serialize();
+        return await this.queueJob(async () => {
+            const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
+            if (!record) {
+                throw new Error('No SenderKeyRecord found for encryption');
+            }
+            const senderKeyState = record.getSenderKeyState();
+            if (!senderKeyState) {
+                throw new Error('No session to encrypt message');
+            }
+            const iteration = senderKeyState.getSenderChainKey().getIteration();
+            const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
+            const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
+            const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
+            await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
+            return senderKeyMessage.serialize();
+        });
     }
     async decrypt(senderKeyMessageBytes) {
-        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
-        if (!record) {
-            throw new Error('No SenderKeyRecord found for decryption');
-        }
-        const senderKeyMessage = new SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
-        const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
-        if (!senderKeyState) {
-            throw new Error('No session found to decrypt message');
-        }
-        senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
-        const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
-        const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
-        await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
-        return plaintext;
+        return await this.queueJob(async () => {
+            const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
+            if (!record) {
+                throw new Error('No SenderKeyRecord found for decryption');
+            }
+            const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
+            const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
+            if (!senderKeyState) {
+                throw new Error('No session found to decrypt message');
+            }
+            senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
+            const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
+            const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
+            await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
+            return plaintext;
+        });
     }
     getSenderKey(senderKeyState, iteration) {
         let senderChainKey = senderKeyState.getSenderChainKey();
@@ -64,7 +75,7 @@ export class GroupCipher {
     }
     async getPlainText(iv, key, ciphertext) {
         try {
-            return decrypt(key, ciphertext, iv);
+            return (0, crypto_1.decrypt)(key, ciphertext, iv);
         }
         catch (e) {
             throw new Error('InvalidMessageException');
@@ -72,11 +83,14 @@ export class GroupCipher {
     }
     async getCipherText(iv, key, plaintext) {
         try {
-            return encrypt(key, plaintext, iv);
+            const ivBuffer = typeof iv === 'string' ? Buffer.from(iv, 'base64') : iv;
+            const keyBuffer = typeof key === 'string' ? Buffer.from(key, 'base64') : key;
+            const plaintextBuffer = typeof plaintext === 'string' ? Buffer.from(plaintext) : plaintext;
+            return (0, crypto_1.encrypt)(keyBuffer, plaintextBuffer, ivBuffer);
         }
         catch (e) {
             throw new Error('InvalidMessageException');
         }
     }
 }
-//# sourceMappingURL=group_cipher.js.map
+exports.GroupCipher = GroupCipher;

package/lib/Signal/Group/index.d.ts

@@ -1,12 +1,11 @@
-export { GroupSessionBuilder } from './group-session-builder.js';
-export { SenderKeyDistributionMessage } from './sender-key-distribution-message.js';
-export { SenderKeyRecord } from './sender-key-record.js';
-export { SenderKeyName } from './sender-key-name.js';
-export { GroupCipher } from './group_cipher.js';
-export { SenderKeyState } from './sender-key-state.js';
-export { SenderKeyMessage } from './sender-key-message.js';
-export { SenderMessageKey } from './sender-message-key.js';
-export { SenderChainKey } from './sender-chain-key.js';
-export { CiphertextMessage } from './ciphertext-message.js';
-export * as keyhelper from './keyhelper.js';
-//# sourceMappingURL=index.d.ts.map
+export { GroupSessionBuilder } from './group-session-builder';
+export { SenderKeyDistributionMessage } from './sender-key-distribution-message';
+export { SenderKeyRecord } from './sender-key-record';
+export { SenderKeyName } from './sender-key-name';
+export { GroupCipher } from './group_cipher';
+export { SenderKeyState } from './sender-key-state';
+export { SenderKeyMessage } from './sender-key-message';
+export { SenderMessageKey } from './sender-message-key';
+export { SenderChainKey } from './sender-chain-key';
+export { CiphertextMessage } from './ciphertext-message';
+export * as keyhelper from './keyhelper';

package/lib/Signal/Group/index.js

@@ -1,12 +1,57 @@
-export { GroupSessionBuilder } from './group-session-builder.js';
-export { SenderKeyDistributionMessage } from './sender-key-distribution-message.js';
-export { SenderKeyRecord } from './sender-key-record.js';
-export { SenderKeyName } from './sender-key-name.js';
-export { GroupCipher } from './group_cipher.js';
-export { SenderKeyState } from './sender-key-state.js';
-export { SenderKeyMessage } from './sender-key-message.js';
-export { SenderMessageKey } from './sender-message-key.js';
-export { SenderChainKey } from './sender-chain-key.js';
-export { CiphertextMessage } from './ciphertext-message.js';
-export * as keyhelper from './keyhelper.js';
-//# sourceMappingURL=index.js.map
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.keyhelper = exports.CiphertextMessage = exports.SenderChainKey = exports.SenderMessageKey = exports.SenderKeyMessage = exports.SenderKeyState = exports.GroupCipher = exports.SenderKeyName = exports.SenderKeyRecord = exports.SenderKeyDistributionMessage = exports.GroupSessionBuilder = void 0;
+var group_session_builder_1 = require("./group-session-builder");
+Object.defineProperty(exports, "GroupSessionBuilder", { enumerable: true, get: function () { return group_session_builder_1.GroupSessionBuilder; } });
+var sender_key_distribution_message_1 = require("./sender-key-distribution-message");
+Object.defineProperty(exports, "SenderKeyDistributionMessage", { enumerable: true, get: function () { return sender_key_distribution_message_1.SenderKeyDistributionMessage; } });
+var sender_key_record_1 = require("./sender-key-record");
+Object.defineProperty(exports, "SenderKeyRecord", { enumerable: true, get: function () { return sender_key_record_1.SenderKeyRecord; } });
+var sender_key_name_1 = require("./sender-key-name");
+Object.defineProperty(exports, "SenderKeyName", { enumerable: true, get: function () { return sender_key_name_1.SenderKeyName; } });
+var group_cipher_1 = require("./group_cipher");
+Object.defineProperty(exports, "GroupCipher", { enumerable: true, get: function () { return group_cipher_1.GroupCipher; } });
+var sender_key_state_1 = require("./sender-key-state");
+Object.defineProperty(exports, "SenderKeyState", { enumerable: true, get: function () { return sender_key_state_1.SenderKeyState; } });
+var sender_key_message_1 = require("./sender-key-message");
+Object.defineProperty(exports, "SenderKeyMessage", { enumerable: true, get: function () { return sender_key_message_1.SenderKeyMessage; } });
+var sender_message_key_1 = require("./sender-message-key");
+Object.defineProperty(exports, "SenderMessageKey", { enumerable: true, get: function () { return sender_message_key_1.SenderMessageKey; } });
+var sender_chain_key_1 = require("./sender-chain-key");
+Object.defineProperty(exports, "SenderChainKey", { enumerable: true, get: function () { return sender_chain_key_1.SenderChainKey; } });
+var ciphertext_message_1 = require("./ciphertext-message");
+Object.defineProperty(exports, "CiphertextMessage", { enumerable: true, get: function () { return ciphertext_message_1.CiphertextMessage; } });
+exports.keyhelper = __importStar(require("./keyhelper"));

package/lib/Signal/Group/keyhelper.d.ts

@@ -1,4 +1,4 @@
-import { generateKeyPair } from 'libsignal/src/curve.js';
+import { generateKeyPair } from 'libsignal/src/curve';
 type KeyPairType = ReturnType<typeof generateKeyPair>;
 export declare function generateSenderKey(): Buffer;
 export declare function generateSenderKeyId(): number;
@@ -8,4 +8,3 @@ export interface SigningKeyPair {
 }
 export declare function generateSenderSigningKey(key?: KeyPairType): SigningKeyPair;
 export {};
-//# sourceMappingURL=keyhelper.d.ts.map

package/lib/Signal/Group/keyhelper.js

@@ -1,18 +1,55 @@
-import * as nodeCrypto from 'crypto';
-import { generateKeyPair } from 'libsignal/src/curve.js';
-export function generateSenderKey() {
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSenderKey = generateSenderKey;
+exports.generateSenderKeyId = generateSenderKeyId;
+exports.generateSenderSigningKey = generateSenderSigningKey;
+const nodeCrypto = __importStar(require("crypto"));
+const curve_1 = require("libsignal/src/curve");
+function generateSenderKey() {
     return nodeCrypto.randomBytes(32);
 }
-export function generateSenderKeyId() {
+function generateSenderKeyId() {
     return nodeCrypto.randomInt(2147483647);
 }
-export function generateSenderSigningKey(key) {
+function generateSenderSigningKey(key) {
     if (!key) {
-        key = generateKeyPair();
+        key = (0, curve_1.generateKeyPair)();
     }
     return {
         public: Buffer.from(key.pubKey),
         private: Buffer.from(key.privKey)
     };
 }
-//# sourceMappingURL=keyhelper.js.map

package/lib/Signal/Group/queue-job.d.ts

@@ -1,2 +1 @@
 export default function queueJob<T>(bucket: string | number, awaitable: () => Promise<T>): Promise<T>;
-//# sourceMappingURL=queue-job.d.ts.map

package/lib/Signal/Group/queue-job.js

@@ -1,7 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = queueJob;
 const _queueAsyncBuckets = new Map();
 const _gcLimit = 10000;
 async function _asyncQueueExecutor(queue, cleanup) {
     let offt = 0;
+    // eslint-disable-next-line no-constant-condition
     while (true) {
         const limit = Math.min(queue.length, _gcLimit);
         for (let i = offt; i < limit; i++) {
@@ -28,7 +32,7 @@ async function _asyncQueueExecutor(queue, cleanup) {
     }
     cleanup();
 }
-export default function queueJob(bucket, awaitable) {
+function queueJob(bucket, awaitable) {
     // Skip name assignment since it's readonly in strict mode
     if (typeof bucket !== 'string') {
         console.warn('Unhandled bucket type (for naming):', typeof bucket, bucket);
@@ -51,4 +55,3 @@ export default function queueJob(bucket, awaitable) {
     }
     return job;
 }
-//# sourceMappingURL=queue-job.js.map

package/lib/Signal/Group/sender-chain-key.d.ts

@@ -1,14 +1,13 @@
-import { SenderMessageKey } from './sender-message-key.js';
+import { SenderMessageKey } from './sender-message-key';
 export declare class SenderChainKey {
     private readonly MESSAGE_KEY_SEED;
     private readonly CHAIN_KEY_SEED;
     private readonly iteration;
     private readonly chainKey;
-    constructor(iteration: number, chainKey: Uint8Array | Buffer);
+    constructor(iteration: number, chainKey: any);
     getIteration(): number;
     getSenderMessageKey(): SenderMessageKey;
     getNext(): SenderChainKey;
     getSeed(): Uint8Array;
     private getDerivative;
 }
-//# sourceMappingURL=sender-chain-key.d.ts.map

package/lib/Signal/Group/sender-chain-key.js

@@ -1,17 +1,25 @@
-import { calculateMAC } from 'libsignal/src/crypto.js';
-import { SenderMessageKey } from './sender-message-key.js';
-export class SenderChainKey {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SenderChainKey = void 0;
+const crypto_1 = require("libsignal/src/crypto");
+const sender_message_key_1 = require("./sender-message-key");
+class SenderChainKey {
     constructor(iteration, chainKey) {
         this.MESSAGE_KEY_SEED = Buffer.from([0x01]);
         this.CHAIN_KEY_SEED = Buffer.from([0x02]);
         this.iteration = iteration;
-        this.chainKey = Buffer.from(chainKey);
+        if (chainKey instanceof Buffer) {
+            this.chainKey = chainKey;
+        }
+        else {
+            this.chainKey = Buffer.from(chainKey || []);
+        }
     }
     getIteration() {
         return this.iteration;
     }
     getSenderMessageKey() {
-        return new SenderMessageKey(this.iteration, this.getDerivative(this.MESSAGE_KEY_SEED, this.chainKey));
+        return new sender_message_key_1.SenderMessageKey(this.iteration, this.getDerivative(this.MESSAGE_KEY_SEED, this.chainKey));
     }
     getNext() {
         return new SenderChainKey(this.iteration + 1, this.getDerivative(this.CHAIN_KEY_SEED, this.chainKey));
@@ -20,7 +28,7 @@ export class SenderChainKey {
         return this.chainKey;
     }
     getDerivative(seed, key) {
-        return calculateMAC(key, seed);
+        return (0, crypto_1.calculateMAC)(key, seed);
     }
 }
-//# sourceMappingURL=sender-chain-key.js.map
+exports.SenderChainKey = SenderChainKey;

package/lib/Signal/Group/sender-key-distribution-message.d.ts

@@ -1,4 +1,4 @@
-import { CiphertextMessage } from './ciphertext-message.js';
+import { CiphertextMessage } from './ciphertext-message';
 export declare class SenderKeyDistributionMessage extends CiphertextMessage {
     private readonly id;
     private readonly iteration;
@@ -14,4 +14,3 @@ export declare class SenderKeyDistributionMessage extends CiphertextMessage {
     getSignatureKey(): Uint8Array;
     getId(): number;
 }
-//# sourceMappingURL=sender-key-distribution-message.d.ts.map

package/lib/Signal/Group/sender-key-distribution-message.js

@@ -1,12 +1,15 @@
-import { proto } from '../../../WAProto/index.js';
-import { CiphertextMessage } from './ciphertext-message.js';
-export class SenderKeyDistributionMessage extends CiphertextMessage {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SenderKeyDistributionMessage = void 0;
+const WAProto_1 = require("../../../WAProto");
+const ciphertext_message_1 = require("./ciphertext-message");
+class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessage {
     constructor(id, iteration, chainKey, signatureKey, serialized) {
         super();
         if (serialized) {
             try {
                 const message = serialized.slice(1);
-                const distributionMessage = proto.SenderKeyDistributionMessage.decode(message).toJSON();
+                const distributionMessage = WAProto_1.proto.SenderKeyDistributionMessage.decode(message).toJSON();
                 this.serialized = serialized;
                 this.id = distributionMessage.id;
                 this.iteration = distributionMessage.iteration;
@@ -29,7 +32,7 @@ export class SenderKeyDistributionMessage extends CiphertextMessage {
             this.iteration = iteration;
             this.chainKey = chainKey;
             this.signatureKey = signatureKey;
-            const message = proto.SenderKeyDistributionMessage.encode(proto.SenderKeyDistributionMessage.create({
+            const message = WAProto_1.proto.SenderKeyDistributionMessage.encode(WAProto_1.proto.SenderKeyDistributionMessage.create({
                 id,
                 iteration,
                 chainKey,
@@ -51,13 +54,13 @@ export class SenderKeyDistributionMessage extends CiphertextMessage {
         return this.iteration;
     }
     getChainKey() {
-        return this.chainKey;
+        return typeof this.chainKey === 'string' ? Buffer.from(this.chainKey, 'base64') : this.chainKey;
     }
     getSignatureKey() {
-        return this.signatureKey;
+        return typeof this.signatureKey === 'string' ? Buffer.from(this.signatureKey, 'base64') : this.signatureKey;
     }
     getId() {
         return this.id;
     }
 }
-//# sourceMappingURL=sender-key-distribution-message.js.map
+exports.SenderKeyDistributionMessage = SenderKeyDistributionMessage;

package/lib/Signal/Group/sender-key-message.d.ts

@@ -1,4 +1,4 @@
-import { CiphertextMessage } from './ciphertext-message.js';
+import { CiphertextMessage } from './ciphertext-message';
 export declare class SenderKeyMessage extends CiphertextMessage {
     private readonly SIGNATURE_LENGTH;
     private readonly messageVersion;
@@ -16,4 +16,3 @@ export declare class SenderKeyMessage extends CiphertextMessage {
     serialize(): Uint8Array;
     getType(): number;
 }
-//# sourceMappingURL=sender-key-message.d.ts.map

package/lib/Signal/Group/sender-key-message.js

@@ -1,7 +1,10 @@
-import { calculateSignature, verifySignature } from 'libsignal/src/curve.js';
-import { proto } from '../../../WAProto/index.js';
-import { CiphertextMessage } from './ciphertext-message.js';
-export class SenderKeyMessage extends CiphertextMessage {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SenderKeyMessage = void 0;
+const curve_1 = require("libsignal/src/curve");
+const WAProto_1 = require("../../../WAProto");
+const ciphertext_message_1 = require("./ciphertext-message");
+class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
     constructor(keyId, iteration, ciphertext, signatureKey, serialized) {
         super();
         this.SIGNATURE_LENGTH = 64;
@@ -9,7 +12,7 @@ export class SenderKeyMessage extends CiphertextMessage {
             const version = serialized[0];
             const message = serialized.slice(1, serialized.length - this.SIGNATURE_LENGTH);
             const signature = serialized.slice(-1 * this.SIGNATURE_LENGTH);
-            const senderKeyMessage = proto.SenderKeyMessage.decode(message).toJSON();
+            const senderKeyMessage = WAProto_1.proto.SenderKeyMessage.decode(message).toJSON();
             this.serialized = serialized;
             this.messageVersion = (version & 0xff) >> 4;
             this.keyId = senderKeyMessage.id;
@@ -23,7 +26,7 @@ export class SenderKeyMessage extends CiphertextMessage {
         else {
             const version = (((this.CURRENT_VERSION << 4) | this.CURRENT_VERSION) & 0xff) % 256;
             const ciphertextBuffer = Buffer.from(ciphertext);
-            const message = proto.SenderKeyMessage.encode(proto.SenderKeyMessage.create({
+            const message = WAProto_1.proto.SenderKeyMessage.encode(WAProto_1.proto.SenderKeyMessage.create({
                 id: keyId,
                 iteration: iteration,
                 ciphertext: ciphertextBuffer
@@ -49,12 +52,12 @@ export class SenderKeyMessage extends CiphertextMessage {
     verifySignature(signatureKey) {
         const part1 = this.serialized.slice(0, this.serialized.length - this.SIGNATURE_LENGTH);
         const part2 = this.serialized.slice(-1 * this.SIGNATURE_LENGTH);
-        const res = verifySignature(signatureKey, part1, part2);
+        const res = (0, curve_1.verifySignature)(signatureKey, part1, part2);
         if (!res)
             throw new Error('Invalid signature!');
     }
     getSignature(signatureKey, serialized) {
-        return Buffer.from(calculateSignature(signatureKey, serialized));
+        return Buffer.from((0, curve_1.calculateSignature)(signatureKey, serialized));
     }
     serialize() {
         return this.serialized;
@@ -63,4 +66,4 @@ export class SenderKeyMessage extends CiphertextMessage {
         return 4;
     }
 }
-//# sourceMappingURL=sender-key-message.js.map
+exports.SenderKeyMessage = SenderKeyMessage;

package/lib/Signal/Group/sender-key-name.d.ts

@@ -15,4 +15,3 @@ export declare class SenderKeyName {
     hashCode(): number;
 }
 export {};
-//# sourceMappingURL=sender-key-name.d.ts.map

package/lib/Signal/Group/sender-key-name.js

@@ -1,3 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SenderKeyName = void 0;
 function isNull(str) {
     return str === null || str === '';
 }
@@ -19,7 +22,7 @@ function hashCode(strKey) {
     }
     return hash;
 }
-export class SenderKeyName {
+class SenderKeyName {
     constructor(groupId, sender) {
         this.groupId = groupId;
         this.sender = sender;
@@ -45,4 +48,4 @@ export class SenderKeyName {
         return hashCode(this.groupId) ^ hashCode(this.sender.toString());
     }
 }
-//# sourceMappingURL=sender-key-name.js.map
+exports.SenderKeyName = SenderKeyName;

package/lib/Signal/Group/sender-key-record.d.ts

@@ -1,4 +1,4 @@
-import { SenderKeyState } from './sender-key-state.js';
+import { SenderKeyState } from './sender-key-state';
 export interface SenderKeyStateStructure {
     senderKeyId: number;
     senderChainKey: {
@@ -26,6 +26,5 @@ export declare class SenderKeyRecord {
         private: Uint8Array;
     }): void;
     serialize(): SenderKeyStateStructure[];
-    static deserialize(data: Uint8Array): SenderKeyRecord;
+    static deserialize(data: Uint8Array | string | SenderKeyStateStructure[]): SenderKeyRecord;
 }
-//# sourceMappingURL=sender-key-record.d.ts.map

package/lib/Signal/Group/sender-key-record.js

@@ -1,12 +1,15 @@
-import { BufferJSON } from '../../Utils/generics.js';
-import { SenderKeyState } from './sender-key-state.js';
-export class SenderKeyRecord {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SenderKeyRecord = void 0;
+const generics_1 = require("../../Utils/generics");
+const sender_key_state_1 = require("./sender-key-state");
+class SenderKeyRecord {
     constructor(serialized) {
         this.MAX_STATES = 5;
         this.senderKeyStates = [];
         if (serialized) {
             for (const structure of serialized) {
-                this.senderKeyStates.push(new SenderKeyState(null, null, null, null, null, null, structure));
+                this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(null, null, null, null, null, null, structure));
             }
         }
     }
@@ -20,22 +23,31 @@ export class SenderKeyRecord {
         return this.senderKeyStates.find(state => state.getKeyId() === keyId);
     }
     addSenderKeyState(id, iteration, chainKey, signatureKey) {
-        this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, null, signatureKey));
+        this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(id, iteration, chainKey, null, signatureKey));
         if (this.senderKeyStates.length > this.MAX_STATES) {
             this.senderKeyStates.shift();
         }
     }
     setSenderKeyState(id, iteration, chainKey, keyPair) {
         this.senderKeyStates.length = 0;
-        this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, keyPair));
+        this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(id, iteration, chainKey, keyPair));
     }
     serialize() {
         return this.senderKeyStates.map(state => state.getStructure());
     }
     static deserialize(data) {
-        const str = Buffer.from(data).toString('utf-8');
-        const parsed = JSON.parse(str, BufferJSON.reviver);
+        let parsed;
+        if (typeof data === 'string') {
+            parsed = JSON.parse(data, generics_1.BufferJSON.reviver);
+        }
+        else if (data instanceof Uint8Array) {
+            const str = Buffer.from(data).toString('utf-8');
+            parsed = JSON.parse(str, generics_1.BufferJSON.reviver);
+        }
+        else {
+            parsed = data;
+        }
         return new SenderKeyRecord(parsed);
     }
 }
-//# sourceMappingURL=sender-key-record.js.map
+exports.SenderKeyRecord = SenderKeyRecord;

package/lib/Signal/Group/sender-key-state.d.ts

@@ -1,5 +1,5 @@
-import { SenderChainKey } from './sender-chain-key.js';
-import { SenderMessageKey } from './sender-message-key.js';
+import { SenderChainKey } from './sender-chain-key';
+import { SenderMessageKey } from './sender-message-key';
 interface SenderChainKeyStructure {
     iteration: number;
     seed: Uint8Array;
@@ -21,10 +21,10 @@ interface SenderKeyStateStructure {
 export declare class SenderKeyState {
     private readonly MAX_MESSAGE_KEYS;
     private readonly senderKeyStateStructure;
-    constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null | string, signatureKeyPair?: {
-        public: Uint8Array | string;
-        private: Uint8Array | string;
-    } | null, signatureKeyPublic?: Uint8Array | string | null, signatureKeyPrivate?: Uint8Array | string | null, senderKeyStateStructure?: SenderKeyStateStructure | null);
+    constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null, signatureKeyPair?: {
+        public: Uint8Array;
+        private: Uint8Array;
+    } | null, signatureKeyPublic?: Uint8Array | null, signatureKeyPrivate?: Uint8Array | null, senderKeyStateStructure?: SenderKeyStateStructure | null);
     getKeyId(): number;
     getSenderChainKey(): SenderChainKey;
     setSenderChainKey(chainKey: SenderChainKey): void;
@@ -36,4 +36,3 @@ export declare class SenderKeyState {
     getStructure(): SenderKeyStateStructure;
 }
 export {};
-//# sourceMappingURL=sender-key-state.d.ts.map