homebridge-deconz 0.0.6 → 0.0.11

package/lib/DeconzAccessory/Gateway.js

@@ -6,17 +6,11 @@
 'use strict'
 
 const homebridgeLib = require('homebridge-lib')
-const util = require('util')
 
-const DeconzClient = require('../DeconzClient')
-const DeconzWsClient = require('../DeconzWsClient')
-const DeconzDevice = require('../DeconzDevice')
+const Deconz = require('../Deconz')
 const DeconzAccessory = require('../DeconzAccessory')
 const DeconzService = require('../DeconzService')
 
-const { toInt, toObject, toString } = homebridgeLib.OptionParser
-const { parseUniqueid } = DeconzClient
-
 const rtypes = ['lights', 'sensors', 'groups']
 
 const periodicEvents = [
@@ -26,7 +20,6 @@ const periodicEvents = [
 ]
 
 /** Delegate class for a deCONZ gateway.
-  * @class
   * @extends AccessoryDelegate
   * @memberof DeconzAccessory
   */
@@ -46,7 +39,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       model: params.config.modelid + ' / ' + params.config.devicename,
       firmware: '0.0.0',
       software: params.config.swversion,
-      category: platform.Accessory.Categories.Bridge
+      category: platform.Accessory.Categories.BRIDGE
     })
 
     this.gateway = this
@@ -60,31 +53,75 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       * devices.
       * @property {Object} fullState - The gateway's full state, from the
       * last time the gateway was polled.
-      * @property {string} host - Gateway hostname or IP address and port.
       */
     this.context // eslint-disable-line no-unused-expressions
-
     this.context.host = params.host
     this.context.config = params.config
     if (this.context.blacklist == null) {
       this.context.blacklist = {}
     }
+    if (this.context.fullState != null) {
+      this.analyseFullState(this.context.fullState, { analyseOnly: true })
+    }
+
+    this.addPropertyDelegate({
+      key: 'apiKey',
+      silent: true
+    }).on('didSet', (value) => {
+      this.client.apiKey = value
+    })
+
+    this.addPropertyDelegate({
+      key: 'host',
+      value: params.host,
+      silent: true
+    }).on('didSet', (value) => {
+      if (this.client != null) {
+        this.client.host = value
+      }
+      if (this.wsClient != null) {
+        this.wsClient.host = this.values.host.split(':')[0] +
+          ':' + this.values.wsPort
+      }
+    })
+    this.values.host = params.host
+
+    this.addPropertyDelegate({
+      key: 'rtypes',
+      value: [],
+      silent: true
+    }).on('didSet', async () => {
+      this.pollNext = true
+    })
+
+    this.addPropertyDelegate({
+      key: 'wsPort',
+      value: 443,
+      silent: true
+    }).on('didSet', (value) => {
+      if (this.wsClient != null) {
+        this.wsClient.host = this.values.host.split(':')[0] +
+          ':' + this.values.wsPort
+      }
+    })
 
     this.log(
       '%s %s gateway v%s', this.values.manufacturer, this.values.model,
       this.values.software
     )
 
-    /** Map of Accessory delegates by id for the gayeway.
+    /** Map of Accessory delegates by id for the gateway.
       * @type {Object<string, DeconzAccessory.Device>}
       */
     this.accessoryById = {}
 
-    /** Map of Accessory delegates by rpath for the gayeway.
+    /** Map of Accessory delegates by rpath for the gateway.
       * @type {Object<string, DeconzAccessory.Device>}
       */
     this.accessoryByRpath = {}
 
+    this.defaultTransitionTime = 0.4
+
     /** Map of errors by device ID trying to expose the corresponding accessory.
       * @type {Object<string, Error>}
       */
@@ -95,11 +132,6 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       */
     this.serviceById = {}
 
-    /** Map of unsupported devices.
-      * @type {Object.<string, boolean>}
-      */
-    this.unsupported = {}
-
     /** The service delegate for the Gateway Settings settings.
       * @type {DeconzService.GatewaySettings}
       */
@@ -108,6 +140,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       primaryService: true,
       host: params.host
     })
