ztxkutils 2.7.0 → 2.7.3

package/dist/request.js

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

package/dist/stompClient.d.ts

@@ -15,6 +15,8 @@ declare class StompClient {
     static getInstance: (connectWsConfig?: IConnectWsConfig) => StompClient;
     connectWsConfig: IConnectWsConfig;
     client: any;
+    isClient: any;
+    clearIsClient: any;
     subscriptions: any;
     subscriptionsFn: any;
     successCallbacks: any;

package/dist/stompClient.js

@@ -4,6 +4,8 @@ import { g as getToken } from './authority-fad2028d.js';
 
 var StompClient = /** @class */ (function () {
     function StompClient(connectWsConfig) {
+        this.isClient = false; // 是否连接上了
+        this.clearIsClient = null;
         this.subscriptions = {}; // 连接通道的返回值存储对象
         this.subscriptionsFn = {}; // 连接通道的函数存储对象
         this.successCallbacks = {}; // 连接成功执行的回调存储对象
@@ -22,6 +24,23 @@ var StompClient = /** @class */ (function () {
         var socket = new SockJS(this.connectWsConfig.baseUrl + "/api/zmdms-csc-ztim/ws?token=" + token + "&system=" + this.connectWsConfig.systemType + "&clientType=" + this.connectWsConfig.clientType);
         // 获取 STOMP 子协议的客户端对象
         this.client = Stomp.over(socket);
+        this.clearIsClient = setTimeout(function () {
+            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!");
+                _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);
+                });
+            }
+        }, 10000);
         // 拦截输出的一大堆垃圾信息
         this.client.debug = function (str) {
             if (_this.connectWsConfig.debug) {
@@ -36,6 +55,10 @@ var StompClient = /** @class */ (function () {
         this.client.connect({}, 
         // 连接成功回调
         function () {
+            _this.isClient = true;
+            if (_this.clearIsClient) {
+                clearTimeout(_this.clearIsClient);
+            }
             _this.reconnectionNum = 0;
             console.log('---------连接成功--------');
             // 连接成功后，将当前已注册的，未执行的 连接通道 连接
@@ -72,6 +95,10 @@ var StompClient = /** @class */ (function () {
         function (err) {
             console.log('---------连接失败--------');
             console.log(err);
+            _this.isClient = true;
+            if (_this.clearIsClient) {
+                clearTimeout(_this.clearIsClient);
+            }
             // this.errorCallback(err);
             // 连接失败后，将当前已注册的 连接通道 全部置为未执行状态
             var subscriptionsFnKeys = Object.keys(_this.subscriptionsFn);
@@ -101,14 +128,18 @@ var StompClient = /** @class */ (function () {
             // 重连逻辑, 默认3秒后重连
             // 重连间隔，每隔5秒递增，超过最大间隔时间后，取最大间隔时间重连
             _this.client.disconnect(function () {
-                var _a;
-                _this.client = null;
-                _this.reconnectionNum++;
-                var timeInterval = Math.ceil(_this.reconnectionNum / 5) *
-                    ((_a = _this.connectWsConfig.reconnectionTime) !== null && _a !== void 0 ? _a : 3000);
                 setTimeout(function () {
-                    _this.init();
-                }, timeInterval > 10000 ? 10000 : timeInterval);
+                    _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);
+                }, 300);
             });
         });
     };

package/package.json

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