@larksuiteoapi/node-sdk 1.48.0 → 1.49.0-alpha.1

package/es/index.js

@@ -82742,6 +82742,10 @@ class WSClient {
     constructor(params) {
         this.wsConfig = new WSConfig();
         this.isConnecting = false;
+        this.reconnectInfo = {
+            lastConnectTime: 0,
+            nextConnectTime: 0,
+        };
         const { appId, appSecret, domain = Domain.Feishu, httpInstance = defaultHttpInstance, loggerLevel = LoggerLevel.info, logger = defaultLogger, autoReconnect = true } = params;
         this.logger = new LoggerProxy(loggerLevel, logger);
         assert(!appId, () => this.logger.error('appId is needed'));
@@ -82822,6 +82826,7 @@ class WSClient {
             }
             this.isConnecting = true;
             const tryConnect = () => {
+                this.reconnectInfo.lastConnectTime = Date.now();
                 return this.pullConnectConfig()
                     .then(isSuccess => isSuccess ? this.connect() : Promise.resolve(false))
                     .then(isSuccess => {
@@ -82830,8 +82835,6 @@ class WSClient {
                         return Promise.resolve(true);
                     }
                     return Promise.resolve(false);
-                }).finally(() => {
-                    this.isConnecting = false;
                 });
             };
             if (this.pingInterval) {
@@ -82842,7 +82845,16 @@ class WSClient {
                 if (wsInstance) {
                     wsInstance === null || wsInstance === void 0 ? void 0 : wsInstance.terminate();
                 }
-                const isSuccess = yield tryConnect();
+                if (this.reconnectInterval) {
+                    clearTimeout(this.reconnectInterval);
+                }
+                let isSuccess = false;
+                try {
+                    isSuccess = yield tryConnect();
+                }
+                finally {
+                    this.isConnecting = false;
+                }
                 if (!isSuccess) {
                     this.logger.error('[ws]', 'connect failed');
                     yield this.reConnect();
@@ -82859,7 +82871,8 @@ class WSClient {
                 wsInstance === null || wsInstance === void 0 ? void 0 : wsInstance.terminate();
             }
             this.wsConfig.setWSInstance(null);
-            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+            const reconnectNonceTime = reconnectNonce ? reconnectNonce * Math.random() : 0;
+            this.reconnectInterval = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 (function loopReConnect(count) {
                     return __awaiter(this, void 0, void 0, function* () {
                         count++;
@@ -82867,18 +82880,22 @@ class WSClient {
                         // if reconnectCount < 0, the reconnect time is infinite
                         if (isSuccess) {
                             this.logger.debug('[ws]', 'reconnect success');
+                            this.isConnecting = false;
                             return;
                         }
                         this.logger.info('ws', `unable to connect to the server after trying ${count} times")`);
                         if (reconnectCount >= 0 && count >= reconnectCount) {
+                            this.isConnecting = false;
                             return;
                         }
-                        setTimeout(() => {
+                        this.reconnectInterval = setTimeout(() => {
                             loopReConnect.bind(this)(count);
                         }, reconnectInterval);
+                        this.reconnectInfo.nextConnectTime = Date.now() + reconnectInterval;
                     });
                 }).bind(this)(0);
-            }), reconnectNonce ? reconnectNonce * Math.random() : 0);
+            }), reconnectNonceTime);
+            this.reconnectInfo.nextConnectTime = Date.now() + reconnectInterval;
         });
     }
     pingLoop() {
@@ -82995,6 +83012,9 @@ class WSClient {
             });
         }
     }
