zalo-toolkit 1.1.8 → 1.2.0

package/dist/Errors/ZaloApiError.d.ts

@@ -1,4 +1,9 @@
 export declare class ZaloApiError extends Error {
     code: number | null;
     constructor(message: string, code?: number);
+    toJSON(): {
+        name: string;
+        message: string;
+        code: number | null;
+    };
 }

package/dist/Errors/ZaloApiError.js

@@ -1,7 +1,15 @@
 export class ZaloApiError extends Error {
     constructor(message, code) {
         super(message);
-        this.name = "ZcaApiError";
+        this.name = 'ZcaApiError';
         this.code = code || null;
+        this.message = message;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            code: this.code,
+        };
     }
 }

package/dist/apis/listen.d.ts

@@ -112,13 +112,13 @@ export declare class Listener extends EventEmitter<ListenerEvents> {
     start(): void;
     stop(): void;
     getSocketUrl(shouldRotate?: boolean, forceFirstEndpoint?: boolean): string;
-    sendWs(payload: WsPayload, requireId?: boolean): void;
+    sendWs(payload: WsPayload, requireId?: boolean): Promise<void>;
     shouldPingHttp(): boolean;
     ping(shouldTimeout?: boolean): void;
     pingActive(): void;
     pong(data: any): void;
     handleError(errorCode: number): void;
-    getSocketState(): 0 | 2 | 1 | 3 | -1;
+    getSocketState(): 0 | 1 | 3 | 2 | -1;
     reset(): void;
     afterClose(): void;
     _onClose: (event: WebSocket.CloseEvent) => void;

package/dist/apis/listen.js

@@ -187,6 +187,14 @@ export class Listener extends EventEmitter {
                         this.ping();
                     }, 3 * 60 * 1000);
                 }
