homebridge-deconz 0.1.4 → 0.1.7

package/jsdoc.json

@@ -8,6 +8,7 @@
       "README.md",
       "index.js",
       "lib",
+      "cli",
       "node_modules/hb-lib-tools/lib/HttpClient.js"
     ]
   },

package/lib/Deconz/ApiClient.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const events = require('events')
-const homebridgeLib = require('homebridge-lib')
+const { HttpClient, OptionParser, timeout } = require('homebridge-lib')
 const os = require('os')
 
 const Deconz = require('../Deconz')
@@ -42,7 +42,7 @@ function numberOfZigbeeMessages (body = {}) {
   * @extends HttpClient
   * @memberof Deconz
   */
-class ApiClient extends homebridgeLib.HttpClient {
+class ApiClient extends HttpClient {
   /** Events reported through `buttonevent`.
     * @type {Object<string, integer>}
     */
@@ -85,11 +85,11 @@ class ApiClient extends homebridgeLib.HttpClient {
     return v ? Math.round(Math.pow(10, (v - 1) / 10000) * 10) / 10 : 0.0001
   }
 
-  /** Create a new instance of a Deconz.Client.
+  /** Create a new instance of a Deconz.ApiClient.
     *
     * The caller is expected to verify that the given host is a reachable
     * deCONZ gateway, by calling
-    * {@link DeconzDiscovery#config DeconzDiscovery#config()} and passing the
+    * {@link Deconz.Discovery#config Deconz.Discovery#config()} and passing the
     * response as `params.config`.<br>
     * The caller is expected to persist the API key, passing it as
     * `params.apiKey`.
@@ -127,7 +127,7 @@ class ApiClient extends homebridgeLib.HttpClient {
       waitTimePutGroup: 1000,
       waitTimeResend: 300
     }
-    const optionParser = new homebridgeLib.OptionParser(_options)
+    const optionParser = new OptionParser(_options)
     optionParser
       .objectKey('config', true)
       .stringKey('host', true)
@@ -196,7 +196,7 @@ class ApiClient extends homebridgeLib.HttpClient {
     * This might be a resource as exposed by the API, e.g. `/lights/1/state`,
     * or an attribute returned by the API, e.g. `/lights/1/state/on`.
     * @return {*} response - The JSON response body converted to JavaScript.
-    * @throws {DeconzError} In case of error.
+    * @throws {Deconz.ApiError} In case of error.
     */
   async get (resource) {
     if (typeof resource !== 'string' || resource[0] !== '/') {
@@ -261,8 +261,8 @@ class ApiClient extends homebridgeLib.HttpClient {
     * delaying the request when needed.
     * @param {string} resource - The resource.
     * @param {*} body - The body, which will be converted to JSON.
-    * @return {DeconzResponse} response - The response.
-    * @throws {DeconzError} In case of error, except for non-critical API errors.
+    * @return {Deconz.ApiResponse} response - The response.
+    * @throws {Deconz.ApiError} In case of error, except for non-critical API errors.
     */
   async put (resource, body) {
     if (this.waitForIt) {
@@ -291,8 +291,8 @@ class ApiClient extends homebridgeLib.HttpClient {
     *
     * @param {string} resource - The resource.
     * @param {*} body - The body, which will be converted to JSON.
-    * @return {DeconzResponse} response - The response.
-    * @throws {DeconzError} In case of error.
+    * @return {Deconz.ApiResponse} response - The response.
+    * @throws {Deconz.ApiError} In case of error.
     */
   async post (resource, body) {
     return this.request('POST', resource, body)
@@ -301,8 +301,8 @@ class ApiClient extends homebridgeLib.HttpClient {
   /** Issue a DELETE request of `/api/`_API_key_`/`_resource_.
     * @param {string} resource - The resource.
     * @param {*} body - The body, which will be converted to JSON.
-    * @return {DeconzResponse} response - The response.
-    * @throws {DeconzError} In case of error.
+    * @return {Deconz.ApiResponse} response - The response.
+    * @throws {Deconz.ApiError} In case of error.
     */
   async delete (resource, body) {
     return this.request('DELETE', resource, body)
@@ -318,7 +318,7 @@ class ApiClient extends homebridgeLib.HttpClient {
     * the client is running on the same host as the gateway.
     * @return {string} apiKey - The newly created API key.
     * @throws {HttpError} In case of HTTP error.
-    * @throws {DeconzError} In case of API error.
+    * @throws {Deconz.ApiError} In case of API error.
     */
   async getApiKey (application) {
     if (typeof application !== 'string' || application === '') {
@@ -339,7 +339,7 @@ class ApiClient extends homebridgeLib.HttpClient {
 
   /** Delete the API key and clear {@link Deconz.ApiClient#apiKey apiKey}.
     * @throws {HttpError} In case of HTTP error.
-    * @throws {DeconzError} In case of API error.
+    * @throws {Deconz.ApiError} In case of API error.
     */
   async deleteApiKey () {
     try {
@@ -353,9 +353,9 @@ class ApiClient extends homebridgeLib.HttpClient {
     * Calls {@link Deconz.ApiClient#put put()} to issue a PUT request to
     * `/api/`_API_key_`/config`.
     *
-    * @return {DeconzResponse} response - The response.
+    * @return {Deconz.ApiResponse} response - The response.
     * @throws {HttpError} In case of HTTP error.
-    * @throws {DeconzError} In case of API error.
+    * @throws {Deconz.ApiError} In case of API error.
     */
   async unlock () {
     return this.put('/config', { unlock: 60 })
@@ -368,9 +368,9 @@ class ApiClient extends homebridgeLib.HttpClient {
     *
     * To see the newly paired devices, issue a GET request of
     * `/api/`_API_key_`/lights/new` and/or `/api/`_API_key_`/sensor/new`
-    * @return {DeconzResponse} response - The response.
+    * @return {Deconz.ApiResponse} response - The response.
     * @throws {HttpError} In case of HTTP error.
-    * @throws {DeconzError} In case of API error.
+    * @throws {Deconz.ApiError} In case of API error.
     */
   async search () {
     return this.put('/config', { permitjoin: 120 })
@@ -381,9 +381,9 @@ class ApiClient extends homebridgeLib.HttpClient {
     * Calls {@link Deconz.ApiClient#post post()} to issue a POST request to
     * `/api/`_API_key_`/config/restartapp`, to restart the deCONZ gateway.
     *
-    * @return {DeconzResponse} response - The response.
+    * @return {Deconz.ApiResponse} response - The response.
     * @throws {HttpError} In case of HTTP error.
-    * @throws {DeconzError} In case of API error.
+    * @throws {Deconz.ApiError} In case of API error.
     */
   async restart () {
     return this.post('/config/restartapp')
@@ -401,9 +401,9 @@ class ApiClient extends homebridgeLib.HttpClient {
     * @param {string} method - The method for the request.
     * @param {!string} resource - The resource for the request.
     * @param {?*} body - The body for the request.
-    * @return {DeconzResponse} response - The response.
+    * @return {Deconz.ApiResponse} response - The response.
     * @throws {HttpError} In case of HTTP error.
-    * @throws {DeconzError} In case of API error.
+    * @throws {Deconz.ApiError} In case of API error.
     */
   async request (method, resource, body = null, retry = 0) {
     try {
@@ -430,7 +430,7 @@ class ApiClient extends homebridgeLib.HttpClient {
         if (error.request != null && this._options.waitTimeResend > 0 && retry < 5) {
           error.message += ' - retry in ' + this._options.waitTimeResend + 'ms'
           this.emit('error', error)
-          await homebridgeLib.timeout(this._options.waitTimeResend)
+          await timeout(this._options.waitTimeResend)
           return this.request(method, resource, body, retry + 1)
         }
       }

package/lib/Deconz/ApiError.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { HttpClient } = require('homebridge-lib')
 
 // API errors that could still cause (part of) the PUT command to be executed.
 const nonCriticalApiErrorTypes = [
@@ -20,7 +20,7 @@ const nonCriticalApiErrorTypes = [
   * @extends HttpClient.HttpError
   * @memberof Deconz
   */
-class ApiError extends homebridgeLib.HttpClient.HttpError {
+class ApiError extends HttpClient.HttpError {
   constructor (e, response) {
     super(
       `${e.address}: api error ${e.type}: ${e.description}`,

package/lib/Deconz/ApiResponse.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { HttpClient } = require('homebridge-lib')
 
 const Deconz = require('../Deconz')
 
@@ -14,7 +14,7 @@ const Deconz = require('../Deconz')
   * @extends HttpClient.HttpResponse
   * @memberof Deconz
   */
-class ApiResponse extends homebridgeLib.HttpClient.HttpResponse {
+class ApiResponse extends HttpClient.HttpResponse {
   constructor (response) {
     super(
       response.request, response.statusCode, response.statusMessage,

package/lib/Deconz/Discovery.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const events = require('events')
-const homebridgeLib = require('homebridge-lib')
+const { HttpClient, OptionParser, UpnpClient } = require('homebridge-lib')
 const xml2js = require('xml2js')
 
 /** Class for discovery of deCONZ gateways.
@@ -28,7 +28,7 @@ class Discovery extends events.EventEmitter {
       forceHttp: false,
       timeout: 5
     }
-    const optionParser = new homebridgeLib.OptionParser(this._options)
+    const optionParser = new OptionParser(this._options)
     optionParser.boolKey('forceHttp')
     optionParser.intKey('timeout', 1, 60)
     optionParser.parse(params)
@@ -43,7 +43,7 @@ class Discovery extends events.EventEmitter {
     * @throws {HttpError} In case of error.
     */
   async config (host) {
-    const client = new homebridgeLib.HttpClient({
+    const client = new HttpClient({
       host,
       json: true,
       path: '/api',
@@ -102,7 +102,7 @@ class Discovery extends events.EventEmitter {
       host,
       timeout: this._options.timeout
     }
-    const client = new homebridgeLib.HttpClient(options)
+    const client = new HttpClient(options)
     client
       .on('error', (error) => { this.emit('error', error) })
       .on('request', (request) => { this.emit('request', request) })
@@ -167,7 +167,7 @@ class Discovery extends events.EventEmitter {
   }
 
   async _upnp () {
-    const upnpClient = new homebridgeLib.UpnpClient({
+    const upnpClient = new UpnpClient({
       filter: (message) => {
         return /^[0-9A-F]{16}$/.test(message['gwid.phoscon.de'])
       },
@@ -213,7 +213,7 @@ class Discovery extends events.EventEmitter {
   async _nupnp (options) {
     options.json = true
     options.timeout = this._options.timeout
-    const client = new homebridgeLib.HttpClient(options)
+    const client = new HttpClient(options)
     client
       .on('error', (error) => { this.emit('error', error) })
       .on('request', (request) => { this.emit('request', request) })

package/lib/Deconz/Resource.js

@@ -5,13 +5,13 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { Colour, OptionParser } = require('homebridge-lib')
 const Deconz = require('../Deconz')
 const DeconzAccessory = require('../DeconzAccessory')
 const DeconzService = require('../DeconzService')
 
-const { toInstance, toInt, toObject, toString } = homebridgeLib.OptionParser
-const { defaultGamut } = homebridgeLib.Colour
+const { toInstance, toInt, toObject, toString } = OptionParser
+const { defaultGamut } = Colour
 const { buttonEvent } = Deconz.ApiClient
 const { SINGLE, DOUBLE, LONG } = DeconzService.Button
 const rtypes = ['lights', 'sensors', 'groups']
@@ -23,7 +23,7 @@ const sensorsPrios = [
   'Temperature',
   'LightLevel',
   'Motion',
-  'OpenClose',
+  'Contact',
   'AirPurifier',
   'Thermostat'
 ]

package/lib/Deconz/WsClient.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const events = require('events')
-const homebridgeLib = require('homebridge-lib')
+const { OptionParser, timeout } = require('homebridge-lib')
 const WebSocket = require('ws')
 
 /** Client for web socket notifications by a deCONZ gateway.
@@ -37,7 +37,7 @@ class WsClient extends events.EventEmitter {
       port: 443,
       retryTime: 15
     }
-    const optionParser = new homebridgeLib.OptionParser(this.config)
+    const optionParser = new OptionParser(this.config)
     optionParser
       .hostKey()
       .intKey('retryTime', 0, 120)
@@ -50,7 +50,7 @@ class WsClient extends events.EventEmitter {
     */
   get host () { return this.config.hostname + ':' + this.config.port }
   set host (host) {
-    const { hostname, port } = homebridgeLib.OptionParser.toHost('host', host)
+    const { hostname, port } = OptionParser.toHost('host', host)
     this.config.hostname = hostname
     this.config.port = port
   }
@@ -185,7 +185,7 @@ class WsClient extends events.EventEmitter {
           */
         this.emit('closed', url, retryTime)
         if (retryTime > 0) {
-          await homebridgeLib.timeout(retryTime * 1000)
+          await timeout(retryTime * 1000)
           return this.listen()
         }
       })

package/lib/DeconzAccessory/Gateway.js

@@ -5,7 +5,9 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const {
+  AccessoryDelegate, HttpClient, OptionParser, timeout
+} = require('homebridge-lib')
 
 const Deconz = require('../Deconz')
 const DeconzAccessory = require('../DeconzAccessory')
@@ -23,7 +25,7 @@ const periodicEvents = [
   * @extends AccessoryDelegate
   * @memberof DeconzAccessory
   */
-class Gateway extends homebridgeLib.AccessoryDelegate {
+class Gateway extends AccessoryDelegate {
   /** Instantiate a gateway delegate.
     * @param {DeconzPlatform} platform - The platform plugin.
     * @param {Object} params - Parameters.
@@ -74,14 +76,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.client.apiKey = value
     })
 
-    this.addPropertyDelegate({
-      key: 'autoExpose',
-      value: { groups: false, lights: true, schedules: false, sensors: true },
-      silent: true
-    }).on('didSet', async () => {
-      this.pollNext = true
-    })
-
     this.addPropertyDelegate({
       key: 'brightnessAdjustment',
       value: 1,
@@ -153,7 +147,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       if (value) {
         try {
           await this.client.search()
-          await homebridgeLib.timeout(120000)
+          await timeout(120000)
           this.values.search = false
           return
         } catch (error) { this.warn(error) }
@@ -168,7 +162,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       if (value) {
         try {
           await this.client.unlock()
-          await homebridgeLib.timeout(60000)
+          await timeout(60000)
           this.values.unlock = false
           return
         } catch (error) { this.warn(error) }
@@ -247,7 +241,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       return
     }
     this.resetting = true
-    await homebridgeLib.timeout(this.platform.config.waitTimeUpdate)
+    await timeout(this.platform.config.waitTimeUpdate)
     this.service.values.transitionTime = this.defaultTransitionTime
     this.resetting = false
   }
@@ -378,7 +372,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     })
     this.client
       .on('error', (error) => {
-        if (error instanceof homebridgeLib.HttpClient.HttpError) {
+        if (error instanceof HttpClient.HttpError) {
           if (error.request.id !== this.requestId) {
             this.log(
               'request %d: %s %s%s', error.request.id,
@@ -453,15 +447,13 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       })
       .on('added', (rtype, rid, body) => {
         this.vdebug('/%s/%d: added: %j', rtype, rid, body)
-        if (this.values.autoExpose[rtype]) {
-          this.pollNext = true
-        }
+        this.pollNext = true
+        this.pollFullState = true
       })
       .on('deleted', (rtype, rid) => {
         this.vdebug('/%s/%d: deleted', rtype, rid)
-        if (this.values.autoExpose[rtype]) {
-          this.pollNext = true
-        }
+        this.pollNext = true
+        this.pollFullState = true
       })
       .on('closed', (url, retryTime) => {
         if (retryTime > 0) {
@@ -504,7 +496,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         error instanceof Deconz.ApiError && error.type === 101 && retry < 8
       ) {
         this.log('unlock gateway to obtain API key - retrying in 15s')
-        await homebridgeLib.timeout(15000)
+        await timeout(15000)
         return this.connect(retry + 1)
       }
       this.error(error)
@@ -542,9 +534,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.context.fullState = null
       this.context.migration = null
       this.values.logLevel = 2
-      this.values.autoExpose = {
-        groups: false, lights: true, schedules: false, sensors: true
-      }
     } catch (error) { this.error(error) }
   }
 
@@ -719,7 +708,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         model: this.values.model,
         name: this.name,
         settings: {
-          autoExpose: this.values.autoExpose,
           brightnessAdjustment: this.values.brightnessAdjustment * 100,
           expose: this.values.expose,
           heartrate: this.values.heartrate,
@@ -770,12 +758,11 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
     if (path[0] === 'settings') {
       const settings = {}
-      const optionParser = new homebridgeLib.OptionParser(settings, true)
+      const optionParser = new OptionParser(settings, true)
       optionParser
         .on('userInputError', (error) => {
           this.warn(error)
         })
-        .objectKey('autoExpose')
         .intKey('brightnessAdjustment', 10, 100)
         .boolKey('expose')
         .intKey('heartrate', 1, 60)
@@ -789,27 +776,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       const responseBody = {}
       for (const key in settings) {
         switch (key) {
-          case 'autoExpose':
-            for (const rtype in settings[key]) {
-              if (this.values[key][rtype] == null) {
-                this.warn('ui error: %s.%s: invalid key', key, rtype)
-                continue
-              }
-              try {
-                settings[key][rtype] = homebridgeLib.OptionParser.toBool(
-                  key + '.' + rtype, settings[key][rtype], true
-                )
-              } catch (error) {
-                this.warn(error)
-                continue
-              }
-              this.values[key][rtype] = settings[key][rtype]
-              if (responseBody[key] == null) {
-                responseBody[key] = {}
-              }
-              responseBody[key][rtype] = this.values[key][rtype]
-            }
-            break
           case 'brightnessAdjustment':
             this.values[key] = settings[key] / 100
             responseBody[key] = this.values[key]
@@ -831,6 +797,9 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       return { status: 200, body: responseBody }
     }
     if (path[0] === 'accessories') {
+      if (path.length < 3) {
+        return { status: 405 } // Method Not Allowed
+      }
       if (path.length === 3 && path[2] === 'settings') {
         const id = path[1]
         if (this.accessoryById[id] == null) {
@@ -838,9 +807,11 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         }
         return this.accessoryById[id].onUiPut(body)
       }
-      return { status: 405 } // Method Not Allowed
     }
     if (path[0] === 'devices') {
+      if (path.length < 3) {
+        return { status: 405 } // Method Not Allowed
+      }
       if (path.length === 3 && path[2] === 'settings') {
         const id = path[1]
         if (this.deviceById[id] == null) {
@@ -852,7 +823,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
         }
         return { status: 200 }
       }
-      return { status: 405 } // Method Not Allowed
     }
     return { status: 403 } // Forbidden
   }
@@ -885,18 +855,13 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
           return
         }
         this.context.fullState.config = config
-        if (
-          this.values.autoExpose.lights || this.nDevicesByRtype.lights > 0 ||
-          this.values.autoExpose.sensors || this.nDevicesByRtype.sensors > 0
-        ) {
-          this.context.fullState.lights = await this.client.get('/lights')
-          this.context.fullState.sensors = await this.client.get('/sensors')
-        }
-        if (this.values.autoExpose.groups || this.nDevicesByRtype.groups > 0) {
+        this.context.fullState.lights = await this.client.get('/lights')
+        this.context.fullState.sensors = await this.client.get('/sensors')
+        if (this.nDevicesByRtype.groups > 0) {
           this.context.fullState.groups = await this.client.get('/groups')
           this.context.fullState.groups[0] = await this.client.get('/groups/0')
         }
-        if (this.values.autoExpose.schedules) {
+        if (this.nDevicesByRtype.schedules) {
           this.context.fullState.schedules = await this.client.get('/schedules')
         }
       }
@@ -1057,11 +1022,9 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       const rids = Object.keys(this.deviceByRidByRtype[rtype]).sort()
       for (const rid of rids) {
         try {
-          const { id } = this.deviceByRidByRtype[rtype][rid]
+          const { id, zigbee } = this.deviceByRidByRtype[rtype][rid]
           if (this.context.settingsById[id] == null) {
-            this.context.settingsById[id] = {
-              expose: this.values.autoExpose[rtype]
-            }
+            this.context.settingsById[id] = { expose: zigbee }
           }
           if (this.context.settingsById[id].expose) {
             if (this.accessoryById[id] == null) {

package/lib/DeconzAccessory/Light.js

@@ -5,11 +5,9 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { ServiceDelegate } = require('homebridge-lib')
 const DeconzAccessory = require('../DeconzAccessory')
 
-const { History } = homebridgeLib.ServiceDelegate
-
 /** Delegate class for a HomeKit accessory, corresponding to a light device
   * or groups resource.
   * @extends DeconzAccessory
@@ -86,7 +84,7 @@ class Light extends DeconzAccessory {
         unit: ' kWh'
       })
     }
-    this.historyService = new History(this, params)
+    this.historyService = new ServiceDelegate.History(this, params)
 
     setImmediate(() => {
       this.debug('initialised')

package/lib/DeconzAccessory/Sensor.js

@@ -5,11 +5,9 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { ServiceDelegate } = require('homebridge-lib')
 const DeconzAccessory = require('../DeconzAccessory')
 
-const { History } = homebridgeLib.ServiceDelegate
-
 class Sensor extends DeconzAccessory {
   constructor (gateway, device) {
     super(gateway, device, gateway.Accessory.Categories.SENSOR)
@@ -30,7 +28,7 @@ class Sensor extends DeconzAccessory {
       case 'Daylight':
       case 'LightLevel':
         // Create dummy motion sensor service.
-        this.motionService = new homebridgeLib.ServiceDelegate(this, {
+        this.motionService = new ServiceDelegate(this, {
           name: this.name + ' Motion',
           Service: this.Services.hap.MotionSensor,
           hidden: true
@@ -56,14 +54,15 @@ class Sensor extends DeconzAccessory {
     if (this.serviceByServiceName.Contact != null) {
       const service = this.serviceByServiceName.Contact
       params.contactDelegate = service.characteristicDelegate('contact')
-      params.lastContactDelegate = this.service.addCharacteristicDelegate({
+      params.lastContactDelegate = service.addCharacteristicDelegate({
         key: 'lastActivation',
         Characteristic: this.Characteristics.eve.LastActivation,
         silent: true
       })
-      params.timesOpenedDelegate = this.service.addCharacteristicDelegate({
+      params.timesOpenedDelegate = service.addCharacteristicDelegate({
         key: 'timesOpened',
         Characteristic: this.Characteristics.eve.TimesOpened,
+        value: 0,
         silent: true
       })
     }
@@ -112,7 +111,7 @@ class Sensor extends DeconzAccessory {
       })
     }
     if (Object.keys(params).length > 0) {
-      this.historyService = new History(this, params)
+      this.historyService = new ServiceDelegate.History(this, params)
     }
 
     setImmediate(() => {

package/lib/DeconzAccessory/Thermostat.js

@@ -5,11 +5,9 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { ServiceDelegate } = require('homebridge-lib')
 const DeconzAccessory = require('../DeconzAccessory')
 
-const { History } = homebridgeLib.ServiceDelegate
-
 class Thermostat extends DeconzAccessory {
   /** Instantiate a delegate for an accessory corresponding to a device.
     * @param {DeconzAccessory.Gateway} gateway - The gateway.
@@ -30,7 +28,7 @@ class Thermostat extends DeconzAccessory {
     }
 
     if (device.resource.body.state.valve !== undefined) {
-      this.historyService = new History(this, {
+      this.historyService = new ServiceDelegate.History(this, {
         temperatureDelegate: this.service.characteristicDelegate('currentTemperature'),
         targetTemperatureDelegate: this.service.characteristicDelegate('targetTemperature'),
         valvePositionDelegate: this.service.characteristicDelegate('valvePosition')

package/lib/DeconzAccessory/WarningDevice.js

@@ -5,11 +5,8 @@
 
 'use strict'
 
-// const homebridgeLib = require('homebridge-lib')
 const DeconzAccessory = require('../DeconzAccessory')
 
-// const { History } = homebridgeLib.ServiceDelegate
-
 /** Delegate class for a HomeKit accessory, corresponding to a light device
   * or groups resource.
   * @extends DeconzAccessory

package/lib/DeconzAccessory/index.js

@@ -5,8 +5,7 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
-const { OptionParser } = homebridgeLib
+const { AccessoryDelegate, OptionParser } = require('homebridge-lib')
 const Deconz = require('../Deconz')
 const DeconzService = require('../DeconzService')
 
@@ -17,7 +16,7 @@ const { SINGLE, DOUBLE, LONG } = DeconzService.Button
   * corresponding to a Zigbee or virtual device on a deCONZ gateway.
   * @extends AccessoryDelegate
   */
-class DeconzAccessory extends homebridgeLib.AccessoryDelegate {
+class DeconzAccessory extends AccessoryDelegate {
   static get Light () { return require('./Light') }
   static get Gateway () { return require('./Gateway') }
   static get Sensor () { return require('./Sensor') }