homebridge-deconz 0.1.13 → 0.1.14

package/lib/DeconzAccessory/Gateway.js

@@ -594,7 +594,7 @@ class Gateway extends AccessoryDelegate {
       const device = this.deviceById[id]
       delete this.exposeErrorById[id]
       const { body } = device.resource
-      this.debug('%s: add accessory', body.name)
+      this.log('%s: add accessory', body.name)
       let { serviceName } = device.resource
       if (DeconzAccessory[serviceName] == null) {
         // this.warn('%s: %s: not yet supported %s type', body.name, body.type, rtype)
@@ -622,7 +622,10 @@ class Gateway extends AccessoryDelegate {
     }
     if (this.accessoryById[id] != null) {
       this.monitorResources(this.accessoryById[id], false)
-      this.log('%s: delete accessory', this.accessoryById[id].name)
+      this.log(
+        '%s: delete accessory%s', this.accessoryById[id].name,
+        delegateOnly ? ' delegate' : ''
+      )
       this.accessoryById[id].destroy(delegateOnly)
       delete this.accessoryById[id]
       if (this.exposeErrorById[id] != null) {

package/lib/DeconzAccessory/index.js

@@ -71,14 +71,29 @@ class DeconzAccessory extends AccessoryDelegate {
 
     this
       .on('polled', (device) => {
+        let reExpose = false
         this.values.firmware = device.resource.firmware
-        for (const subtype in this.serviceBySubtype) {
-          try {
-            const service = this.serviceBySubtype[subtype]
-            const resource = device.resourceBySubtype[subtype]
-            this.debug('%s: polled: %j', resource.rpath, resource.body)
+        for (const subtype in device.resourceBySubtype) {
+          const resource = device.resourceBySubtype[subtype]
+          this.debug('%s: polled: %j', resource.rpath, resource.body)
+          const service = this.serviceBySubtype[subtype]
+          if (service == null) {
+            this.log('%s: new resource: %j', resource.rpath, resource.body)
+            reExpose = true
+          } else {
             service.update(resource.body, resource.rpath)
-          } catch (error) { this.error(error) }
+          }
+        }
+        for (const subtype in this.serviceBySubtype) {
+          const service = this.serviceBySubtype[subtype]
+          const resource = device.resourceBySubtype[subtype]
+          if (resource == null) {
+            this.log('%s: resource deleted', service.rpath)
+            reExpose = true
+          }
+        }
+        if (reExpose) {
+          this.gateway.reExposeAccessory(this.id)
         }
       })
       .on('changed', (rpath, body) => {

package/lib/DeconzService/Label.js

@@ -59,6 +59,11 @@ class Label extends DeconzService.SensorsResource {
 
   updateState (state, rpath) {
     const buttonResource = this.buttonResources[rpath]
+    if (buttonResource == null) {
+      this.log('%s: resource deleted', rpath)
+      this.gateway.reExposeAccessory(this.accessory.id)
+      return
+    }
     if (buttonResource.lastUpdated === '') {
       buttonResource.lastUpdated = state.lastupdated
     } else if (

package/lib/DeconzService/index.js

@@ -55,6 +55,7 @@ class DeconzService extends ServiceDelegate {
     })
     this.id = resource.id
     this.gateway = accessory.gateway
+    this.accessory = accessory
     this.client = accessory.client
     this.resource = resource
     this.rtype = resource.rtype

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -22,11 +22,11 @@
   },
   "engines": {
     "deCONZ": "2.21.2",
-    "homebridge": "^1.6.0",
+    "homebridge": "^1.6.1",
     "node": "^18.16.0"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.14",
+    "homebridge-lib": "~6.3.15",
     "ws": "^8.13.0",
     "xml2js": "~0.5.0"
   },