homebridge-deconz 0.0.26 → 0.1.0

package/lib/DeconzService/index.js

@@ -24,9 +24,8 @@ class DeconzService extends homebridgeLib.ServiceDelegate {
   static get Consumption () { return require('./Consumption') }
   static get Contact () { return require('./Contact') }
   static get Daylight () { return require('./Daylight') }
-  static get DeviceSettings () { return require('./DeviceSettings') }
   static get Flag () { return require('./Flag') }
-  static get GatewaySettings () { return require('./GatewaySettings') }
+  static get Gateway () { return require('./Gateway') }
   static get Humidity () { return require('./Humidity') }
   static get Leak () { return require('./Leak') }
   static get Light () { return require('./Light') }
@@ -50,7 +49,8 @@ class DeconzService extends homebridgeLib.ServiceDelegate {
       name: resource.body.name,
       Service: params.Service,
       subtype: resource.subtype,
-      primaryService: params.primaryService
+      primaryService: params.primaryService,
+      exposeConfiguredName: true
     })
     this.id = resource.id
     this.gateway = accessory.gateway
@@ -62,6 +62,14 @@ class DeconzService extends homebridgeLib.ServiceDelegate {
     this.capabilities = resource.capabilities
 
     this.serviceNameByRpath = {}
+
+    // this.characteristicDelegate('configuredName')
+    //   .on('didSet', async (value, fromHomeKit) => {
+    //     if (fromHomeKit && value != null && value !== '') {
+    //       this.debug('PUT %s %j', this.rpath, { name: value })
+    //       await this.client.put(this.rpath, { name: value })
+    //     }
+    //   })
   }
 
   addResource (resource) {
@@ -80,6 +88,9 @@ class DeconzService extends homebridgeLib.ServiceDelegate {
       }
       return
     }
+    // if (body.name != null) {
+    //   this.values.configuredName = body.name.slice(0, 31).trim()
+    // }
     if (body.lastseen != null && this.rtype === 'lights') {
       this.values.lastSeen = dateToString(body.lastseen)
     }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.26",
