fix compile error, factor out one time init

PADL · Aug 2, 2023 · 9c7d022 · 9c7d022
1 parent a2f86a2
commit 9c7d022
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/Examples/OCADevice/DeviceApp.swift b/Examples/OCADevice/DeviceApp.swift
@@ -32,8 +32,7 @@ public enum DeviceApp {
         }
 
         let device = AES70Device.shared
-        let listener = try await AES70OCP1Listener(address: localAddressData)
-        try await device.add(listener: listener)
+        let listener = try await AES70OCP1Listener(device: device, address: localAddressData)
 
         class MyBooleanActuator: SwiftOCADevice.OcaBooleanActuator {
             override open class var classID: OcaClassID { OcaClassID(parent: super.classID, 65280) }

diff --git a/Sources/SwiftOCADevice/AES70/Device.swift b/Sources/SwiftOCADevice/AES70/Device.swift
@@ -36,22 +36,26 @@ public actor AES70Device {
         return nextObjectNumber
     }
 
-    public func add(listener: AES70Listener) async throws {
-        if rootBlock == nil {
-            rootBlock = try await OcaBlock(
-                objectNumber: OcaRootBlockONo,
-                deviceDelegate: self,
-                addToRootBlock: false
-            )
-            rootBlock.type = 1
-            subscriptionManager = try await OcaSubscriptionManager(deviceDelegate: self)
-            deviceManager = try await OcaDeviceManager(deviceDelegate: self)
+    private func initOnce() async throws {
+        guard rootBlock == nil else {
+            return
         }
+        rootBlock = try await OcaBlock(
+            objectNumber: OcaRootBlockONo,
+            deviceDelegate: self,
+            addToRootBlock: false
+        )
+        rootBlock.type = 1
+        subscriptionManager = try await OcaSubscriptionManager(deviceDelegate: self)
+        deviceManager = try await OcaDeviceManager(deviceDelegate: self)
+    }
 
+    public func add(listener: AES70Listener) async throws {
+        try await initOnce()
         listeners.append(listener)
     }
 
-    public func register(object: OcaRoot, addToRootBlock: Bool = true) throws {
+    public func register(object: OcaRoot, addToRootBlock: Bool = true) async throws {
         precondition(
             object.objectNumber != OcaInvalidONo,
             "cannot register object with invalid ONo"
@@ -62,6 +66,7 @@ public actor AES70Device {
         objects[object.objectNumber] = object
         if addToRootBlock {
             precondition(object.objectNumber != OcaRootBlockONo)
+            try await initOnce()
             try rootBlock.add(actionObject: object)
         }
     }

diff --git a/Tests/SwiftOCADeviceTests/SwiftOCADeviceTests.swift b/Tests/SwiftOCADeviceTests/SwiftOCADeviceTests.swift
@@ -25,8 +25,7 @@ class MyBooleanActuator: SwiftOCADevice.OcaBooleanActuator {
 final class SwiftOCADeviceTests: XCTestCase {
     func testLoopbackDevice() async throws {
         let device = AES70Device.shared
-        let listener = try await AES70LocalListener()
-        try await device.add(listener: listener)
+        let listener = try await AES70LocalListener(device: device)
 
         let matrix = try await SwiftOCADevice
             .OcaMatrix<MyBooleanActuator>(