@queenanya/baileys 8.3.1 → 8.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Defaults/index.d.ts +0 -231
- package/lib/Defaults/index.js +1 -17
- package/lib/Signal/Group/ciphertext-message.d.ts +9 -0
- package/lib/Signal/Group/ciphertext-message.js +15 -0
- package/lib/Signal/Group/group-session-builder.d.ts +14 -0
- package/lib/Signal/Group/group-session-builder.js +64 -0
- package/lib/Signal/Group/group_cipher.d.ts +17 -0
- package/lib/Signal/Group/group_cipher.js +96 -0
- package/lib/Signal/Group/index.d.ts +11 -0
- package/lib/Signal/Group/index.js +57 -0
- package/lib/Signal/Group/keyhelper.d.ts +10 -0
- package/lib/Signal/Group/keyhelper.js +55 -0
- package/lib/Signal/Group/queue-job.d.ts +1 -0
- package/lib/Signal/Group/queue-job.js +57 -0
- package/lib/Signal/Group/sender-chain-key.d.ts +13 -0
- package/lib/Signal/Group/sender-chain-key.js +34 -0
- package/lib/Signal/Group/sender-key-distribution-message.d.ts +16 -0
- package/lib/Signal/Group/sender-key-distribution-message.js +66 -0
- package/lib/Signal/Group/sender-key-message.d.ts +18 -0
- package/lib/Signal/Group/sender-key-message.js +69 -0
- package/lib/Signal/Group/sender-key-name.d.ts +17 -0
- package/lib/Signal/Group/sender-key-name.js +51 -0
- package/lib/Signal/Group/sender-key-record.d.ts +30 -0
- package/lib/Signal/Group/sender-key-record.js +53 -0
- package/lib/Signal/Group/sender-key-state.d.ts +38 -0
- package/lib/Signal/Group/sender-key-state.js +99 -0
- package/lib/Signal/Group/sender-message-key.d.ts +11 -0
- package/{WASignalGroup/sender_message_key.js → lib/Signal/Group/sender-message-key.js} +6 -16
- package/lib/Signal/libsignal.js +33 -20
- package/lib/Socket/Client/index.d.ts +2 -3
- package/lib/Socket/Client/index.js +2 -3
- package/lib/Socket/Client/{abstract-socket-client.d.ts → types.d.ts} +1 -0
- package/lib/Socket/Client/{web-socket-client.d.ts → websocket.d.ts} +2 -1
- package/lib/Socket/Client/{web-socket-client.js → websocket.js} +12 -2
- package/lib/Socket/business.d.ts +5 -3
- package/lib/Socket/chats.d.ts +3 -1
- package/lib/Socket/chats.js +11 -8
- package/lib/Socket/groups.d.ts +3 -1
- package/lib/Socket/index.d.ts +5 -5
- package/lib/Socket/index.js +2 -2
- package/lib/Socket/messages-recv.d.ts +5 -3
- package/lib/Socket/messages-recv.js +16 -8
- package/lib/Socket/messages-send.d.ts +4 -2
- package/lib/Socket/messages-send.js +75 -9
- package/lib/Socket/newsletter.d.ts +3 -1
- package/lib/Socket/socket.d.ts +2 -1
- package/lib/Socket/socket.js +71 -14
- package/lib/Socket/usync.d.ts +1 -1
- package/lib/Store/make-in-memory-store.js +8 -10
- package/lib/Types/Auth.d.ts +0 -6
- package/lib/Types/Message.d.ts +16 -3
- package/lib/Types/Socket.d.ts +3 -3
- package/lib/Utils/auth-utils.js +0 -7
- package/lib/Utils/event-buffer.js +4 -6
- package/lib/Utils/index.d.ts +1 -0
- package/lib/Utils/index.js +1 -0
- package/lib/Utils/messages-media.js +11 -10
- package/lib/Utils/messages.js +10 -2
- package/lib/Utils/noise-handler.d.ts +1 -2
- package/lib/Utils/noise-handler.js +5 -10
- package/lib/Utils/use-single-file-auth-state.d.ts +5 -0
- package/lib/Utils/use-single-file-auth-state.js +66 -0
- package/lib/Utils/validate-connection.d.ts +0 -1
- package/lib/Utils/validate-connection.js +10 -44
- package/lib/WABinary/jid-utils.d.ts +1 -1
- package/lib/WABinary/jid-utils.js +1 -1
- package/package.json +2 -1
- package/WASignalGroup/GroupProtocol.js +0 -1697
- package/WASignalGroup/ciphertext_message.js +0 -16
- package/WASignalGroup/group_cipher.js +0 -120
- package/WASignalGroup/group_session_builder.js +0 -46
- package/WASignalGroup/index.js +0 -5
- package/WASignalGroup/keyhelper.js +0 -21
- package/WASignalGroup/protobufs.js +0 -3
- package/WASignalGroup/queue_job.js +0 -69
- package/WASignalGroup/sender_chain_key.js +0 -50
- package/WASignalGroup/sender_key_distribution_message.js +0 -78
- package/WASignalGroup/sender_key_message.js +0 -92
- package/WASignalGroup/sender_key_name.js +0 -70
- package/WASignalGroup/sender_key_record.js +0 -56
- package/WASignalGroup/sender_key_state.js +0 -129
- package/lib/Defaults/phonenumber-mcc.json +0 -223
- package/lib/Socket/Client/mobile-socket-client.d.ts +0 -12
- package/lib/Socket/Client/mobile-socket-client.js +0 -65
- package/lib/Socket/registration.d.ts +0 -266
- package/lib/Socket/registration.js +0 -166
- /package/lib/Socket/Client/{abstract-socket-client.js → types.js} +0 -0
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = queueJob;
|
|
4
|
+
const _queueAsyncBuckets = new Map();
|
|
5
|
+
const _gcLimit = 10000;
|
|
6
|
+
async function _asyncQueueExecutor(queue, cleanup) {
|
|
7
|
+
let offt = 0;
|
|
8
|
+
// eslint-disable-next-line no-constant-condition
|
|
9
|
+
while (true) {
|
|
10
|
+
const limit = Math.min(queue.length, _gcLimit);
|
|
11
|
+
for (let i = offt; i < limit; i++) {
|
|
12
|
+
const job = queue[i];
|
|
13
|
+
try {
|
|
14
|
+
job.resolve(await job.awaitable());
|
|
15
|
+
}
|
|
16
|
+
catch (e) {
|
|
17
|
+
job.reject(e);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
if (limit < queue.length) {
|
|
21
|
+
if (limit >= _gcLimit) {
|
|
22
|
+
queue.splice(0, limit);
|
|
23
|
+
offt = 0;
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
offt = limit;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
break;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
cleanup();
|
|
34
|
+
}
|
|
35
|
+
function queueJob(bucket, awaitable) {
|
|
36
|
+
// Skip name assignment since it's readonly in strict mode
|
|
37
|
+
if (typeof bucket !== 'string') {
|
|
38
|
+
console.warn('Unhandled bucket type (for naming):', typeof bucket, bucket);
|
|
39
|
+
}
|
|
40
|
+
let inactive = false;
|
|
41
|
+
if (!_queueAsyncBuckets.has(bucket)) {
|
|
42
|
+
_queueAsyncBuckets.set(bucket, []);
|
|
43
|
+
inactive = true;
|
|
44
|
+
}
|
|
45
|
+
const queue = _queueAsyncBuckets.get(bucket);
|
|
46
|
+
const job = new Promise((resolve, reject) => {
|
|
47
|
+
queue.push({
|
|
48
|
+
awaitable,
|
|
49
|
+
resolve: resolve,
|
|
50
|
+
reject
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
if (inactive) {
|
|
54
|
+
_asyncQueueExecutor(queue, () => _queueAsyncBuckets.delete(bucket));
|
|
55
|
+
}
|
|
56
|
+
return job;
|
|
57
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { SenderMessageKey } from './sender-message-key';
|
|
2
|
+
export declare class SenderChainKey {
|
|
3
|
+
private readonly MESSAGE_KEY_SEED;
|
|
4
|
+
private readonly CHAIN_KEY_SEED;
|
|
5
|
+
private readonly iteration;
|
|
6
|
+
private readonly chainKey;
|
|
7
|
+
constructor(iteration: number, chainKey: any);
|
|
8
|
+
getIteration(): number;
|
|
9
|
+
getSenderMessageKey(): SenderMessageKey;
|
|
10
|
+
getNext(): SenderChainKey;
|
|
11
|
+
getSeed(): Uint8Array;
|
|
12
|
+
private getDerivative;
|
|
13
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SenderChainKey = void 0;
|
|
4
|
+
const crypto_1 = require("libsignal/src/crypto");
|
|
5
|
+
const sender_message_key_1 = require("./sender-message-key");
|
|
6
|
+
class SenderChainKey {
|
|
7
|
+
constructor(iteration, chainKey) {
|
|
8
|
+
this.MESSAGE_KEY_SEED = Buffer.from([0x01]);
|
|
9
|
+
this.CHAIN_KEY_SEED = Buffer.from([0x02]);
|
|
10
|
+
this.iteration = iteration;
|
|
11
|
+
if (chainKey instanceof Buffer) {
|
|
12
|
+
this.chainKey = chainKey;
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
this.chainKey = Buffer.from(chainKey || []);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
getIteration() {
|
|
19
|
+
return this.iteration;
|
|
20
|
+
}
|
|
21
|
+
getSenderMessageKey() {
|
|
22
|
+
return new sender_message_key_1.SenderMessageKey(this.iteration, this.getDerivative(this.MESSAGE_KEY_SEED, this.chainKey));
|
|
23
|
+
}
|
|
24
|
+
getNext() {
|
|
25
|
+
return new SenderChainKey(this.iteration + 1, this.getDerivative(this.CHAIN_KEY_SEED, this.chainKey));
|
|
26
|
+
}
|
|
27
|
+
getSeed() {
|
|
28
|
+
return this.chainKey;
|
|
29
|
+
}
|
|
30
|
+
getDerivative(seed, key) {
|
|
31
|
+
return (0, crypto_1.calculateMAC)(key, seed);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
exports.SenderChainKey = SenderChainKey;
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { CiphertextMessage } from './ciphertext-message';
|
|
2
|
+
export declare class SenderKeyDistributionMessage extends CiphertextMessage {
|
|
3
|
+
private readonly id;
|
|
4
|
+
private readonly iteration;
|
|
5
|
+
private readonly chainKey;
|
|
6
|
+
private readonly signatureKey;
|
|
7
|
+
private readonly serialized;
|
|
8
|
+
constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null, signatureKey?: Uint8Array | null, serialized?: Uint8Array | null);
|
|
9
|
+
private intsToByteHighAndLow;
|
|
10
|
+
serialize(): Uint8Array;
|
|
11
|
+
getType(): number;
|
|
12
|
+
getIteration(): number;
|
|
13
|
+
getChainKey(): Uint8Array;
|
|
14
|
+
getSignatureKey(): Uint8Array;
|
|
15
|
+
getId(): number;
|
|
16
|
+
}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SenderKeyDistributionMessage = void 0;
|
|
4
|
+
const WAProto_1 = require("../../../WAProto");
|
|
5
|
+
const ciphertext_message_1 = require("./ciphertext-message");
|
|
6
|
+
class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessage {
|
|
7
|
+
constructor(id, iteration, chainKey, signatureKey, serialized) {
|
|
8
|
+
super();
|
|
9
|
+
if (serialized) {
|
|
10
|
+
try {
|
|
11
|
+
const message = serialized.slice(1);
|
|
12
|
+
const distributionMessage = WAProto_1.proto.SenderKeyDistributionMessage.decode(message).toJSON();
|
|
13
|
+
this.serialized = serialized;
|
|
14
|
+
this.id = distributionMessage.id;
|
|
15
|
+
this.iteration = distributionMessage.iteration;
|
|
16
|
+
this.chainKey =
|
|
17
|
+
typeof distributionMessage.chainKey === 'string'
|
|
18
|
+
? Buffer.from(distributionMessage.chainKey, 'base64')
|
|
19
|
+
: distributionMessage.chainKey;
|
|
20
|
+
this.signatureKey =
|
|
21
|
+
typeof distributionMessage.signingKey === 'string'
|
|
22
|
+
? Buffer.from(distributionMessage.signingKey, 'base64')
|
|
23
|
+
: distributionMessage.signingKey;
|
|
24
|
+
}
|
|
25
|
+
catch (e) {
|
|
26
|
+
throw new Error(String(e));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
const version = this.intsToByteHighAndLow(this.CURRENT_VERSION, this.CURRENT_VERSION);
|
|
31
|
+
this.id = id;
|
|
32
|
+
this.iteration = iteration;
|
|
33
|
+
this.chainKey = chainKey;
|
|
34
|
+
this.signatureKey = signatureKey;
|
|
35
|
+
const message = WAProto_1.proto.SenderKeyDistributionMessage.encode(WAProto_1.proto.SenderKeyDistributionMessage.create({
|
|
36
|
+
id,
|
|
37
|
+
iteration,
|
|
38
|
+
chainKey,
|
|
39
|
+
signingKey: this.signatureKey
|
|
40
|
+
})).finish();
|
|
41
|
+
this.serialized = Buffer.concat([Buffer.from([version]), message]);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
intsToByteHighAndLow(highValue, lowValue) {
|
|
45
|
+
return (((highValue << 4) | lowValue) & 0xff) % 256;
|
|
46
|
+
}
|
|
47
|
+
serialize() {
|
|
48
|
+
return this.serialized;
|
|
49
|
+
}
|
|
50
|
+
getType() {
|
|
51
|
+
return this.SENDERKEY_DISTRIBUTION_TYPE;
|
|
52
|
+
}
|
|
53
|
+
getIteration() {
|
|
54
|
+
return this.iteration;
|
|
55
|
+
}
|
|
56
|
+
getChainKey() {
|
|
57
|
+
return typeof this.chainKey === 'string' ? Buffer.from(this.chainKey, 'base64') : this.chainKey;
|
|
58
|
+
}
|
|
59
|
+
getSignatureKey() {
|
|
60
|
+
return typeof this.signatureKey === 'string' ? Buffer.from(this.signatureKey, 'base64') : this.signatureKey;
|
|
61
|
+
}
|
|
62
|
+
getId() {
|
|
63
|
+
return this.id;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
exports.SenderKeyDistributionMessage = SenderKeyDistributionMessage;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { CiphertextMessage } from './ciphertext-message';
|
|
2
|
+
export declare class SenderKeyMessage extends CiphertextMessage {
|
|
3
|
+
private readonly SIGNATURE_LENGTH;
|
|
4
|
+
private readonly messageVersion;
|
|
5
|
+
private readonly keyId;
|
|
6
|
+
private readonly iteration;
|
|
7
|
+
private readonly ciphertext;
|
|
8
|
+
private readonly signature;
|
|
9
|
+
private readonly serialized;
|
|
10
|
+
constructor(keyId?: number | null, iteration?: number | null, ciphertext?: Uint8Array | null, signatureKey?: Uint8Array | null, serialized?: Uint8Array | null);
|
|
11
|
+
getKeyId(): number;
|
|
12
|
+
getIteration(): number;
|
|
13
|
+
getCipherText(): Uint8Array;
|
|
14
|
+
verifySignature(signatureKey: Uint8Array): void;
|
|
15
|
+
private getSignature;
|
|
16
|
+
serialize(): Uint8Array;
|
|
17
|
+
getType(): number;
|
|
18
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SenderKeyMessage = void 0;
|
|
4
|
+
const curve_1 = require("libsignal/src/curve");
|
|
5
|
+
const WAProto_1 = require("../../../WAProto");
|
|
6
|
+
const ciphertext_message_1 = require("./ciphertext-message");
|
|
7
|
+
class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
|
|
8
|
+
constructor(keyId, iteration, ciphertext, signatureKey, serialized) {
|
|
9
|
+
super();
|
|
10
|
+
this.SIGNATURE_LENGTH = 64;
|
|
11
|
+
if (serialized) {
|
|
12
|
+
const version = serialized[0];
|
|
13
|
+
const message = serialized.slice(1, serialized.length - this.SIGNATURE_LENGTH);
|
|
14
|
+
const signature = serialized.slice(-1 * this.SIGNATURE_LENGTH);
|
|
15
|
+
const senderKeyMessage = WAProto_1.proto.SenderKeyMessage.decode(message).toJSON();
|
|
16
|
+
this.serialized = serialized;
|
|
17
|
+
this.messageVersion = (version & 0xff) >> 4;
|
|
18
|
+
this.keyId = senderKeyMessage.id;
|
|
19
|
+
this.iteration = senderKeyMessage.iteration;
|
|
20
|
+
this.ciphertext =
|
|
21
|
+
typeof senderKeyMessage.ciphertext === 'string'
|
|
22
|
+
? Buffer.from(senderKeyMessage.ciphertext, 'base64')
|
|
23
|
+
: senderKeyMessage.ciphertext;
|
|
24
|
+
this.signature = signature;
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
const version = (((this.CURRENT_VERSION << 4) | this.CURRENT_VERSION) & 0xff) % 256;
|
|
28
|
+
const ciphertextBuffer = Buffer.from(ciphertext);
|
|
29
|
+
const message = WAProto_1.proto.SenderKeyMessage.encode(WAProto_1.proto.SenderKeyMessage.create({
|
|
30
|
+
id: keyId,
|
|
31
|
+
iteration: iteration,
|
|
32
|
+
ciphertext: ciphertextBuffer
|
|
33
|
+
})).finish();
|
|
34
|
+
const signature = this.getSignature(signatureKey, Buffer.concat([Buffer.from([version]), message]));
|
|
35
|
+
this.serialized = Buffer.concat([Buffer.from([version]), message, Buffer.from(signature)]);
|
|
36
|
+
this.messageVersion = this.CURRENT_VERSION;
|
|
37
|
+
this.keyId = keyId;
|
|
38
|
+
this.iteration = iteration;
|
|
39
|
+
this.ciphertext = ciphertextBuffer;
|
|
40
|
+
this.signature = signature;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
getKeyId() {
|
|
44
|
+
return this.keyId;
|
|
45
|
+
}
|
|
46
|
+
getIteration() {
|
|
47
|
+
return this.iteration;
|
|
48
|
+
}
|
|
49
|
+
getCipherText() {
|
|
50
|
+
return this.ciphertext;
|
|
51
|
+
}
|
|
52
|
+
verifySignature(signatureKey) {
|
|
53
|
+
const part1 = this.serialized.slice(0, this.serialized.length - this.SIGNATURE_LENGTH);
|
|
54
|
+
const part2 = this.serialized.slice(-1 * this.SIGNATURE_LENGTH);
|
|
55
|
+
const res = (0, curve_1.verifySignature)(signatureKey, part1, part2);
|
|
56
|
+
if (!res)
|
|
57
|
+
throw new Error('Invalid signature!');
|
|
58
|
+
}
|
|
59
|
+
getSignature(signatureKey, serialized) {
|
|
60
|
+
return Buffer.from((0, curve_1.calculateSignature)(signatureKey, serialized));
|
|
61
|
+
}
|
|
62
|
+
serialize() {
|
|
63
|
+
return this.serialized;
|
|
64
|
+
}
|
|
65
|
+
getType() {
|
|
66
|
+
return 4;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
exports.SenderKeyMessage = SenderKeyMessage;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
interface Sender {
|
|
2
|
+
id: string;
|
|
3
|
+
deviceId: number;
|
|
4
|
+
toString(): string;
|
|
5
|
+
}
|
|
6
|
+
export declare class SenderKeyName {
|
|
7
|
+
private readonly groupId;
|
|
8
|
+
private readonly sender;
|
|
9
|
+
constructor(groupId: string, sender: Sender);
|
|
10
|
+
getGroupId(): string;
|
|
11
|
+
getSender(): Sender;
|
|
12
|
+
serialize(): string;
|
|
13
|
+
toString(): string;
|
|
14
|
+
equals(other: SenderKeyName | null): boolean;
|
|
15
|
+
hashCode(): number;
|
|
16
|
+
}
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SenderKeyName = void 0;
|
|
4
|
+
function isNull(str) {
|
|
5
|
+
return str === null || str === '';
|
|
6
|
+
}
|
|
7
|
+
function intValue(num) {
|
|
8
|
+
const MAX_VALUE = 0x7fffffff;
|
|
9
|
+
const MIN_VALUE = -0x80000000;
|
|
10
|
+
if (num > MAX_VALUE || num < MIN_VALUE) {
|
|
11
|
+
return num & 0xffffffff;
|
|
12
|
+
}
|
|
13
|
+
return num;
|
|
14
|
+
}
|
|
15
|
+
function hashCode(strKey) {
|
|
16
|
+
let hash = 0;
|
|
17
|
+
if (!isNull(strKey)) {
|
|
18
|
+
for (let i = 0; i < strKey.length; i++) {
|
|
19
|
+
hash = hash * 31 + strKey.charCodeAt(i);
|
|
20
|
+
hash = intValue(hash);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return hash;
|
|
24
|
+
}
|
|
25
|
+
class SenderKeyName {
|
|
26
|
+
constructor(groupId, sender) {
|
|
27
|
+
this.groupId = groupId;
|
|
28
|
+
this.sender = sender;
|
|
29
|
+
}
|
|
30
|
+
getGroupId() {
|
|
31
|
+
return this.groupId;
|
|
32
|
+
}
|
|
33
|
+
getSender() {
|
|
34
|
+
return this.sender;
|
|
35
|
+
}
|
|
36
|
+
serialize() {
|
|
37
|
+
return `${this.groupId}::${this.sender.id}::${this.sender.deviceId}`;
|
|
38
|
+
}
|
|
39
|
+
toString() {
|
|
40
|
+
return this.serialize();
|
|
41
|
+
}
|
|
42
|
+
equals(other) {
|
|
43
|
+
if (other === null)
|
|
44
|
+
return false;
|
|
45
|
+
return this.groupId === other.groupId && this.sender.toString() === other.sender.toString();
|
|
46
|
+
}
|
|
47
|
+
hashCode() {
|
|
48
|
+
return hashCode(this.groupId) ^ hashCode(this.sender.toString());
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
exports.SenderKeyName = SenderKeyName;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { SenderKeyState } from './sender-key-state';
|
|
2
|
+
export interface SenderKeyStateStructure {
|
|
3
|
+
senderKeyId: number;
|
|
4
|
+
senderChainKey: {
|
|
5
|
+
iteration: number;
|
|
6
|
+
seed: Uint8Array;
|
|
7
|
+
};
|
|
8
|
+
senderSigningKey: {
|
|
9
|
+
public: Uint8Array;
|
|
10
|
+
private?: Uint8Array;
|
|
11
|
+
};
|
|
12
|
+
senderMessageKeys: Array<{
|
|
13
|
+
iteration: number;
|
|
14
|
+
seed: Uint8Array;
|
|
15
|
+
}>;
|
|
16
|
+
}
|
|
17
|
+
export declare class SenderKeyRecord {
|
|
18
|
+
private readonly MAX_STATES;
|
|
19
|
+
private readonly senderKeyStates;
|
|
20
|
+
constructor(serialized?: SenderKeyStateStructure[]);
|
|
21
|
+
isEmpty(): boolean;
|
|
22
|
+
getSenderKeyState(keyId?: number): SenderKeyState | undefined;
|
|
23
|
+
addSenderKeyState(id: number, iteration: number, chainKey: Uint8Array, signatureKey: Uint8Array): void;
|
|
24
|
+
setSenderKeyState(id: number, iteration: number, chainKey: Uint8Array, keyPair: {
|
|
25
|
+
public: Uint8Array;
|
|
26
|
+
private: Uint8Array;
|
|
27
|
+
}): void;
|
|
28
|
+
serialize(): SenderKeyStateStructure[];
|
|
29
|
+
static deserialize(data: Uint8Array | string | SenderKeyStateStructure[]): SenderKeyRecord;
|
|
30
|
+
}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SenderKeyRecord = void 0;
|
|
4
|
+
const generics_1 = require("../../Utils/generics");
|
|
5
|
+
const sender_key_state_1 = require("./sender-key-state");
|
|
6
|
+
class SenderKeyRecord {
|
|
7
|
+
constructor(serialized) {
|
|
8
|
+
this.MAX_STATES = 5;
|
|
9
|
+
this.senderKeyStates = [];
|
|
10
|
+
if (serialized) {
|
|
11
|
+
for (const structure of serialized) {
|
|
12
|
+
this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(null, null, null, null, null, null, structure));
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
isEmpty() {
|
|
17
|
+
return this.senderKeyStates.length === 0;
|
|
18
|
+
}
|
|
19
|
+
getSenderKeyState(keyId) {
|
|
20
|
+
if (keyId === undefined && this.senderKeyStates.length) {
|
|
21
|
+
return this.senderKeyStates[this.senderKeyStates.length - 1];
|
|
22
|
+
}
|
|
23
|
+
return this.senderKeyStates.find(state => state.getKeyId() === keyId);
|
|
24
|
+
}
|
|
25
|
+
addSenderKeyState(id, iteration, chainKey, signatureKey) {
|
|
26
|
+
this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(id, iteration, chainKey, null, signatureKey));
|
|
27
|
+
if (this.senderKeyStates.length > this.MAX_STATES) {
|
|
28
|
+
this.senderKeyStates.shift();
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
setSenderKeyState(id, iteration, chainKey, keyPair) {
|
|
32
|
+
this.senderKeyStates.length = 0;
|
|
33
|
+
this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(id, iteration, chainKey, keyPair));
|
|
34
|
+
}
|
|
35
|
+
serialize() {
|
|
36
|
+
return this.senderKeyStates.map(state => state.getStructure());
|
|
37
|
+
}
|
|
38
|
+
static deserialize(data) {
|
|
39
|
+
let parsed;
|
|
40
|
+
if (typeof data === 'string') {
|
|
41
|
+
parsed = JSON.parse(data, generics_1.BufferJSON.reviver);
|
|
42
|
+
}
|
|
43
|
+
else if (data instanceof Uint8Array) {
|
|
44
|
+
const str = Buffer.from(data).toString('utf-8');
|
|
45
|
+
parsed = JSON.parse(str, generics_1.BufferJSON.reviver);
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
parsed = data;
|
|
49
|
+
}
|
|
50
|
+
return new SenderKeyRecord(parsed);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.SenderKeyRecord = SenderKeyRecord;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { SenderChainKey } from './sender-chain-key';
|
|
2
|
+
import { SenderMessageKey } from './sender-message-key';
|
|
3
|
+
interface SenderChainKeyStructure {
|
|
4
|
+
iteration: number;
|
|
5
|
+
seed: Uint8Array;
|
|
6
|
+
}
|
|
7
|
+
interface SenderSigningKeyStructure {
|
|
8
|
+
public: Uint8Array;
|
|
9
|
+
private?: Uint8Array;
|
|
10
|
+
}
|
|
11
|
+
interface SenderMessageKeyStructure {
|
|
12
|
+
iteration: number;
|
|
13
|
+
seed: Uint8Array;
|
|
14
|
+
}
|
|
15
|
+
interface SenderKeyStateStructure {
|
|
16
|
+
senderKeyId: number;
|
|
17
|
+
senderChainKey: SenderChainKeyStructure;
|
|
18
|
+
senderSigningKey: SenderSigningKeyStructure;
|
|
19
|
+
senderMessageKeys: SenderMessageKeyStructure[];
|
|
20
|
+
}
|
|
21
|
+
export declare class SenderKeyState {
|
|
22
|
+
private readonly MAX_MESSAGE_KEYS;
|
|
23
|
+
private readonly senderKeyStateStructure;
|
|
24
|
+
constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null, signatureKeyPair?: {
|
|
25
|
+
public: Uint8Array;
|
|
26
|
+
private: Uint8Array;
|
|
27
|
+
} | null, signatureKeyPublic?: Uint8Array | null, signatureKeyPrivate?: Uint8Array | null, senderKeyStateStructure?: SenderKeyStateStructure | null);
|
|
28
|
+
getKeyId(): number;
|
|
29
|
+
getSenderChainKey(): SenderChainKey;
|
|
30
|
+
setSenderChainKey(chainKey: SenderChainKey): void;
|
|
31
|
+
getSigningKeyPublic(): Buffer;
|
|
32
|
+
getSigningKeyPrivate(): Buffer | undefined;
|
|
33
|
+
hasSenderMessageKey(iteration: number): boolean;
|
|
34
|
+
addSenderMessageKey(senderMessageKey: SenderMessageKey): void;
|
|
35
|
+
removeSenderMessageKey(iteration: number): SenderMessageKey | null;
|
|
36
|
+
getStructure(): SenderKeyStateStructure;
|
|
37
|
+
}
|
|
38
|
+
export {};
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SenderKeyState = void 0;
|
|
4
|
+
const sender_chain_key_1 = require("./sender-chain-key");
|
|
5
|
+
const sender_message_key_1 = require("./sender-message-key");
|
|
6
|
+
class SenderKeyState {
|
|
7
|
+
constructor(id, iteration, chainKey, signatureKeyPair, signatureKeyPublic, signatureKeyPrivate, senderKeyStateStructure) {
|
|
8
|
+
this.MAX_MESSAGE_KEYS = 2000;
|
|
9
|
+
if (senderKeyStateStructure) {
|
|
10
|
+
this.senderKeyStateStructure = senderKeyStateStructure;
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
if (signatureKeyPair) {
|
|
14
|
+
signatureKeyPublic = signatureKeyPair.public;
|
|
15
|
+
signatureKeyPrivate = signatureKeyPair.private;
|
|
16
|
+
}
|
|
17
|
+
chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
|
|
18
|
+
const senderChainKeyStructure = {
|
|
19
|
+
iteration: iteration || 0,
|
|
20
|
+
seed: chainKey || Buffer.alloc(0)
|
|
21
|
+
};
|
|
22
|
+
const signingKeyStructure = {
|
|
23
|
+
public: typeof signatureKeyPublic === 'string'
|
|
24
|
+
? Buffer.from(signatureKeyPublic, 'base64')
|
|
25
|
+
: signatureKeyPublic || Buffer.alloc(0)
|
|
26
|
+
};
|
|
27
|
+
if (signatureKeyPrivate) {
|
|
28
|
+
signingKeyStructure.private =
|
|
29
|
+
typeof signatureKeyPrivate === 'string' ? Buffer.from(signatureKeyPrivate, 'base64') : signatureKeyPrivate;
|
|
30
|
+
}
|
|
31
|
+
this.senderKeyStateStructure = {
|
|
32
|
+
senderKeyId: id || 0,
|
|
33
|
+
senderChainKey: senderChainKeyStructure,
|
|
34
|
+
senderSigningKey: signingKeyStructure,
|
|
35
|
+
senderMessageKeys: []
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
getKeyId() {
|
|
40
|
+
return this.senderKeyStateStructure.senderKeyId;
|
|
41
|
+
}
|
|
42
|
+
getSenderChainKey() {
|
|
43
|
+
return new sender_chain_key_1.SenderChainKey(this.senderKeyStateStructure.senderChainKey.iteration, this.senderKeyStateStructure.senderChainKey.seed);
|
|
44
|
+
}
|
|
45
|
+
setSenderChainKey(chainKey) {
|
|
46
|
+
this.senderKeyStateStructure.senderChainKey = {
|
|
47
|
+
iteration: chainKey.getIteration(),
|
|
48
|
+
seed: chainKey.getSeed()
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
getSigningKeyPublic() {
|
|
52
|
+
const publicKey = this.senderKeyStateStructure.senderSigningKey.public;
|
|
53
|
+
if (publicKey instanceof Buffer) {
|
|
54
|
+
return publicKey;
|
|
55
|
+
}
|
|
56
|
+
else if (typeof publicKey === 'string') {
|
|
57
|
+
return Buffer.from(publicKey, 'base64');
|
|
58
|
+
}
|
|
59
|
+
return Buffer.from(publicKey || []);
|
|
60
|
+
}
|
|
61
|
+
getSigningKeyPrivate() {
|
|
62
|
+
const privateKey = this.senderKeyStateStructure.senderSigningKey.private;
|
|
63
|
+
if (!privateKey) {
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
if (privateKey instanceof Buffer) {
|
|
67
|
+
return privateKey;
|
|
68
|
+
}
|
|
69
|
+
else if (typeof privateKey === 'string') {
|
|
70
|
+
return Buffer.from(privateKey, 'base64');
|
|
71
|
+
}
|
|
72
|
+
return Buffer.from(privateKey || []);
|
|
73
|
+
}
|
|
74
|
+
hasSenderMessageKey(iteration) {
|
|
75
|
+
return this.senderKeyStateStructure.senderMessageKeys.some(key => key.iteration === iteration);
|
|
76
|
+
}
|
|
77
|
+
addSenderMessageKey(senderMessageKey) {
|
|
78
|
+
this.senderKeyStateStructure.senderMessageKeys.push({
|
|
79
|
+
iteration: senderMessageKey.getIteration(),
|
|
80
|
+
seed: senderMessageKey.getSeed()
|
|
81
|
+
});
|
|
82
|
+
if (this.senderKeyStateStructure.senderMessageKeys.length > this.MAX_MESSAGE_KEYS) {
|
|
83
|
+
this.senderKeyStateStructure.senderMessageKeys.shift();
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
removeSenderMessageKey(iteration) {
|
|
87
|
+
const index = this.senderKeyStateStructure.senderMessageKeys.findIndex(key => key.iteration === iteration);
|
|
88
|
+
if (index !== -1) {
|
|
89
|
+
const messageKey = this.senderKeyStateStructure.senderMessageKeys[index];
|
|
90
|
+
this.senderKeyStateStructure.senderMessageKeys.splice(index, 1);
|
|
91
|
+
return new sender_message_key_1.SenderMessageKey(messageKey.iteration, messageKey.seed);
|
|
92
|
+
}
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
getStructure() {
|
|
96
|
+
return this.senderKeyStateStructure;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
exports.SenderKeyState = SenderKeyState;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export declare class SenderMessageKey {
|
|
2
|
+
private readonly iteration;
|
|
3
|
+
private readonly iv;
|
|
4
|
+
private readonly cipherKey;
|
|
5
|
+
private readonly seed;
|
|
6
|
+
constructor(iteration: number, seed: Uint8Array);
|
|
7
|
+
getIteration(): number;
|
|
8
|
+
getIv(): Uint8Array;
|
|
9
|
+
getCipherKey(): Uint8Array;
|
|
10
|
+
getSeed(): Uint8Array;
|
|
11
|
+
}
|
|
@@ -1,39 +1,29 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SenderMessageKey = void 0;
|
|
4
|
+
const crypto_1 = require("libsignal/src/crypto");
|
|
2
5
|
class SenderMessageKey {
|
|
3
|
-
iteration = 0;
|
|
4
|
-
|
|
5
|
-
iv = Buffer.alloc(0);
|
|
6
|
-
|
|
7
|
-
cipherKey = Buffer.alloc(0);
|
|
8
|
-
|
|
9
|
-
seed = Buffer.alloc(0);
|
|
10
|
-
|
|
11
6
|
constructor(iteration, seed) {
|
|
12
|
-
const derivative = deriveSecrets(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
|
|
7
|
+
const derivative = (0, crypto_1.deriveSecrets)(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
|
|
13
8
|
const keys = new Uint8Array(32);
|
|
14
9
|
keys.set(new Uint8Array(derivative[0].slice(16)));
|
|
15
10
|
keys.set(new Uint8Array(derivative[1].slice(0, 16)), 16);
|
|
16
11
|
this.iv = Buffer.from(derivative[0].slice(0, 16));
|
|
17
12
|
this.cipherKey = Buffer.from(keys.buffer);
|
|
18
|
-
|
|
19
13
|
this.iteration = iteration;
|
|
20
14
|
this.seed = seed;
|
|
21
15
|
}
|
|
22
|
-
|
|
23
16
|
getIteration() {
|
|
24
17
|
return this.iteration;
|
|
25
18
|
}
|
|
26
|
-
|
|
27
19
|
getIv() {
|
|
28
20
|
return this.iv;
|
|
29
21
|
}
|
|
30
|
-
|
|
31
22
|
getCipherKey() {
|
|
32
23
|
return this.cipherKey;
|
|
33
24
|
}
|
|
34
|
-
|
|
35
25
|
getSeed() {
|
|
36
26
|
return this.seed;
|
|
37
27
|
}
|
|
38
28
|
}
|
|
39
|
-
|
|
29
|
+
exports.SenderMessageKey = SenderMessageKey;
|