fix: edge case deadlock in ping interval

koraykoska · Aug 13, 2023 · c705625 · c705625
1 parent 324d9ed
commit c705625
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Sources/libwebsockets/WebsocketClient.swift b/Sources/libwebsockets/WebsocketClient.swift
@@ -650,7 +650,13 @@ public class WebsocketClient: WebsocketConnection {
                     $0?.cancel()
                     waitingForPong.withLockedValue { $0 = false }
 
-                    self.pingAndScheduleNextTimeoutTask()
+                    // This should not block as we would be in a deadlock
+                    // in certain cases (if we are in the correct EventLoop).
+                    // Hence we schedule it into the EventLoop to return immediately
+                    // without blocking.
+                    self.eventLoop.execute {
+                        self.pingAndScheduleNextTimeoutTask()
+                    }
                 })
             } else {
                 scheduledPingIntervalTimeoutTask.withLockedValue {