@larksuiteoapi/node-sdk 1.58.0 → 1.60.0

package/es/index.js

@@ -85285,6 +85285,7 @@ var HttpStatusCode;
 class WSClient {
     constructor(params) {
         this.wsConfig = new WSConfig();
+        this.reconnectGeneration = 0;
         this.isConnecting = false;
         this.reconnectInfo = {
             lastConnectTime: 0,
@@ -85376,11 +85377,13 @@ class WSClient {
     }
     reConnect(isStart = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isConnecting) {
+            if (this.isConnecting && !isStart) {
                 this.logger.debug('[ws]', 'repeat connection');
                 return;
             }
             this.isConnecting = true;
+            // Invalidate any in-flight reconnect loops from previous sessions
+            const currentGeneration = ++this.reconnectGeneration;
             const tryConnect = () => {
                 this.reconnectInfo.lastConnectTime = Date.now();
                 return this.pullConnectConfig()
@@ -85396,14 +85399,14 @@ class WSClient {
             if (this.pingInterval) {
                 clearTimeout(this.pingInterval);
             }
+            if (this.reconnectInterval) {
+                clearTimeout(this.reconnectInterval);
+            }
             const wsInstance = this.wsConfig.getWSInstance();
             if (isStart) {
                 if (wsInstance) {
                     wsInstance === null || wsInstance === void 0 ? void 0 : wsInstance.terminate();
                 }
-                if (this.reconnectInterval) {
-                    clearTimeout(this.reconnectInterval);
-                }
                 let isSuccess = false;
                 try {
                     isSuccess = yield tryConnect();
@@ -85431,8 +85434,16 @@ class WSClient {
             this.reconnectInterval = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 (function loopReConnect(count) {
                     return __awaiter(this, void 0, void 0, function* () {
+                        // Stale loop — a newer reConnect session has started
+                        if (currentGeneration !== this.reconnectGeneration) {
+                            return;
+                        }
                         count++;
                         const isSuccess = yield tryConnect();
+                        // Re-check after async operation in case a new session started
+                        if (currentGeneration !== this.reconnectGeneration) {
+                            return;
+                        }
                         // if reconnectCount < 0, the reconnect time is infinite
                         if (isSuccess) {
                             this.logger.debug('[ws]', 'reconnect success');
@@ -85578,6 +85589,8 @@ class WSClient {
      */
     close(params = {}) {
         const { force = false } = params;
+        // Invalidate any in-flight reconnect loops
+        this.reconnectGeneration++;
         if (this.pingInterval) {
             clearTimeout(this.pingInterval);
             this.pingInterval = undefined;

package/lib/index.js

@@ -85300,6 +85300,7 @@ var HttpStatusCode;
 class WSClient {
     constructor(params) {
         this.wsConfig = new WSConfig();
+        this.reconnectGeneration = 0;
         this.isConnecting = false;
         this.reconnectInfo = {
             lastConnectTime: 0,
@@ -85391,11 +85392,13 @@ class WSClient {
     }
     reConnect(isStart = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isConnecting) {
+            if (this.isConnecting && !isStart) {
                 this.logger.debug('[ws]', 'repeat connection');
                 return;
             }
             this.isConnecting = true;
+            // Invalidate any in-flight reconnect loops from previous sessions
+            const currentGeneration = ++this.reconnectGeneration;
             const tryConnect = () => {
                 this.reconnectInfo.lastConnectTime = Date.now();
                 return this.pullConnectConfig()
@@ -85411,14 +85414,14 @@ class WSClient {
             if (this.pingInterval) {
                 clearTimeout(this.pingInterval);
             }
+            if (this.reconnectInterval) {
+                clearTimeout(this.reconnectInterval);
+            }
             const wsInstance = this.wsConfig.getWSInstance();
             if (isStart) {
                 if (wsInstance) {
                     wsInstance === null || wsInstance === void 0 ? void 0 : wsInstance.terminate();
                 }
-                if (this.reconnectInterval) {
-                    clearTimeout(this.reconnectInterval);
-                }
                 let isSuccess = false;
                 try {
                     isSuccess = yield tryConnect();
@@ -85446,8 +85449,16 @@ class WSClient {
             this.reconnectInterval = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 (function loopReConnect(count) {
                     return __awaiter(this, void 0, void 0, function* () {
+                        // Stale loop — a newer reConnect session has started
+                        if (currentGeneration !== this.reconnectGeneration) {
+                            return;
+                        }
                         count++;
                         const isSuccess = yield tryConnect();
+                        // Re-check after async operation in case a new session started
+                        if (currentGeneration !== this.reconnectGeneration) {
+                            return;
+                        }
                         // if reconnectCount < 0, the reconnect time is infinite
                         if (isSuccess) {
                             this.logger.debug('[ws]', 'reconnect success');
@@ -85593,6 +85604,8 @@ class WSClient {
      */
     close(params = {}) {
         const { force = false } = params;
+        // Invalidate any in-flight reconnect loops
+        this.reconnectGeneration++;
         if (this.pingInterval) {
             clearTimeout(this.pingInterval);
             this.pingInterval = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larksuiteoapi/node-sdk",
-  "version": "1.58.0",
+  "version": "1.60.0",
   "description": "larksuite open sdk for nodejs",
   "keywords": [
     "feishu",
@@ -34,8 +34,8 @@
     "lodash.merge": "^4.6.2",
     "lodash.pickby": "^4.6.0",
     "protobufjs": "^7.2.6",
-    "qs": "^6.13.0",
-    "ws": "^8.16.0"
+    "qs": "^6.14.2",
+    "ws": "^8.19.0"
   },
   "devDependencies": {
     "@koa/router": "^12.0.0",

package/types/index.d.ts

@@ -293056,6 +293056,7 @@ declare class WSClient {
     private eventDispatcher?;
     private pingInterval?;
     private reconnectInterval?;
+    private reconnectGeneration;
     private isConnecting;
     private reconnectInfo;
     private agent?;