@d0v3riz/baileys 6.7.25 → 7.0.0-rc.8
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 +53 -50
- package/WAProto/GenerateStatics.sh +2 -2
- package/WAProto/WAProto.proto +1339 -493
- package/WAProto/fix-imports.js +1 -1
- package/WAProto/index.d.ts +4585 -44041
- package/WAProto/index.js +80831 -148208
- package/lib/Defaults/index.d.ts +13 -3
- package/lib/Defaults/index.d.ts.map +1 -1
- package/lib/Defaults/index.js +27 -13
- package/lib/Defaults/index.js.map +1 -1
- package/lib/Signal/Group/group_cipher.d.ts +1 -2
- package/lib/Signal/Group/group_cipher.d.ts.map +1 -1
- package/lib/Signal/Group/group_cipher.js +29 -41
- 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 +0 -1
- 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 +1 -7
- package/lib/Signal/Group/sender-chain-key.js.map +1 -1
- package/lib/Signal/Group/sender-key-distribution-message.js +2 -2
- package/lib/Signal/Group/sender-key-distribution-message.js.map +1 -1
- package/lib/Signal/Group/sender-key-message.d.ts.map +1 -1
- package/lib/Signal/Group/sender-key-message.js +0 -1
- package/lib/Signal/Group/sender-key-message.js.map +1 -1
- package/lib/Signal/Group/sender-key-record.d.ts +1 -1
- package/lib/Signal/Group/sender-key-record.d.ts.map +1 -1
- package/lib/Signal/Group/sender-key-record.js +2 -11
- package/lib/Signal/Group/sender-key-record.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 +21 -33
- 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 +0 -1
- package/lib/Signal/Group/sender-message-key.js.map +1 -1
- package/lib/Signal/libsignal.d.ts +4 -3
- package/lib/Signal/libsignal.d.ts.map +1 -1
- package/lib/Signal/libsignal.js +243 -42
- package/lib/Signal/libsignal.js.map +1 -1
- package/lib/Signal/lid-mapping.d.ts +23 -0
- package/lib/Signal/lid-mapping.d.ts.map +1 -0
- package/lib/Signal/lid-mapping.js +171 -0
- package/lib/Signal/lid-mapping.js.map +1 -0
- package/lib/Socket/Client/types.d.ts +2 -2
- package/lib/Socket/Client/types.d.ts.map +1 -1
- package/lib/Socket/Client/websocket.d.ts +2 -2
- package/lib/Socket/Client/websocket.d.ts.map +1 -1
- package/lib/Socket/Client/websocket.js +2 -2
- package/lib/Socket/Client/websocket.js.map +1 -1
- package/lib/Socket/business.d.ts +31 -17
- package/lib/Socket/business.d.ts.map +1 -1
- package/lib/Socket/business.js +122 -1
- package/lib/Socket/business.js.map +1 -1
- package/lib/Socket/chats.d.ts +17 -9
- package/lib/Socket/chats.d.ts.map +1 -1
- package/lib/Socket/chats.js +54 -23
- package/lib/Socket/chats.js.map +1 -1
- package/lib/Socket/communities.d.ts +41 -14
- package/lib/Socket/communities.d.ts.map +1 -1
- package/lib/Socket/communities.js +83 -3
- package/lib/Socket/communities.js.map +1 -1
- package/lib/Socket/groups.d.ts +16 -9
- package/lib/Socket/groups.d.ts.map +1 -1
- package/lib/Socket/groups.js +14 -11
- package/lib/Socket/groups.js.map +1 -1
- package/lib/Socket/index.d.ts +41 -14
- package/lib/Socket/index.d.ts.map +1 -1
- package/lib/Socket/index.js +1 -0
- package/lib/Socket/index.js.map +1 -1
- package/lib/Socket/messages-recv.d.ts +26 -16
- package/lib/Socket/messages-recv.d.ts.map +1 -1
- package/lib/Socket/messages-recv.js +512 -311
- package/lib/Socket/messages-recv.js.map +1 -1
- package/lib/Socket/messages-send.d.ts +27 -16
- package/lib/Socket/messages-send.d.ts.map +1 -1
- package/lib/Socket/messages-send.js +394 -133
- package/lib/Socket/messages-send.js.map +1 -1
- package/lib/Socket/newsletter.d.ts +18 -12
- package/lib/Socket/newsletter.d.ts.map +1 -1
- package/lib/Socket/newsletter.js +3 -1
- package/lib/Socket/newsletter.js.map +1 -1
- package/lib/Socket/socket.d.ts +13 -3
- package/lib/Socket/socket.d.ts.map +1 -1
- package/lib/Socket/socket.js +353 -78
- package/lib/Socket/socket.js.map +1 -1
- package/lib/Types/Auth.d.ts +12 -1
- package/lib/Types/Auth.d.ts.map +1 -1
- package/lib/Types/Bussines.d.ts +25 -0
- package/lib/Types/Bussines.d.ts.map +1 -0
- package/lib/Types/Bussines.js +2 -0
- package/lib/Types/Bussines.js.map +1 -0
- package/lib/Types/Chat.d.ts +5 -0
- 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 +8 -5
- package/lib/Types/Events.d.ts.map +1 -1
- package/lib/Types/GroupMetadata.d.ts +7 -4
- package/lib/Types/GroupMetadata.d.ts.map +1 -1
- package/lib/Types/Message.d.ts +38 -12
- package/lib/Types/Message.d.ts.map +1 -1
- package/lib/Types/Message.js +5 -1
- package/lib/Types/Message.js.map +1 -1
- package/lib/Types/Signal.d.ts +18 -0
- package/lib/Types/Signal.d.ts.map +1 -1
- package/lib/Types/Socket.d.ts +24 -13
- package/lib/Types/Socket.d.ts.map +1 -1
- package/lib/Types/Socket.js.map +1 -1
- package/lib/Utils/auth-utils.d.ts +2 -2
- package/lib/Utils/auth-utils.d.ts.map +1 -1
- package/lib/Utils/auth-utils.js +178 -111
- package/lib/Utils/auth-utils.js.map +1 -1
- package/lib/Utils/browser-utils.d.ts +4 -0
- package/lib/Utils/browser-utils.d.ts.map +1 -0
- package/lib/Utils/browser-utils.js +28 -0
- package/lib/Utils/browser-utils.js.map +1 -0
- package/lib/Utils/chat-utils.d.ts +6 -7
- package/lib/Utils/chat-utils.d.ts.map +1 -1
- package/lib/Utils/chat-utils.js +19 -2
- package/lib/Utils/chat-utils.js.map +1 -1
- package/lib/Utils/crypto.d.ts +6 -6
- package/lib/Utils/crypto.d.ts.map +1 -1
- package/lib/Utils/crypto.js +16 -12
- package/lib/Utils/crypto.js.map +1 -1
- package/lib/Utils/decode-wa-message.d.ts +14 -2
- package/lib/Utils/decode-wa-message.d.ts.map +1 -1
- package/lib/Utils/decode-wa-message.js +104 -15
- package/lib/Utils/decode-wa-message.js.map +1 -1
- package/lib/Utils/event-buffer.d.ts +0 -1
- package/lib/Utils/event-buffer.d.ts.map +1 -1
- package/lib/Utils/event-buffer.js +65 -20
- package/lib/Utils/event-buffer.js.map +1 -1
- package/lib/Utils/generics.d.ts +5 -7
- package/lib/Utils/generics.d.ts.map +1 -1
- package/lib/Utils/generics.js +59 -51
- package/lib/Utils/generics.js.map +1 -1
- package/lib/Utils/history.d.ts +8 -9
- package/lib/Utils/history.d.ts.map +1 -1
- package/lib/Utils/history.js +8 -3
- package/lib/Utils/history.js.map +1 -1
- package/lib/Utils/index.d.ts +2 -1
- package/lib/Utils/index.d.ts.map +1 -1
- package/lib/Utils/index.js +2 -1
- package/lib/Utils/index.js.map +1 -1
- package/lib/Utils/link-preview.d.ts +1 -2
- package/lib/Utils/link-preview.d.ts.map +1 -1
- package/lib/Utils/link-preview.js +1 -1
- package/lib/Utils/link-preview.js.map +1 -1
- package/lib/Utils/message-retry-manager.d.ts +82 -0
- package/lib/Utils/message-retry-manager.d.ts.map +1 -0
- package/lib/Utils/message-retry-manager.js +172 -0
- package/lib/Utils/message-retry-manager.js.map +1 -0
- package/lib/Utils/messages-media.d.ts +14 -12
- package/lib/Utils/messages-media.d.ts.map +1 -1
- package/lib/Utils/messages-media.js +48 -24
- package/lib/Utils/messages-media.js.map +1 -1
- package/lib/Utils/messages.d.ts +17 -4
- package/lib/Utils/messages.d.ts.map +1 -1
- package/lib/Utils/messages.js +85 -21
- package/lib/Utils/messages.js.map +1 -1
- package/lib/Utils/noise-handler.js +2 -1
- package/lib/Utils/noise-handler.js.map +1 -1
- package/lib/Utils/pre-key-manager.d.ts +28 -0
- package/lib/Utils/pre-key-manager.d.ts.map +1 -0
- package/lib/Utils/pre-key-manager.js +106 -0
- package/lib/Utils/pre-key-manager.js.map +1 -0
- package/lib/Utils/process-message.d.ts +26 -8
- package/lib/Utils/process-message.d.ts.map +1 -1
- package/lib/Utils/process-message.js +141 -24
- package/lib/Utils/process-message.js.map +1 -1
- package/lib/Utils/signal.d.ts +4 -4
- package/lib/Utils/signal.d.ts.map +1 -1
- package/lib/Utils/signal.js +21 -12
- package/lib/Utils/signal.js.map +1 -1
- package/lib/Utils/validate-connection.d.ts.map +1 -1
- package/lib/Utils/validate-connection.js +50 -14
- package/lib/Utils/validate-connection.js.map +1 -1
- package/lib/WABinary/decode.d.ts.map +1 -1
- package/lib/WABinary/decode.js +12 -2
- package/lib/WABinary/decode.js.map +1 -1
- package/lib/WABinary/generic-utils.js +1 -1
- package/lib/WABinary/generic-utils.js.map +1 -1
- package/lib/WABinary/jid-utils.d.ts +18 -6
- package/lib/WABinary/jid-utils.d.ts.map +1 -1
- package/lib/WABinary/jid-utils.js +52 -8
- package/lib/WABinary/jid-utils.js.map +1 -1
- package/lib/WAM/constants.d.ts +1 -1
- package/lib/WAM/constants.d.ts.map +1 -1
- package/lib/WAM/constants.js +18516 -10904
- package/lib/WAM/constants.js.map +1 -1
- package/lib/WAM/encode.d.ts.map +1 -1
- package/lib/WAM/encode.js +0 -1
- package/lib/WAM/encode.js.map +1 -1
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts +2 -1
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.d.ts.map +1 -1
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.js +10 -2
- package/lib/WAUSync/Protocols/UsyncLIDProtocol.js.map +1 -1
- package/lib/WAUSync/USyncQuery.d.ts +1 -1
- package/lib/WAUSync/USyncQuery.d.ts.map +1 -1
- package/lib/WAUSync/USyncQuery.js +23 -20
- package/lib/WAUSync/USyncQuery.js.map +1 -1
- package/package.json +16 -11
- package/lib/Defaults/baileys-version.json +0 -3
- package/lib/Signal/Group/queue-job.d.ts +0 -2
- package/lib/Signal/Group/queue-job.d.ts.map +0 -1
- package/lib/Signal/Group/queue-job.js +0 -54
- package/lib/Signal/Group/queue-job.js.map +0 -1
- package/lib/Socket/usync.d.ts +0 -37
- package/lib/Socket/usync.d.ts.map +0 -1
- package/lib/Socket/usync.js +0 -63
- package/lib/Socket/usync.js.map +0 -1
- package/lib/Utils/baileys-event-stream.d.ts +0 -17
- package/lib/Utils/baileys-event-stream.d.ts.map +0 -1
- package/lib/Utils/baileys-event-stream.js +0 -56
- package/lib/Utils/baileys-event-stream.js.map +0 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { proto } from '../../WAProto/index.js';
|
|
2
2
|
import { WAMessageStubType } from '../Types/index.js';
|
|
3
3
|
import { getContentType, normalizeMessageContent } from '../Utils/messages.js';
|
|
4
|
-
import { areJidsSameUser, isJidBroadcast, isJidStatusBroadcast, jidNormalizedUser } from '../WABinary/index.js';
|
|
4
|
+
import { areJidsSameUser, isHostedLidUser, isHostedPnUser, isJidBroadcast, isJidStatusBroadcast, isLidUser, jidDecode, jidEncode, jidNormalizedUser } from '../WABinary/index.js';
|
|
5
5
|
import { aesDecryptGCM, hmacSign } from './crypto.js';
|
|
6
|
-
import { toNumber } from './generics.js';
|
|
6
|
+
import { getKeyAuthor, toNumber } from './generics.js';
|
|
7
7
|
import { downloadAndProcessHistorySyncNotification } from './history.js';
|
|
8
8
|
const REAL_MSG_STUB_TYPES = new Set([
|
|
9
9
|
WAMessageStubType.CALL_MISSED_GROUP_VIDEO,
|
|
@@ -13,10 +13,20 @@ const REAL_MSG_STUB_TYPES = new Set([
|
|
|
13
13
|
]);
|
|
14
14
|
const REAL_MSG_REQ_ME_STUB_TYPES = new Set([WAMessageStubType.GROUP_PARTICIPANT_ADD]);
|
|
15
15
|
/** Cleans a received message to further processing */
|
|
16
|
-
export const cleanMessage = (message, meId) => {
|
|
16
|
+
export const cleanMessage = (message, meId, meLid) => {
|
|
17
17
|
// ensure remoteJid and participant doesn't have device or agent in it
|
|
18
|
-
message.key.remoteJid
|
|
19
|
-
|
|
18
|
+
if (isHostedPnUser(message.key.remoteJid) || isHostedLidUser(message.key.remoteJid)) {
|
|
19
|
+
message.key.remoteJid = jidEncode(jidDecode(message.key?.remoteJid)?.user, isHostedPnUser(message.key.remoteJid) ? 's.whatsapp.net' : 'lid');
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
message.key.remoteJid = jidNormalizedUser(message.key.remoteJid);
|
|
23
|
+
}
|
|
24
|
+
if (isHostedPnUser(message.key.participant) || isHostedLidUser(message.key.participant)) {
|
|
25
|
+
message.key.participant = jidEncode(jidDecode(message.key.participant)?.user, isHostedPnUser(message.key.participant) ? 's.whatsapp.net' : 'lid');
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
message.key.participant = jidNormalizedUser(message.key.participant);
|
|
29
|
+
}
|
|
20
30
|
const content = normalizeMessageContent(message.message);
|
|
21
31
|
// if the message has a reaction, ensure fromMe & remoteJid are from our perspective
|
|
22
32
|
if (content?.reactionMessage) {
|
|
@@ -32,24 +42,26 @@ export const cleanMessage = (message, meId) => {
|
|
|
32
42
|
// if the sender believed the message being reacted to is not from them
|
|
33
43
|
// we've to correct the key to be from them, or some other participant
|
|
34
44
|
msgKey.fromMe = !msgKey.fromMe
|
|
35
|
-
? areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId)
|
|
45
|
+
? areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId) ||
|
|
46
|
+
areJidsSameUser(msgKey.participant || msgKey.remoteJid, meLid)
|
|
36
47
|
: // if the message being reacted to, was from them
|
|
37
48
|
// fromMe automatically becomes false
|
|
38
49
|
false;
|
|
39
50
|
// set the remoteJid to being the same as the chat the message came from
|
|
51
|
+
// TODO: investigate inconsistencies
|
|
40
52
|
msgKey.remoteJid = message.key.remoteJid;
|
|
41
53
|
// set participant of the message
|
|
42
54
|
msgKey.participant = msgKey.participant || message.key.participant;
|
|
43
55
|
}
|
|
44
56
|
}
|
|
45
57
|
};
|
|
46
|
-
|
|
58
|
+
// TODO: target:audit AUDIT THIS FUNCTION AGAIN
|
|
59
|
+
export const isRealMessage = (message) => {
|
|
47
60
|
const normalizedContent = normalizeMessageContent(message.message);
|
|
48
61
|
const hasSomeContent = !!getContentType(normalizedContent);
|
|
49
62
|
return ((!!normalizedContent ||
|
|
50
63
|
REAL_MSG_STUB_TYPES.has(message.messageStubType) ||
|
|
51
|
-
|
|
52
|
-
message.messageStubParameters?.some(p => areJidsSameUser(meId, p)))) &&
|
|
64
|
+
REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType)) &&
|
|
53
65
|
hasSomeContent &&
|
|
54
66
|
!normalizedContent?.protocolMessage &&
|
|
55
67
|
!normalizedContent?.reactionMessage &&
|
|
@@ -89,11 +101,34 @@ export function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsg
|
|
|
89
101
|
return Buffer.from(txt);
|
|
90
102
|
}
|
|
91
103
|
}
|
|
92
|
-
|
|
104
|
+
/**
|
|
105
|
+
* Decrypt an event response
|
|
106
|
+
* @param response encrypted event response
|
|
107
|
+
* @param ctx additional info about the event required for decryption
|
|
108
|
+
* @returns event response message
|
|
109
|
+
*/
|
|
110
|
+
export function decryptEventResponse({ encPayload, encIv }, { eventCreatorJid, eventMsgId, eventEncKey, responderJid }) {
|
|
111
|
+
const sign = Buffer.concat([
|
|
112
|
+
toBinary(eventMsgId),
|
|
113
|
+
toBinary(eventCreatorJid),
|
|
114
|
+
toBinary(responderJid),
|
|
115
|
+
toBinary('Event Response'),
|
|
116
|
+
new Uint8Array([1])
|
|
117
|
+
]);
|
|
118
|
+
const key0 = hmacSign(eventEncKey, new Uint8Array(32), 'sha256');
|
|
119
|
+
const decKey = hmacSign(sign, key0, 'sha256');
|
|
120
|
+
const aad = toBinary(`${eventMsgId}\u0000${responderJid}`);
|
|
121
|
+
const decrypted = aesDecryptGCM(encPayload, decKey, encIv, aad);
|
|
122
|
+
return proto.Message.EventResponseMessage.decode(decrypted);
|
|
123
|
+
function toBinary(txt) {
|
|
124
|
+
return Buffer.from(txt);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
const processMessage = async (message, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, signalRepository, keyStore, logger, options, getMessage }) => {
|
|
93
128
|
const meId = creds.me.id;
|
|
94
129
|
const { accountSettings } = creds;
|
|
95
130
|
const chat = { id: jidNormalizedUser(getChatId(message.key)) };
|
|
96
|
-
const isRealMsg = isRealMessage(message
|
|
131
|
+
const isRealMsg = isRealMessage(message);
|
|
97
132
|
if (isRealMsg) {
|
|
98
133
|
chat.messages = [{ message }];
|
|
99
134
|
chat.conversationTimestamp = toNumber(message.messageTimestamp);
|
|
@@ -123,6 +158,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
123
158
|
isLatest
|
|
124
159
|
}, 'got history notification');
|
|
125
160
|
if (process) {
|
|
161
|
+
// TODO: investigate
|
|
126
162
|
if (histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND) {
|
|
127
163
|
ev.emit('creds.update', {
|
|
128
164
|
processedHistoryMessages: [
|
|
@@ -152,7 +188,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
152
188
|
newAppStateSyncKeyId = strKeyId;
|
|
153
189
|
}
|
|
154
190
|
logger?.info({ newAppStateSyncKeyId, newKeys }, 'injecting new app state sync keys');
|
|
155
|
-
});
|
|
191
|
+
}, meId);
|
|
156
192
|
ev.emit('creds.update', { myAppStateKeyId: newAppStateSyncKeyId });
|
|
157
193
|
}
|
|
158
194
|
else {
|
|
@@ -179,7 +215,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
179
215
|
case proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
|
|
180
216
|
const response = protocolMsg.peerDataOperationRequestResponseMessage;
|
|
181
217
|
if (response) {
|
|
182
|
-
placeholderResendCache?.del(response.stanzaId);
|
|
218
|
+
await placeholderResendCache?.del(response.stanzaId);
|
|
183
219
|
// TODO: IMPLEMENT HISTORY SYNC ETC (sticker uploads etc.).
|
|
184
220
|
const { peerDataOperationResult } = response;
|
|
185
221
|
for (const result of peerDataOperationResult) {
|
|
@@ -188,6 +224,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
188
224
|
if (retryResponse) {
|
|
189
225
|
const webMessageInfo = proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes);
|
|
190
226
|
// wait till another upsert event is available, don't want it to be part of the PDO response message
|
|
227
|
+
// TODO: parse through proper message handling utilities (to add relevant key fields)
|
|
191
228
|
setTimeout(() => {
|
|
192
229
|
ev.emit('messages.upsert', {
|
|
193
230
|
messages: [webMessageInfo],
|
|
@@ -217,6 +254,21 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
217
254
|
}
|
|
218
255
|
]);
|
|
219
256
|
break;
|
|
257
|
+
case proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
|
|
258
|
+
const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload;
|
|
259
|
+
const { pnToLidMappings, chatDbMigrationTimestamp } = proto.LIDMigrationMappingSyncPayload.decode(encodedPayload);
|
|
260
|
+
logger?.debug({ pnToLidMappings, chatDbMigrationTimestamp }, 'got lid mappings and chat db migration timestamp');
|
|
261
|
+
const pairs = [];
|
|
262
|
+
for (const { pn, latestLid, assignedLid } of pnToLidMappings) {
|
|
263
|
+
const lid = latestLid || assignedLid;
|
|
264
|
+
pairs.push({ lid: `${lid}@lid`, pn: `${pn}@s.whatsapp.net` });
|
|
265
|
+
}
|
|
266
|
+
await signalRepository.lidMapping.storeLIDPNMappings(pairs);
|
|
267
|
+
if (pairs.length) {
|
|
268
|
+
for (const { pn, lid } of pairs) {
|
|
269
|
+
await signalRepository.migrateSession(pn, lid);
|
|
270
|
+
}
|
|
271
|
+
}
|
|
220
272
|
}
|
|
221
273
|
}
|
|
222
274
|
else if (content?.reactionMessage) {
|
|
@@ -231,26 +283,91 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
231
283
|
}
|
|
232
284
|
]);
|
|
233
285
|
}
|
|
286
|
+
else if (content?.encEventResponseMessage) {
|
|
287
|
+
const encEventResponse = content.encEventResponseMessage;
|
|
288
|
+
const creationMsgKey = encEventResponse.eventCreationMessageKey;
|
|
289
|
+
// we need to fetch the event creation message to get the event enc key
|
|
290
|
+
const eventMsg = await getMessage(creationMsgKey);
|
|
291
|
+
if (eventMsg) {
|
|
292
|
+
try {
|
|
293
|
+
const meIdNormalised = jidNormalizedUser(meId);
|
|
294
|
+
// all jids need to be PN
|
|
295
|
+
const eventCreatorKey = creationMsgKey.participant || creationMsgKey.remoteJid;
|
|
296
|
+
const eventCreatorPn = isLidUser(eventCreatorKey)
|
|
297
|
+
? await signalRepository.lidMapping.getPNForLID(eventCreatorKey)
|
|
298
|
+
: eventCreatorKey;
|
|
299
|
+
const eventCreatorJid = getKeyAuthor({ remoteJid: jidNormalizedUser(eventCreatorPn), fromMe: meIdNormalised === eventCreatorPn }, meIdNormalised);
|
|
300
|
+
const responderJid = getKeyAuthor(message.key, meIdNormalised);
|
|
301
|
+
const eventEncKey = eventMsg?.messageContextInfo?.messageSecret;
|
|
302
|
+
if (!eventEncKey) {
|
|
303
|
+
logger?.warn({ creationMsgKey }, 'event response: missing messageSecret for decryption');
|
|
304
|
+
}
|
|
305
|
+
else {
|
|
306
|
+
const responseMsg = decryptEventResponse(encEventResponse, {
|
|
307
|
+
eventEncKey,
|
|
308
|
+
eventCreatorJid,
|
|
309
|
+
eventMsgId: creationMsgKey.id,
|
|
310
|
+
responderJid
|
|
311
|
+
});
|
|
312
|
+
const eventResponse = {
|
|
313
|
+
eventResponseMessageKey: message.key,
|
|
314
|
+
senderTimestampMs: responseMsg.timestampMs,
|
|
315
|
+
response: responseMsg
|
|
316
|
+
};
|
|
317
|
+
ev.emit('messages.update', [
|
|
318
|
+
{
|
|
319
|
+
key: creationMsgKey,
|
|
320
|
+
update: {
|
|
321
|
+
eventResponses: [eventResponse]
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
]);
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
catch (err) {
|
|
328
|
+
logger?.warn({ err, creationMsgKey }, 'failed to decrypt event response');
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
else {
|
|
332
|
+
logger?.warn({ creationMsgKey }, 'event creation message not found, cannot decrypt response');
|
|
333
|
+
}
|
|
334
|
+
}
|
|
234
335
|
else if (message.messageStubType) {
|
|
235
336
|
const jid = message.key?.remoteJid;
|
|
236
337
|
//let actor = whatsappID (message.participant)
|
|
237
338
|
let participants;
|
|
238
|
-
const emitParticipantsUpdate = (action) => ev.emit('group-participants.update', {
|
|
339
|
+
const emitParticipantsUpdate = (action) => ev.emit('group-participants.update', {
|
|
340
|
+
id: jid,
|
|
341
|
+
author: message.key.participant,
|
|
342
|
+
authorPn: message.key.participantAlt,
|
|
343
|
+
participants,
|
|
344
|
+
action
|
|
345
|
+
});
|
|
239
346
|
const emitGroupUpdate = (update) => {
|
|
240
|
-
ev.emit('groups.update', [
|
|
347
|
+
ev.emit('groups.update', [
|
|
348
|
+
{ id: jid, ...update, author: message.key.participant ?? undefined, authorPn: message.key.participantAlt }
|
|
349
|
+
]);
|
|
241
350
|
};
|
|
242
351
|
const emitGroupRequestJoin = (participant, action, method) => {
|
|
243
|
-
ev.emit('group.join-request', {
|
|
352
|
+
ev.emit('group.join-request', {
|
|
353
|
+
id: jid,
|
|
354
|
+
author: message.key.participant,
|
|
355
|
+
authorPn: message.key.participantAlt,
|
|
356
|
+
participant: participant.lid,
|
|
357
|
+
participantPn: participant.pn,
|
|
358
|
+
action,
|
|
359
|
+
method: method
|
|
360
|
+
});
|
|
244
361
|
};
|
|
245
|
-
const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid));
|
|
362
|
+
const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid.phoneNumber)); // ADD SUPPORT FOR LID
|
|
246
363
|
switch (message.messageStubType) {
|
|
247
364
|
case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
|
|
248
|
-
participants = message.messageStubParameters || [];
|
|
365
|
+
participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
|
|
249
366
|
emitParticipantsUpdate('modify');
|
|
250
367
|
break;
|
|
251
368
|
case WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
|
|
252
369
|
case WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
|
|
253
|
-
participants = message.messageStubParameters || [];
|
|
370
|
+
participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
|
|
254
371
|
emitParticipantsUpdate('remove');
|
|
255
372
|
// mark the chat read only if you left the group
|
|
256
373
|
if (participantsIncludesMe()) {
|
|
@@ -260,18 +377,18 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
260
377
|
case WAMessageStubType.GROUP_PARTICIPANT_ADD:
|
|
261
378
|
case WAMessageStubType.GROUP_PARTICIPANT_INVITE:
|
|
262
379
|
case WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
|
|
263
|
-
participants = message.messageStubParameters || [];
|
|
380
|
+
participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
|
|
264
381
|
if (participantsIncludesMe()) {
|
|
265
382
|
chat.readOnly = false;
|
|
266
383
|
}
|
|
267
384
|
emitParticipantsUpdate('add');
|
|
268
385
|
break;
|
|
269
386
|
case WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
|
|
270
|
-
participants = message.messageStubParameters || [];
|
|
387
|
+
participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
|
|
271
388
|
emitParticipantsUpdate('demote');
|
|
272
389
|
break;
|
|
273
390
|
case WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
|
|
274
|
-
participants = message.messageStubParameters || [];
|
|
391
|
+
participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
|
|
275
392
|
emitParticipantsUpdate('promote');
|
|
276
393
|
break;
|
|
277
394
|
case WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
|
|
@@ -304,8 +421,8 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
|
|
|
304
421
|
const approvalMode = message.messageStubParameters?.[0];
|
|
305
422
|
emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
|
|
306
423
|
break;
|
|
307
|
-
case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
|
|
308
|
-
const participant = message.messageStubParameters?.[0];
|
|
424
|
+
case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD: // TODO: Add other events
|
|
425
|
+
const participant = JSON.parse(message.messageStubParameters?.[0]);
|
|
309
426
|
const action = message.messageStubParameters?.[1];
|
|
310
427
|
const method = message.messageStubParameters?.[2];
|
|
311
428
|
emitGroupRequestJoin(participant, action, method);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-message.js","sourceRoot":"","sources":["../../src/Utils/process-message.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"process-message.js","sourceRoot":"","sources":["../../src/Utils/process-message.ts"],"names":[],"mappings":"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"}
|
package/lib/Utils/signal.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { SignalRepositoryWithLIDStore } from '../Types/index.js';
|
|
2
2
|
import type { AuthenticationCreds, AuthenticationState, KeyPair, SignalIdentity, SignalKeyStore, SignedKeyPair } from '../Types/Auth.js';
|
|
3
|
-
import { type BinaryNode, type
|
|
3
|
+
import { type BinaryNode, type FullJid } from '../WABinary/index.js';
|
|
4
4
|
import type { USyncQueryResultList } from '../WAUSync/index.js';
|
|
5
5
|
export declare const createSignalIdentity: (wid: string, accountSignatureKey: Uint8Array) => SignalIdentity;
|
|
6
6
|
export declare const getPreKeys: ({ get }: SignalKeyStore, min: number, limit: number) => Promise<{
|
|
@@ -15,8 +15,8 @@ export declare const generateOrGetPreKeys: (creds: AuthenticationCreds, range: n
|
|
|
15
15
|
};
|
|
16
16
|
export declare const xmppSignedPreKey: (key: SignedKeyPair) => BinaryNode;
|
|
17
17
|
export declare const xmppPreKey: (pair: KeyPair, id: number) => BinaryNode;
|
|
18
|
-
export declare const parseAndInjectE2ESessions: (node: BinaryNode, repository:
|
|
19
|
-
export declare const extractDeviceJids: (result: USyncQueryResultList[], myJid: string, excludeZeroDevices: boolean) =>
|
|
18
|
+
export declare const parseAndInjectE2ESessions: (node: BinaryNode, repository: SignalRepositoryWithLIDStore) => Promise<void>;
|
|
19
|
+
export declare const extractDeviceJids: (result: USyncQueryResultList[], myJid: string, myLid: string, excludeZeroDevices: boolean) => FullJid[];
|
|
20
20
|
/**
|
|
21
21
|
* get the next N keys for upload or processing
|
|
22
22
|
* @param count number of pre-keys to get or generate
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../src/Utils/signal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"signal.d.ts","sourceRoot":"","sources":["../../src/Utils/signal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAC5D,OAAO,KAAK,EACX,mBAAmB,EACnB,mBAAmB,EACnB,OAAO,EACP,cAAc,EACd,cAAc,EACd,aAAa,EACb,MAAM,eAAe,CAAA;AACtB,OAAO,EAEN,KAAK,UAAU,EACf,KAAK,OAAO,EASZ,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAoC,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAaxF,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,EAAE,qBAAqB,UAAU,KAAG,cAKnF,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,SAAS,cAAc,EAAE,KAAK,MAAM,EAAE,OAAO,MAAM;;EAOnF,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,OAAO,mBAAmB,EAAE,OAAO,MAAM;;;;;;CAgB7E,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,KAAK,aAAa,KAAG,UAQpD,CAAA;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,OAAO,EAAE,IAAI,MAAM,KAAG,UAOrD,CAAA;AAEF,eAAO,MAAM,yBAAyB,GAAU,MAAM,UAAU,EAAE,YAAY,4BAA4B,kBA0CzG,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC7B,QAAQ,oBAAoB,EAAE,EAC9B,OAAO,MAAM,EACb,OAAO,MAAM,EACb,oBAAoB,OAAO,cAkC3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAU,iBAAiB,mBAAmB,EAAE,OAAO,MAAM;;;;;EAavF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,OAAO,mBAAmB,EAAE,OAAO,MAAM;;;EAqBjF,CAAA"}
|
package/lib/Utils/signal.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
|
|
2
|
-
import { assertNodeErrorFree, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildUInt, jidDecode, S_WHATSAPP_NET } from '../WABinary/index.js';
|
|
2
|
+
import { assertNodeErrorFree, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildUInt, getServerFromDomainType, jidDecode, S_WHATSAPP_NET, WAJIDDomains } from '../WABinary/index.js';
|
|
3
3
|
import { Curve, generateSignalPubKey } from './crypto.js';
|
|
4
4
|
import { encodeBigEndian } from './generics.js';
|
|
5
5
|
function chunk(array, size) {
|
|
@@ -75,7 +75,7 @@ export const parseAndInjectE2ESessions = async (node, repository) => {
|
|
|
75
75
|
const chunkSize = 100;
|
|
76
76
|
const chunks = chunk(nodes, chunkSize);
|
|
77
77
|
for (const nodesChunk of chunks) {
|
|
78
|
-
|
|
78
|
+
for (const node of nodesChunk) {
|
|
79
79
|
const signedKey = getBinaryNodeChild(node, 'skey');
|
|
80
80
|
const key = getBinaryNodeChild(node, 'key');
|
|
81
81
|
const identity = getBinaryNodeChildBuffer(node, 'identity');
|
|
@@ -90,24 +90,33 @@ export const parseAndInjectE2ESessions = async (node, repository) => {
|
|
|
90
90
|
preKey: extractKey(key)
|
|
91
91
|
}
|
|
92
92
|
});
|
|
93
|
-
}
|
|
93
|
+
}
|
|
94
94
|
}
|
|
95
95
|
};
|
|
96
|
-
export const extractDeviceJids = (result, myJid, excludeZeroDevices) => {
|
|
96
|
+
export const extractDeviceJids = (result, myJid, myLid, excludeZeroDevices) => {
|
|
97
97
|
const { user: myUser, device: myDevice } = jidDecode(myJid);
|
|
98
98
|
const extracted = [];
|
|
99
99
|
for (const userResult of result) {
|
|
100
100
|
const { devices, id } = userResult;
|
|
101
|
-
const { user } =
|
|
101
|
+
const decoded = jidDecode(id), { user, server } = decoded;
|
|
102
|
+
let { domainType } = decoded;
|
|
102
103
|
const deviceList = devices?.deviceList;
|
|
103
|
-
if (Array.isArray(deviceList))
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
)
|
|
109
|
-
|
|
104
|
+
if (!Array.isArray(deviceList))
|
|
105
|
+
continue;
|
|
106
|
+
for (const { id: device, keyIndex, isHosted } of deviceList) {
|
|
107
|
+
if ((!excludeZeroDevices || device !== 0) && // if zero devices are not-excluded, or device is non zero
|
|
108
|
+
((myUser !== user && myLid !== user) || myDevice !== device) && // either different user or if me user, not this device
|
|
109
|
+
(device === 0 || !!keyIndex) // ensure that "key-index" is specified for "non-zero" devices, produces a bad req otherwise
|
|
110
|
+
) {
|
|
111
|
+
if (isHosted) {
|
|
112
|
+
domainType = domainType === WAJIDDomains.LID ? WAJIDDomains.HOSTED_LID : WAJIDDomains.HOSTED;
|
|
110
113
|
}
|
|
114
|
+
extracted.push({
|
|
115
|
+
user,
|
|
116
|
+
device,
|
|
117
|
+
domainType,
|
|
118
|
+
server: getServerFromDomainType(server, domainType)
|
|
119
|
+
});
|
|
111
120
|
}
|
|
112
121
|
}
|
|
113
122
|
}
|
package/lib/Utils/signal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signal.js","sourceRoot":"","sources":["../../src/Utils/signal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAU7C,OAAO,EACN,mBAAmB,
|
|
1
|
+
{"version":3,"file":"signal.js","sourceRoot":"","sources":["../../src/Utils/signal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-connection.d.ts","sourceRoot":"","sources":["../../src/Utils/validate-connection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"validate-connection.d.ts","sourceRoot":"","sources":["../../src/Utils/validate-connection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAO9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAC9E,OAAO,EAAE,KAAK,UAAU,EAAiD,MAAM,aAAa,CAAA;AAuD5F,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,EAAE,QAAQ,YAAY,KAAG,KAAK,CAAC,cAY/E,CAAA;AAUD,eAAO,MAAM,wBAAwB,GACpC,qDAAqD,WAAW,EAChE,QAAQ,YAAY,wBAuDpB,CAAA;AAED,eAAO,MAAM,0BAA0B,GACtC,QAAQ,UAAU,EAClB,uDAIG,IAAI,CAAC,mBAAmB,EAAE,cAAc,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;;;CAyFvF,CAAA;AAED,eAAO,MAAM,0BAA0B,GAAI,SAAS,KAAK,CAAC,wBAAwB,EAAE,qBAAqB,OAAO,gCAS/G,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Boom } from '@hapi/boom';
|
|
2
2
|
import { createHash } from 'crypto';
|
|
3
3
|
import { proto } from '../../WAProto/index.js';
|
|
4
|
-
import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
|
|
4
|
+
import { KEY_BUNDLE_TYPE, WA_ADV_ACCOUNT_SIG_PREFIX, WA_ADV_DEVICE_SIG_PREFIX, WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX } from '../Defaults/index.js';
|
|
5
5
|
import { getBinaryNodeChild, jidDecode, S_WHATSAPP_NET } from '../WABinary/index.js';
|
|
6
6
|
import { Curve, hmacSign } from './crypto.js';
|
|
7
7
|
import { encodeBigEndian } from './generics.js';
|
|
@@ -30,7 +30,9 @@ const PLATFORM_MAP = {
|
|
|
30
30
|
};
|
|
31
31
|
const getWebInfo = (config) => {
|
|
32
32
|
let webSubPlatform = proto.ClientPayload.WebInfo.WebSubPlatform.WEB_BROWSER;
|
|
33
|
-
if (config.syncFullHistory &&
|
|
33
|
+
if (config.syncFullHistory &&
|
|
34
|
+
PLATFORM_MAP[config.browser[0]] &&
|
|
35
|
+
config.browser[1] === 'Desktop') {
|
|
34
36
|
webSubPlatform = PLATFORM_MAP[config.browser[0]];
|
|
35
37
|
}
|
|
36
38
|
return { webSubPlatform };
|
|
@@ -48,17 +50,19 @@ export const generateLoginNode = (userJid, config) => {
|
|
|
48
50
|
const { user, device } = jidDecode(userJid);
|
|
49
51
|
const payload = {
|
|
50
52
|
...getClientPayload(config),
|
|
51
|
-
passive:
|
|
53
|
+
passive: true,
|
|
52
54
|
pull: true,
|
|
53
55
|
username: +user,
|
|
54
|
-
device: device
|
|
56
|
+
device: device,
|
|
57
|
+
// TODO: investigate (hard set as false atm)
|
|
58
|
+
lidDbMigrated: false
|
|
55
59
|
};
|
|
56
60
|
return proto.ClientPayload.fromObject(payload);
|
|
57
61
|
};
|
|
58
62
|
const getPlatformType = (platform) => {
|
|
59
63
|
const platformType = platform.toUpperCase();
|
|
60
64
|
return (proto.DeviceProps.PlatformType[platformType] ||
|
|
61
|
-
proto.DeviceProps.PlatformType.
|
|
65
|
+
proto.DeviceProps.PlatformType.CHROME);
|
|
62
66
|
};
|
|
63
67
|
export const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config) => {
|
|
64
68
|
// the app version needs to be md5 hashed
|
|
@@ -69,7 +73,29 @@ export const generateRegistrationNode = ({ registrationId, signedPreKey, signedI
|
|
|
69
73
|
const companion = {
|
|
70
74
|
os: config.browser[0],
|
|
71
75
|
platformType: getPlatformType(config.browser[1]),
|
|
72
|
-
requireFullSync: config.syncFullHistory
|
|
76
|
+
requireFullSync: config.syncFullHistory,
|
|
77
|
+
historySyncConfig: {
|
|
78
|
+
storageQuotaMb: 10240,
|
|
79
|
+
inlineInitialPayloadInE2EeMsg: true,
|
|
80
|
+
recentSyncDaysLimit: undefined,
|
|
81
|
+
supportCallLogHistory: false,
|
|
82
|
+
supportBotUserAgentChatHistory: true,
|
|
83
|
+
supportCagReactionsAndPolls: true,
|
|
84
|
+
supportBizHostedMsg: true,
|
|
85
|
+
supportRecentSyncChunkMessageCountTuning: true,
|
|
86
|
+
supportHostedGroupMsg: true,
|
|
87
|
+
supportFbidBotChatHistory: true,
|
|
88
|
+
supportAddOnHistorySyncMigration: undefined,
|
|
89
|
+
supportMessageAssociation: true,
|
|
90
|
+
supportGroupHistory: false,
|
|
91
|
+
onDemandReady: undefined,
|
|
92
|
+
supportGuestChat: undefined
|
|
93
|
+
},
|
|
94
|
+
version: {
|
|
95
|
+
primary: 10,
|
|
96
|
+
secondary: 15,
|
|
97
|
+
tertiary: 7
|
|
98
|
+
}
|
|
73
99
|
};
|
|
74
100
|
const companionProto = proto.DeviceProps.encode(companion).finish();
|
|
75
101
|
const registerPayload = {
|
|
@@ -101,25 +127,35 @@ export const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentit
|
|
|
101
127
|
}
|
|
102
128
|
const bizName = businessNode?.attrs.name;
|
|
103
129
|
const jid = deviceNode.attrs.jid;
|
|
130
|
+
const lid = deviceNode.attrs.lid;
|
|
104
131
|
const { details, hmac, accountType } = proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
|
|
105
|
-
|
|
106
|
-
|
|
132
|
+
let hmacPrefix = Buffer.from([]);
|
|
133
|
+
if (accountType !== undefined && accountType === proto.ADVEncryptionType.HOSTED) {
|
|
134
|
+
hmacPrefix = WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX;
|
|
135
|
+
}
|
|
107
136
|
const advSign = hmacSign(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'));
|
|
108
137
|
if (Buffer.compare(hmac, advSign) !== 0) {
|
|
109
138
|
throw new Boom('Invalid account signature');
|
|
110
139
|
}
|
|
111
140
|
const account = proto.ADVSignedDeviceIdentity.decode(details);
|
|
112
141
|
const { accountSignatureKey, accountSignature, details: deviceDetails } = account;
|
|
113
|
-
const
|
|
142
|
+
const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails);
|
|
143
|
+
const accountSignaturePrefix = deviceIdentity.deviceType === proto.ADVEncryptionType.HOSTED
|
|
144
|
+
? WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
|
|
145
|
+
: WA_ADV_ACCOUNT_SIG_PREFIX;
|
|
146
|
+
const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails, signedIdentityKey.public]);
|
|
114
147
|
if (!Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
|
|
115
148
|
throw new Boom('Failed to verify account signature');
|
|
116
149
|
}
|
|
117
|
-
const
|
|
118
|
-
|
|
150
|
+
const deviceMsg = Buffer.concat([
|
|
151
|
+
WA_ADV_DEVICE_SIG_PREFIX,
|
|
152
|
+
deviceDetails,
|
|
153
|
+
signedIdentityKey.public,
|
|
154
|
+
accountSignatureKey
|
|
155
|
+
]);
|
|
119
156
|
account.deviceSignature = Curve.sign(signedIdentityKey.private, deviceMsg);
|
|
120
|
-
const identity = createSignalIdentity(
|
|
157
|
+
const identity = createSignalIdentity(lid, accountSignatureKey);
|
|
121
158
|
const accountEnc = encodeSignedDeviceIdentity(account, false);
|
|
122
|
-
const deviceIdentity = proto.ADVDeviceIdentity.decode(account.details);
|
|
123
159
|
const reply = {
|
|
124
160
|
tag: 'iq',
|
|
125
161
|
attrs: {
|
|
@@ -143,7 +179,7 @@ export const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentit
|
|
|
143
179
|
};
|
|
144
180
|
const authUpdate = {
|
|
145
181
|
account,
|
|
146
|
-
me: { id: jid, name: bizName },
|
|
182
|
+
me: { id: jid, name: bizName, lid },
|
|
147
183
|
signalIdentities: [...(signalIdentities || []), identity],
|
|
148
184
|
platform: platformNode?.attrs.name
|
|
149
185
|
};
|