@seamly/web-ui 21.0.2 → 21.0.3-beta.1

package/build/dist/lib/index.js

@@ -6761,21 +6761,37 @@ class ConversationConnector {
       this.channel.on('system', msg => {
         switch (msg.type) {
           case 'attach_channel_succeeded':
-            __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, 'attach_channel_succeeded');
+            __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, {
+              connected: true,
+              ready: true,
+              currentState: 'attach_channel_succeeded'
+            });
             break;
         }
       });
       this.socket.onClose(() => {
         log('[SOCKET]CLOSE');
-        __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, 'socket_closed');
+        __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, {
+          connected: false,
+          ready: false,
+          currentState: 'socket_closed'
+        });
       });
       this.channel.onClose(() => {
         log('[CHANNEL]CLOSE');
-        __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, 'channel_closed');
+        __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, {
+          connected: false,
+          ready: false,
+          currentState: 'channel_closed'
+        });
       });
       this.channel.onError(msg => {
         log('[CHANNEL][ERROR]', msg);
-        __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, 'channel_erred');
+        __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, {
+          connected: false,
+          ready: false,
+          currentState: 'channel_erred'
+        });
       });
       __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_listenTo).call(this, 'ack', 'ui', 'error', 'participant', 'message', 'service_data', 'system', 'info', 'sync');
     });
@@ -6783,10 +6799,18 @@ class ConversationConnector {
   start() {
     this.channel.join().receive('ok', () => {
       log('[CHANNEL][JOIN] OK');
-      __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, 'join_channel_succeeded');
+      __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, {
+        connected: true,
+        ready: false,
+        currentState: 'join_channel_succeeded'
+      });
     }).receive('error', err => {
       log('[CHANNEL][JOIN] ERROR', err);
-      __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, 'join_channel_erred');
+      __classPrivateFieldGet(this, _ConversationConnector_instances, "m", _ConversationConnector_emitConnectionState).call(this, {
+        connected: false,
+        ready: false,
+        currentState: 'join_channel_erred'
+      });
       // @ts-ignore
       this.channel.socket.disconnect();
     }).receive('timeout', () => {
@@ -6800,7 +6824,6 @@ class ConversationConnector {
     (_b = this.socket) === null || _b === void 0 ? void 0 : _b.remove(this.channel);
     (_c = this.socket) === null || _c === void 0 ? void 0 : _c.disconnect();
   }
-  // eslint-disable-next-line no-unused-vars
   onConnection(cb) {
     __classPrivateFieldGet(this, _ConversationConnector_connectionListeners, "f").push(cb);
   }
@@ -6815,7 +6838,15 @@ _ConversationConnector_connectionListeners = new WeakMap(), _ConversationConnect
     });
   });
 }, _ConversationConnector_emitConnectionState = function _ConversationConnector_emitConnectionState(payload) {
-  __classPrivateFieldGet(this, _ConversationConnector_connectionListeners, "f").forEach(cb => cb(payload));
+  // Loop in reverse order to enable splicing the array while iterating
+  for (let i = __classPrivateFieldGet(this, _ConversationConnector_connectionListeners, "f").length - 1; i >= 0; i--) {
+    const cb = __classPrivateFieldGet(this, _ConversationConnector_connectionListeners, "f")[i];
+    const complete = cb(payload);
+    // If we only want to execute the callback once, remove it from the listener
+    if (complete) {
+      __classPrivateFieldGet(this, _ConversationConnector_connectionListeners, "f").splice(i, 1);
+    }
+  }
 };
 ;// CONCATENATED MODULE: ./src/javascripts/api/index.ts
 var api_awaiter = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
@@ -7069,9 +7100,12 @@ class API {
         conversationInitialState = yield api_classPrivateFieldGet(this, _API_instances, "m", _API_createConversation).call(this);
       }
       this.conversation.connect(`${api_classPrivateFieldGet(this, _API_instances, "m", _API_getUrlPrefix).call(this, 'ws')}${this.URLS.socket}`, api_classPrivateFieldGet(this, _API_config, "f").context.channelName, api_classPrivateFieldGet(this, _API_instances, "m", _API_getChannelTopic).call(this), api_classPrivateFieldGet(this, _API_instances, "m", _API_getAccessToken).call(this));
-      this.conversation.onConnection(connectionState => {
-        this.connected = ['attach_channel_succeeded', 'join_channel_succeeded'].includes(connectionState);
-        api_classPrivateFieldSet(this, _API_ready, connectionState === 'attach_channel_succeeded', "f");
+      this.conversation.onConnection(({
+        connected,
+        ready
+      }) => {
+        this.connected = connected;
+        api_classPrivateFieldSet(this, _API_ready, ready, "f");
       });
       // Send environment
       if (api_classPrivateFieldGet(this, _API_config, "f").sendEnvironment) {
@@ -7154,12 +7188,17 @@ class API {
     var _a;
     if (!this.connected || waitForReady && !api_classPrivateFieldGet(this, _API_ready, "f")) {
       // Wait for connection to be made
-      (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.onConnection(connectionState => {
-        const connected = connectionState === 'join_channel_succeeded';
-        const ready = connectionState === 'attach_channel_succeeded';
-        if (connected || ready) {
+      (_a = this.conversation) === null || _a === void 0 ? void 0 : _a.onConnection(({
+        connected,
+        ready
+      }) => {
+        this.connected = connected;
+        api_classPrivateFieldSet(this, _API_ready, ready, "f");
+        if (waitForReady ? ready : connected) {
           this.send(command, payload, waitForReady);
+          return true;
         }
+        return false;
       });
       return;
     }
@@ -17879,8 +17918,10 @@ const SeamlyEventSubscriber = () => {
     return () => {};
   }, [api, api.connectionInfo, api.conversation]);
   (0,hooks_.useEffect)(() => {
-    api.conversation.onConnection(connectionState => {
-      if (connectionState === 'join_channel_erred') {
+    api.conversation.onConnection(({
+      currentState
+    }) => {
+      if (currentState === 'join_channel_erred') {
         const seamlyGeneralError = new SeamlyGeneralError();
         dispatch(setInterrupt({
           name: seamlyGeneralError.name,