Backing out conflicts with latest master implementation

Author: gbrooker

Sources/HAP/Base/Characteristic.swift

@@ -86,7 +86,7 @@ public class GenericCharacteristic<T: CharacteristicValueType>: Characteristic,
             guard let device = service?.accessory?.device else {
                 return
             }
-            device.notifyChange(of: self)
+            device.notify(characteristicListeners: self)
         }
     }
 

Sources/HAP/Base/Info.swift

@@ -30,7 +30,7 @@ extension Service {
                 guard let accessory = self.accessory else {
                     return
                 }
-                _ = accessory.device?.observers.map { $0.didRequestIdentificationOf(accessory) }
+                _ = accessory.device?.onIdentify.map { $0(accessory) }
             })
         }
     }

Sources/HAP/Endpoints/characteristics().swift

@@ -157,7 +157,7 @@ func characteristics(device: Device) -> Application {
                     }
 
                     // notify listeners
-                    device.notifyChange(of: characteristic, exceptToListener: connection)
+                    device.notify(characteristicListeners: characteristic, exceptListener: connection)
                 }
 
                 // toggle events for this characteristic on this connection

Sources/HAP/Endpoints/identify().swift

@@ -2,7 +2,7 @@ import Foundation
 
 func identify(device: Device) -> Application {
     return { connection, request in
-        _ = device.observers.map { $0.didRequestIdentificationOf(device.accessories[0]) }
+        _ = device.onIdentify.map { $0(nil) }
         return Response(status: .noContent)
     }
 }

Sources/HAP/Server/Device.swift

@@ -30,42 +30,6 @@ struct Box<T: Any>: Hashable, Equatable {
     }
 }
 
-// MARK: Device Observer protocol
-
-public protocol DeviceObserver {
-    func characteristicDidChange(
-        _ accessory: Accessory,
-        serviceType: ServiceType,
-        characteristic: CharacteristicType)
-    func characteristicListenerDidSubscribe(
-        _ accessory: Accessory,
-        serviceType: ServiceType,
-        characteristic: CharacteristicType)
-    func characteristicListenerDidUnsubscribe(
-        _ accessory: Accessory,
-        serviceType: ServiceType,
-        characteristic: CharacteristicType)
-    func didRequestIdentificationOf(_ accessory: Accessory)
-}
-
-public extension DeviceObserver {
-    func characteristicDidChange(_ accessory: Accessory,
-                                 serviceType: ServiceType,
-                                 characteristic: CharacteristicType) {}
-    func characteristicListenerDidSubscribe(
-        _ accessory: Accessory,
-        serviceType: ServiceType,
-        characteristic: CharacteristicType) {}
-    func characteristicListenerDidUnsubscribe(
-        _ accessory: Accessory,
-        serviceType: ServiceType,
-        characteristic: CharacteristicType) {}
-    func didRequestIdentificationOf(_ accessory: Accessory) {}
-}
-
-// MARK: Device class
-
-// swiftlint:disable:next type_body_length
 public class Device {
     public let name: String
     public let isBridge: Bool
@@ -74,10 +38,10 @@ public class Device {
          return configuration.setupCode
     }
 
-    public var observers: [DeviceObserver] = []
-
     public private(set) var accessories: [Accessory]
 
+    public var onIdentify: [(Accessory?) -> Void] = []
+
     let storage: Storage
 
     weak var server: Server?
@@ -370,12 +334,6 @@ public class Device {
         } else {
             characteristicEventListeners[Box(characteristic)] = [listener]
         }
-        if let accessory = characteristic.service?.accessory {
-            _ = observers.map {$0.characteristicListenerDidSubscribe(accessory,
-                                                                     serviceType: characteristic.service!.type,
-                                                                     characteristic: characteristic.type)
-            }
-        }
     }
 
     @discardableResult
@@ -384,28 +342,11 @@ public class Device {
         guard characteristicEventListeners[Box(characteristic)] != nil else {
             return nil
         }
-        let subscriber = characteristicEventListeners[Box(characteristic)]!.remove(connection)
-        if let accessory = characteristic.service?.accessory {
-            _ = observers.map {$0.characteristicListenerDidUnsubscribe(accessory,
-                                                                       serviceType: characteristic.service!.type,
-                                                                       characteristic: characteristic.type)
-            }
-        }
-        return subscriber
+        return characteristicEventListeners[Box(characteristic)]!.remove(connection)
     }
 
-    func notifyChange(of characteristic: Characteristic,
-                      exceptToListener except: Server.Connection? = nil) {
-        // Notify external listeners of a characteristic change
-        // The characteristic itself is not passed to avoid Box'ing the object
-        if let accessory = characteristic.service?.accessory {
-            _ = observers.map {$0.characteristicDidChange(accessory,
-                                                          serviceType: characteristic.service!.type,
-                                                          characteristic: characteristic.type)
-
-            }
-        }
-        // Notify internal listeners (server connections) of changes to a characteristic
+    func notify(characteristicListeners characteristic: Characteristic,
+                exceptListener except: Server.Connection? = nil) {
         guard let listeners = characteristicEventListeners[Box(characteristic)]?.filter({ $0 != except }),
             !listeners.isEmpty
         else {

Sources/hap-server/main.swift

@@ -50,13 +50,9 @@ let device = Device(
         Accessory.LockMechanism(info: Service.Info(name: "Front Door Lock", serialNumber: "00014")),
         Accessory.SecuritySystem(info: Service.Info(name: "Alarm", serialNumber: "00015"))
     ])
-
-struct Obs: DeviceObserver {
-    func didRequestIdentificationOf(_ accessory: Accessory) {
-        logger.info("Got identified: \(String(describing: accessory))")
-    }
-}
-device.observers.append(Obs())
+device.onIdentify.append({ acc in
+    logger.info("Got identified: \(String(describing: acc))")
+})
 
 let timer = DispatchSource.makeTimerSource()
 timer.schedule(deadline: .now() + .seconds(1), repeating: .seconds(5))