add unsafelyUnwrappedPresentationAddress helpr

lhoward · lhoward · commit 3fc1932b39b0 · 2025-11-13T11:59:03.000+11:00
diff --git a/Sources/SwiftOCA/OCA/Helpers/SocketAddressHelpers.swift b/Sources/SwiftOCA/OCA/Helpers/SocketAddressHelpers.swift
@@ -11,3 +11,37 @@ package extension Data {
     return try? socketAddress.presentationAddress
   }
 }
+
+#if canImport(FlyingSocks)
+// this is really here to deal with the fact we can't import SocketAddress and
+// FlyingSocks at the same time
+package extension sockaddr {
+  var unsafelyUnwrappedPresentationAddress: String {
+    try! presentationAddress
+  }
+}
+
+package extension sockaddr_in {
+  var unsafelyUnwrappedPresentationAddress: String {
+    try! presentationAddress
+  }
+}
+
+package extension sockaddr_in6 {
+  var unsafelyUnwrappedPresentationAddress: String {
+    try! presentationAddress
+  }
+}
+
+package extension sockaddr_un {
+  var unsafelyUnwrappedPresentationAddress: String {
+    try! presentationAddress
+  }
+}
+#endif
+
+package extension SocketAddress {
+  var unsafelyUnwrappedPresentationAddress: String {
+    try! presentationAddress
+  }
+}
diff --git a/Sources/SwiftOCA/OCP.1/Backend/Ocp1CFSocketConnection.swift b/Sources/SwiftOCA/OCP.1/Backend/Ocp1CFSocketConnection.swift
@@ -415,7 +415,7 @@ public class Ocp1CFSocketConnection: Ocp1Connection, Ocp1MutableConnection {
   }
 
   fileprivate nonisolated var _presentationAddress: String {
-    try! _deviceAddress.criticalState.presentationAddress
+    _deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress
   }
 
   private var family: sa_family_t {
diff --git a/Sources/SwiftOCA/OCP.1/Backend/Ocp1IORingConnection.swift b/Sources/SwiftOCA/OCP.1/Backend/Ocp1IORingConnection.swift
@@ -172,7 +172,7 @@ public final class Ocp1IORingDatagramConnection: Ocp1IORingConnection {
   }
 
   override public var connectionPrefix: String {
-    "\(OcaUdpConnectionPrefix)/\(try! _deviceAddress.criticalState.presentationAddress)"
+    "\(OcaUdpConnectionPrefix)/\(_deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress)"
   }
 
   override public var isDatagram: Bool { true }
@@ -249,7 +249,7 @@ public final class Ocp1IORingDomainSocketDatagramConnection: Ocp1IORingConnectio
   }
 
   override public var connectionPrefix: String {
-    "\(OcaLocalConnectionPrefix)/\(try! _deviceAddress.criticalState.presentationAddress)"
+    "\(OcaLocalConnectionPrefix)/\(_deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress)"
   }
 
   override public var isDatagram: Bool { true }
@@ -293,7 +293,7 @@ public final class Ocp1IORingStreamConnection: Ocp1IORingConnection {
     _deviceAddress.withCriticalRegion { deviceAddress in
       let prefix = deviceAddress
         .family == AF_LOCAL ? OcaLocalConnectionPrefix : OcaTcpConnectionPrefix
-      return "\(prefix)/\(try! deviceAddress.presentationAddress)"
+      return "\(prefix)/\(deviceAddress.unsafelyUnwrappedPresentationAddress)"
     }
   }
 
diff --git a/Sources/SwiftOCA/OCP.1/Backend/Ocp1NWConnection.swift b/Sources/SwiftOCA/OCP.1/Backend/Ocp1NWConnection.swift
@@ -170,7 +170,7 @@ public class Ocp1NWConnection: Ocp1Connection, Ocp1MutableConnection {
   }
 
   fileprivate nonisolated var presentationAddress: String {
-    try! _deviceAddress.criticalState.presentationAddress
+    _deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress
   }
 }
 
diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/CF/Ocp1CFDeviceEndpoint.swift b/Sources/SwiftOCADevice/OCP.1/Backend/CF/Ocp1CFDeviceEndpoint.swift
@@ -148,7 +148,7 @@ public final class Ocp1CFStreamDeviceEndpoint: Ocp1CFDeviceEndpoint,
   }
 
   override public func run() async throws {
-    logger.info("starting \(type(of: self)) on \(try! address.presentationAddress)")
+    logger.info("starting \(type(of: self)) on \(address.unsafelyUnwrappedPresentationAddress)")
     try await super.run()
     socket = try await makeSocketAndListen()
     notificationSocket = try await makeNotificationSocket()
@@ -231,7 +231,7 @@ public class Ocp1CFDatagramDeviceEndpoint: Ocp1CFDeviceEndpoint,
   }
 
   override public func run() async throws {
-    logger.info("starting \(type(of: self)) on \(try! address.presentationAddress)")
+    logger.info("starting \(type(of: self)) on \(address.unsafelyUnwrappedPresentationAddress)")
     try await super.run()
     socket = try await makeSocket()
     repeat {
diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingFoxDeviceEndpoint.swift b/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingFoxDeviceEndpoint.swift
@@ -129,7 +129,7 @@ public final class Ocp1FlyingFoxDeviceEndpoint: OcaDeviceEndpointPrivate,
   }
 
   public nonisolated var description: String {
-    "\(type(of: self))(address: \(try! address.presentationAddress), timeout: \(timeout))"
+    "\(type(of: self))(address: \(address.unsafelyUnwrappedPresentationAddress), timeout: \(timeout))"
   }
 
   public func run() async throws {
diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksDatagramController.swift b/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksDatagramController.swift
@@ -93,7 +93,7 @@ actor Ocp1FlyingSocksDatagramController: Ocp1ControllerInternal {
 
   nonisolated var identifier: String {
     peerAddress.withSockAddr {
-      try! $0.pointee.presentationAddress
+      $0.pointee.unsafelyUnwrappedPresentationAddress
     }
   }
 
diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksDatagramDeviceEndpoint.swift b/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksDatagramDeviceEndpoint.swift
@@ -111,7 +111,7 @@ public final class Ocp1FlyingSocksDatagramDeviceEndpoint: OcaDeviceEndpointPriva
 
   private nonisolated var presentationAddress: String {
     address.withSockAddr {
-      try! $0.pointee.presentationAddress
+      $0.pointee.unsafelyUnwrappedPresentationAddress
     }
   }
 
diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksStreamDeviceEndpoint.swift b/Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksStreamDeviceEndpoint.swift
@@ -115,7 +115,7 @@ public final class Ocp1FlyingSocksStreamDeviceEndpoint: OcaDeviceEndpointPrivate
 
   private nonisolated var presentationAddress: String {
     address.withSockAddr {
-      try! $0.pointee.presentationAddress
+      $0.pointee.unsafelyUnwrappedPresentationAddress
     }
   }
 
diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/IORing/Ocp1IORingDeviceEndpoint.swift b/Sources/SwiftOCADevice/OCP.1/Backend/IORing/Ocp1IORingDeviceEndpoint.swift
@@ -156,7 +156,7 @@ public final class Ocp1IORingStreamDeviceEndpoint: Ocp1IORingDeviceEndpoint,
   }
 
   override public func run() async throws {
-    logger.info("starting \(type(of: self)) on \(try! address.presentationAddress)")
+    logger.info("starting \(type(of: self)) on \(address.unsafelyUnwrappedPresentationAddress)")
     try await super.run()
     let socket = try makeSocketAndListen()
     self.socket = socket
@@ -276,7 +276,7 @@ public class Ocp1IORingDatagramDeviceEndpoint: Ocp1IORingDeviceEndpoint,
   }
 
   override public func run() async throws {
-    logger.info("starting \(type(of: self)) on \(try! address.presentationAddress)")
+    logger.info("starting \(type(of: self)) on \(address.unsafelyUnwrappedPresentationAddress)")
     try await super.run()
 
     let socket = try makeSocket()
@@ -313,7 +313,7 @@ public class Ocp1IORingDatagramDeviceEndpoint: Ocp1IORingDeviceEndpoint,
       } catch {
         logger
           .error(
-            "unexpected error \(error) running \(type(of: self)) event loop on \(try! address.presentationAddress); no longer servicing requests"
+            "unexpected error \(error) running \(type(of: self)) event loop on \(address.unsafelyUnwrappedPresentationAddress); no longer servicing requests"
           )
         throw error
       }

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ public class Ocp1CFSocketConnection: Ocp1Connection, Ocp1MutableConnection {`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`fileprivate nonisolated var _presentationAddress: String {`
`418`		`- try! _deviceAddress.criticalState.presentationAddress`
	`418`	`+ _deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`private var family: sa_family_t {`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public final class Ocp1IORingDatagramConnection: Ocp1IORingConnection {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`override public var connectionPrefix: String {`
`175`		`- "\(OcaUdpConnectionPrefix)/\(try! _deviceAddress.criticalState.presentationAddress)"`
	`175`	`+ "\(OcaUdpConnectionPrefix)/\(_deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress)"`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`override public var isDatagram: Bool { true }`
`@@ -249,7 +249,7 @@ public final class Ocp1IORingDomainSocketDatagramConnection: Ocp1IORingConnectio`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`override public var connectionPrefix: String {`
`252`		`- "\(OcaLocalConnectionPrefix)/\(try! _deviceAddress.criticalState.presentationAddress)"`
	`252`	`+ "\(OcaLocalConnectionPrefix)/\(_deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress)"`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`override public var isDatagram: Bool { true }`
`@@ -293,7 +293,7 @@ public final class Ocp1IORingStreamConnection: Ocp1IORingConnection {`
`293`	`293`	`_deviceAddress.withCriticalRegion { deviceAddress in`
`294`	`294`	`let prefix = deviceAddress`
`295`	`295`	`.family == AF_LOCAL ? OcaLocalConnectionPrefix : OcaTcpConnectionPrefix`
`296`		`- return "\(prefix)/\(try! deviceAddress.presentationAddress)"`
	`296`	`+ return "\(prefix)/\(deviceAddress.unsafelyUnwrappedPresentationAddress)"`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public class Ocp1NWConnection: Ocp1Connection, Ocp1MutableConnection {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`fileprivate nonisolated var presentationAddress: String {`
`173`		`- try! _deviceAddress.criticalState.presentationAddress`
	`173`	`+ _deviceAddress.criticalState.unsafelyUnwrappedPresentationAddress`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public final class Ocp1FlyingFoxDeviceEndpoint: OcaDeviceEndpointPrivate,`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`public nonisolated var description: String {`
`132`		`- "\(type(of: self))(address: \(try! address.presentationAddress), timeout: \(timeout))"`
	`132`	`+ "\(type(of: self))(address: \(address.unsafelyUnwrappedPresentationAddress), timeout: \(timeout))"`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`public func run() async throws {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ actor Ocp1FlyingSocksDatagramController: Ocp1ControllerInternal {`
`93`	`93`
`94`	`94`	`nonisolated var identifier: String {`
`95`	`95`	`peerAddress.withSockAddr {`
`96`		`- try! $0.pointee.presentationAddress`
	`96`	`+ $0.pointee.unsafelyUnwrappedPresentationAddress`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public final class Ocp1FlyingSocksDatagramDeviceEndpoint: OcaDeviceEndpointPriva`
`111`	`111`
`112`	`112`	`private nonisolated var presentationAddress: String {`
`113`	`113`	`address.withSockAddr {`
`114`		`- try! $0.pointee.presentationAddress`
	`114`	`+ $0.pointee.unsafelyUnwrappedPresentationAddress`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public final class Ocp1FlyingSocksStreamDeviceEndpoint: OcaDeviceEndpointPrivate`
`115`	`115`
`116`	`116`	`private nonisolated var presentationAddress: String {`
`117`	`117`	`address.withSockAddr {`
`118`		`- try! $0.pointee.presentationAddress`
	`118`	`+ $0.pointee.unsafelyUnwrappedPresentationAddress`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public final class Ocp1IORingStreamDeviceEndpoint: Ocp1IORingDeviceEndpoint,`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`override public func run() async throws {`
`159`		`- logger.info("starting \(type(of: self)) on \(try! address.presentationAddress)")`
	`159`	`+ logger.info("starting \(type(of: self)) on \(address.unsafelyUnwrappedPresentationAddress)")`
`160`	`160`	`try await super.run()`
`161`	`161`	`let socket = try makeSocketAndListen()`
`162`	`162`	`self.socket = socket`
`@@ -276,7 +276,7 @@ public class Ocp1IORingDatagramDeviceEndpoint: Ocp1IORingDeviceEndpoint,`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`override public func run() async throws {`
`279`		`- logger.info("starting \(type(of: self)) on \(try! address.presentationAddress)")`
	`279`	`+ logger.info("starting \(type(of: self)) on \(address.unsafelyUnwrappedPresentationAddress)")`
`280`	`280`	`try await super.run()`
`281`	`281`
`282`	`282`	`let socket = try makeSocket()`
`@@ -313,7 +313,7 @@ public class Ocp1IORingDatagramDeviceEndpoint: Ocp1IORingDeviceEndpoint,`
`313`	`313`	`} catch {`
`314`	`314`	`logger`
`315`	`315`	`.error(`
`316`		`- "unexpected error \(error) running \(type(of: self)) event loop on \(try! address.presentationAddress); no longer servicing requests"`
	`316`	`+ "unexpected error \(error) running \(type(of: self)) event loop on \(address.unsafelyUnwrappedPresentationAddress); no longer servicing requests"`
`317`	`317`	`)`
`318`	`318`	`throw error`
`319`	`319`	`}`