homebridge-deconz 1.2.12 → 1.3.1

package/cli/ui.js

@@ -344,58 +344,10 @@ class Main extends CommandLineTool {
     const client = new HttpClient({
       host,
       json: true,
+      logger: this,
       name: host,
       timeout: this.clargs.options.timeout
     })
-    client
-      .on('error', (error) => {
-        if (error.request.id !== this.requestId) {
-          if (error.request.body == null) {
-            this.log(
-              '%s: request %d: %s %s', error.request.name, error.request.id,
-              error.request.method, error.request.resource
-            )
-          } else {
-            this.log(
-              '%s: request %d: %s %s %s', error.request.name, error.request.id,
-              error.request.method, error.request.resource, error.request.body
-            )
-          }
-          this.requestId = error.request.id
-        }
-        this.error('%s: request %d: %s', error.request.name, error.request.id, error)
-      })
-      .on('request', (request) => {
-        if (request.body == null) {
-          this.debug(
-            '%s: request %d: %s %s', request.name, request.id,
-            request.method, request.resource
-          )
-          this.vdebug(
-            '%s: request %d: %s %s', request.name, request.id,
-            request.method, request.url
-          )
-        } else {
-          this.debug(
-            '%s: request %d: %s %s %s', request.name, request.id,
-            request.method, request.resource, request.body
-          )
-          this.vdebug(
-            '%s: request %d: %s %s %s', request.name, request.id,
-            request.method, request.url, request.body
-          )
-        }
-      })
-      .on('response', (response) => {
-        this.vdebug(
-          '%s: request %d: response: %j', response.request.name, response.request.id,
-          response.body
-        )
-        this.debug(
-          '%s: request %d: %d %s', response.request.name, response.request.id,
-          response.statusCode, response.statusMessage
-        )
-      })
     const response = await client.get('/ping')
     if (response.body !== 'pong') {
       throw new Error(`${host}: cannot ping`)

package/config.schema.json

@@ -14,10 +14,6 @@
         "required": true,
         "default": "deCONZ"
       },
-      "forceHttp": {
-        "description": "Use plain http instead of https.",
-        "type": "boolean"
-      },
       "hosts": {
         "title": "Gateways",
         "type": "array",
@@ -94,7 +90,6 @@
       "title": "Advanced Settings",
       "description": "Don't change these, unless you understand what you're doing.",
       "items": [
-        "forceHttp",
         "noResponse",
         "parallelRequests",
         "stealth",

package/homebridge-ui/public/index.html

@@ -82,10 +82,6 @@ Copyright © 2022-2026 Erik Baauw. All rights reserved.
           default: 'deCONZ',
           type: 'string'
         },
-        forceHttp: {
-          description: "Use plain http instead of https.",
-          type: "boolean"
-        },
         noResponse: {
           description: "Report unreachable lights as <i>No Response</i> in HomeKit.",
           type: "boolean"
@@ -147,7 +143,6 @@ Copyright © 2022-2026 Erik Baauw. All rights reserved.
         title: "Advanced Settings",
         description: "Don't change these, unless you understand what you're doing.",
         items: [
-          "forceHttp",
           "parallelRequests",
           "stealth",
           "timeout",

package/homebridge-ui/server.js

@@ -13,7 +13,6 @@ class DeconzUiServer extends UiServer {
     this.onRequest('discover', async (params) => {
       if (this.discovery == null) {
         this.discovery = new Discovery({
-          // forceHttp: this.config.forceHttp,
           // timeout: this.config.timeout
         })
         this.discovery

package/lib/Deconz/Resource.js

@@ -344,7 +344,7 @@ class Resource {
         case 'Battery': return 'Battery'
         case 'CarbonMonoxide': return 'CarbonMonoxide'
         case 'Consumption': return 'Consumption'
-        // case 'DoorLock': return null
+        case 'DoorLock': return 'DoorLock'
         case 'Daylight': return 'Daylight'
         case 'DaylightOffset': return ''
         case 'Fire': return 'Smoke'
@@ -1159,22 +1159,6 @@ class Resource {
         break
       case 'icasa':
         switch (this.model) {
-          case 'ICZB-KPD12':
-          case 'ICZB-KPD14S':
-          case 'ICZB-KPD18S':
-            buttons.push([1, 'Off', SINGLE | LONG])
-            buttons.push([2, 'On', SINGLE | LONG])
-            if (this.model !== 'ICZB-KPD12') {
-              buttons.push([3, 'S1', SINGLE])
-              buttons.push([4, 'S2', SINGLE])
-              if (this.model === 'ICZB-KPD18S') {
-                buttons.push([5, 'S3', SINGLE])
-                buttons.push([6, 'S4', SINGLE])
-                buttons.push([7, 'S5', SINGLE])
-                buttons.push([8, 'S6', SINGLE])
-              }
-            }
-            break
           case 'ICZB-RM11S':
             buttons.push([1, '1 Off', SINGLE | LONG])
             buttons.push([2, '1 On', SINGLE | LONG])

package/lib/DeconzAccessory/Gateway.js

@@ -21,8 +21,6 @@ import { DeconzService } from '../DeconzService/index.js'
 import '../DeconzService/Button.js'
 import '../DeconzService/Gateway.js'
 
-const { HttpError } = ApiClient
-
 const migration = {
   name: 'homebridge-deconz',
   description: 'migration',
@@ -78,12 +76,6 @@ class Gateway extends AccessoryDelegate {
     if (this.context.settingsById == null) {
       this.context.settingsById = {}
     }
-    // if (this.context.fullState != null) {
-    //   this.analyseFullState(this.context.fullState, {
-    //     analyseOnly: true,
-    //     logUnsupported: true
-    //   })
-    // }
 
     this.addPropertyDelegate({
       key: 'apiKey',
@@ -127,6 +119,11 @@ class Gateway extends AccessoryDelegate {
       this.pollNext = true
     })
 
+    this.addPropertyDelegate({
+      key: 'fingerprint',
+      silent: true
+    })
+
     this.addPropertyDelegate({
       key: 'heartrate',
       value: 30,
@@ -137,16 +134,15 @@ class Gateway extends AccessoryDelegate {
       key: 'host',
       value: params.host,
       silent: true
-    }).on('didSet', (value) => {
-      if (this.client != null) {
-        this.client.host = value
-      }
-      if (this.wsClient != null) {
-        this.wsClient.host = this.values.host.split(':')[0] +
-          ':' + this.values.wsPort
-      }
     })
 
+    this.addPropertyDelegate({
+      key: 'https',
+      value: params.config.https,
+      silent: true
+    })
+    this.values.https = params.config.https
+
     this.addPropertyDelegate({
       key: 'periodicEvents',
       value: false,
@@ -196,16 +192,32 @@ class Gateway extends AccessoryDelegate {
       }
     })
 
+    this.addPropertyDelegate({
+      key: 'url',
+      silent: true
+    }).on('didSet', async (value) => {
+      if (value != null) {
+        this.log('gateway %s at %s', this.id, value)
+        try {
+          await this.createClient()
+          this.values.wsPort = null
+        } catch (error) { this.warn(error) }
+      }
+    })
+    this.values.url = null
+
     this.addPropertyDelegate({
       key: 'wsPort',
-      value: 443,
+      value: null,
       silent: true
-    }).on('didSet', (value) => {
-      if (this.wsClient != null) {
-        this.wsClient.host = this.values.host.split(':')[0] +
-          ':' + this.values.wsPort
+    }).on('didSet', async (value) => {
+      if (value != null) {
+        try {
+          await this.createWsClient()
+        } catch (error) { this.warn(error) }
       }
     })
+    this.values.wsPort = null
 
     this.log(
       '%s %s gateway v%s', this.values.manufacturer, this.values.model,
@@ -256,14 +268,13 @@ class Gateway extends AccessoryDelegate {
       */
     this.scheduleServicesByRid = {}
 
-    this.createClient()
-    this.createWsClient()
     this.heartbeatEnabled = true
     this
       .on('identify', this.identify)
-      .once('heartbeat', (beat) => { this.initialBeat = beat })
+      .once('heartbeat', async (beat) => {
+        this.initialBeat = beat
+      })
       .on('heartbeat', this.heartbeat)
-      .on('shutdown', this.shutdown)
   }
 
   get transitionTime () { return this.service.values.transitionTime }
@@ -330,13 +341,11 @@ class Gateway extends AccessoryDelegate {
     */
   async found (host, config) {
     try {
-      this.values.host = host
       this.context.config = config
+      this.values.host = host
+      this.values.https = config.https
       this.values.software = config.swversion
-      if (!this.initialised) {
-        this.debug('initialising...')
-        await this.connect()
-      }
+      this.values.url = 'http' + (config.https ? 's' : '') + '://' + host
     } catch (error) {
       this.error(error)
     }
@@ -344,7 +353,7 @@ class Gateway extends AccessoryDelegate {
 
   async shutdown () {
     this.service.values.statusActive = false
-    return this.wsClient.close()
+    return this.wsClient?.close()
   }
 
   /** Called every second.
@@ -372,7 +381,9 @@ class Gateway extends AccessoryDelegate {
     this.values.firmware = parseInt(config.fwversion.slice(6, 8)) + '.' +
       parseInt(config.fwversion.slice(2, 4), 16) + '.' +
       parseInt(config.fwversion.slice(4, 6), 16)
-    this.values.wsPort = config.websocketport
+    this.values.wsPort = this.values.https
+      ? config.websocketport_wss ?? config.websocketport
+      : config.websocketport
     this.service.update(config)
     if (this.checkApiKeys) {
       const myEntry = config.whitelist[this.values.apiKey]
@@ -390,70 +401,47 @@ class Gateway extends AccessoryDelegate {
 
   /** Create {@link DeconzAccessory.Gateway#client}.
     */
-  createClient () {
+  async createClient () {
+    this.client?.removeAllListeners()
     /** REST API client for the gateway.
       * @type {DeconzClient}
       */
     this.client = new ApiClient({
       apiKey: this.values.apiKey,
       config: this.context.config,
+      fingerprint: this.values.fingerprint,
       host: this.values.host,
+      https: this.values.https,
+      logger: this,
       maxSockets: this.platform.config.parallelRequests,
       timeout: this.platform.config.timeout,
       waitTimePut: this.platform.config.waitTimePut,
       waitTimePutGroup: this.platform.config.waitTimePutGroup,
       waitTimeResend: this.platform.config.waitTimeResend
     })
-    this.client
-      .on('error', (error) => {
-        if (error instanceof HttpError) {
-          if (error.request.id !== this.requestId) {
-            this.log(
-              'request %d: %s %s%s', error.request.id,
-              error.request.method, error.request.resource,
-              error.request.body == null ? '' : ' ' + error.request.body
-            )
-            this.requestId = error.request.id
-          }
-          this.warn('request %s: %s', error.request.id, error)
-          return
-        }
-        this.warn(error)
-      })
-      .on('request', (request) => {
-        this.debug(
-          'request %d: %s %s%s', request.id,
-          request.method, request.resource,
-          request.body == null ? '' : ' ' + request.body
-        )
-        this.vdebug(
-          'request %s: %s %s%s', request.id,
-          request.method, request.url,
-          request.body == null ? '' : ' ' + request.body
-        )
-      })
-      .on('response', (response) => {
-        this.vdebug(
-          'request %d: response: %j', response.request.id,
-          response.body
-        )
-        this.debug(
-          'request %s: %d %s', response.request.id,
-          response.statusCode, response.statusMessage
-        )
-      })
+    return this.connect()
   }
 
   /** Create {@link DeconzAccessory.Gateway#wsclient}.
     */
-  createWsClient () {
+  async createWsClient () {
+    this.wsRestart = true
+    await this.wsClient?.close()
+    this.wsClient?.removeAllListeners()
+    const wss = this.values.https && this.context.fullState?.config.websocketport_wss != null
+    const port = wss
+      ? this.context.fullState?.config.websocketport_wss
+      : this.context.fullState?.config.websocketport
+    const options = {
+      wss,
+      fingerprint: this.values.fingerprint,
+      host: this.values.host.split(':')[0] + ':' + port,
+      retryTime: 0
+    }
     /** Client for gateway web socket notifications.
       * @type {DeconzWsClient}
       */
-    this.wsClient = new WsClient({
-      host: this.values.host.split(':')[0] + ':' + this.values.wsPort,
-      retryTime: 15
-    })
+    this.wsClient = new WsClient(options)
     this.wsClient
       .on('error', (error) => {
         this.warn('websocket communication error: %s', error)
@@ -490,14 +478,13 @@ class Gateway extends AccessoryDelegate {
         this.pollFullState = true
       })
       .on('closed', (url, retryTime) => {
-        if (retryTime > 0) {
-          this.log(
-            'websocket connection to %s closed - retry in %ds', url, retryTime
-          )
-        } else {
-          this.log('websocket connection to %s closed', url)
+        this.log('websocket connection to %s closed', url)
+        if (!this.wsRestart) {
+          this.values.wsPort = null
         }
       })
+    this.wsClient.listen()
+    this.wsRestart = false
   }
 
   /** Connect to the gateway.
@@ -515,8 +502,8 @@ class Gateway extends AccessoryDelegate {
       if (this.values.apiKey == null) {
         this.values.apiKey =
           await this.client.getApiKey('homebridge-deconz')
+        this.values.fingerprint = this.client.fingerprint
       }
-      this.wsClient.listen()
       this.service.values.restart = false
       this.service.values.statusActive = true
       this.checkApiKeys = true
@@ -989,6 +976,9 @@ class Gateway extends AccessoryDelegate {
       this.vdebug('%spolling...', this.pollNext ? 'priority ' : '')
       if (this.context.fullState == null || this.pollFullState) {
         const fullState = await this.client.get('/')
+        if (this.values.https && (this.values.fingerprint == null || this.values.fingerprint === '')) {
+          this.values.fingerprint = this.client.fingerprint
+        }
         try {
           fullState.groups[0] = await this.client.get('/groups/0')
         } catch (error) {}
@@ -1025,6 +1015,9 @@ class Gateway extends AccessoryDelegate {
           this.warn('deCONZ not ready')
           return
         }
+        if (this.values.https && (this.values.fingerprint == null || this.values.fingerprint === '')) {
+          this.values.fingerprint = this.client.fingerprint
+        }
         this.context.fullState.config = config
         this.context.fullState.lights = await this.client.get('/lights')
         this.context.fullState.sensors = await this.client.get('/sensors')
@@ -1338,25 +1331,26 @@ class Gateway extends AccessoryDelegate {
     const resource = new Deconz.Resource(this, rtype, rid, body)
     const { id, serviceName } = resource
     // FIX_ME: check introspect against whitelist
-    if (logUnsupported && resource.body.type === 'ZHASwitch') {
+    if (resource.body.type === 'ZHASwitch') {
       if (!resource.capabilities._introspect) {
-        this.warn(
+        warn(
           '%s: /sensors/%d: %s by %s: no introspect',
           id, rid, resource.model, resource.manufacturer
         )
       }
-    } else if (resource.capabilities._buttons != null) {
+    }
+    if (resource.capabilities._buttons != null) {
       if (
         JSON.stringify(resource.capabilities._buttons) !==
           JSON.stringify(resource.capabilities.buttons) ||
         resource.capabilities._namespace !== resource.capabilities.namespace
       ) {
-        this.debug(
+        debug(
           '%s: /sensors/%d: %s by %s: whitelist vs introspect mismatch: %j',
           id, rid, resource.model, resource.manufacturer, resource.capabilities
         )
       } else {
-        this.warn(
+        warn(
           '%s: /sensors/%d: %s by %s: whitelist matches introspect',
           id, rid, resource.model, resource.manufacturer
         )

package/lib/DeconzAccessory/index.js

@@ -158,11 +158,25 @@ class DeconzAccessory extends AccessoryDelegate {
     } else if (params.serviceName === 'Battery') {
       service = this.servicesByServiceName.Battery?.[0]
     } else if (params.serviceName === 'Consumption') {
+      if (this.servicesByServiceName.Consumption?.[0] != null) {
+        this.warn(
+          '%s: ignoring additional ZHAConsumption resource - consider splitting the accessory',
+          resource.rpath
+        )
+        return
+      }
       service = this.servicesByServiceName.Power?.[0]
       if (service != null) {
         service.addResource(resource)
       }
     } else if (params.serviceName === 'Power') {
+      if (this.servicesByServiceName.Power?.[0] != null) {
+        this.warn(
+          '%s: ignoring additional ZHAPower resource - consider splitting the accessory',
+          resource.rpath
+        )
+        return
+      }
       service = this.servicesByServiceName.Consumption?.[0]
       if (service != null) {
         service.addResource(resource)

package/lib/DeconzPlatform.js

@@ -6,7 +6,6 @@
 import { once } from 'node:events'
 
 import { timeout } from 'homebridge-lib'
-import { HttpClient } from 'homebridge-lib/HttpClient'
 import { OptionParser } from 'homebridge-lib/OptionParser'
 import { Platform } from 'homebridge-lib/Platform'
 
@@ -29,7 +28,6 @@ class DeconzPlatform extends Platform {
 
   parseConfigJson (configJson) {
     this.config = {
-      forceHttp: false,
       hosts: [],
       noResponse: false,
       parallelRequests: 10,
@@ -48,7 +46,6 @@ class DeconzPlatform extends Platform {
       })
       .stringKey('name')
       .stringKey('platform')
-      .boolKey('forceHttp')
       .stringKey('host')
       .arrayKey('hosts')
       .boolKey('noResponse')
@@ -69,42 +66,9 @@ class DeconzPlatform extends Platform {
         this.config.hosts.push(this.config.host)
       }
       this.discovery = new Discovery({
-        forceHttp: this.config.forceHttp,
+        logger: this,
         timeout: this.config.timeout
       })
-      this.discovery
-        .on('error', (error) => {
-          if (error instanceof 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(
-            '%s: request %d: %s %s', request.name,
-            request.id, request.method, request.resource
-          )
-        })
-        .on('response', (response) => {
-          this.debug(
-            '%s: request %d: %d %s', response.request.name,
-            response.request.id, response.statusCode, response.statusMessage
-          )
-        })
-        .on('found', (name, id, address) => {
-          this.debug('%s: found %s at %s', name, id, address)
-        })
-        .on('searching', (host) => {
-          this.debug('upnp: listening on %s', host)
-        })
-        .on('searchDone', () => { this.debug('upnp: search done') })
     } catch (error) {
       this.error(error)
     }
@@ -114,9 +78,11 @@ class DeconzPlatform extends Platform {
     const id = config.bridgeid
     if (this.gatewayMap[id] == null) {
       this.gatewayMap[id] = new DeconzAccessory.Gateway(this, { config, host })
+      await this.gatewayMap[id].found(host, config)
+      await once(this.gatewayMap[id], 'initialised')
+    } else {
+      await this.gatewayMap[id].found(host, config)
     }
-    await this.gatewayMap[id].found(host, config)
-    await once(this.gatewayMap[id], 'initialised')
     this.emit('found')
   }
 
@@ -224,7 +190,9 @@ class DeconzPlatform extends Platform {
         const configs = await this.discovery.discover()
         const jobs = []
         for (const host in configs) {
-          jobs.push(this.foundGateway(host, configs[host]))
+          if (this.config.hosts.length === 0 || this.gatewayMap[configs[host].bridgeid] != null) {
+            jobs.push(this.foundGateway(host, configs[host]))
+          }
         }
         for (const job of jobs) {
           try {

package/lib/DeconzService/Contact.js

@@ -19,7 +19,7 @@ class Contact extends DeconzService.SensorsResource {
       Characteristic: this.Characteristics.hap.ContactSensorState
     })
 
-    // With _Status Tapered_ Eve thinks the _Door Sensor_ is an Eve Windows Guard
+    // With _Status Tampered_ Eve thinks the _Door Sensor_ is an Eve Windows Guard
     // (instead of an Eve Door & Window) and won't display it.
     this.addCharacteristicDelegates({ noTampered: true })
 

package/lib/DeconzService/DoorLock.js

@@ -0,0 +1,56 @@
+// homebridge-deconz/lib/DeconzService/DoorLock.js
+// Copyright © 2022-2026 Erik Baauw. All rights reserved.
+//
+// Homebridge plugin for deCONZ.
+
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
+
+/**
+  * @memberof DeconzService
+  */
+class DoorLock extends DeconzService.SensorsResource {
+  constructor (accessory, resource, params = {}) {
+    params.Service = accessory.Services.hap.LockMechanism
+    super(accessory, resource, params)
+
+    this.addCharacteristicDelegate({
+      key: 'currentState',
+      Characteristic: this.Characteristics.hap.LockCurrentState
+    })
+    this.addCharacteristicDelegate({
+      key: 'targetState',
+      Characteristic: this.Characteristics.hap.LockTargetState
+    }).on('didSet', async (value, fromHomeKit) => {
+      if (fromHomeKit) {
+        await this.put('/config', {
+          lock: value === this.Characteristics.hap.LockTargetState.SECURED
+        })
+        this.locking = new Date()
+      }
+    })
+    this.addCharacteristicDelegates()
+
+    this.update(resource.body, resource.rpath)
+  }
+
+  updateState (state) {
+    if (state.lockstate != null) {
+      this.values.currentState = state.lockestate === 'locked'
+        ? this.Characteristics.hap.LockCurrentState.SECURED
+        : this.Characteristics.hap.LockCurrentState.UNSECURED
+    }
+    super.updateState(state)
+  }
+
+  updateConfig (config) {
+    if (config.lock != null && new Date() - this.locking >= 5000) {
+      this.values.targetLockState = config.lock
+        ? this.Characteristics.hap.LockTargetState.SECURED
+        : this.Characteristics.hap.LockTargetState.UNSECURED
+    }
+    super.updateConfig(config)
+  }
+}
+
+DeconzService.DoorLock = DoorLock

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.2.12",
+  "version": "1.3.1",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -27,12 +27,12 @@
   },
   "engines": {
     "deCONZ": "2.32.5",
-    "homebridge": "^1.11.2||^2.0.0-beta",
-    "node": "^24||^22||^20"
+    "homebridge": "^2.0.1",
+    "node": "^24||^22"
   },
   "dependencies": {
-    "hb-deconz-tools": "~2.0.22",
-    "homebridge-lib": "~7.3.1"
+    "hb-deconz-tools": "~3.0.3",
+    "homebridge-lib": "~8.1.0"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",