kucservice 1.5.0 → 1.5.2

package/dist/kucservice.common.js

@@ -2233,12 +2233,25 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
             this.self.socketTimer = setTimeout(function () {
               var _socket = new Socket(optionsClone, _this2._dep, _this2._reconnectCount, _this2.self);
 
+              _this2.clearHeartCheck();
+
+              _this2.onopen = null;
+              _this2.onclose = null;
+              _this2.onerror = null;
+              _this2.onmessage = null;
+
               _this2._dep.notify('reconnect', _socket);
             }, TIMEOUT);
           } // } else {
           //   return console.error('WebSocket重连失败, 请联系技术客服!')
           // }
 
+        } else {
+          this.clearHeartCheck();
+          this.onopen = null;
+          this.onclose = null;
+          this.onerror = null;
+          this.onmessage = null;
         }
       };
 
@@ -2301,8 +2314,12 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
     key: "closeSocket",
     value: function closeSocket(code, reason) {
       this.clearHeartCheck();
-      console.log('=====close code===', code, reason);
-      this.close(code, reason);
+      console.log('=====close code===', code, reason); // this.onopen = null
+      // this.onclose = null
+      // this.onerror = null 
+      // this.onmessage = null
+
+      this.close(code || 1000, reason);
     } // 开始心跳检测
 
   }, {
@@ -11548,6 +11565,7 @@ var common_request_wsClass = /*#__PURE__*/function () {
           _onError && _onError(e);
         },
         onReconnect: function onReconnect(e) {
+          _this.socket = null;
           _this.socket = e;
 
           _this.initSocket({
@@ -11604,8 +11622,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();