@periskope/baileys 7.0.0-alpha-5 → 7.0.0-beta-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/README.md +0 -6
- package/lib/Defaults/index.d.ts +1 -7
- package/lib/Defaults/index.d.ts.map +1 -1
- package/lib/Defaults/index.js +4 -11
- package/lib/Defaults/index.js.map +1 -1
- package/lib/Signal/Group/group_cipher.d.ts +1 -0
- package/lib/Signal/Group/group_cipher.d.ts.map +1 -1
- package/lib/Signal/Group/group_cipher.js +37 -28
- package/lib/Signal/Group/group_cipher.js.map +1 -1
- package/lib/Signal/Group/keyhelper.d.ts.map +1 -1
- package/lib/Signal/Group/keyhelper.js +1 -0
- package/lib/Signal/Group/keyhelper.js.map +1 -1
- package/lib/Signal/Group/sender-chain-key.d.ts +1 -1
- package/lib/Signal/Group/sender-chain-key.d.ts.map +1 -1
- package/lib/Signal/Group/sender-chain-key.js +3 -9
- package/lib/Signal/Group/sender-chain-key.js.map +1 -1
- package/lib/Signal/Group/sender-key-message.d.ts.map +1 -1
- package/lib/Signal/Group/sender-key-message.js +1 -0
- package/lib/Signal/Group/sender-key-message.js.map +1 -1
- package/lib/Signal/Group/sender-key-state.d.ts +4 -4
- package/lib/Signal/Group/sender-key-state.d.ts.map +1 -1
- package/lib/Signal/Group/sender-key-state.js +19 -47
- package/lib/Signal/Group/sender-key-state.js.map +1 -1
- package/lib/Signal/Group/sender-message-key.d.ts.map +1 -1
- package/lib/Signal/Group/sender-message-key.js +1 -0
- package/lib/Signal/Group/sender-message-key.js.map +1 -1
- package/lib/Signal/libsignal.d.ts +2 -6
- package/lib/Signal/libsignal.d.ts.map +1 -1
- package/lib/Signal/libsignal.js +41 -224
- package/lib/Signal/libsignal.js.map +1 -1
- package/lib/Signal/lid-mapping.d.ts +2 -11
- package/lib/Signal/lid-mapping.d.ts.map +1 -1
- package/lib/Signal/lid-mapping.js +34 -91
- package/lib/Signal/lid-mapping.js.map +1 -1
- package/lib/Socket/business.d.ts +14 -26
- package/lib/Socket/business.d.ts.map +1 -1
- package/lib/Socket/business.js +1 -122
- package/lib/Socket/business.js.map +1 -1
- package/lib/Socket/chats.d.ts +9 -15
- package/lib/Socket/chats.d.ts.map +1 -1
- package/lib/Socket/chats.js +20 -53
- package/lib/Socket/chats.js.map +1 -1
- package/lib/Socket/communities.d.ts +11 -25
- package/lib/Socket/communities.d.ts.map +1 -1
- package/lib/Socket/communities.js +0 -44
- package/lib/Socket/communities.js.map +1 -1
- package/lib/Socket/groups.d.ts +9 -14
- package/lib/Socket/groups.d.ts.map +1 -1
- package/lib/Socket/groups.js +10 -12
- package/lib/Socket/groups.js.map +1 -1
- package/lib/Socket/index.d.ts +11 -25
- package/lib/Socket/index.d.ts.map +1 -1
- package/lib/Socket/messages-recv.d.ts +11 -19
- package/lib/Socket/messages-recv.d.ts.map +1 -1
- package/lib/Socket/messages-recv.js +230 -396
- package/lib/Socket/messages-recv.js.map +1 -1
- package/lib/Socket/messages-send.d.ts +11 -20
- package/lib/Socket/messages-send.d.ts.map +1 -1
- package/lib/Socket/messages-send.js +71 -443
- package/lib/Socket/messages-send.js.map +1 -1
- package/lib/Socket/newsletter.d.ts +12 -16
- package/lib/Socket/newsletter.d.ts.map +1 -1
- package/lib/Socket/newsletter.js +1 -3
- package/lib/Socket/newsletter.js.map +1 -1
- package/lib/Socket/socket.d.ts +3 -10
- package/lib/Socket/socket.d.ts.map +1 -1
- package/lib/Socket/socket.js +69 -264
- package/lib/Socket/socket.js.map +1 -1
- package/lib/Types/Auth.d.ts +1 -2
- package/lib/Types/Auth.d.ts.map +1 -1
- package/lib/Types/Chat.d.ts +0 -5
- package/lib/Types/Chat.d.ts.map +1 -1
- package/lib/Types/Chat.js.map +1 -1
- package/lib/Types/Contact.d.ts +4 -4
- package/lib/Types/Contact.d.ts.map +1 -1
- package/lib/Types/Events.d.ts +2 -2
- package/lib/Types/Events.d.ts.map +1 -1
- package/lib/Types/GroupMetadata.d.ts +4 -6
- package/lib/Types/GroupMetadata.d.ts.map +1 -1
- package/lib/Types/Message.d.ts +7 -28
- package/lib/Types/Message.d.ts.map +1 -1
- package/lib/Types/Message.js +1 -5
- package/lib/Types/Message.js.map +1 -1
- package/lib/Types/Signal.d.ts +0 -28
- package/lib/Types/Signal.d.ts.map +1 -1
- package/lib/Types/Socket.d.ts +7 -23
- package/lib/Types/Socket.d.ts.map +1 -1
- package/lib/Utils/auth-utils.d.ts.map +1 -1
- package/lib/Utils/auth-utils.js +79 -363
- package/lib/Utils/auth-utils.js.map +1 -1
- package/lib/Utils/chat-utils.d.ts +2 -2
- package/lib/Utils/chat-utils.d.ts.map +1 -1
- package/lib/Utils/chat-utils.js +2 -19
- package/lib/Utils/chat-utils.js.map +1 -1
- package/lib/Utils/crypto.d.ts +3 -3
- package/lib/Utils/crypto.d.ts.map +1 -1
- package/lib/Utils/crypto.js +12 -16
- package/lib/Utils/crypto.js.map +1 -1
- package/lib/Utils/decode-wa-message.d.ts +2 -13
- package/lib/Utils/decode-wa-message.d.ts.map +1 -1
- package/lib/Utils/decode-wa-message.js +13 -84
- package/lib/Utils/decode-wa-message.js.map +1 -1
- package/lib/Utils/event-buffer.d.ts +1 -0
- package/lib/Utils/event-buffer.d.ts.map +1 -1
- package/lib/Utils/event-buffer.js +4 -48
- package/lib/Utils/event-buffer.js.map +1 -1
- package/lib/Utils/generics.d.ts +0 -1
- package/lib/Utils/generics.d.ts.map +1 -1
- package/lib/Utils/generics.js +8 -24
- package/lib/Utils/generics.js.map +1 -1
- package/lib/Utils/history.d.ts.map +1 -1
- package/lib/Utils/history.js +2 -1
- package/lib/Utils/history.js.map +1 -1
- package/lib/Utils/index.d.ts +0 -1
- package/lib/Utils/index.d.ts.map +1 -1
- package/lib/Utils/index.js +0 -1
- package/lib/Utils/index.js.map +1 -1
- package/lib/Utils/messages-media.d.ts +2 -3
- package/lib/Utils/messages-media.d.ts.map +1 -1
- package/lib/Utils/messages-media.js +1 -4
- package/lib/Utils/messages-media.js.map +1 -1
- package/lib/Utils/messages.d.ts.map +1 -1
- package/lib/Utils/messages.js +4 -24
- package/lib/Utils/messages.js.map +1 -1
- package/lib/Utils/process-message.d.ts +2 -3
- package/lib/Utils/process-message.d.ts.map +1 -1
- package/lib/Utils/process-message.js +3 -13
- package/lib/Utils/process-message.js.map +1 -1
- package/lib/Utils/signal.d.ts +2 -2
- package/lib/Utils/signal.d.ts.map +1 -1
- package/lib/Utils/signal.js.map +1 -1
- package/lib/Utils/validate-connection.d.ts.map +1 -1
- package/lib/Utils/validate-connection.js +2 -3
- package/lib/Utils/validate-connection.js.map +1 -1
- package/lib/WABinary/jid-utils.d.ts +5 -6
- package/lib/WABinary/jid-utils.d.ts.map +1 -1
- package/lib/WABinary/jid-utils.js +5 -11
- package/lib/WABinary/jid-utils.js.map +1 -1
- package/lib/WAM/encode.d.ts.map +1 -1
- package/lib/WAM/encode.js +1 -0
- package/lib/WAM/encode.js.map +1 -1
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts +1 -2
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts.map +1 -1
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.js +2 -10
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.js.map +1 -1
- package/package.json +8 -12
package/README.md
CHANGED
|
@@ -3,12 +3,6 @@
|
|
|
3
3
|
<div align='center'>Baileys is a WebSockets-based TypeScript library for interacting with the WhatsApp Web API.</div>
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
> [!CAUTION]
|
|
7
|
-
> NOTICE OF BREAKING CHANGE.
|
|
8
|
-
>
|
|
9
|
-
> As of 7.0.0, multiple breaking changes were introduced into the library.
|
|
10
|
-
>
|
|
11
|
-
> Please check out https://whiskey.so/migrate-latest for more information.
|
|
12
6
|
|
|
13
7
|
> [!IMPORTANT]
|
|
14
8
|
> I made a survey for users of the project to ask questions, and provide Baileys valuable insights regarding its users. I will be publishing the results of this form (after filtering) as well so we can study and understand where we need to work.
|
package/lib/Defaults/index.d.ts
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { proto } from '../../WAProto/index.js';
|
|
2
|
-
import type { SocketConfig } from '../Types/index.js';
|
|
2
|
+
import type { MediaType, SocketConfig } from '../Types/index.js';
|
|
3
3
|
export declare const UNAUTHORIZED_CODES: number[];
|
|
4
4
|
export declare const DEFAULT_ORIGIN = "https://web.whatsapp.com";
|
|
5
|
-
export declare const CALL_VIDEO_PREFIX = "https://call.whatsapp.com/video/";
|
|
6
|
-
export declare const CALL_AUDIO_PREFIX = "https://call.whatsapp.com/voice/";
|
|
7
5
|
export declare const DEF_CALLBACK_PREFIX = "CB:";
|
|
8
6
|
export declare const DEF_TAG_PREFIX = "TAG:";
|
|
9
7
|
export declare const PHONE_CONNECTION_CB = "CB:Pong";
|
|
@@ -41,14 +39,10 @@ export declare const MEDIA_HKDF_KEY_MAPPING: {
|
|
|
41
39
|
'product-catalog-image': string;
|
|
42
40
|
'payment-bg-image': string;
|
|
43
41
|
ptv: string;
|
|
44
|
-
'biz-cover-photo': string;
|
|
45
42
|
};
|
|
46
|
-
export type MediaType = keyof typeof MEDIA_HKDF_KEY_MAPPING;
|
|
47
43
|
export declare const MEDIA_KEYS: MediaType[];
|
|
48
44
|
export declare const MIN_PREKEY_COUNT = 5;
|
|
49
45
|
export declare const INITIAL_PREKEY_COUNT = 30;
|
|
50
|
-
export declare const UPLOAD_TIMEOUT = 30000;
|
|
51
|
-
export declare const MIN_UPLOAD_INTERVAL = 5000;
|
|
52
46
|
export declare const DEFAULT_CACHE_TTLS: {
|
|
53
47
|
SIGNAL_STORE: number;
|
|
54
48
|
MSG_RETRY: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,OAAO,KAAK,EAAuB,YAAY,EAAa,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,OAAO,KAAK,EAAuB,SAAS,EAAE,YAAY,EAAa,MAAM,UAAU,CAAA;AAOvF,eAAO,MAAM,kBAAkB,UAAkB,CAAA;AAEjD,eAAO,MAAM,cAAc,6BAA6B,CAAA;AACxD,eAAO,MAAM,mBAAmB,QAAQ,CAAA;AACxC,eAAO,MAAM,cAAc,SAAS,CAAA;AACpC,eAAO,MAAM,mBAAmB,YAAY,CAAA;AAE5C,eAAO,MAAM,oBAAoB,QAAmB,CAAA;AAEpD,eAAO,MAAM,UAAU,yCAAyC,CAAA;AAChE,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,eAAe,qBAAmB,CAAA;AAC/C,eAAO,MAAM,eAAe,qBAAyC,CAAA;AACrE,yGAAyG;AAEzG,eAAO,MAAM,SAAS,QAAiC,CAAC;AAExD,eAAO,MAAM,eAAe;;CAE3B,CAAA;AAED,eAAO,MAAM,yBAAyB,yDAMrC,CAAA;AAED,eAAO,MAAM,yBAAyB,EAAE,YA+BvC,CAAA;AAED,eAAO,MAAM,cAAc,EAAE;KAAG,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM;CAUvD,CAAA;AAED,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;CAmBlC,CAAA;AAED,eAAO,MAAM,UAAU,EAAkC,SAAS,EAAE,CAAA;AAEpE,eAAO,MAAM,gBAAgB,IAAI,CAAA;AAEjC,eAAO,MAAM,oBAAoB,KAAK,CAAA;AAEtC,eAAO,MAAM,kBAAkB;;;;;CAK9B,CAAA"}
|
package/lib/Defaults/index.js
CHANGED
|
@@ -2,11 +2,10 @@ import { proto } from '../../WAProto/index.js';
|
|
|
2
2
|
import { makeLibSignalRepository } from '../Signal/libsignal.js';
|
|
3
3
|
import { Browsers } from '../Utils/index.js';
|
|
4
4
|
import logger from '../Utils/logger.js';
|
|
5
|
-
|
|
5
|
+
import defaultVersion from './baileys-version.json' with { type: 'json' };
|
|
6
|
+
const { version } = defaultVersion;
|
|
6
7
|
export const UNAUTHORIZED_CODES = [401, 403, 419];
|
|
7
8
|
export const DEFAULT_ORIGIN = 'https://web.whatsapp.com';
|
|
8
|
-
export const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
|
|
9
|
-
export const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
|
|
10
9
|
export const DEF_CALLBACK_PREFIX = 'CB:';
|
|
11
10
|
export const DEF_TAG_PREFIX = 'TAG:';
|
|
12
11
|
export const PHONE_CONNECTION_CB = 'CB:Pong';
|
|
@@ -50,8 +49,6 @@ export const DEFAULT_CONNECTION_CONFIG = {
|
|
|
50
49
|
linkPreviewImageThumbnailWidth: 192,
|
|
51
50
|
transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
|
|
52
51
|
generateHighQualityLinkPreview: false,
|
|
53
|
-
enableAutoSessionRecreation: true,
|
|
54
|
-
enableRecentMessageCache: true,
|
|
55
52
|
options: {},
|
|
56
53
|
appStateMacVerification: {
|
|
57
54
|
patch: false,
|
|
@@ -71,8 +68,7 @@ export const MEDIA_PATH_MAP = {
|
|
|
71
68
|
'thumbnail-link': '/mms/image',
|
|
72
69
|
'product-catalog-image': '/product/image',
|
|
73
70
|
'md-app-state': '',
|
|
74
|
-
'md-msg-hist': '/mms/md-app-state'
|
|
75
|
-
'biz-cover-photo': '/pps/biz-cover-photo'
|
|
71
|
+
'md-msg-hist': '/mms/md-app-state'
|
|
76
72
|
};
|
|
77
73
|
export const MEDIA_HKDF_KEY_MAPPING = {
|
|
78
74
|
audio: 'Audio',
|
|
@@ -92,14 +88,11 @@ export const MEDIA_HKDF_KEY_MAPPING = {
|
|
|
92
88
|
'md-app-state': 'App State',
|
|
93
89
|
'product-catalog-image': '',
|
|
94
90
|
'payment-bg-image': 'Payment Background',
|
|
95
|
-
ptv: 'Video'
|
|
96
|
-
'biz-cover-photo': 'Image'
|
|
91
|
+
ptv: 'Video'
|
|
97
92
|
};
|
|
98
93
|
export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP);
|
|
99
94
|
export const MIN_PREKEY_COUNT = 5;
|
|
100
95
|
export const INITIAL_PREKEY_COUNT = 30;
|
|
101
|
-
export const UPLOAD_TIMEOUT = 30000; // 30 seconds
|
|
102
|
-
export const MIN_UPLOAD_INTERVAL = 5000; // 5 seconds minimum between uploads
|
|
103
96
|
export const DEFAULT_CACHE_TTLS = {
|
|
104
97
|
SIGNAL_STORE: 5 * 60, // 5 minutes
|
|
105
98
|
MSG_RETRY: 60 * 60, // 1 hour
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,MAAM,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Defaults/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare class GroupCipher {
|
|
|
8
8
|
private readonly senderKeyStore;
|
|
9
9
|
private readonly senderKeyName;
|
|
10
10
|
constructor(senderKeyStore: SenderKeyStore, senderKeyName: SenderKeyName);
|
|
11
|
+
private queueJob;
|
|
11
12
|
encrypt(paddedPlaintext: Uint8Array | string): Promise<Uint8Array>;
|
|
12
13
|
decrypt(senderKeyMessageBytes: Uint8Array): Promise<Uint8Array>;
|
|
13
14
|
private getSenderKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group_cipher.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"group_cipher.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAGrD,MAAM,WAAW,cAAc;IAC9B,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACrE,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpF;AAED,qBAAa,WAAW;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa;IAKxE,OAAO,CAAC,QAAQ;IAIH,OAAO,CAAC,eAAe,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IA6BlE,OAAO,CAAC,qBAAqB,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IA2B5E,OAAO,CAAC,YAAY;YA4BN,YAAY;YAQZ,aAAa;CAc3B"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
/* @ts-ignore */
|
|
1
2
|
import { decrypt, encrypt } from 'libsignal/src/crypto.js';
|
|
3
|
+
import queueJob from './queue-job.js';
|
|
2
4
|
import { SenderKeyMessage } from './sender-key-message.js';
|
|
3
5
|
import { SenderKeyName } from './sender-key-name.js';
|
|
4
6
|
import { SenderKeyRecord } from './sender-key-record.js';
|
|
@@ -8,37 +10,44 @@ export class GroupCipher {
|
|
|
8
10
|
this.senderKeyStore = senderKeyStore;
|
|
9
11
|
this.senderKeyName = senderKeyName;
|
|
10
12
|
}
|
|
13
|
+
queueJob(awaitable) {
|
|
14
|
+
return queueJob(this.senderKeyName.toString(), awaitable);
|
|
15
|
+
}
|
|
11
16
|
async encrypt(paddedPlaintext) {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
17
|
+
return await this.queueJob(async () => {
|
|
18
|
+
const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
|
|
19
|
+
if (!record) {
|
|
20
|
+
throw new Error('No SenderKeyRecord found for encryption');
|
|
21
|
+
}
|
|
22
|
+
const senderKeyState = record.getSenderKeyState();
|
|
23
|
+
if (!senderKeyState) {
|
|
24
|
+
throw new Error('No session to encrypt message');
|
|
25
|
+
}
|
|
26
|
+
const iteration = senderKeyState.getSenderChainKey().getIteration();
|
|
27
|
+
const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
|
|
28
|
+
const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
|
|
29
|
+
const senderKeyMessage = new SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
|
|
30
|
+
await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
|
|
31
|
+
return senderKeyMessage.serialize();
|
|
32
|
+
});
|
|
26
33
|
}
|
|
27
34
|
async decrypt(senderKeyMessageBytes) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
35
|
+
return await this.queueJob(async () => {
|
|
36
|
+
const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
|
|
37
|
+
if (!record) {
|
|
38
|
+
throw new Error('No SenderKeyRecord found for decryption');
|
|
39
|
+
}
|
|
40
|
+
const senderKeyMessage = new SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
|
|
41
|
+
const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
|
|
42
|
+
if (!senderKeyState) {
|
|
43
|
+
throw new Error('No session found to decrypt message');
|
|
44
|
+
}
|
|
45
|
+
senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
|
|
46
|
+
const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
|
|
47
|
+
const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
|
|
48
|
+
await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
|
|
49
|
+
return plaintext;
|
|
50
|
+
});
|
|
42
51
|
}
|
|
43
52
|
getSenderKey(senderKeyState, iteration) {
|
|
44
53
|
let senderChainKey = senderKeyState.getSenderChainKey();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group_cipher.js","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"group_cipher.js","sourceRoot":"","sources":["../../../src/Signal/Group/group_cipher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyhelper.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keyhelper.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAErD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CACf;AAED,wBAAgB,wBAAwB,CAAC,GAAG,CAAC,EAAE,WAAW,GAAG,cAAc,CAS1E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyhelper.js","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAIrD,MAAM,UAAU,iBAAiB;IAChC,OAAO,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,mBAAmB;IAClC,OAAO,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;AACxC,CAAC;AAOD,MAAM,UAAU,wBAAwB,CAAC,GAAiB;IACzD,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,GAAG,GAAG,eAAe,EAAE,CAAA;IACxB,CAAC;IAED,OAAO;QACN,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;KACjC,CAAA;AACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"keyhelper.js","sourceRoot":"","sources":["../../../src/Signal/Group/keyhelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,QAAQ,CAAA;AACpC,gBAAgB;AAChB,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAIrD,MAAM,UAAU,iBAAiB;IAChC,OAAO,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,mBAAmB;IAClC,OAAO,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;AACxC,CAAC;AAOD,MAAM,UAAU,wBAAwB,CAAC,GAAiB;IACzD,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,GAAG,GAAG,eAAe,EAAE,CAAA;IACxB,CAAC;IAED,OAAO;QACN,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;KACjC,CAAA;AACF,CAAC"}
|
|
@@ -4,7 +4,7 @@ export declare class SenderChainKey {
|
|
|
4
4
|
private readonly CHAIN_KEY_SEED;
|
|
5
5
|
private readonly iteration;
|
|
6
6
|
private readonly chainKey;
|
|
7
|
-
constructor(iteration: number, chainKey:
|
|
7
|
+
constructor(iteration: number, chainKey: any);
|
|
8
8
|
getIteration(): number;
|
|
9
9
|
getSenderMessageKey(): SenderMessageKey;
|
|
10
10
|
getNext(): SenderChainKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-chain-key.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sender-chain-key.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,qBAAa,cAAc;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;gBAErB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;IASrC,YAAY,IAAI,MAAM;IAItB,mBAAmB,IAAI,gBAAgB;IAIvC,OAAO,IAAI,cAAc;IAIzB,OAAO,IAAI,UAAU;IAI5B,OAAO,CAAC,aAAa;CAGrB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* @ts-ignore */
|
|
1
2
|
import { calculateMAC } from 'libsignal/src/crypto.js';
|
|
2
3
|
import { SenderMessageKey } from './sender-message-key.js';
|
|
3
4
|
export class SenderChainKey {
|
|
@@ -5,18 +6,11 @@ export class SenderChainKey {
|
|
|
5
6
|
this.MESSAGE_KEY_SEED = Buffer.from([0x01]);
|
|
6
7
|
this.CHAIN_KEY_SEED = Buffer.from([0x02]);
|
|
7
8
|
this.iteration = iteration;
|
|
8
|
-
if (Buffer
|
|
9
|
+
if (chainKey instanceof Buffer) {
|
|
9
10
|
this.chainKey = chainKey;
|
|
10
11
|
}
|
|
11
|
-
else if (chainKey instanceof Uint8Array) {
|
|
12
|
-
this.chainKey = Buffer.from(chainKey);
|
|
13
|
-
}
|
|
14
|
-
else if (chainKey && typeof chainKey === 'object') {
|
|
15
|
-
// backported from @MartinSchere (#1741)
|
|
16
|
-
this.chainKey = Buffer.from(Object.values(chainKey)); // temp fix // backported from @MartinSchere (#1741)
|
|
17
|
-
}
|
|
18
12
|
else {
|
|
19
|
-
this.chainKey = Buffer.
|
|
13
|
+
this.chainKey = Buffer.from(chainKey || []);
|
|
20
14
|
}
|
|
21
15
|
}
|
|
22
16
|
getIteration() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-chain-key.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,OAAO,cAAc;IAM1B,YAAY,SAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"sender-chain-key.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-chain-key.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,OAAO,cAAc;IAM1B,YAAY,SAAiB,EAAE,QAAa;QAL3B,qBAAgB,GAAe,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAClD,mBAAc,GAAe,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAKhE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,QAAQ,YAAY,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACzB,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;QAC5C,CAAC;IACF,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,mBAAmB;QACzB,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtG,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtG,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,QAAQ,CAAA;IACrB,CAAC;IAEO,aAAa,CAAC,IAAgB,EAAE,GAAW;QAClD,OAAO,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC/B,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-key-message.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sender-key-message.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExD,qBAAa,gBAAiB,SAAQ,iBAAiB;IACtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAK;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;gBAGtC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,EAC9B,YAAY,CAAC,EAAE,UAAU,GAAG,IAAI,EAChC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IAyCxB,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,UAAU;IAI3B,eAAe,CAAC,YAAY,EAAE,UAAU,GAAG,IAAI;IAOtD,OAAO,CAAC,YAAY;IAIb,SAAS,IAAI,UAAU;IAIvB,OAAO,IAAI,MAAM;CAGxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-key-message.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sender-key-message.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-message.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExD,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IAStD,YACC,KAAqB,EACrB,SAAyB,EACzB,UAA8B,EAC9B,YAAgC,EAChC,UAA8B;QAE9B,KAAK,EAAE,CAAA;QAfS,qBAAgB,GAAG,EAAE,CAAA;QAiBrC,IAAI,UAAU,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAE,CAAA;YAC9B,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAC9E,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAC9D,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAE/D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;YAC5B,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;YAC3C,IAAI,CAAC,KAAK,GAAG,gBAAgB,CAAC,EAAE,CAAA;YAChC,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAA;YAC3C,IAAI,CAAC,UAAU;gBACd,OAAO,gBAAgB,CAAC,UAAU,KAAK,QAAQ;oBAC9C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC;oBACpD,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAA;YAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC3B,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAA;YACnF,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAW,CAAC,CAAA;YACjD,MAAM,OAAO,GAAG,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAC5C,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAC7B,EAAE,EAAE,KAAM;gBACV,SAAS,EAAE,SAAU;gBACrB,UAAU,EAAE,gBAAgB;aAC5B,CAAC,CACF,CAAC,MAAM,EAAE,CAAA;YAEV,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,YAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;YAEpG,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;YAC1F,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,eAAe,CAAA;YAC1C,IAAI,CAAC,KAAK,GAAG,KAAM,CAAA;YACnB,IAAI,CAAC,SAAS,GAAG,SAAU,CAAA;YAC3B,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAA;YAClC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC3B,CAAC;IACF,CAAC;IAEM,QAAQ;QACd,OAAO,IAAI,CAAC,KAAK,CAAA;IAClB,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,aAAa;QACnB,OAAO,IAAI,CAAC,UAAU,CAAA;IACvB,CAAC;IAEM,eAAe,CAAC,YAAwB;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACtF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,eAAe,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QACvD,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;IAChD,CAAC;IAEO,YAAY,CAAC,YAAwB,EAAE,UAAsB;QACpE,OAAO,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAA;IACjE,CAAC;IAEM,SAAS;QACf,OAAO,IAAI,CAAC,UAAU,CAAA;IACvB,CAAC;IAEM,OAAO;QACb,OAAO,CAAC,CAAA;IACT,CAAC;CACD"}
|
|
@@ -21,10 +21,10 @@ interface SenderKeyStateStructure {
|
|
|
21
21
|
export declare class SenderKeyState {
|
|
22
22
|
private readonly MAX_MESSAGE_KEYS;
|
|
23
23
|
private readonly senderKeyStateStructure;
|
|
24
|
-
constructor(id?: number | null, iteration?: number | null, chainKey?: Uint8Array | null
|
|
25
|
-
public: Uint8Array
|
|
26
|
-
private: Uint8Array
|
|
27
|
-
} | null, signatureKeyPublic?: Uint8Array |
|
|
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
28
|
getKeyId(): number;
|
|
29
29
|
getSenderChainKey(): SenderChainKey;
|
|
30
30
|
setSenderChainKey(chainKey: SenderChainKey): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-key-state.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,UAAU,uBAAuB;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,yBAAyB;IAClC,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,CAAC,EAAE,UAAU,CAAA;CACpB;AAED,UAAU,yBAAyB;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,uBAAuB;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,uBAAuB,CAAA;IACvC,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,iBAAiB,EAAE,yBAAyB,EAAE,CAAA;CAC9C;AAED,qBAAa,cAAc;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAO;IACxC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAyB;gBAGhE,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,EAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"sender-key-state.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,UAAU,uBAAuB;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,yBAAyB;IAClC,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,CAAC,EAAE,UAAU,CAAA;CACpB;AAED,UAAU,yBAAyB;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,UAAU,CAAA;CAChB;AAED,UAAU,uBAAuB;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,uBAAuB,CAAA;IACvC,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,iBAAiB,EAAE,yBAAyB,EAAE,CAAA;CAC9C;AAED,qBAAa,cAAc;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAO;IACxC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAyB;gBAGhE,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,EAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,EAC5B,gBAAgB,CAAC,EAAE;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,GAAG,IAAI,EACrE,kBAAkB,CAAC,EAAE,UAAU,GAAG,IAAI,EACtC,mBAAmB,CAAC,EAAE,UAAU,GAAG,IAAI,EACvC,uBAAuB,CAAC,EAAE,uBAAuB,GAAG,IAAI;IAsClD,QAAQ,IAAI,MAAM;IAIlB,iBAAiB,IAAI,cAAc;IAOnC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAOjD,mBAAmB,IAAI,MAAM;IAW7B,oBAAoB,IAAI,MAAM,GAAG,SAAS;IAe1C,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/C,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAe7D,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAYlE,YAAY,IAAI,uBAAuB;CAG9C"}
|
|
@@ -3,22 +3,8 @@ import { SenderMessageKey } from './sender-message-key.js';
|
|
|
3
3
|
export class SenderKeyState {
|
|
4
4
|
constructor(id, iteration, chainKey, signatureKeyPair, signatureKeyPublic, signatureKeyPrivate, senderKeyStateStructure) {
|
|
5
5
|
this.MAX_MESSAGE_KEYS = 2000;
|
|
6
|
-
const toBuffer = (val) => {
|
|
7
|
-
if (!val)
|
|
8
|
-
return Buffer.alloc(0);
|
|
9
|
-
if (typeof val === 'string')
|
|
10
|
-
return Buffer.from(val, 'base64');
|
|
11
|
-
if (val instanceof Uint8Array || Array.isArray(val))
|
|
12
|
-
return Buffer.from(val);
|
|
13
|
-
return Buffer.alloc(0);
|
|
14
|
-
};
|
|
15
6
|
if (senderKeyStateStructure) {
|
|
16
|
-
this.senderKeyStateStructure =
|
|
17
|
-
...senderKeyStateStructure,
|
|
18
|
-
senderMessageKeys: Array.isArray(senderKeyStateStructure.senderMessageKeys)
|
|
19
|
-
? senderKeyStateStructure.senderMessageKeys
|
|
20
|
-
: []
|
|
21
|
-
};
|
|
7
|
+
this.senderKeyStateStructure = senderKeyStateStructure;
|
|
22
8
|
}
|
|
23
9
|
else {
|
|
24
10
|
if (signatureKeyPair) {
|
|
@@ -28,12 +14,17 @@ export class SenderKeyState {
|
|
|
28
14
|
chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
|
|
29
15
|
const senderChainKeyStructure = {
|
|
30
16
|
iteration: iteration || 0,
|
|
31
|
-
seed: chainKey
|
|
17
|
+
seed: chainKey || Buffer.alloc(0)
|
|
32
18
|
};
|
|
33
19
|
const signingKeyStructure = {
|
|
34
|
-
public:
|
|
35
|
-
|
|
20
|
+
public: typeof signatureKeyPublic === 'string'
|
|
21
|
+
? Buffer.from(signatureKeyPublic, 'base64')
|
|
22
|
+
: signatureKeyPublic || Buffer.alloc(0)
|
|
36
23
|
};
|
|
24
|
+
if (signatureKeyPrivate) {
|
|
25
|
+
signingKeyStructure.private =
|
|
26
|
+
typeof signatureKeyPrivate === 'string' ? Buffer.from(signatureKeyPrivate, 'base64') : signatureKeyPrivate;
|
|
27
|
+
}
|
|
37
28
|
this.senderKeyStateStructure = {
|
|
38
29
|
senderKeyId: id || 0,
|
|
39
30
|
senderChainKey: senderChainKeyStructure,
|
|
@@ -55,45 +46,23 @@ export class SenderKeyState {
|
|
|
55
46
|
};
|
|
56
47
|
}
|
|
57
48
|
getSigningKeyPublic() {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
if (key instanceof Uint8Array) {
|
|
62
|
-
key = Buffer.from(key);
|
|
63
|
-
}
|
|
64
|
-
else if (typeof key === 'string') {
|
|
65
|
-
key = Buffer.from(key, 'base64');
|
|
66
|
-
}
|
|
67
|
-
else if (key && typeof key === 'object') {
|
|
68
|
-
return Buffer.from(Object.values(key)); // temp fix // inspired by @MartinSchere 's #1741
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
key = Buffer.from(key || []);
|
|
72
|
-
}
|
|
49
|
+
const publicKey = this.senderKeyStateStructure.senderSigningKey.public;
|
|
50
|
+
if (publicKey instanceof Buffer) {
|
|
51
|
+
return publicKey;
|
|
73
52
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const fixed = Buffer.alloc(33);
|
|
77
|
-
fixed[0] = 0x05;
|
|
78
|
-
publicKey.copy(fixed, 1);
|
|
79
|
-
return fixed;
|
|
53
|
+
else if (typeof publicKey === 'string') {
|
|
54
|
+
return Buffer.from(publicKey, 'base64');
|
|
80
55
|
}
|
|
81
|
-
return publicKey;
|
|
56
|
+
return Buffer.from(publicKey || []);
|
|
82
57
|
}
|
|
83
58
|
getSigningKeyPrivate() {
|
|
84
59
|
const privateKey = this.senderKeyStateStructure.senderSigningKey.private;
|
|
85
60
|
if (!privateKey) {
|
|
86
61
|
return undefined;
|
|
87
62
|
}
|
|
88
|
-
if (Buffer
|
|
63
|
+
if (privateKey instanceof Buffer) {
|
|
89
64
|
return privateKey;
|
|
90
65
|
}
|
|
91
|
-
else if (privateKey instanceof Uint8Array) {
|
|
92
|
-
return Buffer.from(privateKey);
|
|
93
|
-
}
|
|
94
|
-
else if (privateKey && typeof privateKey === 'object') {
|
|
95
|
-
return Buffer.from(Object.values(privateKey)); // temp fix // inspired by @MartinSchere 's #1741
|
|
96
|
-
}
|
|
97
66
|
else if (typeof privateKey === 'string') {
|
|
98
67
|
return Buffer.from(privateKey, 'base64');
|
|
99
68
|
}
|
|
@@ -103,6 +72,9 @@ export class SenderKeyState {
|
|
|
103
72
|
return this.senderKeyStateStructure.senderMessageKeys.some(key => key.iteration === iteration);
|
|
104
73
|
}
|
|
105
74
|
addSenderMessageKey(senderMessageKey) {
|
|
75
|
+
if (!this.senderKeyStateStructure.senderMessageKeys) {
|
|
76
|
+
this.senderKeyStateStructure.senderMessageKeys = [];
|
|
77
|
+
}
|
|
106
78
|
this.senderKeyStateStructure.senderMessageKeys.push({
|
|
107
79
|
iteration: senderMessageKey.getIteration(),
|
|
108
80
|
seed: senderMessageKey.getSeed()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-key-state.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAwBvD,MAAM,OAAO,cAAc;IAI1B,YACC,EAAkB,EAClB,SAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"sender-key-state.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-key-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-message-key.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-message-key.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sender-message-key.d.ts","sourceRoot":"","sources":["../../../src/Signal/Group/sender-message-key.ts"],"names":[],"mappings":"AAGA,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;gBAErB,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAYxC,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,UAAU;IAInB,YAAY,IAAI,UAAU;IAI1B,OAAO,IAAI,UAAU;CAG5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender-message-key.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-message-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,MAAM,OAAO,gBAAgB;IAM5B,YAAY,SAAiB,EAAE,IAAgB;QAC9C,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAA;QACrF,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAExD,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACjD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACjB,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,KAAK;QACX,OAAO,IAAI,CAAC,EAAE,CAAA;IACf,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,IAAI,CAAA;IACjB,CAAC;CACD"}
|
|
1
|
+
{"version":3,"file":"sender-message-key.js","sourceRoot":"","sources":["../../../src/Signal/Group/sender-message-key.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,MAAM,OAAO,gBAAgB;IAM5B,YAAY,SAAiB,EAAE,IAAgB;QAC9C,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAA;QACrF,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAExD,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACjD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACjB,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,KAAK;QACX,OAAO,IAAI,CAAC,EAAE,CAAA;IACf,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,IAAI,CAAA;IACjB,CAAC;CACD"}
|
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
import type { SignalAuthState } from '../Types/index.js';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function makeLibSignalRepository(auth: SignalAuthState
|
|
4
|
-
jid: string;
|
|
5
|
-
exists: boolean;
|
|
6
|
-
lid: string;
|
|
7
|
-
}[] | undefined>): SignalRepositoryWithLIDStore;
|
|
2
|
+
import type { SignalRepository } from '../Types/Signal.js';
|
|
3
|
+
export declare function makeLibSignalRepository(auth: SignalAuthState): SignalRepository;
|
|
8
4
|
//# sourceMappingURL=libsignal.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libsignal.d.ts","sourceRoot":"","sources":["../../src/Signal/libsignal.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"libsignal.d.ts","sourceRoot":"","sources":["../../src/Signal/libsignal.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAQvD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,eAAe,GAAG,gBAAgB,CAoF/E"}
|