kucservice 1.5.2 → 1.5.3

package/dist/kucservice.common.js

@@ -2182,6 +2182,8 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
 
     Object(defineProperty["a" /* default */])(_assertThisInitialized(_this), "firstConnect", false);
 
+    Object(defineProperty["a" /* default */])(_assertThisInitialized(_this), "isManualClose", false);
+
     _this.self = _self;
     _this._currentOptions = options;
     _this._dep = dep;
@@ -2216,7 +2218,7 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
         this._dep.notify('close', e); // 如果WebSocket是非正常关闭 则进行重连
 
 
-        if (e.code !== CLOSE_ABNORMAL) {
+        if (e.code !== CLOSE_ABNORMAL && !this.isManualClose) {
           var _this$self;
 
           // if (this._reconnectCount < this.heartCheckCount) {
@@ -2247,11 +2249,14 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
           // }
 
         } else {
+          this.isManualClose = false;
           this.clearHeartCheck();
           this.onopen = null;
           this.onclose = null;
           this.onerror = null;
           this.onmessage = null;
+
+          this._dep.notify('close', e, true);
         }
       };
 
@@ -2313,13 +2318,16 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
   }, {
     key: "closeSocket",
     value: function closeSocket(code, reason) {
+      this.isManualClose = true;
       this.clearHeartCheck();
       console.log('=====close code===', code, reason); // this.onopen = null
       // this.onclose = null
       // this.onerror = null 
       // this.onmessage = null
 
-      this.close(code || 1000, reason);
+      if (this && this.readyState === this.OPEN) {
+        this.close(code || 1000, reason);
+      }
     } // 开始心跳检测
 
   }, {
@@ -11415,9 +11423,10 @@ var initWsBaseTheme = function initWsBaseTheme(socket, _ref) {
     console.log('WebSocket连接成功!');
     onOpen && onOpen();
   });
-  socket.subscribe('close', function (reason) {
+  socket.subscribe('close', function (reason, isManualClose) {
     console.log('WebSocket连接关闭!', reason);
     onClose && onClose(reason);
+    isManualClose && (socket = null);
   });
   socket.subscribe('message', function (result) {
     onMessage && onMessage(result);