+    this.manageLogLevel(this.service.characteristicDelegate('logLevel'))
 
     /** The service delegate for the Stateless Programmable Switch service.
       * @type {DeconzService.Button}
@@ -129,6 +162,18 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       .on('shutdown', this.shutdown)
   }
 
+  get transitionTime () { return this.service.values.transitionTime }
+
+  async resetTransitionTime () {
+    if (this.resetting) {
+      return
+    }
+    this.resetting = true
+    await homebridgeLib.timeout(this.platform.config.waitTimeUpdate)
+    this.service.values.transitionTime = this.defaultTransitionTime
+    this.resetting = false
+  }
+
   /** Log debug messages.
     */
   identify () {
@@ -156,7 +201,8 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       )
       const exposeErrors = Object.keys(this.exposeErrorById).sort()
       this.vdebug(
-        '%d accessories with expose errors', exposeErrors.length, exposeErrors
+        '%d accessories with expose errors: %j', exposeErrors.length,
+        exposeErrors
       )
       const blacklist = Object.keys(this.context.blacklist).sort()
       this.vdebug(
@@ -170,9 +216,14 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     try {
       this.debug('initialising...')
       this.initialBeat = beat
-      if (this.context.fullState != null) {
-        this.analyseFullState(this.context.fullState)
-      }
+      // if (this.context.fullState != null) {
+      //   this.analyseFullState(this.context.fullState, { logUnsupported: true })
+      //   for (const id of this.restoredAccessories) {
+      //     try {
+      //       this.addAccessory(id)
+      //     } catch (error) { this.error(error) }
+      //   }
+      // }
       await this.connect()
       this.initialised = true
       this.debug('initialised')
@@ -186,7 +237,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     * GET `/config` (from {@link DeconzDiscovery#config config()}.
     */
   found (host, config) {
-    this.service.values.host = host
+    this.values.host = host
     this.context.config = config
     this.values.software = config.swversion
   }
@@ -208,10 +259,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
           }
         }
       }
-      if (beat - this.pollBeat >= this.service.values.heartrate) {
-        this.pollNext = true
-      }
-      if (this.pollNext) {
+      if (beat - this.pollBeat >= this.service.values.heartrate || this.pollNext) {
         this.pollBeat = beat
         await this.poll()
       }
@@ -221,11 +269,12 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
   update (config) {
     this.values.software = config.swversion
     this.values.firmware = config.fwversion
+    this.values.wsPort = config.websocketport
     this.service.update(config)
     if (this.checkApiKeys) {
-      const myEntry = config.whitelist[this.service.values.username]
+      const myEntry = config.whitelist[this.values.apiKey]
       for (const key in config.whitelist) {
-        if (key !== this.service.values.username) {
+        if (key !== this.values.apiKey) {
           const entry = config.whitelist[key]
           if (entry.name === myEntry.name) {
             this.warn('%s: potentially stale api key: %j', key, entry)
@@ -242,10 +291,10 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     /** REST API client for the gateway.
       * @type {DeconzClient}
       */
-    this.client = new DeconzClient({
-      host: this.service.values.host,
+    this.client = new Deconz.ApiClient({
+      apiKey: this.values.apiKey,
       config: this.context.config,
-      username: this.service.values.username,
+      host: this.values.host,
       maxSockets: this.platform.config.parallelRequests,
       timeout: this.platform.config.timeout,
       waitTimePut: this.platform.config.waitTimePut,
@@ -298,8 +347,8 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     /** Client for gateway web socket notifications.
       * @type {DeconzWsClient}
       */
-    this.wsClient = new DeconzWsClient({
-      host: this.service.values.wsHost,
+    this.wsClient = new Deconz.WsClient({
+      host: this.values.host.split(':')[0] + ':' + this.values.wsPort,
       retryTime: 15
     })
     this.wsClient
@@ -309,19 +358,14 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       .on('listening', (url) => {
         this.log('websocket connected to %s', url)
       })
-      .on('changed', (rpath, obj) => {
-        this.vdebug('%s: event: %j', rpath, obj)
+      .on('changed', (rtype, rid, body) => {
         try {
-          const a = rpath.split('/')
-          rpath = a.slice(0, 3).join('/')
+          const rpath = '/' + rtype + '/' + rid
+          this.vdebug('%s: changed: %j', rpath, body)
           const accessory = this.accessoryByRpath[rpath]
           if (accessory != null) {
-            let body = obj
-            if (a[3] != null) {
-              body = {}
-              body[a[3]] = obj
-            }
-            /** Emitted when resource has been polled.
+            /** Emitted when a change notificatoin for a resource has been
+              * received over the web socket.
               * @event DeconzAccessory.Device#changed
               * @param {string} rpath - The resource path.
               * @param {Object} body - The resource body.
@@ -332,6 +376,18 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
           this.warn('websocket error: %s', error)
         }
       })
+      .on('added', (rtype, rid, body) => {
+        this.vdebug('/%s/%d: added: %j', rtype, rid, body)
+        if (this.service.values[rtype]) {
+          this.pollNext = true
+        }
+      })
+      .on('deleted', (rtype, rid) => {
+        this.vdebug('/%s/%d: deleted', rtype, rid)
+        if (this.service.values[rtype]) {
+          this.pollNext = true
+        }
+      })
       .on('closed', (url, retryTime) => {
         if (retryTime > 0) {
           this.log(
@@ -351,24 +407,24 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     */
   async connect (retry = 0) {
     if (!this.service.values.expose) {
-      this.warn('unlock gayeway and set Expose to obtain an API key')
+      this.warn('unlock gateway and set Expose to obtain an API key')
       return
     }
     try {
-      if (this.service.values.username == null) {
-        this.service.values.username =
-          await this.client.createUser('homebridge-deconz')
+      if (this.values.apiKey == null) {
+        this.values.apiKey =
+          await this.client.getApiKey('homebridge-deconz')
       }
       this.wsClient.listen()
       this.checkApiKeys = true
       for (const id in this.exposeErrorById) {
         this.resetExposeError(id)
       }
+      this.context.fullState = null
       this.pollNext = true
     } catch (error) {
       if (
-        error instanceof DeconzClient.DeconzError && error.type === 101 &&
-        retry < 8
+        error instanceof Deconz.ApiError && error.type === 101 && retry < 8
       ) {
         this.log('unlock gateway to obtain API key - retrying in 15s')
         await homebridgeLib.timeout(15000)
@@ -387,14 +443,14 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     * the gateway.
     */
   async reset () {
-    if (this.service.values.username == null) {
+    if (this.values.apiKey == null) {
       return
     }
     try {
       try {
-        await this.client.deleteUser()
+        await this.client.deleteApiKey()
       } catch (error) {}
-      this.service.values.username = null
+      this.values.apiKey = null
       await this.wsClient.close()
       for (const id in this.accessoryById) {
         if (id !== this.id) {
@@ -406,12 +462,13 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       }
       this.exposeErrors = {}
       this.context.blacklist = {}
-      this.context.fullState = {}
+      this.context.fullState = null
       this.service.values.lights = false
       this.service.values.sensors = false
       this.service.values.groups = false
       this.service.values.schedules = false
-      this.service.values.rtypes = []
+      this.service.values.logLevel = 2
+      this.values.rtypes = []
     } catch (error) { this.error(error) }
   }
 
@@ -451,32 +508,15 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     if (this.deviceById[id] == null) {
       throw new RangeError(`${id}: unknown device ID`)
     }
-    if (this.unsupported[id] != null) {
-      return
-    }
     if (this.accessoryById[id] == null) {
       const device = this.deviceById[id]
-      this.debug(
-        '%s: new device, %d resources', id, device.rpaths.length
-      )
       delete this.exposeErrorById[id]
-      const { body, category, rtype } = device.resource
+      const { body } = device.resource
+      this.log('%s: add accessory', body.name)
       let { serviceName } = device.resource
-      if (category == null || serviceName == null) {
-        let message
-        if (category == null) {
-          message = util.format('%s: unknown %s type', body.type, rtype)
-          this.warn('%s: %s', body.name, message)
-        } else {
-          message = util.format('%s: unsupported %s type', body.type, rtype)
-          this.debug('%s: %s', body.name, message)
-        }
-        this.unsupported[id] = message
-        return
-      }
       if (DeconzAccessory[serviceName] == null) {
-        this.warn('%s: %s: not yet supported %s type', body.name, body.type, rtype)
-        serviceName = 'Device'
+        // this.warn('%s: %s: not yet supported %s type', body.name, body.type, rtype)
+        serviceName = 'Sensor'
       }
       const accessory = new DeconzAccessory[serviceName](this, device)
       this.accessoryById[id] = accessory
@@ -497,6 +537,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       throw new RangeError(`${id}: gateway ID`)
     }
     if (this.accessoryById[id] != null) {
+      this.log('%s: delete accessory', this.accessoryById[id].name)
       this.monitorResources(this.accessoryById[id], false)
       this.accessoryById[id].destroy()
       delete this.accessoryById[id]
@@ -537,6 +578,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
   /** Reset expose error for device.
     *
     * Remove the un-exposed accessory, so it will be re-created on next poll.
+    * @params {string} id - The device ID.
     */
   resetExposeError (id) {
     this.log(
@@ -546,7 +588,7 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     this.deleteService(id)
   }
 
-  /** Add a service to the gateway accessory to un-blacklist the device.
+  /** Add a service to the gateway accessory to un-blacklist a device.
     * @params {string} id - The device ID.
     * @return {DeconzService.DeviceSettings} - The service delegate.
     */
@@ -558,6 +600,9 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       throw new RangeError(`${id}: unknown device ID`)
     }
     if (this.serviceById[id] == null) {
+      if (Object.keys(this.serviceById).length >= 97) {
+        return null
+      }
       const { resource, rpaths } = this.deviceById[id]
       const { body } = resource
       const service = new DeconzService.DeviceSettings(this, {
@@ -571,12 +616,12 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     return this.serviceById[id]
   }
 
-  /** Delete the service on the gateway accessory to un-blacklist the device.
+  /** Delete the service on the gateway accessory to un-blacklist a device.
     * @params {string} id - The device ID.
     */
   deleteService (id) {
     if (id === this.id) {
-      return
+      throw new RangeError(`${id}: gateway ID`)
     }
     if (this.serviceById[id] != null) {
       this.serviceById[id].destroy()
@@ -588,39 +633,39 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
 
   /** Poll the gateway.
     *
-    * Periodically read and analyse the gateway full state.<br>
-    * The `/groups`, `/lights`, and `/sensors` resources are analysed to build
-    * a map of zigbee and virtual devices exposed by the gateway, while:
-    * - Creating new accessories for new devices;
-    * - Updating existing accessories for existing devices;
-    * - Deleting existing accessories for deleted devices.
+    * Periodically get the gateway full state and call
+    * {@link DeconzAccessory.Gateway#analyseFullState()}.<br>
     */
   async poll () {
-    if (this.polling || this.service.values.username == null) {
+    if (this.polling || this.values.apiKey == null) {
       return
     }
     try {
       this.polling = true
       this.vdebug('%spolling...', this.pollNext ? 'priority ' : '')
-      const config = await this.client.get('/config')
-      if (config.bridgeid === this.id && config.UTC == null) {
-        this.service.values.expose = false
-        this.service.values.username = null
-        await this.wsClient.close()
-        return
-      }
-      this.context.fullState = { config: config }
-      this.update(this.context.fullState.config)
-      if (this.service.values.lights || this.service.values.sensors) {
-        this.context.fullState.lights = await this.client.get('/lights')
-        this.context.fullState.sensors = await this.client.get('/sensors')
-      }
-      if (this.service.values.groups) {
-        this.context.fullState.groups = await this.client.get('/groups')
+      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.service.values.schedules) {
-        this.context.fullState.schedules = await this.client.get('/schedules')
+      } else {
+        const config = await this.client.get('/config')
+        if (config.bridgeid === this.id && config.UTC == null) {
+          this.service.values.expose = false
+          this.values.apiKey = null
+          await this.wsClient.close()
+          return
+        }
+        this.context.fullState.config = config
+        if (this.service.values.lights || this.service.values.sensors) {
+          this.context.fullState.lights = await this.client.get('/lights')
+          this.context.fullState.sensors = await this.client.get('/sensors')
+        }
+        if (this.service.values.groups) {
+          this.context.fullState.groups = await this.client.get('/groups')
+          this.context.fullState.groups[0] = await this.client.get('/groups/0')
+        }
+        if (this.service.values.schedules) {
+          this.context.fullState.schedules = await this.client.get('/schedules')
+        }
       }
       this.analyseFullState(this.context.fullState)
     } catch (error) {
@@ -632,23 +677,71 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
   }
 
-  analyseFullState (fullState) {
-    /** Devices by device ID.
-      * @type {Object<string, DeconzDevice>}
+  /** Analyse the peristed full state of the gateway,
+    * adding, re-configuring, and deleting delegates for corresponding HomeKit
+    * accessories and services.
+    *
+    * The analysis consists of the following steps:
+    * 1. Analyse the resources, updating:
+    * {@link DeconzAccessory.Gateway#deviceById deviceById},
+    * {@link DeconzAccessory.Gateway#deviceByRidByRtype deviceByRidByRtype},
+    * {@link DeconzAccessory.Gateway#nDevices nDevices},
+    * {@link DeconzAccessory.Gateway#nDevicesByRtype nDevicesByRtype},
+    * {@link DeconzAccessory.Gateway#nResources nResources},
+    * {@link DeconzAccessory.Gateway#resourceByRpath resourceByRpath}.
+    * 2. Analyse (pre-existing) _Device_ accessories, emitting
+    * {@link DeconzAccessory.Device#event.polled}, and calling
+    * {@link DeconzAccessory.Gateway#deleteAccessory deleteAccessory()} for
+    * stale accessories, corresponding to devices that have been deleted from
+    * the gateway, blacklisted, or excluded by device primary resource type.
+    * 3. Analyse (pre-existing) _Device Settings_ services, calling
+    * {@link DeconzAccessory.Gateway#deleteService deleteService()}
+    * for stale services, corresponding to devices that have been deleted from
+    * the gateway, un-blacklisted, or excluded by device primary resource type.
+    * 4. Analysing supported devices with enabled device primary resource types,
+    * calling {@link DeconzAccessory.Gateway#addAccessory addAccessory()} and
+    * {@link DeconzAccessory.Gateway#deleteService deleteService()} for new
+    * _Device_ accessories, corresponding to devices added to the gateway,
+    * un-blacklisted, or included by device primary resource type, and calling
+    * {@link DeconzAccessory.Gateway#addService addService()} and
+    * {@link DeconzAccessory.Gateway#deleteAccessory deleteAccessory()} for
+    * accessories, corresponding to devices have been blacklisted.
+    * @param {Object} fullState - The gateway full state, as returned by
+    * {@link DeconzAccessory.Gateway#poll poll()}.
+    * @param {Object} params - Parameters
+    * @param {boolean} [params.logUnsupportedResources=false] - Issue debug
+    * messsages for unsupported resources.
+    * @param {boolean} [params.analyseOnly=false]
+    */
+  analyseFullState (fullState, params = {}) {
+    /** Supported devices by device ID.
+      *
+      * Updated by
+      * {@link DeconzAccessory.Gateway#analyseFullState analyseFullState()}.
+      * @type {Object<string, Deconz.Device>}
       */
     this.deviceById = {}
 
-    /** Resources by resource path.
-      * @type {Object<string, DeconzDevice.Resource>}
+    /** Supported resources by resource path.
+      *
+      * Updated by {@link DeconzAccessory.Gateway#analyseFullState analyseFullState()}.
+      * @type {Object<string, Deconz.Resource>}
       */
     this.resourceByRpath = {}
 
-    /** Devices by resource ID by resource type.
-      * @type {Object<string, Object<string, DeconzDevice>>}
+    /** Supported devices by resource ID by resource type, of the primary
+      * resource for the device.
+      *
+      * Updated by
+      * {@link DeconzAccessory.Gateway#analyseFullState analyseFullState()}.
+      * @type {Object<string, Object<string, Deconz.Device>>}
       */
     this.deviceByRidByRtype = {}
 
-    /** Map of number of devices by resource type.
+    /** Number of supported devices by resource type.
+      *
+      * Updated by
+      * {@link DeconzAccessory.Gateway#analyseFullState analyseFullState()}.
       * @type {Object<string, integer>}
       */
     this.nDevicesByRtype = {}
@@ -657,12 +750,30 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     for (const rtype of rtypes) {
       this.deviceByRidByRtype[rtype] = {}
       for (const rid in fullState[rtype]) {
-        const body = fullState[rtype][rid]
-        this.analyseResource(rtype, rid, body)
+        try {
+          const body = fullState[rtype][rid]
+          this.analyseResource(rtype, rid, body, params.logUnsupported)
+        } catch (error) { this.error(error) }
       }
     }
+
+    /** Number of supported devices.
+      *
+      * Updated by
+      * {@link DeconzAccessory.Gateway#analyseFullState analyseFullState()}.
+      * @type {integer}
+      */
+
     this.nDevices = Object.keys(this.deviceById).length
+
+    /** Number of supported resources.
+      *
+      * Updated by
+      * {@link DeconzAccessory.Gateway#analyseFullState analyseFullState()}.
+      * @type {integer}
+      */
     this.nResources = Object.keys(this.resourceByRpath).length
+
     this.vdebug('%d devices, %d resources', this.nDevices, this.nResources)
     for (const id in this.deviceById) {
       const device = this.deviceById[id]
@@ -675,76 +786,87 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
       this.vdebug('%d %s devices', this.nDevicesByRtype[rtype], rtype)
     }
 
+    if (params.analyseOnly) {
+      return
+    }
+
+    this.update(fullState.config)
+
     let changed = false
 
     this.vdebug('analysing accessories...')
     for (const id in this.accessoryById) {
-      if (
-        this.deviceById[id] == null ||
-        !this.service.values.rtypes.includes(this.deviceById[id].resource.rtype)
-      ) {
-        delete this.context.blacklist[id]
-        this.deleteAccessory(id)
-        this.deleteService(id)
-        changed = true
-      } else {
-        /** Emitted when resource has been polled.
-          * @event DeconzAccessory.Device#polled
-          * @param {DeconzDevice} device - The device.
-          */
-        this.accessoryById[id].emit('polled', this.deviceById[id])
-      }
-    }
-    this.nAccessories = Object.keys(this.accessoryById).length
-    this.nExposeErrors = Object.keys(this.exposeErrorById).length
-    if (this.nExposeErrors === 0) {
-      this.vdebug('%d accessories', this.nAccessories)
-    } else {
-      this.vdebug(
-        '%d accessories, %d expose errors', this.nAccessories, this.nExposeErrors
-      )
+      try {
+        if (
+          this.deviceById[id] == null
+        ) {
+          delete this.context.blacklist[id]
+          this.deleteAccessory(id)
+          this.deleteService(id)
+          changed = true
+        } else {
+          /** Emitted when the gateway has been polled.
+            * @event DeconzAccessory.Device#polled
+            * @param {Deconz.Device} device - The updated device.
+            */
+          this.accessoryById[id].emit('polled', this.deviceById[id])
+        }
+      } catch (error) { this.error(error) }
     }
 
     this.vdebug('analysing services...')
     for (const id in this.serviceById) {
-      if (
-        this.deviceById[id] == null ||
-        !this.service.values.rtypes.includes(this.deviceById[id].resource.rtype)
-      ) {
-        delete this.context.blacklist[id]
-        delete this.exposeErrorById[id]
-        this.deleteService(id)
-        changed = true
-      }
+      try {
+        if (
+          this.deviceById[id] == null ||
+          !this.values.rtypes.includes(this.deviceById[id].resource.rtype)
+        ) {
+          delete this.exposeErrorById[id]
+          this.deleteService(id)
+          changed = true
+        }
+      } catch (error) { this.error(error) }
     }
 
-    for (const rtype of this.service.values.rtypes) {
+    for (const rtype of this.values.rtypes) {
       this.vdebug('analysing %s devices...', rtype)
       const rids = Object.keys(this.deviceByRidByRtype[rtype]).sort()
       for (const rid of rids) {
-        const { id } = this.deviceByRidByRtype[rtype][rid]
-        if (this.context.blacklist[id] == null) {
-          if (this.accessoryById[id] == null && this.unsupported[id] == null) {
-            this.addAccessory(id)
-            changed = true
-          }
-          if (this.serviceById[id] != null) {
-            this.deleteService(id)
-            changed = true
-          }
-        } else {
-          if (this.serviceById[id] == null && this.unsupported[id] == null) {
-            this.addService(id)
-            changed = true
-          }
-          if (this.accessoryById[id] != null) {
-            this.deleteAccessory(id)
-            changed = true
+        try {
+          const { id } = this.deviceByRidByRtype[rtype][rid]
+          if (this.context.blacklist[id] == null) {
+            if (this.accessoryById[id] == null) {
+              this.addAccessory(id)
+              changed = true
+            }
+            if (this.serviceById[id] != null) {
+              this.deleteService(id)
+              changed = true
+            }
+          } else {
+            if (this.serviceById[id] == null) {
+              this.addService(id)
+              changed = true
+            }
+            if (this.accessoryById[id] != null) {
+              this.deleteAccessory(id)
+              changed = true
+            }
           }
-        }
+        } catch (error) { this.error(error) }
       }
     }
 
+    this.nAccessories = Object.keys(this.accessoryById).length
+    this.nExposeErrors = Object.keys(this.exposeErrorById).length
+    if (this.nExposeErrors === 0) {
+      this.vdebug('%d accessories', this.nAccessories)
+    } else {
+      this.vdebug(
+        '%d accessories, %d expose errors', this.nAccessories, this.nExposeErrors
+      )
+    }
+
     if (changed) {
       this.nResourcesMonitored = Object.keys(this.accessoryByRpath).length
       this.identify()
@@ -753,226 +875,46 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
     }
   }
 
-  /** Anayse a resource, updating
+  /** Anayse a gateway resource, updating
     * {@link DeconzAccessory.Gateway#deviceById deviceById} and
-    * {@link DeconzAccessory.Gateway#resourceByRpath resourceByRpath} and
+    * {@link DeconzAccessory.Gateway#resourceByRpath resourceByRpath} for
+    * supported resources.
     *
     * @param {string} rtype - The type of the resource:
-    * `group`, `light`, or `sensor`.
+    * `groups`, `lights`, or `sensors`.
     * @param {integer} rid - The resource ID of the resource.
     * @param {object} body - The body of the resource.
+    * @param {boolean} logUnsupported - Issue a debug message for
+    * unsupported resources.
     */
-  analyseResource (rtype, rid, body) {
-    const attrs = this.resourceAttrs(rtype, rid, body)
-    const { id } = attrs
-    if (id === this.id) {
+  analyseResource (rtype, rid, body, logUnsupported) {
+    const resource = new Deconz.Resource(this, rtype, rid, body)
+    const { id, serviceName } = resource
+    if (id === this.id || serviceName === '') {
+      const debug = (logUnsupported ? this.debug : this.vdebug).bind(this)
+      debug(
+        '%s: /%s/%d: %s: ignoring unsupported %s type',
+        id, rtype, rid, body.type, rtype
+      )
+      return
+    }
+    if (serviceName == null) {
+      const warn = (logUnsupported ? this.warn : this.vdebug).bind(this)
+      warn(
+        '%s: /%s/%d: %s: ignoring unknown %s type',
+        id, rtype, rid, body.type, rtype
+      )
       return
     }
     if (this.deviceById[id] == null) {
-      this.deviceById[id] = new DeconzDevice(rtype, rid, body, attrs)
+      this.deviceById[id] = new Deconz.Device(resource)
       this.vdebug('%s: device', id)
+    } else {
+      this.deviceById[id].addResource(resource)
     }
-    const resource = this.deviceById[id].addResource(rtype, rid, body, attrs)
     const { rpath } = resource
-    this.vdebug('%s: %s: device resource', id, rpath)
     this.resourceByRpath[rpath] = resource
-  }
-
-  /** Determine the derived attributes for a resource.
-    *
-    * @param {string} rtype - The type of the resource:
-    * `config`, `group`, `light`, or `sensor`.
-    * @param {integer} rid - The resource ID of the resource.
-    * @param {object} body - The body of the resource.
-    * @returns {DeconzDevice.ResourceAttributes} - The derived
-    * resource attributes.
-    */
-  resourceAttrs (rtype, rid, body) {
-    toString('params.rtype', rtype, true)
-    if (!(rtypes.includes(rtype))) {
-      throw new RangeError(`rtype: ${rtype}: not a valid resource type`)
-    }
-    toInt('rid', rid)
-    toObject('body', body)
-    toString('body.name', body.name, true)
-    toString('body.type', body.type, true)
-    if (rtype === 'lights' || (rtype === 'sensors' && body.type.startsWith('Z'))) {
-      const { mac, endpoint, cluster } = parseUniqueid(body.uniqueid)
-      return new DeconzDevice.ResourceAttributes(
-        mac,
-        endpoint + (cluster == null ? '' : '-' + cluster),
-        rtype === 'lights'
-          ? this.lightsTypeAttributes(body.type)
-          : this.sensorsTypeAttributes(body.type),
-        true
-      )
-    }
-    if (rtype === 'groups') {
-      return new DeconzDevice.ResourceAttributes(
-        this.id + '-G' + rid,
-        'G' + rid,
-        new DeconzDevice.TypeAttributes(
-          this.Accessory.Categories.LIGHTBULB, 'LightBulb'
-        ),
-        false
-      )
-    }
-    return new DeconzDevice.ResourceAttributes(
-      this.id + '-S' + rid,
-      'S' + rid,
-      this.sensorsTypeAttributes(body.type),
-      false
-    )
-  }
-
-  /** Derive the attributes for a `/lights` resource type.
-    *
-    * @params {string} type - The `type` attribute of the `/lights` resource.
-    * @return {DeconzDevice.TypeAttributes} - The derived type
-    * attributes.
-    */
-  lightsTypeAttributes (type) {
-    const Cats = this.Accessory.Categories
-    switch (type) {
-      case 'Color dimmable light':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'LightBulb', 4)
-      case 'Color light':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'LightBulb', 3)
-      case 'Color temperature light':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'LightBulb', 2)
-      case 'Dimmable light':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'LightBulb', 1)
-      case 'Dimmable plug-in unit':
-        return new DeconzDevice.TypeAttributes(Cats.OUTLET, 'LightBulb')
-      case 'Extended color light':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'LightBulb', 5)
-      // case 'Consumption awareness device':
-      //   return new DeconzDevice.TypeAttributes(Cats.OTHER)
-      case 'Dimmer switch':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'LightBulb')
-      case 'Level control switch':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'LightBulb')
-      // case 'Level controllable output':
-      //   return new DeconzDevice.TypeAttributes(Cats.OTHER)
-      // case 'Door Lock':
-      //   return new DeconzDevice.TypeAttributes(Cats.DOOR_LOCK)
-      // case 'Door Lock Unit':
-      //   return new DeconzDevice.TypeAttributes(Cats.DOOR_LOCK)
-      // case 'Fan':
-      //   return new DeconzDevice.TypeAttributes(Cats.FAN)
-      case 'On/Off light switch':
-        return new DeconzDevice.TypeAttributes(Cats.SWITCH, 'Outlet')
-      case 'On/Off light':
-        return new DeconzDevice.TypeAttributes(Cats.LIGHTBULB, 'Outlet')
-      case 'On/Off output':
-        return new DeconzDevice.TypeAttributes(Cats.OUTLET, 'Outlet')
-      case 'On/Off plug-in unit':
-        return new DeconzDevice.TypeAttributes(Cats.OUTLET, 'Outlet')
-      case 'Smart plug':
-        return new DeconzDevice.TypeAttributes(Cats.OUTLET, 'Outlet')
-      case 'Configuration tool':
-        return new DeconzDevice.TypeAttributes(Cats.BRIDGE)
-      case 'Range extender':
-        return new DeconzDevice.TypeAttributes(Cats.RANGE_EXTENDER)
-      case 'Warning device':
-        return new DeconzDevice.TypeAttributes(Cats.SECURITY_SYSTEM, 'WarningDevice')
-      case 'Window covering controller':
-        return new DeconzDevice.TypeAttributes(Cats.WINDOW_COVERING, 'WindowCovering')
-      case 'Window covering device':
-        return new DeconzDevice.TypeAttributes(Cats.WINDOW_COVERING, 'WindowCovering')
-      default:
-        return new DeconzDevice.TypeAttributes()
-    }
-  }
-
-  /** Derivce the attributes for a `/sensors` resource type.
-    *
-    * @params {string} type - The `type` attribute of the `/sensors` resource.
-    * @return {DeconzDevice.TypeAttributes} - The derived type
-    * attributes.
-    */
-  sensorsTypeAttributes (type) {
-    const Cats = this.Accessory.Categories
-    switch (type) {
-      case 'ZHAAirPurifier':
-      case 'CLIPAirPurifier':
-        return new DeconzDevice.TypeAttributes(Cats.AIR_PURIFIER)
-      case 'ZHAAirQuality':
-      case 'CLIPAirQuality':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'AirQuality', 3)
-      case 'ZHAAlarm':
-      case 'CLIPAlarm':
-        return new DeconzDevice.TypeAttributes(Cats.SECURITY_SYSTEM, 'Alarm')
-      // case 'ZHAAncillaryControl':
-      // case 'CLIPAncillaryControl':
-      //   return new DeconzDevice.TypeAttributes(Cats.SECURITY_SYSTEM)
-      case 'ZHABattery':
-      case 'CLIPBattery':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Battery')
-      case 'ZHACarbonMonoxide':
-      case 'CLIPCarbonMonoxide':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'CarbonMonoxide')
-      case 'ZHAConsumption':
-      case 'CLIPConsumption':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Consumption')
-      // case 'ZHADoorLock':
-      // case 'CLIPDoorLock':
-      //   return new DeconzDevice.TypeAttributes(Cats.DOOR_LOCK)
-      case 'Daylight':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Daylight')
-      case 'ZHAFire':
-      case 'CLIPFire':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Fire')
-      case 'CLIPGenericFlag':
-        return new DeconzDevice.TypeAttributes(Cats.SWITCH, 'Flag')
-      case 'CLIPGenericStatus':
-        return new DeconzDevice.TypeAttributes(Cats.OTHER, 'Status')
-      case 'ZHAHumidity':
-      case 'CLIPHumidity':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Humidity', 4)
-      case 'ZHALightLevel':
-      case 'CLIPLightLevel':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'LightLevel', 6)
-      // case 'ZHAMoisture':
-      // case 'CLIPMoisture':
-      //   return new DeconzDevice.TypeAttributes(Cats.SENSOR)
-      case 'ZHAOpenClose':
-      case 'CLIPOpenClose':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'OpenClose', 8)
-      case 'ZHAPower':
-      case 'CLIPPower':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Power', 1)
-      case 'ZHAPresence':
-      case 'CLIPPresence':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Presence', 7)
-      case 'ZHAPressure':
-      case 'CLIPPressure':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Pressure', 3)
-      // case 'ZHASpectral':
-      //   return new DeconzDevice.TypeAttributes(Cats.SENSOR)
-      case 'ZGPSwitch':
-      case 'ZHASwitch':
-        return new DeconzDevice.TypeAttributes(Cats.PROGRAMMABLE_SWITCH, 'Switch')
-      case 'CLIPSwitch':
-        return new DeconzDevice.TypeAttributes(Cats.PROGRAMMABLE_SWITCH)
-      case 'ZHATemperature':
-      case 'CLIPTemperature':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Temperature', 5)
-      case 'ZHAThermostat':
-      case 'CLIPThermostat':
-        return new DeconzDevice.TypeAttributes(Cats.THERMOSTAT, 'Thermostat')
-      case 'ZHATime':
-      case 'CLIPTime':
-        return new DeconzDevice.TypeAttributes(Cats.OTHER)
-      case 'ZHAVibration':
-      case 'CLIPVibration':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Vibration')
-      case 'ZHAWater':
-      case 'CLIPWater':
-        return new DeconzDevice.TypeAttributes(Cats.SENSOR, 'Water')
-      default:
-        return new DeconzDevice.TypeAttributes()
-    }
+    this.vdebug('%s: %s: device resource', id, rpath)
   }
 }