homebridge-deconz 0.0.15 → 0.0.16

package/cli/deconz.js

@@ -703,7 +703,7 @@ class Main extends homebridgeLib.CommandLineTool {
     const { websocketport } = await this.client.get('/config')
     options.host = this.client.host + ':' + websocketport
     this.wsMonitor = new Deconz.WsClient(options)
-    this.setOptions({ mode: mode })
+    this.setOptions({ mode })
     this.wsMonitor
       .on('error', (error) => { this.error(error) })
       .on('listening', (url) => { this.log('listening on %s', url) })
@@ -813,7 +813,7 @@ class Main extends homebridgeLib.CommandLineTool {
       .parse(...args)
     const apiKey = await this.client.getApiKey('deconz')
     this.print(jsonFormatter.stringify(apiKey))
-    this.gateways[this.bridgeid] = { apiKey: apiKey }
+    this.gateways[this.bridgeid] = { apiKey }
     if (this.client.fingerprint != null) {
       this.gateways[this.bridgeid].fingerprint = this.client.fingerprint
     }

package/lib/Deconz/ApiClient.js

@@ -149,7 +149,7 @@ class ApiClient extends homebridgeLib.HttpClient {
       maxSockets: _options.maxSockets,
       path: '/api',
       timeout: _options.timeout,
-      validStatusCodes: [200, 400, 403, 404]
+      validStatusCodes: [200, 400, 403] //, 404]
     }
     if (_options.phoscon) {
       // options.headers = { Accept: 'application/vnd.ddel.v1' }

package/lib/Deconz/Discovery.js

@@ -44,7 +44,7 @@ class Discovery extends events.EventEmitter {
     */
   async config (host) {
     const client = new homebridgeLib.HttpClient({
-      host: host,
+      host,
       json: true,
       path: '/api',
       timeout: this._options.timeout
@@ -96,7 +96,7 @@ class Discovery extends events.EventEmitter {
     */
   async description (host) {
     const options = {
-      host: host,
+      host,
       timeout: this._options.timeout
     }
     const client = new homebridgeLib.HttpClient(options)

package/lib/Deconz/Resource.js

@@ -256,7 +256,7 @@ class Resource {
   get prio () {
     if (this.rtype === 'groups') return -1
     if (this.rtype === 'lights') return this.endpoint
-    return sensorsPrios.indexOf(this.type)
+    return sensorsPrios.indexOf(this.serviceName)
   }
 
   /** The resource path of the resource, e.g. `/lights/1`.
@@ -270,7 +270,7 @@ class Resource {
     * corresponding HomeKit service, or `null` for unsupported and unknown
     * resources.
     *
-    * This is derived from the resource type and`type` in the resource body.
+    * This is derived from the resource type and `type` in the resource body.
     * @type {string}
     */
   get serviceName () {

package/lib/DeconzAccessory/Gateway.js

@@ -44,6 +44,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
 
     this.gateway = this
     this.id = params.config.bridgeid
+    this.recommendedSoftware = this.platform.packageJson.engines.deCONZ
 
     /** Persisted properties.
       * @type {Object}
@@ -109,6 +110,9 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       '%s %s gateway v%s', this.values.manufacturer, this.values.model,
       this.values.software
     )
+    if (this.values.software !== this.recommendedSoftware) {
+      this.warn('recommended version: deCONZ v%s', this.recommendedSoftware)
+    }
 
     /** Map of Accessory delegates by id for the gateway.
       * @type {Object<string, DeconzAccessory.Device>}
@@ -182,6 +186,9 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.values.manufacturer, this.values.model, this.values.software,
       this.nAccessories, this.nDevices, this.nResourcesMonitored
     )
+    if (this.values.software !== this.recommendedSoftware) {
+      this.warn('recommended version: deCONZ v%s', this.recommendedSoftware)
+    }
     if (this.context.migration != null) {
       this.log(
         'migration: %s: %d resources',
@@ -716,11 +723,11 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.vdebug('polling done')
       this.pollNext = false
       this.polling = false
-      if (!this.initialised) {
-        this.initialised = true
-        this.debug('initialised')
-        this.emit('initialised')
-      }
+    }
+    if (!this.initialised) {
+      this.initialised = true
+      this.debug('initialised')
+      this.emit('initialised')
     }
   }
 

package/lib/DeconzAccessory/index.js

@@ -39,7 +39,7 @@ class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
       manufacturer: device.resource.manufacturer,
       model: device.resource.model,
       firmware: device.resource.firmware,
-      category: category
+      category
     })
 
     this.context.gid = gateway.id

package/lib/DeconzPlatform.js

@@ -70,13 +70,17 @@ class DeconzPlatform extends homebridgeLib.Platform {
       })
       this.discovery
         .on('error', (error) => {
-          this.log(
-            '%s: request %d: %s %s', error.request.name,
-            error.request.id, error.request.method, error.request.resource
-          )
-          this.warn(
-            '%s: request %d: %s', error.request.name, error.request.id, error
-          )
+          if (error instanceof homebridgeLib.HttpClient.HttpError) {
+            this.log(
+              '%s: request %d: %s %s', error.request.name,
+              error.request.id, error.request.method, error.request.resource
+            )
+            this.warn(
+              '%s: request %d: %s', error.request.name, error.request.id, error
+            )
+            return
+          }
+          this.warn(error)
         })
         .on('request', (request) => {
           this.debug(
@@ -105,10 +109,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
   async foundGateway (host, config) {
     const id = config.bridgeid
     if (this.gatewayMap[id] == null) {
-      this.gatewayMap[id] = new DeconzAccessory.Gateway(this, {
-        config: config,
-        host: host
-      })
+      this.gatewayMap[id] = new DeconzAccessory.Gateway(this, { config, host })
     }
     await this.gatewayMap[id].found(host, config)
     await events.once(this.gatewayMap[id], 'initialised')
@@ -190,7 +191,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
             gatewayByHost[gateway.context.host] = {
               config: gateway.context.config,
               host: gateway.context.host,
-              id: id
+              id
             }
           }
           return {

package/lib/DeconzService/Consumption.js

@@ -57,7 +57,7 @@ class Consumption extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    Consumption.updateResourceState(this.service, state)
+    Consumption.updateResourceState(this, state)
     super.updateState(state)
   }
 }

package/lib/DeconzService/Light.js

@@ -51,7 +51,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const bri = Math.round(value * 2.54)
-          this.put({ bri: bri })
+          this.put({ bri })
           this.updateAdaptiveLighting()
         }
       })
@@ -97,7 +97,7 @@ class Light extends DeconzService.LightsResource {
           this.capabilities.ctMin, Math.min(value, this.capabilities.ctMax)
         )
         if (fromHomeKit) {
-          this.put({ ct: ct })
+          this.put({ ct })
           this.values.colormode = 'ct'
         }
         if (this.capabilities.xy && this.values.colormode === 'ct') {
@@ -118,7 +118,7 @@ class Light extends DeconzService.LightsResource {
           const xy = hsvToXy(
             value, this.values.saturation, this.capabilities.gamut
           )
-          this.put({ xy: xy })
+          this.put({ xy })
           this.values.colormode = 'xy'
         }
       })
@@ -129,7 +129,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const xy = hsvToXy(this.values.hue, value, this.capabilities.gamut)
-          this.put({ xy: xy })
+          this.put({ xy })
           this.values.colormode = 'xy'
         }
       })
@@ -141,7 +141,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const hue = Math.round(this.values.hue * 65535.0 / 360.0)
-          this.put({ hue: hue })
+          this.put({ hue })
           this.values.colormode = 'hs'
         }
       })
@@ -152,7 +152,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const sat = Math.round(this.values.saturation * 254.0 / 100.0)
-          this.put({ sat: sat })
+          this.put({ sat })
           this.values.colormode = 'hs'
         }
       })
@@ -165,7 +165,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const effect = value ? 'colorloop' : 'none'
-          const state = { effect: effect }
+          const state = { effect }
           if (value) {
             state.colorloopspeed = this.values.colorLoopSpeed
           }
@@ -181,7 +181,7 @@ class Light extends DeconzService.LightsResource {
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
           const effect = 'colorloop'
-          this.put({ effect: effect, colorloopspeed: value })
+          this.put({ effect, colorloopspeed: value })
           this.values.colormode = 'hs'
         }
       })
@@ -467,7 +467,7 @@ class Light extends DeconzService.LightsResource {
     if (this.values.colormode === 'ct' && ct === this.values.colorTemperature) {
       return
     }
-    this.put({ ct: ct })
+    this.put({ ct })
     this.fromAdaptiveLighting = true
     this.values.colormode = 'ct'
     if (ct !== this.values.colorTemperature) {

package/lib/DeconzService/Motion.js

@@ -35,7 +35,7 @@ class Motion extends DeconzService.SensorsResource {
           : value === this.Characteristics.eve.Sensitivity.LOW
             ? 0
             : Math.round(this.sensitivitymax / 2)
-        await this.put('/config', { sensitivity: sensitivity })
+        await this.put('/config', { sensitivity })
       }
     })
 

package/lib/DeconzService/Power.js

@@ -75,7 +75,7 @@ class Power extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    Power.updateResourceState(this.service, state)
+    Power.updateResourceState(this, state)
     super.updateState(state)
   }
 }

package/lib/DeconzService/Switch.js

@@ -42,8 +42,8 @@ class Switch extends DeconzService.SensorsResource {
       this.buttonServices[i] = new DeconzService.Button(this.accessoryDelegate, {
         name: this.name + ' ' + label,
         button: Number(i),
-        events: events,
-        hasRepeat: hasRepeat
+        events,
+        hasRepeat
       })
     }
   }

package/lib/DeconzService/Temperature.js

@@ -27,6 +27,7 @@ class Temperature extends DeconzService.SensorsResource {
       key: 'offset',
       Characteristic: this.Characteristics.my.Offset,
       unit: '°C',
+      props: { minValue: -5, maxValue: 5, minStep: 0.1 },
       value: 0
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {

package/lib/DeconzService/Thermostat.js

@@ -77,6 +77,7 @@ class Thermostat extends DeconzService.SensorsResource {
       key: 'offset',
       Characteristic: this.Characteristics.my.Offset,
       unit: '°C',
+      props: { minValue: -5, maxValue: 5, minStep: 0.1 },
       value: 0
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {

package/lib/DeconzService/WindowCovering.js

@@ -114,7 +114,7 @@ class WindowCovering extends DeconzService.LightsResource {
         ? this.Characteristics.hap.PositionState.INCREASING
         : this.Characteristics.hap.PositionState.DECREASING
     this.moving = new Date()
-    await this.put({ lift: lift })
+    await this.put({ lift })
   }
 
   updateState (state) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -20,12 +20,12 @@
     "deconz": "cli/deconz.js"
   },
   "engines": {
-    "deCONZ": "2.14.1",
+    "deCONZ": "2.15.3",
     "homebridge": "^1.4.0",
     "node": "^16.14.2"
   },
   "dependencies": {
-    "homebridge-lib": "~5.4.0",
+    "homebridge-lib": "~5.5.0",
     "semver": "^7.3.7",
     "ws": "^8.5.0",
     "xml2js": "~0.4.23"