refactor reconnection logic, split out into new file

PADL · Nov 27, 2024 · 2fd1b39 · 2fd1b39
1 parent f0fae9e
commit 2fd1b39
Show file tree

Hide file tree

Showing 12 changed files with 415 additions and 159 deletions.
diff --git a/Sources/SwiftOCA/OCF/Errors.swift b/Sources/SwiftOCA/OCF/Errors.swift
@@ -34,6 +34,7 @@ public enum Ocp1Error: Error, Equatable {
   case invalidProtocolVersion
   case invalidProxyMethodResponse
   case invalidSyncValue
+  case missingKeepalive
   case noConnectionDelegate
   case noInitialValue
   case noMatchingTypeForClass

diff --git a/Sources/SwiftOCA/OCP.1/Backend/Ocp1CFSocketConnection.swift b/Sources/SwiftOCA/OCP.1/Backend/Ocp1CFSocketConnection.swift
@@ -401,14 +401,14 @@ public class Ocp1CFSocketConnection: Ocp1Connection {
     deviceAddress.family
   }
 
-  override func connectDevice() async throws {
+  override public func connectDevice() async throws {
     socket = try await _CFSocketWrapper(address: deviceAddress, type: type)
     try await super.connectDevice()
   }
 
-  override public func disconnectDevice(clearObjectCache: Bool) async throws {
+  override public func disconnectDevice() async throws {
     socket = nil
-    try await super.disconnectDevice(clearObjectCache: clearObjectCache)
+    try await super.disconnectDevice()
   }
 }
 

diff --git a/Sources/SwiftOCA/OCP.1/Backend/Ocp1FlyingSocksConnection.swift b/Sources/SwiftOCA/OCP.1/Backend/Ocp1FlyingSocksConnection.swift
@@ -123,7 +123,7 @@ public class Ocp1FlyingSocksConnection: Ocp1Connection {
     try? asyncSocket?.close()
   }
 
-  override func connectDevice() async throws {
+  override public func connectDevice() async throws {
     let socket = try Socket(domain: Int32(deviceAddress.family), type: socketType)
     try? setSocketOptions(socket)
     // also connect UDP sockets to ensure we do not receive unsolicited replies
@@ -135,13 +135,13 @@ public class Ocp1FlyingSocksConnection: Ocp1Connection {
     try await super.connectDevice()
   }
 
-  override public func disconnectDevice(clearObjectCache: Bool) async throws {
+  override public func disconnectDevice() async throws {
     await AsyncSocketPoolMonitor.shared.stop()
     if let asyncSocket {
       try asyncSocket.close()
       self.asyncSocket = nil
     }
-    try await super.disconnectDevice(clearObjectCache: clearObjectCache)
+    try await super.disconnectDevice()
   }
 
   public convenience init(

diff --git a/Sources/SwiftOCA/OCP.1/Backend/Ocp1IORingConnection.swift b/Sources/SwiftOCA/OCP.1/Backend/Ocp1IORingConnection.swift
@@ -79,7 +79,7 @@ public class Ocp1IORingConnection: Ocp1Connection {
     )
   }
 
-  override func connectDevice() async throws {
+  override public func connectDevice() async throws {
     let socket = try Socket(
       ring: IORing.shared,
       domain: deviceAddress.family,
@@ -94,9 +94,9 @@ public class Ocp1IORingConnection: Ocp1Connection {
     try await super.connectDevice()
   }
 
-  override public func disconnectDevice(clearObjectCache: Bool) async throws {
+  override public func disconnectDevice() async throws {
     socket = nil
-    try await super.disconnectDevice(clearObjectCache: clearObjectCache)
+    try await super.disconnectDevice()
   }
 
   fileprivate func withMappedError<T: Sendable>(