@mrlegendbot/baileys 1.2.4 → 1.2.6
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/fix-imports.js +85 -0
- package/WAProto/index.d.ts +14017 -0
- package/WAProto/index.js +97691 -2
- package/lib/Defaults/index.d.ts +75 -0
- package/lib/Defaults/index.js +92 -89
- package/lib/Menu/index.d.ts +42 -0
- package/lib/Menu/index.js +283 -0
- package/lib/Signal/Group/ciphertext-message.d.ts +10 -0
- package/lib/Signal/Group/ciphertext-message.js +10 -9
- package/lib/Signal/Group/group-session-builder.d.ts +15 -0
- package/lib/Signal/Group/group-session-builder.js +22 -21
- package/lib/Signal/Group/group_cipher.d.ts +17 -0
- package/lib/Signal/Group/group_cipher.js +69 -75
- package/lib/Signal/Group/index.d.ts +12 -0
- package/lib/Signal/Group/index.js +1 -0
- package/lib/Signal/Group/keyhelper.d.ts +11 -0
- package/lib/Signal/Group/keyhelper.js +10 -9
- package/lib/Signal/Group/sender-chain-key.d.ts +14 -0
- package/lib/Signal/Group/sender-chain-key.js +22 -21
- package/lib/Signal/Group/sender-key-distribution-message.d.ts +17 -0
- package/lib/Signal/Group/sender-key-distribution-message.js +60 -51
- package/lib/Signal/Group/sender-key-message.d.ts +19 -0
- package/lib/Signal/Group/sender-key-message.js +62 -56
- package/lib/Signal/Group/sender-key-name.d.ts +18 -0
- package/lib/Signal/Group/sender-key-name.js +40 -38
- package/lib/Signal/Group/sender-key-record.d.ts +31 -0
- package/lib/Signal/Group/sender-key-record.js +34 -33
- package/lib/Signal/Group/sender-key-state.d.ts +39 -0
- package/lib/Signal/Group/sender-key-state.js +76 -72
- package/lib/Signal/Group/sender-message-key.d.ts +12 -0
- package/lib/Signal/Group/sender-message-key.js +23 -22
- package/lib/Signal/libsignal.d.ts +5 -0
- package/lib/Signal/libsignal.js +405 -506
- package/lib/Signal/lid-mapping.d.ts +23 -0
- package/lib/Signal/lid-mapping.js +258 -276
- package/lib/Socket/Client/index.d.ts +3 -0
- package/lib/Socket/Client/index.js +1 -0
- package/lib/Socket/Client/types.d.ts +16 -0
- package/lib/Socket/Client/types.js +7 -6
- package/lib/Socket/Client/websocket.d.ts +13 -0
- package/lib/Socket/Client/websocket.js +49 -48
- package/lib/Socket/business.d.ts +217 -0
- package/lib/Socket/business.js +369 -349
- package/lib/Socket/chats.d.ts +125 -0
- package/lib/Socket/chats.js +1148 -1172
- package/lib/Socket/communities.d.ts +273 -0
- package/lib/Socket/communities.js +413 -473
- package/lib/Socket/groups.d.ts +161 -0
- package/lib/Socket/groups.js +331 -387
- package/lib/Socket/index.d.ts +267 -0
- package/lib/Socket/index.js +19 -6
- package/lib/Socket/messages-recv.d.ts +203 -0
- package/lib/Socket/messages-recv.js +1719 -1782
- package/lib/Socket/messages-send.d.ts +199 -0
- package/lib/Socket/messages-send.js +2451 -1504
- package/lib/Socket/mex.d.ts +3 -0
- package/lib/Socket/mex.js +35 -40
- package/lib/Socket/newsletter.d.ts +170 -0
- package/lib/Socket/newsletter.js +191 -239
- package/lib/Socket/socket.d.ts +59 -0
- package/lib/Socket/socket.js +923 -992
- package/lib/Types/Auth.d.ts +117 -0
- package/lib/Types/Auth.js +1 -0
- package/lib/Types/Bussines.d.ts +25 -0
- package/lib/Types/Bussines.js +1 -0
- package/lib/Types/Call.d.ts +15 -0
- package/lib/Types/Call.js +1 -0
- package/lib/Types/Chat.d.ts +124 -0
- package/lib/Types/Chat.js +8 -1
- package/lib/Types/Contact.d.ts +26 -0
- package/lib/Types/Contact.js +1 -0
- package/lib/Types/Events.d.ts +256 -0
- package/lib/Types/Events.js +2 -1
- package/lib/Types/GroupMetadata.d.ts +71 -0
- package/lib/Types/GroupMetadata.js +1 -0
- package/lib/Types/Label.d.ts +47 -0
- package/lib/Types/Label.js +22 -20
- package/lib/Types/LabelAssociation.d.ts +30 -0
- package/lib/Types/LabelAssociation.js +4 -2
- package/lib/Types/Message.d.ts +320 -0
- package/lib/Types/Message.js +5 -3
- package/lib/Types/Mex.d.ts +141 -0
- package/lib/Types/Mex.js +31 -26
- package/lib/Types/Product.d.ts +79 -0
- package/lib/Types/Product.js +1 -0
- package/lib/Types/Signal.d.ts +87 -0
- package/lib/Types/Signal.js +2 -1
- package/lib/Types/Socket.d.ts +136 -0
- package/lib/Types/Socket.js +3 -2
- package/lib/Types/State.d.ts +97 -0
- package/lib/Types/State.js +52 -4
- package/lib/Types/USync.d.ts +26 -0
- package/lib/Types/USync.js +1 -0
- package/lib/Types/index.d.ts +66 -0
- package/lib/Types/index.js +11 -10
- package/lib/Utils/auth-utils.d.ts +24 -0
- package/lib/Utils/auth-utils.js +277 -240
- package/lib/Utils/browser-utils.d.ts +4 -0
- package/lib/Utils/browser-utils.js +23 -20
- package/lib/Utils/business.d.ts +23 -0
- package/lib/Utils/business.js +204 -200
- package/lib/Utils/chat-utils.d.ts +100 -0
- package/lib/Utils/chat-utils.js +810 -836
- package/lib/Utils/companion-reg-client-utils.d.ts +17 -0
- package/lib/Utils/companion-reg-client-utils.js +25 -23
- package/lib/Utils/crypto.d.ts +37 -0
- package/lib/Utils/crypto.js +86 -70
- package/lib/Utils/decode-wa-message.d.ts +66 -0
- package/lib/Utils/decode-wa-message.js +284 -277
- package/lib/Utils/event-buffer.d.ts +36 -0
- package/lib/Utils/event-buffer.js +595 -592
- package/lib/Utils/generics.d.ts +92 -0
- package/lib/Utils/generics.js +335 -312
- package/lib/Utils/history.d.ts +24 -0
- package/lib/Utils/history.js +115 -123
- 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 -0
- package/lib/Utils/index.js +2 -1
- package/lib/Utils/link-preview.d.ts +21 -0
- package/lib/Utils/link-preview.js +73 -74
- package/lib/Utils/logger.d.ts +12 -0
- package/lib/Utils/logger.js +2 -3
- package/lib/Utils/lt-hash.d.ts +8 -0
- package/lib/Utils/lt-hash.js +6 -0
- package/lib/Utils/make-mutex.d.ts +9 -0
- package/lib/Utils/make-mutex.js +27 -27
- package/lib/Utils/message-retry-manager.d.ts +115 -0
- package/lib/Utils/message-retry-manager.js +254 -213
- package/lib/Utils/messages-media.d.ts +133 -0
- package/lib/Utils/messages-media.js +715 -741
- package/lib/Utils/messages.d.ts +91 -0
- package/lib/Utils/messages.js +827 -791
- package/lib/Utils/noise-handler.d.ts +20 -0
- package/lib/Utils/noise-handler.js +187 -215
- 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 +98 -69
- package/lib/Utils/process-message.d.ts +60 -0
- package/lib/Utils/process-message.js +586 -617
- package/lib/Utils/reporting-utils.d.ts +11 -0
- package/lib/Utils/reporting-utils.js +234 -553
- package/lib/Utils/signal.d.ts +47 -0
- package/lib/Utils/signal.js +170 -217
- package/lib/Utils/stanza-ack.d.ts +11 -0
- package/lib/Utils/stanza-ack.js +35 -27
- package/lib/Utils/sync-action-utils.d.ts +19 -0
- package/lib/Utils/sync-action-utils.js +41 -37
- package/lib/Utils/tc-token-utils.d.ts +37 -0
- package/lib/Utils/tc-token-utils.js +141 -120
- package/lib/Utils/use-multi-file-auth-state.d.ts +13 -0
- package/lib/Utils/use-multi-file-auth-state.js +105 -87
- package/lib/Utils/validate-connection.d.ts +11 -0
- package/lib/Utils/validate-connection.js +188 -190
- package/lib/WABinary/constants.d.ts +28 -0
- package/lib/WABinary/constants.js +1294 -28
- package/lib/WABinary/decode.d.ts +7 -0
- package/lib/WABinary/decode.js +249 -245
- package/lib/WABinary/encode.d.ts +3 -0
- package/lib/WABinary/encode.js +206 -201
- package/lib/WABinary/generic-utils.d.ts +15 -0
- package/lib/WABinary/generic-utils.js +89 -86
- package/lib/WABinary/index.d.ts +6 -0
- package/lib/WABinary/index.js +1 -0
- package/lib/WABinary/jid-utils.d.ts +48 -0
- package/lib/WABinary/jid-utils.js +77 -68
- package/lib/WABinary/types.d.ts +19 -0
- package/lib/WABinary/types.js +1 -0
- package/lib/WAM/BinaryInfo.d.ts +9 -0
- package/lib/WAM/BinaryInfo.js +8 -7
- package/lib/WAM/constants.d.ts +40 -0
- package/lib/WAM/constants.js +22853 -19892
- package/lib/WAM/encode.d.ts +3 -0
- package/lib/WAM/encode.js +132 -121
- package/lib/WAM/index.d.ts +4 -0
- package/lib/WAM/index.js +1 -0
- package/lib/WAUSync/Protocols/USyncContactProtocol.d.ts +10 -0
- package/lib/WAUSync/Protocols/USyncContactProtocol.js +43 -46
- package/lib/WAUSync/Protocols/USyncDeviceProtocol.d.ts +23 -0
- package/lib/WAUSync/Protocols/USyncDeviceProtocol.js +48 -47
- package/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.d.ts +13 -0
- package/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.js +23 -22
- package/lib/WAUSync/Protocols/USyncStatusProtocol.d.ts +13 -0
- package/lib/WAUSync/Protocols/USyncStatusProtocol.js +33 -30
- package/lib/WAUSync/Protocols/USyncUsernameProtocol.d.ts +10 -0
- package/lib/WAUSync/Protocols/USyncUsernameProtocol.js +20 -19
- package/lib/WAUSync/Protocols/UsyncBotProfileProtocol.d.ts +26 -0
- package/lib/WAUSync/Protocols/UsyncBotProfileProtocol.js +44 -53
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts +10 -0
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.js +24 -24
- package/lib/WAUSync/Protocols/index.d.ts +6 -0
- package/lib/WAUSync/Protocols/index.js +1 -0
- package/lib/WAUSync/USyncQuery.d.ts +30 -0
- package/lib/WAUSync/USyncQuery.js +88 -79
- package/lib/WAUSync/USyncUser.d.ts +17 -0
- package/lib/WAUSync/USyncUser.js +29 -28
- package/lib/WAUSync/index.d.ts +4 -0
- package/lib/WAUSync/index.js +1 -0
- package/lib/index.d.ts +12 -0
- package/lib/index.js +2 -2
- package/package.json +86 -22
- package/README.upstream.md +0 -1312
- package/WAProto/WAProto.json +0 -1
- package/WAProto/WAProto.proto +0 -6275
- package/WAProto/compiler.js +0 -550
- package/lib/Store/index.js +0 -8
- package/lib/Store/keyed-db.js +0 -108
- package/lib/Store/make-cache-manager-store.js +0 -70
- package/lib/Store/make-in-memory-store.js +0 -417
- package/lib/Store/make-ordered-dictionary.js +0 -69
- package/lib/Store/object-repository.js +0 -27
- package/lib/Utils/use-sqlite-auth-state.js +0 -162
package/lib/Signal/libsignal.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
// @ts-ignore
|
|
1
2
|
import * as libsignal from 'libsignal';
|
|
3
|
+
// @ts-ignore
|
|
2
4
|
import { PreKeyWhisperMessage } from 'libsignal/src/protobufs.js';
|
|
3
5
|
import { LRUCache } from 'lru-cache';
|
|
4
6
|
import { generateSignalPubKey } from '../Utils/index.js';
|
|
@@ -7,526 +9,423 @@ import { SenderKeyName } from './Group/sender-key-name.js';
|
|
|
7
9
|
import { SenderKeyRecord } from './Group/sender-key-record.js';
|
|
8
10
|
import { GroupCipher, GroupSessionBuilder, SenderKeyDistributionMessage } from './Group/index.js';
|
|
9
11
|
import { LIDMappingStore } from './lid-mapping.js';
|
|
12
|
+
/** Extract identity key from PreKeyWhisperMessage for identity change detection */
|
|
10
13
|
function extractIdentityFromPkmsg(ciphertext) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
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;
|
|
18
29
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
return new Uint8Array(preKeyProto.identityKey);
|
|
30
|
+
catch {
|
|
31
|
+
return undefined;
|
|
22
32
|
}
|
|
23
|
-
return undefined;
|
|
24
|
-
} catch {
|
|
25
|
-
return undefined;
|
|
26
|
-
}
|
|
27
33
|
}
|
|
28
34
|
export function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
[senderNameStr]: senderKey
|
|
42
|
-
} = await auth.keys.get('sender-key', [senderNameStr]);
|
|
43
|
-
if (!senderKey) {
|
|
44
|
-
await storage.storeSenderKey(senderName, new SenderKeyRecord());
|
|
45
|
-
}
|
|
46
|
-
const skdm = await new GroupSessionBuilder(storage).create(senderName);
|
|
47
|
-
return {
|
|
48
|
-
senderName,
|
|
49
|
-
skdm
|
|
50
|
-
};
|
|
51
|
-
};
|
|
52
|
-
const repository = {
|
|
53
|
-
decryptGroupMessage({
|
|
54
|
-
group,
|
|
55
|
-
authorJid,
|
|
56
|
-
msg
|
|
57
|
-
}) {
|
|
58
|
-
const senderName = jidToSignalSenderKeyName(group, authorJid);
|
|
59
|
-
const cipher = new GroupCipher(storage, senderName);
|
|
60
|
-
return parsedKeys.transaction(async () => {
|
|
61
|
-
return cipher.decrypt(msg);
|
|
62
|
-
}, group);
|
|
63
|
-
},
|
|
64
|
-
async processSenderKeyDistributionMessage({
|
|
65
|
-
item,
|
|
66
|
-
authorJid
|
|
67
|
-
}) {
|
|
68
|
-
const builder = new GroupSessionBuilder(storage);
|
|
69
|
-
if (!item.groupId) {
|
|
70
|
-
throw new Error('Group ID is required for sender key distribution message');
|
|
71
|
-
}
|
|
72
|
-
const senderName = jidToSignalSenderKeyName(item.groupId, authorJid);
|
|
73
|
-
const senderMsg = new SenderKeyDistributionMessage(null, null, null, null, item.axolotlSenderKeyDistributionMessage);
|
|
74
|
-
const senderNameStr = senderName.toString();
|
|
75
|
-
const {
|
|
76
|
-
[senderNameStr]: senderKey
|
|
77
|
-
} = await auth.keys.get('sender-key', [senderNameStr]);
|
|
78
|
-
if (!senderKey) {
|
|
79
|
-
await storage.storeSenderKey(senderName, new SenderKeyRecord());
|
|
80
|
-
}
|
|
81
|
-
return parsedKeys.transaction(async () => {
|
|
82
|
-
const {
|
|
83
|
-
[senderNameStr]: senderKey
|
|
84
|
-
} = await auth.keys.get('sender-key', [senderNameStr]);
|
|
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]);
|
|
85
47
|
if (!senderKey) {
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
await builder.process(senderName, senderMsg);
|
|
89
|
-
}, item.groupId);
|
|
90
|
-
},
|
|
91
|
-
async decryptMessage({
|
|
92
|
-
jid,
|
|
93
|
-
type,
|
|
94
|
-
ciphertext
|
|
95
|
-
}) {
|
|
96
|
-
const addr = jidToSignalProtocolAddress(jid);
|
|
97
|
-
const session = new libsignal.SessionCipher(storage, addr);
|
|
98
|
-
if (type === 'pkmsg') {
|
|
99
|
-
const identityKey = extractIdentityFromPkmsg(ciphertext);
|
|
100
|
-
if (identityKey) {
|
|
101
|
-
const addrStr = addr.toString();
|
|
102
|
-
const identityChanged = await storage.saveIdentity(addrStr, identityKey);
|
|
103
|
-
if (identityChanged) {
|
|
104
|
-
logger.info({
|
|
105
|
-
jid,
|
|
106
|
-
addr: addrStr
|
|
107
|
-
}, 'identity key changed or new contact, session will be re-established');
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
async function doDecrypt() {
|
|
112
|
-
let result;
|
|
113
|
-
switch (type) {
|
|
114
|
-
case 'pkmsg':
|
|
115
|
-
result = await session.decryptPreKeyWhisperMessage(ciphertext);
|
|
116
|
-
break;
|
|
117
|
-
case 'msg':
|
|
118
|
-
result = await session.decryptWhisperMessage(ciphertext);
|
|
119
|
-
break;
|
|
120
|
-
}
|
|
121
|
-
return result;
|
|
122
|
-
}
|
|
123
|
-
return parsedKeys.transaction(async () => {
|
|
124
|
-
return await doDecrypt();
|
|
125
|
-
}, jid);
|
|
126
|
-
},
|
|
127
|
-
async encryptMessage({
|
|
128
|
-
jid,
|
|
129
|
-
data
|
|
130
|
-
}) {
|
|
131
|
-
const addr = jidToSignalProtocolAddress(jid);
|
|
132
|
-
const cipher = new libsignal.SessionCipher(storage, addr);
|
|
133
|
-
return parsedKeys.transaction(async () => {
|
|
134
|
-
const {
|
|
135
|
-
type: sigType,
|
|
136
|
-
body
|
|
137
|
-
} = await cipher.encrypt(data);
|
|
138
|
-
const type = sigType === 3 ? 'pkmsg' : 'msg';
|
|
139
|
-
return {
|
|
140
|
-
type,
|
|
141
|
-
ciphertext: Buffer.from(body, 'binary')
|
|
142
|
-
};
|
|
143
|
-
}, jid);
|
|
144
|
-
},
|
|
145
|
-
async encryptGroupMessage({
|
|
146
|
-
group,
|
|
147
|
-
meId,
|
|
148
|
-
data
|
|
149
|
-
}) {
|
|
150
|
-
return parsedKeys.transaction(async () => {
|
|
151
|
-
const {
|
|
152
|
-
senderName,
|
|
153
|
-
skdm
|
|
154
|
-
} = await ensureSenderKeyAndCreateSkdm(group, meId);
|
|
155
|
-
const ciphertext = await new GroupCipher(storage, senderName).encrypt(data);
|
|
156
|
-
return {
|
|
157
|
-
ciphertext,
|
|
158
|
-
senderKeyDistributionMessage: skdm.serialize()
|
|
159
|
-
};
|
|
160
|
-
}, group);
|
|
161
|
-
},
|
|
162
|
-
async getSenderKeyDistributionMessage({
|
|
163
|
-
group,
|
|
164
|
-
meId
|
|
165
|
-
}) {
|
|
166
|
-
return parsedKeys.transaction(async () => {
|
|
167
|
-
const {
|
|
168
|
-
skdm
|
|
169
|
-
} = await ensureSenderKeyAndCreateSkdm(group, meId);
|
|
170
|
-
return skdm.serialize();
|
|
171
|
-
}, group);
|
|
172
|
-
},
|
|
173
|
-
async hasSenderKey({
|
|
174
|
-
group,
|
|
175
|
-
meId
|
|
176
|
-
}) {
|
|
177
|
-
const senderName = jidToSignalSenderKeyName(group, meId).toString();
|
|
178
|
-
const {
|
|
179
|
-
[senderName]: key
|
|
180
|
-
} = await auth.keys.get('sender-key', [senderName]);
|
|
181
|
-
return !!key;
|
|
182
|
-
},
|
|
183
|
-
async getSessionInfo(jid) {
|
|
184
|
-
const addr = jidToSignalProtocolAddress(jid).toString();
|
|
185
|
-
const session = await storage.loadSession(addr);
|
|
186
|
-
if (!session) {
|
|
187
|
-
return null;
|
|
188
|
-
}
|
|
189
|
-
const open = session.getOpenSession?.();
|
|
190
|
-
const baseKey = open?.indexInfo?.baseKey;
|
|
191
|
-
const registrationId = open?.registrationId;
|
|
192
|
-
if (!baseKey || typeof registrationId !== 'number') {
|
|
193
|
-
return null;
|
|
194
|
-
}
|
|
195
|
-
return {
|
|
196
|
-
baseKey: new Uint8Array(baseKey),
|
|
197
|
-
registrationId
|
|
198
|
-
};
|
|
199
|
-
},
|
|
200
|
-
async injectE2ESession({
|
|
201
|
-
jid,
|
|
202
|
-
session
|
|
203
|
-
}) {
|
|
204
|
-
logger.trace({
|
|
205
|
-
jid
|
|
206
|
-
}, 'injecting E2EE session');
|
|
207
|
-
const cipher = new libsignal.SessionBuilder(storage, jidToSignalProtocolAddress(jid));
|
|
208
|
-
return parsedKeys.transaction(async () => {
|
|
209
|
-
await cipher.initOutgoing(session);
|
|
210
|
-
}, jid);
|
|
211
|
-
},
|
|
212
|
-
jidToSignalProtocolAddress(jid) {
|
|
213
|
-
return jidToSignalProtocolAddress(jid).toString();
|
|
214
|
-
},
|
|
215
|
-
lidMapping,
|
|
216
|
-
async validateSession(jid) {
|
|
217
|
-
try {
|
|
218
|
-
const addr = jidToSignalProtocolAddress(jid);
|
|
219
|
-
const session = await storage.loadSession(addr.toString());
|
|
220
|
-
if (!session) {
|
|
221
|
-
return {
|
|
222
|
-
exists: false,
|
|
223
|
-
reason: 'no session'
|
|
224
|
-
};
|
|
225
|
-
}
|
|
226
|
-
if (!session.haveOpenSession()) {
|
|
227
|
-
return {
|
|
228
|
-
exists: false,
|
|
229
|
-
reason: 'no open session'
|
|
230
|
-
};
|
|
48
|
+
await storage.storeSenderKey(senderName, new SenderKeyRecord());
|
|
231
49
|
}
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
});
|
|
249
|
-
return parsedKeys.transaction(async () => {
|
|
250
|
-
await auth.keys.set({
|
|
251
|
-
session: sessionUpdates
|
|
252
|
-
});
|
|
253
|
-
}, `delete-${jids.length}-sessions`);
|
|
254
|
-
},
|
|
255
|
-
close() {
|
|
256
|
-
migratedSessionCache.clear();
|
|
257
|
-
lidMapping.close();
|
|
258
|
-
},
|
|
259
|
-
async migrateSession(fromJid, toJid) {
|
|
260
|
-
if (!fromJid || !isLidUser(toJid) && !isHostedLidUser(toJid)) return {
|
|
261
|
-
migrated: 0,
|
|
262
|
-
skipped: 0,
|
|
263
|
-
total: 0
|
|
264
|
-
};
|
|
265
|
-
if (!isPnUser(fromJid) && !isHostedPnUser(fromJid)) {
|
|
266
|
-
return {
|
|
267
|
-
migrated: 0,
|
|
268
|
-
skipped: 0,
|
|
269
|
-
total: 1
|
|
270
|
-
};
|
|
271
|
-
}
|
|
272
|
-
const {
|
|
273
|
-
user
|
|
274
|
-
} = jidDecode(fromJid);
|
|
275
|
-
logger.debug({
|
|
276
|
-
fromJid
|
|
277
|
-
}, 'bulk device migration - loading all user devices');
|
|
278
|
-
const {
|
|
279
|
-
[user]: userDevices
|
|
280
|
-
} = await parsedKeys.get('device-list', [user]);
|
|
281
|
-
if (!userDevices) {
|
|
282
|
-
return {
|
|
283
|
-
migrated: 0,
|
|
284
|
-
skipped: 0,
|
|
285
|
-
total: 0
|
|
286
|
-
};
|
|
287
|
-
}
|
|
288
|
-
const {
|
|
289
|
-
device: fromDevice
|
|
290
|
-
} = jidDecode(fromJid);
|
|
291
|
-
const fromDeviceStr = fromDevice?.toString() || '0';
|
|
292
|
-
if (!userDevices.includes(fromDeviceStr)) {
|
|
293
|
-
userDevices.push(fromDeviceStr);
|
|
294
|
-
}
|
|
295
|
-
const uncachedDevices = userDevices.filter(device => {
|
|
296
|
-
const deviceKey = `${user}.${device}`;
|
|
297
|
-
return !migratedSessionCache.has(deviceKey);
|
|
298
|
-
});
|
|
299
|
-
const deviceSessionKeys = uncachedDevices.map(device => `${user}.${device}`);
|
|
300
|
-
const existingSessions = await parsedKeys.get('session', deviceSessionKeys);
|
|
301
|
-
const deviceJids = [];
|
|
302
|
-
for (const [sessionKey, sessionData] of Object.entries(existingSessions)) {
|
|
303
|
-
if (sessionData) {
|
|
304
|
-
const deviceStr = sessionKey.split('.')[1];
|
|
305
|
-
if (!deviceStr) continue;
|
|
306
|
-
const deviceNum = parseInt(deviceStr);
|
|
307
|
-
let jid = deviceNum === 0 ? `${user}@s.whatsapp.net` : `${user}:${deviceNum}@s.whatsapp.net`;
|
|
308
|
-
if (deviceNum === 99) {
|
|
309
|
-
jid = `${user}:99@hosted`;
|
|
310
|
-
}
|
|
311
|
-
deviceJids.push(jid);
|
|
312
|
-
}
|
|
313
|
-
}
|
|
314
|
-
logger.debug({
|
|
315
|
-
fromJid,
|
|
316
|
-
totalDevices: userDevices.length,
|
|
317
|
-
devicesWithSessions: deviceJids.length,
|
|
318
|
-
devices: deviceJids
|
|
319
|
-
}, 'bulk device migration complete - all user devices processed');
|
|
320
|
-
return parsedKeys.transaction(async () => {
|
|
321
|
-
const migrationOps = deviceJids.map(jid => {
|
|
322
|
-
const lidWithDevice = transferDevice(jid, toJid);
|
|
323
|
-
const fromDecoded = jidDecode(jid);
|
|
324
|
-
const toDecoded = jidDecode(lidWithDevice);
|
|
325
|
-
return {
|
|
326
|
-
fromJid: jid,
|
|
327
|
-
toJid: lidWithDevice,
|
|
328
|
-
pnUser: fromDecoded.user,
|
|
329
|
-
lidUser: toDecoded.user,
|
|
330
|
-
deviceId: fromDecoded.device || 0,
|
|
331
|
-
fromAddr: jidToSignalProtocolAddress(jid),
|
|
332
|
-
toAddr: jidToSignalProtocolAddress(lidWithDevice)
|
|
333
|
-
};
|
|
334
|
-
});
|
|
335
|
-
const totalOps = migrationOps.length;
|
|
336
|
-
let migratedCount = 0;
|
|
337
|
-
const pnAddrStrings = Array.from(new Set(migrationOps.map(op => op.fromAddr.toString())));
|
|
338
|
-
const pnSessions = await parsedKeys.get('session', pnAddrStrings);
|
|
339
|
-
const sessionUpdates = {};
|
|
340
|
-
for (const op of migrationOps) {
|
|
341
|
-
const pnAddrStr = op.fromAddr.toString();
|
|
342
|
-
const lidAddrStr = op.toAddr.toString();
|
|
343
|
-
const pnSession = pnSessions[pnAddrStr];
|
|
344
|
-
if (pnSession) {
|
|
345
|
-
const fromSession = libsignal.SessionRecord.deserialize(pnSession);
|
|
346
|
-
if (fromSession.haveOpenSession()) {
|
|
347
|
-
sessionUpdates[lidAddrStr] = fromSession.serialize();
|
|
348
|
-
sessionUpdates[pnAddrStr] = null;
|
|
349
|
-
migratedCount++;
|
|
50
|
+
const skdm = await new GroupSessionBuilder(storage).create(senderName);
|
|
51
|
+
return { senderName, skdm };
|
|
52
|
+
};
|
|
53
|
+
const repository = {
|
|
54
|
+
decryptGroupMessage({ group, authorJid, msg }) {
|
|
55
|
+
const senderName = jidToSignalSenderKeyName(group, authorJid);
|
|
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);
|
|
61
|
+
},
|
|
62
|
+
async processSenderKeyDistributionMessage({ item, authorJid }) {
|
|
63
|
+
const builder = new GroupSessionBuilder(storage);
|
|
64
|
+
if (!item.groupId) {
|
|
65
|
+
throw new Error('Group ID is required for sender key distribution message');
|
|
350
66
|
}
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
67
|
+
const senderName = jidToSignalSenderKeyName(item.groupId, authorJid);
|
|
68
|
+
const senderMsg = new SenderKeyDistributionMessage(null, null, null, null, item.axolotlSenderKeyDistributionMessage);
|
|
69
|
+
const senderNameStr = senderName.toString();
|
|
70
|
+
const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
|
|
71
|
+
if (!senderKey) {
|
|
72
|
+
await storage.storeSenderKey(senderName, new SenderKeyRecord());
|
|
73
|
+
}
|
|
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);
|
|
81
|
+
},
|
|
82
|
+
async decryptMessage({ jid, type, ciphertext }) {
|
|
83
|
+
const addr = jidToSignalProtocolAddress(jid);
|
|
84
|
+
const session = new libsignal.SessionCipher(storage, addr);
|
|
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);
|
|
113
|
+
},
|
|
114
|
+
async encryptMessage({ jid, data }) {
|
|
115
|
+
const addr = jidToSignalProtocolAddress(jid);
|
|
116
|
+
const cipher = new libsignal.SessionCipher(storage, addr);
|
|
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);
|
|
123
|
+
},
|
|
124
|
+
async encryptGroupMessage({ group, meId, data }) {
|
|
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;
|
|
147
|
+
}
|
|
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 };
|
|
155
|
+
},
|
|
156
|
+
async injectE2ESession({ jid, session }) {
|
|
157
|
+
logger.trace({ jid }, 'injecting E2EE session');
|
|
158
|
+
const cipher = new libsignal.SessionBuilder(storage, jidToSignalProtocolAddress(jid));
|
|
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);
|
|
164
|
+
},
|
|
165
|
+
jidToSignalProtocolAddress(jid) {
|
|
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 };
|
|
364
211
|
}
|
|
365
|
-
|
|
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}`);
|
|
366
307
|
}
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
migrated: migratedCount,
|
|
370
|
-
skipped: skippedCount,
|
|
371
|
-
total: totalOps
|
|
372
|
-
};
|
|
373
|
-
}, `migrate-${deviceJids.length}-sessions-${jidDecode(toJid)?.user}`);
|
|
374
|
-
}
|
|
375
|
-
};
|
|
376
|
-
return repository;
|
|
308
|
+
};
|
|
309
|
+
return repository;
|
|
377
310
|
}
|
|
378
|
-
const jidToSignalProtocolAddress = jid => {
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
user
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
domainType
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
const finalDevice = device || 0;
|
|
391
|
-
if (device === 99 && decoded.server !== 'hosted' && decoded.server !== 'hosted.lid') {
|
|
392
|
-
throw new Error('Unexpected non-hosted device JID with device 99. This ID seems invalid. ID:' + jid);
|
|
393
|
-
}
|
|
394
|
-
return new libsignal.ProtocolAddress(signalUser, finalDevice);
|
|
311
|
+
const jidToSignalProtocolAddress = (jid) => {
|
|
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);
|
|
395
323
|
};
|
|
396
324
|
const jidToSignalSenderKeyName = (group, user) => {
|
|
397
|
-
|
|
325
|
+
return new SenderKeyName(group, jidToSignalProtocolAddress(user));
|
|
398
326
|
};
|
|
399
|
-
function signalStorage({
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
}
|
|
415
|
-
}
|
|
416
|
-
return id;
|
|
417
|
-
};
|
|
418
|
-
return {
|
|
419
|
-
loadSession: async id => {
|
|
420
|
-
try {
|
|
421
|
-
const wireJid = await resolveLIDSignalAddress(id);
|
|
422
|
-
const {
|
|
423
|
-
[wireJid]: sess
|
|
424
|
-
} = await keys.get('session', [wireJid]);
|
|
425
|
-
if (sess) {
|
|
426
|
-
return libsignal.SessionRecord.deserialize(sess);
|
|
427
|
-
}
|
|
428
|
-
} catch (e) {
|
|
429
|
-
return null;
|
|
430
|
-
}
|
|
431
|
-
return null;
|
|
432
|
-
},
|
|
433
|
-
storeSession: async (id, session) => {
|
|
434
|
-
const wireJid = await resolveLIDSignalAddress(id);
|
|
435
|
-
await keys.set({
|
|
436
|
-
session: {
|
|
437
|
-
[wireJid]: session.serialize()
|
|
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
|
+
}
|
|
438
342
|
}
|
|
439
|
-
|
|
440
|
-
}
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
343
|
+
return id;
|
|
344
|
+
};
|
|
345
|
+
return {
|
|
346
|
+
loadSession: async (id) => {
|
|
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;
|
|
356
|
+
}
|
|
357
|
+
return null;
|
|
358
|
+
},
|
|
359
|
+
storeSession: async (id, session) => {
|
|
360
|
+
const wireJid = await resolveLIDSignalAddress(id);
|
|
361
|
+
await keys.set({ session: { [wireJid]: session.serialize() } });
|
|
362
|
+
},
|
|
363
|
+
isTrustedIdentity: () => {
|
|
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;
|
|
389
|
+
},
|
|
390
|
+
loadPreKey: async (id) => {
|
|
391
|
+
const keyId = id.toString();
|
|
392
|
+
const { [keyId]: key } = await keys.get('pre-key', [keyId]);
|
|
393
|
+
if (key) {
|
|
394
|
+
return {
|
|
395
|
+
privKey: Buffer.from(key.private),
|
|
396
|
+
pubKey: Buffer.from(key.public)
|
|
397
|
+
};
|
|
398
|
+
}
|
|
399
|
+
},
|
|
400
|
+
removePreKey: (id) => keys.set({ 'pre-key': { [id]: null } }),
|
|
401
|
+
loadSignedPreKey: () => {
|
|
402
|
+
const key = creds.signedPreKey;
|
|
403
|
+
return {
|
|
404
|
+
privKey: Buffer.from(key.keyPair.private),
|
|
405
|
+
pubKey: Buffer.from(key.keyPair.public)
|
|
406
|
+
};
|
|
407
|
+
},
|
|
408
|
+
loadSenderKey: async (senderKeyName) => {
|
|
409
|
+
const keyId = senderKeyName.toString();
|
|
410
|
+
const { [keyId]: key } = await keys.get('sender-key', [keyId]);
|
|
411
|
+
if (key) {
|
|
412
|
+
return SenderKeyRecord.deserialize(key);
|
|
413
|
+
}
|
|
414
|
+
return new SenderKeyRecord();
|
|
415
|
+
},
|
|
416
|
+
storeSenderKey: async (senderKeyName, key) => {
|
|
417
|
+
const keyId = senderKeyName.toString();
|
|
418
|
+
const serialized = JSON.stringify(key.serialize());
|
|
419
|
+
await keys.set({ 'sender-key': { [keyId]: Buffer.from(serialized, 'utf-8') } });
|
|
420
|
+
},
|
|
421
|
+
getOurRegistrationId: () => creds.registrationId,
|
|
422
|
+
getOurIdentity: () => {
|
|
423
|
+
const { signedIdentityKey } = creds;
|
|
424
|
+
return {
|
|
425
|
+
privKey: Buffer.from(signedIdentityKey.private),
|
|
426
|
+
pubKey: Buffer.from(generateSignalPubKey(signedIdentityKey.public))
|
|
427
|
+
};
|
|
518
428
|
}
|
|
519
|
-
|
|
520
|
-
},
|
|
521
|
-
getOurRegistrationId: () => creds.registrationId,
|
|
522
|
-
getOurIdentity: () => {
|
|
523
|
-
const {
|
|
524
|
-
signedIdentityKey
|
|
525
|
-
} = creds;
|
|
526
|
-
return {
|
|
527
|
-
privKey: Buffer.from(signedIdentityKey.private),
|
|
528
|
-
pubKey: Buffer.from(generateSignalPubKey(signedIdentityKey.public))
|
|
529
|
-
};
|
|
530
|
-
}
|
|
531
|
-
};
|
|
429
|
+
};
|
|
532
430
|
}
|
|
431
|
+
//# sourceMappingURL=libsignal.js.map
|