ztxkutils 2.10.66-5 → 2.10.66-50

package/dist/stompClient.js

@@ -1,3 +1,4 @@
+import instance from './i18next.js';
 import Stomp from 'zt-stompjs';
 import SockJS from 'zt-sockjs-client';
 import { g as getToken } from './authority-7a91cb9f.js';
@@ -58,18 +59,22 @@ var StompClient = /** @class */ (function () {
         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!system=" + _this.connectWsConfig.systemType);
+                console.log(instance.t('连接已发起，但是10秒后未成功建立连接，手动断开重连!system={{slot0}}', { slot0: _this.connectWsConfig.systemType }));
                 try {
                     _this.client.disconnect(function () {
                         _this.client = null;
                     });
                 }
                 catch (err) {
-                    console.log('---连接未建立的关闭出错---', err);
+                    console.log(instance.t('---连接未建立的关闭出错---'), err);
                 }
                 _this.reconnectionNum++;
                 var timeInterval = _this.getReconnectionTime();
-                console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01time=" + Date.now() + "system=" + _this.connectWsConfig.systemType + "---");
+                console.log(instance.t('---第{{slot0}}次重连！time={{slot1}}system={{slot2}}---', {
+                    slot0: _this.reconnectionNum,
+                    slot1: Date.now(),
+                    slot2: _this.connectWsConfig.systemType,
+                }));
                 if (_this.clearIsClientNo) {
                     clearTimeout(_this.clearIsClientNo);
                     _this.clearIsClientNo = null;
@@ -112,40 +117,16 @@ var StompClient = /** @class */ (function () {
                 _this.clearIsClientYes = null;
             }
             _this.reconnectionNum = 0;
-            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)) {
-                subscriptionsFnKeys.forEach(function (key) {
-                    var _a = _this.subscriptionsFn[key], isExecute = _a.isExecute, subscriptionsFn = _a.subscriptionsFn;
-                    if (!isExecute) {
-                        subscriptionsFn === null || subscriptionsFn === void 0 ? void 0 : subscriptionsFn();
-                        _this.subscriptionsFn[key].isExecute = true;
-                    }
-                });
-            }
-            // 连接成功后，统一执行连接成功函数
-            var successCallbackKeys = Object.keys(_this.successCallbacks);
-            if (Array.isArray(successCallbackKeys)) {
-                successCallbackKeys.forEach(function (key) {
-                    var _a = _this.successCallbacks[key], isExecute = _a.isExecute, callback = _a.callback;
-                    if (!isExecute) {
-                        callback && callback();
-                    }
-                    _this.successCallbacks[key].isExecute = true;
-                });
-            }
-            // 将失败回调 的执行状态 重置为未执行状态
-            var errorCallbackKeys = Object.keys(_this.errorCallbacks);
-            if (Array.isArray(errorCallbackKeys)) {
-                errorCallbackKeys.forEach(function (key) {
-                    _this.errorCallbacks[key].isExecute = false;
-                });
-            }
+            console.log(instance.t('---------连接成功 time={{slot0}} system={{slot1}} time={{slot2}}--------', {
+                slot0: Date.now(),
+                slot1: _this.connectWsConfig.systemType,
+                slot2: Date.now(),
+            }));
+            _this.executeSubscribe();
         }, 
         // 连接失败回调
         function (err) {
-            console.log("---------\u8FDE\u63A5\u5931\u8D25 system=" + _this.connectWsConfig.systemType + " time=" + Date.now() + "--------");
+            console.log(instance.t('---------连接失败 system={{slot0}} time={{slot1}}--------', { slot0: _this.connectWsConfig.systemType, slot1: Date.now() }));
             console.log(err);
             if (_this.userClose) {
                 _this.userClose = false; // 重新初始化 重新计算
@@ -161,7 +142,9 @@ var StompClient = /** @class */ (function () {
                     clearTimeout(_this.clearIsClientYes);
                     _this.clearIsClientYes = null;
                 }
-                console.log('用户主动关闭');
+                // 连接失败后，将所有注册过的订阅、回调执行状态置为未执行状态。
+                _this.setExecuteFail();
+                console.log(instance.t('用户主动关闭'));
                 return;
             }
             _this.isClient = true;
@@ -177,32 +160,8 @@ var StompClient = /** @class */ (function () {
                 clearTimeout(_this.clearIsClientYes);
                 _this.clearIsClientYes = null;
             }
-            // this.errorCallback(err);
-            // 连接失败后，将当前已注册的 连接通道 全部置为未执行状态
-            var subscriptionsFnKeys = Object.keys(_this.subscriptionsFn);
-            if (Array.isArray(subscriptionsFnKeys)) {
-                subscriptionsFnKeys.forEach(function (key) {
-                    _this.subscriptionsFn[key].isExecute = false;
-                });
-            }
-            // 连接失败后，统一执行连接失败函数
-            var errorCallbackKeys = Object.keys(_this.errorCallbacks);
-            if (Array.isArray(errorCallbackKeys)) {
-                errorCallbackKeys.forEach(function (key) {
-                    var _a = _this.errorCallbacks[key], isExecute = _a.isExecute, callback = _a.callback;
-                    if (!isExecute) {
-                        callback && callback();
-                    }
-                    _this.errorCallbacks[key].isExecute = true;
-                });
-            }
-            // 将成功回调 的执行状态 重置为未执行状态
-            var successCallbackKeys = Object.keys(_this.successCallbacks);
-            if (Array.isArray(successCallbackKeys)) {
-                successCallbackKeys.forEach(function (key) {
-                    _this.successCallbacks[key].isExecute = false;
-                });
-            }
+            // 连接失败后，将所有注册过的订阅、回调执行状态置为未执行状态。
+            _this.setExecuteFail();
             // 重连逻辑, 默认3秒后重连
             // 重连间隔，每隔5秒递增，超过最大间隔时间后，取最大间隔时间重连
             try {
@@ -211,14 +170,15 @@ var StompClient = /** @class */ (function () {
                 });
             }
             catch (err) {
-                console.log("---\u8FDE\u63A5\u5DF2\u5EFA\u7ACB\u7684\u5173\u95ED\u51FA\u9519 time=" + Date.now() + "system=" + _this.connectWsConfig.systemType + "---", err);
+                console.log(instance.t('---连接已建立的关闭出错 time={{slot0}}system={{slot1}}---', { slot0: Date.now(), slot1: _this.connectWsConfig.systemType }), err);
             }
             _this.reconnectionNum++;
-            // const timeInterval =
-            //   Math.ceil(this.reconnectionNum / 5) *
-            //   (this.connectWsConfig.reconnectionTime ?? 3000);
             var timeInterval = _this.getReconnectionTime();
-            console.log("---\u7B2C" + _this.reconnectionNum + "\u6B21\u91CD\u8FDE\uFF01time=" + Date.now() + "system=" + _this.connectWsConfig.systemType);
+            console.log(instance.t('---第{{slot0}}次重连！time={{slot1}}system={{slot2}}', {
+                slot0: _this.reconnectionNum,
+                slot1: Date.now(),
+                slot2: _this.connectWsConfig.systemType,
+            }));
             _this.clearIsClientYes = setTimeout(function () {
                 _this.init();
             }, timeInterval > _this.maxReconnectiontime
@@ -226,6 +186,76 @@ var StompClient = /** @class */ (function () {
                 : timeInterval);
         });
     };
+    /**
+     * 连接失败后，将所有注册过的订阅、回调执行状态置为未执行状态。
+     * @param isExecute 连接通道、回调的执行状态
+     */
+    StompClient.prototype.setExecuteFail = function () {
+        var _this = this;
+        // 连接失败后，将当前已注册的 连接通道 全部置为未执行状态
+        var subscriptionsFnKeys = Object.keys(this.subscriptionsFn);
+        if (Array.isArray(subscriptionsFnKeys)) {
+            subscriptionsFnKeys.forEach(function (key) {
+                _this.subscriptionsFn[key].isExecute = false;
+            });
+        }
+        // 连接失败后，统一执行连接失败函数
+        var errorCallbackKeys = Object.keys(this.errorCallbacks);
+        if (Array.isArray(errorCallbackKeys)) {
+            errorCallbackKeys.forEach(function (key) {
+                var _a = _this.errorCallbacks[key], isExecute = _a.isExecute, callback = _a.callback;
+                if (!isExecute) {
+                    callback && callback();
+                }
+                _this.errorCallbacks[key].isExecute = true;
+            });
+        }
+        // 将成功回调 的执行状态 重置为未执行状态
+        var successCallbackKeys = Object.keys(this.successCallbacks);
+        if (Array.isArray(successCallbackKeys)) {
+            successCallbackKeys.forEach(function (key) {
+                _this.successCallbacks[key].isExecute = false;
+            });
+        }
+    };
+    /**
+     * 连接成功后，需要将当前已注册的，未执行的连接通道重新执行连接
+     * 还有成功回调
+     * 失败回调的执行状态重置为未执行状态
+     * @returns 执行订阅相关回调
+     */
+    StompClient.prototype.executeSubscribe = function () {
+        var _this = this;
+        // 连接成功后，将当前已注册的，未执行的 连接通道 连接
+        var subscriptionsFnKeys = Object.keys(this.subscriptionsFn);
+        if (Array.isArray(subscriptionsFnKeys)) {
+            subscriptionsFnKeys.forEach(function (key) {
+                var _a = _this.subscriptionsFn[key], isExecute = _a.isExecute, subscriptionsFn = _a.subscriptionsFn;
+                if (!isExecute) {
+                    subscriptionsFn === null || subscriptionsFn === void 0 ? void 0 : subscriptionsFn();
+                    _this.subscriptionsFn[key].isExecute = true;
+                }
+            });
+        }
+        // 连接成功后，统一执行连接成功函数
+        var successCallbackKeys = Object.keys(this.successCallbacks);
+        if (Array.isArray(successCallbackKeys)) {
+            successCallbackKeys.forEach(function (key) {
+                var _a = _this.successCallbacks[key], isExecute = _a.isExecute, callback = _a.callback;
+                if (!isExecute) {
+                    callback && callback();
+                }
+                _this.successCallbacks[key].isExecute = true;
+            });
+        }
+        // 将失败回调 的执行状态 重置为未执行状态
+        var errorCallbackKeys = Object.keys(this.errorCallbacks);
+        if (Array.isArray(errorCallbackKeys)) {
+            errorCallbackKeys.forEach(function (key) {
+                _this.errorCallbacks[key].isExecute = false;
+            });
+        }
+    };
     // 重连时间计算
     StompClient.prototype.getReconnectionTime = function () {
         var _a;
@@ -310,6 +340,28 @@ var StompClient = /** @class */ (function () {
             }
         });
     };
+    // 手动重新连接
+    StompClient.prototype.reconnect = function () {
+        var _this = this;
+        this.isInit = false;
+        this.userClose = true;
+        return new Promise(function (resolve, reject) {
+            try {
+                _this.setExecuteFail();
+                _this.client.disconnect(function () {
+                    _this.client = null;
+                    resolve(null);
+                });
+                setTimeout(function () {
+                    _this.userClose = false;
+                    _this.init();
+                }, 400);
+            }
+            catch (err) {
+                resolve(null);
+            }
+        });
+    };
     // 发送消息
     StompClient.prototype.send = function (pipe, headers, message) {
         if (typeof headers === 'string') {

package/dist/test1.d.ts

@@ -0,0 +1 @@
+export {};