violetics 7.0.0-alpha → 7.0.2-alpha

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

@@ -1,25 +1,17 @@
-"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 {
+import { calculateMAC } from 'libsignal/src/crypto.js';
+import { SenderMessageKey } from './sender-message-key.js';
+export class SenderChainKey {
     constructor(iteration, chainKey) {
         this.MESSAGE_KEY_SEED = Buffer.from([0x01]);
         this.CHAIN_KEY_SEED = Buffer.from([0x02]);
         this.iteration = iteration;
-        if (chainKey instanceof Buffer) {
-            this.chainKey = chainKey;
-        }
-        else {
-            this.chainKey = Buffer.from(chainKey || []);
-        }
+        this.chainKey = Buffer.from(chainKey);
     }
     getIteration() {
         return this.iteration;
     }
     getSenderMessageKey() {
-        return new sender_message_key_1.SenderMessageKey(this.iteration, this.getDerivative(this.MESSAGE_KEY_SEED, this.chainKey));
+        return new 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));
@@ -28,7 +20,6 @@ class SenderChainKey {
         return this.chainKey;
     }
     getDerivative(seed, key) {
-        return (0, crypto_1.calculateMAC)(key, seed);
+        return calculateMAC(key, seed);
     }
-}
-exports.SenderChainKey = SenderChainKey;
+}

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

