allow device event delegates to be notified of controller expiry

PADL · Jan 27, 2025 · fa367d3 · fa367d3
1 parent 7248064
commit fa367d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Examples/OCADevice/DeviceApp.swift b/Examples/OCADevice/DeviceApp.swift
@@ -27,6 +27,7 @@ import Android
 
 final class DeviceEventDelegate: OcaDeviceEventDelegate {
   public func onEvent(_ event: SwiftOCA.OcaEvent, parameters: Data) async {}
+  public func onControllerExpiry(_ controller: OcaController) {}
 }
 
 @main

diff --git a/Sources/SwiftOCADevice/OCA/Device.swift b/Sources/SwiftOCADevice/OCA/Device.swift
@@ -25,6 +25,8 @@ public protocol OcaDeviceEventDelegate: AnyObject, Sendable {
     _ event: OcaEvent,
     parameters: Data
   ) async
+
+  func onControllerExpiry(_ controller: OcaController)
 }
 
 @globalActor
@@ -40,7 +42,7 @@ public actor OcaDevice {
   var endpoints = [OcaDeviceEndpoint]()
   var logger = Logger(label: "com.padl.SwiftOCADevice")
 
-  private weak var eventDelegate: OcaDeviceEventDelegate?
+  weak var eventDelegate: OcaDeviceEventDelegate?
 
   public func allocateObjectNumber() -> OcaONo {
     repeat {

diff --git a/Sources/SwiftOCADevice/OCP.1/Ocp1ControllerInternal.swift b/Sources/SwiftOCADevice/OCP.1/Ocp1ControllerInternal.swift
@@ -164,6 +164,7 @@ extension Ocp1ControllerInternal {
           let now = ContinuousClock.now
           if connectionIsStale(now) {
             try? await onConnectionBecomingStale()
+            await endpoint?.device.eventDelegate?.onControllerExpiry(self)
             await endpoint?.remove(controller: self as! Endpoint.ControllerType)
             endpoint?.logger.info("expired controller", controller: self)
             break
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ import Android @@
     final class DeviceEventDelegate: OcaDeviceEventDelegate {
       public func onEvent(_ event: SwiftOCA.OcaEvent, parameters: Data) async {}
+      public func onControllerExpiry(_ controller: OcaController) {}
     }
     @main
@@ Expand Down @@