ztxkutils 2.7.11 → 2.7.14

package/dist/request.d.ts

@@ -5,5 +5,6 @@ import { AxiosRequestConfig } from 'axios';
 export interface IOptions extends AxiosRequestConfig {
     isFormData?: boolean;
     encryptionType?: 'aes' | 'des' | boolean;
+    isTimeoutMessage?: boolean;
 }
 export default function request(myOptions: IOptions): any;

package/dist/request.js

@@ -1,7 +1,7 @@
 import './tslib.es6-f9459658.js';
 import 'axios';
 import 'ztxkui';
-export { a as default } from './request-5b825e2e.js';
+export { a as default } from './request-5df1ec76.js';
 import './authority-fad2028d.js';
 import './crypto-c481f616.js';
 import 'crypto';

package/dist/stompClient.js

@@ -32,25 +32,34 @@ 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.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!");
+                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!system=" + _this.connectWsConfig.systemType);
                 try {
                     _this.client.disconnect(function () {
-                        // const timeInterval =
-                        //   Math.ceil(this.reconnectionNum / 5) *
-                        //   (this.connectWsConfig.reconnectionTime ?? 3000);
+                        _this.client = null;
                     });
                 }
                 catch (err) {
                     console.log('---连接未建立的关闭出错---', err);
                 }
-                _this.client = null;
                 _this.reconnectionNum++;
                 var timeInterval = 3000;
-                console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01---");
-                setTimeout(function () {
+                console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01time=" + Date.now() + "system=" + _this.connectWsConfig.systemType + "---");
+                if (_this.clearIsClientNo) {
+                    clearTimeout(_this.clearIsClientNo);
+                    _this.clearIsClientNo = null;
+                }
+                _this.clearIsClientNo = setTimeout(function () {
                     _this.init();
                 }, timeInterval > 10000 ? 10000 : timeInterval);
             }
@@ -74,8 +83,16 @@ 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('---------连接成功--------');
+            console.log("---------\u8FDE\u63A5\u6210\u529F time=" + Date.now() + " system=" + _this.connectWsConfig.systemType + " time=" + Date.now() + "--------");
             // 连接成功后，将当前已注册的，未执行的 连接通道 连接
             var subscriptionsFnKeys = Object.keys(_this.subscriptionsFn);
             if (Array.isArray(subscriptionsFnKeys)) {
@@ -108,13 +125,21 @@ var StompClient = /** @class */ (function () {
         }, 
         // 连接失败回调
         function (err) {
-            console.log('---------连接失败--------');
+            console.log("---------\u8FDE\u63A5\u5931\u8D25 system=" + _this.connectWsConfig.systemType + " time=" + Date.now() + "--------");
             console.log(err);
             _this.isClient = 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;
+            }
             // this.errorCallback(err);
             // 连接失败后，将当前已注册的 连接通道 全部置为未执行状态
             var subscriptionsFnKeys = Object.keys(_this.subscriptionsFn);
@@ -145,22 +170,19 @@ var StompClient = /** @class */ (function () {
             // 重连间隔，每隔5秒递增，超过最大间隔时间后，取最大间隔时间重连
             try {
                 _this.client.disconnect(function () {
-                    // const timeInterval =
-                    //   Math.ceil(this.reconnectionNum / 5) *
-                    //   (this.connectWsConfig.reconnectionTime ?? 3000);
+                    _this.client = null;
                 });
             }
             catch (err) {
-                console.log('---连接已建立的关闭出错---', err);
+                console.log("---\u8FDE\u63A5\u5DF2\u5EFA\u7ACB\u7684\u5173\u95ED\u51FA\u9519 time=" + Date.now() + "system=" + _this.connectWsConfig.systemType + "---", 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 () {
+            console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01time=" + Date.now() + "system=" + _this.connectWsConfig.systemType);
+            _this.clearIsClientYes = setTimeout(function () {
                 _this.init();
             }, timeInterval);
         });
@@ -189,10 +211,12 @@ var StompClient = /** @class */ (function () {
             callback = undefined;
         }
         var subscriptionsFn = function () {
-            var subscription = _this.client.subscribe(pipe, function (response) {
-                callback && callback(response);
-            }, headers);
-            _this.subscriptions[subscribeId] = subscription;
+            if (_this.client) {
+                var subscription = _this.client.subscribe(pipe, function (response) {
+                    callback && callback(response);
+                }, headers);
+                _this.subscriptions[subscribeId] = subscription;
+            }
         };
         if ((_a = this.client) === null || _a === void 0 ? void 0 : _a.connected) {
             // 如果是连接状态 正常执行函数

package/package.json

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