@seamly/web-ui 22.3.0-beta.2 → 22.3.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seamly/web-ui",
-  "version": "22.3.0-beta.2",
+  "version": "22.3.0-beta.3",
   "main": "build/dist/lib/index.js",
   "types": "build/src/javascripts/index.d.ts",
   "module": "",

package/src/javascripts/api/conversation-connector.ts

@@ -46,11 +46,12 @@ export default class ConversationConnector {
     this.channelTopic = channelTopic
     const { url: splittedUrl, params } = splitUrlParams(this.url)
 
-    this.socket = new Socket(splittedUrl, {
-      params: { ...params, v: apiVersion },
-    })
-
-    this.socket.connect()
+    if (!this.socket) {
+      this.socket = new Socket(splittedUrl, {
+        params: { ...params, v: apiVersion },
+      })
+      this.socket.connect()
+    }
 
     this.channel = this.socket.channel(this.channelTopic, {
       authorization: `Bearer ${this.accessToken}`,
@@ -138,8 +139,6 @@ export default class ConversationConnector {
           ready: false,
           currentState: 'join_channel_erred',
         })
-        // @ts-ignore
-        this.channel.socket.disconnect()
       })
       .receive('timeout', () => {
         log('[CHANEL][JOIN] Networking issue. Still waiting...')
@@ -149,8 +148,6 @@ export default class ConversationConnector {
   disconnect() {
     this.channel?.leave().receive('ok', () => {
       log('[CHANNEL][LEAVE] OK')
-      this.socket?.remove(this.channel)
-      this.socket?.disconnect()
       this.#connectionListeners = []
     })
   }

package/src/javascripts/ui/components/core/seamly-event-subscriber.ts

@@ -71,21 +71,26 @@ const SeamlyEventSubscriber = () => {
   }, [api, api.connectionInfo, api.conversation.socket, dispatch])
 
   useEffect(() => {
-    api.conversation.onConnection(({ currentState }) => {
-      if (currentState === 'join_channel_erred') {
-        const seamlyGeneralError = new SeamlyGeneralError()
-        dispatch(
-          setInterrupt({
-            name: seamlyGeneralError.name,
-            message: seamlyGeneralError.message,
-            langKey: seamlyGeneralError.langKey,
-            originalEvent: seamlyGeneralError.originalEvent,
-            originalError: seamlyGeneralError.originalError,
-            action: seamlyGeneralError.action,
-          }),
-        )
-      }
-    })
+    if (api.connectionInfo && api.conversation.socket) {
+      api.conversation.onConnection(({ currentState }) => {
+        if (currentState === 'join_channel_erred') {
+          const seamlyGeneralError = new SeamlyGeneralError()
+          dispatch(
+            setInterrupt({
+              name: seamlyGeneralError.name,
+              message: seamlyGeneralError.message,
+              langKey: seamlyGeneralError.langKey,
+              originalEvent: seamlyGeneralError.originalEvent,
+              originalError: seamlyGeneralError.originalError,
+              action: seamlyGeneralError.action,
+            }),
+          )
+
+          return true
+        }
+        return false
+      })
+    }
   }, [api, api.connectionInfo, api.conversation.channel, dispatch])
 
   useEffect(() => {