polfan-server-js-client 0.2.6 → 0.2.7

package/.idea/workspace.xml

@@ -4,25 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Improvements and fixes to collection mirroring">
-      <change afterPath="$PROJECT_DIR$/src/types/src/schemes/commands/UpdateRoomMember.ts" afterDir="false" />
+    <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Improve reconnect on timeout">
       <change beforePath="$PROJECT_DIR$/build/index.cjs.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.cjs.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/index.cjs.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.cjs.js.map" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/index.umd.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.umd.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/index.umd.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.umd.js.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/types/AbstractChatClient.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/AbstractChatClient.d.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/types/Permissions.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/Permissions.d.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/types/types/src/index.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/types/src/index.d.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/types/types/src/schemes/User.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/types/src/schemes/User.d.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/types/types/src/schemes/commands/CreateMessage.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/types/src/schemes/commands/CreateMessage.d.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/AbstractChatClient.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/AbstractChatClient.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Permissions.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Permissions.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/types" beforeDir="false" afterPath="$PROJECT_DIR$/src/types" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/types/src/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/index.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/User.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/User.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/commands/CreateMessage.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/commands/CreateMessage.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/commands/SetCustomNick.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/commands/UpdateSpaceMember.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/WebSocketChatClient.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/WebSocketChatClient.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -68,32 +56,33 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager": "true",
-    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "junie.onboarding.icon.badge.shown": "true",
-    "last_opened_file_path": "//wsl.localhost/Debian/home/jarek/polfan-js-client-library",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "to.speed.mode.migration.done": "true",
-    "ts.external.directory.path": "\\\\wsl.localhost\\Debian\\home\\jarek\\polfan-js-client-library\\node_modules\\typescript\\lib",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;//wsl.localhost/Debian/home/jarek/polfan-js-client-library&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;\\\\wsl.localhost\\Debian\\home\\jarek\\polfan-js-client-library\\node_modules\\typescript\\lib&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-js-predefined-d6986cc7102b-c7e53b3be11b-JavaScript-PS-253.28086.57" />
-        <option value="bundled-php-predefined-a98d8de5180a-09080813851e-com.jetbrains.php.sharedIndexes-PS-253.28086.57" />
+        <option value="bundled-js-predefined-d6986cc7102b-c7e53b3be11b-JavaScript-PS-253.28294.257" />
+        <option value="bundled-php-predefined-a98d8de5180a-09080813851e-com.jetbrains.php.sharedIndexes-PS-253.28294.257" />
       </set>
     </attachedChunks>
   </component>
@@ -167,47 +156,15 @@
       <workItem from="1763410036992" duration="181000" />
       <workItem from="1763457144937" duration="13889000" />
       <workItem from="1764419232591" duration="640000" />
-      <workItem from="1764525611464" duration="5294000" />
-    </task>
-    <task id="LOCAL-00015" summary="Restore support for nullable parameter in permission overwrites id function">
-      <option name="closed" value="true" />
-      <created>1739444617033</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1739444617033</updated>
-    </task>
-    <task id="LOCAL-00016" summary="Bans support">
-      <option name="closed" value="true" />
-      <created>1740177682341</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1740177682341</updated>
-    </task>
-    <task id="LOCAL-00017" summary="New scheme of Bye event">
-      <option name="closed" value="true" />
-      <created>1740250355576</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1740250355576</updated>
-    </task>
-    <task id="LOCAL-00018" summary="Fix authentication">
-      <option name="closed" value="true" />
-      <created>1740253483444</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1740253483444</updated>
-    </task>
-    <task id="LOCAL-00019" summary="Add notify option to Kick command">
-      <option name="closed" value="true" />
-      <created>1740515104457</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1740515104457</updated>
+      <workItem from="1764525611464" duration="5340000" />
+      <workItem from="1764689604655" duration="307000" />
+      <workItem from="1764716454990" duration="1338000" />
+      <workItem from="1764758258935" duration="1127000" />
+      <workItem from="1764792690210" duration="1002000" />
+      <workItem from="1764794428269" duration="595000" />
+      <workItem from="1764847260499" duration="28335000" />
+      <workItem from="1765180748047" duration="596000" />
+      <workItem from="1765272289918" duration="2750000" />
     </task>
     <task id="LOCAL-00020" summary="UsersManager">
       <option name="closed" value="true" />
@@ -561,7 +518,47 @@
       <option name="project" value="LOCAL" />
       <updated>1763587170121</updated>
     </task>
