homebridge-deconz 0.1.17 → 0.1.19

package/homebridge-ui/server.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const { UiServer } = require('homebridge-lib')
-const Deconz = require('../lib/Deconz')
+const { Discovery } = require('hb-deconz-tools')
 
 class DeconzUiServer extends UiServer {
   constructor () {
@@ -14,7 +14,7 @@ class DeconzUiServer extends UiServer {
 
     this.onRequest('discover', async (params) => {
       if (this.discovery == null) {
-        this.discovery = new Deconz.Discovery({
+        this.discovery = new Discovery({
           // forceHttp: this.config.forceHttp,
           // timeout: this.config.timeout
         })

package/lib/Deconz/Resource.js

@@ -6,17 +6,16 @@
 'use strict'
 
 const { OptionParser } = require('homebridge-lib')
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzAccessory = require('../DeconzAccessory')
 const DeconzService = require('../DeconzService')
 
 const { toInstance, toInt, toObject, toString } = OptionParser
-const { buttonEvent } = Deconz.ApiClient
+const { buttonEvent } = ApiClient
 const { SINGLE, DOUBLE, LONG } = DeconzService.Button
 const rtypes = ['lights', 'sensors', 'groups']
 
 const patterns = {
-  uniqueid: /^([0-9a-f]{1,2}(?:[:-]?(?:[0-9a-f]{1,2})){7})-([0-9a-z]{2})(?:-([0-9a-z]{4}))?$/i,
   clipId: /^(S[0-9]{1,3})-([0-9a-z]{2})-([0-9a-z]{4})$/i,
   swversion: /^([0-9]+)(?:\.([0-9]+)(?:\.([0-9]+)(?:_([0-9]{4}))?)?)?$/
 }
@@ -52,20 +51,6 @@ const hueTapMap = {
   * @memberof Deconz
   */
 class Resource {
-  /** Parse the `uniqueid` in the resource body of a resource for a Zigbee device.
-    * @param {string} uniqueid - The `uniqueid`.
-    * @return {object} The Zigbee `mac`, `endpoint`, and `cluster`.
-    */
-  static parseUniqueid (uniqueid) {
-    toString('uniqueid', uniqueid, true)
-    const a = patterns.uniqueid.exec(uniqueid.replace(/:/g, '').toUpperCase())
-    return {
-      mac: a?.[1],
-      endpoint: a?.[2],
-      cluster: a?.[3]
-    }
-  }
-
   /** Parse the `uniqueid` in the resource body of a resource for a CLIP sensor.
     * @param {string} uniqueid - The `uniqueid`.
     * @return {object} The MultiCLIP `id`, `endpoint`, and `cluster`.
@@ -132,7 +117,7 @@ class Resource {
       this.rtype === 'lights' ||
       (this.rtype === 'sensors' && this.body.type.startsWith('Z'))
     ) {
-      const { mac, endpoint, cluster } = Resource.parseUniqueid(body.uniqueid)
+      const { mac, endpoint, cluster } = ApiClient.parseUniqueid(body.uniqueid)
 
       /** The device ID.
         *
@@ -170,7 +155,7 @@ class Resource {
 
       realDevice = true
     } else if (this.rtype === 'sensors') {
-      const { mac, endpoint, cluster } = Resource.parseUniqueid(body.uniqueid)
+      const { mac, endpoint, cluster } = ApiClient.parseUniqueid(body.uniqueid)
       if (mac != null && endpoint != null && cluster != null) {
         // uniqueid for proxy device has proper mac, endpoint, cluster
         this.id = mac

package/lib/Deconz/index.js

@@ -9,13 +9,8 @@
   * @hideconstructor
   */
 class Deconz {
-  static get ApiClient () { return require('./ApiClient') }
-  static get ApiError () { return require('./ApiError') }
-  static get ApiResponse () { return require('./ApiResponse') }
   static get Device () { return require('./Device') }
-  static get Discovery () { return require('./Discovery') }
   static get Resource () { return require('./Resource') }
-  static get WsClient () { return require('./WsClient') }
 }
 
 module.exports = Deconz

package/lib/DeconzAccessory/Gateway.js

@@ -8,7 +8,7 @@
 const {
   AccessoryDelegate, HttpClient, OptionParser, timeout
 } = require('homebridge-lib')
-
+const { ApiClient, ApiError, WsClient } = require('hb-deconz-tools')
 const Deconz = require('../Deconz')
 const DeconzAccessory = require('../DeconzAccessory')
 const DeconzService = require('../DeconzService')
@@ -381,7 +381,7 @@ class Gateway extends AccessoryDelegate {
     /** REST API client for the gateway.
       * @type {DeconzClient}
       */
-    this.client = new Deconz.ApiClient({
+    this.client = new ApiClient({
       apiKey: this.values.apiKey,
       config: this.context.config,
       host: this.values.host,
@@ -437,7 +437,7 @@ class Gateway extends AccessoryDelegate {
     /** Client for gateway web socket notifications.
       * @type {DeconzWsClient}
       */
-    this.wsClient = new Deconz.WsClient({
+    this.wsClient = new WsClient({
       host: this.values.host.split(':')[0] + ':' + this.values.wsPort,
       retryTime: 15
     })
@@ -514,7 +514,7 @@ class Gateway extends AccessoryDelegate {
       this.pollFullState = true
     } catch (error) {
       if (
-        error instanceof Deconz.ApiError && error.type === 101 && retry < 8
+        error instanceof ApiError && error.type === 101 && retry < 8
       ) {
         this.log('unlock gateway to obtain API key - retrying in 15s')
         await timeout(15000)

package/lib/DeconzAccessory/index.js

@@ -6,10 +6,10 @@
 'use strict'
 
 const { AccessoryDelegate, OptionParser } = require('homebridge-lib')
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
 
-const { HttpError } = Deconz.ApiClient
+const { HttpError } = ApiClient
 const { SINGLE, DOUBLE, LONG } = DeconzService.Button
 
 /** Abstract superclass for a delegate of a HomeKit accessory,
@@ -65,7 +65,7 @@ class DeconzAccessory extends AccessoryDelegate {
     this.device = device
 
     /** The API client instance for the gateway.
-      * @type {Deconz.ApiClient}
+      * @type {ApiClient}
       */
     this.client = gateway.client
 

package/lib/DeconzPlatform.js

@@ -7,7 +7,7 @@
 
 const events = require('events')
 const { HttpClient, OptionParser, Platform, timeout } = require('homebridge-lib')
-const Deconz = require('./Deconz')
+const { Discovery } = require('hb-deconz-tools')
 const DeconzAccessory = require('./DeconzAccessory')
 
 class DeconzPlatform extends Platform {
@@ -65,7 +65,7 @@ class DeconzPlatform extends Platform {
       if (this.config.host != null) {
         this.config.hosts.push(this.config.host)
       }
-      this.discovery = new Deconz.Discovery({
+      this.discovery = new Discovery({
         forceHttp: this.config.forceHttp,
         timeout: this.config.timeout
       })

package/lib/DeconzService/AirQuality.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
 
-const { dateToString } = Deconz.ApiClient
+const { dateToString } = ApiClient
 
 /**
   * @memberof DeconzService

package/lib/DeconzService/Battery.js

@@ -5,9 +5,9 @@
 
 'use strict'
 
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const { ServiceDelegate } = require('homebridge-lib')
-const { dateToString } = Deconz.ApiClient
+const { dateToString } = ApiClient
 
 /**
   * @memberof DeconzService

package/lib/DeconzService/Consumption.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
 
-const { dateToString } = Deconz.ApiClient
+const { dateToString } = ApiClient
 
 /**
   * @memberof DeconzService

package/lib/DeconzService/Daylight.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
-const Deconz = require('../Deconz')
 
-const { dateToString } = Deconz.ApiClient
+const { dateToString } = ApiClient
 
 const daylightEvents = {
   100: { name: 'Solar Midnight', period: 'Night' },

package/lib/DeconzService/LightLevel.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
-const Deconz = require('../Deconz')
 
-const { lightLevelToLux } = Deconz.ApiClient
+const { lightLevelToLux } = ApiClient
 
 /**
   * @memberof DeconzService

package/lib/DeconzService/LightsResource.js

@@ -6,10 +6,10 @@
 'use strict'
 
 const { timeout } = require('homebridge-lib')
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
 
-const { HttpError } = Deconz.ApiClient
+const { HttpError } = ApiClient
 
 class LightsResource extends DeconzService {
   constructor (accessory, resource, params) {

package/lib/DeconzService/Motion.js

@@ -26,8 +26,7 @@ class Motion extends DeconzService.SensorsResource {
 
     this.addCharacteristicDelegate({
       key: 'sensitivity',
-      Characteristic: this.Characteristics.eve.Sensitivity,
-      value: this.Characteristics.hap.TemperatureDisplayUnits.CELSIUS
+      Characteristic: this.Characteristics.eve.Sensitivity
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {
         const sensitivity = value === this.Characteristics.eve.Sensitivity.HIGH

package/lib/DeconzService/Power.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-const Deconz = require('../Deconz')
 const DeconzService = require('../DeconzService')
+const { ApiClient } = require('hb-deconz-tools')
 
-const { dateToString } = Deconz.ApiClient
+const { dateToString } = ApiClient
 
 /**
   * @memberof DeconzService

package/lib/DeconzService/Schedule.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const { ServiceDelegate } = require('homebridge-lib')
 
-const { HttpError } = Deconz.ApiClient
+const { HttpError } = ApiClient
 
 /**
   * @memberof DeconzService

package/lib/DeconzService/SensorsResource.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-const Deconz = require('../Deconz')
+const { ApiClient } = require('hb-deconz-tools')
 const DeconzService = require('../DeconzService')
 
-const { dateToString, HttpError } = Deconz.ApiClient
+const { dateToString, HttpError } = ApiClient
 
 /**
   * @memberof DeconzService
@@ -30,8 +30,11 @@ class SensorsResource extends DeconzService {
     this.addCharacteristicDelegate({
       key: 'enabled',
       Characteristic: this.Characteristics.my.Enabled
-    }).on('didSet', (value) => {
+    }).on('didSet', async (value, fromHomeKit) => {
       this.values.statusActive = value
+      if (fromHomeKit) {
+        await this.put('/config', { on: value })
+      }
     })
 
     this.addCharacteristicDelegate({

package/lib/DeconzService/index.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
+const { ApiClient } = require('hb-deconz-tools')
 const { ServiceDelegate } = require('homebridge-lib')
-const Deconz = require('../Deconz')
 
-const { dateToString } = Deconz.ApiClient
+const { dateToString } = ApiClient
 
 /** Service delegates.
   * @extends ServiceDelegate

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -23,12 +23,11 @@
   "engines": {
     "deCONZ": "2.21.2",
     "homebridge": "^1.6.1",
-    "node": "^18.16.0"
+    "node": "^18.16.1"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.17",
-    "ws": "^8.13.0",
-    "xml2js": "~0.5.0"
+    "hb-deconz-tools": "~1.0.3",
+    "homebridge-lib": "~6.3.18"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",