homebridge-deconz 1.0.18 → 1.0.21

package/lib/DeconzAccessory/Gateway.js

@@ -163,7 +163,6 @@ class Gateway extends AccessoryDelegate {
           await this.client.restart()
           this.values.search = false
           this.values.unlock = false
-          return
         } catch (error) { this.warn(error) }
       }
     })
@@ -179,7 +178,6 @@ class Gateway extends AccessoryDelegate {
           await this.client.search()
           await timeout(120000)
           this.values.search = false
-          return
         } catch (error) { this.warn(error) }
       }
     })
@@ -194,7 +192,6 @@ class Gateway extends AccessoryDelegate {
           await this.client.unlock()
           await timeout(60000)
           this.values.unlock = false
-          return
         } catch (error) { this.warn(error) }
       }
     })

package/lib/DeconzService/Alarm.js

@@ -25,8 +25,22 @@ class Alarm extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    if (state.alarm != null || state.test != null) {
-      this.values.alarm = state.alarm || state.test
+    if (state.test) {
+      if (this.testTimout) {
+        clearTimeout(this.testTimeout)
+      }
+      this.test = true
+      this.testTimout = setTimeout(() => {
+        delete this.testTimeout
+        this.test = false
+      }, 5000)
+    }
+    if (state.alarm) {
+      this.values.alarm = true
+    } else if (this.test) {
+      this.values.alarm = true
+    } else {
+      this.values.alarm = false
     }
     super.updateState(state)
   }

package/lib/DeconzService/CarbonMonoxide.js

@@ -25,10 +25,22 @@ class CarbonMonoxide extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    if (state.carbonmonoxide != null || state.test != null) {
-      this.values.carbonmonoxide = state.carbonmonoxide || state.test
-        ? this.Characteristics.hap.CarbonMonoxideDetected.CO_LEVELS_ABNORMAL
-        : this.Characteristics.hap.CarbonMonoxideDetected.CO_LEVELS_NORMAL
+    if (state.test) {
+      if (this.testTimout) {
+        clearTimeout(this.testTimeout)
+      }
+      this.test = true
+      this.testTimout = setTimeout(() => {
+        delete this.testTimeout
+        this.test = false
+      }, 5000)
+    }
+    if (state.carbonmonoxide) {
+      this.values.carbonmonoxide = this.Characteristics.hap.CarbonMonoxideDetected.CO_LEVELS_ABNORMAL
+    } else if (this.test) {
+      this.values.carbonmonoxide = this.Characteristics.hap.CarbonMonoxideDetected.CO_LEVELS_ABNORMAL
+    } else {
+      this.values.carbonmonoxide = this.Characteristics.hap.CarbonMonoxideDetected.CO_LEVELS_NORMAL
     }
     super.updateState(state)
   }

package/lib/DeconzService/Leak.js

@@ -25,10 +25,22 @@ class Leak extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    if (state.water != null || state.test != null) {
-      this.values.leak = state.water || state.test
-        ? this.Characteristics.hap.LeakDetected.LEAK_DETECTED
-        : this.Characteristics.hap.LeakDetected.LEAK_NOT_DETECTED
+    if (state.test) {
+      if (this.testTimout) {
+        clearTimeout(this.testTimeout)
+      }
+      this.test = true
+      this.testTimout = setTimeout(() => {
+        delete this.testTimeout
+        this.test = false
+      }, 5000)
+    }
+    if (state.water) {
+      this.values.leak = this.Characteristics.hap.LeakDetected.LEAK_DETECTED
+    } else if (this.test) {
+      this.values.leak = this.Characteristics.hap.LeakDetected.LEAK_DETECTED
+    } else {
+      this.values.leak = this.Characteristics.hap.LeakDetected.LEAK_NOT_DETECTED
     }
     super.updateState(state)
   }

package/lib/DeconzService/Light.js

@@ -327,6 +327,7 @@ class Light extends DeconzService.LightsResource {
       value: 'none',
       silent: true
     })
+    effectString.setMaxListeners(20)
     for (const id in this.resource.body.capabilities.color.effects) {
       const effect = this.resource.body.capabilities.color.effects[id]
       const characteristicName = effect[0].toUpperCase() + effect.slice(1) + 'Effect'

package/lib/DeconzService/SensorsResource.js

@@ -98,7 +98,7 @@ class SensorsResource extends DeconzService {
     return this._putConfig()
   }
 
-  // Send the request (for the combined state changes) to the gateway.
+  // Send the request (for the combined config changes) to the gateway.
   async _putConfig () {
     try {
       if (this.platform.config.waitTimeUpdate > 0) {

package/lib/DeconzService/Smoke.js

@@ -30,19 +30,27 @@ class Smoke extends DeconzService.SensorsResource {
   }
 
   updateState (state) {
-    if (state.fire != null || state.test != null) {
-      this.values.smoke = state.fire
-        ? this.Characteristics.hap.SmokeDetected.SMOKE_DETECTED
-        : this.Characteristics.hap.SmokeDetected.SMOKE_NOT_DETECTED
-      let status = 0
-      if (state.fire) {
-        status |= this.Characteristics.eve.ElgatoDeviceStatus.SMOKE_DETECTED
+    if (state.test) {
+      if (this.testTimout) {
+        clearTimeout(this.testTimeout)
       }
-      if (state.test) {
-        status |= this.Characteristics.eve.ElgatoDeviceStatus.ALARM_TEST_ACTIVE
-      }
-      this.values.deviceStatus = status
+      this.test = true
+      this.testTimout = setTimeout(() => {
+        delete this.testTimeout
+        this.test = false
+      }, 5000)
+    }
+    let status = 0
+    if (state.fire) {
+      this.values.smoke = this.Characteristics.hap.SmokeDetected.SMOKE_DETECTED
+      status |= this.Characteristics.eve.ElgatoDeviceStatus.SMOKE_DETECTED
+    } else if (this.test) {
+      this.values.smoke = this.Characteristics.hap.SmokeDetected.SMOKE_DETECTED
+      status |= this.Characteristics.eve.ElgatoDeviceStatus.ALARM_TEST_ACTIVE
+    } else {
+      this.values.smoke = this.Characteristics.hap.SmokeDetected.SMOKE_NOT_DETECTED
     }
+    this.values.deviceStatus = status
     super.updateState(state)
   }
 }

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -28,11 +28,11 @@
   "engines": {
     "deCONZ": "2.28.1",
     "homebridge": "^1.8.4||^2.0.0-beta",
-    "node": "^20||^18"
+    "node": "^22||^20||^18"
   },
   "dependencies": {
-    "hb-deconz-tools": "~2.0.3",
-    "homebridge-lib": "~7.0.8"
+    "hb-deconz-tools": "~2.0.4",
+    "homebridge-lib": "~7.0.9"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",