polfan-server-js-client 0.2.69 → 0.2.71

package/.idea/workspace.xml

@@ -164,7 +164,7 @@
       <workItem from="1764794428269" duration="595000" />
       <workItem from="1764847260499" duration="28335000" />
       <workItem from="1765180748047" duration="596000" />
-      <workItem from="1765272289918" duration="2519000" />
+      <workItem from="1765272289918" duration="3221000" />
     </task>
     <task id="LOCAL-00020" summary="UsersManager">
       <option name="closed" value="true" />

package/build/index.cjs.js

@@ -4280,9 +4280,9 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
     WebSocketChatClient_defineProperty(_this, "connectingTimeoutId", void 0);
     WebSocketChatClient_defineProperty(_this, "authenticated", void 0);
     WebSocketChatClient_defineProperty(_this, "authenticatedResolvers", void 0);
-    WebSocketChatClient_defineProperty(_this, "pingIntervalId", void 0);
+    WebSocketChatClient_defineProperty(_this, "pingMonitorInterval", void 0);
+    WebSocketChatClient_defineProperty(_this, "inFlightPingTimeout", void 0);
     WebSocketChatClient_defineProperty(_this, "lastReceivedMessageAt", void 0);
-    WebSocketChatClient_defineProperty(_this, "pingInFlight", void 0);
     _this.options = options;
     if ((_this$options$stateTr = _this.options.stateTracking) !== null && _this$options$stateTr !== void 0 ? _this$options$stateTr : true) {
       _this.state = new ChatStateTracker(_this);
@@ -4466,12 +4466,11 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
         return;
       }
       this.lastReceivedMessageAt = Date.now();
-      this.pingIntervalId = setInterval(/*#__PURE__*/WebSocketChatClient_asyncToGenerator(/*#__PURE__*/WebSocketChatClient_regenerator().m(function _callee3() {
-        var timeout;
+      this.pingMonitorInterval = setInterval(/*#__PURE__*/WebSocketChatClient_asyncToGenerator(/*#__PURE__*/WebSocketChatClient_regenerator().m(function _callee3() {
         return WebSocketChatClient_regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              if (!(!_this4.isReady || _this4.pingInFlight)) {
+              if (!(!_this4.isReady || _this4.inFlightPingTimeout)) {
                 _context3.n = 1;
                 break;
               }
@@ -4483,14 +4482,13 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
               }
               return _context3.a(2);
             case 2:
-              timeout = setTimeout(function () {
-                _this4.pingInFlight = false;
-                _this4.ws.close(1008); // Service Restart (reconnect)
+              _this4.inFlightPingTimeout = setTimeout(function () {
+                _this4.inFlightPingTimeout = undefined;
+                _this4.ws.close(3000); // Service Restart (reconnect)
               }, _this4.options.ping.pongBackTimeoutMs);
-              _this4.pingInFlight = true;
               _this4.send('Ping', {}).then(function () {
-                _this4.pingInFlight = false;
-                clearTimeout(timeout);
+                _this4.inFlightPingTimeout = undefined;
+                clearTimeout(_this4.inFlightPingTimeout);
               });
             case 3:
               return _context3.a(2);
@@ -4501,11 +4499,14 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
   }, {
     key: "stopConnectionMonitor",
     value: function stopConnectionMonitor() {
-      if (this.pingIntervalId) {
-        clearInterval(this.pingIntervalId);
-        this.pingIntervalId = undefined;
+      if (this.inFlightPingTimeout) {
+        clearTimeout(this.inFlightPingTimeout);
+        this.inFlightPingTimeout = undefined;
+      }
+      if (this.pingMonitorInterval) {
+        clearInterval(this.pingMonitorInterval);
+        this.pingMonitorInterval = undefined;
       }
-      this.pingInFlight = false;
     }
   }]);
 }(AbstractChatClient);