+                const supportedEncryptTypes = [2, 1, 3];
+                if (supportedEncryptTypes.includes(parsed.encrypt)) {
+                    const parsedData = (await decodeEventData(parsed, this.cipherKey)).data;
+                    if (cmd === MessageCommand.Authen) {
+                        this.configSocket.doAfterAuth(parsedData);
+                        return;
+                    }
+                }
                 if (version == 1 && cmd == 501) {
                     const parsedData = (await decodeEventData(parsed, this.cipherKey)).data;
                     const { msgs, queueStatus } = parsedData;
@@ -243,7 +251,7 @@ export class Listener extends EventEmitter {
                 }
                 if ([510, 511, 610, 611, 603, 604].includes(cmd)) {
                     const parsedData = (await decodeEventData(parsed, this.cipherKey)).data;
-                    this.configSocket.onGotOffline(cmd, subCmd, { data: parsedData });
+                    await this.configSocket.onGotOffline(cmd, subCmd, { data: parsedData });
                 }
                 if (version == 1 && [601, 603, 604].includes(cmd)) {
                     const parsedData = (await decodeEventData(parsed, this.cipherKey)).data;
@@ -480,7 +488,7 @@ export class Listener extends EventEmitter {
         }
         return makeURL(this.ctx, this.listUrlSocket[index], { t: Date.now() });
     }
-    sendWs(payload, requireId = true) {
+    async sendWs(payload, requireId = true) {
         if (this.ws && this.getSocketState() === WebSocket.OPEN) {
             if (requireId)
                 payload.data['req_id'] = `req_${this.id++}`;
@@ -493,6 +501,7 @@ export class Listener extends EventEmitter {
             encodedData.forEach((e, i) => {
                 data.setUint8(4 + i, e);
             });
+            await Promise.resolve();
             this.ws.send(data);
         }
     }

package/dist/cjs/Errors/ZaloApiError.cjs

@@ -3,8 +3,16 @@
 class ZaloApiError extends Error {
     constructor(message, code) {
         super(message);
-        this.name = "ZcaApiError";
+        this.name = 'ZcaApiError';
         this.code = code || null;
+        this.message = message;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            code: this.code,
+        };
     }
 }
 

package/dist/cjs/apis/addUnreadMark.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const addUnreadMarkFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = utils.makeURL(`${api.zpwServiceMap.conversation[0]}/api/conv/addUnreadMark`);

package/dist/cjs/apis/createReminder.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 var Reminder = require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const createReminderFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/deleteChat.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const deleteChatFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/deleteMessage.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const deleteMessageFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/editReminder.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const editReminderFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/getAvatarUrlProfile.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const getAvatarUrlProfileFactory = utils.apiFactory()((api, _ctx, utils) => {
     const serviceURL = utils.makeURL(`${api.zpwServiceMap.profile[0]}/api/social/profile/avatar-url`);

package/dist/cjs/apis/getListBoard.cjs

@@ -7,10 +7,10 @@ require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const getListBoardFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = utils.makeURL(`${api.zpwServiceMap.group_board[0]}/api/board/list`);

package/dist/cjs/apis/getListReminder.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const getListReminderFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/listen.cjs

@@ -190,6 +190,14 @@ class Listener extends stream.EventEmitter {
                         this.ping();
                     }, 3 * 60 * 1000);
                 }
+                const supportedEncryptTypes = [2, 1, 3];
+                if (supportedEncryptTypes.includes(parsed.encrypt)) {
+                    const parsedData = (await utils.decodeEventData(parsed, this.cipherKey)).data;
+                    if (cmd === Listen.MessageCommand.Authen) {
+                        this.configSocket.doAfterAuth(parsedData);
+                        return;
+                    }
+                }
                 if (version == 1 && cmd == 501) {
                     const parsedData = (await utils.decodeEventData(parsed, this.cipherKey)).data;
                     const { msgs, queueStatus } = parsedData;
@@ -246,7 +254,7 @@ class Listener extends stream.EventEmitter {
                 }
                 if ([510, 511, 610, 611, 603, 604].includes(cmd)) {
                     const parsedData = (await utils.decodeEventData(parsed, this.cipherKey)).data;
-                    this.configSocket.onGotOffline(cmd, subCmd, { data: parsedData });
+                    await this.configSocket.onGotOffline(cmd, subCmd, { data: parsedData });
                 }
                 if (version == 1 && [601, 603, 604].includes(cmd)) {
                     const parsedData = (await utils.decodeEventData(parsed, this.cipherKey)).data;
@@ -483,7 +491,7 @@ class Listener extends stream.EventEmitter {
         }
         return utils.makeURL(this.ctx, this.listUrlSocket[index], { t: Date.now() });
     }
-    sendWs(payload, requireId = true) {
+    async sendWs(payload, requireId = true) {
         if (this.ws && this.getSocketState() === WebSocket.OPEN) {
             if (requireId)
                 payload.data['req_id'] = `req_${this.id++}`;
@@ -496,6 +504,7 @@ class Listener extends stream.EventEmitter {
             encodedData.forEach((e, i) => {
                 data.setUint8(4 + i, e);
             });
+            await Promise.resolve();
             this.ws.send(data);
         }
     }

package/dist/cjs/apis/removeReminder.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const removeReminderFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/removeUnreadMark.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const removeUnreadMarkFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = utils.makeURL(`${api.zpwServiceMap.conversation[0]}/api/conv/removeUnreadMark`);

package/dist/cjs/apis/sendBankCard.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendBankCardFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = utils.makeURL(`${api.zpwServiceMap.zimsg[0]}/api/transfer/card`);

package/dist/cjs/apis/sendCard.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendCardFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/sendDeliveredEvent.cjs

@@ -8,10 +8,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendDeliveredEventFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/sendLink.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendLinkFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/sendMessage.cjs

@@ -8,10 +8,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const attachmentUrlType = {
     image: 'photo_original/send?',

package/dist/cjs/apis/sendReport.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 exports.ReportReason = void 0;
 (function (ReportReason) {

package/dist/cjs/apis/sendSeenEvent.cjs

@@ -8,10 +8,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendSeenEventFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/sendSticker.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendStickerFactory = utils.apiFactory()((api, ctx, utils$1) => {
     const serviceURL = {

package/dist/cjs/apis/sendTypingEvent.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendTypingEventFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/sendVideo.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendVideoFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/sendVoice.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const sendVoiceFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = {

package/dist/cjs/apis/setHiddenConversations.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const setHiddenConversationsFactory = utils.apiFactory()((api, ctx, utils) => {
     const serviceURL = utils.makeURL(`${api.zpwServiceMap.conversation[0]}/api/hiddenconvers/add-remove`);

package/dist/cjs/apis/setMute.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 exports.MuteDuration = void 0;
 (function (MuteDuration) {

package/dist/cjs/apis/setPinnedConversations.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const setPinnedConversationsFactory = utils.apiFactory()((api, _, utils) => {
     const serviceURL = utils.makeURL(`${api.zpwServiceMap.conversation[0]}/api/pinconvers/updatev2`);

package/dist/cjs/apis/undo.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const undoFactory = utils.apiFactory()((api, ctx, utils) => {
     const URLType = {

package/dist/cjs/apis/updateAutoDeleteChat.cjs

@@ -7,10 +7,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 exports.ChatTTL = void 0;
 (function (ChatTTL) {

package/dist/cjs/apis/uploadAttachment.cjs

@@ -9,10 +9,10 @@ var Enum = require('../models/Enum.cjs');
 require('../models/FriendEvent.cjs');
 require('../models/Group.cjs');
 require('../models/GroupEvent.cjs');
-var utils = require('../utils.cjs');
 require('../models/Reaction.cjs');
 require('../models/Reminder.cjs');
 require('../models/ZBusiness.cjs');
+var utils = require('../utils.cjs');
 
 const urlType = {
     image: 'photo_original/upload',

package/dist/cjs/models/Listen.cjs

@@ -159,8 +159,28 @@ const SignalCommands = {
     },
 };
 const MAX_CHUNK_WS = 5;
+const OfflineCommands = {
+    MSG_11_PC: 513,
+    MSG_11_WEB: 515,
+    MSG_GROUP: 514,
+    SESSION_PC: 516,
+    SESSION_WEB: 517,
+    ACK_DELIVER_11: 518,
+    ACK_DELIVER_GROUP: 519,
+};
+const E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY = {
+    [OfflineCommands.MSG_11_PC]: 0,
+    [OfflineCommands.MSG_11_WEB]: 0,
+    [OfflineCommands.SESSION_PC]: 1,
+    [OfflineCommands.SESSION_WEB]: 1,
+    [OfflineCommands.MSG_GROUP]: 2,
+    [OfflineCommands.ACK_DELIVER_11]: 3,
+    [OfflineCommands.ACK_DELIVER_GROUP]: 3,
+};
 
 exports.DEFAULT_RETRY_DELAYS = DEFAULT_RETRY_DELAYS;
+exports.E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY = E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY;
 exports.MAX_CHUNK_WS = MAX_CHUNK_WS;
 exports.MessageTypes = MessageTypes;
+exports.OfflineCommands = OfflineCommands;
 exports.SignalCommands = SignalCommands;

package/dist/cjs/models/Message.cjs

@@ -1,6 +1,5 @@
 'use strict';
 
-var utils = require('../utils.cjs');
 var Enum = require('./Enum.cjs');
 
 class UserMessage {
@@ -10,7 +9,7 @@ class UserMessage {
         this.threadId = data.uidFrom == '0' ? data.idTo : data.uidFrom;
         this.isSelf = data.uidFrom == '0';
         if (queueStatus)
-            this.queueStatus = utils.handleQueueStatus(queueStatus);
+            this.queueStatus = queueStatus;
         if (data.idTo == '0')
             data.idTo = uid;
         if (data.uidFrom == '0')
@@ -27,7 +26,7 @@ class GroupMessage {
         this.threadId = data.idTo;
         this.isSelf = data.uidFrom == '0';
         if (queueStatus)
-            this.queueStatus = utils.handleQueueStatus(queueStatus);
+            this.queueStatus = queueStatus;
         if (data.uidFrom == '0')
             data.uidFrom = uid;
         if (data.quote) {

package/dist/cjs/socket/config-socket.cjs

@@ -3,6 +3,7 @@
 var Listen = require('../models/Listen.cjs');
 var WebSocket = require('ws');
 var utils = require('../utils.cjs');
+var lodash = require('lodash');
 
 class ConfigSocket {
     constructor(ws, features, ctx, listen) {
@@ -15,13 +16,14 @@ class ConfigSocket {
         this.features = features;
         this.ctx = ctx;
         this.listen = listen;
+        this.settingSocket = features.socket;
     }
     getLastActionIdsForSocket(socketKey) {
         const defaultResult = { lastId: 1, preIds: [] };
-        if (utils.hasOwn(this.pollId, socketKey)) {
-            const { lastId } = this.pollId[socketKey];
-            const preIds = this.pollId[socketKey].control.getLastActionIdsArray(lastId).slice(0, 10);
-            return { lastId, preIds };
+        if (utils.hasOwn(this.ctx.queueStatus, socketKey)) {
+            const { lastId } = this.ctx.queueStatus[socketKey];
+            // const preIds = this.ctx.queueStatus[socketKey].ids.slice(0, 10);
+            return { lastId, preIds: [] };
         }
         return defaultResult;
     }
@@ -32,7 +34,7 @@ class ConfigSocket {
     getSocketState() {
         return this.emitter ? this.emitter.readyState : -1;
     }
-    sendWs(payload) {
+    async sendWs(payload) {
         if (this.emitter && this.getSocketState() === WebSocket.WebSocket.OPEN) {
             const encodedData = new TextEncoder().encode(JSON.stringify(payload.data));
             const dataLength = encodedData.length;
@@ -43,6 +45,7 @@ class ConfigSocket {
             encodedData.forEach((e, i) => {
                 data.setUint8(4 + i, e);
             });
+            await Promise.resolve();
             this.emitter.send(data);
         }
     }
@@ -69,7 +72,7 @@ class ConfigSocket {
             requestPayload.data.lastId = lastActionId !== undefined ? lastActionId : lastId;
             requestPayload.data.preIds = preIds;
         }
-        this.sendWs(requestPayload);
+        await this.sendWs(requestPayload);
     }
     createOfflineWaiter() {
         const waiter = { resolve: null, reject: null, promise: null };
@@ -199,6 +202,101 @@ class ConfigSocket {
             this.offlineTimer = null;
         }
     }
+    reorderQueueCmdToRequestPushOffline(queueCommands) {
+        const normalQueues = [];
+        const e2eeQueues = [];
+        const e2eeCmds = [513, 515, 514, 516, 517, 518, 519];
+        queueCommands.forEach((queueCommand) => {
+            if (e2eeCmds.includes(queueCommand.cmd)) {
+                e2eeQueues.push(queueCommand);
+            }
+            else {
+                normalQueues.push(queueCommand);
+            }
+        });
+        e2eeQueues.sort((a, b) => {
+            return Listen.E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY[a.cmd] - Listen.E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY[b.cmd];
+        });
+        return [...normalQueues, ...e2eeQueues];
+    }
+    checkSwapToBUQueue(queueCmds, backupQueues) {
+        if (lodash.isEmpty(backupQueues)) {
+            return;
+        }
+        for (const queueCmd of queueCmds) {
+            const queueName = `${queueCmd.cmd}_${queueCmd.subCmd}`;
+            const backupQueueName = backupQueues[queueName];
+            if (!backupQueueName) {
+                continue;
+            }
+            const currentQueueState = this.getLastActionIdsForSocket(queueName);
+            const backupQueueState = this.getLastActionIdsForSocket(backupQueueName);
+            const shouldSwapQueue = currentQueueState.lastId === 1 && backupQueueState.lastId !== 1;
+            if (shouldSwapQueue) {
+                const [cmd, subCmd] = backupQueueName.split('_').map(Number);
+                queueCmd.cmd = cmd;
+                queueCmd.subCmd = subCmd;
+                queueCmd.queueName = backupQueueName;
+            }
+        }
+    }
+    doAfterAuth(data) {
+        this.onAuthenticated(data);
+        this.onAuthenticatedCtrl(data);
+    }
+    onAuthenticated(data) {
+        const qCmds = data === null || data === void 0 ? void 0 : data.qCmds;
+        if (!Array.isArray(qCmds) || qCmds.length === 0) {
+            return false;
+        }
+        this.offlineCmds.clear();
+        this.checkSwapToBUQueue(qCmds, data.bk_cmds);
+        const validCmds = qCmds.filter((item) => item.cmd && item.subCmd);
+        validCmds.map(({ cmd, subCmd }) => `${cmd}_${subCmd}`);
+        const reorderedCmds = this.reorderQueueCmdToRequestPushOffline(validCmds);
+        const total = reorderedCmds.length;
+        reorderedCmds.forEach((item, index) => {
+            item.priority = total - index;
+            // nếu muốn unique theo cả cmd + subCmd thì đổi key
+            this.offlineCmds.set(item.cmd, item);
+        });
+        this.signalGetOffline();
+    }
+    onAuthenticatedCtrl(data) {
+        const controlQueues = data === null || data === void 0 ? void 0 : data.ctrl_qCmds;
+        const backupQueues = data === null || data === void 0 ? void 0 : data.bk_cmds;
+        const hasValidControlQueues = Array.isArray(controlQueues) && controlQueues.length > 0;
+        if (!hasValidControlQueues) {
+            if (!this.settingSocket.enable_ctrl_socket) {
+                return false;
+            }
+            return false;
+        }
+        this.offlineCmds.clear();
+        // Swap to backup queue if needed
+        this.checkSwapToBUQueue(controlQueues, backupQueues);
+        controlQueues.forEach((queue) => {
+            if (queue.cmd && queue.subCmd) {
+                this.offlineCmds.set(queue.cmd, queue);
+            }
+        });
+        if (!this.settingSocket.enable_ctrl_socket) {
+            return true;
+        }
+        this.signalGetOffline();
+        return true;
+    }
+    signalGetOffline() {
+        this.emitter.emit(Listen.SocketEvent.ON_START_PULL_OFFLINE);
+        const offlineQueues = Array.from(this.offlineCmds.values());
+        offlineQueues.sort((a, b) => {
+            return b.priority - a.priority;
+        });
+        offlineQueues.forEach((queue) => {
+            this.doGetOffline(queue.cmd, queue.subCmd, true);
+        });
+        return true;
+    }
 }
 
 exports.ConfigSocket = ConfigSocket;

package/dist/cjs/utils.cjs

@@ -683,12 +683,6 @@ class FibonacciRetry {
         return baseDelay * randomFactor;
     }
 }
-function handleQueueStatus(queueStatus) {
-    for (const key in queueStatus) {
-        delete queueStatus[key].ids;
-    }
-    return queueStatus;
-}
 function looksLikeJson(str) {
     return /^[\[{].*[\]}]$/.test(str.trim());
 }
@@ -724,7 +718,6 @@ exports.getImageMetaData = getImageMetaData;
 exports.getMd5LargeFileObject = getMd5LargeFileObject;
 exports.getSecChUaPlatform = getSecChUaPlatform;
 exports.getSignKey = getSignKey;
-exports.handleQueueStatus = handleQueueStatus;
 exports.handleZaloResponse = handleZaloResponse;
 exports.hasOwn = hasOwn;
 exports.logger = logger;

package/dist/context.d.ts

@@ -1,5 +1,6 @@
 import type { Agent } from 'http';
 import type { CookieJar } from 'tough-cookie';
+import type { TypeQueueStatus } from './models/Message.js';
 type UploadEventData = {
     fileUrl: string;
     fileId: string;
@@ -155,6 +156,7 @@ export type AppContextBase = {
     };
     serverInfo: ServerInfo;
     extraVer: ExtraVer;
+    queueStatus: TypeQueueStatus;
 };
 export type ImageMetadataGetterResponse = {
     width: number;

package/dist/models/Listen.d.ts

@@ -184,3 +184,24 @@ export declare const SignalCommands: {
     };
 };
 export declare const MAX_CHUNK_WS = 5;
+export interface TypeQueueCmd {
+    cmd: number;
+    subCmd: number;
+    queueName: string;
+    priority: number;
+}
+export interface TypeResponseAuth {
+    ctrl_qCmds: TypeQueueCmd[];
+    qCmds: TypeQueueCmd[];
+    bk_cmds: Record<string, string>;
+}
+export declare const OfflineCommands: {
+    readonly MSG_11_PC: 513;
+    readonly MSG_11_WEB: 515;
+    readonly MSG_GROUP: 514;
+    readonly SESSION_PC: 516;
+    readonly SESSION_WEB: 517;
+    readonly ACK_DELIVER_11: 518;
+    readonly ACK_DELIVER_GROUP: 519;
+};
+export declare const E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY: Record<number, number>;

package/dist/models/Listen.js

@@ -192,3 +192,21 @@ export const SignalCommands = {
     },
 };
 export const MAX_CHUNK_WS = 5;
+export const OfflineCommands = {
+    MSG_11_PC: 513,
+    MSG_11_WEB: 515,
+    MSG_GROUP: 514,
+    SESSION_PC: 516,
+    SESSION_WEB: 517,
+    ACK_DELIVER_11: 518,
+    ACK_DELIVER_GROUP: 519,
+};
+export const E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY = {
+    [OfflineCommands.MSG_11_PC]: 0,
+    [OfflineCommands.MSG_11_WEB]: 0,
+    [OfflineCommands.SESSION_PC]: 1,
+    [OfflineCommands.SESSION_WEB]: 1,
+    [OfflineCommands.MSG_GROUP]: 2,
+    [OfflineCommands.ACK_DELIVER_11]: 3,
+    [OfflineCommands.ACK_DELIVER_GROUP]: 3,
+};

package/dist/models/Message.js

@@ -1,4 +1,3 @@
-import { handleQueueStatus } from '../utils.js';
 import { ThreadType } from './Enum.js';
 export class UserMessage {
     constructor(uid, data, queueStatus) {
@@ -7,7 +6,7 @@ export class UserMessage {
         this.threadId = data.uidFrom == '0' ? data.idTo : data.uidFrom;
         this.isSelf = data.uidFrom == '0';
         if (queueStatus)
-            this.queueStatus = handleQueueStatus(queueStatus);
+            this.queueStatus = queueStatus;
         if (data.idTo == '0')
             data.idTo = uid;
         if (data.uidFrom == '0')
@@ -24,7 +23,7 @@ export class GroupMessage {
         this.threadId = data.idTo;
         this.isSelf = data.uidFrom == '0';
         if (queueStatus)
-            this.queueStatus = handleQueueStatus(queueStatus);
+            this.queueStatus = queueStatus;
         if (data.uidFrom == '0')
             data.uidFrom = uid;
         if (data.quote) {

package/dist/socket/config-socket.d.ts

@@ -1,5 +1,6 @@
 import type { Listener, WsPayload } from '../apis/listen.js';
 import type { AppContextBase, ContextSession } from '../context.js';
+import { type TypeQueueCmd, type TypeResponseAuth } from '../models/Listen.js';
 import { WebSocket } from 'ws';
 export declare class ConfigSocket {
     private emitter;
@@ -12,14 +13,18 @@ export declare class ConfigSocket {
     private pollId;
     private offlineTimer;
     private isDoneOffline;
+    private settingSocket;
     constructor(ws: WebSocket, features: AppContextBase['settings']['features'], ctx: ContextSession, listen: Listener);
     getLastActionIdsForSocket(socketKey: string): {
-        lastId: any;
-        preIds: any;
+        lastId: number;
+        preIds: never[];
+    } | {
+        lastId: string;
+        preIds: never[];
     };
     immediateDoNextOfflineReq(cmd: number): boolean;
-    getSocketState(): 0 | 2 | 1 | 3 | -1;
-    sendWs(payload: WsPayload): void;
+    getSocketState(): 0 | 1 | 3 | 2 | -1;
+    sendWs(payload: WsPayload): Promise<void>;
     doGetOffline(cmd: number, subCmd: number, first: boolean, lastActionId?: number): Promise<void>;
     createOfflineWaiter(): any;
     ackOfflineQueue(isGroup: boolean, data: any): Promise<unknown>;
@@ -35,4 +40,10 @@ export declare class ConfigSocket {
     handleSocketMsg(cmd: string, payload: any): boolean | undefined;
     onDoneOfflineQueue(queueId: string): void;
     onDoneOfflineAll(): void;
+    reorderQueueCmdToRequestPushOffline(queueCommands: TypeQueueCmd[]): TypeQueueCmd[];
+    checkSwapToBUQueue(queueCmds: TypeQueueCmd[], backupQueues: TypeResponseAuth['bk_cmds']): void;
+    doAfterAuth(data: TypeResponseAuth): void;
+    onAuthenticated(data: TypeResponseAuth): false | undefined;
+    onAuthenticatedCtrl(data: TypeResponseAuth): boolean;
+    signalGetOffline(): boolean;
 }

package/dist/socket/config-socket.js

@@ -1,6 +1,7 @@
-import { EventTypes, MAX_CHUNK_WS, MessageCommand, MessageTypes, SignalCommands } from '../models/Listen.js';
+import { E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY, EventTypes, MAX_CHUNK_WS, MessageCommand, MessageTypes, SignalCommands, SocketEvent, } from '../models/Listen.js';
 import { WebSocket } from 'ws';
 import { hasOwn } from '../utils.js';
+import { isEmpty } from 'lodash';
 export class ConfigSocket {
     constructor(ws, features, ctx, listen) {
         this.overflowTracker = {};
@@ -12,13 +13,14 @@ export class ConfigSocket {
         this.features = features;
         this.ctx = ctx;
         this.listen = listen;
+        this.settingSocket = features.socket;
     }
     getLastActionIdsForSocket(socketKey) {
         const defaultResult = { lastId: 1, preIds: [] };
-        if (hasOwn(this.pollId, socketKey)) {
-            const { lastId } = this.pollId[socketKey];
-            const preIds = this.pollId[socketKey].control.getLastActionIdsArray(lastId).slice(0, 10);
-            return { lastId, preIds };
+        if (hasOwn(this.ctx.queueStatus, socketKey)) {
+            const { lastId } = this.ctx.queueStatus[socketKey];
+            // const preIds = this.ctx.queueStatus[socketKey].ids.slice(0, 10);
+            return { lastId, preIds: [] };
         }
         return defaultResult;
     }
@@ -29,7 +31,7 @@ export class ConfigSocket {
     getSocketState() {
         return this.emitter ? this.emitter.readyState : -1;
     }
-    sendWs(payload) {
+    async sendWs(payload) {
         if (this.emitter && this.getSocketState() === WebSocket.OPEN) {
             const encodedData = new TextEncoder().encode(JSON.stringify(payload.data));
             const dataLength = encodedData.length;
@@ -40,6 +42,7 @@ export class ConfigSocket {
             encodedData.forEach((e, i) => {
                 data.setUint8(4 + i, e);
             });
+            await Promise.resolve();
             this.emitter.send(data);
         }
     }
@@ -66,7 +69,7 @@ export class ConfigSocket {
             requestPayload.data.lastId = lastActionId !== undefined ? lastActionId : lastId;
             requestPayload.data.preIds = preIds;
         }
-        this.sendWs(requestPayload);
+        await this.sendWs(requestPayload);
     }
     createOfflineWaiter() {
         const waiter = { resolve: null, reject: null, promise: null };
@@ -200,4 +203,99 @@ export class ConfigSocket {
             this.offlineTimer = null;
         }
     }
+    reorderQueueCmdToRequestPushOffline(queueCommands) {
+        const normalQueues = [];
+        const e2eeQueues = [];
+        const e2eeCmds = [513, 515, 514, 516, 517, 518, 519];
+        queueCommands.forEach((queueCommand) => {
+            if (e2eeCmds.includes(queueCommand.cmd)) {
+                e2eeQueues.push(queueCommand);
+            }
+            else {
+                normalQueues.push(queueCommand);
+            }
+        });
+        e2eeQueues.sort((a, b) => {
+            return E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY[a.cmd] - E2EE_QUEUE_OFFLINE_REQUEST_PRIORITY[b.cmd];
+        });
+        return [...normalQueues, ...e2eeQueues];
+    }
+    checkSwapToBUQueue(queueCmds, backupQueues) {
+        if (isEmpty(backupQueues)) {
+            return;
+        }
+        for (const queueCmd of queueCmds) {
+            const queueName = `${queueCmd.cmd}_${queueCmd.subCmd}`;
+            const backupQueueName = backupQueues[queueName];
+            if (!backupQueueName) {
+                continue;
+            }
+            const currentQueueState = this.getLastActionIdsForSocket(queueName);
+            const backupQueueState = this.getLastActionIdsForSocket(backupQueueName);
+            const shouldSwapQueue = currentQueueState.lastId === 1 && backupQueueState.lastId !== 1;
+            if (shouldSwapQueue) {
+                const [cmd, subCmd] = backupQueueName.split('_').map(Number);
+                queueCmd.cmd = cmd;
+                queueCmd.subCmd = subCmd;
+                queueCmd.queueName = backupQueueName;
+            }
+        }
+    }
+    doAfterAuth(data) {
+        this.onAuthenticated(data);
+        this.onAuthenticatedCtrl(data);
+    }
+    onAuthenticated(data) {
+        const qCmds = data === null || data === void 0 ? void 0 : data.qCmds;
+        if (!Array.isArray(qCmds) || qCmds.length === 0) {
+            return false;
+        }
+        this.offlineCmds.clear();
+        this.checkSwapToBUQueue(qCmds, data.bk_cmds);
+        const validCmds = qCmds.filter((item) => item.cmd && item.subCmd);
+        const verifyKeys = validCmds.map(({ cmd, subCmd }) => `${cmd}_${subCmd}`);
+        const reorderedCmds = this.reorderQueueCmdToRequestPushOffline(validCmds);
+        const total = reorderedCmds.length;
+        reorderedCmds.forEach((item, index) => {
+            item.priority = total - index;
+            // nếu muốn unique theo cả cmd + subCmd thì đổi key
+            this.offlineCmds.set(item.cmd, item);
+        });
+        this.signalGetOffline();
+    }
+    onAuthenticatedCtrl(data) {
+        const controlQueues = data === null || data === void 0 ? void 0 : data.ctrl_qCmds;
+        const backupQueues = data === null || data === void 0 ? void 0 : data.bk_cmds;
+        const hasValidControlQueues = Array.isArray(controlQueues) && controlQueues.length > 0;
+        if (!hasValidControlQueues) {
+            if (!this.settingSocket.enable_ctrl_socket) {
+                return false;
+            }
+            return false;
+        }
+        this.offlineCmds.clear();
+        // Swap to backup queue if needed
+        this.checkSwapToBUQueue(controlQueues, backupQueues);
+        controlQueues.forEach((queue) => {
+            if (queue.cmd && queue.subCmd) {
+                this.offlineCmds.set(queue.cmd, queue);
+            }
+        });
+        if (!this.settingSocket.enable_ctrl_socket) {
+            return true;
+        }
+        this.signalGetOffline();
+        return true;
+    }
+    signalGetOffline() {
+        this.emitter.emit(SocketEvent.ON_START_PULL_OFFLINE);
+        const offlineQueues = Array.from(this.offlineCmds.values());
+        offlineQueues.sort((a, b) => {
+            return b.priority - a.priority;
+        });
+        offlineQueues.forEach((queue) => {
+            this.doGetOffline(queue.cmd, queue.subCmd, true);
+        });
+        return true;
+    }
 }

package/dist/utils.d.ts

@@ -4,7 +4,6 @@ import { type ContextBase, type ContextSession } from './context.js';
 import type { IFileUpload } from './core/interfaces/common.js';
 import { FriendEventType } from './models/FriendEvent.js';
 import { GroupEventType } from './models/GroupEvent.js';
-import type { TypeQueueStatus } from './models/Message.js';
 export declare function hasOwn(obj: Record<string, unknown>, key: string): key is keyof typeof obj;
 /**
  * Get signed key for API requests.
@@ -185,7 +184,6 @@ export declare class FibonacciRetry {
      */
     getNextRetry(count: number, multiplier: number, maxDelay?: number): number;
 }
-export declare function handleQueueStatus(queueStatus: TypeQueueStatus): TypeQueueStatus;
 export declare function looksLikeJson(str: string): boolean;
 export declare function safeJsonParse<T = any>(input: string): T | undefined;
 export {};

package/dist/utils.js

@@ -740,12 +740,6 @@ export class FibonacciRetry {
         return baseDelay * randomFactor;
     }
 }
-export function handleQueueStatus(queueStatus) {
-    for (const key in queueStatus) {
-        delete queueStatus[key].ids;
-    }
-    return queueStatus;
-}
 export function looksLikeJson(str) {
     return /^[\[{].*[\]}]$/.test(str.trim());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zalo-toolkit",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "Unofficial Zalo API for JavaScript",
   "main": "dist/index.js",
   "type": "module",