homebridge-deconz 0.0.23 → 0.0.26

package/cli/deconz.js

@@ -711,12 +711,15 @@ class Main extends homebridgeLib.CommandLineTool {
       .on('changed', (rtype, rid, body) => {
         let resource = '/' + rtype + '/' + rid
         if (Object.keys(body).length === 1) {
-          if (body.state != null) {
-            resource += '/state'
-            body = body.state
+          if (body.capabilities != null) {
+            resource += '/capabilities'
+            body = body.capabilities
           } else if (body.config != null) {
             resource += '/config'
             body = body.config
+          } else if (body.state != null) {
+            resource += '/state'
+            body = body.state
           }
         }
         this.log('%s: %s', resource, this.jsonFormatter.stringify(body))

package/lib/Deconz/ApiClient.js

@@ -152,7 +152,7 @@ class ApiClient extends homebridgeLib.HttpClient {
     }
     if (_options.phoscon) {
       // options.headers = { Accept: 'application/vnd.ddel.v1' }
-      options.headers = { Accept: 'application/vnd.ddel.v1.1,vnd.ddel.v1.1' }
+      options.headers = { Accept: 'application/vnd.ddel.v3,application/vnd.ddel.v2,application/vnd.ddel.v1.1' }
     }
     if (_options.apiKey) {
       options.path += '/' + _options.apiKey

package/lib/Deconz/Resource.js

@@ -446,6 +446,13 @@ class Resource {
           this.capabilities.bri = false
         }
         break
+      case 'LEDVANCE':
+        this.capabilities.gamut = {
+          r: [0.6972, 0.3027],
+          g: [0.1737, 0.6991],
+          b: [0.1227, 0.0959]
+        }
+        break
       case 'LIDL Livarno Lux':
         this.capabilities.ctMax = 454 // 2200 K
         this.capabilities.ctMin = 153 // 6500 K
@@ -474,9 +481,9 @@ class Resource {
         break
       case 'OSRAM':
         this.capabilities.gamut = {
-          r: [0.6877, 0.3161],
-          g: [0.1807, 0.7282],
-          b: [0.1246, 0.0580]
+          r: [0.6850, 0.3149],
+          g: [0.1780, 0.7253],
+          b: [0.1241, 0.0578]
         }
         break
       case 'Philips':
@@ -642,7 +649,7 @@ class Resource {
             }
             break
           case 'TRADFRI SHORTCUT Button':
-            buttons.push([1, 'Button', SINGLE | LONG])
+            buttons.push([1, 'Button', SINGLE | DOUBLE | LONG])
             break
           case 'TRADFRI on/off switch':
             buttons.push([1, 'On', SINGLE | LONG])
@@ -1036,6 +1043,19 @@ class Resource {
             break
         }
         break
+      case '_TZ3000_wkai4ga5':
+        switch (this.model) {
+          case 'TS0044':
+            dots = true
+            buttons.push([1, 'Top Left', SINGLE | DOUBLE | LONG])
+            buttons.push([2, 'Top Right', SINGLE | DOUBLE | LONG])
+            buttons.push([3, 'Bottom Left', SINGLE | DOUBLE | LONG])
+            buttons.push([4, 'Bottom Right', SINGLE | DOUBLE | LONG])
+            break
+          default:
+            break
+        }
+        break
       case '_TZ3000_xabckq1v':
         switch (this.model) {
           case 'TS004F': // Tuya 4-button switch, single press only

package/lib/Deconz/WsClient.js

@@ -60,7 +60,7 @@ class WsClient extends events.EventEmitter {
   listen () {
     this.reconnect = true
     const url = 'ws://' + this.config.hostname + ':' + this.config.port
-    this.ws = new WebSocket(url)
+    this.ws = new WebSocket(url, { family: 4 })
 
     this.ws
       .on('error', (error) => {
@@ -91,12 +91,14 @@ class WsClient extends events.EventEmitter {
                 case 'changed':
                   if (obj.r !== null && obj.id !== null) {
                     let body
-                    if (obj.state != null) {
-                      body = { state: obj.state }
+                    if (obj.attr != null) {
+                      body = obj.attr
+                    } else if (obj.capabilities != null) {
+                      body = { capabilities: obj.capabilities }
                     } else if (obj.config != null) {
                       body = { config: obj.config }
-                    } else if (obj.attr != null) {
-                      body = obj.attr
+                    } else if (obj.state != null) {
+                      body = { state: obj.state }
                     }
                     /** Emitted when a `changed` notification has been received.
                       *

package/lib/DeconzService/Light.js

@@ -210,6 +210,7 @@ class Light extends DeconzService.LightsResource {
           return this.adaptiveLighting.generateControl()
         },
         setter: async (value) => {
+          this.initAdaptiveLighting()
           const control = this.adaptiveLighting.parseControl(value)
           this.context.transitionControl = value
           const response = this.adaptiveLighting.generateControlResponse()

package/package.json

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