@periskope/baileys 6.7.19 → 7.0.0-alpha-1

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.
Files changed (139) hide show
  1. package/README.md +6 -0
  2. package/WAProto/GenerateStatics.sh +2 -2
  3. package/WAProto/index.d.ts +2793 -45578
  4. package/WAProto/index.js +19344 -147065
  5. package/lib/Defaults/index.d.ts +7 -1
  6. package/lib/Defaults/index.d.ts.map +1 -1
  7. package/lib/Defaults/index.js +11 -4
  8. package/lib/Defaults/index.js.map +1 -1
  9. package/lib/Signal/Group/group_cipher.d.ts +0 -1
  10. package/lib/Signal/Group/group_cipher.d.ts.map +1 -1
  11. package/lib/Signal/Group/group_cipher.js +28 -36
  12. package/lib/Signal/Group/group_cipher.js.map +1 -1
  13. package/lib/Signal/Group/sender-key-distribution-message.d.ts.map +1 -1
  14. package/lib/Signal/Group/sender-key-distribution-message.js +1 -1
  15. package/lib/Signal/Group/sender-key-distribution-message.js.map +1 -1
  16. package/lib/Signal/Group/sender-key-message.d.ts.map +1 -1
  17. package/lib/Signal/Group/sender-key-message.js +1 -1
  18. package/lib/Signal/Group/sender-key-message.js.map +1 -1
  19. package/lib/Signal/Group/sender-key-state.d.ts.map +1 -1
  20. package/lib/Signal/Group/sender-key-state.js +6 -1
  21. package/lib/Signal/Group/sender-key-state.js.map +1 -1
  22. package/lib/Signal/libsignal.d.ts +5 -1
  23. package/lib/Signal/libsignal.d.ts.map +1 -1
  24. package/lib/Signal/libsignal.js +211 -38
  25. package/lib/Signal/libsignal.js.map +1 -1
  26. package/lib/Signal/lid-mapping.d.ts +14 -3
  27. package/lib/Signal/lid-mapping.d.ts.map +1 -0
  28. package/lib/Signal/lid-mapping.js +53 -65
  29. package/lib/Signal/lid-mapping.js.map +1 -0
  30. package/lib/Socket/business.d.ts +25 -13
  31. package/lib/Socket/business.d.ts.map +1 -1
  32. package/lib/Socket/business.js +122 -1
  33. package/lib/Socket/business.js.map +1 -1
  34. package/lib/Socket/chats.d.ts +14 -8
  35. package/lib/Socket/chats.d.ts.map +1 -1
  36. package/lib/Socket/chats.js +54 -21
  37. package/lib/Socket/chats.js.map +1 -1
  38. package/lib/Socket/communities.d.ts +24 -10
  39. package/lib/Socket/communities.d.ts.map +1 -1
  40. package/lib/Socket/communities.js +45 -1
  41. package/lib/Socket/communities.js.map +1 -1
  42. package/lib/Socket/groups.d.ts +13 -8
  43. package/lib/Socket/groups.d.ts.map +1 -1
  44. package/lib/Socket/groups.js +12 -11
  45. package/lib/Socket/groups.js.map +1 -1
  46. package/lib/Socket/index.d.ts +24 -10
  47. package/lib/Socket/index.d.ts.map +1 -1
  48. package/lib/Socket/messages-recv.d.ts +18 -10
  49. package/lib/Socket/messages-recv.d.ts.map +1 -1
  50. package/lib/Socket/messages-recv.js +383 -220
  51. package/lib/Socket/messages-recv.js.map +1 -1
  52. package/lib/Socket/messages-send.d.ts +19 -10
  53. package/lib/Socket/messages-send.d.ts.map +1 -1
  54. package/lib/Socket/messages-send.js +454 -62
  55. package/lib/Socket/messages-send.js.map +1 -1
  56. package/lib/Socket/newsletter.d.ts +15 -11
  57. package/lib/Socket/newsletter.d.ts.map +1 -1
  58. package/lib/Socket/newsletter.js +3 -1
  59. package/lib/Socket/newsletter.js.map +1 -1
  60. package/lib/Socket/socket.d.ts +9 -2
  61. package/lib/Socket/socket.d.ts.map +1 -1
  62. package/lib/Socket/socket.js +266 -70
  63. package/lib/Socket/socket.js.map +1 -1
  64. package/lib/Types/Auth.d.ts +2 -1
  65. package/lib/Types/Auth.d.ts.map +1 -1
  66. package/lib/Types/Bussines.d.ts +25 -0
  67. package/lib/Types/Bussines.d.ts.map +1 -0
  68. package/lib/Types/Bussines.js +2 -0
  69. package/lib/Types/Bussines.js.map +1 -0
  70. package/lib/Types/Chat.d.ts +5 -0
  71. package/lib/Types/Chat.d.ts.map +1 -1
  72. package/lib/Types/Chat.js.map +1 -1
  73. package/lib/Types/Contact.d.ts +4 -4
  74. package/lib/Types/Contact.d.ts.map +1 -1
  75. package/lib/Types/Events.d.ts +2 -2
  76. package/lib/Types/Events.d.ts.map +1 -1
  77. package/lib/Types/GroupMetadata.d.ts +6 -4
  78. package/lib/Types/GroupMetadata.d.ts.map +1 -1
  79. package/lib/Types/Message.d.ts +28 -7
  80. package/lib/Types/Message.d.ts.map +1 -1
  81. package/lib/Types/Message.js +5 -1
  82. package/lib/Types/Message.js.map +1 -1
  83. package/lib/Types/Signal.d.ts +24 -0
  84. package/lib/Types/Signal.d.ts.map +1 -1
  85. package/lib/Types/Socket.d.ts +9 -1
  86. package/lib/Types/Socket.d.ts.map +1 -1
  87. package/lib/Utils/auth-utils.d.ts.map +1 -1
  88. package/lib/Utils/auth-utils.js +362 -78
  89. package/lib/Utils/auth-utils.js.map +1 -1
  90. package/lib/Utils/chat-utils.d.ts +2 -2
  91. package/lib/Utils/chat-utils.d.ts.map +1 -1
  92. package/lib/Utils/chat-utils.js +20 -3
  93. package/lib/Utils/chat-utils.js.map +1 -1
  94. package/lib/Utils/decode-wa-message.d.ts +10 -0
  95. package/lib/Utils/decode-wa-message.d.ts.map +1 -1
  96. package/lib/Utils/decode-wa-message.js +84 -13
  97. package/lib/Utils/decode-wa-message.js.map +1 -1
  98. package/lib/Utils/event-buffer.d.ts +0 -1
  99. package/lib/Utils/event-buffer.d.ts.map +1 -1
  100. package/lib/Utils/event-buffer.js +48 -4
  101. package/lib/Utils/event-buffer.js.map +1 -1
  102. package/lib/Utils/generics.d.ts.map +1 -1
  103. package/lib/Utils/generics.js +17 -8
  104. package/lib/Utils/generics.js.map +1 -1
  105. package/lib/Utils/history.d.ts.map +1 -1
  106. package/lib/Utils/history.js +1 -2
  107. package/lib/Utils/history.js.map +1 -1
  108. package/lib/Utils/index.d.ts +1 -0
  109. package/lib/Utils/index.d.ts.map +1 -1
  110. package/lib/Utils/index.js +1 -0
  111. package/lib/Utils/index.js.map +1 -1
  112. package/lib/Utils/message-retry-manager.d.ts +82 -0
  113. package/lib/Utils/message-retry-manager.d.ts.map +1 -0
  114. package/lib/Utils/message-retry-manager.js +149 -0
  115. package/lib/Utils/message-retry-manager.js.map +1 -0
  116. package/lib/Utils/messages-media.d.ts +3 -2
  117. package/lib/Utils/messages-media.d.ts.map +1 -1
  118. package/lib/Utils/messages-media.js +4 -1
  119. package/lib/Utils/messages-media.js.map +1 -1
  120. package/lib/Utils/messages.d.ts.map +1 -1
  121. package/lib/Utils/messages.js +35 -15
  122. package/lib/Utils/messages.js.map +1 -1
  123. package/lib/Utils/process-message.d.ts +3 -2
  124. package/lib/Utils/process-message.d.ts.map +1 -1
  125. package/lib/Utils/process-message.js +13 -2
  126. package/lib/Utils/process-message.js.map +1 -1
  127. package/lib/Utils/use-multi-file-auth-state.js +1 -1
  128. package/lib/Utils/use-multi-file-auth-state.js.map +1 -1
  129. package/lib/Utils/validate-connection.d.ts.map +1 -1
  130. package/lib/Utils/validate-connection.js +5 -4
  131. package/lib/Utils/validate-connection.js.map +1 -1
  132. package/lib/WABinary/jid-utils.d.ts +6 -5
  133. package/lib/WABinary/jid-utils.d.ts.map +1 -1
  134. package/lib/WABinary/jid-utils.js +11 -5
  135. package/lib/WABinary/jid-utils.js.map +1 -1
  136. package/lib/WAM/encode.d.ts.map +1 -1
  137. package/lib/WAM/encode.js +0 -1
  138. package/lib/WAM/encode.js.map +1 -1
  139. package/package.json +12 -8
