kucservice 1.5.1 → 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) {
@@ -2233,7 +2235,12 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
             this.self.socketTimer = setTimeout(function () {
               var _socket = new Socket(optionsClone, _this2._dep, _this2._reconnectCount, _this2.self);
 
-              _this2.closeSocket();
+              _this2.clearHeartCheck();
+
+              _this2.onopen = null;
+              _this2.onclose = null;
+              _this2.onerror = null;
+              _this2.onmessage = null;
 
               _this2._dep.notify('reconnect', _socket);
             }, TIMEOUT);
@@ -2241,6 +2248,15 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
           //   return console.error('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);
         }
       };
 
@@ -2302,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);
+      console.log('=====close code===', code, reason); // this.onopen = null
+      // this.onclose = null
+      // this.onerror = null 
+      // this.onmessage = null
+
+      if (this && this.readyState === this.OPEN) {
+        this.close(code || 1000, reason);
+      }
     } // 开始心跳检测
 
   }, {
@@ -11404,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);
@@ -11611,8 +11631,7 @@ var common_request_wsClass = /*#__PURE__*/function () {
       _classPrivateFieldSet(this, _player, null);
 
       this.socketTimer && clearTimeout(this.socketTimer);
-      (_this$socket2 = this.socket) === null || _this$socket2 === void 0 ? void 0 : _this$socket2.closeSocket(1000, '通知关闭websocket连接');
-      this.socket = null;
+      (_this$socket2 = this.socket) === null || _this$socket2 === void 0 ? void 0 : _this$socket2.closeSocket(1000, '通知关闭websocket连接'); // this.socket = null
 
       if (_classPrivateFieldGet(this, _phoneClientObj)) {
         _classPrivateFieldGet(this, _phoneClientObj).onclose();