fix serial queue logic

aws-amplify · Nov 23, 2023 · 17fc03f · 17fc03f
1 parent c670ab8
commit 17fc03f
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/AppSyncRealTimeClient/Websocket/Starscream/StarscreamAdapter.swift b/AppSyncRealTimeClient/Websocket/Starscream/StarscreamAdapter.swift
@@ -53,27 +53,29 @@ public class StarscreamAdapter: AppSyncWebsocketProvider {
             self.socket?.callbackQueue = self.callbackQueue
             self.socket?.connect()
             #if os(watchOS)
-            // On watchOS, if it takes longer than 5 seconds
-            // to connect, fail fast.
             AppSyncLogger.debug(
-                "[StarscreamAdapter] Starting connectivity timer for watchOS for 3s"
+                "[StarscreamAdapter] Starting connectivity timer for watchOS for 3s."
             )
             self.watchOSConnectivityTimer.start(interval: 3) {
                 AppSyncLogger.debug(
                     "[StarscreamAdapter] watchOS connectivity timer is up."
                 )
-                if !self._isConnected {
-                    AppSyncLogger.debug(
-                        "[StarscreamAdapter] watchOS subscriptions not connected after 3s."
-                    )
-                    self.serialQueue.async {
+                self.serialQueue.async {
+                    if !self._isConnected {
+                        AppSyncLogger.debug(
+                            "[StarscreamAdapter] watchOS subscriptions not connected after 3s."
+                        )
+                        AppSyncLogger.debug(
+                            "[StarscreamAdapter] Manually send disconnect."
+                        )
                         self.delegate?.websocketDidDisconnect(provider: self, error: nil)
+                    } else {
+                        AppSyncLogger.debug(
+                            "[StarscreamAdapter] watchOS subscriptions are connected within 3s."
+                        )
                     }
-                } else {
-                    AppSyncLogger.debug(
-                        "[StarscreamAdapter] watchOS subscriptions are connected within 3s."
-                    )
                 }
+
             }
             #endif
         }