@@ -1,5 +1,7 @@
1
1
  import NodeCache from '@cacheable/node-cache';
2
+ import { Mutex } from 'async-mutex';
2
3
  import { randomBytes } from 'crypto';
4
+ import { LRUCache } from 'lru-cache';
3
5
  import { DEFAULT_CACHE_TTLS } from '../Defaults/index.js';
4
6
  import { Curve, signedKeyPair } from './crypto.js';
5
7
  import { delay, generateRegistrationId } from './generics.js';
@@ -16,45 +18,51 @@ export function makeCacheableSignalKeyStore(store, logger, _cache) {
16
18
  useClones: false,
17
19
  deleteOnExpire: true
18
20
  });
21
+ // Mutex for protecting cache operations
22
+ const cacheMutex = new Mutex();
19
23
  function getUniqueId(type, id) {
20
24
  return `${type}.${id}`;
21
25
  }
22
26
  return {
23
27
  async get(type, ids) {
24
- const data = {};
25
- const idsToFetch = [];
26
- for (const id of ids) {
27
- const item = cache.get(getUniqueId(type, id));
28
- if (typeof item !== 'undefined') {
29
- data[id] = item;
30
- }
31
- else {
32
- idsToFetch.push(id);
33
- }
34
- }
35
- if (idsToFetch.length) {
36
- logger?.trace({ items: idsToFetch.length }, 'loading from store');
37
- const fetched = await store.get(type, idsToFetch);
38
- for (const id of idsToFetch) {
39
- const item = fetched[id];
40
- if (item) {
28
+ return cacheMutex.runExclusive(async () => {
29
+ const data = {};
30
+ const idsToFetch = [];
31
+ for (const id of ids) {
32
+ const item = cache.get(getUniqueId(type, id));
33
+ if (typeof item !== 'undefined') {
41
34
  data[id] = item;
42
- cache.set(getUniqueId(type, id), item);
35
+ }
36
+ else {
37
+ idsToFetch.push(id);
43
38
  }
44
39
  }
45
- }
46
- return data;
40
+ if (idsToFetch.length) {
41
+ logger?.trace({ items: idsToFetch.length }, 'loading from store');
42
+ const fetched = await store.get(type, idsToFetch);
43
+ for (const id of idsToFetch) {
44
+ const item = fetched[id];
45
+ if (item) {
46
+ data[id] = item;
47
+ cache.set(getUniqueId(type, id), item);
48
+ }
49
+ }
50
+ }
51
+ return data;
52
+ });
47
53
  },
48
54
  async set(data) {
49
- let keys = 0;
50
- for (const type in data) {
51
- for (const id in data[type]) {
52
- cache.set(getUniqueId(type, id), data[type][id]);
53
- keys += 1;
55
+ return cacheMutex.runExclusive(async () => {
56
+ let keys = 0;
57
+ for (const type in data) {
58
+ for (const id in data[type]) {
59
+ cache.set(getUniqueId(type, id), data[type][id]);
60
+ keys += 1;
61
+ }
54
62
  }
55
- }
56
- logger?.trace({ keys }, 'updated cache');
57
- await store.set(data);
63
+ logger?.trace({ keys }, 'updated cache');
64
+ await store.set(data);
65
+ });
58
66
  },
59
67
  async clear() {
60
68
  cache.flushAll();
@@ -62,6 +70,145 @@ export function makeCacheableSignalKeyStore(store, logger, _cache) {
62
70
  }
63
71
  };
64
72
  }
73
+ // Module-level specialized mutexes for pre-key operations
74
+ const preKeyMutex = new Mutex();
75
+ const signedPreKeyMutex = new Mutex();
76
+ /**
77
+ * Get the appropriate mutex for the key type
78
+ */
79
+ const getPreKeyMutex = (keyType) => {
80
+ return keyType === 'signed-pre-key' ? signedPreKeyMutex : preKeyMutex;
81
+ };
82
+ /**
83
+ * Handles pre-key operations with mutex protection
84
+ */
85
+ async function handlePreKeyOperations(data, keyType, transactionCache, mutations, logger, isInTransaction, state) {
86
+ const mutex = getPreKeyMutex(keyType);
87
+ await mutex.runExclusive(async () => {
88
+ const keyData = data[keyType];
89
+ if (!keyData)
90
+ return;
91
+ // Ensure structures exist
92
+ transactionCache[keyType] = transactionCache[keyType] || {};
93
+ mutations[keyType] = mutations[keyType] || {};
94
+ // Separate deletions from updates for batch processing
95
+ const deletionKeys = [];
96
+ const updateKeys = [];
97
+ for (const keyId in keyData) {
98
+ if (keyData[keyId] === null) {
99
+ deletionKeys.push(keyId);
100
+ }
101
+ else {
102
+ updateKeys.push(keyId);
103
+ }
104
+ }
105
+ // Process updates first (no validation needed)
106
+ for (const keyId of updateKeys) {
107
+ if (transactionCache[keyType]) {
108
+ transactionCache[keyType][keyId] = keyData[keyId];
109
+ }
110
+ if (mutations[keyType]) {
111
+ mutations[keyType][keyId] = keyData[keyId];
112
+ }
113
+ }
114
+ // Process deletions with validation
115
+ if (deletionKeys.length === 0)
116
+ return;
117
+ if (isInTransaction) {
118
+ // In transaction, only allow deletion if key exists in cache
119
+ for (const keyId of deletionKeys) {
120
+ if (transactionCache[keyType]) {
121
+ transactionCache[keyType][keyId] = null;
122
+ if (mutations[keyType]) {
123
+ // Mark for deletion in mutations
124
+ mutations[keyType][keyId] = null;
125
+ }
126
+ }
127
+ else {
128
+ logger.warn(`Skipping deletion of non-existent ${keyType} in transaction: ${keyId}`);
129
+ }
130
+ }
131
+ return;
132
+ }
133
+ // Outside transaction, batch validate all deletions
134
+ if (!state)
135
+ return;
136
+ const existingKeys = await state.get(keyType, deletionKeys);
137
+ for (const keyId of deletionKeys) {
138
+ if (existingKeys[keyId]) {
139
+ if (transactionCache[keyType])
140
+ transactionCache[keyType][keyId] = null;
141
+ if (mutations[keyType])
142
+ mutations[keyType][keyId] = null;
143
+ }
144
+ else {
145
+ logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`);
146
+ }
147
+ }
148
+ });
149
+ }
150
+ /**
151
+ * Handles normal key operations for transactions
152
+ */
153
+ function handleNormalKeyOperations(data, key, transactionCache, mutations) {
154
+ Object.assign(transactionCache[key], data[key]);
155
+ mutations[key] = mutations[key] || {};
156
+ Object.assign(mutations[key], data[key]);
157
+ }
158
+ /**
159
+ * Process pre-key deletions with validation
160
+ */
161
+ async function processPreKeyDeletions(data, keyType, state, logger) {
162
+ const mutex = getPreKeyMutex(keyType);
163
+ await mutex.runExclusive(async () => {
164
+ const keyData = data[keyType];
165
+ if (!keyData)
166
+ return;
167
+ // Validate deletions
168
+ for (const keyId in keyData) {
169
+ if (keyData[keyId] === null) {
170
+ const existingKeys = await state.get(keyType, [keyId]);
171
+ if (!existingKeys[keyId]) {
172
+ logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`);
173
+ if (data[keyType])
174
+ delete data[keyType][keyId];
175
+ }
176
+ }
177
+ }
178
+ });
179
+ }
180
+ /**
181
+ * Executes a function with mutexes acquired for given key types
182
+ * Uses async-mutex's runExclusive with efficient batching
183
+ */
184
+ async function withMutexes(keyTypes, getKeyTypeMutex, fn) {
185
+ if (keyTypes.length === 0) {
186
+ return fn();
187
+ }
188
+ if (keyTypes.length === 1) {
189
+ return getKeyTypeMutex(keyTypes[0]).runExclusive(fn);
190
+ }
191
+ // For multiple mutexes, sort by key type to prevent deadlocks
192
+ // Then acquire all mutexes in order using Promise.all for better efficiency
193
+ const sortedKeyTypes = [...keyTypes].sort();
194
+ const mutexes = sortedKeyTypes.map(getKeyTypeMutex);
195
+ // Acquire all mutexes in order to prevent deadlocks
196
+ const releases = [];
197
+ try {
198
+ for (const mutex of mutexes) {
199
+ releases.push(await mutex.acquire());
200
+ }
201
+ return await fn();
202
+ }
203
+ finally {
204
+ // Release in reverse order
205
+ while (releases.length > 0) {
206
+ const release = releases.pop();
207
+ if (release)
208
+ release();
209
+ }
210
+ }
211
+ }
65
212
  /**
66
213
  * Adds DB like transaction capability (https://en.wikipedia.org/wiki/Database_transaction) to the SignalKeyStore,
67
214
  * this allows batch read & write operations & improves the performance of the lib
@@ -75,7 +222,81 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
75
222
  let dbQueriesInTransaction = 0;
76
223
  let transactionCache = {};
77
224
  let mutations = {};
225
+ // LRU Cache to hold mutexes for different key types
226
+ const mutexCache = new LRUCache({
227
+ ttl: 60 * 60 * 1000, // 1 hour
228
+ ttlAutopurge: true,
229
+ updateAgeOnGet: true
230
+ });
78
231
  let transactionsInProgress = 0;
232
+ function getKeyTypeMutex(type) {
233
+ return getMutex(`keytype:${type}`);
234
+ }
235
+ function getSenderKeyMutex(senderKeyName) {
236
+ return getMutex(`senderkey:${senderKeyName}`);
237
+ }
238
+ function getTransactionMutex(key) {
239
+ return getMutex(`transaction:${key}`);
240
+ }
241
+ // Get or create a mutex for a specific key name
242
+ function getMutex(key) {
243
+ let mutex = mutexCache.get(key);
244
+ if (!mutex) {
245
+ mutex = new Mutex();
246
+ mutexCache.set(key, mutex);
247
+ logger.info({ key }, 'created new mutex');
248
+ }
249
+ return mutex;
250
+ }
251
+ // Sender key operations with proper mutex sequencing
252
+ function queueSenderKeyOperation(senderKeyName, operation) {
253
+ return getSenderKeyMutex(senderKeyName).runExclusive(operation);
254
+ }
255
+ // Check if we are currently in a transaction
256
+ function isInTransaction() {
257
+ return transactionsInProgress > 0;
258
+ }
259
+ // Helper function to handle transaction commit with retries
260
+ async function commitTransaction() {
261
+ if (!Object.keys(mutations).length) {
262
+ logger.trace('no mutations in transaction');
263
+ return;
264
+ }
265
+ logger.trace('committing transaction');
266
+ let tries = maxCommitRetries;
267
+ while (tries > 0) {
268
+ tries -= 1;
269
+ try {
270
+ await state.set(mutations);
271
+ logger.trace({ dbQueriesInTransaction }, 'committed transaction');
272
+ return;
273
+ }
274
+ catch (error) {
275
+ logger.warn(`failed to commit ${Object.keys(mutations).length} mutations, tries left=${tries}`);
276
+ if (tries > 0) {
277
+ await delay(delayBetweenTriesMs);
278
+ }
279
+ }
280
+ }
281
+ }
282
+ // Helper function to clean up transaction state
283
+ function cleanupTransactionState() {
284
+ transactionsInProgress -= 1;
285
+ if (transactionsInProgress === 0) {
286
+ transactionCache = {};
287
+ mutations = {};
288
+ dbQueriesInTransaction = 0;
289
+ }
290
+ }
291
+ // Helper function to execute work within transaction
292
+ async function executeTransactionWork(work) {
293
+ const result = await work();
294
+ // commit if this is the outermost transaction
295
+ if (transactionsInProgress === 1) {
296
+ await commitTransaction();
297
+ }
298
+ return result;
299
+ }
79
300
  return {
80
301
  get: async (type, ids) => {
81
302
  if (isInTransaction()) {
@@ -84,9 +305,30 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
84
305
  // only fetch if there are any items to fetch
85
306
  if (idsRequiringFetch.length) {
86
307
  dbQueriesInTransaction += 1;
87
- const result = await state.get(type, idsRequiringFetch);
88
- transactionCache[type] || (transactionCache[type] = {});
89
- Object.assign(transactionCache[type], result);
308
+ // Use per-sender-key queue for sender-key operations when possible
309
+ if (type === 'sender-key') {
310
+ logger.info({ idsRequiringFetch }, 'processing sender keys in transaction');
311
+ // For sender keys, process each one with queued operations to maintain serialization
312
+ for (const senderKeyName of idsRequiringFetch) {
313
+ await queueSenderKeyOperation(senderKeyName, async () => {
314
+ logger.info({ senderKeyName }, 'fetching sender key in transaction');
315
+ const result = await state.get(type, [senderKeyName]);
316
+ // Update transaction cache
317
+ transactionCache[type] || (transactionCache[type] = {});
318
+ Object.assign(transactionCache[type], result);
319
+ logger.info({ senderKeyName, hasResult: !!result[senderKeyName] }, 'sender key fetch complete');
320
+ });
321
+ }
322
+ }
323
+ else {
324
+ // Use runExclusive for cleaner mutex handling
325
+ await getKeyTypeMutex(type).runExclusive(async () => {
326
+ const result = await state.get(type, idsRequiringFetch);
327
+ // Update transaction cache
328
+ transactionCache[type] || (transactionCache[type] = {});
329
+ Object.assign(transactionCache[type], result);
330
+ });
331
+ }
90
332
  }
91
333
  return ids.reduce((dict, id) => {
92
334
  const value = transactionCache[type]?.[id];
@@ -97,73 +339,115 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
97
339
  }, {});
98
340
  }
99
341
  else {
100
- return state.get(type, ids);
342
+ // Not in transaction, fetch directly with queue protection
343
+ if (type === 'sender-key') {
344
+ // For sender keys, use individual queues to maintain per-key serialization
345
+ const results = {};
346
+ for (const senderKeyName of ids) {
347
+ const result = await queueSenderKeyOperation(senderKeyName, async () => await state.get(type, [senderKeyName]));
348
+ Object.assign(results, result);
349
+ }
350
+ return results;
351
+ }
352
+ else {
353
+ return await getKeyTypeMutex(type).runExclusive(() => state.get(type, ids));
354
+ }
101
355
  }
102
356
  },
103
- set: data => {
357
+ set: async (data) => {
104
358
  if (isInTransaction()) {
105
359
  logger.trace({ types: Object.keys(data) }, 'caching in transaction');
106
360
  for (const key_ in data) {
107
361
  const key = key_;
108
362
  transactionCache[key] = transactionCache[key] || {};
109
- Object.assign(transactionCache[key], data[key]);
110
- mutations[key] = mutations[key] || {};
111
- Object.assign(mutations[key], data[key]);
363
+ // Special handling for pre-keys and signed-pre-keys
364
+ if (key === 'pre-key') {
365
+ await handlePreKeyOperations(data, key, transactionCache, mutations, logger, true);
366
+ }
367
+ else {
368
+ // Normal handling for other key types
369
+ handleNormalKeyOperations(data, key, transactionCache, mutations);
370
+ }
112
371
  }
113
372
  }
114
373
  else {
115
- return state.set(data);
374
+ // Not in transaction, apply directly with mutex protection
375
+ const hasSenderKeys = 'sender-key' in data;
376
+ const senderKeyNames = hasSenderKeys ? Object.keys(data['sender-key'] || {}) : [];
377
+ if (hasSenderKeys) {
378
+ logger.info({ senderKeyNames }, 'processing sender key set operations');
379
+ // Handle sender key operations with per-key queues
380
+ for (const senderKeyName of senderKeyNames) {
381
+ await queueSenderKeyOperation(senderKeyName, async () => {
382
+ // Create data subset for this specific sender key
383
+ const senderKeyData = {
384
+ 'sender-key': {
385
+ [senderKeyName]: data['sender-key'][senderKeyName]
386
+ }
387
+ };
388
+ logger.trace({ senderKeyName }, 'storing sender key');
389
+ // Apply changes to the store
390
+ await state.set(senderKeyData);
391
+ logger.trace({ senderKeyName }, 'sender key stored');
392
+ });
393
+ }
394
+ // Handle any non-sender-key data with regular mutexes
395
+ const nonSenderKeyData = { ...data };
396
+ delete nonSenderKeyData['sender-key'];
397
+ if (Object.keys(nonSenderKeyData).length > 0) {
398
+ await withMutexes(Object.keys(nonSenderKeyData), getKeyTypeMutex, async () => {
399
+ // Process pre-keys and signed-pre-keys separately with specialized mutexes
400
+ for (const key_ in nonSenderKeyData) {
401
+ const keyType = key_;
402
+ if (keyType === 'pre-key') {
403
+ await processPreKeyDeletions(nonSenderKeyData, keyType, state, logger);
404
+ }
405
+ }
406
+ // Apply changes to the store
407
+ await state.set(nonSenderKeyData);
408
+ });
409
+ }
410
+ }
411
+ else {
412
+ // No sender keys - use original logic
413
+ await withMutexes(Object.keys(data), getKeyTypeMutex, async () => {
414
+ // Process pre-keys and signed-pre-keys separately with specialized mutexes
415
+ for (const key_ in data) {
416
+ const keyType = key_;
417
+ if (keyType === 'pre-key') {
418
+ await processPreKeyDeletions(data, keyType, state, logger);
419
+ }
420
+ }
421
+ // Apply changes to the store
422
+ await state.set(data);
423
+ });
424
+ }
116
425
  }
117
426
  },
118
427
  isInTransaction,
119
- async transaction(work) {
120
- let result;
121
- transactionsInProgress += 1;
122
- if (transactionsInProgress === 1) {
123
- logger.trace('entering transaction');
124
- }
428
+ async transaction(work, key) {
429
+ const releaseTxMutex = await getTransactionMutex(key).acquire();
125
430
  try {
126
- result = await work();
127
- // commit if this is the outermost transaction
431
+ transactionsInProgress += 1;
128
432
  if (transactionsInProgress === 1) {
129
- if (Object.keys(mutations).length) {
130
- logger.trace('committing transaction');
131
- // retry mechanism to ensure we've some recovery
132
- // in case a transaction fails in the first attempt
133
- let tries = maxCommitRetries;
134
- while (tries) {
135
- tries -= 1;
136
- //eslint-disable-next-line max-depth
137
- try {
138
- await state.set(mutations);
139
- logger.trace({ dbQueriesInTransaction }, 'committed transaction');
140
- break;
141
- }
142
- catch (error) {
143
- logger.warn(`failed to commit ${Object.keys(mutations).length} mutations, tries left=${tries}`);
144
- await delay(delayBetweenTriesMs);
145
- }
146
- }
147
- }
148
- else {
149
- logger.trace('no mutations in transaction');
150
- }
433
+ logger.trace('entering transaction');
151
434
  }
152
- }
153
- finally {
154
- transactionsInProgress -= 1;
155
- if (transactionsInProgress === 0) {
156
- transactionCache = {};
157
- mutations = {};
158
- dbQueriesInTransaction = 0;
435
+ // Release the transaction mutex now that we've updated the counter
436
+ // This allows other transactions to start preparing
437
+ releaseTxMutex();
438
+ try {
439
+ return await executeTransactionWork(work);
440
+ }
441
+ finally {
442
+ cleanupTransactionState();
159
443
  }
160
444
  }
161
- return result;
445
+ catch (error) {
446
+ releaseTxMutex();
447
+ throw error;
448
+ }
162
449
  }
163
450
  };
164
- function isInTransaction() {
165
- return transactionsInProgress > 0;
166
- }
167
451
  };
168
452
  export const initAuthCreds = () => {
169
453
  const identityKey = Curve.generateKeyPair();
@@ -1 +1 @@
1
- {"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../src/Utils/auth-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../src/Utils/auth-utils.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,7 @@ export declare const encodeSyncdPatch: ({ type, index, syncAction, apiVersion, o
13
13
  state: LTHashState;
14
14
  }>;
15
15
  export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation | proto.ISyncdRecord)[], initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
16
- hash: Buffer<ArrayBufferLike>;
16
+ hash: Buffer<ArrayBuffer>;
17
17
  indexValueMap: {
18
18
  [indexMacBase64: string]: {
19
19
  valueMac: Uint8Array | Buffer;
@@ -21,7 +21,7 @@ export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation
21
21
  };
22
22
  }>;
23
23
  export declare const decodeSyncdPatch: (msg: proto.ISyncdPatch, name: WAPatchName, initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
24
- hash: Buffer<ArrayBufferLike>;
24
+ hash: Buffer<ArrayBuffer>;
25
25
  indexValueMap: {
26
26
  [indexMacBase64: string]: {
27
27
  valueMac: Uint8Array | Buffer;
@@ -1 +1 @@
1
- {"version":3,"file":"chat-utils.d.ts","sourceRoot":"","sources":["../../src/Utils/chat-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"chat-utils.d.ts","sourceRoot":"","sources":["../../src/Utils/chat-utils.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { Boom } from '@hapi/boom';
2
2
  import { proto } from '../../WAProto/index.js';
3
3
  import { LabelAssociationType } from '../Types/LabelAssociation.js';
4
- import { getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, isJidUser, jidNormalizedUser } from '../WABinary/index.js';
4
+ import { getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, jidNormalizedUser } from '../WABinary/index.js';
5
5
  import { aesDecrypt, aesEncrypt, hkdf, hmacSign } from './crypto.js';
6
6
  import { toNumber } from './generics.js';
7
7
  import { LT_HASH_ANTI_TAMPERING } from './lt-hash.js';
@@ -94,7 +94,7 @@ export const encodeSyncdPatch = async ({ type, index, syncAction, apiVersion, op
94
94
  const encKeyId = Buffer.from(myAppStateKeyId, 'base64');
95
95
  state = { ...state, indexValueMap: { ...state.indexValueMap } };
96
96
  const indexBuffer = Buffer.from(JSON.stringify(index));
97
- const dataProto = proto.SyncActionData.fromObject({
97
+ const dataProto = proto.SyncActionData.create({
98
98
  index: indexBuffer,
99
99
  value: syncAction,
100
100
  padding: new Uint8Array(0),
@@ -499,6 +499,23 @@ export const chatModificationToAppPatch = (mod, jid) => {
499
499
  operation: OP.SET
500
500
  };
501
501
  }
502
+ else if ('quickReply' in mod) {
503
+ patch = {
504
+ syncAction: {
505
+ quickReplyAction: {
506
+ count: 0,
507
+ deleted: mod.quickReply.deleted || false,
508
+ keywords: [],
509
+ message: mod.quickReply.message || '',
510
+ shortcut: mod.quickReply.shortcut || ''
511
+ }
512
+ },
513
+ index: ['quick_reply', mod.quickReply.timestamp || String(Math.floor(Date.now() / 1000))],
514
+ type: 'regular',
515
+ apiVersion: 2,
516
+ operation: OP.SET
517
+ };
518
+ }
502
519
  else if ('addLabel' in mod) {
503
520
  patch = {
504
521
  syncAction: {
@@ -653,7 +670,7 @@ export const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) =
653
670
  id: id,
654
671
  name: action.contactAction.fullName,
655
672
  lid: action.contactAction.lidJid || undefined,
656
- jid: isJidUser(id) ? id : undefined
673
+ phoneNumber: action.contactAction.pnJid || undefined
657
674
  }
658
675
  ]);
659
676
  }