homebridge-deconz 1.0.1 → 1.0.2

package/lib/DeconzAccessory/Light.js

@@ -33,19 +33,8 @@ class Light extends DeconzAccessory {
       serviceName: this.values.serviceName
     })
 
-    for (const subtype in device.resourceBySubtype) {
-      const resource = device.resourceBySubtype[subtype]
-      if (subtype === device.primary) {
-        continue
-      }
-      if (resource.rtype === 'lights') {
-        this.createService(resource, { serviceName: this.values.serviceName })
-      } else {
-        this.createService(resource)
-      }
-    }
-
     const params = {}
+
     if (this.values.serviceName === 'Outlet') {
       this.service.addCharacteristicDelegate({
         key: 'lockPhysicalControls',
@@ -57,7 +46,14 @@ class Light extends DeconzAccessory {
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true
       })
-    } else if (this.values.serviceName !== 'Valve') {
+    } else if (this.values.serviceName === 'Switch') {
+      params.onDelegate = this.service.characteristicDelegate('on')
+      params.lastOnDelegate = this.service.addCharacteristicDelegate({
+        key: 'lastActivation',
+        Characteristic: this.Characteristics.eve.LastActivation,
+        silent: true
+      })
+    } else if (this.values.serviceName === 'Light') {
       params.lightOnDelegate = this.service.characteristicDelegate('on')
       params.lastLightOnDelegate = this.service.addCharacteristicDelegate({
         key: 'lastActivation',
@@ -65,6 +61,7 @@ class Light extends DeconzAccessory {
         silent: true
       })
     }
+
     if (this.service.characteristicDelegate('totalConsumption') != null) {
       params.totalConsumptionDelegate = this.service.characteristicDelegate('totalConsumption')
       if (this.service.values.consumption === undefined) {
@@ -86,6 +83,51 @@ class Light extends DeconzAccessory {
     }
     this.historyService = new ServiceDelegate.History(this, params)
 
+    for (const subtype in device.resourceBySubtype) {
+      const resource = device.resourceBySubtype[subtype]
+      if (subtype === device.primary) {
+        continue
+      }
+      if (resource.rtype === 'lights') {
+        const service = this.createService(resource, { serviceName: this.values.serviceName })
+        if (this.values.serviceName !== 'Valve') {
+          this.historyService.addLastOnDelegate(
+            service.characteristicDelegate('on'),
+            service.addCharacteristicDelegate({
+              key: 'lastActivation',
+              Characteristic: this.Characteristics.eve.LastActivation,
+              silent: true
+            })
+          )
+        }
+      } else {
+        this.createService(resource)
+      }
+    }
+
+    if (
+      this.values.serviceName === 'Outlet' &&
+      this.service.characteristicDelegate('totalConsumption') == null &&
+      this.service.characteristicDelegate('consumption') == null &&
+      this.servicesByServiceName.Outlet?.length === 1
+    ) {
+      // Dumb Outlet
+      this.warn('dumb outlet')
+      this.service.addCharacteristicDelegate({
+        key: 'dummyTotalConsumption',
+        Characteristic: this.Characteristics.eve.TotalConsumption,
+        props: {
+          perms: [
+            this.Characteristic.Perms.PAIRED_READ,
+            this.Characteristic.Perms.NOTIFY,
+            this.Characteristic.Perms.HIDDEN
+          ]
+        },
+        silent: true,
+        value: 0
+      })
+    }
+
     setImmediate(() => {
       this.debug('initialised')
       this.emit('initialised')

package/lib/DeconzAccessory/Sensor.js

@@ -106,10 +106,10 @@ class Sensor extends DeconzAccessory {
         params.vocDensityDelegate = service.characteristicDelegate('vocDensity')
       }
     }
-    if (this.servicesByServiceName.Flag != null) {
+    if (this.servicesByServiceName.Flag?.length === 1) {
       const service = this.servicesByServiceName.Flag[0]
-      params.switchOnDelegate = service.characteristicDelegate('on')
-      params.lastSwitchOnDelegate = service.addCharacteristicDelegate({
+      params.onDelegate = service.characteristicDelegate('on')
+      params.lastOnDelegate = service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true

package/lib/DeconzAccessory/WarningDevice.js

@@ -35,8 +35,8 @@ class WarningDevice extends DeconzAccessory {
 
     const params = {}
     if (this.servicesByServiceName.WarningDevice?.length === 1) {
-      params.switchOnDelegate = this.service.characteristicDelegate('on')
-      params.lastSwitchOnDelegate = this.service.addCharacteristicDelegate({
+      params.onDelegate = this.service.characteristicDelegate('on')
+      params.lastOnDelegate = this.service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true

package/lib/DeconzService/WarningDevice.js

@@ -6,6 +6,7 @@
 'use strict'
 
 const DeconzService = require('../DeconzService')
+const { timeout } = require('homebridge-lib')
 
 class WarningDevice extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -33,11 +34,10 @@ class WarningDevice extends DeconzService.LightsResource {
             body = { alert: 'lselect', ontime: onTime }
           }
         }
-        this.put(body)
+        await this.put(this.statePath, body)
         if (value) {
-          this.timer = setTimeout(() => {
-            this.values.on = false
-          }, onTime * 1000)
+          await timeout(onTime * 1000)
+          this.values.on = false
         }
       }
     })

package/lib/DeconzService/WindowCovering.js

@@ -5,8 +5,8 @@
 
 'use strict'
 
-const { timeout } = require('homebridge-lib')
 const DeconzService = require('../DeconzService')
+const { timeout } = require('homebridge-lib')
 
 class WindowCovering extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -34,7 +34,7 @@ class WindowCovering extends DeconzService.LightsResource {
         return
       }
       this.values.targetPosition = Math.round(this.values.targetPosition / 5) * 5
-      await this.setPosition()
+      return this.setPosition()
     })
 
     this.addCharacteristicDelegate({
@@ -46,8 +46,8 @@ class WindowCovering extends DeconzService.LightsResource {
     this.addCharacteristicDelegate({
       key: 'holdPosition',
       Characteristic: this.Characteristics.hap.HoldPosition
-    }).on('didSet', () => {
-      this.put({ stop: true })
+    }).on('didSet', async () => {
+      await this.put(this.statePath, { stop: true })
       this.values.positionState = this.Characteristics.hap.PositionState.STOPPED
     })
 
@@ -60,7 +60,7 @@ class WindowCovering extends DeconzService.LightsResource {
           return
         }
         if (this.values.currentPosition !== 100) {
-          await this.setPosition()
+          return this.setPosition()
         }
       })
     }
@@ -80,7 +80,7 @@ class WindowCovering extends DeconzService.LightsResource {
         if (!fromHomeKit) {
           return
         }
-        await this.put({ speed: value })
+        await this.put('/config', { speed: value })
       })
     }
 
@@ -90,7 +90,7 @@ class WindowCovering extends DeconzService.LightsResource {
         Characteristic: this.Characteristics.my.PositionChange
       }).on('didSet', async (value) => {
         if (value !== 0) {
-          this.put({ lift_inc: -value })
+          await this.put(this.statePath, { lift_inc: -value })
           await timeout(this.platform.config.waitTimeReset)
           this.values.positionChange = 0
         }
@@ -120,7 +120,7 @@ class WindowCovering extends DeconzService.LightsResource {
         ? this.Characteristics.hap.PositionState.INCREASING
         : this.Characteristics.hap.PositionState.DECREASING
     this.moving = new Date()
-    await this.put({ lift })
+    return this.put(this.statePath, { lift })
   }
 
   updateState (state) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "hb-deconz-tools": "~1.0.7",
-    "homebridge-lib": "~6.5.1"
+    "homebridge-lib": "~6.6.0"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",