npm - ztxkutils - Versions diffs - 2.7.9 → 2.7.12 - Mend

ztxkutils 2.7.9 → 2.7.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/stompClient.d.ts CHANGED Viewed

@@ -17,6 +17,8 @@ declare class StompClient {
     client: any;
     isClient: any;
     clearIsClient: any;
+    clearIsClientNo: any;
+    clearIsClientYes: any;
     subscriptions: any;
     subscriptionsFn: any;
     successCallbacks: any;

package/dist/stompClient.js CHANGED Viewed

@@ -6,6 +6,8 @@ var StompClient = /** @class */ (function () {
     function StompClient(connectWsConfig) {
         this.isClient = false; // 是否连接上了
         this.clearIsClient = null;
+        this.clearIsClientNo = null; // 连接10秒内未建立，重新连接
+        this.clearIsClientYes = null; // 连接已建立重新连接
         this.subscriptions = {}; // 连接通道的返回值存储对象
         this.subscriptionsFn = {}; // 连接通道的函数存储对象
         this.successCallbacks = {}; // 连接成功执行的回调存储对象
@@ -30,26 +32,41 @@ var StompClient = /** @class */ (function () {
             clearTimeout(this.clearIsClient);
             this.clearIsClient = null;
         }
-        if (!this.clearIsClient) {
-            this.clearIsClient = setTimeout(function () {
-                _this.clearIsClient = null;
-                if (!_this.isClient) {
-                    console.log("\u8FDE\u63A5\u5DF2\u53D1\u8D77\uFF0C\u4F46\u662F10\u79D2\u540E\u672A\u6210\u529F\u5EFA\u7ACB\u8FDE\u63A5\uFF0C\u624B\u52A8\u65AD\u5F00\u91CD\u8FDE!");
+        if (this.clearIsClientNo) {
+            clearTimeout(this.clearIsClientNo);
+            this.clearIsClientNo = null;
+        }
+        if (this.clearIsClientYes) {
+            clearTimeout(this.clearIsClientYes);
+            this.clearIsClientYes = null;
+        }
+        this.clearIsClient = setTimeout(function () {
+            _this.clearIsClient = null;
+            if (!_this.isClient) {
+                console.log("\u8FDE\u63A5\u5DF2\u53D1\u8D77\uFF0C\u4F46\u662F10\u79D2\u540E\u672A\u6210\u529F\u5EFA\u7ACB\u8FDE\u63A5\uFF0C\u624B\u52A8\u65AD\u5F00\u91CD\u8FDE!");
+                try {
                     _this.client.disconnect(function () {
                         // const timeInterval =
                         //   Math.ceil(this.reconnectionNum / 5) *
                         //   (this.connectWsConfig.reconnectionTime ?? 3000);
                     });
-                    _this.client = null;
-                    _this.reconnectionNum++;
-                    var timeInterval = 3000;
-                    console.log("\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01");
-                    setTimeout(function () {
-                        _this.init();
-                    }, timeInterval > 10000 ? 10000 : timeInterval);
                 }
-            }, 20000);
-        }
+                catch (err) {
+                    console.log('---连接未建立的关闭出错---', err);
+                }
+                _this.client = null;
+                _this.reconnectionNum++;
+                var timeInterval = 3000;
+                console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01---");
+                if (_this.clearIsClientNo) {
+                    clearTimeout(_this.clearIsClientNo);
+                    _this.clearIsClientNo = null;
+                }
+                _this.clearIsClientNo = setTimeout(function () {
+                    _this.init();
+                }, timeInterval > 10000 ? 10000 : timeInterval);
+            }
+        }, 10000);
         // 拦截输出的一大堆垃圾信息
         this.client.debug = function (str) {
             if (_this.connectWsConfig.debug) {
@@ -69,6 +86,14 @@ var StompClient = /** @class */ (function () {
                 clearTimeout(_this.clearIsClient);
                 _this.clearIsClient = null;
             }
+            if (_this.clearIsClientNo) {
+                clearTimeout(_this.clearIsClientNo);
+                _this.clearIsClientNo = null;
+            }
+            if (_this.clearIsClientYes) {
+                clearTimeout(_this.clearIsClientYes);
+                _this.clearIsClientYes = null;
+            }
             _this.reconnectionNum = 0;
             console.log('---------连接成功--------');
             // 连接成功后，将当前已注册的，未执行的 连接通道 连接
@@ -110,6 +135,14 @@ var StompClient = /** @class */ (function () {
                 clearTimeout(_this.clearIsClient);
                 _this.clearIsClient = null;
             }
+            if (_this.clearIsClientNo) {
+                clearTimeout(_this.clearIsClientNo);
+                _this.clearIsClientNo = null;
+            }
+            if (_this.clearIsClientYes) {
+                clearTimeout(_this.clearIsClientYes);
+                _this.clearIsClientYes = null;
+            }
             // this.errorCallback(err);
             // 连接失败后，将当前已注册的 连接通道 全部置为未执行状态
             var subscriptionsFnKeys = Object.keys(_this.subscriptionsFn);
@@ -138,18 +171,26 @@ var StompClient = /** @class */ (function () {
             }
             // 重连逻辑, 默认3秒后重连
             // 重连间隔，每隔5秒递增，超过最大间隔时间后，取最大间隔时间重连
-            _this.client.disconnect(function () {
-                _this.client = null;
-                _this.reconnectionNum++;
-                // const timeInterval =
-                //   Math.ceil(this.reconnectionNum / 5) *
-                //   (this.connectWsConfig.reconnectionTime ?? 3000);
-                var timeInterval = 3000;
-                console.log("\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01");
-                setTimeout(function () {
-                    _this.init();
-                }, timeInterval);
-            });
+            try {
+                _this.client.disconnect(function () {
+                    // const timeInterval =
+                    //   Math.ceil(this.reconnectionNum / 5) *
+                    //   (this.connectWsConfig.reconnectionTime ?? 3000);
+                });
+            }
+            catch (err) {
+                console.log('---连接已建立的关闭出错---', err);
+            }
+            _this.client = null;
+            _this.reconnectionNum++;
+            // const timeInterval =
+            //   Math.ceil(this.reconnectionNum / 5) *
+            //   (this.connectWsConfig.reconnectionTime ?? 3000);
+            var timeInterval = 3000;
+            console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01");
+            _this.clearIsClientYes = setTimeout(function () {
+                _this.init();
+            }, timeInterval);
         });
     };
     // 订阅连接成功回调
@@ -209,11 +250,17 @@ var StompClient = /** @class */ (function () {
         var _this = this;
         this.isInit = false;
         return new Promise(function (resolve, reject) {
-            _this.client.disconnect(function () {
-                _this.client = null;
+            try {
+                _this.client.disconnect(function () {
+                    _this.client = null;
+                    callback && callback();
+                    resolve(null);
+                });
+            }
+            catch (err) {
                 callback && callback();
                 resolve(null);
-            });
+            }
         });
     };
     // 发送消息

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.7.9",
+  "version": "2.7.12",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",