fix connection state error handling: replace force-unwraps with ?? .notConnected fallback

lhoward · ampcode-com · lhoward · commit a18c1beb6328 · 2026-03-22T09:06:19.000+11:00
Amp-Thread-ID: https://ampcode.com/threads/T-019d1236-110d-717d-b5cc-faefb53720a3 Co-authored-by: Amp <amp@ampcode.com>
diff --git a/Sources/SwiftOCA/OCP.1/Ocp1Connection+Connect.swift b/Sources/SwiftOCA/OCP.1/Ocp1Connection+Connect.swift
@@ -255,7 +255,7 @@ extension Ocp1Connection {
       break
     default:
       logger.trace("connection failed whilst attempting to connect: \(connectionState)")
-      throw connectionState.error!
+      throw connectionState.error ?? .notConnected
     }
   }
 
@@ -372,7 +372,7 @@ extension Ocp1Connection {
     } else if currentConnectionState == .connecting {
       throw Ocp1Error.connectionAlreadyInProgress
     } else if currentConnectionState != .reconnecting {
-      throw currentConnectionState.error!
+      throw currentConnectionState.error ?? .notConnected
     }
 
     logger

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ extension Ocp1Connection {`
`255`	`255`	`break`
`256`	`256`	`default:`
`257`	`257`	`logger.trace("connection failed whilst attempting to connect: \(connectionState)")`
`258`		`- throw connectionState.error!`
	`258`	`+ throw connectionState.error ?? .notConnected`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`
`@@ -372,7 +372,7 @@ extension Ocp1Connection {`
`372`	`372`	`} else if currentConnectionState == .connecting {`
`373`	`373`	`throw Ocp1Error.connectionAlreadyInProgress`
`374`	`374`	`} else if currentConnectionState != .reconnecting {`
`375`		`- throw currentConnectionState.error!`
	`375`	`+ throw currentConnectionState.error ?? .notConnected`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`logger`