@alannxd/baileys 6.0.4 → 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 -51
- 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
|
@@ -0,0 +1,277 @@
|
|
|
1
|
+
import { LRUCache } from 'lru-cache';
|
|
2
|
+
import { isHostedPnUser, isLidUser, isPnUser, jidDecode, jidNormalizedUser, WAJIDDomains } from '../WABinary/index.js';
|
|
3
|
+
export class LIDMappingStore {
|
|
4
|
+
constructor(keys, logger, pnToLIDFunc) {
|
|
5
|
+
this.mappingCache = new LRUCache({
|
|
6
|
+
ttl: 3 * 24 * 60 * 60 * 1000, // 7 days
|
|
7
|
+
ttlAutopurge: true,
|
|
8
|
+
updateAgeOnGet: true
|
|
9
|
+
});
|
|
10
|
+
this.inflightLIDLookups = new Map();
|
|
11
|
+
this.inflightPNLookups = new Map();
|
|
12
|
+
this.keys = keys;
|
|
13
|
+
this.pnToLIDFunc = pnToLIDFunc;
|
|
14
|
+
this.logger = logger;
|
|
15
|
+
}
|
|
16
|
+
async storeLIDPNMappings(pairs) {
|
|
17
|
+
if (pairs.length === 0)
|
|
18
|
+
return;
|
|
19
|
+
const validatedPairs = [];
|
|
20
|
+
for (const { lid, pn } of pairs) {
|
|
21
|
+
if (!((isLidUser(lid) && isPnUser(pn)) || (isPnUser(lid) && isLidUser(pn)))) {
|
|
22
|
+
this.logger.warn(`Invalid LID-PN mapping: ${lid}, ${pn}`);
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
const lidDecoded = jidDecode(lid);
|
|
26
|
+
const pnDecoded = jidDecode(pn);
|
|
27
|
+
if (!lidDecoded || !pnDecoded)
|
|
28
|
+
continue;
|
|
29
|
+
validatedPairs.push({ pnUser: pnDecoded.user, lidUser: lidDecoded.user });
|
|
30
|
+
}
|
|
31
|
+
if (validatedPairs.length === 0)
|
|
32
|
+
return;
|
|
33
|
+
const cacheMissSet = new Set();
|
|
34
|
+
const existingMappings = new Map();
|
|
35
|
+
for (const { pnUser } of validatedPairs) {
|
|
36
|
+
const cached = this.mappingCache.get(`pn:${pnUser}`);
|
|
37
|
+
if (cached) {
|
|
38
|
+
existingMappings.set(pnUser, cached);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
cacheMissSet.add(pnUser);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (cacheMissSet.size > 0) {
|
|
45
|
+
const cacheMisses = [...cacheMissSet];
|
|
46
|
+
this.logger.trace(`Batch fetching ${cacheMisses.length} LID mappings from database`);
|
|
47
|
+
const stored = await this.keys.get('lid-mapping', cacheMisses);
|
|
48
|
+
for (const pnUser of cacheMisses) {
|
|
49
|
+
const existingLidUser = stored[pnUser];
|
|
50
|
+
if (existingLidUser) {
|
|
51
|
+
existingMappings.set(pnUser, existingLidUser);
|
|
52
|
+
this.mappingCache.set(`pn:${pnUser}`, existingLidUser);
|
|
53
|
+
this.mappingCache.set(`lid:${existingLidUser}`, pnUser);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
const pairMap = {};
|
|
58
|
+
for (const { pnUser, lidUser } of validatedPairs) {
|
|
59
|
+
const existingLidUser = existingMappings.get(pnUser);
|
|
60
|
+
if (existingLidUser === lidUser) {
|
|
61
|
+
this.logger.debug({ pnUser, lidUser }, 'LID mapping already exists, skipping');
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
pairMap[pnUser] = lidUser;
|
|
65
|
+
}
|
|
66
|
+
if (Object.keys(pairMap).length === 0)
|
|
67
|
+
return;
|
|
68
|
+
this.logger.trace({ pairMap }, `Storing ${Object.keys(pairMap).length} pn mappings`);
|
|
69
|
+
const batchData = {};
|
|
70
|
+
for (const [pnUser, lidUser] of Object.entries(pairMap)) {
|
|
71
|
+
batchData[pnUser] = lidUser;
|
|
72
|
+
batchData[`${lidUser}_reverse`] = pnUser;
|
|
73
|
+
}
|
|
74
|
+
await this.keys.transaction(async () => {
|
|
75
|
+
await this.keys.set({ 'lid-mapping': batchData });
|
|
76
|
+
}, 'lid-mapping');
|
|
77
|
+
// Update cache after successful DB write
|
|
78
|
+
for (const [pnUser, lidUser] of Object.entries(pairMap)) {
|
|
79
|
+
this.mappingCache.set(`pn:${pnUser}`, lidUser);
|
|
80
|
+
this.mappingCache.set(`lid:${lidUser}`, pnUser);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
async getLIDForPN(pn) {
|
|
84
|
+
return (await this.getLIDsForPNs([pn]))?.[0]?.lid || null;
|
|
85
|
+
}
|
|
86
|
+
async getLIDsForPNs(pns) {
|
|
87
|
+
if (pns.length === 0)
|
|
88
|
+
return null;
|
|
89
|
+
const sortedPns = [...new Set(pns)].sort();
|
|
90
|
+
const cacheKey = sortedPns.join(',');
|
|
91
|
+
const inflight = this.inflightLIDLookups.get(cacheKey);
|
|
92
|
+
if (inflight) {
|
|
93
|
+
this.logger.trace(`Coalescing getLIDsForPNs request for ${sortedPns.length} PNs`);
|
|
94
|
+
return inflight;
|
|
95
|
+
}
|
|
96
|
+
const promise = this._getLIDsForPNsImpl(pns);
|
|
97
|
+
this.inflightLIDLookups.set(cacheKey, promise);
|
|
98
|
+
try {
|
|
99
|
+
return await promise;
|
|
100
|
+
}
|
|
101
|
+
finally {
|
|
102
|
+
this.inflightLIDLookups.delete(cacheKey);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
async _getLIDsForPNsImpl(pns) {
|
|
106
|
+
const usyncFetch = {};
|
|
107
|
+
const successfulPairs = {};
|
|
108
|
+
const pending = [];
|
|
109
|
+
const addResolvedPair = (pn, decoded, lidUser) => {
|
|
110
|
+
const normalizedLidUser = lidUser.toString();
|
|
111
|
+
if (!normalizedLidUser) {
|
|
112
|
+
this.logger.warn(`Invalid or empty LID user for PN ${pn}: lidUser = "${lidUser}"`);
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
// Push the PN device ID to the LID to maintain device separation
|
|
116
|
+
const pnDevice = decoded.device !== undefined ? decoded.device : 0;
|
|
117
|
+
const deviceSpecificLid = `${normalizedLidUser}${!!pnDevice ? `:${pnDevice}` : ``}@${decoded.server === 'hosted' ? 'hosted.lid' : 'lid'}`;
|
|
118
|
+
this.logger.trace(`getLIDForPN: ${pn} → ${deviceSpecificLid} (user mapping with device ${pnDevice})`);
|
|
119
|
+
successfulPairs[pn] = { lid: deviceSpecificLid, pn };
|
|
120
|
+
return true;
|
|
121
|
+
};
|
|
122
|
+
for (const pn of pns) {
|
|
123
|
+
if (!isPnUser(pn) && !isHostedPnUser(pn))
|
|
124
|
+
continue;
|
|
125
|
+
const decoded = jidDecode(pn);
|
|
126
|
+
if (!decoded)
|
|
127
|
+
continue;
|
|
128
|
+
const pnUser = decoded.user;
|
|
129
|
+
const cached = this.mappingCache.get(`pn:${pnUser}`);
|
|
130
|
+
if (cached && typeof cached === 'string') {
|
|
131
|
+
if (!addResolvedPair(pn, decoded, cached)) {
|
|
132
|
+
this.logger.warn(`Invalid entry for ${pn} (pair not resolved)`);
|
|
133
|
+
continue;
|
|
134
|
+
}
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
137
|
+
pending.push({ pn, pnUser, decoded });
|
|
138
|
+
}
|
|
139
|
+
if (pending.length) {
|
|
140
|
+
const pnUsers = [...new Set(pending.map(item => item.pnUser))];
|
|
141
|
+
const stored = await this.keys.get('lid-mapping', pnUsers);
|
|
142
|
+
for (const pnUser of pnUsers) {
|
|
143
|
+
const lidUser = stored[pnUser];
|
|
144
|
+
if (lidUser && typeof lidUser === 'string') {
|
|
145
|
+
this.mappingCache.set(`pn:${pnUser}`, lidUser);
|
|
146
|
+
this.mappingCache.set(`lid:${lidUser}`, pnUser);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
for (const { pn, pnUser, decoded } of pending) {
|
|
150
|
+
const cached = this.mappingCache.get(`pn:${pnUser}`);
|
|
151
|
+
if (cached && typeof cached === 'string') {
|
|
152
|
+
if (!addResolvedPair(pn, decoded, cached)) {
|
|
153
|
+
this.logger.warn(`Invalid entry for ${pn} (pair not resolved)`);
|
|
154
|
+
continue;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
this.logger.trace(`No LID mapping found for PN user ${pnUser}; batch getting from USync`);
|
|
159
|
+
const device = decoded.device || 0;
|
|
160
|
+
let normalizedPn = jidNormalizedUser(pn);
|
|
161
|
+
if (isHostedPnUser(normalizedPn)) {
|
|
162
|
+
normalizedPn = `${pnUser}@s.whatsapp.net`;
|
|
163
|
+
}
|
|
164
|
+
if (!usyncFetch[normalizedPn]) {
|
|
165
|
+
usyncFetch[normalizedPn] = [device];
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
usyncFetch[normalizedPn]?.push(device);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
if (Object.keys(usyncFetch).length > 0) {
|
|
174
|
+
const result = await this.pnToLIDFunc?.(Object.keys(usyncFetch)); // this function already adds LIDs to mapping
|
|
175
|
+
if (result && result.length > 0) {
|
|
176
|
+
await this.storeLIDPNMappings(result);
|
|
177
|
+
for (const pair of result) {
|
|
178
|
+
const pnDecoded = jidDecode(pair.pn);
|
|
179
|
+
const pnUser = pnDecoded?.user;
|
|
180
|
+
if (!pnUser)
|
|
181
|
+
continue;
|
|
182
|
+
const lidUser = jidDecode(pair.lid)?.user;
|
|
183
|
+
if (!lidUser)
|
|
184
|
+
continue;
|
|
185
|
+
for (const device of usyncFetch[pair.pn]) {
|
|
186
|
+
const deviceSpecificLid = `${lidUser}${!!device ? `:${device}` : ``}@${device === 99 ? 'hosted.lid' : 'lid'}`;
|
|
187
|
+
this.logger.trace(`getLIDForPN: USYNC success for ${pair.pn} → ${deviceSpecificLid} (user mapping with device ${device})`);
|
|
188
|
+
const deviceSpecificPn = `${pnUser}${!!device ? `:${device}` : ``}@${device === 99 ? 'hosted' : 's.whatsapp.net'}`;
|
|
189
|
+
successfulPairs[deviceSpecificPn] = { lid: deviceSpecificLid, pn: deviceSpecificPn };
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
this.logger.warn('USync fetch yielded no results for pending PNs');
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
return Object.values(successfulPairs).length > 0 ? Object.values(successfulPairs) : null;
|
|
198
|
+
}
|
|
199
|
+
async getPNForLID(lid) {
|
|
200
|
+
return (await this.getPNsForLIDs([lid]))?.[0]?.pn || null;
|
|
201
|
+
}
|
|
202
|
+
async getPNsForLIDs(lids) {
|
|
203
|
+
if (lids.length === 0)
|
|
204
|
+
return null;
|
|
205
|
+
const sortedLids = [...new Set(lids)].sort();
|
|
206
|
+
const cacheKey = sortedLids.join(',');
|
|
207
|
+
const inflight = this.inflightPNLookups.get(cacheKey);
|
|
208
|
+
if (inflight) {
|
|
209
|
+
this.logger.trace(`Coalescing getPNsForLIDs request for ${sortedLids.length} LIDs`);
|
|
210
|
+
return inflight;
|
|
211
|
+
}
|
|
212
|
+
const promise = this._getPNsForLIDsImpl(lids);
|
|
213
|
+
this.inflightPNLookups.set(cacheKey, promise);
|
|
214
|
+
try {
|
|
215
|
+
return await promise;
|
|
216
|
+
}
|
|
217
|
+
finally {
|
|
218
|
+
this.inflightPNLookups.delete(cacheKey);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
async _getPNsForLIDsImpl(lids) {
|
|
222
|
+
const successfulPairs = {};
|
|
223
|
+
const pending = [];
|
|
224
|
+
const addResolvedPair = (lid, decoded, pnUser) => {
|
|
225
|
+
if (!pnUser || typeof pnUser !== 'string') {
|
|
226
|
+
return false;
|
|
227
|
+
}
|
|
228
|
+
const lidDevice = decoded.device !== undefined ? decoded.device : 0;
|
|
229
|
+
const pnJid = `${pnUser}:${lidDevice}@${decoded.domainType === WAJIDDomains.HOSTED_LID ? 'hosted' : 's.whatsapp.net'}`;
|
|
230
|
+
this.logger.trace(`Found reverse mapping: ${lid} → ${pnJid}`);
|
|
231
|
+
successfulPairs[lid] = { lid, pn: pnJid };
|
|
232
|
+
return true;
|
|
233
|
+
};
|
|
234
|
+
for (const lid of lids) {
|
|
235
|
+
if (!isLidUser(lid))
|
|
236
|
+
continue;
|
|
237
|
+
const decoded = jidDecode(lid);
|
|
238
|
+
if (!decoded)
|
|
239
|
+
continue;
|
|
240
|
+
const lidUser = decoded.user;
|
|
241
|
+
const cached = this.mappingCache.get(`lid:${lidUser}`);
|
|
242
|
+
if (cached && typeof cached === 'string') {
|
|
243
|
+
addResolvedPair(lid, decoded, cached);
|
|
244
|
+
continue;
|
|
245
|
+
}
|
|
246
|
+
pending.push({ lid, lidUser, decoded });
|
|
247
|
+
}
|
|
248
|
+
if (pending.length) {
|
|
249
|
+
const reverseKeys = [...new Set(pending.map(item => `${item.lidUser}_reverse`))];
|
|
250
|
+
const stored = await this.keys.get('lid-mapping', reverseKeys);
|
|
251
|
+
for (const { lid, lidUser, decoded } of pending) {
|
|
252
|
+
let pnUser = this.mappingCache.get(`lid:${lidUser}`);
|
|
253
|
+
if (!pnUser || typeof pnUser !== 'string') {
|
|
254
|
+
pnUser = stored[`${lidUser}_reverse`];
|
|
255
|
+
if (pnUser && typeof pnUser === 'string') {
|
|
256
|
+
this.mappingCache.set(`lid:${lidUser}`, pnUser);
|
|
257
|
+
this.mappingCache.set(`pn:${pnUser}`, lidUser);
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
if (pnUser && typeof pnUser === 'string') {
|
|
261
|
+
addResolvedPair(lid, decoded, pnUser);
|
|
262
|
+
}
|
|
263
|
+
else {
|
|
264
|
+
this.logger.trace(`No reverse mapping found for LID user: ${lidUser}`);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
return Object.values(successfulPairs).length ? Object.values(successfulPairs) : null;
|
|
269
|
+
}
|
|
270
|
+
/**
|
|
271
|
+
* Close the cache and release resources
|
|
272
|
+
*/
|
|
273
|
+
close() {
|
|
274
|
+
this.mappingCache.clear();
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
//# sourceMappingURL=lid-mapping.js.map
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './
|
|
2
|
-
export * from './
|
|
3
|
-
|
|
1
|
+
export * from './types.js';
|
|
2
|
+
export * from './websocket.js';
|
|
3
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./abstract-socket-client"), exports);
|
|
18
|
-
__exportStar(require("./mobile-socket-client"), exports);
|
|
19
|
-
__exportStar(require("./web-socket-client"), exports);
|
|
1
|
+
export * from './types.js';
|
|
2
|
+
export * from './websocket.js';
|
|
3
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
1
|
import { EventEmitter } from 'events';
|
|
4
2
|
import { URL } from 'url';
|
|
5
|
-
import { SocketConfig } from '../../Types';
|
|
3
|
+
import type { SocketConfig } from '../../Types/index.js';
|
|
6
4
|
export declare abstract class AbstractSocketClient extends EventEmitter {
|
|
7
5
|
url: URL;
|
|
8
6
|
config: SocketConfig;
|
|
@@ -11,7 +9,8 @@ export declare abstract class AbstractSocketClient extends EventEmitter {
|
|
|
11
9
|
abstract get isClosing(): boolean;
|
|
12
10
|
abstract get isConnecting(): boolean;
|
|
13
11
|
constructor(url: URL, config: SocketConfig);
|
|
14
|
-
abstract connect():
|
|
15
|
-
abstract close():
|
|
12
|
+
abstract connect(): void;
|
|
13
|
+
abstract close(): void;
|
|
16
14
|
abstract send(str: Uint8Array | string, cb?: (err?: Error) => void): boolean;
|
|
17
15
|
}
|
|
16
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { EventEmitter } from 'events';
|
|
2
|
+
import { URL } from 'url';
|
|
3
|
+
export class AbstractSocketClient extends EventEmitter {
|
|
4
|
+
constructor(url, config) {
|
|
5
|
+
super();
|
|
6
|
+
this.url = url;
|
|
7
|
+
this.config = config;
|
|
8
|
+
this.setMaxListeners(0);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import WebSocket from 'ws';
|
|
2
|
-
import { AbstractSocketClient } from './
|
|
2
|
+
import { AbstractSocketClient } from './types.js';
|
|
3
3
|
export declare class WebSocketClient extends AbstractSocketClient {
|
|
4
4
|
protected socket: WebSocket | null;
|
|
5
5
|
get isOpen(): boolean;
|
|
6
6
|
get isClosed(): boolean;
|
|
7
7
|
get isClosing(): boolean;
|
|
8
8
|
get isConnecting(): boolean;
|
|
9
|
-
connect():
|
|
9
|
+
connect(): void;
|
|
10
10
|
close(): Promise<void>;
|
|
11
11
|
send(str: string | Uint8Array, cb?: (err?: Error) => void): boolean;
|
|
12
12
|
}
|
|
13
|
+
//# sourceMappingURL=websocket.d.ts.map
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import WebSocket from 'ws';
|
|
2
|
+
import { DEFAULT_ORIGIN } from '../../Defaults/index.js';
|
|
3
|
+
import { AbstractSocketClient } from './types.js';
|
|
4
|
+
export class WebSocketClient extends AbstractSocketClient {
|
|
5
|
+
constructor() {
|
|
6
|
+
super(...arguments);
|
|
7
|
+
this.socket = null;
|
|
8
|
+
}
|
|
9
|
+
get isOpen() {
|
|
10
|
+
return this.socket?.readyState === WebSocket.OPEN;
|
|
11
|
+
}
|
|
12
|
+
get isClosed() {
|
|
13
|
+
return this.socket === null || this.socket?.readyState === WebSocket.CLOSED;
|
|
14
|
+
}
|
|
15
|
+
get isClosing() {
|
|
16
|
+
return this.socket === null || this.socket?.readyState === WebSocket.CLOSING;
|
|
17
|
+
}
|
|
18
|
+
get isConnecting() {
|
|
19
|
+
return this.socket?.readyState === WebSocket.CONNECTING;
|
|
20
|
+
}
|
|
21
|
+
connect() {
|
|
22
|
+
if (this.socket) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
this.socket = new WebSocket(this.url, {
|
|
26
|
+
origin: DEFAULT_ORIGIN,
|
|
27
|
+
headers: this.config.options?.headers,
|
|
28
|
+
handshakeTimeout: this.config.connectTimeoutMs,
|
|
29
|
+
timeout: this.config.connectTimeoutMs,
|
|
30
|
+
agent: this.config.agent
|
|
31
|
+
});
|
|
32
|
+
this.socket.setMaxListeners(0);
|
|
33
|
+
const events = ['close', 'error', 'upgrade', 'message', 'open', 'ping', 'pong', 'unexpected-response'];
|
|
34
|
+
for (const event of events) {
|
|
35
|
+
this.socket?.on(event, (...args) => this.emit(event, ...args));
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
async close() {
|
|
39
|
+
if (!this.socket) {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
const closePromise = new Promise(resolve => {
|
|
43
|
+
this.socket?.once('close', resolve);
|
|
44
|
+
});
|
|
45
|
+
this.socket.close();
|
|
46
|
+
await closePromise;
|
|
47
|
+
this.socket = null;
|
|
48
|
+
}
|
|
49
|
+
send(str, cb) {
|
|
50
|
+
this.socket?.send(str, cb);
|
|
51
|
+
return Boolean(this.socket);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=websocket.js.map
|