-    <option name="localTasksCounter" value="64" />
+    <task id="LOCAL-00064" summary="Align to custom colors and nicks protocol changes">
+      <option name="closed" value="true" />
+      <created>1764688847485</created>
+      <option name="number" value="00064" />
+      <option name="presentableId" value="LOCAL-00064" />
+      <option name="project" value="LOCAL" />
+      <updated>1764688847485</updated>
+    </task>
+    <task id="LOCAL-00065" summary="Align to custom colors and nicks protocol changes">
+      <option name="closed" value="true" />
+      <created>1764689897013</created>
+      <option name="number" value="00065" />
+      <option name="presentableId" value="LOCAL-00065" />
+      <option name="project" value="LOCAL" />
+      <updated>1764689897014</updated>
+    </task>
+    <task id="LOCAL-00066" summary="Connection handling optimizations">
+      <option name="closed" value="true" />
+      <created>1764955397384</created>
+      <option name="number" value="00066" />
+      <option name="presentableId" value="LOCAL-00066" />
+      <option name="project" value="LOCAL" />
+      <updated>1764955397384</updated>
+    </task>
+    <task id="LOCAL-00067" summary="Ping-pong connection monitoring">
+      <option name="closed" value="true" />
+      <created>1765145134871</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1765145134871</updated>
+    </task>
+    <task id="LOCAL-00068" summary="Improve reconnect on timeout">
+      <option name="closed" value="true" />
+      <created>1765145773196</created>
+      <option name="number" value="00068" />
+      <option name="presentableId" value="LOCAL-00068" />
+      <option name="project" value="LOCAL" />
+      <updated>1765145773196</updated>
+    </task>
+    <option name="localTasksCounter" value="69" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -579,10 +576,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Fix JoinRoom command response type" />
-    <MESSAGE value="Fix package.json exports" />
-    <MESSAGE value="Fix package.json type exports" />
-    <MESSAGE value="New message type" />
     <MESSAGE value="Dedicated event for user status change" />
     <MESSAGE value="Fix update the latest message in a room default topic" />
     <MESSAGE value="Adapt FilesClient to new files API" />
@@ -604,6 +597,18 @@
     <MESSAGE value="Collection integration with React JS rework" />
     <MESSAGE value="Update deps and improve library building" />
     <MESSAGE value="Improvements and fixes to collection mirroring" />
-    <option name="LAST_COMMIT_MESSAGE" value="Improvements and fixes to collection mirroring" />
+    <MESSAGE value="Align to custom colors and nicks protocol changes" />
+    <MESSAGE value="Connection handling optimizations" />
+    <MESSAGE value="Ping-pong connection monitoring" />
+    <MESSAGE value="Improve reconnect on timeout" />
+    <option name="LAST_COMMIT_MESSAGE" value="Improve reconnect on timeout" />
+  </component>
+  <component name="github-copilot-workspace">
+    <instructionFileLocations>
+      <option value=".github/instructions" />
+    </instructionFileLocations>
+    <promptFileLocations>
+      <option value=".github/prompts" />
+    </promptFileLocations>
   </component>
 </project>

package/README.md

@@ -1,5 +1,5 @@
 # pserv-js-client-library
-TypeScript client library to handle connection with Polfan chat service.
+TypeScript client library to handle connection with Devana (new Polfan) chat service.
 
 ## How to use?
 
@@ -22,4 +22,24 @@ TypeScript client library to handle connection with Polfan chat service.
     console.log("The spaces you are in:", session.spaces);
     console.log("The version of server you connected to:", session.serverVersion);
 })();
-```
+```
+
+## State management
+
+The library provides built-in state management for WebSocket client. To enable it, just pass `stateTracking`
+option to the `WebSocketChatClient` constructor:
+
+```js
+const wsClient = new PServ.WebSocketChatClient({
+    token: 'your-access-token',
+    url: 'wss://pserv-websocket-address',
+    stateTracking: true, // Enable state tracking
+});
+```
+
+With state tracking enabled, the client will automatically maintain the current state of rooms, users, and messages, 
+by handling incoming events from the server. Reactive data structures are available via `ObservableIndexedObjectCollection`
+objects, which allows you to subscribe to changes.
+
+**Important note:** you can cache these objects for the connection lifetime, but you should refetch them after reconnecting,
+because some structures are rebuild from scratch on `Session` event.

package/build/index.cjs.js

