homebridge-deconz 1.3.0 → 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/lib/Deconz/Resource.js

@@ -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',
@@ -275,12 +273,8 @@ class Gateway extends AccessoryDelegate {
       .on('identify', this.identify)
       .once('heartbeat', async (beat) => {
         this.initialBeat = beat
-        try {
-          await this.createClient()
-        } catch (error) { this.warn(error) }
       })
       .on('heartbeat', this.heartbeat)
-      .on('shutdown', this.shutdown)
   }
 
   get transitionTime () { return this.service.values.transitionTime }
@@ -352,10 +346,6 @@ class Gateway extends AccessoryDelegate {
       this.values.https = config.https
       this.values.software = config.swversion
       this.values.url = 'http' + (config.https ? 's' : '') + '://' + host
-      if (!this.initialised) {
-        this.debug('initialising...')
-        await this.connect()
-      }
     } catch (error) {
       this.error(error)
     }
@@ -419,53 +409,16 @@ class Gateway extends AccessoryDelegate {
     this.client = new ApiClient({
       apiKey: this.values.apiKey,
       config: this.context.config,
-      https: this.values.https,
       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()
   }
 
@@ -1378,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/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'
 
@@ -67,41 +66,9 @@ class DeconzPlatform extends Platform {
         this.config.hosts.push(this.config.host)
       }
       this.discovery = new Discovery({
+        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)
     }
@@ -111,10 +78,10 @@ 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)
-    if (!this.gatewayMap[id].initialised) {
+      await this.gatewayMap[id].found(host, config)
       await once(this.gatewayMap[id], 'initialised')
+    } else {
+      await this.gatewayMap[id].found(host, config)
     }
     this.emit('found')
   }

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.3.0",
+  "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": "~3.0.0",
-    "homebridge-lib": "~7.3.2"
+    "hb-deconz-tools": "~3.0.3",
+    "homebridge-lib": "~8.1.0"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",