@alannxd/baileys 6.0.3 → 6.0.5
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/WAProto/GenerateStatics.sh +3 -0
- package/WAProto/WAProto.proto +5479 -0
- package/WAProto/fix-imports.js +85 -0
- package/WAProto/index.d.ts +14017 -0
- package/WAProto/index.js +201 -160
- package/engine-requirements.js +1 -1
- package/lib/Defaults/index.d.ts +37 -15
- package/lib/Defaults/index.js +119 -136
- package/lib/Signal/Group/ciphertext-message.d.ts +1 -0
- package/lib/Signal/Group/ciphertext-message.js +2 -5
- package/lib/Signal/Group/group-session-builder.d.ts +4 -3
- package/lib/Signal/Group/group-session-builder.js +7 -41
- package/lib/Signal/Group/group_cipher.d.ts +4 -4
- package/lib/Signal/Group/group_cipher.js +37 -51
- package/lib/Signal/Group/index.d.ts +12 -11
- package/lib/Signal/Group/index.js +12 -57
- package/lib/Signal/Group/keyhelper.d.ts +2 -1
- package/lib/Signal/Group/keyhelper.js +7 -44
- package/lib/Signal/Group/sender-chain-key.d.ts +3 -2
- package/lib/Signal/Group/sender-chain-key.js +7 -15
- package/lib/Signal/Group/sender-key-distribution-message.d.ts +2 -1
- package/lib/Signal/Group/sender-key-distribution-message.js +8 -11
- package/lib/Signal/Group/sender-key-message.d.ts +2 -1
- package/lib/Signal/Group/sender-key-message.js +9 -12
- package/lib/Signal/Group/sender-key-name.d.ts +1 -0
- package/lib/Signal/Group/sender-key-name.js +2 -5
- package/lib/Signal/Group/sender-key-record.d.ts +3 -2
- package/lib/Signal/Group/sender-key-record.js +9 -21
- package/lib/Signal/Group/sender-key-state.d.ts +7 -6
- package/lib/Signal/Group/sender-key-state.js +27 -42
- package/lib/Signal/Group/sender-message-key.d.ts +1 -0
- package/lib/Signal/Group/sender-message-key.js +4 -7
- package/lib/Signal/libsignal.d.ts +5 -3
- package/lib/Signal/libsignal.js +347 -90
- package/lib/Signal/lid-mapping.d.ts +23 -0
- package/lib/Signal/lid-mapping.js +277 -0
- package/lib/Socket/Client/index.d.ts +3 -3
- package/lib/Socket/Client/index.js +3 -19
- package/lib/Socket/Client/{abstract-socket-client.d.ts → types.d.ts} +4 -5
- package/lib/Socket/Client/types.js +11 -0
- package/lib/Socket/Client/{web-socket-client.d.ts → websocket.d.ts} +3 -2
- package/lib/Socket/Client/websocket.js +54 -0
- package/lib/Socket/business.d.ts +154 -108
- package/lib/Socket/business.js +162 -43
- package/lib/Socket/chats.d.ts +96 -239
- package/lib/Socket/chats.js +627 -427
- package/lib/Socket/communities.d.ts +239 -146
- package/lib/Socket/communities.js +90 -80
- package/lib/Socket/groups.d.ts +104 -57
- package/lib/Socket/groups.js +154 -161
- package/lib/Socket/index.d.ts +202 -115
- package/lib/Socket/index.js +11 -10
- package/lib/Socket/luxu.d.ts +22 -266
- package/lib/Socket/luxu.js +422 -465
- package/lib/Socket/messages-recv.d.ts +136 -84
- package/lib/Socket/messages-recv.js +1421 -615
- package/lib/Socket/messages-send.d.ts +142 -126
- package/lib/Socket/messages-send.js +878 -671
- package/lib/Socket/mex.d.ts +3 -0
- package/lib/Socket/mex.js +42 -0
- package/lib/Socket/newsletter.d.ts +121 -85
- package/lib/Socket/newsletter.js +147 -272
- package/lib/Socket/socket.d.ts +34 -19
- package/lib/Socket/socket.js +544 -313
- package/lib/Store/index.d.ts +10 -3
- package/lib/Store/index.js +10 -10
- package/lib/Store/keyed-db.d.ts +22 -0
- package/lib/Store/keyed-db.js +108 -0
- package/lib/Store/make-cache-manager-store.d.ts +17 -11
- package/lib/Store/make-cache-manager-store.js +43 -41
- package/lib/Store/make-in-memory-store.d.ts +39 -118
- package/lib/Store/make-in-memory-store.js +112 -341
- package/lib/Store/make-ordered-dictionary.d.ts +11 -10
- package/lib/Store/make-ordered-dictionary.js +14 -20
- package/lib/Store/object-repository.d.ts +10 -9
- package/lib/Store/object-repository.js +11 -6
- package/lib/Types/Auth.d.ts +19 -12
- package/lib/Types/Auth.js +2 -2
- package/lib/Types/Bussines.d.ts +25 -0
- package/lib/Types/Bussines.js +2 -0
- package/lib/Types/Call.d.ts +3 -1
- package/lib/Types/Call.js +2 -2
- package/lib/Types/Chat.d.ts +35 -13
- package/lib/Types/Chat.js +8 -4
- package/lib/Types/Contact.d.ts +8 -1
- package/lib/Types/Contact.js +2 -2
- package/lib/Types/Events.d.ts +116 -17
- package/lib/Types/Events.js +2 -2
- package/lib/Types/GroupMetadata.d.ts +21 -5
- package/lib/Types/GroupMetadata.js +2 -2
- package/lib/Types/Label.d.ts +12 -0
- package/lib/Types/Label.js +3 -5
- package/lib/Types/LabelAssociation.d.ts +1 -0
- package/lib/Types/LabelAssociation.js +3 -5
- package/lib/Types/Message.d.ts +105 -58
- package/lib/Types/Message.js +11 -9
- package/lib/Types/Mex.d.ts +141 -0
- package/lib/Types/Mex.js +37 -0
- package/lib/Types/Product.d.ts +2 -1
- package/lib/Types/Product.js +2 -2
- package/lib/Types/Signal.d.ts +32 -2
- package/lib/Types/Signal.js +2 -2
- package/lib/Types/Socket.d.ts +50 -25
- package/lib/Types/Socket.js +3 -2
- package/lib/Types/State.d.ts +72 -2
- package/lib/Types/State.js +56 -2
- package/lib/Types/USync.d.ts +3 -2
- package/lib/Types/USync.js +2 -2
- package/lib/Types/index.d.ts +22 -14
- package/lib/Types/index.js +15 -31
- package/lib/Utils/auth-utils.d.ts +12 -6
- package/lib/Utils/auth-utils.js +239 -143
- package/lib/Utils/browser-utils.d.ts +4 -0
- package/lib/Utils/browser-utils.js +28 -0
- package/lib/Utils/business.d.ts +3 -2
- package/lib/Utils/business.js +66 -69
- package/lib/Utils/chat-utils.d.ts +52 -23
- package/lib/Utils/chat-utils.js +396 -253
- package/lib/Utils/companion-reg-client-utils.d.ts +17 -0
- package/lib/Utils/companion-reg-client-utils.js +35 -0
- package/lib/Utils/crypto.d.ts +18 -22
- package/lib/Utils/crypto.js +57 -90
- package/lib/Utils/decode-wa-message.d.ts +55 -8
- package/lib/Utils/decode-wa-message.js +203 -84
- package/lib/Utils/event-buffer.d.ts +9 -8
- package/lib/Utils/event-buffer.js +185 -77
- package/lib/Utils/generics.d.ts +28 -29
- package/lib/Utils/generics.js +180 -210
- package/lib/Utils/history.d.ts +18 -9
- package/lib/Utils/history.js +93 -55
- package/lib/Utils/identity-change-handler.d.ts +44 -0
- package/lib/Utils/identity-change-handler.js +50 -0
- package/lib/Utils/index.d.ts +22 -17
- package/lib/Utils/index.js +22 -33
- package/lib/Utils/link-preview.d.ts +5 -5
- package/lib/Utils/link-preview.js +16 -24
- package/lib/Utils/logger.d.ts +11 -3
- package/lib/Utils/logger.js +3 -7
- package/lib/Utils/lt-hash.d.ts +8 -12
- package/lib/Utils/lt-hash.js +3 -46
- package/lib/Utils/make-mutex.d.ts +4 -2
- package/lib/Utils/make-mutex.js +24 -34
- package/lib/Utils/message-retry-manager.d.ts +115 -0
- package/lib/Utils/message-retry-manager.js +265 -0
- package/lib/Utils/messages-media.d.ts +61 -44
- package/lib/Utils/messages-media.js +451 -482
- package/lib/Utils/messages.d.ts +32 -18
- package/lib/Utils/messages.js +458 -369
- package/lib/Utils/noise-handler.d.ts +13 -14
- package/lib/Utils/noise-handler.js +145 -99
- package/lib/Utils/offline-node-processor.d.ts +17 -0
- package/lib/Utils/offline-node-processor.js +40 -0
- package/lib/Utils/pre-key-manager.d.ts +28 -0
- package/lib/Utils/pre-key-manager.js +106 -0
- package/lib/Utils/process-message.d.ts +31 -12
- package/lib/Utils/process-message.js +459 -150
- package/lib/Utils/reporting-utils.d.ts +11 -0
- package/lib/Utils/reporting-utils.js +258 -0
- package/lib/Utils/signal.d.ts +20 -5
- package/lib/Utils/signal.js +120 -72
- package/lib/Utils/stanza-ack.d.ts +11 -0
- package/lib/Utils/stanza-ack.js +38 -0
- package/lib/Utils/sync-action-utils.d.ts +19 -0
- package/lib/Utils/sync-action-utils.js +49 -0
- package/lib/Utils/tc-token-utils.d.ts +37 -0
- package/lib/Utils/tc-token-utils.js +163 -0
- package/lib/Utils/use-multi-file-auth-state.d.ts +2 -2
- package/lib/Utils/use-multi-file-auth-state.js +29 -27
- package/lib/Utils/validate-connection.d.ts +7 -7
- package/lib/Utils/validate-connection.js +73 -99
- package/lib/WABinary/constants.d.ts +25 -27
- package/lib/WABinary/constants.js +1281 -20
- package/lib/WABinary/decode.d.ts +5 -5
- package/lib/WABinary/decode.js +52 -42
- package/lib/WABinary/encode.d.ts +3 -3
- package/lib/WABinary/encode.js +110 -155
- package/lib/WABinary/generic-utils.d.ts +8 -7
- package/lib/WABinary/generic-utils.js +48 -49
- package/lib/WABinary/index.d.ts +6 -5
- package/lib/WABinary/index.js +6 -21
- package/lib/WABinary/jid-utils.d.ts +25 -8
- package/lib/WABinary/jid-utils.js +74 -40
- package/lib/WABinary/types.d.ts +2 -1
- package/lib/WABinary/types.js +2 -2
- package/lib/WAM/BinaryInfo.d.ts +3 -11
- package/lib/WAM/BinaryInfo.js +2 -5
- package/lib/WAM/constants.d.ts +5 -3
- package/lib/WAM/constants.js +19071 -11568
- package/lib/WAM/encode.d.ts +3 -3
- package/lib/WAM/encode.js +17 -22
- package/lib/WAM/index.d.ts +4 -3
- package/lib/WAM/index.js +4 -19
- package/lib/WAUSync/Protocols/USyncContactProtocol.d.ts +4 -3
- package/lib/WAUSync/Protocols/USyncContactProtocol.js +33 -13
- package/lib/WAUSync/Protocols/USyncDeviceProtocol.d.ts +3 -2
- package/lib/WAUSync/Protocols/USyncDeviceProtocol.js +11 -14
- package/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.d.ts +3 -2
- package/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.js +9 -12
- package/lib/WAUSync/Protocols/USyncStatusProtocol.d.ts +3 -2
- package/lib/WAUSync/Protocols/USyncStatusProtocol.js +9 -13
- package/lib/WAUSync/Protocols/USyncUsernameProtocol.d.ts +10 -0
- package/lib/WAUSync/Protocols/USyncUsernameProtocol.js +25 -0
- package/lib/WAUSync/Protocols/UsyncBotProfileProtocol.d.ts +4 -3
- package/lib/WAUSync/Protocols/UsyncBotProfileProtocol.js +20 -22
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts +5 -3
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.js +13 -8
- package/lib/WAUSync/Protocols/index.d.ts +6 -4
- package/lib/WAUSync/Protocols/index.js +6 -20
- package/lib/WAUSync/USyncQuery.d.ts +6 -4
- package/lib/WAUSync/USyncQuery.js +44 -35
- package/lib/WAUSync/USyncUser.d.ts +10 -5
- package/lib/WAUSync/USyncUser.js +10 -5
- package/lib/WAUSync/index.d.ts +4 -0
- package/lib/WAUSync/index.js +4 -19
- package/lib/index.d.ts +10 -9
- package/lib/index.js +12 -34
- package/package.json +84 -53
- package/WAProto/fix-import.js +0 -29
- package/lib/Defaults/baileys-version.json +0 -3
- package/lib/Defaults/phonenumber-mcc.json +0 -223
- package/lib/Signal/Group/queue-job.d.ts +0 -1
- package/lib/Signal/Group/queue-job.js +0 -57
- package/lib/Socket/Client/abstract-socket-client.js +0 -13
- package/lib/Socket/Client/mobile-socket-client.d.ts +0 -13
- package/lib/Socket/Client/mobile-socket-client.js +0 -65
- package/lib/Socket/Client/web-socket-client.js +0 -62
- package/lib/Socket/registration.d.ts +0 -267
- package/lib/Socket/registration.js +0 -166
- package/lib/Socket/usync.d.ts +0 -36
- package/lib/Socket/usync.js +0 -70
- package/lib/Types/Newsletter.d.ts +0 -103
- package/lib/Types/Newsletter.js +0 -38
- package/lib/Utils/baileys-event-stream.d.ts +0 -16
- package/lib/Utils/baileys-event-stream.js +0 -63
package/lib/Signal/libsignal.js
CHANGED
|
@@ -1,135 +1,391 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
// @ts-ignore
|
|
2
|
+
import * as libsignal from 'libsignal';
|
|
3
|
+
// @ts-ignore
|
|
4
|
+
import { PreKeyWhisperMessage } from 'libsignal/src/protobufs.js';
|
|
5
|
+
import { LRUCache } from 'lru-cache';
|
|
6
|
+
import { generateSignalPubKey } from '../Utils/index.js';
|
|
7
|
+
import { isHostedLidUser, isHostedPnUser, isLidUser, isPnUser, jidDecode, transferDevice, WAJIDDomains } from '../WABinary/index.js';
|
|
8
|
+
import { SenderKeyName } from './Group/sender-key-name.js';
|
|
9
|
+
import { SenderKeyRecord } from './Group/sender-key-record.js';
|
|
10
|
+
import { GroupCipher, GroupSessionBuilder, SenderKeyDistributionMessage } from './Group/index.js';
|
|
11
|
+
import { LIDMappingStore } from './lid-mapping.js';
|
|
12
|
+
/** Extract identity key from PreKeyWhisperMessage for identity change detection */
|
|
13
|
+
function extractIdentityFromPkmsg(ciphertext) {
|
|
14
|
+
try {
|
|
15
|
+
if (!ciphertext || ciphertext.length < 2) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
// Version byte check (version 3)
|
|
19
|
+
const version = ciphertext[0];
|
|
20
|
+
if ((version & 0xf) !== 3) {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
// Parse protobuf (skip version byte)
|
|
24
|
+
const preKeyProto = PreKeyWhisperMessage.decode(ciphertext.slice(1));
|
|
25
|
+
if (preKeyProto.identityKey?.length === 33) {
|
|
26
|
+
return new Uint8Array(preKeyProto.identityKey);
|
|
27
|
+
}
|
|
28
|
+
return undefined;
|
|
7
29
|
}
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
30
|
+
catch {
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
export function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
|
|
35
|
+
const lidMapping = new LIDMappingStore(auth.keys, logger, pnToLIDFunc);
|
|
36
|
+
const storage = signalStorage(auth, lidMapping);
|
|
37
|
+
const parsedKeys = auth.keys;
|
|
38
|
+
const migratedSessionCache = new LRUCache({
|
|
39
|
+
ttl: 3 * 24 * 60 * 60 * 1000, // 7 days
|
|
40
|
+
ttlAutopurge: true,
|
|
41
|
+
updateAgeOnGet: true
|
|
42
|
+
});
|
|
43
|
+
const ensureSenderKeyAndCreateSkdm = async (group, meId) => {
|
|
44
|
+
const senderName = jidToSignalSenderKeyName(group, meId);
|
|
45
|
+
const senderNameStr = senderName.toString();
|
|
46
|
+
const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
|
|
47
|
+
if (!senderKey) {
|
|
48
|
+
await storage.storeSenderKey(senderName, new SenderKeyRecord());
|
|
49
|
+
}
|
|
50
|
+
const skdm = await new GroupSessionBuilder(storage).create(senderName);
|
|
51
|
+
return { senderName, skdm };
|
|
33
52
|
};
|
|
34
|
-
|
|
35
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.makeLibSignalRepository = makeLibSignalRepository;
|
|
37
|
-
const libsignal = __importStar(require("libsignal"));
|
|
38
|
-
const Utils_1 = require("../Utils");
|
|
39
|
-
const WABinary_1 = require("../WABinary");
|
|
40
|
-
const sender_key_name_1 = require("./Group/sender-key-name");
|
|
41
|
-
const sender_key_record_1 = require("./Group/sender-key-record");
|
|
42
|
-
const Group_1 = require("./Group");
|
|
43
|
-
function makeLibSignalRepository(auth) {
|
|
44
|
-
const storage = signalStorage(auth);
|
|
45
|
-
return {
|
|
53
|
+
const repository = {
|
|
46
54
|
decryptGroupMessage({ group, authorJid, msg }) {
|
|
47
55
|
const senderName = jidToSignalSenderKeyName(group, authorJid);
|
|
48
|
-
const cipher = new
|
|
49
|
-
|
|
56
|
+
const cipher = new GroupCipher(storage, senderName);
|
|
57
|
+
// Use transaction to ensure atomicity
|
|
58
|
+
return parsedKeys.transaction(async () => {
|
|
59
|
+
return cipher.decrypt(msg);
|
|
60
|
+
}, group);
|
|
50
61
|
},
|
|
51
62
|
async processSenderKeyDistributionMessage({ item, authorJid }) {
|
|
52
|
-
const builder = new
|
|
63
|
+
const builder = new GroupSessionBuilder(storage);
|
|
53
64
|
if (!item.groupId) {
|
|
54
65
|
throw new Error('Group ID is required for sender key distribution message');
|
|
55
66
|
}
|
|
56
67
|
const senderName = jidToSignalSenderKeyName(item.groupId, authorJid);
|
|
57
|
-
const senderMsg = new
|
|
68
|
+
const senderMsg = new SenderKeyDistributionMessage(null, null, null, null, item.axolotlSenderKeyDistributionMessage);
|
|
58
69
|
const senderNameStr = senderName.toString();
|
|
59
70
|
const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
|
|
60
71
|
if (!senderKey) {
|
|
61
|
-
await storage.storeSenderKey(senderName, new
|
|
72
|
+
await storage.storeSenderKey(senderName, new SenderKeyRecord());
|
|
62
73
|
}
|
|
63
|
-
|
|
74
|
+
return parsedKeys.transaction(async () => {
|
|
75
|
+
const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
|
|
76
|
+
if (!senderKey) {
|
|
77
|
+
await storage.storeSenderKey(senderName, new SenderKeyRecord());
|
|
78
|
+
}
|
|
79
|
+
await builder.process(senderName, senderMsg);
|
|
80
|
+
}, item.groupId);
|
|
64
81
|
},
|
|
65
82
|
async decryptMessage({ jid, type, ciphertext }) {
|
|
66
83
|
const addr = jidToSignalProtocolAddress(jid);
|
|
67
84
|
const session = new libsignal.SessionCipher(storage, addr);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
|
|
85
|
+
// Extract and save sender's identity key before decryption for identity change detection
|
|
86
|
+
if (type === 'pkmsg') {
|
|
87
|
+
const identityKey = extractIdentityFromPkmsg(ciphertext);
|
|
88
|
+
if (identityKey) {
|
|
89
|
+
const addrStr = addr.toString();
|
|
90
|
+
const identityChanged = await storage.saveIdentity(addrStr, identityKey);
|
|
91
|
+
if (identityChanged) {
|
|
92
|
+
logger.info({ jid, addr: addrStr }, 'identity key changed or new contact, session will be re-established');
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
async function doDecrypt() {
|
|
97
|
+
let result;
|
|
98
|
+
switch (type) {
|
|
99
|
+
case 'pkmsg':
|
|
100
|
+
result = await session.decryptPreKeyWhisperMessage(ciphertext);
|
|
101
|
+
break;
|
|
102
|
+
case 'msg':
|
|
103
|
+
result = await session.decryptWhisperMessage(ciphertext);
|
|
104
|
+
break;
|
|
105
|
+
}
|
|
106
|
+
return result;
|
|
107
|
+
}
|
|
108
|
+
// If it's not a sync message, we need to ensure atomicity
|
|
109
|
+
// For regular messages, we use a transaction to ensure atomicity
|
|
110
|
+
return parsedKeys.transaction(async () => {
|
|
111
|
+
return await doDecrypt();
|
|
112
|
+
}, jid);
|
|
80
113
|
},
|
|
81
114
|
async encryptMessage({ jid, data }) {
|
|
82
115
|
const addr = jidToSignalProtocolAddress(jid);
|
|
83
116
|
const cipher = new libsignal.SessionCipher(storage, addr);
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
117
|
+
// Use transaction to ensure atomicity
|
|
118
|
+
return parsedKeys.transaction(async () => {
|
|
119
|
+
const { type: sigType, body } = await cipher.encrypt(data);
|
|
120
|
+
const type = sigType === 3 ? 'pkmsg' : 'msg';
|
|
121
|
+
return { type, ciphertext: Buffer.from(body, 'binary') };
|
|
122
|
+
}, jid);
|
|
87
123
|
},
|
|
88
124
|
async encryptGroupMessage({ group, meId, data }) {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
125
|
+
return parsedKeys.transaction(async () => {
|
|
126
|
+
const { senderName, skdm } = await ensureSenderKeyAndCreateSkdm(group, meId);
|
|
127
|
+
const ciphertext = await new GroupCipher(storage, senderName).encrypt(data);
|
|
128
|
+
return { ciphertext, senderKeyDistributionMessage: skdm.serialize() };
|
|
129
|
+
}, group);
|
|
130
|
+
},
|
|
131
|
+
async getSenderKeyDistributionMessage({ group, meId }) {
|
|
132
|
+
return parsedKeys.transaction(async () => {
|
|
133
|
+
const { skdm } = await ensureSenderKeyAndCreateSkdm(group, meId);
|
|
134
|
+
return skdm.serialize();
|
|
135
|
+
}, group);
|
|
136
|
+
},
|
|
137
|
+
async hasSenderKey({ group, meId }) {
|
|
138
|
+
const senderName = jidToSignalSenderKeyName(group, meId).toString();
|
|
139
|
+
const { [senderName]: key } = await auth.keys.get('sender-key', [senderName]);
|
|
140
|
+
return !!key;
|
|
141
|
+
},
|
|
142
|
+
async getSessionInfo(jid) {
|
|
143
|
+
const addr = jidToSignalProtocolAddress(jid).toString();
|
|
144
|
+
const session = (await storage.loadSession(addr));
|
|
145
|
+
if (!session) {
|
|
146
|
+
return null;
|
|
95
147
|
}
|
|
96
|
-
const
|
|
97
|
-
const
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
};
|
|
148
|
+
const open = session.getOpenSession?.();
|
|
149
|
+
const baseKey = open?.indexInfo?.baseKey;
|
|
150
|
+
const registrationId = open?.registrationId;
|
|
151
|
+
if (!baseKey || typeof registrationId !== 'number') {
|
|
152
|
+
return null;
|
|
153
|
+
}
|
|
154
|
+
return { baseKey: new Uint8Array(baseKey), registrationId };
|
|
103
155
|
},
|
|
104
156
|
async injectE2ESession({ jid, session }) {
|
|
157
|
+
logger.trace({ jid }, 'injecting E2EE session');
|
|
105
158
|
const cipher = new libsignal.SessionBuilder(storage, jidToSignalProtocolAddress(jid));
|
|
106
|
-
|
|
159
|
+
return parsedKeys.transaction(async () => {
|
|
160
|
+
// libsignal runtime accepts an absent prekey (initOutgoing checks `device.preKey && ...`)
|
|
161
|
+
// but the bundled .d.ts marks it required.
|
|
162
|
+
await cipher.initOutgoing(session);
|
|
163
|
+
}, jid);
|
|
107
164
|
},
|
|
108
165
|
jidToSignalProtocolAddress(jid) {
|
|
109
166
|
return jidToSignalProtocolAddress(jid).toString();
|
|
167
|
+
},
|
|
168
|
+
// Optimized direct access to LID mapping store
|
|
169
|
+
lidMapping,
|
|
170
|
+
async validateSession(jid) {
|
|
171
|
+
try {
|
|
172
|
+
const addr = jidToSignalProtocolAddress(jid);
|
|
173
|
+
const session = await storage.loadSession(addr.toString());
|
|
174
|
+
if (!session) {
|
|
175
|
+
return { exists: false, reason: 'no session' };
|
|
176
|
+
}
|
|
177
|
+
if (!session.haveOpenSession()) {
|
|
178
|
+
return { exists: false, reason: 'no open session' };
|
|
179
|
+
}
|
|
180
|
+
return { exists: true };
|
|
181
|
+
}
|
|
182
|
+
catch (error) {
|
|
183
|
+
return { exists: false, reason: 'validation error' };
|
|
184
|
+
}
|
|
185
|
+
},
|
|
186
|
+
async deleteSession(jids) {
|
|
187
|
+
if (!jids.length)
|
|
188
|
+
return;
|
|
189
|
+
// Convert JIDs to signal addresses and prepare for bulk deletion
|
|
190
|
+
const sessionUpdates = {};
|
|
191
|
+
jids.forEach(jid => {
|
|
192
|
+
const addr = jidToSignalProtocolAddress(jid);
|
|
193
|
+
sessionUpdates[addr.toString()] = null;
|
|
194
|
+
});
|
|
195
|
+
// Single transaction for all deletions
|
|
196
|
+
return parsedKeys.transaction(async () => {
|
|
197
|
+
await auth.keys.set({ session: sessionUpdates });
|
|
198
|
+
}, `delete-${jids.length}-sessions`);
|
|
199
|
+
},
|
|
200
|
+
close() {
|
|
201
|
+
migratedSessionCache.clear();
|
|
202
|
+
lidMapping.close();
|
|
203
|
+
},
|
|
204
|
+
async migrateSession(fromJid, toJid) {
|
|
205
|
+
// TODO: use usync to handle this entire mess
|
|
206
|
+
if (!fromJid || (!isLidUser(toJid) && !isHostedLidUser(toJid)))
|
|
207
|
+
return { migrated: 0, skipped: 0, total: 0 };
|
|
208
|
+
// Only support PN to LID migration
|
|
209
|
+
if (!isPnUser(fromJid) && !isHostedPnUser(fromJid)) {
|
|
210
|
+
return { migrated: 0, skipped: 0, total: 1 };
|
|
211
|
+
}
|
|
212
|
+
const { user } = jidDecode(fromJid);
|
|
213
|
+
logger.debug({ fromJid }, 'bulk device migration - loading all user devices');
|
|
214
|
+
// Get user's device list from storage
|
|
215
|
+
const { [user]: userDevices } = await parsedKeys.get('device-list', [user]);
|
|
216
|
+
if (!userDevices) {
|
|
217
|
+
return { migrated: 0, skipped: 0, total: 0 };
|
|
218
|
+
}
|
|
219
|
+
const { device: fromDevice } = jidDecode(fromJid);
|
|
220
|
+
const fromDeviceStr = fromDevice?.toString() || '0';
|
|
221
|
+
if (!userDevices.includes(fromDeviceStr)) {
|
|
222
|
+
userDevices.push(fromDeviceStr);
|
|
223
|
+
}
|
|
224
|
+
// Filter out cached devices before database fetch
|
|
225
|
+
const uncachedDevices = userDevices.filter(device => {
|
|
226
|
+
const deviceKey = `${user}.${device}`;
|
|
227
|
+
return !migratedSessionCache.has(deviceKey);
|
|
228
|
+
});
|
|
229
|
+
// Bulk check session existence only for uncached devices
|
|
230
|
+
const deviceSessionKeys = uncachedDevices.map(device => `${user}.${device}`);
|
|
231
|
+
const existingSessions = await parsedKeys.get('session', deviceSessionKeys);
|
|
232
|
+
// Step 3: Convert existing sessions to JIDs (only migrate sessions that exist)
|
|
233
|
+
const deviceJids = [];
|
|
234
|
+
for (const [sessionKey, sessionData] of Object.entries(existingSessions)) {
|
|
235
|
+
if (sessionData) {
|
|
236
|
+
// Session exists in storage
|
|
237
|
+
const deviceStr = sessionKey.split('.')[1];
|
|
238
|
+
if (!deviceStr)
|
|
239
|
+
continue;
|
|
240
|
+
const deviceNum = parseInt(deviceStr);
|
|
241
|
+
let jid = deviceNum === 0 ? `${user}@s.whatsapp.net` : `${user}:${deviceNum}@s.whatsapp.net`;
|
|
242
|
+
if (deviceNum === 99) {
|
|
243
|
+
jid = `${user}:99@hosted`;
|
|
244
|
+
}
|
|
245
|
+
deviceJids.push(jid);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
logger.debug({
|
|
249
|
+
fromJid,
|
|
250
|
+
totalDevices: userDevices.length,
|
|
251
|
+
devicesWithSessions: deviceJids.length,
|
|
252
|
+
devices: deviceJids
|
|
253
|
+
}, 'bulk device migration complete - all user devices processed');
|
|
254
|
+
// Single transaction for all migrations
|
|
255
|
+
return parsedKeys.transaction(async () => {
|
|
256
|
+
const migrationOps = deviceJids.map(jid => {
|
|
257
|
+
const lidWithDevice = transferDevice(jid, toJid);
|
|
258
|
+
const fromDecoded = jidDecode(jid);
|
|
259
|
+
const toDecoded = jidDecode(lidWithDevice);
|
|
260
|
+
return {
|
|
261
|
+
fromJid: jid,
|
|
262
|
+
toJid: lidWithDevice,
|
|
263
|
+
pnUser: fromDecoded.user,
|
|
264
|
+
lidUser: toDecoded.user,
|
|
265
|
+
deviceId: fromDecoded.device || 0,
|
|
266
|
+
fromAddr: jidToSignalProtocolAddress(jid),
|
|
267
|
+
toAddr: jidToSignalProtocolAddress(lidWithDevice)
|
|
268
|
+
};
|
|
269
|
+
});
|
|
270
|
+
const totalOps = migrationOps.length;
|
|
271
|
+
let migratedCount = 0;
|
|
272
|
+
// Bulk fetch PN sessions - already exist (verified during device discovery)
|
|
273
|
+
const pnAddrStrings = Array.from(new Set(migrationOps.map(op => op.fromAddr.toString())));
|
|
274
|
+
const pnSessions = await parsedKeys.get('session', pnAddrStrings);
|
|
275
|
+
// Prepare bulk session updates (PN → LID migration + deletion)
|
|
276
|
+
const sessionUpdates = {};
|
|
277
|
+
for (const op of migrationOps) {
|
|
278
|
+
const pnAddrStr = op.fromAddr.toString();
|
|
279
|
+
const lidAddrStr = op.toAddr.toString();
|
|
280
|
+
const pnSession = pnSessions[pnAddrStr];
|
|
281
|
+
if (pnSession) {
|
|
282
|
+
// Session exists (guaranteed from device discovery)
|
|
283
|
+
const fromSession = libsignal.SessionRecord.deserialize(pnSession);
|
|
284
|
+
if (fromSession.haveOpenSession()) {
|
|
285
|
+
// Queue for bulk update: copy to LID, delete from PN
|
|
286
|
+
sessionUpdates[lidAddrStr] = fromSession.serialize();
|
|
287
|
+
sessionUpdates[pnAddrStr] = null;
|
|
288
|
+
migratedCount++;
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
// Single bulk session update for all migrations
|
|
293
|
+
if (Object.keys(sessionUpdates).length > 0) {
|
|
294
|
+
await parsedKeys.set({ session: sessionUpdates });
|
|
295
|
+
logger.debug({ migratedSessions: migratedCount }, 'bulk session migration complete');
|
|
296
|
+
// Cache device-level migrations
|
|
297
|
+
for (const op of migrationOps) {
|
|
298
|
+
if (sessionUpdates[op.toAddr.toString()]) {
|
|
299
|
+
const deviceKey = `${op.pnUser}.${op.deviceId}`;
|
|
300
|
+
migratedSessionCache.set(deviceKey, true);
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
const skippedCount = totalOps - migratedCount;
|
|
305
|
+
return { migrated: migratedCount, skipped: skippedCount, total: totalOps };
|
|
306
|
+
}, `migrate-${deviceJids.length}-sessions-${jidDecode(toJid)?.user}`);
|
|
110
307
|
}
|
|
111
308
|
};
|
|
309
|
+
return repository;
|
|
112
310
|
}
|
|
113
311
|
const jidToSignalProtocolAddress = (jid) => {
|
|
114
|
-
const
|
|
115
|
-
|
|
312
|
+
const decoded = jidDecode(jid);
|
|
313
|
+
const { user, device, server, domainType } = decoded;
|
|
314
|
+
if (!user) {
|
|
315
|
+
throw new Error(`JID decoded but user is empty: "${jid}" -> user: "${user}", server: "${server}", device: ${device}`);
|
|
316
|
+
}
|
|
317
|
+
const signalUser = domainType !== WAJIDDomains.WHATSAPP ? `${user}_${domainType}` : user;
|
|
318
|
+
const finalDevice = device || 0;
|
|
319
|
+
if (device === 99 && decoded.server !== 'hosted' && decoded.server !== 'hosted.lid') {
|
|
320
|
+
throw new Error('Unexpected non-hosted device JID with device 99. This ID seems invalid. ID:' + jid);
|
|
321
|
+
}
|
|
322
|
+
return new libsignal.ProtocolAddress(signalUser, finalDevice);
|
|
116
323
|
};
|
|
117
324
|
const jidToSignalSenderKeyName = (group, user) => {
|
|
118
|
-
return new
|
|
325
|
+
return new SenderKeyName(group, jidToSignalProtocolAddress(user));
|
|
119
326
|
};
|
|
120
|
-
function signalStorage({ creds, keys }) {
|
|
327
|
+
function signalStorage({ creds, keys }, lidMapping) {
|
|
328
|
+
// Shared function to resolve PN signal address to LID if mapping exists
|
|
329
|
+
const resolveLIDSignalAddress = async (id) => {
|
|
330
|
+
if (id.includes('.')) {
|
|
331
|
+
const [deviceId, device] = id.split('.');
|
|
332
|
+
const [user, domainType_] = deviceId.split('_');
|
|
333
|
+
const domainType = parseInt(domainType_ || '0');
|
|
334
|
+
if (domainType === WAJIDDomains.LID || domainType === WAJIDDomains.HOSTED_LID)
|
|
335
|
+
return id;
|
|
336
|
+
const pnJid = `${user}${device !== '0' ? `:${device}` : ''}@${domainType === WAJIDDomains.HOSTED ? 'hosted' : 's.whatsapp.net'}`;
|
|
337
|
+
const lidForPN = await lidMapping.getLIDForPN(pnJid);
|
|
338
|
+
if (lidForPN) {
|
|
339
|
+
const lidAddr = jidToSignalProtocolAddress(lidForPN);
|
|
340
|
+
return lidAddr.toString();
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
return id;
|
|
344
|
+
};
|
|
121
345
|
return {
|
|
122
346
|
loadSession: async (id) => {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
347
|
+
try {
|
|
348
|
+
const wireJid = await resolveLIDSignalAddress(id);
|
|
349
|
+
const { [wireJid]: sess } = await keys.get('session', [wireJid]);
|
|
350
|
+
if (sess) {
|
|
351
|
+
return libsignal.SessionRecord.deserialize(sess);
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
catch (e) {
|
|
355
|
+
return null;
|
|
126
356
|
}
|
|
357
|
+
return null;
|
|
127
358
|
},
|
|
128
359
|
storeSession: async (id, session) => {
|
|
129
|
-
|
|
360
|
+
const wireJid = await resolveLIDSignalAddress(id);
|
|
361
|
+
await keys.set({ session: { [wireJid]: session.serialize() } });
|
|
130
362
|
},
|
|
131
363
|
isTrustedIdentity: () => {
|
|
132
|
-
return true;
|
|
364
|
+
return true; // TOFU - Trust on First Use (same as WhatsApp Web)
|
|
365
|
+
},
|
|
366
|
+
loadIdentityKey: async (id) => {
|
|
367
|
+
const wireJid = await resolveLIDSignalAddress(id);
|
|
368
|
+
const { [wireJid]: key } = await keys.get('identity-key', [wireJid]);
|
|
369
|
+
return key || undefined;
|
|
370
|
+
},
|
|
371
|
+
saveIdentity: async (id, identityKey) => {
|
|
372
|
+
const wireJid = await resolveLIDSignalAddress(id);
|
|
373
|
+
const { [wireJid]: existingKey } = await keys.get('identity-key', [wireJid]);
|
|
374
|
+
const keysMatch = existingKey?.length === identityKey.length && existingKey.every((byte, i) => byte === identityKey[i]);
|
|
375
|
+
if (existingKey && !keysMatch) {
|
|
376
|
+
// Identity changed - clear session and update key
|
|
377
|
+
await keys.set({
|
|
378
|
+
session: { [wireJid]: null },
|
|
379
|
+
'identity-key': { [wireJid]: identityKey }
|
|
380
|
+
});
|
|
381
|
+
return true;
|
|
382
|
+
}
|
|
383
|
+
if (!existingKey) {
|
|
384
|
+
// New contact - Trust on First Use (TOFU)
|
|
385
|
+
await keys.set({ 'identity-key': { [wireJid]: identityKey } });
|
|
386
|
+
return true;
|
|
387
|
+
}
|
|
388
|
+
return false;
|
|
133
389
|
},
|
|
134
390
|
loadPreKey: async (id) => {
|
|
135
391
|
const keyId = id.toString();
|
|
@@ -153,9 +409,9 @@ function signalStorage({ creds, keys }) {
|
|
|
153
409
|
const keyId = senderKeyName.toString();
|
|
154
410
|
const { [keyId]: key } = await keys.get('sender-key', [keyId]);
|
|
155
411
|
if (key) {
|
|
156
|
-
return
|
|
412
|
+
return SenderKeyRecord.deserialize(key);
|
|
157
413
|
}
|
|
158
|
-
return new
|
|
414
|
+
return new SenderKeyRecord();
|
|
159
415
|
},
|
|
160
416
|
storeSenderKey: async (senderKeyName, key) => {
|
|
161
417
|
const keyId = senderKeyName.toString();
|
|
@@ -167,8 +423,9 @@ function signalStorage({ creds, keys }) {
|
|
|
167
423
|
const { signedIdentityKey } = creds;
|
|
168
424
|
return {
|
|
169
425
|
privKey: Buffer.from(signedIdentityKey.private),
|
|
170
|
-
pubKey: (
|
|
426
|
+
pubKey: Buffer.from(generateSignalPubKey(signedIdentityKey.public))
|
|
171
427
|
};
|
|
172
428
|
}
|
|
173
429
|
};
|
|
174
430
|
}
|
|
431
|
+
//# sourceMappingURL=libsignal.js.map
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { LIDMapping, SignalKeyStoreWithTransaction } from '../Types/index.js';
|
|
2
|
+
import type { ILogger } from '../Utils/logger.js';
|
|
3
|
+
export declare class LIDMappingStore {
|
|
4
|
+
private readonly mappingCache;
|
|
5
|
+
private readonly keys;
|
|
6
|
+
private readonly logger;
|
|
7
|
+
private pnToLIDFunc?;
|
|
8
|
+
private readonly inflightLIDLookups;
|
|
9
|
+
private readonly inflightPNLookups;
|
|
10
|
+
constructor(keys: SignalKeyStoreWithTransaction, logger: ILogger, pnToLIDFunc?: (jids: string[]) => Promise<LIDMapping[] | undefined>);
|
|
11
|
+
storeLIDPNMappings(pairs: LIDMapping[]): Promise<void>;
|
|
12
|
+
getLIDForPN(pn: string): Promise<string | null>;
|
|
13
|
+
getLIDsForPNs(pns: string[]): Promise<LIDMapping[] | null>;
|
|
14
|
+
private _getLIDsForPNsImpl;
|
|
15
|
+
getPNForLID(lid: string): Promise<string | null>;
|
|
16
|
+
getPNsForLIDs(lids: string[]): Promise<LIDMapping[] | null>;
|
|
17
|
+
private _getPNsForLIDsImpl;
|
|
18
|
+
/**
|
|
19
|
+
* Close the cache and release resources
|
|
20
|
+
*/
|
|
21
|
+
close(): void;
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=lid-mapping.d.ts.map
|