catch connection monitor error from taskGroup

PADL · Nov 27, 2024 · 1087b6b · 1087b6b
1 parent 283b866
commit 1087b6b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 34 deletions.
diff --git a/Sources/SwiftOCA/OCP.1/Ocp1Connection+Connect.swift b/Sources/SwiftOCA/OCP.1/Ocp1Connection+Connect.swift
@@ -301,21 +301,13 @@ extension Ocp1Connection {
     }
   }
 
-  private func _onMonitorError(_ error: Error) async throws {
+  func onMonitorError(id: Int, _ error: Error) async throws {
     _updateConnectionState(error.ocp1ConnectionState)
 
     if _automaticReconnect, error._isRecoverableConnectionError {
-      logger.trace("monitor task disconnecting: \(error)")
+      logger.trace("monitor task \(id) disconnecting: \(error)")
       try await _disconnectDeviceAfterConnectionFailure()
       Task.detached { try await self.reconnectDeviceWithBackoff() }
     }
   }
-
-  func onKeepAliveMonitorError(_ error: Error) async throws {
-    try await _onMonitorError(error)
-  }
-
-  func onReceiveMessageMonitorError(_ error: Error) async throws {
-    try await _onMonitorError(error)
-  }
 }
diff --git a/Sources/SwiftOCA/OCP.1/Ocp1Connection.swift b/Sources/SwiftOCA/OCP.1/Ocp1Connection.swift
@@ -232,7 +232,7 @@ open class Ocp1Connection: CustomStringConvertible, ObservableObject {
     typealias Continuation = CheckedContinuation<Ocp1Response, Error>
 
     private let _connection: Weak<Ocp1Connection>
-    private let _connectionID: Int
+    let _connectionID: Int
     private let _continuations = ManagedCriticalState<[OcaUint32: Continuation]>([:])
     private var _lastMessageReceivedTime = ManagedAtomic<UInt64>(0)
 

diff --git a/Sources/SwiftOCA/OCP.1/Ocp1ConnectionMonitor.swift b/Sources/SwiftOCA/OCP.1/Ocp1ConnectionMonitor.swift
@@ -136,33 +136,28 @@ extension Ocp1Connection.Monitor {
   }
 
   func receiveMessages(_ connection: Ocp1Connection) async throws {
-    try await withThrowingTaskGroup(of: Void.self) { @OcaConnection group in
-      group.addTask { [self] in
-        repeat {
-          try Task.checkCancellation()
-          do {
-            try await receiveMessage(connection)
-          } catch Ocp1Error.unknownPduType {
-          } catch Ocp1Error.invalidHandle {
-          } catch {
-            guard await !connection.isConnecting else { continue }
-            try await connection.onReceiveMessageMonitorError(error)
-            throw error
-          }
-        } while true
-      }
-      if connection.heartbeatTime > .zero {
-        group.addTask(priority: .background) { [self] in
-          do {
+    do {
+      try await withThrowingTaskGroup(of: Void.self) { @OcaConnection group in
+        group.addTask { [self] in
+          repeat {
+            try Task.checkCancellation()
+            do {
+              try await receiveMessage(connection)
+            } catch Ocp1Error.unknownPduType {
+            } catch Ocp1Error.invalidHandle {}
+          } while true
+        }
+        if connection.heartbeatTime > .zero {
+          group.addTask(priority: .background) { [self] in
             try await keepAlive(connection)
-          } catch {
-            try await connection.onKeepAliveMonitorError(error)
-            throw error
           }
         }
+        try await group.next()
+        group.cancelAll()
       }
-      try await group.next()
-      group.cancelAll()
+    } catch {
+      try? await connection.onMonitorError(id: _connectionID, error)
+      throw error
     }
   }
 }