homebridge-deconz 0.0.14 → 0.0.15

package/lib/DeconzAccessory/Gateway.js

@@ -157,7 +157,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     this.heartbeatEnabled = true
     this
       .on('identify', this.identify)
-      .once('heartbeat', this.init)
+      .once('heartbeat', (beat) => { this.initialBeat = beat })
       .on('heartbeat', this.heartbeat)
       .on('shutdown', this.shutdown)
   }
@@ -182,6 +182,12 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.values.manufacturer, this.values.model, this.values.software,
       this.nAccessories, this.nDevices, this.nResourcesMonitored
     )
+    if (this.context.migration != null) {
+      this.log(
+        'migration: %s: %d resources',
+        this.context.migration, this.nResourcesMonitored
+      )
+    }
     if (this.logLevel > 2) {
       this.vdebug(
         '%d gateway resouces: %j', this.nResources,
@@ -210,28 +216,24 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
   }
 
-  /** Initialise the gateway delegate.
-    */
-  async init (beat) {
-    try {
-      this.debug('initialising...')
-      this.initialBeat = beat
-      await this.connect()
-      this.initialised = true
-      this.debug('initialised')
-      this.emit('initialised')
-    } catch (error) { this.error(error) }
-  }
-
   /** Update properties from gateway announcement.
     * @param {string} host - The gateway hostname or IP address and port.
     * @param {Object} config - The response body of an unauthenticated
     * GET `/config` (from {@link DeconzDiscovery#config config()}.
     */
-  found (host, config) {
-    this.values.host = host
-    this.context.config = config
-    this.values.software = config.swversion
+  async found (host, config) {
+    try {
+      this.context.host = host
+      this.values.host = host
+      this.context.config = config
+      this.values.software = config.swversion
+      if (!this.initialised) {
+        this.debug('initialising...')
+        await this.connect()
+      }
+    } catch (error) {
+      this.error(error)
+    }
   }
 
   async shutdown () {
@@ -412,8 +414,8 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       for (const id in this.exposeErrorById) {
         this.resetExposeError(id)
       }
-      this.context.fullState = null
       this.pollNext = true
+      this.pollFullState = true
     } catch (error) {
       if (
         error instanceof Deconz.ApiError && error.type === 101 && retry < 8
@@ -678,9 +680,11 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     try {
       this.polling = true
       this.vdebug('%spolling...', this.pollNext ? 'priority ' : '')
-      if (this.context.fullState == null) {
-        this.context.fullState = await this.client.get('/')
-        this.context.fullState.groups[0] = await this.client.get('/groups/0')
+      if (this.context.fullState == null || this.pollFullState) {
+        const fullState = await this.client.get('/')
+        fullState.groups[0] = await this.client.get('/groups/0')
+        this.context.fullState = fullState
+        this.pollFullState = false
       } else {
         const config = await this.client.get('/config')
         if (config.bridgeid === this.id && config.UTC == null) {
@@ -712,6 +716,11 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.vdebug('polling done')
       this.pollNext = false
       this.polling = false
+      if (!this.initialised) {
+        this.initialised = true
+        this.debug('initialised')
+        this.emit('initialised')
+      }
     }
   }
 
@@ -896,6 +905,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
 
     this.nAccessories = Object.keys(this.accessoryById).length
+    this.nResourcesMonitored = Object.keys(this.accessoryByRpath).length
     this.nExposeErrors = Object.keys(this.exposeErrorById).length
     if (this.nExposeErrors === 0) {
       this.vdebug('%d accessories', this.nAccessories)
@@ -906,8 +916,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
 
     if (changed) {
-      this.nResourcesMonitored = Object.keys(this.accessoryByRpath).length
-      this.identify()
       if (this.context.migration == null) {
         const response = await this.client.post('/resourcelinks', {
           name: 'homebridge-deconz',
@@ -921,10 +929,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
           links: Object.keys(this.accessoryByRpath).sort()
         })
       }
-      this.log(
-        'migration: %s: %d resources',
-        this.context.migration, this.nResourcesMonitored
-      )
+      this.identify()
     }
   }
 

package/lib/DeconzPlatform.js

@@ -110,7 +110,8 @@ class DeconzPlatform extends homebridgeLib.Platform {
         host: host
       })
     }
-    this.gatewayMap[id].found(host, config)
+    await this.gatewayMap[id].found(host, config)
+    await events.once(this.gatewayMap[id], 'initialised')
     this.emit('found')
   }
 
@@ -128,17 +129,25 @@ class DeconzPlatform extends homebridgeLib.Platform {
   async init () {
     try {
       const jobs = []
-      this.debug('job %d: find at least one gateway', jobs.length)
-      jobs.push(events.once(this, 'found'))
       if (this.config.hosts.length > 0) {
         for (const host of this.config.hosts) {
           this.debug('job %d: find gateway at %s', jobs.length, host)
           jobs.push(this.findHost(host))
         }
       } else {
+        this.debug('job %d: find at least one gateway', jobs.length)
+        jobs.push(events.once(this, 'found'))
         for (const id in this.gatewayMap) {
+          const gateway = this.gatewayMap[id]
+          const host = gateway.context.host
           this.debug('job %d: find gateway %s', jobs.length, id)
-          jobs.push(this.gatewayMap[id].init())
+          jobs.push(events.once(gateway, 'initialised'))
+          try {
+            const config = await this.discovery.config(host)
+            await this.foundGateway(host, config)
+          } catch (error) {
+            this.warn('%s: %s', id, error)
+          }
         }
       }
 
@@ -154,6 +163,15 @@ class DeconzPlatform extends homebridgeLib.Platform {
 
       this.log('%d gateways', Object.keys(this.gatewayMap).length)
       this.emit('initialised')
+      const dumpInfo = {
+        config: this.config,
+        gatewayMap: {}
+      }
+      for (const id in this.gatewayMap) {
+        const gateway = this.gatewayMap[id]
+        dumpInfo.gatewayMap[id] = gateway.context
+      }
+      await this.createDumpFile(dumpInfo)
     } catch (error) { this.error(error) }
   }
 

package/lib/DeconzService/WindowCovering.js

@@ -135,7 +135,7 @@ class WindowCovering extends DeconzService.LightsResource {
         this.values.closeUpwards = closeUpwards
       }
       if (
-        this.moving == null || new Date() - this.moving >= 15000 || (
+        this.moving == null || new Date() - this.moving >= 30000 || (
           position === this.values.targetPosition &&
           (closeUpwards == null || closeUpwards === this.targetCloseUpwards)
         )

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -22,11 +22,11 @@
   "engines": {
     "deCONZ": "2.14.1",
     "homebridge": "^1.4.0",
-    "node": "^16.14.0"
+    "node": "^16.14.2"
   },
   "dependencies": {
-    "homebridge-lib": "~5.3.0",
-    "semver": "^7.3.5",
+    "homebridge-lib": "~5.4.0",
+    "semver": "^7.3.7",
     "ws": "^8.5.0",
     "xml2js": "~0.4.23"
   },