@sixcore/baileys 1.0.0 → 1.0.2
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/index.js +14270 -302
- package/jessica.js +91 -0
- package/lib/Defaults/baileys-version.json +1 -1
- package/lib/Defaults/index.js +117 -79
- package/lib/Defaults/phonenumber-mcc.json +223 -0
- package/lib/Signal/Group/ciphertext-message.d.ts +9 -0
- package/lib/Signal/Group/ciphertext-message.js +15 -0
- package/lib/Signal/Group/group-session-builder.d.ts +14 -0
- package/lib/Signal/Group/group-session-builder.js +64 -0
- package/lib/Signal/Group/group_cipher.d.ts +17 -0
- package/lib/Signal/Group/group_cipher.js +96 -0
- package/lib/Signal/Group/index.d.ts +11 -0
- package/lib/Signal/Group/index.js +57 -0
- package/lib/Signal/Group/keyhelper.d.ts +10 -0
- package/lib/Signal/Group/keyhelper.js +55 -0
- package/lib/Signal/Group/queue-job.d.ts +1 -0
- package/lib/Signal/Group/queue-job.js +57 -0
- package/lib/Signal/Group/sender-chain-key.d.ts +13 -0
- package/lib/Signal/Group/sender-chain-key.js +34 -0
- package/lib/Signal/Group/sender-key-distribution-message.d.ts +16 -0
- package/lib/Signal/Group/sender-key-distribution-message.js +66 -0
- package/lib/Signal/Group/sender-key-message.d.ts +18 -0
- package/lib/Signal/Group/sender-key-message.js +69 -0
- package/lib/Signal/Group/sender-key-name.d.ts +17 -0
- package/lib/Signal/Group/sender-key-name.js +51 -0
- package/lib/Signal/Group/sender-key-record.d.ts +30 -0
- package/lib/Signal/Group/sender-key-record.js +53 -0
- package/lib/Signal/Group/sender-key-state.d.ts +38 -0
- package/lib/Signal/Group/sender-key-state.js +99 -0
- package/lib/Signal/Group/sender-message-key.d.ts +11 -0
- package/{WASignalGroup/sender_message_key.js → lib/Signal/Group/sender-message-key.js} +6 -16
- package/lib/Signal/libsignal.js +51 -29
- package/lib/Socket/business.d.ts +43 -42
- package/lib/Socket/chats.d.ts +222 -36
- package/lib/Socket/chats.js +173 -153
- package/lib/Socket/dugong.d.ts +254 -0
- package/lib/Socket/dugong.js +484 -0
- package/lib/Socket/groups.d.ts +7 -7
- package/lib/Socket/groups.js +37 -35
- package/lib/Socket/index.d.ts +52 -51
- package/lib/Socket/index.js +1 -0
- package/lib/Socket/messages-recv.d.ts +37 -34
- package/lib/Socket/messages-recv.js +175 -37
- package/lib/Socket/messages-send.d.ts +12 -18
- package/lib/Socket/messages-send.js +396 -574
- package/lib/Socket/newsletter.d.ts +28 -26
- package/lib/Socket/newsletter.js +132 -121
- package/lib/Socket/registration.d.ts +52 -49
- package/lib/Socket/registration.js +7 -7
- package/lib/Socket/socket.d.ts +0 -1
- package/lib/Socket/socket.js +49 -27
- package/lib/Socket/usync.d.ts +10 -11
- package/lib/Store/make-cache-manager-store.d.ts +1 -2
- package/lib/Store/make-in-memory-store.d.ts +2 -2
- package/lib/Store/make-in-memory-store.js +1 -5
- package/lib/Store/make-ordered-dictionary.js +2 -2
- package/lib/Types/Auth.d.ts +1 -0
- package/lib/Types/Call.d.ts +1 -1
- package/lib/Types/Chat.d.ts +7 -12
- package/lib/Types/Events.d.ts +2 -17
- package/lib/Types/GroupMetadata.d.ts +2 -3
- package/lib/Types/Label.d.ts +0 -11
- package/lib/Types/Label.js +1 -1
- package/lib/Types/LabelAssociation.js +1 -1
- package/lib/Types/Message.d.ts +10 -170
- package/lib/Types/Newsletter.d.ts +97 -86
- package/lib/Types/Newsletter.js +38 -32
- package/lib/Types/Socket.d.ts +2 -7
- package/lib/Types/index.d.ts +0 -9
- package/lib/Types/index.js +1 -1
- package/lib/Utils/auth-utils.js +14 -35
- package/lib/Utils/business.d.ts +1 -1
- package/lib/Utils/business.js +2 -2
- package/lib/Utils/chat-utils.d.ts +12 -11
- package/lib/Utils/chat-utils.js +36 -52
- package/lib/Utils/crypto.d.ts +16 -15
- package/lib/Utils/crypto.js +26 -74
- package/lib/Utils/decode-wa-message.d.ts +0 -17
- package/lib/Utils/decode-wa-message.js +17 -53
- package/lib/Utils/event-buffer.js +7 -10
- package/lib/Utils/generics.d.ts +17 -13
- package/lib/Utils/generics.js +79 -58
- package/lib/Utils/history.d.ts +2 -6
- package/lib/Utils/history.js +6 -4
- package/lib/Utils/logger.d.ts +3 -1
- package/lib/Utils/lt-hash.js +12 -12
- package/lib/Utils/make-mutex.d.ts +2 -2
- package/lib/Utils/messages-media.d.ts +28 -25
- package/lib/Utils/messages-media.js +733 -557
- package/lib/Utils/messages.js +68 -473
- package/lib/Utils/noise-handler.d.ts +5 -4
- package/lib/Utils/noise-handler.js +14 -19
- package/lib/Utils/process-message.d.ts +5 -5
- package/lib/Utils/process-message.js +23 -75
- package/lib/Utils/signal.d.ts +1 -2
- package/lib/Utils/signal.js +26 -32
- package/lib/Utils/use-multi-file-auth-state.d.ts +1 -0
- package/lib/Utils/use-multi-file-auth-state.js +66 -242
- package/lib/Utils/validate-connection.d.ts +1 -1
- package/lib/Utils/validate-connection.js +88 -64
- package/lib/WABinary/constants.d.ts +27 -24
- package/lib/WABinary/decode.d.ts +2 -1
- package/lib/WABinary/decode.js +11 -23
- package/lib/WABinary/encode.d.ts +2 -1
- package/lib/WABinary/encode.js +147 -134
- package/lib/WABinary/generic-utils.d.ts +5 -2
- package/lib/WABinary/generic-utils.js +125 -37
- package/lib/WABinary/jid-utils.d.ts +1 -1
- package/lib/WAM/BinaryInfo.d.ts +11 -2
- package/lib/WAM/encode.d.ts +2 -1
- package/lib/WAUSync/Protocols/USyncStatusProtocol.js +3 -3
- package/lib/WAUSync/USyncUser.d.ts +2 -0
- package/lib/index.d.ts +12 -0
- package/lib/index.js +64 -1
- package/package.json +113 -51
- package/WAProto/GenerateStatics.sh +0 -4
- package/WAProto/WAProto.proto +0 -4357
- package/WAProto/index.d.ts +0 -50383
- package/WASignalGroup/GroupProtocol.js +0 -1697
- package/WASignalGroup/ciphertext_message.js +0 -16
- package/WASignalGroup/generate-proto.sh +0 -1
- package/WASignalGroup/group.proto +0 -42
- package/WASignalGroup/group_cipher.js +0 -120
- package/WASignalGroup/group_session_builder.js +0 -46
- package/WASignalGroup/index.js +0 -5
- package/WASignalGroup/keyhelper.js +0 -21
- package/WASignalGroup/protobufs.js +0 -3
- package/WASignalGroup/queue_job.js +0 -69
- package/WASignalGroup/sender_chain_key.js +0 -50
- package/WASignalGroup/sender_key_distribution_message.js +0 -78
- package/WASignalGroup/sender_key_message.js +0 -92
- package/WASignalGroup/sender_key_name.js +0 -70
- package/WASignalGroup/sender_key_record.js +0 -56
- package/WASignalGroup/sender_key_state.js +0 -129
- package/lib/Utils/use-single-file-auth-state.d.ts +0 -12
- package/lib/Utils/use-single-file-auth-state.js +0 -75
- package/src/Defaults/baileys-version.json +0 -3
- package/src/Defaults/index.ts +0 -133
- package/src/Signal/Group/ciphertext-message.ts +0 -9
- package/src/Signal/Group/group-session-builder.ts +0 -56
- package/src/Signal/Group/group_cipher.ts +0 -117
- package/src/Signal/Group/index.ts +0 -11
- package/src/Signal/Group/keyhelper.ts +0 -28
- package/src/Signal/Group/sender-chain-key.ts +0 -34
- package/src/Signal/Group/sender-key-distribution-message.ts +0 -95
- package/src/Signal/Group/sender-key-message.ts +0 -96
- package/src/Signal/Group/sender-key-name.ts +0 -66
- package/src/Signal/Group/sender-key-record.ts +0 -69
- package/src/Signal/Group/sender-key-state.ts +0 -134
- package/src/Signal/Group/sender-message-key.ts +0 -36
- package/src/Signal/libsignal.ts +0 -447
- package/src/Signal/lid-mapping.ts +0 -209
- package/src/Socket/Client/index.ts +0 -2
- package/src/Socket/Client/types.ts +0 -22
- package/src/Socket/Client/websocket.ts +0 -56
- package/src/Socket/business.ts +0 -421
- package/src/Socket/chats.ts +0 -1223
- package/src/Socket/communities.ts +0 -477
- package/src/Socket/groups.ts +0 -361
- package/src/Socket/index.ts +0 -22
- package/src/Socket/messages-recv.ts +0 -1563
- package/src/Socket/messages-send.ts +0 -1210
- package/src/Socket/mex.ts +0 -58
- package/src/Socket/newsletter.ts +0 -229
- package/src/Socket/socket.ts +0 -1072
- package/src/Types/Auth.ts +0 -115
- package/src/Types/Bussines.ts +0 -20
- package/src/Types/Call.ts +0 -14
- package/src/Types/Chat.ts +0 -138
- package/src/Types/Contact.ts +0 -24
- package/src/Types/Events.ts +0 -132
- package/src/Types/GroupMetadata.ts +0 -70
- package/src/Types/Label.ts +0 -48
- package/src/Types/LabelAssociation.ts +0 -35
- package/src/Types/Message.ts +0 -424
- package/src/Types/Newsletter.ts +0 -98
- package/src/Types/Product.ts +0 -85
- package/src/Types/Signal.ts +0 -76
- package/src/Types/Socket.ts +0 -150
- package/src/Types/State.ts +0 -43
- package/src/Types/USync.ts +0 -27
- package/src/Types/globals.d.ts +0 -8
- package/src/Types/index.ts +0 -67
- package/src/Utils/auth-utils.ts +0 -331
- package/src/Utils/browser-utils.ts +0 -31
- package/src/Utils/business.ts +0 -286
- package/src/Utils/chat-utils.ts +0 -933
- package/src/Utils/crypto.ts +0 -184
- package/src/Utils/decode-wa-message.ts +0 -355
- package/src/Utils/event-buffer.ts +0 -662
- package/src/Utils/generics.ts +0 -470
- package/src/Utils/history.ts +0 -114
- package/src/Utils/index.ts +0 -18
- package/src/Utils/link-preview.ts +0 -111
- package/src/Utils/logger.ts +0 -13
- package/src/Utils/lt-hash.ts +0 -65
- package/src/Utils/make-mutex.ts +0 -45
- package/src/Utils/message-retry-manager.ts +0 -229
- package/src/Utils/messages-media.ts +0 -820
- package/src/Utils/messages.ts +0 -1137
- package/src/Utils/noise-handler.ts +0 -192
- package/src/Utils/pre-key-manager.ts +0 -126
- package/src/Utils/process-message.ts +0 -622
- package/src/Utils/signal.ts +0 -214
- package/src/Utils/use-multi-file-auth-state.ts +0 -136
- package/src/Utils/validate-connection.ts +0 -253
- package/src/WABinary/constants.ts +0 -1305
- package/src/WABinary/decode.ts +0 -281
- package/src/WABinary/encode.ts +0 -253
- package/src/WABinary/generic-utils.ts +0 -127
- package/src/WABinary/index.ts +0 -5
- package/src/WABinary/jid-utils.ts +0 -128
- package/src/WABinary/types.ts +0 -17
- package/src/WAM/BinaryInfo.ts +0 -12
- package/src/WAM/constants.ts +0 -22889
- package/src/WAM/encode.ts +0 -169
- package/src/WAM/index.ts +0 -3
- package/src/WAUSync/Protocols/USyncContactProtocol.ts +0 -32
- package/src/WAUSync/Protocols/USyncDeviceProtocol.ts +0 -78
- package/src/WAUSync/Protocols/USyncDisappearingModeProtocol.ts +0 -35
- package/src/WAUSync/Protocols/USyncStatusProtocol.ts +0 -44
- package/src/WAUSync/Protocols/UsyncBotProfileProtocol.ts +0 -76
- package/src/WAUSync/Protocols/UsyncLIDProtocol.ts +0 -33
- package/src/WAUSync/Protocols/index.ts +0 -4
- package/src/WAUSync/USyncQuery.ts +0 -133
- package/src/WAUSync/USyncUser.ts +0 -32
- package/src/WAUSync/index.ts +0 -3
- package/src/index.ts +0 -13
package/src/Utils/logger.ts
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import P from 'pino'
|
|
2
|
-
|
|
3
|
-
export interface ILogger {
|
|
4
|
-
level: string
|
|
5
|
-
child(obj: Record<string, unknown>): ILogger
|
|
6
|
-
trace(obj: unknown, msg?: string): void
|
|
7
|
-
debug(obj: unknown, msg?: string): void
|
|
8
|
-
info(obj: unknown, msg?: string): void
|
|
9
|
-
warn(obj: unknown, msg?: string): void
|
|
10
|
-
error(obj: unknown, msg?: string): void
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
export default P({ timestamp: () => `,"time":"${new Date().toJSON()}"` })
|
package/src/Utils/lt-hash.ts
DELETED
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
import { hkdf } from './crypto'
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* LT Hash is a summation based hash algorithm that maintains the integrity of a piece of data
|
|
5
|
-
* over a series of mutations. You can add/remove mutations and it'll return a hash equal to
|
|
6
|
-
* if the same series of mutations was made sequentially.
|
|
7
|
-
*/
|
|
8
|
-
const o = 128
|
|
9
|
-
|
|
10
|
-
class LTHash {
|
|
11
|
-
salt: string
|
|
12
|
-
|
|
13
|
-
constructor(e: string) {
|
|
14
|
-
this.salt = e
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
async add(e: ArrayBuffer, t: ArrayBuffer[]): Promise<ArrayBuffer> {
|
|
18
|
-
for (const item of t) {
|
|
19
|
-
e = await this._addSingle(e, item)
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
return e
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
async subtract(e: ArrayBuffer, t: ArrayBuffer[]): Promise<ArrayBuffer> {
|
|
26
|
-
for (const item of t) {
|
|
27
|
-
e = await this._subtractSingle(e, item)
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
return e
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
async subtractThenAdd(e: ArrayBuffer, addList: ArrayBuffer[], subtractList: ArrayBuffer[]): Promise<ArrayBuffer> {
|
|
34
|
-
const subtracted = await this.subtract(e, subtractList)
|
|
35
|
-
return this.add(subtracted, addList)
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
private async _addSingle(e: ArrayBuffer, t: ArrayBuffer): Promise<ArrayBuffer> {
|
|
39
|
-
const derived = new Uint8Array(await hkdf(Buffer.from(t), o, { info: this.salt })).buffer
|
|
40
|
-
return this.performPointwiseWithOverflow(e, derived, (a, b) => a + b)
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
private async _subtractSingle(e: ArrayBuffer, t: ArrayBuffer): Promise<ArrayBuffer> {
|
|
44
|
-
const derived = new Uint8Array(await hkdf(Buffer.from(t), o, { info: this.salt })).buffer
|
|
45
|
-
return this.performPointwiseWithOverflow(e, derived, (a, b) => a - b)
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
private performPointwiseWithOverflow(
|
|
49
|
-
e: ArrayBuffer,
|
|
50
|
-
t: ArrayBuffer,
|
|
51
|
-
op: (a: number, b: number) => number
|
|
52
|
-
): ArrayBuffer {
|
|
53
|
-
const n = new DataView(e)
|
|
54
|
-
const i = new DataView(t)
|
|
55
|
-
const out = new ArrayBuffer(n.byteLength)
|
|
56
|
-
const s = new DataView(out)
|
|
57
|
-
|
|
58
|
-
for (let offset = 0; offset < n.byteLength; offset += 2) {
|
|
59
|
-
s.setUint16(offset, op(n.getUint16(offset, true), i.getUint16(offset, true)), true)
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
return out
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
export const LT_HASH_ANTI_TAMPERING = new LTHash('WhatsApp Patch Integrity')
|
package/src/Utils/make-mutex.ts
DELETED
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
export const makeMutex = () => {
|
|
2
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
3
|
-
let task = Promise.resolve() as Promise<any>
|
|
4
|
-
|
|
5
|
-
let taskTimeout: NodeJS.Timeout | undefined
|
|
6
|
-
|
|
7
|
-
return {
|
|
8
|
-
mutex<T>(code: () => Promise<T> | T): Promise<T> {
|
|
9
|
-
task = (async () => {
|
|
10
|
-
// wait for the previous task to complete
|
|
11
|
-
// if there is an error, we swallow so as to not block the queue
|
|
12
|
-
try {
|
|
13
|
-
await task
|
|
14
|
-
} catch {}
|
|
15
|
-
|
|
16
|
-
try {
|
|
17
|
-
// execute the current task
|
|
18
|
-
const result = await code()
|
|
19
|
-
return result
|
|
20
|
-
} finally {
|
|
21
|
-
clearTimeout(taskTimeout)
|
|
22
|
-
}
|
|
23
|
-
})()
|
|
24
|
-
// we replace the existing task, appending the new piece of execution to it
|
|
25
|
-
// so the next task will have to wait for this one to finish
|
|
26
|
-
return task
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export type Mutex = ReturnType<typeof makeMutex>
|
|
32
|
-
|
|
33
|
-
export const makeKeyedMutex = () => {
|
|
34
|
-
const map: { [id: string]: Mutex } = {}
|
|
35
|
-
|
|
36
|
-
return {
|
|
37
|
-
mutex<T>(key: string, task: () => Promise<T> | T): Promise<T> {
|
|
38
|
-
if (!map[key]) {
|
|
39
|
-
map[key] = makeMutex()
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
return map[key].mutex(task)
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
}
|
|
@@ -1,229 +0,0 @@
|
|
|
1
|
-
import { LRUCache } from 'lru-cache'
|
|
2
|
-
import type { proto } from '../../WAProto/index.js'
|
|
3
|
-
import type { ILogger } from './logger'
|
|
4
|
-
|
|
5
|
-
/** Number of sent messages to cache in memory for handling retry receipts */
|
|
6
|
-
const RECENT_MESSAGES_SIZE = 512
|
|
7
|
-
|
|
8
|
-
const MESSAGE_KEY_SEPARATOR = '\u0000'
|
|
9
|
-
|
|
10
|
-
/** Timeout for session recreation - 1 hour */
|
|
11
|
-
const RECREATE_SESSION_TIMEOUT = 60 * 60 * 1000 // 1 hour in milliseconds
|
|
12
|
-
const PHONE_REQUEST_DELAY = 3000
|
|
13
|
-
export interface RecentMessageKey {
|
|
14
|
-
to: string
|
|
15
|
-
id: string
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
export interface RecentMessage {
|
|
19
|
-
message: proto.IMessage
|
|
20
|
-
timestamp: number
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export interface SessionRecreateHistory {
|
|
24
|
-
[jid: string]: number // timestamp
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
export interface RetryCounter {
|
|
28
|
-
[messageId: string]: number
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export type PendingPhoneRequest = Record<string, ReturnType<typeof setTimeout>>
|
|
32
|
-
|
|
33
|
-
export interface RetryStatistics {
|
|
34
|
-
totalRetries: number
|
|
35
|
-
successfulRetries: number
|
|
36
|
-
failedRetries: number
|
|
37
|
-
mediaRetries: number
|
|
38
|
-
sessionRecreations: number
|
|
39
|
-
phoneRequests: number
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
export class MessageRetryManager {
|
|
43
|
-
private recentMessagesMap = new LRUCache<string, RecentMessage>({
|
|
44
|
-
max: RECENT_MESSAGES_SIZE,
|
|
45
|
-
ttl: 5 * 60 * 1000,
|
|
46
|
-
ttlAutopurge: true,
|
|
47
|
-
dispose: (_value: RecentMessage, key: string) => {
|
|
48
|
-
const separatorIndex = key.lastIndexOf(MESSAGE_KEY_SEPARATOR)
|
|
49
|
-
if (separatorIndex > -1) {
|
|
50
|
-
const messageId = key.slice(separatorIndex + MESSAGE_KEY_SEPARATOR.length)
|
|
51
|
-
this.messageKeyIndex.delete(messageId)
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
})
|
|
55
|
-
private messageKeyIndex = new Map<string, string>()
|
|
56
|
-
private sessionRecreateHistory = new LRUCache<string, number>({
|
|
57
|
-
ttl: RECREATE_SESSION_TIMEOUT * 2,
|
|
58
|
-
ttlAutopurge: true
|
|
59
|
-
})
|
|
60
|
-
private retryCounters = new LRUCache<string, number>({
|
|
61
|
-
ttl: 15 * 60 * 1000,
|
|
62
|
-
ttlAutopurge: true,
|
|
63
|
-
updateAgeOnGet: true
|
|
64
|
-
}) // 15 minutes TTL
|
|
65
|
-
private pendingPhoneRequests: PendingPhoneRequest = {}
|
|
66
|
-
private readonly maxMsgRetryCount: number = 5
|
|
67
|
-
private statistics: RetryStatistics = {
|
|
68
|
-
totalRetries: 0,
|
|
69
|
-
successfulRetries: 0,
|
|
70
|
-
failedRetries: 0,
|
|
71
|
-
mediaRetries: 0,
|
|
72
|
-
sessionRecreations: 0,
|
|
73
|
-
phoneRequests: 0
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
constructor(
|
|
77
|
-
private logger: ILogger,
|
|
78
|
-
maxMsgRetryCount: number
|
|
79
|
-
) {
|
|
80
|
-
this.maxMsgRetryCount = maxMsgRetryCount
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
/**
|
|
84
|
-
* Add a recent message to the cache for retry handling
|
|
85
|
-
*/
|
|
86
|
-
addRecentMessage(to: string, id: string, message: proto.IMessage): void {
|
|
87
|
-
const key: RecentMessageKey = { to, id }
|
|
88
|
-
const keyStr = this.keyToString(key)
|
|
89
|
-
|
|
90
|
-
// Add new message
|
|
91
|
-
this.recentMessagesMap.set(keyStr, {
|
|
92
|
-
message,
|
|
93
|
-
timestamp: Date.now()
|
|
94
|
-
})
|
|
95
|
-
this.messageKeyIndex.set(id, keyStr)
|
|
96
|
-
|
|
97
|
-
this.logger.debug(`Added message to retry cache: ${to}/${id}`)
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
/**
|
|
101
|
-
* Get a recent message from the cache
|
|
102
|
-
*/
|
|
103
|
-
getRecentMessage(to: string, id: string): RecentMessage | undefined {
|
|
104
|
-
const key: RecentMessageKey = { to, id }
|
|
105
|
-
const keyStr = this.keyToString(key)
|
|
106
|
-
return this.recentMessagesMap.get(keyStr)
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
/**
|
|
110
|
-
* Check if a session should be recreated based on retry count and history
|
|
111
|
-
*/
|
|
112
|
-
shouldRecreateSession(jid: string, retryCount: number, hasSession: boolean): { reason: string; recreate: boolean } {
|
|
113
|
-
// If we don't have a session, always recreate
|
|
114
|
-
if (!hasSession) {
|
|
115
|
-
this.sessionRecreateHistory.set(jid, Date.now())
|
|
116
|
-
this.statistics.sessionRecreations++
|
|
117
|
-
return {
|
|
118
|
-
reason: "we don't have a Signal session with them",
|
|
119
|
-
recreate: true
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
// Only consider recreation if retry count > 1
|
|
124
|
-
if (retryCount < 2) {
|
|
125
|
-
return { reason: '', recreate: false }
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
const now = Date.now()
|
|
129
|
-
const prevTime = this.sessionRecreateHistory.get(jid)
|
|
130
|
-
|
|
131
|
-
// If no previous recreation or it's been more than an hour
|
|
132
|
-
if (!prevTime || now - prevTime > RECREATE_SESSION_TIMEOUT) {
|
|
133
|
-
this.sessionRecreateHistory.set(jid, now)
|
|
134
|
-
this.statistics.sessionRecreations++
|
|
135
|
-
return {
|
|
136
|
-
reason: 'retry count > 1 and over an hour since last recreation',
|
|
137
|
-
recreate: true
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
return { reason: '', recreate: false }
|
|
142
|
-
}
|
|
143
|
-
|
|
144
|
-
/**
|
|
145
|
-
* Increment retry counter for a message
|
|
146
|
-
*/
|
|
147
|
-
incrementRetryCount(messageId: string): number {
|
|
148
|
-
this.retryCounters.set(messageId, (this.retryCounters.get(messageId) || 0) + 1)
|
|
149
|
-
this.statistics.totalRetries++
|
|
150
|
-
return this.retryCounters.get(messageId)!
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
/**
|
|
154
|
-
* Get retry count for a message
|
|
155
|
-
*/
|
|
156
|
-
getRetryCount(messageId: string): number {
|
|
157
|
-
return this.retryCounters.get(messageId) || 0
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
/**
|
|
161
|
-
* Check if message has exceeded maximum retry attempts
|
|
162
|
-
*/
|
|
163
|
-
hasExceededMaxRetries(messageId: string): boolean {
|
|
164
|
-
return this.getRetryCount(messageId) >= this.maxMsgRetryCount
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
/**
|
|
168
|
-
* Mark retry as successful
|
|
169
|
-
*/
|
|
170
|
-
markRetrySuccess(messageId: string): void {
|
|
171
|
-
this.statistics.successfulRetries++
|
|
172
|
-
// Clean up retry counter for successful message
|
|
173
|
-
this.retryCounters.delete(messageId)
|
|
174
|
-
this.cancelPendingPhoneRequest(messageId)
|
|
175
|
-
this.removeRecentMessage(messageId)
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
/**
|
|
179
|
-
* Mark retry as failed
|
|
180
|
-
*/
|
|
181
|
-
markRetryFailed(messageId: string): void {
|
|
182
|
-
this.statistics.failedRetries++
|
|
183
|
-
this.retryCounters.delete(messageId)
|
|
184
|
-
this.cancelPendingPhoneRequest(messageId)
|
|
185
|
-
this.removeRecentMessage(messageId)
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
/**
|
|
189
|
-
* Schedule a phone request with delay
|
|
190
|
-
*/
|
|
191
|
-
schedulePhoneRequest(messageId: string, callback: () => void, delay: number = PHONE_REQUEST_DELAY): void {
|
|
192
|
-
// Cancel any existing request for this message
|
|
193
|
-
this.cancelPendingPhoneRequest(messageId)
|
|
194
|
-
|
|
195
|
-
this.pendingPhoneRequests[messageId] = setTimeout(() => {
|
|
196
|
-
delete this.pendingPhoneRequests[messageId]
|
|
197
|
-
this.statistics.phoneRequests++
|
|
198
|
-
callback()
|
|
199
|
-
}, delay)
|
|
200
|
-
|
|
201
|
-
this.logger.debug(`Scheduled phone request for message ${messageId} with ${delay}ms delay`)
|
|
202
|
-
}
|
|
203
|
-
|
|
204
|
-
/**
|
|
205
|
-
* Cancel pending phone request
|
|
206
|
-
*/
|
|
207
|
-
cancelPendingPhoneRequest(messageId: string): void {
|
|
208
|
-
const timeout = this.pendingPhoneRequests[messageId]
|
|
209
|
-
if (timeout) {
|
|
210
|
-
clearTimeout(timeout)
|
|
211
|
-
delete this.pendingPhoneRequests[messageId]
|
|
212
|
-
this.logger.debug(`Cancelled pending phone request for message ${messageId}`)
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
private keyToString(key: RecentMessageKey): string {
|
|
217
|
-
return `${key.to}${MESSAGE_KEY_SEPARATOR}${key.id}`
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
private removeRecentMessage(messageId: string): void {
|
|
221
|
-
const keyStr = this.messageKeyIndex.get(messageId)
|
|
222
|
-
if (!keyStr) {
|
|
223
|
-
return
|
|
224
|
-
}
|
|
225
|
-
|
|
226
|
-
this.recentMessagesMap.delete(keyStr)
|
|
227
|
-
this.messageKeyIndex.delete(messageId)
|
|
228
|
-
}
|
|
229
|
-
}
|