@@ -968,9 +968,6 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
     _this2.tracker = tracker;
     _this2.internalState.traverseLock = false;
     if (bindEvents) {
-      _this2.tracker.client.on('Session', function (ev) {
-        return _this2.handleSession(ev);
-      });
       _this2.tracker.client.on('NewMessage', function (ev) {
         return _this2.handleNewMessage(ev);
       });
@@ -1117,19 +1114,6 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
       }
       return handleNewMessage;
     }()
-  }, {
-    key: "handleSession",
-    value: function handleSession(ev) {
-      var _this3 = this;
-      var rooms = ev.state.rooms;
-      if (rooms.find(function (room) {
-        return room.id === _this3.roomId;
-      })) {
-        void this.resetToLatest();
-      } else {
-        this.deleteAll();
-      }
-    }
   }, {
     key: "fetchItemsAfter",
     value: function () {
@@ -2428,7 +2412,10 @@ var RoomsManager = /*#__PURE__*/function () {
               return {
                 user: user,
                 spaceMember: null,
-                roles: null
+                roles: null,
+                customColor: null,
+                customNick: null,
+                extras: ''
               };
             })
           });
@@ -4282,7 +4269,7 @@ var WebSocketChatClientEvent = /*#__PURE__*/function (WebSocketChatClientEvent)
 }(WebSocketChatClientEvent || {});
 var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
   function WebSocketChatClient(options) {
-    var _this$options$stateTr;
+    var _this$options$stateTr, _options$ping, _options$ping2, _options$ping2$enable, _options$ping3, _options$ping3$noActi, _options$ping4, _options$ping4$pongBa;
     var _this;
     WebSocketChatClient_classCallCheck(this, WebSocketChatClient);
     _this = WebSocketChatClient_callSuper(this, WebSocketChatClient);
@@ -4293,10 +4280,17 @@ 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, "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);
     }
+    (_options$ping = options.ping) !== null && _options$ping !== void 0 ? _options$ping : options.ping = {};
+    (_options$ping2$enable = (_options$ping2 = options.ping).enabled) !== null && _options$ping2$enable !== void 0 ? _options$ping2$enable : _options$ping2.enabled = true;
+    (_options$ping3$noActi = (_options$ping3 = options.ping).noActivityTimeoutMs) !== null && _options$ping3$noActi !== void 0 ? _options$ping3$noActi : _options$ping3.noActivityTimeoutMs = 15000;
+    (_options$ping4$pongBa = (_options$ping4 = options.ping).pongBackTimeoutMs) !== null && _options$ping4$pongBa !== void 0 ? _options$ping4$pongBa : _options$ping4.pongBackTimeoutMs = 5000;
     return _this;
   }
   WebSocketChatClient_inherits(WebSocketChatClient, _AbstractChatClient);
@@ -4311,6 +4305,12 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
         return WebSocketChatClient_regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
+              if (!(this.isOpenWsState() || this.isConnectingWsState())) {
+                _context.n = 1;
+                break;
+              }
+              return _context.a(2);
+            case 1:
               params = new URLSearchParams((_this$options$queryPa = this.options.queryParams) !== null && _this$options$queryPa !== void 0 ? _this$options$queryPa : {});
               params.set('token', this.options.token);
               this.ws = new WebSocket("".concat(this.options.url, "?").concat(params));
@@ -4343,7 +4343,7 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
     value: function disconnect() {
       var _this$ws;
       this.sendQueue = [];
-      (_this$ws = this.ws) === null || _this$ws === void 0 || _this$ws.close();
+      (_this$ws = this.ws) === null || _this$ws === void 0 || _this$ws.close(1000); // Normal closure
       this.ws = null;
     }
   }, {
@@ -4356,7 +4356,7 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
             case 0:
               envelope = this.createEnvelope(commandType, commandData);
               promise = this.createPromiseFromCommandEnvelope(envelope);
-              if (!this.isPendingReadyWsState()) {
+              if (!(this.isConnectingWsState() || !this.authenticated && this.isOpenWsState())) {
                 _context2.n = 1;
                 break;
               }
@@ -4373,19 +4373,25 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
       }
       return send;
     }()
