@softtynet/zca-js 2.3.2 → 2.3.4

package/dist/cjs/utils.cjs

@@ -15,8 +15,7 @@ var protocol = require('./constants/protocol.cjs');
 var domains = require('./constants/domains.cjs');
 var defaults = require('./constants/defaults.cjs');
 var aes = require('./crypto/aes.cjs');
-require('pako');
-require('json-bigint');
+var wsCipher = require('./crypto/ws-cipher.cjs');
 
 const isBun = typeof Bun !== "undefined";
 function hasOwn(obj, key) {
@@ -166,8 +165,20 @@ async function request(ctx, url, options, raw = false) {
             options = { ...(options || {}), headers: defaultHeaders };
         }
     }
+    const timeoutMs = ctx.options?.requestTimeout;
+    const defaultSignal = !options?.signal &&
+        typeof timeoutMs === "number" &&
+        timeoutMs > 0 &&
+        typeof AbortSignal !== "undefined" &&
+        typeof AbortSignal.timeout === "function"
+        ? AbortSignal.timeout(timeoutMs)
+        : undefined;
+    const isAgentUndiciDispatcher = Boolean(ctx.options.agent && typeof ctx.options.agent.dispatch === "function");
+    const resolvedDispatcher = ctx.options.dispatcher ?? (isAgentUndiciDispatcher ? ctx.options.agent : undefined);
+    const resolvedAgent = ctx.options.agent && !isAgentUndiciDispatcher ? ctx.options.agent : undefined;
     const _options = {
         ...(options ?? {}),
+        ...(defaultSignal ? { signal: defaultSignal } : {}),
         ...(isBun
             ? {
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -175,8 +186,8 @@ async function request(ctx, url, options, raw = false) {
                 proxy: ctx.options.agent?.proxy?.href,
             }
             : {
-                agent: ctx.options.agent,
-                dispatcher: ctx.options.agent,
+                ...(resolvedAgent ? { agent: resolvedAgent } : {}),
+                ...(resolvedDispatcher ? { dispatcher: resolvedDispatcher } : {}),
             }),
     };
     const response = await ctx.options.polyfill(url, _options);
@@ -481,7 +492,8 @@ async function handleZaloResponse(ctx, response, isEncrypted = true) {
             result.data = {};
             return result;
         }
-        const decodedData = isEncrypted ? JSON.parse(decodedStr) : jsonData;
+        const safeJsonStr = isEncrypted ? wsCipher.preParseJsonIds(decodedStr) : null;
+        const decodedData = isEncrypted ? JSON.parse(safeJsonStr) : jsonData;
         if (decodedData.error_code != 0) {
             result.error = {
                 message: decodedData.error_message,
@@ -554,6 +566,11 @@ exports.decryptResp = aes.decryptResp;
 exports.encodeAES = aes.encodeAES;
 exports.encryptPin = aes.encryptPin;
 exports.validatePin = aes.validatePin;
+exports.DEFAULT_BIGINT_ID_FIELDS = wsCipher.DEFAULT_BIGINT_ID_FIELDS;
+exports.decodeBase64ToBuffer = wsCipher.decodeBase64ToBuffer;
+exports.decodeEventData = wsCipher.decodeEventData;
+exports.decodeUnit8Array = wsCipher.decodeUnit8Array;
+exports.preParseJsonIds = wsCipher.preParseJsonIds;
 exports.apiFactory = apiFactory;
 exports.formatTime = formatTime;
 exports.generateZaloUUID = generateZaloUUID;

package/dist/constants/endpoints.d.ts

@@ -64,4 +64,17 @@ export declare const ZALO_ENDPOINTS: {
         readonly LIST: "/api/recentsearch/list";
         readonly UPDATE: "/api/recentsearch/update";
     };
+    readonly GROUP: {
+        readonly GET_LIST_V3: "/api/group/getlg/v3";
+        readonly GET_LIST_V4: "/api/group/getlg/v4";
+        readonly GET_INFO_V1: "/api/group/getgi";
+        readonly GET_INFO_V2: "/api/group/getgi/v2";
+        readonly GET_MULTI_INFO_V1: "/api/group/getmg";
+        readonly GET_MULTI_INFO_V2: "/api/group/getmg-v2";
+        readonly GET_STATUS_MSG: "/api/group/getStatusMsg";
+        readonly HISTORY_LEGACY: "/api/group/history";
+        readonly CLOUD_MSG_RECENT_V2: "/api/cm/getrecentv2";
+        readonly CLOUD_MSG_OLD_V2: "/api/cm/getoldv2";
+        readonly CLOUD_MSG_JUMP_V2: "/api/cm/rgetv2";
+    };
 };

package/dist/constants/endpoints.js

@@ -64,4 +64,17 @@ export const ZALO_ENDPOINTS = {
         LIST: "/api/recentsearch/list",
         UPDATE: "/api/recentsearch/update",
     },
+    GROUP: {
+        GET_LIST_V3: "/api/group/getlg/v3",
+        GET_LIST_V4: "/api/group/getlg/v4",
+        GET_INFO_V1: "/api/group/getgi",
+        GET_INFO_V2: "/api/group/getgi/v2",
+        GET_MULTI_INFO_V1: "/api/group/getmg",
+        GET_MULTI_INFO_V2: "/api/group/getmg-v2",
+        GET_STATUS_MSG: "/api/group/getStatusMsg",
+        HISTORY_LEGACY: "/api/group/history",
+        CLOUD_MSG_RECENT_V2: "/api/cm/getrecentv2",
+        CLOUD_MSG_OLD_V2: "/api/cm/getoldv2",
+        CLOUD_MSG_JUMP_V2: "/api/cm/rgetv2",
+    },
 };

package/dist/constants/protocol.d.ts

@@ -10,7 +10,7 @@ export declare const ZALO_PROTOCOL: {
     readonly API_VERSION: 689;
     readonly DEFAULT_API_VERSION: 689;
     /** Phiên bản SDK hiện tại */
-    readonly SDK_VERSION: "2.3.2";
+    readonly SDK_VERSION: "2.3.4";
     /** Mã zpw_type đặc thù dành riêng cho phân hệ Gọi Thoại & Video (binary C++ ZaloCall) */
     readonly VOICECALL_API_TYPE: 24;
     /** Phiên bản mã hóa ZCID (ParamDecryptor) */

package/dist/constants/protocol.js

@@ -10,7 +10,7 @@ export const ZALO_PROTOCOL = {
     API_VERSION: 689,
     DEFAULT_API_VERSION: 689,
     /** Phiên bản SDK hiện tại */
-    SDK_VERSION: "2.3.2",
+    SDK_VERSION: "2.3.4",
     /** Mã zpw_type đặc thù dành riêng cho phân hệ Gọi Thoại & Video (binary C++ ZaloCall) */
     VOICECALL_API_TYPE: 24,
     /** Phiên bản mã hóa ZCID (ParamDecryptor) */

package/dist/context.d.ts

@@ -154,18 +154,28 @@ export type Options = {
     apiType: number;
     apiVersion: number;
     agent?: Agent;
+    /**
+     * Bộ điều phối kết nối (Undici `Dispatcher` / `ProxyAgent`) dành cho `globalThis.fetch` mặc định của Node.js 18+.
+     */
+    dispatcher?: unknown;
     /**
      * Optional fetch implementation for polyfills in non-standard environments.
      * If using proxy, `node-fetch` is highly recommended.
      */
     polyfill: typeof fetch;
     imageMetadataGetter?: ImageMetadataGetter;
+    /**
+     * Thời gian chờ tối đa cho mỗi HTTP request tính bằng mili-giây (mặc định: `30000`ms = 30s, đặt `0` để tắt).
+     */
+    requestTimeout?: number;
 };
 declare class CallbacksMap extends Map<string, UploadCallback> {
+    private timers;
     /**
      * @param ttl Time to live in milliseconds. Default is 5 minutes.
      */
     set(key: string, value: UploadCallback, ttl?: number): this;
+    delete(key: string): boolean;
 }
 export type ViewerKeyCacheEntry = {
     viewer_key: string;

package/dist/context.js

@@ -1,15 +1,32 @@
 import { ZALO_DEFAULTS, ZALO_PROTOCOL } from "./constants/index.js";
 const _5_MINUTES = ZALO_DEFAULTS.UPLOAD.CALLBACK_TTL_MS;
 class CallbacksMap extends Map {
+    timers = new Map();
     /**
      * @param ttl Time to live in milliseconds. Default is 5 minutes.
      */
     set(key, value, ttl = _5_MINUTES) {
-        setTimeout(() => {
-            this.delete(key);
+        const existing = this.timers.get(key);
+        if (existing)
+            clearTimeout(existing);
+        const timer = setTimeout(() => {
+            this.timers.delete(key);
+            super.delete(key);
         }, ttl);
+        if (typeof timer === "object" && timer !== null && "unref" in timer && typeof timer.unref === "function") {
+            timer.unref();
+        }
+        this.timers.set(key, timer);
         return super.set(key, value);
     }
+    delete(key) {
+        const existing = this.timers.get(key);
+        if (existing) {
+            clearTimeout(existing);
+            this.timers.delete(key);
+        }
+        return super.delete(key);
+    }
 }
 export const createContext = (apiType = ZALO_PROTOCOL.API_TYPE, apiVersion = ZALO_PROTOCOL.API_VERSION) => ({
     API_TYPE: apiType,
@@ -20,6 +37,7 @@ export const createContext = (apiType = ZALO_PROTOCOL.API_TYPE, apiVersion = ZAL
         checkUpdate: ZALO_DEFAULTS.OPTIONS.CHECK_UPDATE,
         logging: ZALO_DEFAULTS.OPTIONS.LOGGING,
         polyfill: global.fetch,
+        requestTimeout: 30000,
     },
     secretKey: null,
 });

package/dist/crypto/ws-cipher.d.ts

@@ -1,3 +1,10 @@
+export declare const DEFAULT_BIGINT_ID_FIELDS: readonly ["owner_id", "group_id", "uidFrom", "uidTo", "uid", "ownerId", "destId", "srcId", "fromUid", "threadId", "globalMsgId", "global_msg_id", "globalDelMsgId", "msgId", "refMessageId", "cliMsgId", "client_msg_id", "actionId", "lastActionIdOther", "lastActionId", "resetLastActionId", "lastId", "ids", "topicId", "reminderId", "eventId"];
+/**
+ * Tiền xử lý chuỗi JSON trước khi `JSON.parse` (tương đương `preParse(e, t)` trong `app.asar` của Zalo PC).
+ * Bọc dấu ngoặc kép quanh các trường định danh 64-bit (`owner_id`, `group_id`, hoặc các số nguyên >= 16 chữ số
+ * vượt quá `Number.MAX_SAFE_INTEGER`) để tránh mất 3 chữ số cuối của UID/MsgId do làm tròn IEEE-754.
+ */
+export declare function preParseJsonIds(jsonStr: string, alwaysStringFields?: readonly string[], bigIntSafeFields?: readonly string[]): string;
 export declare function decodeBase64ToBuffer(data: string): Buffer;
 export declare function decodeUnit8Array(data: Uint8Array): string | null;
 export declare function decodeEventData(parsed: Record<string, unknown>, cipherKey?: string): Promise<any>;

package/dist/crypto/ws-cipher.js

@@ -2,6 +2,68 @@ import crypto from "node:crypto";
 import pako from "pako";
 import JSONBig from "json-bigint";
 import { ZaloApiError } from "../Errors/index.js";
+const jsonBigString = JSONBig({ storeAsString: true });
+export const DEFAULT_BIGINT_ID_FIELDS = [
+    "owner_id",
+    "group_id",
+    "uidFrom",
+    "uidTo",
+    "uid",
+    "ownerId",
+    "destId",
+    "srcId",
+    "fromUid",
+    "threadId",
+    "globalMsgId",
+    "global_msg_id",
+    "globalDelMsgId",
+    "msgId",
+    "refMessageId",
+    "cliMsgId",
+    "client_msg_id",
+    "actionId",
+    "lastActionIdOther",
+    "lastActionId",
+    "resetLastActionId",
+    "lastId",
+    "ids",
+    "topicId",
+    "reminderId",
+    "eventId",
+];
+/**
+ * Tiền xử lý chuỗi JSON trước khi `JSON.parse` (tương đương `preParse(e, t)` trong `app.asar` của Zalo PC).
+ * Bọc dấu ngoặc kép quanh các trường định danh 64-bit (`owner_id`, `group_id`, hoặc các số nguyên >= 16 chữ số
+ * vượt quá `Number.MAX_SAFE_INTEGER`) để tránh mất 3 chữ số cuối của UID/MsgId do làm tròn IEEE-754.
+ */
+export function preParseJsonIds(jsonStr, alwaysStringFields = ["owner_id", "group_id"], bigIntSafeFields = DEFAULT_BIGINT_ID_FIELDS) {
+    if (!jsonStr || typeof jsonStr !== "string")
+        return jsonStr;
+    const alwaysSet = new Set(alwaysStringFields);
+    const allFields = Array.from(new Set([...alwaysStringFields, ...bigIntSafeFields]));
+    if (allFields.length === 0)
+        return jsonStr;
+    const escapedKeys = allFields.map((k) => k.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+    const keyValueRegex = new RegExp(`"(${escapedKeys})"(\\s*:\\s*)(\\d+|\\[\\s*\\d+(?:\\s*,\\s*\\d+)*\\s*\\])`, "g");
+    return jsonStr.replace(keyValueRegex, (fullMatch, key, sep, rawVal) => {
+        const forceString = alwaysSet.has(key);
+        if (rawVal.startsWith("[")) {
+            const inner = rawVal.slice(1, -1);
+            const parts = inner.split(",").map((part) => {
+                const trimmed = part.trim();
+                if (forceString || trimmed.length >= 16 || Number(trimmed) > Number.MAX_SAFE_INTEGER) {
+                    return `"${trimmed}"`;
+                }
+                return trimmed;
+            });
+            return `"${key}"${sep}[${parts.join(",")}]`;
+        }
+        if (forceString || rawVal.length >= 16 || Number(rawVal) > Number.MAX_SAFE_INTEGER) {
+            return `"${key}"${sep}"${rawVal}"`;
+        }
+        return fullMatch;
+    });
+}
 export function decodeBase64ToBuffer(data) {
     return Buffer.from(data, "base64");
 }
@@ -23,7 +85,7 @@ export async function decodeEventData(parsed, cipherKey) {
     const rawData = parsed.data;
     const encryptType = parsed.encrypt;
     if (encryptType === 0)
-        return JSON.parse(rawData);
+        return jsonBigString.parse(preParseJsonIds(rawData));
     const decodedBuffer = decodeBase64ToBuffer(encryptType === 1 ? rawData : decodeURIComponent(rawData));
     let decryptedBuffer = decodedBuffer;
     if (encryptType !== 1) {
@@ -48,5 +110,5 @@ export async function decodeEventData(parsed, cipherKey) {
     const decodedData = decodeUnit8Array(decompressedBuffer);
     if (!decodedData)
         return;
-    return JSONBig.parse(decodedData);
+    return jsonBigString.parse(preParseJsonIds(decodedData));
 }

package/dist/index.d.ts

@@ -68,8 +68,27 @@ export type { GetFriendRecommendationsResponse, FriendRecommendationsCollapseMsg
 export type { GetFriendRequestStatusResponse } from "./apis/friend/getFriendRequestStatus.js";
 export type { GetFullAvatarResponse } from "./apis/profile/getFullAvatar.js";
 export type { GetGroupBlockedMemberPayload, GetGroupBlockedMemberResponse } from "./apis/group/getGroupBlockedMember.js";
-export type { GetGroupChatHistoryResponse } from "./apis/group/getGroupChatHistory.js";
+export type { GetGroupChatHistoryOptions, GetGroupChatHistoryResponse } from "./apis/group/getGroupChatHistory.js";
+export type { GetGroupHistoryLegacyResponse } from "./apis/group/getGroupHistoryLegacy.js";
 export type { GroupInfoPendingApprove, GroupInfoResponse } from "./apis/group/getGroupInfo.js";
+export type { GetGroupInfoV2Options, GetGroupInfoV2Response } from "./apis/group/getGroupInfoV2.js";
+export type { GetGroupListV3Options, GetGroupListV3Response } from "./apis/group/getGroupListV3.js";
+export type { GetGroupMessageStatusQueryItem, GetGroupMessageStatusResponse, GroupMessageStatusMemberItem, GroupMessageStatusThreadInfo, } from "./apis/group/getGroupMessageStatus.js";
+export type { CheckQuotaCommunityMemberResponse } from "./apis/group/checkQuotaCommunityMember.js";
+export type { GetE2eeGroupListResponse } from "./apis/group/getE2eeGroupList.js";
+export type { GetMultiGroupCloudMessagesResponse } from "./apis/group/getMultiGroupCloudMessages.js";
+export type { GetGroupCloudMessagePathOptions, GetGroupCloudMessagePathResponse } from "./apis/group/getGroupCloudMessagePath.js";
+export type { AnalyseGroupResponse } from "./apis/group/analyseGroup.js";
+export type { DirectMessageStatusItem, GetDirectMessageStatusResponse } from "./apis/chat/getDirectMessageStatus.js";
+export type { GetSuggestedConversationsResponse } from "./apis/chat/getSuggestedConversations.js";
+export type { UpdatePinConversationsOptions, UpdatePinConversationsResponse } from "./apis/chat/updatePinConversations.js";
+export type { GetFriendProfilesV2Options, GetFriendProfilesV2Response } from "./apis/friend/getFriendProfilesV2.js";
+export type { GetFriendsActivePCWebResponse } from "./apis/friend/getFriendsActivePCWeb.js";
+export type { VerifyFriendOptions, VerifyFriendResponse } from "./apis/friend/verifyFriend.js";
+export type { GetPersonalMediaOptions } from "./apis/media/getPersonalMedia.js";
+export type { GetPersonalMediaPreviewResponse } from "./apis/media/getPersonalMediaPreview.js";
+export type { RemovePersonalMediaOptions, RemovePersonalMediaResponse } from "./apis/media/removePersonalMedia.js";
+export type { ExportedSession } from "./apis/auth/exportSession.js";
 export type { GetGroupInviteBoxInfoPayload, GetGroupInviteBoxInfoResponse } from "./apis/group/getGroupInviteBoxInfo.js";
 export type { GetGroupInviteBoxListPayload, GetGroupInviteBoxListResponse } from "./apis/group/getGroupInviteBoxList.js";
 export type { GetGroupLinkDetailResponse } from "./apis/group/getGroupLinkDetail.js";
@@ -176,7 +195,7 @@ export type { GetBlockFriendsResponse } from "./apis/friend/getBlockFriends.js";
 export type { GetCloudInfoResponse } from "./apis/zcloud/getCloudInfo.js";
 export type { GetCloudSettingsResponse } from "./apis/zcloud/getCloudSettings.js";
 export type { GetCloudViewerKeyResponse } from "./apis/zcloud/getCloudViewerKey.js";
-export type { GetConversationMediaOptions, GetConversationMediaResponse } from "./apis/media/getConversationMedia.js";
+export type { GetConversationMediaOptions, GetConversationMediaResponse, MediaStoreItem, MediaStoreType, } from "./apis/media/getConversationMedia.js";
 export type { GetEmojiStatusConfigResponse } from "./apis/profile/getEmojiStatusConfig.js";
 export type { GetExtraFriendInfoResponse } from "./apis/friend/getExtraFriendInfo.js";
 export type { GetExtraGroupInfoResponse } from "./apis/group/getExtraGroupInfo.js";
@@ -221,4 +240,4 @@ export { ChatTTL } from "./apis/chat/updateAutoDeleteChat.js";
 export { UpdateLangAvailableLanguages } from "./apis/auth/updateLang.js";
 export { UpdateSettingsType } from "./apis/profile/updateSettings.js";
 export { CallType } from "./apis/call/sendVoiceCall.js";
-export { generateRSAKeyPair, decryptWithPrivateKey, deriveZdbAesKey, decryptZdbBuffer, parseZdbHeader, encryptZCloudAES, decryptZCloudAES, type ZdbTocEntry, } from "./utils.js";
+export { generateRSAKeyPair, decryptWithPrivateKey, deriveZdbAesKey, decryptZdbBuffer, parseZdbHeader, encryptZCloudAES, decryptZCloudAES, preParseJsonIds, type ZdbTocEntry, } from "./utils.js";

package/dist/index.js

@@ -16,4 +16,4 @@ export { ChatTTL } from "./apis/chat/updateAutoDeleteChat.js";
 export { UpdateLangAvailableLanguages } from "./apis/auth/updateLang.js";
 export { UpdateSettingsType } from "./apis/profile/updateSettings.js";
 export { CallType } from "./apis/call/sendVoiceCall.js";
-export { generateRSAKeyPair, decryptWithPrivateKey, deriveZdbAesKey, decryptZdbBuffer, parseZdbHeader, encryptZCloudAES, decryptZCloudAES, } from "./utils.js";
+export { generateRSAKeyPair, decryptWithPrivateKey, deriveZdbAesKey, decryptZdbBuffer, parseZdbHeader, encryptZCloudAES, decryptZCloudAES, preParseJsonIds, } from "./utils.js";

package/dist/realtime/listener.d.ts

@@ -21,6 +21,7 @@ export declare class Listener extends EventEmitter<ListenerEvents> {
     private retryTimeout?;
     private watchdogTimeout?;
     private consecutive1006Count;
+    private isManualStop;
     private id;
     constructor(ctx: ContextSession, urls: string[]);
     /**

package/dist/realtime/listener.js

@@ -27,6 +27,7 @@ export class Listener extends EventEmitter {
     retryTimeout;
     watchdogTimeout;
     consecutive1006Count = 0;
+    isManualStop = false;
     id = 0;
     constructor(ctx, urls) {
         super();
@@ -152,6 +153,7 @@ export class Listener extends EventEmitter {
         logger(this.ctx).verbose(`Rotating endpoint to ${this.wsURL}`);
     }
     start({ retryOnClose = false } = {}) {
+        this.isManualStop = false;
         if (this.retryTimeout) {
             clearTimeout(this.retryTimeout);
             this.retryTimeout = undefined;
@@ -175,6 +177,10 @@ export class Listener extends EventEmitter {
             t: Date.now(),
         });
         const cookie = this.ctx.cookie.getCookieStringSync(ZALO_DOMAINS.CHAT_WEB);
+        const wsAgent = this.ctx.options.agent &&
+            typeof this.ctx.options.agent.dispatch !== "function"
+            ? this.ctx.options.agent
+            : undefined;
         const ws = new WebSocket(this.wsURL, {
             headers: {
                 "accept-language": getBrowserLanguage(this.ctx.language),
@@ -189,7 +195,7 @@ export class Listener extends EventEmitter {
                 "user-agent": this.userAgent,
                 cookie,
             },
-            agent: this.ctx.options.agent,
+            ...(wsAgent ? { agent: wsAgent } : {}),
         });
         this.ws = ws;
         ws.onopen = () => {
@@ -202,7 +208,8 @@ export class Listener extends EventEmitter {
         ws.onclose = (event) => {
             this.reset();
             this.emit("disconnected", event.code, event.reason);
-            const retry = retryOnClose &&
+            const retry = !this.isManualStop &&
+                retryOnClose &&
                 this.isRetryable(event.code) &&
                 this.canRetry(event.code);
             if (retry && retryOnClose) {
@@ -288,19 +295,24 @@ export class Listener extends EventEmitter {
         };
     }
     stop() {
-        if (this.retryTimeout)
+        this.isManualStop = true;
+        if (this.retryTimeout) {
             clearTimeout(this.retryTimeout);
-        if (this.watchdogTimeout)
+            this.retryTimeout = undefined;
+        }
+        if (this.watchdogTimeout) {
             clearTimeout(this.watchdogTimeout);
+            this.watchdogTimeout = undefined;
+        }
         if (this.ws) {
-            if (this.ws.readyState !== WebSocket.CLOSED) {
+            if (this.ws.readyState !== WebSocket.CLOSED && this.ws.readyState !== WebSocket.CLOSING) {
                 this.ws.close(CloseReason.ManualClosure);
             }
         }
         this.reset();
     }
     sendWs(payload, requireId = true) {
-        if (this.ws) {
+        if (this.ws && (this.ws.readyState === undefined || this.ws.readyState === WebSocket.OPEN)) {
             if (requireId)
                 payload.data["req_id"] = `req_${this.id++}`;
             const encodedData = new TextEncoder().encode(JSON.stringify(payload.data));

package/dist/update.js

@@ -6,6 +6,9 @@ const NPM_REGISTRY = ZALO_DOMAINS.NPM_REGISTRY;
 export async function checkUpdate(ctx) {
     if (!ctx.options.checkUpdate)
         return;
+    const isAgentUndiciDispatcher = Boolean(ctx.options.agent && typeof ctx.options.agent.dispatch === "function");
+    const resolvedDispatcher = ctx.options.dispatcher ?? (isAgentUndiciDispatcher ? ctx.options.agent : undefined);
+    const resolvedAgent = ctx.options.agent && !isAgentUndiciDispatcher ? ctx.options.agent : undefined;
     const _options = {
         ...(isBun
             ? {
@@ -13,7 +16,13 @@ export async function checkUpdate(ctx) {
                 // @ts-ignore
                 proxy: ctx.options.agent?.proxy?.href,
             }
-            : { agent: ctx.options.agent }),
+            : {
+                ...(resolvedAgent ? { agent: resolvedAgent } : {}),
+                ...(resolvedDispatcher ? { dispatcher: resolvedDispatcher } : {}),
+            }),
+        ...(typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function"
+            ? { signal: AbortSignal.timeout(3000) }
+            : {}),
     };
     const response = await ctx.options.polyfill(NPM_REGISTRY, _options).catch(() => null);
     if (!response || !response.ok)

package/dist/utils.js

@@ -9,7 +9,7 @@ import { ZaloApiError, ZaloApiMissingImageMetadataGetter } from "./Errors/index.
 import { FriendEventType } from "./models/FriendEvent.js";
 import { GroupEventType } from "./models/GroupEvent.js";
 import { ZALO_DEFAULTS, ZALO_DOMAINS, ZALO_PROTOCOL } from "./constants/index.js";
-import { decodeAES, encodeAES } from "./crypto/index.js";
+import { decodeAES, encodeAES, preParseJsonIds } from "./crypto/index.js";
 export * from "./constants/index.js";
 export * from "./crypto/index.js";
 export * from "./core/index.js";
@@ -161,8 +161,20 @@ export async function request(ctx, url, options, raw = false) {
             options = { ...(options || {}), headers: defaultHeaders };
         }
     }
+    const timeoutMs = ctx.options?.requestTimeout;
+    const defaultSignal = !options?.signal &&
+        typeof timeoutMs === "number" &&
+        timeoutMs > 0 &&
+        typeof AbortSignal !== "undefined" &&
+        typeof AbortSignal.timeout === "function"
+        ? AbortSignal.timeout(timeoutMs)
+        : undefined;
+    const isAgentUndiciDispatcher = Boolean(ctx.options.agent && typeof ctx.options.agent.dispatch === "function");
+    const resolvedDispatcher = ctx.options.dispatcher ?? (isAgentUndiciDispatcher ? ctx.options.agent : undefined);
+    const resolvedAgent = ctx.options.agent && !isAgentUndiciDispatcher ? ctx.options.agent : undefined;
     const _options = {
         ...(options ?? {}),
+        ...(defaultSignal ? { signal: defaultSignal } : {}),
         ...(isBun
             ? {
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -170,8 +182,8 @@ export async function request(ctx, url, options, raw = false) {
                 proxy: ctx.options.agent?.proxy?.href,
             }
             : {
-                agent: ctx.options.agent,
-                dispatcher: ctx.options.agent,
+                ...(resolvedAgent ? { agent: resolvedAgent } : {}),
+                ...(resolvedDispatcher ? { dispatcher: resolvedDispatcher } : {}),
             }),
     };
     const response = await ctx.options.polyfill(url, _options);
@@ -476,7 +488,8 @@ export async function handleZaloResponse(ctx, response, isEncrypted = true) {
             result.data = {};
             return result;
         }
-        const decodedData = isEncrypted ? JSON.parse(decodedStr) : jsonData;
+        const safeJsonStr = isEncrypted ? preParseJsonIds(decodedStr) : null;
+        const decodedData = isEncrypted ? JSON.parse(safeJsonStr) : jsonData;
         if (decodedData.error_code != 0) {
             result.error = {
                 message: decodedData.error_message,

package/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./dist";
+export * from "./dist/index.js";
 export as namespace Zalo;

package/package.json

@@ -1,8 +1,10 @@
 {
     "name": "@softtynet/zca-js",
-    "version": "2.3.2",
+    "version": "2.3.4",
     "description": "Zalo API client library for Node.js and Bun, maintained by Softtynet.",
-    "main": "dist/index.js",
+    "main": "dist/cjs/index.cjs",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
     "type": "module",
     "files": [
         "dist",
@@ -12,8 +14,9 @@
     ],
     "exports": {
         ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js",
             "require": "./dist/cjs/index.cjs",
-            "types": "./index.d.ts",
             "default": "./dist/index.js"
         }
     },
@@ -23,8 +26,14 @@
         "build:esm": "tsc",
         "build:cjs": "rollup -c rollup.config.js",
         "build": "npm run build:clean && npm run build:esm && npm run build:cjs",
-        "test:verify": "npx --yes tsx test/verify_upgrades.ts",
+        "typecheck": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit && tsc -p examples/tsconfig.json --noEmit && tsc -p docs/tsconfig.json --noEmit",
+        "test:verify": "npm run typecheck && npx --yes tsx test/verify_upgrades.ts",
         "test:live": "npx --yes tsx test/verify_live.ts",
+        "docs:gen": "node scripts/generateDocs.js",
+        "docs:dev": "node scripts/generateDocs.js && vitepress dev docs",
+        "docs:build": "node scripts/generateDocs.js && vitepress build docs",
+        "docs:preview": "vitepress preview docs",
+        "docs:deploy": "node scripts/deployDocs.js",
         "prettier": "prettier --write .",
         "lint": "eslint .",
         "lint:fix": "eslint . --fix",
@@ -79,7 +88,8 @@
         "rimraf": "^5.0.10",
         "rollup": "^4.24.0",
         "typescript": "^5.5.3",
-        "typescript-eslint": "^8.41.0"
+        "typescript-eslint": "^8.41.0",
+        "vitepress": "^1.6.4"
     },
     "lint-staged": {
         "*.{js,ts}": "eslint"