Fix for accessory configuration on restart. Add didChangeAccessoryList to DeviceDelegate.

Author: gbrooker

Sources/HAP/Server/Configuration.swift

@@ -42,7 +42,7 @@ extension Device {
         // Accessories must increment the config number after a firmware update.
         // This must have a range of 1-4294967295 and wrap to 1 when it overflows.
         // This value must persist across reboots, power cycles, etc.
-        internal var number: UInt32 = 0
+        internal var number: UInt32 = 1
 
         // HAP Specification 2.6.1: Instance IDs
         //

Sources/HAP/Server/Device.swift

@@ -150,7 +150,7 @@ public class Device {
         // The first accessory must be aid 1
         accessories[0].aid = 1
 
-        addAccessories(accessories)
+        addToAccessoryList(accessories)
     }
 
     private func persistConfig() {
@@ -185,7 +185,7 @@ public class Device {
     /// It is an error to try and add accessories with duplicate serial numbers.
     /// It is an error to try and add accessories to a non-bridge device.
     /// It is an error to try and increase the number of accessories above 99.
-    public func addAccessories(_ newAccessories: [Accessory]) {
+    private func addToAccessoryList(_ newAccessories: [Accessory]) {
         let totalNumberOfAccessories = accessories.count + newAccessories.count
         precondition(
             (isBridge && totalNumberOfAccessories <= 100) ||
@@ -228,6 +228,18 @@ public class Device {
                 configuration.aidForAccessorySerialNumber[serialNumber] = accessory.aid
             }
         }
+    }
+
+    /// Add an array of accessories to this bridge device, and notify changes
+    ///
+    /// It is an error to try and add accessories with duplicate serial numbers.
+    /// It is an error to try and add accessories to a non-bridge device.
+    /// It is an error to try and increase the number of accessories above 99.
+    public func addAccessories(_ newAccessories: [Accessory]) {
+
+        addToAccessoryList(newAccessories)
+
+        delegate?.didChangeAccessoryList()
 
         // Write configuration data to persist updated aid's and notify listeners
         updatedConfiguration()
@@ -266,6 +278,8 @@ public class Device {
             let serialNumber = accessory.serialNumber
             configuration.aidForAccessorySerialNumber.removeValue(forKey: serialNumber)
         }
+        delegate?.didChangeAccessoryList()
+
         // write configuration data to persist updated aid's
         updatedConfiguration()
     }

Sources/HAP/Server/DeviceDelegate.swift

@@ -51,6 +51,10 @@ public protocol DeviceDelegate: class {
     ///
     func didChangePairingState(from: PairingState, to: PairingState)
 
+    /// Tells the delegate that one or more Accessories were added or removed.
+    ///
+    func didChangeAccessoryList()
+
     /// Tells the delegate that the value of a characteristic has changed.
     ///
     /// - Parameters:
@@ -83,6 +87,8 @@ public extension DeviceDelegate {
 
     func didChangePairingState(from: PairingState, to: PairingState) { }
 
+    func didChangeAccessoryList() { }
+
     func characteristic<T>(
         _ characteristic: GenericCharacteristic<T>,
         ofService: Service,