+  }, {
+    key: "isReady",
+    get: function get() {
+      return this.isOpenWsState() && this.authenticated;
+    }
   }, {
     key: "sendEnvelope",
     value: function sendEnvelope(envelope) {
       var _this$ws$readyState, _this$ws2;
-      if (this.isReadyToSendWsState()) {
+      if (this.isReady) {
         this.ws.send(JSON.stringify(envelope));
         return;
       }
-      this.handleEnvelopeSendError(envelope, new Error("Cannot send; invalid websocket state=".concat((_this$ws$readyState = (_this$ws2 = this.ws) === null || _this$ws2 === void 0 ? void 0 : _this$ws2.readyState) !== null && _this$ws$readyState !== void 0 ? _this$ws$readyState : '[no connection]')));
+      this.handleEnvelopeSendError(envelope, new Error("Cannot send - client is not ready (state=".concat((_this$ws$readyState = (_this$ws2 = this.ws) === null || _this$ws2 === void 0 ? void 0 : _this$ws2.readyState) !== null && _this$ws$readyState !== void 0 ? _this$ws$readyState : '[no connection]', "; authenticated=").concat(this.authenticated, ")")));
     }
   }, {
     key: "onMessage",
     value: function onMessage(event) {
+      this.lastReceivedMessageAt = Date.now();
       var envelope = JSON.parse(event.data);
       this.handleIncomingEnvelope(envelope);
       this.emit(envelope.type, envelope.data);
@@ -4396,6 +4402,7 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
         var isAuthenticated = envelope.type !== 'Bye';
         this.authenticated = isAuthenticated;
         if (isAuthenticated) {
+          this.startConnectionMonitor();
           this.authenticatedResolvers[0]();
           this.emit(this.Event.connect);
           this.sendFromQueue();
@@ -4407,6 +4414,7 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
   }, {
     key: "onClose",
     value: function onClose(event) {
+      this.stopConnectionMonitor();
       clearTimeout(this.connectingTimeoutId);
       var reconnect = event.code !== 1000; // Connection was closed because of error
       if (reconnect) {
@@ -4441,14 +4449,63 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
       this.emit(this.Event.error, new Error('Connection timeout'));
     }
   }, {
-    key: "isPendingReadyWsState",
-    value: function isPendingReadyWsState() {
-      return this.ws && this.ws.readyState === this.ws.CONNECTING || !this.authenticated;
+    key: "isConnectingWsState",
+    value: function isConnectingWsState() {
+      return this.ws && this.ws.readyState === this.ws.CONNECTING;
     }
   }, {
-    key: "isReadyToSendWsState",
-    value: function isReadyToSendWsState() {
-      return this.ws && this.ws.readyState === this.ws.OPEN && this.authenticated;
+    key: "isOpenWsState",
+    value: function isOpenWsState() {
+      return this.ws && this.ws.readyState === this.ws.OPEN;
+    }
+  }, {
+    key: "startConnectionMonitor",
+    value: function startConnectionMonitor() {
+      var _this4 = this;
+      if (!this.options.ping.enabled) {
+        return;
+      }
+      this.lastReceivedMessageAt = Date.now();
+      this.pingIntervalId = setInterval(/*#__PURE__*/WebSocketChatClient_asyncToGenerator(/*#__PURE__*/WebSocketChatClient_regenerator().m(function _callee3() {
+        var timeout;
+        return WebSocketChatClient_regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
+            case 0:
+              if (!(!_this4.isReady || _this4.pingInFlight)) {
+                _context3.n = 1;
+                break;
+              }
+              return _context3.a(2);
+            case 1:
+              if (!(Date.now() - _this4.lastReceivedMessageAt < _this4.options.ping.noActivityTimeoutMs)) {
+                _context3.n = 2;
+                break;
+              }
+              return _context3.a(2);
+            case 2:
+              timeout = setTimeout(function () {
+                _this4.pingInFlight = false;
+                _this4.ws.close(3000); // Service Restart (reconnect)
+              }, _this4.options.ping.pongBackTimeoutMs);
+              _this4.pingInFlight = true;
+              _this4.send('Ping', {}).then(function () {
+                _this4.pingInFlight = false;
+                clearTimeout(timeout);
+              });
+            case 3:
+              return _context3.a(2);
+          }
+        }, _callee3);
+      })), 1000);
+    }
+  }, {
+    key: "stopConnectionMonitor",
+    value: function stopConnectionMonitor() {
+      if (this.pingIntervalId) {
+        clearInterval(this.pingIntervalId);
+        this.pingIntervalId = undefined;
+      }
+      this.pingInFlight = false;
     }
   }]);
 }(AbstractChatClient);