more refactoring of reconnection logic

Author: lhoward

Sources/SwiftOCA/OCP.1/Ocp1Connection+Connect.swift

@@ -33,6 +33,12 @@ private extension Ocp1Error {
   }
 }
 
+private extension Error {
+  var ocp1ConnectionState: Ocp1ConnectionState {
+    (self as? Ocp1Error)?.connectionState ?? .connectionFailed
+  }
+}
+
 private extension Ocp1ConnectionState {
   var error: Ocp1Error? {
     switch self {
@@ -120,12 +126,13 @@ extension Ocp1Connection {
 
   /// reconnect to the OCA device with exponential backoff, updating
   /// connectionState
-  private func reconnectDeviceWithBackoff() async throws {
+  func reconnectDeviceWithBackoff() async throws {
     var lastError: Error?
     var backoff: Duration = options.reconnectPauseInterval
 
     for i in 0..<options.reconnectMaxTries {
       do {
+        logger.trace("reconnection attempt \(i + 1)")
         try await _connectDeviceWithTimeout()
         await _didConnect()
         break
@@ -142,9 +149,10 @@ extension Ocp1Connection {
 
     if let lastError {
       logger.trace("gave up attempting to reconnect: \(lastError)")
+      _updateConnectionState(lastError.ocp1ConnectionState)
       throw lastError
     } else if !isConnected {
-      logger.trace("reconnection finished without connection being established")
+      logger.trace("gave up attempting to reconnect")
       _updateConnectionState(.notConnected)
       throw Ocp1Error.notConnected
     }
@@ -233,7 +241,7 @@ public extension Ocp1Connection {
       try await _connectDeviceWithTimeout()
     } catch {
       logger.trace("connection failed: \(error)")
-      _updateConnectionState((error as? Ocp1Error)?.connectionState ?? .connectionFailed)
+      _updateConnectionState(error.ocp1ConnectionState)
       throw error
     }