homebridge-deconz 0.0.12 → 0.0.15

package/README.md

@@ -1,11 +1,13 @@
 <p align="center">
-  <img src="homebridge-deconz.png" height="200px">  
-</p><span align="center">
+  <img src="homebridge-ui/public/homebridge-deconz.png" height="200px">  
+</p>
+<span align="center">
 
 # Homebridge deCONZ
 [![Downloads](https://img.shields.io/npm/dt/homebridge-deconz)](https://www.npmjs.com/package/homebridge-deconz)
 [![Version](https://img.shields.io/npm/v/homebridge-deconz)](https://www.npmjs.com/package/homebridge-deconz)
-[![Homebridge Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.gg/hZubhrz)
+[![Homebridge Discord](https://img.shields.io/discord/432663330281226270?color=728ED5&logo=discord&label=discord)](https://discord.gg/zUhSZSNb4P)
+[![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 
 [![GitHub issues](https://img.shields.io/github/issues/ebaauw/homebridge-deconz)](https://github.com/ebaauw/homebridge-deconz/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/ebaauw/homebridge-deconz)](https://github.com/ebaauw/homebridge-deconz/pulls)
@@ -22,7 +24,7 @@ See [Future Development of Homebridge Hue](https://github.com/ebaauw/homebridge-
 Homebridge deCONZ is still under development.
 See [Releases](https://github.com/ebaauw/homebridge-deconz/releases) for more details.
 
-If you have a question, please post a message to the **#hue** channel of the Homebridge community on [Discord](https://discord.gg/hZubhrz).
+If you have a question, please post a message to the **#deconz** channel of the Homebridge community on [Discord](https://discord.gg/zUhSZSNb4P).
 
 ### Introduction
 This [Homebridge](https://github.com/homebridge/homebridge) plugin exposes to Apple's [HomeKit](http://www.apple.com/ios/home/) ZigBee devices (lights, plugs, sensors, switches, ...) and virtual devices on a deCONZ gateway by dresden elektronik.

package/config.schema.json

@@ -2,7 +2,7 @@
   "pluginAlias": "deCONZ",
   "pluginType": "platform",
   "singular": true,
-  "customUi": true,
+  "customUi": false,
   "headerDisplay": "Homebridge plugin for deCONZ",
   "footerDisplay": "For a detailed description, see the [wiki](https://github.com/ebaauw/homebridge-deconz/wiki/Configuration).",
   "schema": {
@@ -77,7 +77,7 @@
       }
     }
   },
-  "form": [
+  "layout": [
     "name",
     {
       "key": "hosts",

package/homebridge-ui/public/index.html

@@ -6,19 +6,499 @@ Copyright © 2022 Erik Baauw. All rights reserved.
 -->
 
 <link rel="stylesheet" href="style.css">
+<p align="center">
+  <a href="https://github.com/ebaauw/homebridge-deconz/wiki/Configuration" target="_blank">
+    <img src="homebridge-deconz.png" height="200px">
+  </a>
+</p>
 
 <script>
-(async () => {
-  try {
+
+async function showFormPluginConfig () {
+  homebridge.showSpinner()
+  const pluginConfig = await homebridge.getPluginConfig()
+  console.log('pluginConfig: %o', pluginConfig)
+  // const pluginConfigSchema = await homebridge.getPluginConfigSchema()
+  // console.log('pluginConfigSchema: %o', pluginConfigSchema)
+  // const cachedAccessories = await homebridge.getCachedAccessories()
+  // console.log('cachedAccessories: %o', cachedAccessories)
+  // const discoveredGateways = await homebridge.request('discover')
+  // console.log('discovered gateways: %o', discoveredGateways)
+  for (const config of pluginConfig) {
+    if (config._bridge != null) {
+      const cachedAccessories = await homebridge.request('cachedAccessories', {
+        username: config._bridge.username
+      })
+      console.log('%s: cachedAccessories: %o', config.name, cachedAccessories)
+      const cachedGateways = cachedAccessories.filter((accessory) => {
+        return accessory.plugin === 'homebridge-deconz' &&
+          accessory.context != null &&
+          accessory.context.className === 'Gateway'
+      })
+      const result = {}
+      for (const gateway of cachedGateways) {
+        if (gateway.context.uiPort == null) {
+          continue
+        }
+        const pong = await homebridge.request(
+          'get', { uiPort: gateway.context.uiPort, path: '/ping' }
+        )
+        if (pong === 'pong') {
+          result[gateway.context.host] = gateway.context
+        }
+      }
+      const gateways = Object.keys(result).sort()
+      console.log('%s: gateways: %j',config.name, gateways)
+    }
+  }
+  homebridge.hideSpinner()
+
+  const form = homebridge.createForm(
+    {
+      schema: {
+        type: 'object',
+        properties: {
+          config: {
+            title: 'Gateways',
+            description: 'Configure a child bridge per deCONZ gateway.  See <a href="https://github.com/ebaauw/homebridge-deconz/wiki/Configuration" target="_blank">wiki</a> for details.',
+            type: 'array',
+            disabled: true,
+            items: {
+              type: 'object',
+              properties: {
+                host: {
+                  description: 'Gateway hostname and port.',
+                  default: 'localhost:80',
+                  type: 'string',
+                  required: true
+                },
+                name: {
+                  description: 'Homebridge log plugin name.',
+                  default: 'deCONZ',
+                  type: 'string'
+                },
+                _bridge: {
+                  type: 'object',
+                  required: true,
+                  properties: {
+                    name: {
+                      type: 'string',
+                      required: true
+                    },
+                    username: {
+                      type: 'string',
+                      pattern: '^([A-F0-9]{2}:){5}[A-F0-9]{2}$',
+                      placeholder: 'AA:BB:CC:DD:EE:FF',
+                      required: true
+                    },
+                    port: {
+                      type: 'integer',
+                      minimum: 1025,
+                      // maximum: 65535,
+                      required: true
+                    },
+                    manufacturer: {
+                      type: 'string',
+                      enabled: false,
+                      required: true
+                    },
+                    model: {
+                      type: 'string',
+                      required: true
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      // layout: null
+      layout: [
+        {
+          type: 'tabarray',
+          title: '{{ value.name }}',
+          items: [
+            {
+              type: 'fieldset',
+              title: 'Gateway Settings',
+              key: 'config[]',
+              items: [
+                {
+                  type: 'flex',
+                  'flex-flow': 'row',
+                  items: [
+                    'config[].host',
+                    'config[].name',
+                  ]
+                }
+              ]
+            },
+            {
+              type: 'flex',
+              'flex-flow': 'row',
+              key: 'config[]',
+              items: [
+                {
+                  type: 'button',
+                  title: 'Connect',
+                  key: 'config[].connect'
+                },
+                {
+                  type: 'button',
+                  title: 'Get API Key',
+                  key: 'config[].getApiKey'
+                },
+                {
+                  type: 'submit',
+                  title: 'Configure',
+                  key: 'config[].configure'
+                }
+              ]
+            },
+            {
+              type: 'fieldset',
+              key: 'config[]._bridge',
+              // expandable: true,
+              title: 'Child Bridge Accessory Settings',
+              items: [
+                {
+                  type: 'flex',
+                  'flex-flow': 'row',
+                  items: [
+                    'config[]._bridge.username',
+                    'config[]._bridge.port'
+                  ]
+                },
+                'config[]._bridge.name',
+                {
+                  type: 'flex',
+                  'flex-flow': 'row',
+                  items: [
+                    'config[]._bridge.manufacturer',
+                    'config[]._bridge.model'
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }, {
+      config: pluginConfig,
+    },
+    'Gateway Settings',
+    'Homebridge Settings'
+  )
+  form.onChange(async (form) => {
+    console.log('change: %o', form)
+  })
+  form.onSubmit(async (form) => {
+    console.log('submit: %o', form)
+  })
+  form.onCancel(async (form) => {
+    console.log('cancel: %o', form)
+  })
+
+}
+
+async function showFormGateways (gateway) {
+  homebridge.showSpinner()
+  const cachedAccessories = await homebridge.getCachedAccessories()
+  const cachedGateways = cachedAccessories.filter((accessory) => {
+    return accessory.plugin === 'homebridge-deconz' &&
+      accessory.context != null &&
+      accessory.context.className === 'Gateway'
+  })
+  const result = {}
+  for (const gateway of cachedGateways) {
+    if (gateway.context.uiPort == null) {
+      continue
+    }
+    const pong = await homebridge.request(
+      'get', { uiPort: gateway.context.uiPort, path: '/ping' }
+    )
+    if (pong === 'pong') {
+      result[gateway.context.host] = gateway.context
+    }
+  }
+  const gateways = Object.keys(result).sort()
+  homebridge.hideSpinner()
+  if (gateways.length === 0) {
     homebridge.showSchemaForm()
+    return
+  }
+  // const form = homebridge.createForm({
+  //   schema: {
+  //     type: 'object',
+  //     properties: {
+  //       gateway: {
+  //         title: 'Connected Gateways',
+  //         type: 'string',
+  //         oneOf: gateways.map((name) => {
+  //           const config = result[name].context.config
+  //           return {
+  //             title: `${name}: dresden elektronik ${config.modelid} gateway v${config.swversion} / ${config.devicename} ${config.bridgeid}`,
+  //             enum: [name]
+  //           }
+  //         }),
+  //         required: true
+  //       }
+  //     }
+  //   },
+  //   layout: null,
+  //   form: null
+  // }, {
+  //   gateway: gateway != null ? gateway : gateways[0]
+  // }, 'Gateway Settings', 'Homebridge Settings')
+  const form = homebridge.createForm({
+    footerDisplay: 'For a detailed description, see the [wiki](https://github.com/ebaauw/homebridge-deconz/wiki/Configuration).',
+    schema: {
+      type: 'object',
+      properties: {
+        name: {
+          description: 'Plugin name as displayed in the Homebridge log.',
+          type: 'string',
+          required: true,
+          default: 'deCONZ'
+        },
+        gateways: {
+          title: 'Gateways',
+          type: 'array',
+          disabled: true,
+          items: {
+            type: 'object',
+            properties: {
+              host: {
+                description: 'Hostname and port of the deCONZ gateway.',
+                type: 'string'
+              },
+              expose: {
+                description: 'Expose gateway to HomeKit.',
+                type: 'boolean'
+              }
+            }
+          }
+
+        }
+      }
+    } //,
+    // layout: [
+    //   'name',
+    //   {
+    //     key: 'gateways',
+    //     type: 'array',
+    //     buttonText: 'Add Gateway',
+    //     items: [
+    //       {
+    //         type: 'section',
+    //         htmlClass: 'row',
+    //         items: [
+    //           {
+    //             type: 'section',
+    //             htmlClass: 'col',
+    //             items: [
+    //               'gateways[].host'
+    //             ]
+    //           },
+    //           {
+    //             type: 'section',
+    //             htmlClass: 'col',
+    //             items: [
+    //             {
+    //               key: 'gateways[].expose',
+    //               disabled: true
+    //             }
+    //             ]
+    //           }
+    //         ]
+    //       }
+    //     ]
+    //   }
+    // ]
+  }, {
 
-    // const pluginConfig = await homebridge.getPluginConfig()
-    // const pluginConfigSchema = await homebridge.getPluginConfigSchema()
-    const cachedAccessories = await homebridge.getCachedAccessories()
+  }, 'Gateway Settings', 'Homebridge Settings')
+  form.onChange(async (form) => {
+    // showFormGatewaySettings(result[form.gateway])
+  })
+  form.onSubmit(async (form) => {
+    await showFormGatewaySettings(result[form.gateways])
+  })
+  form.onCancel(() => { homebridge.showSchemaForm() })
+}
+
+async function showFormGatewaySettings (gateway, device) {
+  homebridge.showSpinner()
+  const data = await homebridge.request(
+    'get', {
+      uiPort: gateway.uiPort,
+      path: '/gateways/' + gateway.id
+    }
+  )
+  const values = {}
+  for (const rtype in data.deviceByRidByRtype) {
+    values[rtype] = []
+    for (const rid in data.deviceByRidByRtype[rtype]) {
+      const device = data.deviceByRidByRtype[rtype][rid]
+      values[rtype].push({
+        title: ['', rtype, rid].join('/') + ': ' +
+          device.resourceBySubtype[device.primary].body.name,
+        enum: [device.id]
+      })
+    }
+  }
+  data.lightsDevice = values.lights[0].enum[0]
+  data.sensorsDevice = values.sensors[0].enum[0]
+  data.groupsDevice = values.groups[0].enum[0]
+  homebridge.hideSpinner()
+  const form = homebridge.createForm({
+    schema: {
+      type: 'object',
+      properties: {
+        expose: {
+          title: 'Expose',
+          type: 'boolean'
+        },
+        lights: {
+          title: 'Lights',
+          type: 'boolean',
+        },
+        sensors: {
+          title: 'Sensors',
+          type: 'boolean',
+        },
+        groups: {
+          title: 'Groups',
+          type: 'boolean',
+        },
+        schedules: {
+          title: 'Schedules',
+          type: 'boolean',
+        },
+        logLevel: {
+          title: 'Log Level',
+          type: 'string',
+          oneOf: ['0', '1', '2', '3'].map((level) => { return { title: level, enum: [level] } }),
+          required: true,
+          condition: {
+            functionBody: 'return model.expose'
+          }
+        },
+        lightsDevice: {
+          title: 'Device',
+          type: 'string',
+          oneOf: values.lights,
+          required: true
+        },
+        sensorsDevice: {
+          title: 'Device',
+          type: 'string',
+          oneOf: values.sensors,
+          required: true
+        },
+        groupsDevice: {
+          title: 'Device',
+          type: 'string',
+          oneOf: values.groups,
+          required: true
+        }
+      }
+    },
+    layout: [
+      {
+        type: 'fieldset',
+        title: `${gateway.context.host} Gateway Settings`
+      },
+      'expose',
+      'logLevel',
+      {
+        type: 'flex',
+        'flex-flow': 'row',
+        title: 'Automatically Expose New',
+        items: [
+          'lights',
+          'sensors',
+          'groups',
+          'schedules'
+        ],
+        condition: {
+          functionBody: 'return model.expose'
+        }
+      },
+      {
+        type: 'fieldset',
+        items: [
+          {
+            type: 'tabs',
+            tabs: [
+              {
+                title: 'Lights',
+                items: [
+                  'lightsDevice'
+                ]
+              },
+              {
+                title: 'Sensors',
+                items: [
+                  'sensorsDevice'
+                ]
+              },
+              {
+                title: 'Groups',
+                items: [
+                  'groupsDevice'
+                ]
+              }
+            ]
+          }
+        ],
+        condition: {
+          functionBody: 'return model.expose'
+        }
+      }
+    ]
+  }, data, 'Device Settings', 'Done')
+  form.onChange((form) => {})
+  form.onSubmit((form) => {
+    showFormDeviceSettings(gateway, form.lightsDevice)
+  })
+  form.onCancel((form) => {
+    showFormGateways(gateway.context.host)
+  })
+}
 
-    const result = await homebridge.request('/cachedAccessories', cachedAccessories)
-    const nGateways = Object.keys(result).length
-    homebridge.toast.success(`${nGateways} gateways`)
+async function showFormDeviceSettings (gateway, device) {
+  homebridge.showSpinner()
+  homebridge.hideSpinner()
+  const form = homebridge.createForm({
+    schema: {
+      type: 'object',
+      properties: {
+        gateway: {
+          type: 'string'
+        },
+        device: {
+          type: 'string'
+        }
+      }
+    }
+  }, {
+    gateway: gateway.context.host,
+    device: device
+  }, 'OK', 'Cancel')
+  form.onChange((form) => {})
+  form.onSubmit((form) => {
+    showFormGatewaySettings(gateway)
+  })
+  form.onCancel((form) => {
+    showFormGatewaySettings(gateway)
+  })
+}
+
+(async () => {
+  try {
+    await showFormPluginConfig()
   } catch (error) {
     console.error(error)
   }

package/homebridge-ui/server.js

@@ -5,39 +5,54 @@
 
 'use strict'
 
-const {
-  HomebridgePluginUiServer, RequestError
-} = require('@homebridge/plugin-ui-utils')
+const { UiServer } = require('homebridge-lib')
+const Deconz = require('../lib/Deconz')
 
-class UiServer extends HomebridgePluginUiServer {
+class DeconzUiServer extends UiServer {
   constructor () {
     super()
 
-    this.onRequest('/cachedAccessories', async (cachedAccessories) => {
-      try {
-        // console.log('%d accessories', cachedAccessories.length)
-        const gateways = cachedAccessories.filter((accessory) => {
-          return accessory.plugin === 'homebridge-deconz' &&
-            accessory.context != null &&
-            accessory.context.className === 'Gateway'
+    this.onRequest('discover', async (params) => {
+      if (this.discovery == null) {
+        this.discovery = new Deconz.Discovery({
+          // forceHttp: this.config.forceHttp,
+          // timeout: this.config.timeout
         })
-        // console.log('%d gateways', gateways.length)
-        const result = {}
-        for (const gateway of gateways) {
-          const { host, apiKey } = gateway.context
-          if (apiKey != null) {
-            result[host] = apiKey
-          }
-        }
-        console.log('%d gateways: %j', Object.keys(result).length, result)
-        return result
-      } catch (error) {
-        throw new RequestError(error)
+        this.discovery
+          .on('error', (error) => {
+            this.log(
+              '%s: request %d: %s %s', error.request.name,
+              error.request.id, error.request.method, error.request.resource
+            )
+            this.warn(
+              '%s: request %d: %s', error.request.name, error.request.id, error
+            )
+          })
+          .on('request', (request) => {
+            this.debug(
+              '%s: request %d: %s %s', request.name,
+              request.id, request.method, request.resource
+            )
+          })
+          .on('response', (response) => {
+            this.debug(
+              '%s: request %d: %d %s', response.request.name,
+              response.request.id, response.statusCode, response.statusMessage
+            )
+          })
+          .on('found', (name, id, address) => {
+            this.debug('%s: found %s at %s', name, id, address)
+          })
+          .on('searching', (host) => {
+            this.debug('upnp: listening on %s', host)
+          })
+          .on('searchDone', () => { this.debug('upnp: search done') })
       }
+      const configs = await this.discovery.discover()
+      return configs
     })
-
     this.ready()
   }
 }
 
-new UiServer() // eslint-disable-line no-new
+new DeconzUiServer() // eslint-disable-line no-new

package/lib/Deconz/Resource.js

@@ -656,7 +656,7 @@ class Resource {
             buttons.push([5, 'Next', SINGLE | LONG])
             break
           case 'TRADFRI wireless dimmer':
-            if (this.obj.mode === 1) {
+            if (this.body.mode === 1) {
               buttons.push([1, 'Turn Right', SINGLE | LONG])
               buttons.push([2, 'Turn Left', SINGLE | LONG])
             } else {
@@ -1187,9 +1187,9 @@ class Resource {
     */
   patchThermostat (gateway) {
     if (this.manufacturer === 'ELKO' && this.model === 'Super TR') {
-      this.capbilities.heatValue = 'heat'
+      this.capabilities.heatValue = 'heat'
     } else {
-      this.capbilities.heatValue = 'auto'
+      this.capabilities.heatValue = 'auto'
     }
   }
 
@@ -1197,7 +1197,8 @@ class Resource {
   * @param {DeconzAccessory.Gateway} gateway - The gateway.
     */
   patchWindowCovering (gateway) {
-    if (this.manufacturer === 'ELKO' && this.model === 'Super TR') {
+    if (this.manufacturer === 'LUMI' && this.model === 'lumi.curtain.acn002') {
+      this.capabilities.maxSpeed = 2
       this.capabilities.positionChange = true
     }
   }

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
@@ -627,6 +629,45 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
 
   // ===========================================================================
 
+  async onUiGet (a) {
+    this.debug('ui request: GET %s', a.join('/'))
+    if (a.length === 0) {
+      return {
+        status: 200,
+        body: {
+          expose: this.service.values.expose,
+          groups: this.service.values.groups,
+          heartrate: this.service.values.heartrate,
+          lights: this.service.values.lights,
+          logLevel: this.service.values.logLevel,
+          schedules: this.service.values.schedules,
+          sensors: this.service.values.sensors
+          // deviceByRidByRtype: this.deviceByRidByRtype
+        }
+      }
+    }
+    if (a[0] !== 'accessories') {
+      return { status: 403 } // Forbidden
+    }
+    if (a.length === 1) {
+      return { status: 200, body: this.deviceByRidByRtype }
+    }
+    if (this.deviceById[a[1]] == null) {
+      return { status: 404 } // Not Found
+    }
+    if (a.length === 2) {
+      return { status: 200, body: this.deviceById[a[1]] }
+    }
+    return { status: 403 } // Forbidden
+  }
+
+  async onUiPut (a, body) {
+    this.debug('ui request: PUT %s %j', a.join('/'), body)
+    return { status: 501 } // Not Implented
+  }
+
+  // ===========================================================================
+
   /** Poll the gateway.
     *
     * Periodically get the gateway full state and call
@@ -639,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) {
@@ -673,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')
+      }
     }
   }
 
@@ -857,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)
@@ -867,24 +916,20 @@ 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',
           description: 'migration',
           classid: 1,
-          links: Object.keys(this.resourceByRpath).sort()
+          links: Object.keys(this.accessoryByRpath).sort()
         })
         this.context.migration = '/resourcelinks/' + response.success.id
       } else {
         await this.client.put(this.context.migration, {
-          links: Object.keys(this.resourceByRpath).sort()
+          links: Object.keys(this.accessoryByRpath).sort()
         })
       }
-      this.log(
-        'migration: %s: %d resources', this.context.migration, this.nResources
-      )
+      this.identify()
     }
   }
 

package/lib/DeconzPlatform.js

@@ -45,6 +45,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
       .stringKey('name')
       .stringKey('platform')
       .boolKey('forceHttp')
+      .stringKey('host')
       .arrayKey('hosts')
       .boolKey('noResponse')
       .intKey('parallelRequests', 1, 30)
@@ -60,6 +61,9 @@ class DeconzPlatform extends homebridgeLib.Platform {
 
     try {
       optionParser.parse(configJson)
+      if (this.config.host != null) {
+        this.config.hosts.push(this.config.host)
+      }
       this.discovery = new Deconz.Discovery({
         forceHttp: this.config.forceHttp,
         timeout: this.config.timeout
@@ -106,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')
   }
 
@@ -124,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)
+          }
         }
       }
 
@@ -150,9 +163,61 @@ 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) }
   }
 
+  async onUiRequest (method, url, body) {
+    const a = url.split('/').slice(1)
+    if (a.length < 1) {
+      return { status: 403 } // Forbidden
+    }
+    if (a[0] === 'gateways') {
+      if (a.length === 1) {
+        if (method === 'GET') {
+          // const gatewayByHost = await this.discovery.discover()
+          const gatewayByHost = {}
+          for (const id in this.gatewayMap) {
+            const gateway = this.gatewayMap[id]
+            gatewayByHost[gateway.context.host] = {
+              config: gateway.context.config,
+              host: gateway.context.host,
+              id: id
+            }
+          }
+          return {
+            status: 200,
+            body: Object.keys(gatewayByHost).sort().map((host) => {
+              return gatewayByHost[host]
+            })
+          }
+        }
+        return { status: 405 } // Method Not Allowed
+      }
+      const gateway = this.gatewayMap[a[1]]
+      const path = a.slice(2)
+      if (gateway == null) {
+        return { status: 404 } // Not Found
+      }
+      if (method === 'GET') {
+        return gateway.onUiGet(path)
+      }
+      if (method === 'PUT') {
+        return gateway.onUiPut(path, body)
+      }
+      return { status: 405 } // Method Not Allowed
+    }
+    return { status: 403 } // Forbidden
+  }
+
   async heartbeat (beat) {
     try {
       if (beat % 300 === 5 && this.config.hosts.length === 0) {

package/lib/DeconzService/Light.js

@@ -140,7 +140,7 @@ class Light extends DeconzService.LightsResource {
         unit: '°'
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
-          const hue = Math.round(this.hk.hue * 65535.0 / 360.0)
+          const hue = Math.round(this.values.hue * 65535.0 / 360.0)
           this.put({ hue: hue })
           this.values.colormode = 'hs'
         }
@@ -151,7 +151,7 @@ class Light extends DeconzService.LightsResource {
         unit: '%'
       }).on('didSet', (value, fromHomeKit) => {
         if (fromHomeKit) {
-          const sat = Math.round(this.hk.sat * 254.0 / 100.0)
+          const sat = Math.round(this.values.saturation * 254.0 / 100.0)
           this.put({ sat: sat })
           this.values.colormode = 'hs'
         }
@@ -236,31 +236,8 @@ class Light extends DeconzService.LightsResource {
     }
 
     if (this.resource.rtype === 'groups') {
-      this.sceneServices = []
-      for (const scene of this.resource.body.scenes) {
-        const service = new homebridgeLib.ServiceDelegate(accessory, {
-          name: this.resource.body.name + ' ' + scene.name,
-          Service: this.Services.hap.Switch,
-          subtype: this.subtype + '-S' + scene.id
-        })
-        service.addCharacteristicDelegate({
-          key: 'on',
-          Characteristic: this.Characteristics.hap.On,
-          value: false
-        }).on('didSet', async (value, fromHomeKit) => {
-          this.checkAdaptiveLighting()
-          if (fromHomeKit && value) {
-            try {
-              const path = this.resource.rpath + '/scenes/' + scene.id + '/recall'
-              this.debug('PUT %s', path)
-              await this.client.put(path)
-            } catch (error) { this.error(error) }
-            await timeout(this.platform.config.waitTimeReset)
-            service.values.on = false
-          }
-        })
-        this.sceneServices.push(service)
-      }
+      this.sceneServices = {}
+      this.updateScenes(this.resource.body.scenes)
     }
 
     if (this.capabilities.effects != null) {
@@ -412,6 +389,43 @@ class Light extends DeconzService.LightsResource {
     super.updateState(state)
   }
 
+  updateScenes (scenes) {
+    const sceneById = {}
+    for (const scene of scenes) {
+      sceneById[scene.id] = scene
+      if (this.sceneServices[scene.id] == null) {
+        const service = new homebridgeLib.ServiceDelegate(this.accessoryDelegate, {
+          name: this.resource.body.name + ' ' + scene.name,
+          Service: this.Services.hap.Switch,
+          subtype: this.subtype + '-S' + scene.id
+        })
+        service.addCharacteristicDelegate({
+          key: 'on',
+          Characteristic: this.Characteristics.hap.On,
+          value: false
+        }).on('didSet', async (value, fromHomeKit) => {
+          this.checkAdaptiveLighting()
+          if (fromHomeKit && value) {
+            try {
+              const path = this.resource.rpath + '/scenes/' + scene.id + '/recall'
+              this.debug('PUT %s', path)
+              await this.client.put(path)
+            } catch (error) { this.error(error) }
+            await timeout(this.platform.config.waitTimeReset)
+            service.values.on = false
+          }
+        })
+        this.sceneServices[scene.id] = service
+      }
+    }
+    for (const id in this.scenesServices) {
+      if (sceneById[id] == null) {
+        this.scenesSerices[id].destroy()
+        delete this.scenesService[id]
+      }
+    }
+  }
+
   initAdaptiveLighting () {
     if (this.adaptiveLighting == null) {
       this.adaptiveLighting = new homebridgeLib.AdaptiveLighting(

package/lib/DeconzService/Thermostat.js

@@ -12,7 +12,7 @@ const DeconzService = require('../DeconzService')
   */
 class Thermostat extends DeconzService.SensorsResource {
   constructor (accessory, resource, params = {}) {
-    params.Service = accessory.Services.hap.TemperatureSensor
+    params.Service = accessory.Services.hap.Thermostat
     super(accessory, resource, params)
 
     this.addCharacteristicDelegate({
@@ -65,7 +65,7 @@ class Thermostat extends DeconzService.SensorsResource {
       }
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {
-        await this.put('/mode', {
+        await this.put('/config', {
           mode: value === this.Characteristics.hap.TargetHeatingCoolingState.OFF
             ? 'off'
             : this.capabilities.heatValue

package/lib/DeconzService/WindowCovering.js

@@ -37,10 +37,6 @@ class WindowCovering extends DeconzService.LightsResource {
       key: 'positionState',
       Characteristic: this.Characteristics.hap.PositionState,
       value: this.Characteristics.hap.PositionState.STOPPED
-    }).on('didSet', (value) => {
-      if (value === this.Characteristics.hap.PositionState.STOPPED) {
-        this.values.targetPosition = this.values.currentPosition
-      }
     })
 
     this.addCharacteristicDelegate({
@@ -63,6 +59,25 @@ class WindowCovering extends DeconzService.LightsResource {
       })
     }
 
+    if (resource.capabilities.maxSpeed != null) {
+      this.addCharacteristicDelegate({
+        key: 'motorSpeed',
+        Characteristic: this.Characteristics.my.MotorSpeed,
+        unit: '',
+        props: {
+          unit: '',
+          minValue: 0,
+          maxValue: resource.capabilities.maxSpeed,
+          minStep: 1
+        }
+      }).on('didSet', async (value, fromHomeKit) => {
+        if (!fromHomeKit) {
+          return
+        }
+        await this.put({ speed: value })
+      })
+    }
+
     if (resource.capabilities.positionChange) {
       this.addCharacteristicDelegate({
         key: 'positionChange',
@@ -80,13 +95,10 @@ class WindowCovering extends DeconzService.LightsResource {
     this.addCharacteristicDelegates()
 
     this.update(resource.body, resource.rpath)
+    this.values.targetPosition = this.values.currentPosition
   }
 
-  setPosition () {
-    if (this.timer != null) {
-      clearTimeout(this.timer)
-      delete this.timer
-    }
+  async setPosition () {
     let lift = 100 - this.values.targetPosition // % closed --> % open
     if (this.venetianBlind) {
       if (this.values.closeUpwards) {
@@ -101,14 +113,11 @@ class WindowCovering extends DeconzService.LightsResource {
       this.values.targetPosition > this.values.currentPosition
         ? this.Characteristics.hap.PositionState.INCREASING
         : this.Characteristics.hap.PositionState.DECREASING
-    this.put({ lift: lift })
-    this.timer = setTimeout(() => {
-      this.values.positionState =
-        this.Characteristics.hap.PositionState.STOPPED
-    }, 15000)
+    this.moving = new Date()
+    await this.put({ lift: lift })
   }
 
-  updateState (state, rpath) {
+  updateState (state) {
     if (state.lift != null) {
       let position = Math.round(state.lift / 5) * 5
       let closeUpwards
@@ -121,16 +130,23 @@ class WindowCovering extends DeconzService.LightsResource {
         }
       }
       position = 100 - position // % open -> % closed
-      if (
-        position === this.values.targetPosition &&
-        (closeUpwards == null || closeUpwards === this.targetCloseUpwards)
-      ) {
-        this.values.positionState = this.Characteristics.hap.PositionState.STOPPED
-      }
       this.values.currentPosition = position
       if (closeUpwards != null) {
         this.values.closeUpwards = closeUpwards
       }
+      if (
+        this.moving == null || new Date() - this.moving >= 30000 || (
+          position === this.values.targetPosition &&
+          (closeUpwards == null || closeUpwards === this.targetCloseUpwards)
+        )
+      ) {
+        this.moving = null
+        this.values.targetPosition = position
+        this.values.positionState = this.Characteristics.hap.PositionState.STOPPED
+      }
+    }
+    if (state.speed != null) {
+      this.values.motorSpeed = state.speed
     }
     super.updateState(state)
   }

package/lib/DeconzService/index.js

@@ -91,6 +91,9 @@ class DeconzService extends homebridgeLib.ServiceDelegate {
     if (body.state != null) {
       this.updateState(body.state, rpath)
     }
+    if (body.scenes != null && this.rtype === 'groups') {
+      this.updateScenes(body.scenes)
+    }
   }
 }
 

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.12",
+  "version": "0.0.15",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -22,13 +22,12 @@
   "engines": {
     "deCONZ": "2.14.1",
     "homebridge": "^1.4.0",
-    "node": "^16.14.0"
+    "node": "^16.14.2"
   },
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "~0.0.19",
-    "homebridge-lib": "~5.2.3",
-    "semver": "^7.3.5",
-    "ws": "^8.4.2",
+    "homebridge-lib": "~5.4.0",
+    "semver": "^7.3.7",
+    "ws": "^8.5.0",
     "xml2js": "~0.4.23"
   },
   "scripts": {