@softtynet/zca-js 2.1.8 → 2.1.10

package/dist/apis/listen.d.ts

@@ -42,6 +42,8 @@ interface ListenerEvents {
     friend_event: [data: FriendEvent];
     group_event: [data: GroupEvent];
     cipher_key: [key: string];
+    ping: [];
+    pong: [];
 }
 export declare class Listener extends EventEmitter<ListenerEvents> {
     private ctx;
@@ -59,6 +61,7 @@ export declare class Listener extends EventEmitter<ListenerEvents> {
     private cipherKey?;
     private selfListen;
     private pingInterval?;
+    private retryTimeout?;
     private id;
     constructor(ctx: ContextSession, urls: string[]);
     /**

package/dist/apis/listen.js

@@ -129,7 +129,7 @@ export class Listener extends EventEmitter {
                 if (shouldRotate) {
                     this.rotateEndpoint();
                 }
-                setTimeout(() => {
+                this.retryTimeout = setTimeout(() => {
                     this.start({ retryOnClose: true });
                 }, retry);
             }
@@ -143,6 +143,7 @@ export class Listener extends EventEmitter {
             this.emit("error", event);
         };
         ws.onmessage = async (event) => {
+            this.emit("pong"); // Pulse event to notify watchdog that socket is alive
             const { data } = event;
             if (!(data instanceof Buffer))
                 return;
@@ -167,6 +168,7 @@ export class Listener extends EventEmitter {
                             data: { eventId: Date.now() },
                         };
                         this.sendWs(payload, false);
+                        this.emit("ping");
                     };
                     this.pingInterval = setInterval(() => {
                         ping();
@@ -355,16 +357,24 @@ export class Listener extends EventEmitter {
                 }
             }
             catch (error) {
+                if (error instanceof ZaloApiError && error.message.includes("Invalid data length or missing cipher key")) {
+                    logger(this.ctx).verbose("Ignored undecryptable Zalo packet. This is normal for some reaction/system events.");
+                    return;
+                }
                 this.onErrorCallback(error);
                 this.emit("error", error);
             }
         };
     }
     stop() {
+        if (this.retryTimeout)
+            clearTimeout(this.retryTimeout);
         if (this.ws) {
-            this.ws.close(CloseReason.ManualClosure);
-            this.reset();
+            if (this.ws.readyState !== WebSocket.CLOSED) {
+                this.ws.close(CloseReason.ManualClosure);
+            }
         }
+        this.reset();
     }
     sendWs(payload, requireId = true) {
         if (this.ws) {

package/dist/cjs/apis/listen.cjs

@@ -141,7 +141,7 @@ class Listener extends EventEmitter {
                 if (shouldRotate) {
                     this.rotateEndpoint();
                 }
-                setTimeout(() => {
+                this.retryTimeout = setTimeout(() => {
                     this.start({ retryOnClose: true });
                 }, retry);
             }
@@ -155,6 +155,7 @@ class Listener extends EventEmitter {
             this.emit("error", event);
         };
         ws.onmessage = async (event) => {
+            this.emit("pong"); // Pulse event to notify watchdog that socket is alive
             const { data } = event;
             if (!(data instanceof Buffer))
                 return;
@@ -179,6 +180,7 @@ class Listener extends EventEmitter {
                             data: { eventId: Date.now() },
                         };
                         this.sendWs(payload, false);
+                        this.emit("ping");
                     };
                     this.pingInterval = setInterval(() => {
                         ping();
@@ -367,16 +369,24 @@ class Listener extends EventEmitter {
                 }
             }
             catch (error) {
+                if (error instanceof ZaloApiError.ZaloApiError && error.message.includes("Invalid data length or missing cipher key")) {
+                    utils.logger(this.ctx).verbose("Ignored undecryptable Zalo packet. This is normal for some reaction/system events.");
+                    return;
+                }
                 this.onErrorCallback(error);
                 this.emit("error", error);
             }
         };
     }
     stop() {
+        if (this.retryTimeout)
+            clearTimeout(this.retryTimeout);
         if (this.ws) {
-            this.ws.close(exports.CloseReason.ManualClosure);
-            this.reset();
+            if (this.ws.readyState !== WebSocket.CLOSED) {
+                this.ws.close(exports.CloseReason.ManualClosure);
+            }
         }
+        this.reset();
     }
     sendWs(payload, requireId = true) {
         if (this.ws) {

package/package.json

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