polfan-server-js-client 0.2.63 → 0.2.65

package/.idea/workspace.xml

@@ -5,6 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Align to custom colors and nicks protocol changes">
+      <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/WebSocketChatClient.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/WebSocketChatClient.d.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/WebSocketChatClient.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/WebSocketChatClient.ts" afterDir="false" />
     </list>
@@ -156,7 +161,9 @@
       <workItem from="1764689604655" duration="307000" />
       <workItem from="1764716454990" duration="1338000" />
       <workItem from="1764758258935" duration="1127000" />
-      <workItem from="1764792690210" duration="302000" />
+      <workItem from="1764792690210" duration="1002000" />
+      <workItem from="1764794428269" duration="595000" />
+      <workItem from="1764847260499" duration="4990000" />
     </task>
     <task id="LOCAL-00017" summary="New scheme of Bye event">
       <option name="closed" value="true" />

package/build/index.cjs.js

@@ -4314,6 +4314,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));
@@ -4359,7 +4365,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;
               }
@@ -4379,17 +4385,17 @@ var WebSocketChatClient = /*#__PURE__*/function (_AbstractChatClient) {
   }, {
     key: "isReady",
     get: function get() {
-      return this.isReadyToSendWsState();
+      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",
@@ -4449,14 +4455,14 @@ 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;
     }
   }]);
 }(AbstractChatClient);