consolidate post-connect logic

Author: lhoward

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

@@ -109,6 +109,13 @@ extension Ocp1Connection {
     }
   }
 
+  private func _didConnect() async {
+    _updateConnectionState(.connected)
+    await _refreshDeviceTreeWithPolicy()
+    await refreshSubscriptions()
+    await refreshCachedObjectProperties()
+  }
+
   /// reconnect to the OCA device with exponential backoff, updating
   /// connectionState
   private func reconnectDeviceWithBackoff() async throws {
@@ -118,7 +125,7 @@ extension Ocp1Connection {
     for i in 0..<options.reconnectMaxTries {
       do {
         try await _connectDeviceWithTimeout()
-        _updateConnectionState(.connected)
+        await _didConnect()
         break
       } catch {
         lastError = error
@@ -139,10 +146,6 @@ extension Ocp1Connection {
       _updateConnectionState(.notConnected)
       throw Ocp1Error.notConnected
     }
-
-    await _refreshDeviceTreeWithPolicy()
-    await refreshSubscriptions()
-    await refreshCachedObjectProperties()
   }
 
   private var _needsReconnect: Bool {
@@ -236,9 +239,9 @@ public extension Ocp1Connection {
     if connectionState == .connecting {
       logger.trace("connected")
       _updateConnectionState(.connected)
-      await _refreshDeviceTreeWithPolicy()
+      await _didConnect()
     } else if connectionState != .connected {
-      logger.trace("connection failed whilst connecting: \(connectionState)")
+      logger.trace("connection failed whilst attempting to connect: \(connectionState)")
       throw connectionState.error ?? .notConnected
     }
   }
@@ -248,9 +251,7 @@ public extension Ocp1Connection {
 
     _updateConnectionState(.notConnected)
 
-    try await disconnectDevice(
-      clearObjectCache: !options.flags
-        .contains(.retainObjectCacheAfterDisconnect)
-    )
+    let clearObjectCache = !options.flags.contains(.retainObjectCacheAfterDisconnect)
+    try await disconnectDevice(clearObjectCache: clearObjectCache)
   }
 }

Sources/SwiftOCA/OCP.1/Ocp1Connection.swift

@@ -342,18 +342,11 @@ open class Ocp1Connection: CustomStringConvertible, ObservableObject {
       try await monitor!.run()
     }
 
-    subscriptions = [:]
-
     if heartbeatTime > .zero {
       // send keepalive to open UDP connection
       try await sendKeepAlive()
     }
 
-    // refresh all objects
-    for (_, object) in objects {
-      await object.refresh()
-    }
-
     #if canImport(Combine) || canImport(OpenCombine)
     objectWillChange.send()
     #endif