SocketPool + IdentifiableContinuation

swhitty · Apr 14, 2024 · 71c85f9 · 71c85f9
1 parent 374f722
commit 71c85f9
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/FlyingSocks/Sources/SocketPool.swift b/FlyingSocks/Sources/SocketPool.swift
@@ -144,21 +144,23 @@ public final actor SocketPool<Queue: EventQueue>: AsyncSocketPool {
 
     private func cancellAll() {
         logger.logInfo("SocketPoll cancellAll")
-        try? queue.close()
         state = .complete
         waiting.cancellAll()
         waiting = Waiting()
-        loop?.resume(throwing: CancellationError())
-        loop = nil
+        if let loop {
+            self.loop = nil
+            loop.resume(throwing: CancellationError())
+        }
+        try? queue.close()
     }
 
     typealias Continuation = IdentifiableContinuation<Void, any Swift.Error>
     private var loop: Continuation?
     private var waiting = Waiting() {
         didSet {
-            if !waiting.isEmpty, let continuation = loop {
-                continuation.resume()
-                loop = nil
+            if let loop, !waiting.isEmpty {
+                self.loop = nil
+                loop.resume()
             }
         }
     }
@@ -172,9 +174,9 @@ public final actor SocketPool<Queue: EventQueue>: AsyncSocketPool {
     }
 
     private func cancelLoopContinuation(with id: Continuation.ID) {
-        if loop?.id == id {
-            loop?.resume(throwing: CancellationError())
-            loop = nil
+        if let loop, loop.id == id {
+            self.loop = nil
+            loop.resume(throwing: CancellationError())
         }
     }