@softtynet/zca-js 2.1.18 → 2.1.20

package/dist/apis/listen.js

@@ -142,8 +142,25 @@ export class Listener extends EventEmitter {
         logger(this.ctx).verbose(`Rotating endpoint to ${this.wsURL}`);
     }
     start({ retryOnClose = false } = {}) {
-        if (this.ws)
-            throw new ZaloApiError("Already started");
+        if (this.retryTimeout) {
+            clearTimeout(this.retryTimeout);
+            this.retryTimeout = undefined;
+        }
+        if (this.ws) {
+            const state = this.ws.readyState;
+            if (state === WebSocket.CONNECTING || state === WebSocket.OPEN) {
+                logger(this.ctx).warn("Listener is already active or connecting. Skipping duplicate start().");
+                return;
+            }
+            try {
+                this.ws.removeAllListeners();
+                this.ws.close();
+            }
+            catch (_a) {
+                // ignore
+            }
+            this.ws = null;
+        }
         this.wsURL = makeURL(this.ctx, this.urls[this.rotateCount], {
             t: Date.now(),
         });
@@ -185,7 +202,12 @@ export class Listener extends EventEmitter {
                 }
                 this.emit("reconnecting", event.code);
                 this.retryTimeout = setTimeout(() => {
-                    this.start({ retryOnClose: true });
+                    try {
+                        this.start({ retryOnClose: true });
+                    }
+                    catch (error) {
+                        logger(this.ctx).error("Failed to auto-restart listener on retry timeout:", error);
+                    }
                 }, retry);
             }
             else {

package/dist/cjs/apis/listen.cjs

@@ -154,8 +154,25 @@ class Listener extends EventEmitter {
         utils.logger(this.ctx).verbose(`Rotating endpoint to ${this.wsURL}`);
     }
     start({ retryOnClose = false } = {}) {
-        if (this.ws)
-            throw new ZaloApiError.ZaloApiError("Already started");
+        if (this.retryTimeout) {
+            clearTimeout(this.retryTimeout);
+            this.retryTimeout = undefined;
+        }
+        if (this.ws) {
+            const state = this.ws.readyState;
+            if (state === WebSocket.CONNECTING || state === WebSocket.OPEN) {
+                utils.logger(this.ctx).warn("Listener is already active or connecting. Skipping duplicate start().");
+                return;
+            }
+            try {
+                this.ws.removeAllListeners();
+                this.ws.close();
+            }
+            catch (_a) {
+                // ignore
+            }
+            this.ws = null;
+        }
         this.wsURL = utils.makeURL(this.ctx, this.urls[this.rotateCount], {
             t: Date.now(),
         });
@@ -197,7 +214,12 @@ class Listener extends EventEmitter {
                 }
                 this.emit("reconnecting", event.code);
                 this.retryTimeout = setTimeout(() => {
-                    this.start({ retryOnClose: true });
+                    try {
+                        this.start({ retryOnClose: true });
+                    }
+                    catch (error) {
+                        utils.logger(this.ctx).error("Failed to auto-restart listener on retry timeout:", error);
+                    }
                 }, retry);
             }
             else {

package/dist/cjs/utils.cjs

@@ -309,7 +309,7 @@ async function getDefaultHeaders(ctx, origin = "https://chat.zalo.me") {
     if (!ctx.userAgent)
         throw new ZaloApiError.ZaloApiError("User agent is not available");
     const secChUa = getSecChUaHeaders(ctx.userAgent);
-    return Object.assign({ accept: "*/*", "accept-encoding": "gzip, deflate, br, zstd", "accept-language": getBrowserLanguage(ctx.language), "content-type": "application/x-www-form-urlencoded", cookie: await ctx.cookie.getCookieString(origin), origin: "https://chat.zalo.me", priority: "u=1, i", referer: "https://chat.zalo.me/", "user-agent": ctx.userAgent, "sec-fetch-dest": "empty", "sec-fetch-mode": "cors", "sec-fetch-site": "same-site" }, secChUa);
+    return Object.assign({ accept: "*/*", "accept-encoding": "gzip, deflate, br, zstd", "accept-language": getBrowserLanguage(ctx.language), "content-type": "application/x-www-form-urlencoded", cookie: await ctx.cookie.getCookieString(origin), origin: origin, priority: "u=1, i", referer: `${origin}/`, "user-agent": ctx.userAgent, "sec-fetch-dest": "empty", "sec-fetch-mode": "cors", "sec-fetch-site": origin === "https://id.zalo.me" ? "same-origin" : "same-site" }, secChUa);
 }
 async function request(ctx, url, options, raw = false) {
     var _a, _b;
@@ -318,11 +318,23 @@ async function request(ctx, url, options, raw = false) {
     const origin = new URL(url).origin;
     const defaultHeaders = await getDefaultHeaders(ctx, origin);
     if (!raw) {
-        if (options) {
-            options.headers = Object.assign(defaultHeaders, options.headers || {});
+        if (options && options.headers) {
+            const mergedHeaders = Object.assign({}, defaultHeaders);
+            const inputHeaders = options.headers;
+            for (const [key, value] of Object.entries(inputHeaders)) {
+                const lowerKey = key.toLowerCase();
+                for (const existingKey of Object.keys(mergedHeaders)) {
+                    if (existingKey.toLowerCase() === lowerKey && existingKey !== key) {
+                        delete mergedHeaders[existingKey];
+                    }
+                }
+                mergedHeaders[key] = value;
+            }
+            options.headers = mergedHeaders;
+        }
+        else {
+            options = Object.assign(Object.assign({}, (options || {})), { headers: defaultHeaders });
         }
-        else
-            options = { headers: defaultHeaders };
     }
     const _options = Object.assign(Object.assign({}, (options !== null && options !== void 0 ? options : {})), (isBun
         ? {

package/dist/utils.js

@@ -305,7 +305,7 @@ export async function getDefaultHeaders(ctx, origin = "https://chat.zalo.me") {
     if (!ctx.userAgent)
         throw new ZaloApiError("User agent is not available");
     const secChUa = getSecChUaHeaders(ctx.userAgent);
-    return Object.assign({ accept: "*/*", "accept-encoding": "gzip, deflate, br, zstd", "accept-language": getBrowserLanguage(ctx.language), "content-type": "application/x-www-form-urlencoded", cookie: await ctx.cookie.getCookieString(origin), origin: "https://chat.zalo.me", priority: "u=1, i", referer: "https://chat.zalo.me/", "user-agent": ctx.userAgent, "sec-fetch-dest": "empty", "sec-fetch-mode": "cors", "sec-fetch-site": "same-site" }, secChUa);
+    return Object.assign({ accept: "*/*", "accept-encoding": "gzip, deflate, br, zstd", "accept-language": getBrowserLanguage(ctx.language), "content-type": "application/x-www-form-urlencoded", cookie: await ctx.cookie.getCookieString(origin), origin: origin, priority: "u=1, i", referer: `${origin}/`, "user-agent": ctx.userAgent, "sec-fetch-dest": "empty", "sec-fetch-mode": "cors", "sec-fetch-site": origin === "https://id.zalo.me" ? "same-origin" : "same-site" }, secChUa);
 }
 export async function request(ctx, url, options, raw = false) {
     var _a, _b;
@@ -314,11 +314,23 @@ export async function request(ctx, url, options, raw = false) {
     const origin = new URL(url).origin;
     const defaultHeaders = await getDefaultHeaders(ctx, origin);
     if (!raw) {
-        if (options) {
-            options.headers = Object.assign(defaultHeaders, options.headers || {});
+        if (options && options.headers) {
+            const mergedHeaders = Object.assign({}, defaultHeaders);
+            const inputHeaders = options.headers;
+            for (const [key, value] of Object.entries(inputHeaders)) {
+                const lowerKey = key.toLowerCase();
+                for (const existingKey of Object.keys(mergedHeaders)) {
+                    if (existingKey.toLowerCase() === lowerKey && existingKey !== key) {
+                        delete mergedHeaders[existingKey];
+                    }
+                }
+                mergedHeaders[key] = value;
+            }
+            options.headers = mergedHeaders;
+        }
+        else {
+            options = Object.assign(Object.assign({}, (options || {})), { headers: defaultHeaders });
         }
-        else
-            options = { headers: defaultHeaders };
     }
     const _options = Object.assign(Object.assign({}, (options !== null && options !== void 0 ? options : {})), (isBun
         ? {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@softtynet/zca-js",
-    "version": "2.1.18",
+    "version": "2.1.20",
     "description": "Unofficial Zalo API for JavaScript",
     "main": "dist/index.js",
     "type": "module",