@queenanya/baileys 6.9.1 → 6.9.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/lib/Defaults/baileys-version.json +1 -1
- package/lib/Defaults/index.js +1 -1
- package/lib/Socket/business.d.ts +1 -0
- package/lib/Socket/business.js +1 -0
- package/lib/Socket/chats.js +2 -2
- package/lib/Socket/index.d.ts +1 -0
- package/lib/Socket/messages-recv.js +19 -8
- package/lib/Socket/messages-send.d.ts +1 -1
- package/lib/Socket/registration.d.ts +1 -0
- package/lib/Socket/socket.js +14 -1
- package/lib/Store/make-in-memory-store.d.ts +2 -2
- package/lib/Store/make-in-memory-store.js +6 -43
- package/lib/Types/Auth.d.ts +1 -0
- package/lib/Types/Events.d.ts +8 -1
- package/lib/Types/GroupMetadata.d.ts +2 -0
- package/lib/Utils/auth-utils.js +1 -0
- package/lib/Utils/generics.js +1 -1
- package/lib/Utils/messages.d.ts +2 -1
- package/lib/Utils/messages.js +5 -7
- package/lib/Utils/noise-handler.d.ts +2 -1
- package/lib/Utils/noise-handler.js +16 -3
- package/lib/Utils/process-message.js +11 -2
- package/lib/Utils/use-multi-file-auth-state.js +16 -3
- package/package.json +2 -1
package/lib/Defaults/index.js
CHANGED
|
@@ -48,7 +48,7 @@ exports.PROCESSABLE_HISTORY_TYPES = [
|
|
|
48
48
|
];
|
|
49
49
|
exports.DEFAULT_CONNECTION_CONFIG = {
|
|
50
50
|
version: baileys_version_json_1.version,
|
|
51
|
-
browser: Utils_1.Browsers.ubuntu(
|
|
51
|
+
browser: Utils_1.Browsers.ubuntu('Firefox'),
|
|
52
52
|
waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
|
|
53
53
|
connectTimeoutMs: 20000,
|
|
54
54
|
keepAliveIntervalMs: 30000,
|
package/lib/Socket/business.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { GetCatalogOptions, ProductCreate, ProductUpdate, SocketConfig } from '../Types';
|
|
3
3
|
import { BinaryNode } from '../WABinary';
|
|
4
4
|
export declare const makeBusinessSocket: (config: SocketConfig) => {
|
|
5
|
+
logger: import("pino").Logger<import("pino").LoggerOptions>;
|
|
5
6
|
getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
|
|
6
7
|
getCatalog: ({ jid, limit, cursor }: GetCatalogOptions) => Promise<{
|
|
7
8
|
products: import("../Types").Product[];
|
package/lib/Socket/business.js
CHANGED
package/lib/Socket/chats.js
CHANGED
|
@@ -511,7 +511,7 @@ const makeChatsSocket = (config) => {
|
|
|
511
511
|
let presence;
|
|
512
512
|
const jid = attrs.from;
|
|
513
513
|
const participant = attrs.participant || attrs.from;
|
|
514
|
-
if (shouldIgnoreJid(jid)) {
|
|
514
|
+
if (shouldIgnoreJid(jid) && jid !== '@s.whatsapp.net') {
|
|
515
515
|
return;
|
|
516
516
|
}
|
|
517
517
|
if (tag === 'presence') {
|
|
@@ -610,7 +610,7 @@ const makeChatsSocket = (config) => {
|
|
|
610
610
|
content: [
|
|
611
611
|
{ tag: 'props', attrs: {
|
|
612
612
|
protocol: '2',
|
|
613
|
-
hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) ||
|
|
613
|
+
hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) || ''
|
|
614
614
|
} }
|
|
615
615
|
]
|
|
616
616
|
});
|
package/lib/Socket/index.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { UserFacingSocketConfig } from '../Types';
|
|
|
3
3
|
declare const makeWASocket: (config: UserFacingSocketConfig) => {
|
|
4
4
|
register: (code: string) => Promise<import("./registration").ExistsResponse>;
|
|
5
5
|
requestRegistrationCode: (registrationOptions?: import("./registration").RegistrationOptions | undefined) => Promise<import("./registration").ExistsResponse>;
|
|
6
|
+
logger: import("pino").Logger<import("pino").LoggerOptions>;
|
|
6
7
|
getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
|
|
7
8
|
getCatalog: ({ jid, limit, cursor }: import("../Types").GetCatalogOptions) => Promise<{
|
|
8
9
|
products: import("../Types").Product[];
|
|
@@ -163,6 +163,8 @@ const makeMessagesRecvSocket = (config) => {
|
|
|
163
163
|
}
|
|
164
164
|
};
|
|
165
165
|
const handleGroupNotification = (participant, child, msg) => {
|
|
166
|
+
var _a, _b;
|
|
167
|
+
const participantJid = ((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant;
|
|
166
168
|
switch (child === null || child === void 0 ? void 0 : child.tag) {
|
|
167
169
|
case 'create':
|
|
168
170
|
const metadata = (0, groups_1.extractGroupMetadata)(child);
|
|
@@ -237,6 +239,15 @@ const makeMessagesRecvSocket = (config) => {
|
|
|
237
239
|
msg.messageStubParameters = [approvalMode.attrs.state];
|
|
238
240
|
}
|
|
239
241
|
break;
|
|
242
|
+
case 'created_membership_requests':
|
|
243
|
+
msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
|
|
244
|
+
msg.messageStubParameters = [participantJid, 'created', child.attrs.request_method];
|
|
245
|
+
break;
|
|
246
|
+
case 'revoked_membership_requests':
|
|
247
|
+
const isDenied = (0, WABinary_1.areJidsSameUser)(participantJid, participant);
|
|
248
|
+
msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
|
|
249
|
+
msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
|
|
250
|
+
break;
|
|
240
251
|
}
|
|
241
252
|
};
|
|
242
253
|
const processNotification = async (node) => {
|
|
@@ -461,7 +472,7 @@ const makeMessagesRecvSocket = (config) => {
|
|
|
461
472
|
fromMe,
|
|
462
473
|
participant: attrs.participant
|
|
463
474
|
};
|
|
464
|
-
if (shouldIgnoreJid(remoteJid)) {
|
|
475
|
+
if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
|
|
465
476
|
logger.debug({ remoteJid }, 'ignoring receipt from jid');
|
|
466
477
|
await sendMessageAck(node);
|
|
467
478
|
return;
|
|
@@ -480,7 +491,7 @@ const makeMessagesRecvSocket = (config) => {
|
|
|
480
491
|
// or another device of ours has read some messages
|
|
481
492
|
status > WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ||
|
|
482
493
|
!isNodeFromMe)) {
|
|
483
|
-
if ((0, WABinary_1.isJidGroup)(remoteJid)) {
|
|
494
|
+
if ((0, WABinary_1.isJidGroup)(remoteJid) || (0, WABinary_1.isJidStatusBroadcast)(remoteJid)) {
|
|
484
495
|
if (attrs.participant) {
|
|
485
496
|
const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
|
|
486
497
|
ev.emit('message-receipt.update', ids.map(id => ({
|
|
@@ -527,7 +538,7 @@ const makeMessagesRecvSocket = (config) => {
|
|
|
527
538
|
};
|
|
528
539
|
const handleNotification = async (node) => {
|
|
529
540
|
const remoteJid = node.attrs.from;
|
|
530
|
-
if (shouldIgnoreJid(remoteJid)) {
|
|
541
|
+
if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
|
|
531
542
|
logger.debug({ remoteJid, id: node.attrs.id }, 'ignored notification');
|
|
532
543
|
await sendMessageAck(node);
|
|
533
544
|
return;
|
|
@@ -556,17 +567,17 @@ const makeMessagesRecvSocket = (config) => {
|
|
|
556
567
|
};
|
|
557
568
|
const handleMessage = async (node) => {
|
|
558
569
|
var _a, _b;
|
|
570
|
+
if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
|
|
571
|
+
logger.debug({ key: node.attrs.key }, 'ignored message');
|
|
572
|
+
await sendMessageAck(node);
|
|
573
|
+
return;
|
|
574
|
+
}
|
|
559
575
|
const { fullMessage: msg, category, author, decrypt } = (0, Utils_1.decryptMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
|
|
560
576
|
if (((_b = (_a = msg.message) === null || _a === void 0 ? void 0 : _a.protocolMessage) === null || _b === void 0 ? void 0 : _b.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER) {
|
|
561
577
|
if (node.attrs.sender_pn) {
|
|
562
578
|
ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
|
|
563
579
|
}
|
|
564
580
|
}
|
|
565
|
-
if (shouldIgnoreJid(msg.key.remoteJid)) {
|
|
566
|
-
logger.debug({ key: msg.key }, 'ignored message');
|
|
567
|
-
await sendMessageAck(node);
|
|
568
|
-
return;
|
|
569
|
-
}
|
|
570
581
|
await Promise.all([
|
|
571
582
|
processingMutex.mutex(async () => {
|
|
572
583
|
await decrypt();
|
|
@@ -27,7 +27,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
|
|
|
27
27
|
}[]>;
|
|
28
28
|
groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "reject" | "approve") => Promise<{
|
|
29
29
|
status: string;
|
|
30
|
-
jid: string;
|
|
30
|
+
jid: string;
|
|
31
31
|
}[]>;
|
|
32
32
|
groupParticipantsUpdate: (jid: string, participants: string[], action: import("../Types").ParticipantAction) => Promise<{
|
|
33
33
|
status: string;
|
|
@@ -4,6 +4,7 @@ import { KeyPair, SignedKeyPair, SocketConfig } from '../Types';
|
|
|
4
4
|
export declare const makeRegistrationSocket: (config: SocketConfig) => {
|
|
5
5
|
register: (code: string) => Promise<ExistsResponse>;
|
|
6
6
|
requestRegistrationCode: (registrationOptions?: RegistrationOptions) => Promise<ExistsResponse>;
|
|
7
|
+
logger: import("pino").Logger<import("pino").LoggerOptions>;
|
|
7
8
|
getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
|
|
8
9
|
getCatalog: ({ jid, limit, cursor }: import("../Types").GetCatalogOptions) => Promise<{
|
|
9
10
|
products: import("../Types").Product[];
|
package/lib/Socket/socket.js
CHANGED
|
@@ -18,12 +18,16 @@ const Client_1 = require("./Client");
|
|
|
18
18
|
* - query phone connection
|
|
19
19
|
*/
|
|
20
20
|
const makeSocket = (config) => {
|
|
21
|
+
var _a, _b;
|
|
21
22
|
const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository, } = config;
|
|
22
23
|
let url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl;
|
|
23
24
|
config.mobile = config.mobile || url.protocol === 'tcp:';
|
|
24
25
|
if (config.mobile && url.protocol !== 'tcp:') {
|
|
25
26
|
url = new url_1.URL(`tcp://${Defaults_1.MOBILE_ENDPOINT}:${Defaults_1.MOBILE_PORT}`);
|
|
26
27
|
}
|
|
28
|
+
if (!config.mobile && url.protocol === 'wss' && ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.routingInfo)) {
|
|
29
|
+
url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'));
|
|
30
|
+
}
|
|
27
31
|
const ws = config.socket ? config.socket : config.mobile ? new Client_1.MobileSocketClient(url, config) : new Client_1.WebSocketClient(url, config);
|
|
28
32
|
ws.connect();
|
|
29
33
|
const ev = (0, Utils_1.makeEventBuffer)(logger);
|
|
@@ -34,7 +38,8 @@ const makeSocket = (config) => {
|
|
|
34
38
|
keyPair: ephemeralKeyPair,
|
|
35
39
|
NOISE_HEADER: config.mobile ? Defaults_1.MOBILE_NOISE_HEADER : Defaults_1.NOISE_WA_HEADER,
|
|
36
40
|
mobile: config.mobile,
|
|
37
|
-
logger
|
|
41
|
+
logger,
|
|
42
|
+
routingInfo: (_b = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _b === void 0 ? void 0 : _b.routingInfo
|
|
38
43
|
});
|
|
39
44
|
const { creds } = authState;
|
|
40
45
|
// add transaction capability
|
|
@@ -526,6 +531,14 @@ const makeSocket = (config) => {
|
|
|
526
531
|
ws.on('CB:ib,,downgrade_webclient', () => {
|
|
527
532
|
end(new boom_1.Boom('Multi-device beta not joined', { statusCode: Types_1.DisconnectReason.multideviceMismatch }));
|
|
528
533
|
});
|
|
534
|
+
ws.on('CB:ib,,edge_routing', (node) => {
|
|
535
|
+
const edgeRoutingNode = (0, WABinary_1.getBinaryNodeChild)(node, 'edge_routing');
|
|
536
|
+
const routingInfo = (0, WABinary_1.getBinaryNodeChild)(edgeRoutingNode, 'routing_info');
|
|
537
|
+
if (routingInfo === null || routingInfo === void 0 ? void 0 : routingInfo.content) {
|
|
538
|
+
authState.creds.routingInfo = Buffer.from(routingInfo === null || routingInfo === void 0 ? void 0 : routingInfo.content);
|
|
539
|
+
ev.emit('creds.update', authState.creds);
|
|
540
|
+
}
|
|
541
|
+
});
|
|
529
542
|
let didStartBuffer = false;
|
|
530
543
|
process.nextTick(() => {
|
|
531
544
|
var _a;
|
|
@@ -17,10 +17,10 @@ export declare const waLabelAssociationKey: Comparable<LabelAssociation, string>
|
|
|
17
17
|
export type BaileysInMemoryStoreConfig = {
|
|
18
18
|
chatKey?: Comparable<Chat, string>;
|
|
19
19
|
labelAssociationKey?: Comparable<LabelAssociation, string>;
|
|
20
|
-
logger
|
|
20
|
+
logger?: Logger;
|
|
21
21
|
socket?: WASocket;
|
|
22
22
|
};
|
|
23
|
-
declare const _default: (
|
|
23
|
+
declare const _default: (config: BaileysInMemoryStoreConfig) => {
|
|
24
24
|
chats: KeyedDB<Chat, string>;
|
|
25
25
|
contacts: {
|
|
26
26
|
[_: string]: Contact;
|
|
@@ -23,48 +23,11 @@ exports.waLabelAssociationKey = {
|
|
|
23
23
|
compare: (k1, k2) => k2.localeCompare(k1)
|
|
24
24
|
};
|
|
25
25
|
const makeMessagesDictionary = () => (0, make_ordered_dictionary_1.default)(exports.waMessageID);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
color: 1,
|
|
32
|
-
deleted: false
|
|
33
|
-
},
|
|
34
|
-
'2': {
|
|
35
|
-
id: '2',
|
|
36
|
-
name: 'New order',
|
|
37
|
-
predefinedId: '2',
|
|
38
|
-
color: 2,
|
|
39
|
-
deleted: false
|
|
40
|
-
},
|
|
41
|
-
'3': {
|
|
42
|
-
id: '3',
|
|
43
|
-
name: 'Pending payment',
|
|
44
|
-
predefinedId: '3',
|
|
45
|
-
color: 3,
|
|
46
|
-
deleted: false
|
|
47
|
-
},
|
|
48
|
-
'4': {
|
|
49
|
-
id: '4',
|
|
50
|
-
name: 'Paid',
|
|
51
|
-
predefinedId: '4',
|
|
52
|
-
color: 4,
|
|
53
|
-
deleted: false
|
|
54
|
-
},
|
|
55
|
-
'5': {
|
|
56
|
-
id: '5',
|
|
57
|
-
name: 'Order completed',
|
|
58
|
-
predefinedId: '5',
|
|
59
|
-
color: 5,
|
|
60
|
-
deleted: false
|
|
61
|
-
}
|
|
62
|
-
});
|
|
63
|
-
exports.default = ({ logger, chatKey, labelAssociationKey, socket }) => {
|
|
64
|
-
// const logger = _logger || DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' })
|
|
65
|
-
chatKey = chatKey || (0, exports.waChatKey)(true);
|
|
66
|
-
labelAssociationKey = labelAssociationKey || exports.waLabelAssociationKey;
|
|
67
|
-
logger = logger || Defaults_1.DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' });
|
|
26
|
+
exports.default = (config) => {
|
|
27
|
+
const socket = config.socket;
|
|
28
|
+
const chatKey = config.chatKey || (0, exports.waChatKey)(true);
|
|
29
|
+
const labelAssociationKey = config.labelAssociationKey || exports.waLabelAssociationKey;
|
|
30
|
+
const logger = config.logger || Defaults_1.DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' });
|
|
68
31
|
const KeyedDB = require('@adiwajshing/keyed-db').default;
|
|
69
32
|
const chats = new KeyedDB(chatKey, c => c.id);
|
|
70
33
|
const messages = {};
|
|
@@ -72,7 +35,7 @@ exports.default = ({ logger, chatKey, labelAssociationKey, socket }) => {
|
|
|
72
35
|
const groupMetadata = {};
|
|
73
36
|
const presences = {};
|
|
74
37
|
const state = { connection: 'close' };
|
|
75
|
-
const labels = new object_repository_1.ObjectRepository(
|
|
38
|
+
const labels = new object_repository_1.ObjectRepository();
|
|
76
39
|
const labelAssociations = new KeyedDB(labelAssociationKey, labelAssociationKey.key);
|
|
77
40
|
const assertMessageList = (jid) => {
|
|
78
41
|
if (!messages[jid]) {
|
package/lib/Types/Auth.d.ts
CHANGED
|
@@ -65,6 +65,7 @@ export type AuthenticationCreds = SignalCreds & {
|
|
|
65
65
|
registration: RegistrationOptions;
|
|
66
66
|
pairingCode: string | undefined;
|
|
67
67
|
lastPropHash: string | undefined;
|
|
68
|
+
routingInfo: Buffer | undefined;
|
|
68
69
|
};
|
|
69
70
|
export type SignalDataTypeMap = {
|
|
70
71
|
'pre-key': KeyPair;
|
package/lib/Types/Events.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { AuthenticationCreds } from './Auth';
|
|
|
4
4
|
import { WACallEvent } from './Call';
|
|
5
5
|
import { Chat, ChatUpdate, PresenceData } from './Chat';
|
|
6
6
|
import { Contact } from './Contact';
|
|
7
|
-
import { GroupMetadata, ParticipantAction } from './GroupMetadata';
|
|
7
|
+
import { GroupMetadata, ParticipantAction, RequestJoinAction, RequestJoinMethod } from './GroupMetadata';
|
|
8
8
|
import { Label } from './Label';
|
|
9
9
|
import { LabelAssociation } from './LabelAssociation';
|
|
10
10
|
import { MessageUpsertType, MessageUserReceiptUpdate, WAMessage, WAMessageKey, WAMessageUpdate } from './Message';
|
|
@@ -78,6 +78,13 @@ export type BaileysEventMap = {
|
|
|
78
78
|
participants: string[];
|
|
79
79
|
action: ParticipantAction;
|
|
80
80
|
};
|
|
81
|
+
'group.join-request': {
|
|
82
|
+
id: string;
|
|
83
|
+
author: string;
|
|
84
|
+
participant: string;
|
|
85
|
+
action: RequestJoinAction;
|
|
86
|
+
method: RequestJoinMethod;
|
|
87
|
+
};
|
|
81
88
|
'blocklist.set': {
|
|
82
89
|
blocklist: string[];
|
|
83
90
|
};
|
|
@@ -5,6 +5,8 @@ export type GroupParticipant = (Contact & {
|
|
|
5
5
|
admin?: 'admin' | 'superadmin' | null;
|
|
6
6
|
});
|
|
7
7
|
export type ParticipantAction = 'add' | 'remove' | 'promote' | 'demote';
|
|
8
|
+
export type RequestJoinAction = 'created' | 'revoked' | 'rejected';
|
|
9
|
+
export type RequestJoinMethod = 'invite_link' | 'linked_group_join' | 'non_admin_add' | undefined;
|
|
8
10
|
export interface GroupMetadata {
|
|
9
11
|
id: string;
|
|
10
12
|
owner: string | undefined;
|
package/lib/Utils/auth-utils.js
CHANGED
package/lib/Utils/generics.js
CHANGED
|
@@ -21,7 +21,7 @@ const PLATFORM_MAP = {
|
|
|
21
21
|
exports.Browsers = {
|
|
22
22
|
ubuntu: browser => ['Ubuntu', browser, '20.0.04'],
|
|
23
23
|
macOS: browser => ['Mac OS', browser, '10.15.7'],
|
|
24
|
-
baileys: browser => ['
|
|
24
|
+
baileys: browser => ['Baileys', browser, '4.0.0'],
|
|
25
25
|
windows: browser => ['Windows', browser, '10.0.22621'],
|
|
26
26
|
/** The appropriate browser based on your OS & release */
|
|
27
27
|
appropriate: browser => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
|
package/lib/Utils/messages.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { Logger } from 'pino';
|
|
4
|
+
import { type Transform } from 'stream';
|
|
4
5
|
import { proto } from '../../WAProto';
|
|
5
6
|
import { AnyMediaMessageContent, AnyMessageContent, MediaGenerationOptions, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent, MessageUserReceipt, WAMessage, WAMessageContent, WAProto } from '../Types';
|
|
6
7
|
import { MediaDownloadOptions } from './messages-media';
|
|
@@ -70,7 +71,7 @@ type DownloadMediaMessageContext = {
|
|
|
70
71
|
/**
|
|
71
72
|
* Downloads the given message. Throws an error if it's not a media message
|
|
72
73
|
*/
|
|
73
|
-
export declare const downloadMediaMessage: (message: WAMessage, type:
|
|
74
|
+
export declare const downloadMediaMessage: <Type extends "stream" | "buffer">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer : Transform>;
|
|
74
75
|
/** Checks whether the given message is a media message; if it is returns the inner content */
|
|
75
76
|
export declare const assertMediaContent: (content: proto.IMessage | null | undefined) => proto.Message.IVideoMessage | proto.Message.IImageMessage | proto.Message.IAudioMessage | proto.Message.IDocumentMessage | proto.Message.IStickerMessage;
|
|
76
77
|
export {};
|
package/lib/Utils/messages.js
CHANGED
|
@@ -700,12 +700,9 @@ const REUPLOAD_REQUIRED_STATUS = [410, 404];
|
|
|
700
700
|
* Downloads the given message. Throws an error if it's not a media message
|
|
701
701
|
*/
|
|
702
702
|
const downloadMediaMessage = async (message, type, options, ctx) => {
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
return result;
|
|
707
|
-
}
|
|
708
|
-
catch (error) {
|
|
703
|
+
const result = await downloadMsg()
|
|
704
|
+
.catch(async (error) => {
|
|
705
|
+
var _a;
|
|
709
706
|
if (ctx) {
|
|
710
707
|
if (axios_1.default.isAxiosError(error)) {
|
|
711
708
|
// check if the message requires a reupload
|
|
@@ -719,7 +716,8 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
|
|
|
719
716
|
}
|
|
720
717
|
}
|
|
721
718
|
throw error;
|
|
722
|
-
}
|
|
719
|
+
});
|
|
720
|
+
return result;
|
|
723
721
|
async function downloadMsg() {
|
|
724
722
|
const mContent = (0, exports.extractMessageContent)(message.message);
|
|
725
723
|
if (!mContent) {
|
|
@@ -3,11 +3,12 @@ import { Logger } from 'pino';
|
|
|
3
3
|
import { proto } from '../../WAProto';
|
|
4
4
|
import { KeyPair } from '../Types';
|
|
5
5
|
import { BinaryNode } from '../WABinary';
|
|
6
|
-
export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, }: {
|
|
6
|
+
export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }: {
|
|
7
7
|
keyPair: KeyPair;
|
|
8
8
|
NOISE_HEADER: Uint8Array;
|
|
9
9
|
mobile: boolean;
|
|
10
10
|
logger: Logger;
|
|
11
|
+
routingInfo?: Buffer | undefined;
|
|
11
12
|
}) => {
|
|
12
13
|
encrypt: (plaintext: Uint8Array) => Buffer;
|
|
13
14
|
decrypt: (ciphertext: Uint8Array) => Buffer;
|
|
@@ -11,7 +11,7 @@ const generateIV = (counter) => {
|
|
|
11
11
|
new DataView(iv).setUint32(8, counter);
|
|
12
12
|
return new Uint8Array(iv);
|
|
13
13
|
};
|
|
14
|
-
const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, }) => {
|
|
14
|
+
const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }) => {
|
|
15
15
|
logger = logger.child({ class: 'ns' });
|
|
16
16
|
const authenticate = (data) => {
|
|
17
17
|
if (!isFinished) {
|
|
@@ -101,10 +101,23 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
|
|
|
101
101
|
if (isFinished) {
|
|
102
102
|
data = encrypt(data);
|
|
103
103
|
}
|
|
104
|
-
|
|
104
|
+
let header;
|
|
105
|
+
if (routingInfo) {
|
|
106
|
+
header = Buffer.alloc(7);
|
|
107
|
+
header.write('ED', 0, 'utf8');
|
|
108
|
+
header.writeUint8(0, 2);
|
|
109
|
+
header.writeUint8(1, 3);
|
|
110
|
+
header.writeUint8(routingInfo.byteLength >> 16, 4);
|
|
111
|
+
header.writeUint16BE(routingInfo.byteLength & 65535, 5);
|
|
112
|
+
header = Buffer.concat([header, routingInfo, NOISE_HEADER]);
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
header = Buffer.from(NOISE_HEADER);
|
|
116
|
+
}
|
|
117
|
+
const introSize = sentIntro ? 0 : header.length;
|
|
105
118
|
const frame = Buffer.alloc(introSize + 3 + data.byteLength);
|
|
106
119
|
if (!sentIntro) {
|
|
107
|
-
frame.set(
|
|
120
|
+
frame.set(header);
|
|
108
121
|
sentIntro = true;
|
|
109
122
|
}
|
|
110
123
|
frame.writeUInt8(data.byteLength >> 16, introSize);
|
|
@@ -103,7 +103,7 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
|
|
|
103
103
|
}
|
|
104
104
|
exports.decryptPollVote = decryptPollVote;
|
|
105
105
|
const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }) => {
|
|
106
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
106
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
107
107
|
const meId = creds.me.id;
|
|
108
108
|
const { accountSettings } = creds;
|
|
109
109
|
const chat = { id: (0, WABinary_1.jidNormalizedUser)((0, exports.getChatId)(message.key)) };
|
|
@@ -220,6 +220,9 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
|
|
|
220
220
|
var _a;
|
|
221
221
|
ev.emit('groups.update', [{ id: jid, ...update, author: (_a = message.participant) !== null && _a !== void 0 ? _a : undefined }]);
|
|
222
222
|
};
|
|
223
|
+
const emitGroupRequestJoin = (participant, action, method) => {
|
|
224
|
+
ev.emit('group.join-request', { id: jid, author: message.participant, participant, action, method: method });
|
|
225
|
+
};
|
|
223
226
|
const participantsIncludesMe = () => participants.find(jid => (0, WABinary_1.areJidsSameUser)(meId, jid));
|
|
224
227
|
switch (message.messageStubType) {
|
|
225
228
|
case Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
|
|
@@ -273,6 +276,12 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
|
|
|
273
276
|
const approvalMode = (_j = message.messageStubParameters) === null || _j === void 0 ? void 0 : _j[0];
|
|
274
277
|
emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
|
|
275
278
|
break;
|
|
279
|
+
case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
|
|
280
|
+
const participant = (_k = message.messageStubParameters) === null || _k === void 0 ? void 0 : _k[0];
|
|
281
|
+
const action = (_l = message.messageStubParameters) === null || _l === void 0 ? void 0 : _l[1];
|
|
282
|
+
const method = (_m = message.messageStubParameters) === null || _m === void 0 ? void 0 : _m[2];
|
|
283
|
+
emitGroupRequestJoin(participant, action, method);
|
|
284
|
+
break;
|
|
276
285
|
}
|
|
277
286
|
}
|
|
278
287
|
else if (content === null || content === void 0 ? void 0 : content.pollUpdateMessage) {
|
|
@@ -283,7 +292,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
|
|
|
283
292
|
const meIdNormalised = (0, WABinary_1.jidNormalizedUser)(meId);
|
|
284
293
|
const pollCreatorJid = (0, generics_1.getKeyAuthor)(creationMsgKey, meIdNormalised);
|
|
285
294
|
const voterJid = (0, generics_1.getKeyAuthor)(message.key, meIdNormalised);
|
|
286
|
-
const pollEncKey = (
|
|
295
|
+
const pollEncKey = (_o = pollMsg.messageContextInfo) === null || _o === void 0 ? void 0 : _o.messageSecret;
|
|
287
296
|
try {
|
|
288
297
|
const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
|
|
289
298
|
pollEncKey,
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.useMultiFileAuthState = void 0;
|
|
7
|
+
const async_lock_1 = __importDefault(require("async-lock"));
|
|
4
8
|
const promises_1 = require("fs/promises");
|
|
5
9
|
const path_1 = require("path");
|
|
6
10
|
const WAProto_1 = require("../../WAProto");
|
|
7
11
|
const auth_utils_1 = require("./auth-utils");
|
|
8
12
|
const generics_1 = require("./generics");
|
|
13
|
+
// We need to lock files due to the fact that we are using async functions to read and write files
|
|
14
|
+
// https://github.com/WhiskeySockets/Baileys/issues/794
|
|
15
|
+
// https://github.com/nodejs/node/issues/26338
|
|
16
|
+
// Default pending is 1000, set it to infinity
|
|
17
|
+
// https://github.com/rogierschouten/async-lock/issues/63
|
|
18
|
+
const fileLock = new async_lock_1.default({ maxPending: Infinity });
|
|
9
19
|
/**
|
|
10
20
|
* stores the full authentication state in a single folder.
|
|
11
21
|
* Far more efficient than singlefileauthstate
|
|
@@ -15,11 +25,13 @@ const generics_1 = require("./generics");
|
|
|
15
25
|
* */
|
|
16
26
|
const useMultiFileAuthState = async (folder) => {
|
|
17
27
|
const writeData = (data, file) => {
|
|
18
|
-
|
|
28
|
+
const filePath = (0, path_1.join)(folder, fixFileName(file));
|
|
29
|
+
return fileLock.acquire(filePath, () => (0, promises_1.writeFile)((0, path_1.join)(filePath), JSON.stringify(data, generics_1.BufferJSON.replacer)));
|
|
19
30
|
};
|
|
20
31
|
const readData = async (file) => {
|
|
21
32
|
try {
|
|
22
|
-
const
|
|
33
|
+
const filePath = (0, path_1.join)(folder, fixFileName(file));
|
|
34
|
+
const data = await fileLock.acquire(filePath, () => (0, promises_1.readFile)(filePath, { encoding: 'utf-8' }));
|
|
23
35
|
return JSON.parse(data, generics_1.BufferJSON.reviver);
|
|
24
36
|
}
|
|
25
37
|
catch (error) {
|
|
@@ -28,7 +40,8 @@ const useMultiFileAuthState = async (folder) => {
|
|
|
28
40
|
};
|
|
29
41
|
const removeData = async (file) => {
|
|
30
42
|
try {
|
|
31
|
-
|
|
43
|
+
const filePath = (0, path_1.join)(folder, fixFileName(file));
|
|
44
|
+
await fileLock.acquire(filePath, () => (0, promises_1.unlink)(filePath));
|
|
32
45
|
}
|
|
33
46
|
catch (_a) {
|
|
34
47
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@queenanya/baileys",
|
|
3
|
-
"version": "6.9.
|
|
3
|
+
"version": "6.9.5",
|
|
4
4
|
"description": "WhatsApp API",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"whatsapp",
|
|
@@ -45,6 +45,7 @@
|
|
|
45
45
|
"@adiwajshing/keyed-db": "^0.2.4",
|
|
46
46
|
"@hapi/boom": "^9.1.3",
|
|
47
47
|
"@queenanya/pkg": "latest",
|
|
48
|
+
"async-lock": "^1.4.1",
|
|
48
49
|
"audio-decode": "^2.1.3",
|
|
49
50
|
"axios": "^1.3.3",
|
|
50
51
|
"cache-manager": "4.0.1",
|