ztxkutils 2.10.31 → 2.10.32

package/dist/stompClient.d.ts

@@ -24,6 +24,7 @@ declare class StompClient {
     successCallbacks: any;
     errorCallbacks: any;
     reconnectionNum: number;
+    userClose: boolean;
     isInit: boolean;
     constructor(connectWsConfig: IConnectWsConfig);
     init(): void;

package/dist/stompClient.js

@@ -13,6 +13,7 @@ var StompClient = /** @class */ (function () {
         this.successCallbacks = {}; // 连接成功执行的回调存储对象
         this.errorCallbacks = {}; // 连接失败执行的回调存储对象
         this.reconnectionNum = 0; // 重连次数
+        this.userClose = false; // 是否用户主动关闭
         this.isInit = false;
         this.connectWsConfig = connectWsConfig;
     }
@@ -27,6 +28,7 @@ var StompClient = /** @class */ (function () {
         // 获取 STOMP 子协议的客户端对象
         this.client = Stomp.over(socket);
         this.isClient = false;
+        this.userClose = false; // 重新初始化 重新计算
         // 如果存在 证明已经初始化过，直接删除
         if (this.clearIsClient) {
             clearTimeout(this.clearIsClient);
@@ -129,6 +131,22 @@ var StompClient = /** @class */ (function () {
         function (err) {
             console.log("---------\u8FDE\u63A5\u5931\u8D25 system=" + _this.connectWsConfig.systemType + " time=" + Date.now() + "--------");
             console.log(err);
+            if (_this.userClose) {
+                if (_this.clearIsClient) {
+                    clearTimeout(_this.clearIsClient);
+                    _this.clearIsClient = null;
+                }
+                if (_this.clearIsClientNo) {
+                    clearTimeout(_this.clearIsClientNo);
+                    _this.clearIsClientNo = null;
+                }
+                if (_this.clearIsClientYes) {
+                    clearTimeout(_this.clearIsClientYes);
+                    _this.clearIsClientYes = null;
+                }
+                console.log('用户主动关闭');
+                return;
+            }
             _this.isClient = true;
             if (_this.clearIsClient) {
                 clearTimeout(_this.clearIsClient);
@@ -247,43 +265,28 @@ var StompClient = /** @class */ (function () {
     StompClient.prototype.disconnect = function (callback) {
         var _this = this;
         this.isInit = false;
+        this.userClose = true;
+        if (this.clearIsClient) {
+            clearTimeout(this.clearIsClient);
+            this.clearIsClient = null;
+        }
+        if (this.clearIsClientNo) {
+            clearTimeout(this.clearIsClientNo);
+            this.clearIsClientNo = null;
+        }
+        if (this.clearIsClientYes) {
+            clearTimeout(this.clearIsClientYes);
+            this.clearIsClientYes = null;
+        }
         return new Promise(function (resolve, reject) {
             try {
                 _this.client.disconnect(function () {
                     _this.client = null;
-                    setTimeout(function () {
-                        if (_this.clearIsClient) {
-                            clearTimeout(_this.clearIsClient);
-                            _this.clearIsClient = null;
-                        }
-                        if (_this.clearIsClientNo) {
-                            clearTimeout(_this.clearIsClientNo);
-                            _this.clearIsClientNo = null;
-                        }
-                        if (_this.clearIsClientYes) {
-                            clearTimeout(_this.clearIsClientYes);
-                            _this.clearIsClientYes = null;
-                        }
-                    }, 300);
                     callback && callback();
                     resolve(null);
                 });
             }
             catch (err) {
-                setTimeout(function () {
-                    if (_this.clearIsClient) {
-                        clearTimeout(_this.clearIsClient);
-                        _this.clearIsClient = null;
-                    }
-                    if (_this.clearIsClientNo) {
-                        clearTimeout(_this.clearIsClientNo);
-                        _this.clearIsClientNo = null;
-                    }
-                    if (_this.clearIsClientYes) {
-                        clearTimeout(_this.clearIsClientYes);
-                        _this.clearIsClientYes = null;
-                    }
-                }, 300);
                 callback && callback();
                 resolve(null);
             }

package/package.json

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