kucservice 1.4.7 → 1.4.9

package/dist/kucservice.common.js

@@ -2078,7 +2078,7 @@ var es_json_stringify = __webpack_require__("e9c4");
 var EventTypes = ['open', 'close', 'message', 'error', 'reconnect'];
 var DEFAULT_CHECK_TIME = 30 * 1000; // 心跳检测的默认时间
 
-var TIMEOUT = 40 * 1000; //重连延迟时间
+var TIMEOUT = 100; //重连延迟时间
 
 var DEFAULT_CHECK_COUNT = 10; // 心跳检测默认失败重连次数
 
@@ -2211,6 +2211,8 @@ var websocket_Socket = /*#__PURE__*/function (_WebSocket) {
       this.onclose = function (e) {
         var _this2 = this;
 
+        console.error('webSocket关闭', e);
+
         this._dep.notify('close', e); // 如果WebSocket是非正常关闭 则进行重连
 
 
@@ -11474,12 +11476,10 @@ var _phoneClientObj = /*#__PURE__*/new WeakMap();
 
 var common_request_wsClass = /*#__PURE__*/function () {
   function wsClass(config, _ref2) {
-    var _this = this;
-
-    var _onOpen = _ref2.onOpen,
-        _onClose = _ref2.onClose,
-        _onMessage = _ref2.onMessage,
-        _onError = _ref2.onError,
+    var onOpen = _ref2.onOpen,
+        onClose = _ref2.onClose,
+        onMessage = _ref2.onMessage,
+        onError = _ref2.onError,
         initAction = _ref2.initAction;
 
     Object(classCallCheck["a" /* default */])(this, wsClass);
@@ -11499,42 +11499,68 @@ var common_request_wsClass = /*#__PURE__*/function () {
     Object.assign(this.config, {
       checkData: JSON.stringify(GetSendModel('keeplive', this.config))
     });
-    this.socket = common_request_useRequest('websocket')(config);
-    initWsBaseTheme(this.socket, {
-      onOpen: function onOpen(e) {
-        // 登录
-        console.log('====onOpen=====');
-        console.log(_this);
-
-        _this.send('Login');
-
-        _onOpen && _onOpen(e);
-      },
-      onClose: function onClose(e) {
-        _onClose && _onClose(e);
-      },
-      onMessage: function onMessage(e) {
-        var data = e.data || e;
-
-        if (data.indexOf('Back_Login(') === 0) {
-          // 设置坐席
-          _this.config.AgentGroupName && _this.send("SetGroupRole", _this.config.AgentGroupName); // 初始化操作
-
-          initAction && initAction(); // return
-        }
-
-        _onMessage && _onMessage(e);
-      },
-      onError: function onError(e) {
-        _onError && _onError(e);
-      },
-      onReconnect: function onReconnect(e) {
-        _this.scoket = e;
-      }
+    this.socket = common_request_useRequest('websocket')(config, this);
+    this.initSocket({
+      onOpen: onOpen,
+      onClose: onClose,
+      onMessage: onMessage,
+      onError: onError,
+      initAction: initAction
     });
   }
 
   Object(createClass["a" /* default */])(wsClass, [{
+    key: "initSocket",
+    value: function initSocket(_ref3) {
+      var _this = this;
+
+      var _onOpen = _ref3.onOpen,
+          _onClose = _ref3.onClose,
+          _onMessage = _ref3.onMessage,
+          _onError = _ref3.onError,
+          initAction = _ref3.initAction;
+      initWsBaseTheme(this.socket, {
+        onOpen: function onOpen(e) {
+          // 登录
+          console.log('====onOpen=====');
+          console.log(_this);
+
+          _this.send('Login');
+
+          _onOpen && _onOpen(e);
+        },
+        onClose: function onClose(e) {
+          _onClose && _onClose(e);
+        },
+        onMessage: function onMessage(e) {
+          var data = e.data || e;
+
+          if (data.indexOf('Back_Login(') === 0) {
+            // 设置坐席
+            _this.config.AgentGroupName && _this.send("SetGroupRole", _this.config.AgentGroupName); // 初始化操作
+
+            initAction && initAction(); // return
+          }
+
+          _onMessage && _onMessage(e);
+        },
+        onError: function onError(e) {
+          _onError && _onError(e);
+        },
+        onReconnect: function onReconnect(e) {
+          _this.scoket = e;
+
+          _this.initSocket({
+            onOpen: _onOpen,
+            onClose: _onClose,
+            onMessage: _onMessage,
+            onError: _onError,
+            initAction: initAction
+          });
+        }
+      });
+    }
+  }, {
     key: "send",
     value: function send(action, params) {
       var _this$socket;
@@ -11577,6 +11603,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;
 
@@ -11591,12 +11618,12 @@ var common_request_wsClass = /*#__PURE__*/function () {
   return wsClass;
 }();
 
-var useKUcservice = function useKUcservice(options, _ref3) {
-  var onOpen = _ref3.onOpen,
-      onClose = _ref3.onClose,
-      onMessage = _ref3.onMessage,
-      onError = _ref3.onError,
-      initAction = _ref3.initAction;
+var useKUcservice = function useKUcservice(options, _ref4) {
+  var onOpen = _ref4.onOpen,
+      onClose = _ref4.onClose,
+      onMessage = _ref4.onMessage,
+      onError = _ref4.onError,
+      initAction = _ref4.initAction;
   if (!window.WebSocket) return console.error('您的浏览器不支持WebSocket, 请更换浏览器!');
   return new common_request_wsClass(options, {
     onOpen: onOpen,