homebridge-deconz 0.0.27 → 0.1.1

package/lib/DeconzAccessory/Light.js

@@ -47,55 +47,45 @@ class Light extends DeconzAccessory {
       }
     }
 
-    if (this.serviceByServiceName.Consumption != null) {
-      // Current Consumption to be computed by history if not exposed by device
-      const currentConsumption =
-        this.service.values.currentConsumption === undefined
-          ? this.service.addCharacteristicDelegate({
-            key: 'currentConsumption',
-            Characteristic: this.Characteristics.eve.CurrentConsumption,
-            unit: ' W'
-          })
-          : null
-      this.service.addCharacteristicDelegate({
-        key: 'lockPhysicalControls',
-        Characteristic: this.Characteristics.hap.LockPhysicalControls
-      })
-      this.historyService = new History.Consumption(this, {
-        consumptionDelegate: this.service.characteristicDelegate('totalConsumption'),
-        powerDelegate: currentConsumption,
-        onDelegate: this.service.characteristicDelegate('on')
-      })
-    } else if (this.serviceByServiceName.Power != null) {
-      // Total Consumption to be computed by history
-      const TotalConsumption = this.service.addCharacteristicDelegate({
-        key: 'totalConsumption',
-        Characteristic: this.Characteristics.eve.TotalConsumption,
-        unit: ' kWh',
-        value: 0
-      })
+    const params = {}
+    if (this.values.serviceName === 'Outlet') {
       this.service.addCharacteristicDelegate({
         key: 'lockPhysicalControls',
         Characteristic: this.Characteristics.hap.LockPhysicalControls
       })
-      this.historyService = new History.Power(this, {
-        powerDelegate: this.service.characteristicDelegate('currentConsumption'),
-        consumptionDelegate: TotalConsumption,
-        onDelegate: this.service.characteristicDelegate('on')
+      params.onDelegate = this.service.characteristicDelegate('on')
+      params.lastOnDelegate = this.service.addCharacteristicDelegate({
+        key: 'lastActivation',
+        Characteristic: this.Characteristics.eve.LastActivation,
+        silent: true
       })
     } else {
-      const lastActivation = this.service.addCharacteristicDelegate({
+      params.lightOnDelegate = this.service.characteristicDelegate('on')
+      params.lastLightOnDelegate = this.service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true
       })
-      this.historyService = new History.Light(this, {
-        onDelegate: this.service.characteristicDelegate('on'),
-        lastActivationDelegate: lastActivation
+    }
+    if (this.serviceByServiceName.Consumption != null) {
+      params.consumptionDelegate = this.service.characteristicDelegate('totalConsumption')
+      if (this.service.values.currentConsumption === undefined) {
+        // Current Consumption to be computed by history if not exposed by device
+        params.computedPowerDelegate = this.service.addCharacteristicDelegate({
+          key: 'currentConsumption',
+          Characteristic: this.Characteristics.eve.CurrentConsumption,
+          unit: ' W'
+        })
+      }
+    } else if (this.serviceByServiceName.Power != null) {
+      // Total Consumption to be computed by history
+      params.computedConsumptionDelegate = this.service.addCharacteristicDelegate({
+        key: 'totalConsumption',
+        Characteristic: this.Characteristics.eve.TotalConsumption,
+        unit: ' kWh'
       })
     }
-
-    this.createSettingsService()
+    this.historyService = new History(this, params)
 
     setImmediate(() => {
       this.debug('initialised')

package/lib/DeconzAccessory/Sensor.js

@@ -5,8 +5,11 @@
 
 'use strict'
 
+const homebridgeLib = require('homebridge-lib')
 const DeconzAccessory = require('../DeconzAccessory')
 
+const { History } = homebridgeLib.ServiceDelegate
+
 class Sensor extends DeconzAccessory {
   constructor (gateway, device) {
     super(gateway, device, gateway.Accessory.Categories.SENSOR)
@@ -23,7 +26,94 @@ class Sensor extends DeconzAccessory {
       this.createService(resource)
     }
 
-    this.createSettingsService()
+    switch (device.resource.serviceName) {
+      case 'Daylight':
+      case 'LightLevel':
+        // Create dummy motion sensor service.
+        this.motionService = new homebridgeLib.ServiceDelegate(this, {
+          name: this.name + ' Motion',
+          Service: this.Services.hap.MotionSensor,
+          hidden: true
+        })
+        this.motionService.addCharacteristicDelegate({
+          key: 'motion',
+          Characteristic: this.Characteristics.hap.MotionDetected,
+          props: {
+            perms: [
+              this.Characteristic.Perms.PAIRED_READ,
+              this.Characteristic.Perms.NOTIFY,
+              this.Characteristic.Perms.HIDDEN
+            ]
+          },
+          value: 0
+        })
+        break
+      default:
+        break
+    }
+
+    const params = {}
+    if (this.serviceByServiceName.Contact != null) {
+      const service = this.serviceByServiceName.Contact
+      params.contactDelegate = service.characteristicDelegate('contact')
+      params.lastContactDelegate = this.service.addCharacteristicDelegate({
+        key: 'lastActivation',
+        Characteristic: this.Characteristics.eve.LastActivation,
+        silent: true
+      })
+      params.timesOpenedDelegate = this.service.addCharacteristicDelegate({
+        key: 'timesOpened',
+        Characteristic: this.Characteristics.eve.TimesOpened,
+        silent: true
+      })
+    }
+    if (this.serviceByServiceName.Motion != null) {
+      const service = this.serviceByServiceName.Motion
+      params.motionDelegate = service.characteristicDelegate('motion')
+      params.lastMotionDelegate = this.service.addCharacteristicDelegate({
+        key: 'lastActivation',
+        Characteristic: this.Characteristics.eve.LastActivation,
+        silent: true
+      })
+    }
+    if (this.serviceByServiceName.LightLevel != null) {
+      const service = this.serviceByServiceName.LightLevel
+      params.lightLevelDelegate = service.characteristicDelegate('lightLevel')
+    }
+    if (this.serviceByServiceName.Daylight != null) {
+      const service = this.serviceByServiceName.Daylight
+      params.lightLevelDelegate = service.characteristicDelegate('lightLevel')
+    }
+    if (this.serviceByServiceName.Temperature != null) {
+      const service = this.serviceByServiceName.Temperature
+      params.temperatureDelegate = service.characteristicDelegate('temperature')
+    }
+    if (this.serviceByServiceName.Humidity != null) {
+      const service = this.serviceByServiceName.Humidity
+      params.humidityDelegate = service.characteristicDelegate('humidity')
+    }
+    if (this.serviceByServiceName.AirPressure != null) {
+      const service = this.serviceByServiceName.AirPressure
+      params.airPressureDelegate = service.characteristicDelegate('airPressure')
+    }
+    if (this.serviceByServiceName.AirQuality != null) {
+      const service = this.serviceByServiceName.AirQuality
+      if (service.characteristicDelegate('vocDensity') != null) {
+        params.vocDensityDelegate = service.characteristicDelegate('vocDensity')
+      }
+    }
+    if (this.serviceByServiceName.Flag != null) {
+      const service = this.serviceByServiceName.Flag
+      params.switchOnDelegate = service.characteristicDelegate('on')
+      params.lastSwitchOnDelegate = this.service.addCharacteristicDelegate({
+        key: 'lastActivation',
+        Characteristic: this.Characteristics.eve.LastActivation,
+        silent: true
+      })
+    }
+    if (Object.keys(params).length > 0) {
+      this.historyService = new History(this, params)
+    }
 
     setImmediate(() => {
       this.debug('initialised')

package/lib/DeconzAccessory/Thermostat.js

@@ -30,15 +30,13 @@ class Thermostat extends DeconzAccessory {
     }
 
     if (device.resource.body.state.valve !== undefined) {
-      this.historyService = new History.Thermo(this, {
+      this.historyService = new History(this, {
         temperatureDelegate: this.service.characteristicDelegate('currentTemperature'),
         targetTemperatureDelegate: this.service.characteristicDelegate('targetTemperature'),
         valvePositionDelegate: this.service.characteristicDelegate('valvePosition')
       })
     }
 
-    this.createSettingsService()
-
     setImmediate(() => {
       this.debug('initialised')
       this.emit('initialised')

package/lib/DeconzAccessory/WarningDevice.js

@@ -35,14 +35,6 @@ class WarningDevice extends DeconzAccessory {
       this.createService(resource)
     }
 
-    // if (this.serviceByServiceName.Temperature != null) {
-    //   this.historyService = new History.Weather(this, {
-    //     temperatureDelegate: this.serviceByServiceName.Temperature.characteristicDelegate('temperature')
-    //   })
-    // }
-
-    this.createSettingsService()
-
     setImmediate(() => {
       this.debug('initialised')
       this.emit('initialised')

package/lib/DeconzAccessory/WindowCovering.js

@@ -35,8 +35,6 @@ class WindowCovering extends DeconzAccessory {
       this.createService(resource)
     }
 
-    this.createSettingsService()
-
     setImmediate(() => {
       this.debug('initialised')
       this.emit('initialised')

package/lib/DeconzAccessory/index.js

@@ -6,6 +6,7 @@
 'use strict'
 
 const homebridgeLib = require('homebridge-lib')
+const { OptionParser } = homebridgeLib
 const Deconz = require('../Deconz')
 const DeconzService = require('../DeconzService')
 
@@ -17,12 +18,9 @@ const { SINGLE, DOUBLE, LONG } = DeconzService.Button
   * @extends AccessoryDelegate
   */
 class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
-  static get Contact () { return require('./Contact') }
   static get Light () { return require('./Light') }
   static get Gateway () { return require('./Gateway') }
-  static get Motion () { return require('./Motion') }
   static get Sensor () { return require('./Sensor') }
-  static get Temperature () { return require('./Temperature') }
   static get WarningDevice () { return require('./WarningDevice') }
   static get WindowCovering () { return require('./WindowCovering') }
 
@@ -41,6 +39,7 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
       firmware: device.resource.firmware,
       category
     })
+    this.values.logLevel = gateway.logLevel
 
     this.context.gid = gateway.id
 
@@ -203,16 +202,127 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
     return service
   }
 
-  createSettingsService (params = {}) {
-    this.settingsService = new DeconzService.DeviceSettings(this, {
-      name: this.name + ' Settings',
-      subtype: this.id,
-      resource: this.device.rpaths.join(', '),
-      expose: true,
-      logLevel: this.gateway.logLevel,
-      hasRepeat: this.service.hasRepeat
-    })
-    this.manageLogLevel(this.settingsService.characteristicDelegate('logLevel'))
+  settings = {
+    anyOn: { service: 'Lightbulb', type: 'bool' },
+    buttonRepeat: { service: 'Button', type: 'boolMap' },
+    effects: { service: 'Light', type: 'boolMap' },
+    expose: { type: 'bool' },
+    logLevel: { type: 'int', min: 0, max: 3 },
+    lowBatteryThreshold: { service: 'Battery', type: 'int', min: 10, max: 100, factor: 100 },
+    offset: { service: 'Temperature', type: 'number', min: -5, max: 5 },
+    splitLight: { service: 'Light' }
+  }
+
+  onUiGet (details = false) {
+    const resource = this.device.resourceBySubtype[this.device.primary]
+    const body = {
+      id: details ? this.id : undefined,
+      manufacturer: this.values.manufacturer,
+      model: this.values.model,
+      name: this.name,
+      resources: this.device.rpaths,
+      settings: details
+        ? {
+            anyOn: this.device.resource.rtype === 'groups'
+              ? this.values.anyOn
+              : undefined,
+            buttonRepeat: undefined, // map per button
+            expose: true,
+            exposeEffects: this.service.values.exposeEffects,
+            exposeScenes: this.service.values.exposeScenes,
+            multiClip: undefined,
+            multiLight: undefined,
+            logLevel: this.logLevel,
+            lowBatteryThreshold: this.serviceByServiceName.Battery == null
+              ? undefined
+              : this.serviceByServiceName.Battery.values.lowBatteryThreshold,
+            // offset: this.serviceByServiceName.Temperature == null
+            //   ? undefined
+            //   : this.serviceByServiceName.Temperature.values.offset,
+            serviceName: this.values.serviceName,
+            splitLight: undefined,
+            venetianBlind: this.service.values.venetianBlind,
+            wallSwitch: undefined
+          }
+        : undefined,
+      type: resource.rtype,
+      zigbee: this.device.zigbee
+    }
+    return { status: 200, body }
+  }
+
+  onUiPut (body) {
+    let reExpose = false
+    const responseBody = {}
+    for (const key in body) {
+      try {
+        let value
+        switch (key) {
+          case 'expose':
+            value = OptionParser.toBool(key, body[key])
+            if (value) {
+              reExpose = true
+            } else {
+              this.gateway.exposeDevice(this.id, value)
+            }
+            responseBody[key] = value
+            continue
+          // Settings for the primary service.
+          case 'anyOn':
+          case 'exposeEffects':
+          case 'exposeScenes':
+          case 'venetianBlind':
+            if (this.service.values[key] != null) {
+              value = OptionParser.toBool(key, body[key])
+              this.service.values[key] = value
+              reExpose = true
+              responseBody[key] = value
+              continue
+            }
+            break
+          case 'logLevel':
+            value = OptionParser.toInt(key, body[key], 0, 1)
+            this.values[key] = value
+            responseBody[key] = value
+            continue
+          case 'lowBatteryThreshold':
+            if (this.serviceByServiceName.Battery != null) {
+              value = OptionParser.toInt(key, body[key], 10, 100)
+              this.serviceByServiceName.Battery.values[key] = value
+              responseBody[key] = value
+              continue
+            }
+            break
+          // case 'offset': // TODO: doesn't work because of fromHomeKit
+          //   if (this.serviceByServiceName.Temperature != null) {
+          //     const value = OptionParser.toNumber(key, body[key], -5, 5)
+          //     this.serviceByServiceName.Temperature.values[key] = value
+          //     responseBody[key] = value
+          //     continue
+          //   }
+          //   break
+          case 'serviceName':
+            if (this.values.serviceName != null) {
+              value = OptionParser.toString(key, body[key])
+              if (DeconzService[value] == null) {
+                throw new Error(`${value}: illegal serviceName`)
+              }
+              this.values.serviceName = value
+              reExpose = true
+              responseBody[key] = value
+              continue
+            }
+            break
+          default:
+            break
+        }
+        this.warn('ui error: %s: invalid key', key)
+      } catch (error) { this.warn('ui error: %s', error) }
+    }
+    if (reExpose) {
+      this.gateway.reExposeAccessory(this.id)
+    }
+    return { status: 200, body: responseBody }
   }
 }
 

package/lib/DeconzPlatform.js

@@ -45,7 +45,6 @@ class DeconzPlatform extends homebridgeLib.Platform {
       })
       .stringKey('name')
       .stringKey('platform')
-      .intKey('brightnessAdjustment', 10, 100)
       .boolKey('forceHttp')
       .stringKey('host')
       .arrayKey('hosts')
@@ -63,7 +62,6 @@ class DeconzPlatform extends homebridgeLib.Platform {
 
     try {
       optionParser.parse(configJson)
-      this.config.brightnessAdjustment /= 100
       if (this.config.host != null) {
         this.config.hosts.push(this.config.host)
       }
@@ -181,42 +179,36 @@ class DeconzPlatform extends homebridgeLib.Platform {
   }
 
   async onUiRequest (method, url, body) {
-    const a = url.split('/').slice(1)
-    if (a.length < 1) {
+    const path = url.split('/').slice(1)
+    if (path.length < 1) {
       return { status: 403 } // Forbidden
     }
-    if (a[0] === 'gateways') {
-      if (a.length === 1) {
+    if (path[0] === 'gateways') {
+      if (path.length === 1) {
         if (method === 'GET') {
           // const gatewayByHost = await this.discovery.discover()
-          const gatewayByHost = {}
-          for (const id in this.gatewayMap) {
+          const body = {}
+          for (const id of Object.keys(this.gatewayMap).sort()) {
             const gateway = this.gatewayMap[id]
-            gatewayByHost[gateway.context.host] = {
+            body[gateway.values.host] = {
               config: gateway.context.config,
-              host: gateway.context.host,
+              host: gateway.values.host,
               id
             }
           }
-          return {
-            status: 200,
-            body: Object.keys(gatewayByHost).sort().map((host) => {
-              return gatewayByHost[host]
-            })
-          }
+          return { status: 200, body }
         }
         return { status: 405 } // Method Not Allowed
       }
-      const gateway = this.gatewayMap[a[1]]
-      const path = a.slice(2)
+      const gateway = this.gatewayMap[path[1]]
       if (gateway == null) {
         return { status: 404 } // Not Found
       }
       if (method === 'GET') {
-        return gateway.onUiGet(path)
+        return gateway.onUiGet(path.slice(2))
       }
       if (method === 'PUT') {
-        return gateway.onUiPut(path, body)
+        return gateway.onUiPut(path.slice(2), body)
       }
       return { status: 405 } // Method Not Allowed
     }

package/lib/DeconzService/AirPressure.js

@@ -35,7 +35,7 @@ class AirPressure extends DeconzService.SensorsResource {
 
     this.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/AirPurifier.js

@@ -37,7 +37,7 @@ class FilterMaintenance extends DeconzService.SensorsResource {
       this.values.filterLifeTime = resource.body.config.filterlifetime
     }
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {
@@ -137,7 +137,7 @@ class AirPurifier extends DeconzService.SensorsResource {
 
     super.addCharacteristicDelegates()
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   modeValue (

package/lib/DeconzService/AirQuality.js

@@ -42,7 +42,7 @@ class AirQuality extends DeconzService.SensorsResource {
       super.addCharacteristicDelegates()
     }
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   airQualityValue (value) {

package/lib/DeconzService/Alarm.js

@@ -22,7 +22,7 @@ class Alarm extends DeconzService.SensorsResource {
 
     super.addCharacteristicDelegates(params)
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Battery.js

@@ -5,10 +5,9 @@
 
 'use strict'
 
+const Deconz = require('../Deconz')
 const homebridgeLib = require('homebridge-lib')
-// const Deconz = require('../Deconz')
-
-// const { dateToString } = Deconz.ApiClient
+const { dateToString } = Deconz.ApiClient
 
 /**
   * @memberof DeconzService
@@ -19,9 +18,19 @@ class Battery extends homebridgeLib.ServiceDelegate.Battery {
       name: accessory.name + ' Battery',
       exposeConfiguredName: true
     })
+
+    if (resource.body.state.battery != null) {
+      this.addCharacteristicDelegate({
+        key: 'lastUpdated',
+        Characteristic: this.Characteristics.my.LastUpdated,
+        silent: true
+      })
+    }
+
+    this.update(resource.body, resource.rpath)
   }
 
-  update (body) {
+  update (body, rpath) {
     if (this.updating) {
       return
     }
@@ -36,11 +45,12 @@ class Battery extends homebridgeLib.ServiceDelegate.Battery {
   updateState (state) {
     if (state.battery != null) {
       this.values.batteryLevel = state.battery
-    }
-    if (state.charging != null) {
-      this.values.chargingState = state.charging
-        ? this.Characteristics.hap.ChargingState.CHARGING
-        : this.Characteristics.hap.ChargingState.NOT_CHARGING
+      if (state.charging != null) {
+        this.values.chargingState = state.charging
+          ? this.Characteristics.hap.ChargingState.CHARGING
+          : this.Characteristics.hap.ChargingState.NOT_CHARGING
+      }
+      this.values.lastUpdated = dateToString(state.lastupdated)
     }
   }
 

package/lib/DeconzService/Button.js

@@ -107,6 +107,7 @@ class Button extends homebridgeLib.ServiceDelegate {
   constructor (deconzAccessory, params = {}) {
     params.Service = deconzAccessory.Services.hap.StatelessProgrammableSwitch
     params.subtype = params.button
+    params.exposeConfiguredName = true
     super(deconzAccessory, params)
     this.button = params.button
 

package/lib/DeconzService/CarbonMonoxide.js

@@ -22,7 +22,7 @@ class CarbonMonoxide extends DeconzService.SensorsResource {
 
     super.addCharacteristicDelegates(params)
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Consumption.js

@@ -39,6 +39,8 @@ class Consumption extends DeconzService.SensorsResource {
         silent: true
       })
     }
+
+    service.update(resource.body, resource.rpath)
   }
 
   static updateResourceState (service, state) {
@@ -61,7 +63,7 @@ class Consumption extends DeconzService.SensorsResource {
 
     super.addCharacteristicDelegates({ noLastUpdated: true })
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {

package/lib/DeconzService/Contact.js

@@ -20,33 +20,9 @@ class Contact extends DeconzService.SensorsResource {
       Characteristic: this.Characteristics.hap.ContactSensorState
     })
 
-    this.addCharacteristicDelegate({
-      key: 'timesOpened',
-      Characteristic: this.Characteristics.eve.TimesOpened,
-      value: 0
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'openDuration',
-      Characteristic: this.Characteristics.eve.OpenDuration,
-      value: 0
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'closedDuration',
-      Characteristic: this.Characteristics.eve.ClosedDuration,
-      value: 0
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'lastActivation',
-      Characteristic: this.Characteristics.eve.LastActivation,
-      silent: true
-    })
-
     this.addCharacteristicDelegates({ noTampered: true })
 
-    this.update(resource.body)
+    this.update(resource.body, resource.rpath)
   }
 
   updateState (state) {