+    getReconnectInfo() {
+        return this.reconnectInfo;
+    }
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.info('[ws]', `receive events or callbacks through persistent connection only available in self-build & Feishu app, Configured in:

package/lib/index.js

@@ -82757,6 +82757,10 @@ class WSClient {
     constructor(params) {
         this.wsConfig = new WSConfig();
         this.isConnecting = false;
+        this.reconnectInfo = {
+            lastConnectTime: 0,
+            nextConnectTime: 0,
+        };
         const { appId, appSecret, domain = exports.Domain.Feishu, httpInstance = defaultHttpInstance, loggerLevel = exports.LoggerLevel.info, logger = defaultLogger, autoReconnect = true } = params;
         this.logger = new LoggerProxy(loggerLevel, logger);
         assert(!appId, () => this.logger.error('appId is needed'));
@@ -82837,6 +82841,7 @@ class WSClient {
             }
             this.isConnecting = true;
             const tryConnect = () => {
+                this.reconnectInfo.lastConnectTime = Date.now();
                 return this.pullConnectConfig()
                     .then(isSuccess => isSuccess ? this.connect() : Promise.resolve(false))
                     .then(isSuccess => {
@@ -82845,8 +82850,6 @@ class WSClient {
                         return Promise.resolve(true);
                     }
                     return Promise.resolve(false);
-                }).finally(() => {
-                    this.isConnecting = false;
                 });
             };
             if (this.pingInterval) {
@@ -82857,7 +82860,16 @@ class WSClient {
                 if (wsInstance) {
                     wsInstance === null || wsInstance === void 0 ? void 0 : wsInstance.terminate();
                 }
-                const isSuccess = yield tryConnect();
+                if (this.reconnectInterval) {
+                    clearTimeout(this.reconnectInterval);
+                }
+                let isSuccess = false;
+                try {
+                    isSuccess = yield tryConnect();
+                }
+                finally {
+                    this.isConnecting = false;
+                }
                 if (!isSuccess) {
                     this.logger.error('[ws]', 'connect failed');
                     yield this.reConnect();
@@ -82874,7 +82886,8 @@ class WSClient {
                 wsInstance === null || wsInstance === void 0 ? void 0 : wsInstance.terminate();
             }
             this.wsConfig.setWSInstance(null);
-            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+            const reconnectNonceTime = reconnectNonce ? reconnectNonce * Math.random() : 0;
+            this.reconnectInterval = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 (function loopReConnect(count) {
                     return __awaiter(this, void 0, void 0, function* () {
                         count++;
@@ -82882,18 +82895,22 @@ class WSClient {
                         // if reconnectCount < 0, the reconnect time is infinite
                         if (isSuccess) {
                             this.logger.debug('[ws]', 'reconnect success');
+                            this.isConnecting = false;
                             return;
                         }
                         this.logger.info('ws', `unable to connect to the server after trying ${count} times")`);
                         if (reconnectCount >= 0 && count >= reconnectCount) {
+                            this.isConnecting = false;
                             return;
                         }
-                        setTimeout(() => {
+                        this.reconnectInterval = setTimeout(() => {
                             loopReConnect.bind(this)(count);
                         }, reconnectInterval);
+                        this.reconnectInfo.nextConnectTime = Date.now() + reconnectInterval;
                     });
                 }).bind(this)(0);
-            }), reconnectNonce ? reconnectNonce * Math.random() : 0);
+            }), reconnectNonceTime);
+            this.reconnectInfo.nextConnectTime = Date.now() + reconnectInterval;
         });
     }
     pingLoop() {
@@ -83010,6 +83027,9 @@ class WSClient {
             });
         }
     }
+    getReconnectInfo() {
+        return this.reconnectInfo;
+    }
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.info('[ws]', `receive events or callbacks through persistent connection only available in self-build & Feishu app, Configured in:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larksuiteoapi/node-sdk",
-  "version": "1.48.0",
+  "version": "1.49.0-alpha.1",
   "description": "larksuite open sdk for nodejs",
   "keywords": [
     "feishu",

package/types/index.d.ts

@@ -265917,7 +265917,9 @@ declare class WSClient {
     private httpInstance;
     private eventDispatcher?;
     private pingInterval?;
+    private reconnectInterval?;
     private isConnecting;
+    private reconnectInfo;
     constructor(params: IConstructorParams);
     private pullConnectConfig;
     private connect;
@@ -265927,6 +265929,10 @@ declare class WSClient {
     private handleControlData;
     private handleEventData;
     private sendMessage;
+    getReconnectInfo(): {
+        lastConnectTime: number;
+        nextConnectTime: number;
+    };
     start(params: {
         eventDispatcher: EventDispatcher;
     }): Promise<void>;