ztxkutils 2.7.10 → 2.7.11

package/dist/stompClient.d.ts

@@ -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

@@ -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,31 +32,29 @@ 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!");
-                    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++;
-                    var timeInterval = 3000;
-                    console.log("\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01");
-                    setTimeout(function () {
-                        _this.init();
-                    }, timeInterval > 10000 ? 10000 : timeInterval);
+        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);
+                    });
                 }
-            }, 20000);
-        }
+                catch (err) {
+                    console.log('---连接未建立的关闭出错---', err);
+                }
+                _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);
+            }
+        }, 10000);
         // 拦截输出的一大堆垃圾信息
         this.client.debug = function (str) {
             if (_this.connectWsConfig.debug) {
@@ -143,18 +143,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");
+            setTimeout(function () {
+                _this.init();
+            }, timeInterval);
         });
     };
     // 订阅连接成功回调
@@ -214,11 +222,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

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