@@ -1,15 +1,12 @@
-"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 {
+import { proto } from '../../../WAProto/index.js';
+import { CiphertextMessage } from './ciphertext-message.js';
+export class SenderKeyDistributionMessage extends CiphertextMessage {
     constructor(id, iteration, chainKey, signatureKey, serialized) {
         super();
         if (serialized) {
             try {
                 const message = serialized.slice(1);
-                const distributionMessage = WAProto_1.proto.SenderKeyDistributionMessage.decode(message).toJSON();
+                const distributionMessage = proto.SenderKeyDistributionMessage.decode(message).toJSON();
                 this.serialized = serialized;
                 this.id = distributionMessage.id;
                 this.iteration = distributionMessage.iteration;
@@ -32,7 +29,7 @@ class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessag
             this.iteration = iteration;
             this.chainKey = chainKey;
             this.signatureKey = signatureKey;
-            const message = WAProto_1.proto.SenderKeyDistributionMessage.encode(WAProto_1.proto.SenderKeyDistributionMessage.create({
+            const message = proto.SenderKeyDistributionMessage.encode(proto.SenderKeyDistributionMessage.create({
                 id,
                 iteration,
                 chainKey,
@@ -54,13 +51,12 @@ class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessag
         return this.iteration;
     }
     getChainKey() {
-        return typeof this.chainKey === 'string' ? Buffer.from(this.chainKey, 'base64') : this.chainKey;
+        return this.chainKey;
     }
     getSignatureKey() {
-        return typeof this.signatureKey === 'string' ? Buffer.from(this.signatureKey, 'base64') : this.signatureKey;
+        return this.signatureKey;
     }
     getId() {
         return this.id;
     }
-}
-exports.SenderKeyDistributionMessage = SenderKeyDistributionMessage;
+}

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

@@ -1,10 +1,7 @@
-"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 {
+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 {
     constructor(keyId, iteration, ciphertext, signatureKey, serialized) {
         super();
         this.SIGNATURE_LENGTH = 64;
@@ -12,7 +9,7 @@ class SenderKeyMessage extends ciphertext_message_1.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 = WAProto_1.proto.SenderKeyMessage.decode(message).toJSON();
+            const senderKeyMessage = proto.SenderKeyMessage.decode(message).toJSON();
             this.serialized = serialized;
             this.messageVersion = (version & 0xff) >> 4;
             this.keyId = senderKeyMessage.id;
@@ -26,7 +23,7 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
         else {
             const version = (((this.CURRENT_VERSION << 4) | this.CURRENT_VERSION) & 0xff) % 256;
             const ciphertextBuffer = Buffer.from(ciphertext);
-            const message = WAProto_1.proto.SenderKeyMessage.encode(WAProto_1.proto.SenderKeyMessage.create({
+            const message = proto.SenderKeyMessage.encode(proto.SenderKeyMessage.create({
                 id: keyId,
                 iteration: iteration,
                 ciphertext: ciphertextBuffer
@@ -52,12 +49,12 @@ class SenderKeyMessage extends ciphertext_message_1.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 = (0, curve_1.verifySignature)(signatureKey, part1, part2);
+        const res = verifySignature(signatureKey, part1, part2);
         if (!res)
             throw new Error('Invalid signature!');
     }
     getSignature(signatureKey, serialized) {
-        return Buffer.from((0, curve_1.calculateSignature)(signatureKey, serialized));
+        return Buffer.from(calculateSignature(signatureKey, serialized));
     }
     serialize() {
         return this.serialized;
@@ -65,5 +62,4 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
     getType() {
         return 4;
     }
-}
-exports.SenderKeyMessage = SenderKeyMessage;
+}

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

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

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

@@ -1,15 +1,12 @@
-"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 {
+import { BufferJSON } from '../../Utils/generics.js';
+import { SenderKeyState } from './sender-key-state.js';
+export class SenderKeyRecord {
     constructor(serialized) {
         this.MAX_STATES = 5;
         this.senderKeyStates = [];
         if (serialized) {
             for (const structure of serialized) {
-                this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(null, null, null, null, null, null, structure));
+                this.senderKeyStates.push(new SenderKeyState(null, null, null, null, null, null, structure));
             }
         }
     }
@@ -23,31 +20,21 @@ class SenderKeyRecord {
         return this.senderKeyStates.find(state => state.getKeyId() === keyId);
     }
     addSenderKeyState(id, iteration, chainKey, signatureKey) {
-        this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(id, iteration, chainKey, null, signatureKey));
+        this.senderKeyStates.push(new 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 sender_key_state_1.SenderKeyState(id, iteration, chainKey, keyPair));
+        this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, keyPair));
     }
     serialize() {
         return this.senderKeyStates.map(state => state.getStructure());
     }
     static deserialize(data) {
-        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;
-        }
+        const str = Buffer.from(data).toString('utf-8');
+        const parsed = JSON.parse(str, BufferJSON.reviver);
         return new SenderKeyRecord(parsed);
     }
-}
-exports.SenderKeyRecord = SenderKeyRecord;
+}

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

@@ -1,37 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SenderKeyState = void 0;
-const sender_chain_key_1 = require("./sender-chain-key");
-const sender_message_key_1 = require("./sender-message-key");
-class SenderKeyState {
+import { SenderChainKey } from './sender-chain-key.js';
+import { SenderMessageKey } from './sender-message-key.js';
+export class SenderKeyState {
     constructor(id, iteration, chainKey, signatureKeyPair, signatureKeyPublic, signatureKeyPrivate, senderKeyStateStructure) {
         this.MAX_MESSAGE_KEYS = 2000;
         if (senderKeyStateStructure) {
-            this.senderKeyStateStructure = senderKeyStateStructure;
+            this.senderKeyStateStructure = {
+                ...senderKeyStateStructure,
+                senderMessageKeys: Array.isArray(senderKeyStateStructure.senderMessageKeys)
+                    ? senderKeyStateStructure.senderMessageKeys
+                    : []
+            };
         }
         else {
             if (signatureKeyPair) {
                 signatureKeyPublic = signatureKeyPair.public;
                 signatureKeyPrivate = signatureKeyPair.private;
             }
-            chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
-            const senderChainKeyStructure = {
-                iteration: iteration || 0,
-                seed: chainKey || Buffer.alloc(0)
-            };
-            const signingKeyStructure = {
-                public: typeof signatureKeyPublic === 'string'
-                    ? Buffer.from(signatureKeyPublic, 'base64')
-                    : signatureKeyPublic || Buffer.alloc(0)
-            };
-            if (signatureKeyPrivate) {
-                signingKeyStructure.private =
-                    typeof signatureKeyPrivate === 'string' ? Buffer.from(signatureKeyPrivate, 'base64') : signatureKeyPrivate;
-            }
             this.senderKeyStateStructure = {
                 senderKeyId: id || 0,
-                senderChainKey: senderChainKeyStructure,
-                senderSigningKey: signingKeyStructure,
+                senderChainKey: {
+                    iteration: iteration || 0,
+                    seed: Buffer.from(chainKey || [])
+                },
+                senderSigningKey: {
+                    public: Buffer.from(signatureKeyPublic || []),
+                    private: Buffer.from(signatureKeyPrivate || [])
+                },
                 senderMessageKeys: []
             };
         }
@@ -40,7 +34,7 @@ class SenderKeyState {
         return this.senderKeyStateStructure.senderKeyId;
     }
     getSenderChainKey() {
-        return new sender_chain_key_1.SenderChainKey(this.senderKeyStateStructure.senderChainKey.iteration, this.senderKeyStateStructure.senderChainKey.seed);
+        return new SenderChainKey(this.senderKeyStateStructure.senderChainKey.iteration, this.senderKeyStateStructure.senderChainKey.seed);
     }
     setSenderChainKey(chainKey) {
         this.senderKeyStateStructure.senderChainKey = {
@@ -49,26 +43,17 @@ class SenderKeyState {
         };
     }
     getSigningKeyPublic() {
-        const publicKey = this.senderKeyStateStructure.senderSigningKey.public;
-        if (publicKey instanceof Buffer) {
-            return publicKey;
+        const publicKey = Buffer.from(this.senderKeyStateStructure.senderSigningKey.public);
+        if (publicKey.length === 32) {
+            const fixed = Buffer.alloc(33);
+            fixed[0] = 0x05;
+            publicKey.copy(fixed, 1);
+            return fixed;
         }
-        else if (typeof publicKey === 'string') {
-            return Buffer.from(publicKey, 'base64');
-        }
-        return Buffer.from(publicKey || []);
+        return publicKey;
     }
     getSigningKeyPrivate() {
         const privateKey = this.senderKeyStateStructure.senderSigningKey.private;
-        if (!privateKey) {
-            return undefined;
-        }
-        if (privateKey instanceof Buffer) {
-            return privateKey;
-        }
-        else if (typeof privateKey === 'string') {
-            return Buffer.from(privateKey, 'base64');
-        }
         return Buffer.from(privateKey || []);
     }
     hasSenderMessageKey(iteration) {
@@ -88,12 +73,11 @@ class SenderKeyState {
         if (index !== -1) {
             const messageKey = this.senderKeyStateStructure.senderMessageKeys[index];
             this.senderKeyStateStructure.senderMessageKeys.splice(index, 1);
-            return new sender_message_key_1.SenderMessageKey(messageKey.iteration, messageKey.seed);
+            return new SenderMessageKey(messageKey.iteration, messageKey.seed);
         }
         return null;
     }
     getStructure() {
         return this.senderKeyStateStructure;
     }
-}
-exports.SenderKeyState = SenderKeyState;
+}

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

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SenderMessageKey = void 0;
-const crypto_1 = require("libsignal/src/crypto");
-class SenderMessageKey {
+import { deriveSecrets } from 'libsignal/src/crypto.js';
+export class SenderMessageKey {
     constructor(iteration, seed) {
-        const derivative = (0, crypto_1.deriveSecrets)(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
+        const derivative = deriveSecrets(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
         const keys = new Uint8Array(32);
         keys.set(new Uint8Array(derivative[0].slice(16)));
         keys.set(new Uint8Array(derivative[1].slice(0, 16)), 16);
@@ -25,5 +22,4 @@ class SenderMessageKey {
     getSeed() {
         return this.seed;
     }
-}
-exports.SenderMessageKey = SenderMessageKey;
+}