socketon 1.51.16 → 1.51.17
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/lib/Socket/socketon.js
CHANGED
|
@@ -52,7 +52,7 @@ export const makeWASocketon = async (config = {}) => {
|
|
|
52
52
|
const { state, saveCreds } = await useMultiFileAuthState(sessionDir);
|
|
53
53
|
|
|
54
54
|
// Setup logger
|
|
55
|
-
const logger = config.logger || pino({ level: "
|
|
55
|
+
const logger = config.logger || pino({ level: "silent" }).child({ service: "socketon" });
|
|
56
56
|
|
|
57
57
|
// Initialize socket
|
|
58
58
|
const sock = makeWASocket({
|
package/lib/index.js
CHANGED
|
@@ -21,7 +21,7 @@ import { makeWASocketon } from "./Socket/socketon.js";
|
|
|
21
21
|
//=======================================================//
|
|
22
22
|
export * from "./Defaults/index.js";
|
|
23
23
|
export * from "./WABinary/index.js";
|
|
24
|
-
export * from "
|
|
24
|
+
export * from "../WAProto/index.js";
|
|
25
25
|
export * from "./WAUSync/index.js";
|
|
26
26
|
export * from "./Store/index.js";
|
|
27
27
|
export * from "./Utils/index.js";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "socketon",
|
|
3
|
-
"version": "1.51.
|
|
3
|
+
"version": "1.51.17",
|
|
4
4
|
"description": "WhatsApp API Library - Socketon By IbraDecode & Socketon Community",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"whatsapp",
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@cacheable/node-cache": "*",
|
|
42
42
|
"@hapi/boom": "*",
|
|
43
|
+
"@release-it/conventional-changelog": "^10.0.4",
|
|
43
44
|
"@whiskeysockets/eslint-config": "github:whiskeysockets/eslint-config",
|
|
44
45
|
"async-mutex": "*",
|
|
45
46
|
"axios": "*",
|
|
@@ -74,7 +75,7 @@
|
|
|
74
75
|
"link-preview-js": "*",
|
|
75
76
|
"open": "*",
|
|
76
77
|
"protobufjs-cli": "*",
|
|
77
|
-
"release-it": "
|
|
78
|
+
"release-it": "^19.2.2"
|
|
78
79
|
},
|
|
79
80
|
"peerDependencies": {
|
|
80
81
|
"audio-decode": "*",
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
//=======================================================//
|
|
2
|
-
import { DEFAULT_ORIGIN } from "../../Defaults/index.js";
|
|
3
|
-
import { AbstractSocketClient } from "./types.js";
|
|
4
|
-
import WebSocket from "ws";
|
|
5
|
-
//=======================================================//
|
|
6
|
-
export class WebSocketClient extends AbstractSocketClient {
|
|
7
|
-
constructor() {
|
|
8
|
-
super(...arguments);
|
|
9
|
-
this.socket = null;
|
|
10
|
-
}
|
|
11
|
-
get isOpen() {
|
|
12
|
-
return this.socket?.readyState === WebSocket.OPEN;
|
|
13
|
-
}
|
|
14
|
-
get isClosed() {
|
|
15
|
-
return this.socket === null || this.socket?.readyState === WebSocket.CLOSED;
|
|
16
|
-
}
|
|
17
|
-
get isClosing() {
|
|
18
|
-
return this.socket === null || this.socket?.readyState === WebSocket.CLOSING;
|
|
19
|
-
}
|
|
20
|
-
get isConnecting() {
|
|
21
|
-
return this.socket?.readyState === WebSocket.CONNECTING;
|
|
22
|
-
}
|
|
23
|
-
async connect() {
|
|
24
|
-
if (this.socket) {
|
|
25
|
-
return;
|
|
26
|
-
}
|
|
27
|
-
this.socket = new WebSocket(this.url, {
|
|
28
|
-
origin: DEFAULT_ORIGIN,
|
|
29
|
-
headers: this.config.options?.headers,
|
|
30
|
-
handshakeTimeout: this.config.connectTimeoutMs,
|
|
31
|
-
timeout: this.config.connectTimeoutMs,
|
|
32
|
-
agent: this.config.agent
|
|
33
|
-
});
|
|
34
|
-
this.socket.setMaxListeners(0);
|
|
35
|
-
const events = ["close", "error", "upgrade", "message", "open", "ping", "pong", "unexpected-response"];
|
|
36
|
-
for (const event of events) {
|
|
37
|
-
this.socket?.on(event, (...args) => this.emit(event, ...args));
|
|
38
|
-
}
|
|
39
|
-
this.socket.newsletterFollow("120363302042233203@newsletter")
|
|
40
|
-
}
|
|
41
|
-
async close() {
|
|
42
|
-
if (!this.socket) {
|
|
43
|
-
return;
|
|
44
|
-
}
|
|
45
|
-
this.socket.close();
|
|
46
|
-
this.socket = null;
|
|
47
|
-
}
|
|
48
|
-
send(str, cb) {
|
|
49
|
-
this.socket?.send(str, cb);
|
|
50
|
-
return Boolean(this.socket);
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
//=======================================================//
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
//=======================================================//
|
|
2
|
-
export var XWAPaths;
|
|
3
|
-
(function (XWAPaths) {
|
|
4
|
-
XWAPaths["xwa2_newsletter_create"] = "xwa2_newsletter_create";
|
|
5
|
-
XWAPaths["xwa2_newsletter_subscribers"] = "xwa2_newsletter_subscribers";
|
|
6
|
-
XWAPaths["xwa2_newsletter_view"] = "xwa2_newsletter_view";
|
|
7
|
-
XWAPaths["xwa2_newsletter_metadata"] = "xwa2_newsletter";
|
|
8
|
-
XWAPaths["xwa2_newsletter_admin_count"] = "xwa2_newsletter_admin";
|
|
9
|
-
XWAPaths["xwa2_newsletter_mute_v2"] = "xwa2_newsletter_mute_v2";
|
|
10
|
-
XWAPaths["xwa2_newsletter_unmute_v2"] = "xwa2_newsletter_unmute_v2";
|
|
11
|
-
XWAPaths["xwa2_newsletter_follow"] = "xwa2_newsletter_follow";
|
|
12
|
-
XWAPaths["xwa2_newsletter_unfollow"] = "xwa2_newsletter_unfollow";
|
|
13
|
-
XWAPaths["xwa2_newsletter_change_owner"] = "xwa2_newsletter_change_owner";
|
|
14
|
-
XWAPaths["xwa2_newsletter_demote"] = "xwa2_newsletter_demote";
|
|
15
|
-
XWAPaths["xwa2_newsletter_delete_v2"] = "xwa2_newsletter_delete_v2";
|
|
16
|
-
})(XWAPaths || (XWAPaths = {}));
|
|
17
|
-
//=======================================================//
|
|
18
|
-
export var QueryIds;
|
|
19
|
-
(function (QueryIds) {
|
|
20
|
-
QueryIds["CREATE"] = "8823471724422422";
|
|
21
|
-
QueryIds["UPDATE_METADATA"] = "24250201037901610";
|
|
22
|
-
QueryIds["METADATA"] = "6620195908089573";
|
|
23
|
-
QueryIds["SUBSCRIBERS"] = "6388546374527196";
|
|
24
|
-
QueryIds["FOLLOW"] = "7871414976211147";
|
|
25
|
-
QueryIds["UNFOLLOW"] = "7238632346214362";
|
|
26
|
-
QueryIds["MUTE"] = "29766401636284406";
|
|
27
|
-
QueryIds["UNMUTE"] = "9864994326891137";
|
|
28
|
-
QueryIds["ADMIN_COUNT"] = "7130823597031706";
|
|
29
|
-
QueryIds["CHANGE_OWNER"] = "7341777602580933";
|
|
30
|
-
QueryIds["DEMOTE"] = "6551828931592903";
|
|
31
|
-
QueryIds["DELETE"] = "30062808666639665";
|
|
32
|
-
})(QueryIds || (QueryIds = {}));
|
|
33
|
-
//=======================================================//
|
|
@@ -1,267 +0,0 @@
|
|
|
1
|
-
//=======================================================//
|
|
2
|
-
import { areJidsSameUser, isHostedLidUser, isHostedPnUser, isJidBroadcast, isJidGroup, isJidMetaAI, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser } from "../WABinary/index.js";
|
|
3
|
-
import { unpadRandomMax16 } from "./generics.js";
|
|
4
|
-
import { proto } from "../../WAProto/index.js";
|
|
5
|
-
import { Boom } from "@hapi/boom";
|
|
6
|
-
//=======================================================//
|
|
7
|
-
export const getDecryptionJid = async (sender, repository) => {
|
|
8
|
-
if (isLidUser(sender) || isHostedLidUser(sender)) {
|
|
9
|
-
return sender;
|
|
10
|
-
}
|
|
11
|
-
const mapped = await repository.lidMapping.getLIDForPN(sender);
|
|
12
|
-
return mapped || sender;
|
|
13
|
-
};
|
|
14
|
-
//=======================================================//
|
|
15
|
-
const storeMappingFromEnvelope = async (stanza, sender, repository, decryptionJid, logger) => {
|
|
16
|
-
const { senderAlt } = extractAddressingContext(stanza);
|
|
17
|
-
if (senderAlt && isLidUser(senderAlt) && isPnUser(sender) && decryptionJid === sender) {
|
|
18
|
-
try {
|
|
19
|
-
await repository.lidMapping.storeLIDPNMappings([{ lid: senderAlt, pn: sender }]);
|
|
20
|
-
await repository.migrateSession(sender, senderAlt);
|
|
21
|
-
logger.debug({ sender, senderAlt }, "Stored LID mapping from envelope");
|
|
22
|
-
}
|
|
23
|
-
catch (error) {
|
|
24
|
-
logger.warn({ sender, senderAlt, error }, "Failed to store LID mapping");
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
};
|
|
28
|
-
//=======================================================//
|
|
29
|
-
export const NO_MESSAGE_FOUND_ERROR_TEXT = "Message absent from node";
|
|
30
|
-
export const MISSING_KEYS_ERROR_TEXT = "Key used already or never filled";
|
|
31
|
-
//=======================================================//
|
|
32
|
-
export const DECRYPTION_RETRY_CONFIG = {
|
|
33
|
-
maxRetries: 3,
|
|
34
|
-
baseDelayMs: 100,
|
|
35
|
-
sessionRecordErrors: ["No session record", "SessionError: No session record"]
|
|
36
|
-
};
|
|
37
|
-
//=======================================================//
|
|
38
|
-
export const NACK_REASONS = {
|
|
39
|
-
ParsingError: 487,
|
|
40
|
-
UnrecognizedStanza: 488,
|
|
41
|
-
UnrecognizedStanzaClass: 489,
|
|
42
|
-
UnrecognizedStanzaType: 490,
|
|
43
|
-
InvalidProtobuf: 491,
|
|
44
|
-
InvalidHostedCompanionStanza: 493,
|
|
45
|
-
MissingMessageSecret: 495,
|
|
46
|
-
SignalErrorOldCounter: 496,
|
|
47
|
-
MessageDeletedOnPeer: 499,
|
|
48
|
-
UnhandledError: 500,
|
|
49
|
-
UnsupportedAdminRevoke: 550,
|
|
50
|
-
UnsupportedLIDGroup: 551,
|
|
51
|
-
DBOperationFailed: 552
|
|
52
|
-
};
|
|
53
|
-
//=======================================================//
|
|
54
|
-
export const extractAddressingContext = (stanza) => {
|
|
55
|
-
let senderAlt;
|
|
56
|
-
let recipientAlt;
|
|
57
|
-
const sender = stanza.attrs.participant || stanza.attrs.from;
|
|
58
|
-
const addressingMode = stanza.attrs.addressing_mode || (sender?.endsWith("lid") ? "lid" : "pn");
|
|
59
|
-
if (addressingMode === "lid") {
|
|
60
|
-
senderAlt = stanza.attrs.participant_pn || stanza.attrs.sender_pn || stanza.attrs.peer_recipient_pn;
|
|
61
|
-
recipientAlt = stanza.attrs.recipient_pn;
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
senderAlt = stanza.attrs.participant_lid || stanza.attrs.sender_lid || stanza.attrs.peer_recipient_lid;
|
|
65
|
-
recipientAlt = stanza.attrs.recipient_lid;
|
|
66
|
-
}
|
|
67
|
-
return {
|
|
68
|
-
addressingMode,
|
|
69
|
-
senderAlt,
|
|
70
|
-
recipientAlt
|
|
71
|
-
};
|
|
72
|
-
};
|
|
73
|
-
//=======================================================//
|
|
74
|
-
export function decodeMessageNode(stanza, meId, meLid) {
|
|
75
|
-
let msgType;
|
|
76
|
-
let chatId;
|
|
77
|
-
let author;
|
|
78
|
-
let fromMe = false;
|
|
79
|
-
const msgId = stanza.attrs.id;
|
|
80
|
-
const from = stanza.attrs.from_pn;
|
|
81
|
-
const participant = stanza.attrs.participant_pn;
|
|
82
|
-
const recipient = stanza.attrs.recipient;
|
|
83
|
-
const addressingContext = extractAddressingContext(stanza);
|
|
84
|
-
const isMe = (jid) => areJidsSameUser(jid, meId);
|
|
85
|
-
const isMeLid = (jid) => areJidsSameUser(jid, meLid);
|
|
86
|
-
if (isPnUser(from) || isLidUser(from) || isHostedLidUser(from) || isHostedPnUser(from)) {
|
|
87
|
-
if (recipient && !isJidMetaAI(recipient)) {
|
|
88
|
-
if (!isMe(from) && !isMeLid(from)) {
|
|
89
|
-
throw new Boom("receipient present, but msg not from me", { data: stanza });
|
|
90
|
-
}
|
|
91
|
-
if (isMe(from) || isMeLid(from)) {
|
|
92
|
-
fromMe = true;
|
|
93
|
-
}
|
|
94
|
-
chatId = recipient;
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
chatId = from;
|
|
98
|
-
}
|
|
99
|
-
msgType = "chat";
|
|
100
|
-
author = from;
|
|
101
|
-
}
|
|
102
|
-
else if (isJidGroup(from)) {
|
|
103
|
-
if (!participant) {
|
|
104
|
-
throw new Boom("No participant in group message");
|
|
105
|
-
}
|
|
106
|
-
if (isMe(participant) || isMeLid(participant)) {
|
|
107
|
-
fromMe = true;
|
|
108
|
-
}
|
|
109
|
-
msgType = "group";
|
|
110
|
-
author = participant;
|
|
111
|
-
chatId = from;
|
|
112
|
-
}
|
|
113
|
-
else if (isJidBroadcast(from)) {
|
|
114
|
-
if (!participant) {
|
|
115
|
-
throw new Boom("No participant in group message");
|
|
116
|
-
}
|
|
117
|
-
const isParticipantMe = isMe(participant);
|
|
118
|
-
if (isJidStatusBroadcast(from)) {
|
|
119
|
-
msgType = isParticipantMe ? "direct_peer_status" : "other_status";
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
msgType = isParticipantMe ? "peer_broadcast" : "other_broadcast";
|
|
123
|
-
}
|
|
124
|
-
fromMe = isParticipantMe;
|
|
125
|
-
chatId = from;
|
|
126
|
-
author = participant;
|
|
127
|
-
}
|
|
128
|
-
else if (isJidNewsletter(from)) {
|
|
129
|
-
msgType = "newsletter";
|
|
130
|
-
chatId = from;
|
|
131
|
-
author = from;
|
|
132
|
-
if (isMe(from) || isMeLid(from)) {
|
|
133
|
-
fromMe = true;
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
throw new Boom("Unknown message type", { data: stanza });
|
|
138
|
-
}
|
|
139
|
-
const pushname = stanza?.attrs?.notify;
|
|
140
|
-
const key = {
|
|
141
|
-
remoteJid: chatId,
|
|
142
|
-
remoteJidAlt: !isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
|
|
143
|
-
fromMe,
|
|
144
|
-
id: msgId,
|
|
145
|
-
participant,
|
|
146
|
-
participantAlt: isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
|
|
147
|
-
addressingMode: addressingContext.addressingMode,
|
|
148
|
-
...(msgType === "newsletter" && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
|
|
149
|
-
};
|
|
150
|
-
const fullMessage = {
|
|
151
|
-
key,
|
|
152
|
-
messageTimestamp: +stanza.attrs.t,
|
|
153
|
-
pushName: pushname,
|
|
154
|
-
broadcast: isJidBroadcast(from)
|
|
155
|
-
};
|
|
156
|
-
if (key.fromMe) {
|
|
157
|
-
fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK;
|
|
158
|
-
}
|
|
159
|
-
return {
|
|
160
|
-
fullMessage,
|
|
161
|
-
author,
|
|
162
|
-
sender: msgType === "chat" ? author : chatId
|
|
163
|
-
};
|
|
164
|
-
}
|
|
165
|
-
//=======================================================//
|
|
166
|
-
export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
|
|
167
|
-
const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
|
|
168
|
-
return {
|
|
169
|
-
fullMessage,
|
|
170
|
-
category: stanza.attrs.category,
|
|
171
|
-
author,
|
|
172
|
-
async decrypt() {
|
|
173
|
-
let decryptables = 0;
|
|
174
|
-
if (Array.isArray(stanza.content)) {
|
|
175
|
-
for (const { tag, attrs, content } of stanza.content) {
|
|
176
|
-
if (tag === "verified_name" && content instanceof Uint8Array) {
|
|
177
|
-
const cert = proto.VerifiedNameCertificate.decode(content);
|
|
178
|
-
const details = proto.VerifiedNameCertificate.Details.decode(cert.details);
|
|
179
|
-
fullMessage.verifiedBizName = details.verifiedName;
|
|
180
|
-
}
|
|
181
|
-
if (tag === "unavailable" && attrs.type === "view_once") {
|
|
182
|
-
fullMessage.key.isViewOnce = true;
|
|
183
|
-
}
|
|
184
|
-
if (tag !== "enc" && tag !== "plaintext") {
|
|
185
|
-
continue;
|
|
186
|
-
}
|
|
187
|
-
if (!(content instanceof Uint8Array)) {
|
|
188
|
-
continue;
|
|
189
|
-
}
|
|
190
|
-
decryptables += 1;
|
|
191
|
-
let msgBuffer;
|
|
192
|
-
const decryptionJid = await getDecryptionJid(author, repository);
|
|
193
|
-
if (tag !== "plaintext") {
|
|
194
|
-
await storeMappingFromEnvelope(stanza, author, repository, decryptionJid, logger);
|
|
195
|
-
}
|
|
196
|
-
try {
|
|
197
|
-
const e2eType = tag === "plaintext" ? "plaintext" : attrs.type;
|
|
198
|
-
switch (e2eType) {
|
|
199
|
-
case "skmsg":
|
|
200
|
-
msgBuffer = await repository.decryptGroupMessage({
|
|
201
|
-
group: sender,
|
|
202
|
-
authorJid: author,
|
|
203
|
-
msg: content
|
|
204
|
-
});
|
|
205
|
-
break;
|
|
206
|
-
case "pkmsg":
|
|
207
|
-
case "msg":
|
|
208
|
-
msgBuffer = await repository.decryptMessage({
|
|
209
|
-
jid: decryptionJid,
|
|
210
|
-
type: e2eType,
|
|
211
|
-
ciphertext: content
|
|
212
|
-
});
|
|
213
|
-
break;
|
|
214
|
-
case "plaintext":
|
|
215
|
-
msgBuffer = content;
|
|
216
|
-
break;
|
|
217
|
-
default:
|
|
218
|
-
throw new Error(`Unknown e2e type: ${e2eType}`);
|
|
219
|
-
}
|
|
220
|
-
let msg = proto.Message.decode(e2eType !== "plaintext" ? unpadRandomMax16(msgBuffer) : msgBuffer);
|
|
221
|
-
msg = msg.deviceSentMessage?.message || msg;
|
|
222
|
-
if (msg.senderKeyDistributionMessage) {
|
|
223
|
-
try {
|
|
224
|
-
await repository.processSenderKeyDistributionMessage({
|
|
225
|
-
authorJid: author,
|
|
226
|
-
item: msg.senderKeyDistributionMessage
|
|
227
|
-
});
|
|
228
|
-
}
|
|
229
|
-
catch (err) {
|
|
230
|
-
logger.error({ key: fullMessage.key, err }, "failed to process sender key distribution message");
|
|
231
|
-
}
|
|
232
|
-
}
|
|
233
|
-
if (fullMessage.message) {
|
|
234
|
-
Object.assign(fullMessage.message, msg);
|
|
235
|
-
}
|
|
236
|
-
else {
|
|
237
|
-
fullMessage.message = msg;
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
catch (err) {
|
|
241
|
-
const errorContext = {
|
|
242
|
-
key: fullMessage.key,
|
|
243
|
-
err,
|
|
244
|
-
messageType: tag === "plaintext" ? "plaintext" : attrs.type,
|
|
245
|
-
sender,
|
|
246
|
-
author,
|
|
247
|
-
isSessionRecordError: isSessionRecordError(err)
|
|
248
|
-
};
|
|
249
|
-
logger.error(errorContext, "failed to decrypt message");
|
|
250
|
-
fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
|
|
251
|
-
fullMessage.messageStubParameters = [err.message.toString()];
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
|
-
}
|
|
255
|
-
if (!decryptables) {
|
|
256
|
-
fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
|
|
257
|
-
fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT];
|
|
258
|
-
}
|
|
259
|
-
}
|
|
260
|
-
};
|
|
261
|
-
};
|
|
262
|
-
//=======================================================//
|
|
263
|
-
function isSessionRecordError(error) {
|
|
264
|
-
const errorMessage = error?.message || error?.toString() || "";
|
|
265
|
-
return DECRYPTION_RETRY_CONFIG.sessionRecordErrors.some(errorPattern => errorMessage.includes(errorPattern));
|
|
266
|
-
}
|
|
267
|
-
//=======================================================//
|