+  "version": "0.1.0",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -20,13 +20,13 @@
     "deconz": "cli/deconz.js"
   },
   "engines": {
-    "deCONZ": "2.19.1",
-    "homebridge": "^1.5.1",
-    "node": "^18.12.0"
+    "deCONZ": "2.19.3",
+    "homebridge": "^1.6.0",
+    "node": "^18.13.0"
   },
   "dependencies": {
-    "homebridge-lib": "~5.7.2",
-    "ws": "^8.10.0",
+    "homebridge-lib": "~6.3.4",
+    "ws": "^8.12.0",
     "xml2js": "~0.4.23"
   },
   "scripts": {

package/lib/DeconzAccessory/Contact.js

@@ -1,54 +0,0 @@
-// homebridge-deconz/lib/DeconzAccessory/Contact.js
-// Copyright © 2022 Erik Baauw. All rights reserved.
-//
-// Homebridge plugin for deCONZ.
-
-'use strict'
-
-const homebridgeLib = require('homebridge-lib')
-const DeconzAccessory = require('../DeconzAccessory')
-
-const { History } = homebridgeLib.ServiceDelegate
-
-/** Delegate class for a HomeKit accessory corresponding to a contact sensor,
-  * with Eve Door & Window history.
-  * @extends DeconzAccessory
-  * @memberof DeconzAccessory
-  */
-class Contact extends DeconzAccessory {
-  /** Instantiate a contact sensor delegate.
-    * @param {DeconzAccessory.Gateway} gateway - The gateway.
-    * @param {Deconz.Device} device - The device.
-    */
-  constructor (gateway, device) {
-    super(gateway, device, gateway.Accessory.Categories.SENSOR)
-
-    this.identify()
-
-    this.service = this.createService(device.resource, { primaryService: true })
-
-    for (const subtype in device.resourceBySubtype) {
-      const resource = device.resourceBySubtype[subtype]
-      if (subtype === device.primary) {
-        continue
-      }
-      this.createService(resource)
-    }
-
-    this.historyService = new History.Contact(
-      this, {},
-      this.service.characteristicDelegate('contact'),
-      this.service.characteristicDelegate('timesOpened'),
-      this.service.characteristicDelegate('lastActivation')
-    )
-
-    this.createSettingsService()
-
-    setImmediate(() => {
-      this.debug('initialised')
-      this.emit('initialised')
-    })
-  }
-}
-
-module.exports = Contact

package/lib/DeconzAccessory/Motion.js

@@ -1,54 +0,0 @@
-// homebridge-deconz/lib/DeconzAccessory/Motion.js
-// Copyright © 2022 Erik Baauw. All rights reserved.
-//
-// Homebridge plugin for deCONZ.
-
-'use strict'
-
-const homebridgeLib = require('homebridge-lib')
-const DeconzAccessory = require('../DeconzAccessory')
-
-const { History } = homebridgeLib.ServiceDelegate
-
-class Motion extends DeconzAccessory {
-  /** Instantiate a delegate for an accessory corresponding to a device.
-    * @param {DeconzAccessory.Gateway} gateway - The gateway.
-    * @param {Deconz.Device} device - The device.
-    */
-  constructor (gateway, device) {
-    super(gateway, device, gateway.Accessory.Categories.SENSOR)
-
-    this.identify()
-
-    this.service = this.createService(device.resource, { primaryService: true })
-
-    for (const subtype in device.resourceBySubtype) {
-      const resource = device.resourceBySubtype[subtype]
-      if (subtype === device.primary) {
-        continue
-      }
-      this.createService(resource)
-    }
-
-    this.historyService = new History.Motion(
-      this, {},
-      this.service.characteristicDelegate('motion'),
-      this.service.characteristicDelegate('lastActivation'),
-      this.serviceByServiceName.LightLevel == null
-        ? null
-        : this.serviceByServiceName.LightLevel.characteristicDelegate('lightlevel'),
-      this.serviceByServiceName.Temperature == null
-        ? null
-        : this.serviceByServiceName.Temperature.characteristicDelegate('temperature')
-    )
-
-    this.createSettingsService()
-
-    setImmediate(() => {
-      this.debug('initialised')
-      this.emit('initialised')
-    })
-  }
-}
-
-module.exports = Motion

package/lib/DeconzAccessory/Temperature.js

@@ -1,63 +0,0 @@
-// homebridge-deconz/lib/DeconzAccessory/Temperature.js
-// Copyright © 2022 Erik Baauw. All rights reserved.
-//
-// Homebridge plugin for deCONZ.
-
-'use strict'
-
-const homebridgeLib = require('homebridge-lib')
-const DeconzAccessory = require('../DeconzAccessory')
-
-const { History } = homebridgeLib.ServiceDelegate
-
-class Temperature extends DeconzAccessory {
-  /** Instantiate a delegate for an accessory corresponding to a device.
-    * @param {DeconzAccessory.Gateway} gateway - The gateway.
-    * @param {Deconz.Device} device - The device.
-    */
-  constructor (gateway, device, settings = {}) {
-    super(gateway, device, gateway.Accessory.Categories.SENSOR)
-    this.identify()
-
-    this.service = this.createService(device.resource, { primaryService: true })
-
-    for (const subtype in device.resourceBySubtype) {
-      const resource = device.resourceBySubtype[subtype]
-      if (subtype === device.primary) {
-        continue
-      }
-      this.createService(resource)
-    }
-
-    if (this.serviceByServiceName.AirQuality == null) {
-      this.historyService = new History.Weather(
-        this, {},
-        this.service.characteristicDelegate('temperature'),
-        this.serviceByServiceName.Humidity == null
-          ? null
-          : this.serviceByServiceName.Humidity.characteristicDelegate('humidity'),
-        this.serviceByServiceName.AirPressure == null
-          ? null
-          : this.serviceByServiceName.AirPressure.characteristicDelegate('airPressure')
-      )
-    } else {
-      this.historyService = new History.Room(
-        this, {},
-        this.service.characteristicDelegate('temperature'),
-        this.serviceByServiceName.Humidity == null
-          ? null
-          : this.serviceByServiceName.Humidity.characteristicDelegate('humidity'),
-        this.serviceByServiceName.AirQuality.characteristicDelegate('vocDensity')
-      )
-    }
-
-    this.createSettingsService()
-
-    setImmediate(() => {
-      this.debug('initialised')
-      this.emit('initialised')
-    })
-  }
-}
-
-module.exports = Temperature

package/lib/DeconzService/DeviceSettings.js

@@ -1,56 +0,0 @@
-// homebridge-deconz/lib/DeconzService/DeviceSettings.js
-// Copyright © 2022 Erik Baauw. All rights reserved.
-//
-// Homebridge plugin for deCONZ.
-
-'use strict'
-
-const homebridgeLib = require('homebridge-lib')
-
-/** Delegate class for a DeconzDevice service.
-  * @extends ServiceDelegate
-  * @memberof DeconzService
-  */
-class DeviceSettings extends homebridgeLib.ServiceDelegate {
-  constructor (accessory, params = {}) {
-    params.Service = accessory.Services.my.DeconzDevice
-    super(accessory, params)
-
-    this.debug('settings: %j', params)
-
-    this.addCharacteristicDelegate({
-      key: 'expose',
-      Characteristic: this.Characteristics.my.Expose,
-      value: params.expose,
-      silent: true
-    }).on('didSet', (value) => {
-      accessory.gateway.exposeDevice(params.subtype, value)
-    })
-
-    if (params.hasRepeat != null) {
-      this.addCharacteristicDelegate({
-        key: 'repeat',
-        Characteristic: this.Characteristics.my.Repeat,
-        props: { minValue: 0, maxValue: 1, minStep: 1 },
-        value: 0
-      })
-    }
-
-    if (params.logLevel != null) {
-      this.addCharacteristicDelegate({
-        key: 'logLevel',
-        Characteristic: this.Characteristics.my.LogLevel,
-        value: params.logLevel
-      })
-    }
-
-    this.addCharacteristicDelegate({
-      key: 'resource',
-      Characteristic: this.Characteristics.my.Resource,
-      value: params.resource,
-      silent: true
-    })
-  }
-}
-
-module.exports = DeviceSettings

package/lib/DeconzService/GatewaySettings.js

@@ -1,175 +0,0 @@
-// homebridge-deconz/lib/DeconzService/GatewaySettings.js
-// Copyright © 2022 Erik Baauw. All rights reserved.
-//
-// Homebridge plugin for deCONZ.
-
-'use strict'
-
-const homebridgeLib = require('homebridge-lib')
-
-/** Delegate class for a DeconzGateway service.
-  * @extends ServiceDelegate
-  * @memberof DeconzService
-  */
-class GatewaySettings extends homebridgeLib.ServiceDelegate {
-  constructor (gateway, params = {}) {
-    params.Service = gateway.Services.my.DeconzGateway
-    super(gateway, params)
-    this.gateway = gateway
-
-    this.addCharacteristicDelegate({
-      key: 'expose',
-      Characteristic: this.Characteristics.my.Expose,
-      value: true
-    }).on('didSet', async (value, fromHomeKit) => {
-      try {
-        this.values.statusActve = value
-        if (value) {
-          await gateway.connect()
-        } else if (fromHomeKit) {
-          await gateway.reset()
-        }
-      } catch (error) { this.error(error) }
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'lights',
-      Characteristic: this.Characteristics.my.ExposeLights,
-      value: false
-    }).on('didSet', (value) => { this.updateRtypes('lights', value) })
-
-    this.addCharacteristicDelegate({
-      key: 'sensors',
-      Characteristic: this.Characteristics.my.ExposeSensors,
-      value: false
-    }).on('didSet', (value) => { this.updateRtypes('sensors', value) })
-
-    this.addCharacteristicDelegate({
-      key: 'groups',
-      Characteristic: this.Characteristics.my.ExposeGroups,
-      value: false
-    }).on('didSet', (value) => { this.updateRtypes('groups', value) })
-
-    this.addCharacteristicDelegate({
-      key: 'schedules',
-      Characteristic: this.Characteristics.my.ExposeSchedules,
-      value: false
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'heartrate',
-      Characteristic: this.Characteristics.my.Heartrate,
-      value: 30
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'lastUpdated',
-      Characteristic: this.Characteristics.my.LastUpdated,
-      silent: true
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'logLevel',
-      Characteristic: this.Characteristics.my.LogLevel,
-      value: this.accessoryDelegate.logLevel
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'restart',
-      Characteristic: this.Characteristics.my.Restart,
-      value: false
-    }).on('didSet', async (value, fromHomeKit) => {
-      try {
-        if (value) {
-          try {
-            await gateway.client.restart()
-            this.values.search = false
-            this.values.unlock = false
-            return
-          } catch (error) { this.warn(error) }
-        }
-        if (fromHomeKit) {
-          await homebridgeLib.timeout(this.platform.config.waitTimeReset)
-          this.values.restart = !value
-        }
-      } catch (error) { this.error(error) }
-    })
-    this.values.restart = false
-
-    this.addCharacteristicDelegate({
-      key: 'search',
-      Characteristic: this.Characteristics.my.Search,
-      value: false
-    }).on('didSet', async (value, fromHomeKit) => {
-      try {
-        if (value) {
-          try {
-            await gateway.client.search()
-            await homebridgeLib.timeout(120000)
-            this.values.search = false
-            return
-          } catch (error) { this.warn(error) }
-        }
-        if (fromHomeKit) {
-          await homebridgeLib.timeout(this.platform.config.waitTimeReset)
-          this.values.search = !value
-        }
-      } catch (error) { this.error(error) }
-    })
-    this.values.search = false
-
-    this.addCharacteristicDelegate({
-      key: 'statusActve',
-      Characteristic: this.Characteristics.hap.StatusActive,
-      value: true,
-      silent: true
-    })
-
-    this.addCharacteristicDelegate({
-      key: 'transitionTime',
-      Characteristic: this.Characteristics.my.TransitionTime,
-      value: this.gateway.defaultTransitionTime
-    })
-    this.values.transitionTime = this.gateway.defaultTransitionTime
-
-    this.addCharacteristicDelegate({
-      key: 'unlock',
-      Characteristic: this.Characteristics.my.Unlock,
-      value: false
-    }).on('didSet', async (value, fromHomeKit) => {
-      try {
-        if (value) {
-          try {
-            await gateway.client.unlock()
-            await homebridgeLib.timeout(60000)
-            this.values.unlock = false
-            return
-          } catch (error) { this.warn(error) }
-        }
-        if (fromHomeKit) {
-          await homebridgeLib.timeout(this.platform.config.waitTimeReset)
-          this.values.unlock = !value
-        }
-      } catch (error) { this.error(error) }
-    })
-    this.values.unlock = false
-  }
-
-  async updateRtypes (rtype, value) {
-    const rtypes = this.gateway.values.rtypes.slice()
-    if (value) {
-      rtypes.push(rtype)
-    } else {
-      rtypes.splice(rtypes.indexOf(rtype), 1)
-    }
-    this.gateway.values.rtypes = rtypes
-  }
-
-  update (config) {
-    this.values.expose = true
-    this.values.lastUpdated = new Date().toString().slice(0, 24)
-    this.values.restart = false
-  }
-}
-
-module.exports = GatewaySettings