homebridge-deconz 1.0.13 → 1.0.15

package/lib/Deconz/Device.js

@@ -61,6 +61,11 @@ class Device {
       * @type {boolean}
       */
     this.zigbee = resource.zigbee
+
+    /** Device has a resource with `config.battery` in their `body`.
+      * @type {boolean}
+      */
+    this.hasBattery = resource.body.config?.battery !== undefined
   }
 
   /** The delegate of the primary resource of the device.
@@ -105,6 +110,9 @@ class Device {
       this.subtypesByServiceName[resource.serviceName].push(resource.subtype)
     }
     this.resourceBySubtype[subtype] = resource
+    if (resource.body.config?.battery !== undefined) {
+      this.hasBattery = true
+    }
     const p = this.resourceBySubtype[this.primary]
     if (p.rtype === rtype && p.prio < prio) {
       this.primary = resource.subtype

package/lib/Deconz/Resource.js

@@ -112,6 +112,9 @@ class Resource {
       */
     this.body = toObject('body', body)
     toString('body.name', body.name, true)
+    body.name = body.name.replace(/[^\p{L}\p{N} ']/ug, ' ')
+      .replace(/^[ ']*/, '')
+      .replace(/[ ']*$/, '')
     toString('body.type', body.type, true)
 
     let realDevice = false
@@ -302,6 +305,7 @@ class Resource {
         case 'Consumption': return 'Consumption'
         // case 'DoorLock': return null
         case 'Daylight': return 'Daylight'
+        case 'DaylightOffset': return ''
         case 'Fire': return 'Smoke'
         case 'GenericFlag': return 'Flag'
         case 'GenericStatus': return 'Status'
@@ -536,7 +540,7 @@ class Resource {
             buttons.push([2, 'Close', SINGLE | LONG])
             break
           case 'TRADFRI remote control':
-            buttons.push([1, 'On/Off', SINGLE])
+            buttons.push([1, 'Power', SINGLE])
             buttons.push([2, 'Dim Up', SINGLE | LONG])
             buttons.push([3, 'Dim Down', SINGLE | LONG])
             buttons.push([4, 'Previous', SINGLE | LONG])
@@ -580,7 +584,7 @@ class Resource {
       case 'LDS':
         switch (this.model) {
           case 'ZBT-DIMController-D0800':
-            buttons.push([1, 'On/Off', SINGLE])
+            buttons.push([1, 'Power', SINGLE])
             buttons.push([2, 'Dim Up', SINGLE | LONG])
             buttons.push([3, 'Dim Down', SINGLE | LONG])
             buttons.push([4, 'Scene', SINGLE | LONG])
@@ -719,7 +723,7 @@ class Resource {
       case 'MLI':
         switch (this.model) {
           case 'ZBT-Remote-ALL-RGBW': // Tint remote control by Müller-Licht see deconz-rest-plugin#1209
-            buttons.push([1, 'On/Off', SINGLE])
+            buttons.push([1, 'Power', SINGLE])
             buttons.push([2, 'Dim Up', SINGLE | LONG])
             buttons.push([3, 'Dim Down', SINGLE | LONG])
             buttons.push([4, 'Warm', SINGLE])
@@ -802,7 +806,7 @@ class Resource {
             buttons.push([4, 'Off', SINGLE | LONG])
             break
           case 'RWL022': // Hue dimmer switch (2021)
-            buttons.push([1, 'On/Off', SINGLE | LONG])
+            buttons.push([1, 'Power', SINGLE | LONG])
             buttons.push([2, 'Dim Up', SINGLE | LONG, true])
             buttons.push([3, 'Dim Down', SINGLE | LONG, true])
             buttons.push([4, 'Hue', SINGLE | LONG])
@@ -1055,7 +1059,7 @@ class Resource {
         switch (this.model) {
           case 'RC 110':
             if (this.endpoint === '01') {
-              buttons.push([1, 'On/Off', SINGLE])
+              buttons.push([1, 'Power', SINGLE])
               buttons.push([2, 'Dim Up', SINGLE | LONG])
               buttons.push([3, 'Dim Down', SINGLE | LONG])
               buttons.push([4, '1', SINGLE])
@@ -1066,7 +1070,7 @@ class Resource {
               buttons.push([9, '6', SINGLE])
               for (let i = 1; i <= 6; i++) {
                 const button = 7 + i * 3
-                buttons.push([button, `On/Off ${i}`, SINGLE])
+                buttons.push([button, `Power ${i}`, SINGLE])
                 buttons.push([button + 1, `Dim Up ${i}`, SINGLE | LONG])
                 buttons.push([button + 2, `Dim Down ${i}`, SINGLE | LONG])
               }

package/lib/DeconzAccessory/Gateway.js

@@ -16,14 +16,10 @@ import '../Deconz/Resource.js'
 import '../Deconz/Device.js'
 
 import { DeconzAccessory } from '../DeconzAccessory/index.js'
-import '../DeconzAccessory/AirPurifier.js'
-import '../DeconzAccessory/Light.js'
-import '../DeconzAccessory/Sensor.js'
-import '../DeconzAccessory/Thermostat.js'
-import '../DeconzAccessory/WarningDevice.js'
-import '../DeconzAccessory/WindowCovering.js'
 
 import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/Button.js'
+import '../DeconzService/Gateway.js'
 
 const { HttpError } = ApiClient
 
@@ -153,7 +149,7 @@ class Gateway extends AccessoryDelegate {
 
     this.addPropertyDelegate({
       key: 'periodicEvents',
-      value: true,
+      value: false,
       silent: true
     })
 
@@ -571,7 +567,6 @@ class Gateway extends AccessoryDelegate {
       this.exposeErrors = {}
       this.context.settingsById = {}
       this.context.fullState = null
-      this.values.logLevel = 2
     } catch (error) { this.error(error) }
   }
 
@@ -615,11 +610,47 @@ class Gateway extends AccessoryDelegate {
     this.pollNext = true
   }
 
+  /** On-demand import of a DeconzAccessory subclass.
+    * @params {string} type - The name of the class.
+    */
+  async importAccessoryType (type) {
+    switch (type) {
+      case 'AirPurifier':
+      case 'Light':
+      case 'Sensor':
+      case 'Thermostat':
+      case 'WarningDevice':
+      case 'WindowCovering':
+        break
+      case 'Outlet':
+      case 'Switch':
+        type = 'Light'
+        break
+      default:
+        type = 'Sensor'
+        break
+    }
+    if (DeconzAccessory[type] == null) {
+      this.vdebug('importing DeconzAccessory.%s', type)
+      await import('../DeconzAccessory/' + type + '.js')
+    }
+  }
+
+  /** On-demand import of a a DeconzService subclass.
+    * @params {string} type - The name of the class.
+    */
+  async importServiceType (type) {
+    if (DeconzService[type] == null) {
+      this.vdebug('importing DeconzService.%s', type)
+      await import('../DeconzService/' + type + '.js')
+    }
+  }
+
   /** Add the accessory for the device.
     * @params {string} id - The device ID.
     * @return {?DeconzAccessory} - The accessory delegate.
     */
-  addAccessory (id) {
+  async addAccessory (id) {
     if (id === this.id) {
       throw new RangeError(`${id}: gateway ID`)
     }
@@ -632,10 +663,17 @@ class Gateway extends AccessoryDelegate {
       const { body } = device.resource
       this.log('%s: add accessory', body.name)
       let { serviceName } = device.resource
+      await this.importAccessoryType(serviceName)
       if (DeconzAccessory[serviceName] == null) {
         // this.warn('%s: %s: not yet supported %s type', body.name, body.type, rtype)
         serviceName = 'Sensor'
       }
+      for (const resourceServiceName of Object.keys(device.subtypesByServiceName)) {
+        await this.importServiceType(resourceServiceName)
+      }
+      if (device.hasBattery) {
+        await this.importServiceType('Battery')
+      }
       const accessory = new DeconzAccessory[serviceName](this, device)
       this.accessoryById[id] = accessory
       this.monitorResources(accessory, true)

package/lib/DeconzAccessory/index.js

@@ -9,35 +9,7 @@ import { OptionParser } from 'homebridge-lib/OptionParser'
 import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
 import { DeconzService } from '../DeconzService/index.js'
-import '../DeconzService/AirPressure.js'
-import '../DeconzService/AirPurifier.js'
-import '../DeconzService/AirQuality.js'
-import '../DeconzService/Alarm.js'
-import '../DeconzService/Battery.js'
 import '../DeconzService/Button.js'
-import '../DeconzService/CarbonMonoxide.js'
-import '../DeconzService/Consumption.js'
-import '../DeconzService/Contact.js'
-import '../DeconzService/Daylight.js'
-import '../DeconzService/Flag.js'
-import '../DeconzService/Gateway.js'
-import '../DeconzService/Humidity.js'
-import '../DeconzService/Label.js'
-import '../DeconzService/Leak.js'
-import '../DeconzService/Light.js'
-import '../DeconzService/LightLevel.js'
-import '../DeconzService/Motion.js'
-import '../DeconzService/Outlet.js'
-import '../DeconzService/Power.js'
-import '../DeconzService/Schedule.js'
-import '../DeconzService/Status.js'
-import '../DeconzService/Smoke.js'
-import '../DeconzService/Switch.js'
-import '../DeconzService/Temperature.js'
-import '../DeconzService/Thermostat.js'
-import '../DeconzService/Valve.js'
-import '../DeconzService/WarningDevice.js'
-import '../DeconzService/WindowCovering.js'
 
 const { HttpError } = ApiClient
 const { SINGLE, DOUBLE, LONG } = DeconzService.Button

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "hb-deconz-tools": "~2.0.3",
-    "homebridge-lib": "~7.0.5"
+    "homebridge-lib": "~7.0.6"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",