homebridge-deconz 0.1.4 → 0.1.7

package/lib/DeconzPlatform.js

@@ -6,11 +6,11 @@
 'use strict'
 
 const events = require('events')
-const homebridgeLib = require('homebridge-lib')
+const { HttpClient, OptionParser, Platform, timeout } = require('homebridge-lib')
 const Deconz = require('./Deconz')
 const DeconzAccessory = require('./DeconzAccessory')
 
-class DeconzPlatform extends homebridgeLib.Platform {
+class DeconzPlatform extends Platform {
   constructor (log, configJson, homebridge, bridge) {
     super(log, configJson, homebridge)
     this.parseConfigJson(configJson)
@@ -38,7 +38,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
       waitTimeReset: 500,
       waitTimeUpdate: 100
     }
-    const optionParser = new homebridgeLib.OptionParser(this.config, true)
+    const optionParser = new OptionParser(this.config, true)
     optionParser
       .on('userInputError', (message) => {
         this.warn('config.json: %s', message)
@@ -71,7 +71,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
       })
       this.discovery
         .on('error', (error) => {
-          if (error instanceof homebridgeLib.HttpClient.HttpError) {
+          if (error instanceof HttpClient.HttpError) {
             this.log(
               '%s: request %d: %s %s', error.request.name,
               error.request.id, error.request.method, error.request.resource
@@ -123,7 +123,7 @@ class DeconzPlatform extends homebridgeLib.Platform {
       await this.foundGateway(host, config)
     } catch (error) {
       this.warn('%s: %s - retrying in 60s', host, error)
-      await homebridgeLib.timeout(60000)
+      await timeout(60000)
       return this.findHost(host)
     }
   }

package/lib/DeconzService/Battery.js

@@ -6,13 +6,13 @@
 'use strict'
 
 const Deconz = require('../Deconz')
-const homebridgeLib = require('homebridge-lib')
+const { ServiceDelegate } = require('homebridge-lib')
 const { dateToString } = Deconz.ApiClient
 
 /**
   * @memberof DeconzService
   */
-class Battery extends homebridgeLib.ServiceDelegate.Battery {
+class Battery extends ServiceDelegate.Battery {
   constructor (accessory, resource, params = {}) {
     super(accessory, {
       name: accessory.name + ' Battery',

package/lib/DeconzService/Button.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { ServiceDelegate } = require('homebridge-lib')
 
 const deconzEvent = {
   PRESS: 0,
@@ -25,7 +25,7 @@ let homeKitEvent
 /**
   * @memberof DeconzService
   */
-class Button extends homebridgeLib.ServiceDelegate {
+class Button extends ServiceDelegate {
   static get SINGLE () { return 0x01 }
   static get DOUBLE () { return 0x02 }
   static get LONG () { return 0x04 }

package/lib/DeconzService/Gateway.js

@@ -5,13 +5,13 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { ServiceDelegate } = require('homebridge-lib')
 
 /** Delegate class for a DeconzGateway service.
   * @extends ServiceDelegate
   * @memberof DeconzService
   */
-class Gateway extends homebridgeLib.ServiceDelegate {
+class Gateway extends ServiceDelegate {
   constructor (gateway, params = {}) {
     params.Service = gateway.Services.my.DeconzGateway
     params.exposeConfiguredName = true

package/lib/DeconzService/Light.js

@@ -5,12 +5,11 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { AdaptiveLighting, Colour, ServiceDelegate, timeout } = require('homebridge-lib')
 const DeconzService = require('../DeconzService')
 
-const { History } = homebridgeLib.ServiceDelegate
-const { timeout } = homebridgeLib
-const { xyToHsv, hsvToXy, ctToXy } = homebridgeLib.Colour
+const { xyToHsv, hsvToXy, ctToXy } = Colour
+const { History } = ServiceDelegate
 
 class Light extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -291,7 +290,7 @@ class Light extends DeconzService.LightsResource {
     })
     for (const id in this.capabilities.effects) {
       const effect = this.capabilities.effects[id]
-      const service = new homebridgeLib.ServiceDelegate(this.accessoryDelegate, {
+      const service = new ServiceDelegate(this.accessoryDelegate, {
         name: this.resource.body.name + ' ' + effect,
         Service: this.Services.hap.Lightbulb,
         subtype: (this.subtype == null ? 'E' : this.subtype + '-E') + id
@@ -461,7 +460,7 @@ class Light extends DeconzService.LightsResource {
     for (const scene of scenes) {
       sceneById[scene.id] = scene
       if (this.sceneServices[scene.id] == null) {
-        const service = new homebridgeLib.ServiceDelegate(this.accessoryDelegate, {
+        const service = new ServiceDelegate(this.accessoryDelegate, {
           name: this.resource.body.name + ' ' + scene.name,
           Service: this.Services.hap.Lightbulb,
           subtype: this.subtype + '-S' + scene.id,
@@ -504,7 +503,7 @@ class Light extends DeconzService.LightsResource {
   initAdaptiveLighting () {
     if (this.adaptiveLightingNotInitialised) {
       delete this.adaptiveLightingNotInitialised
-      this.adaptiveLighting = new homebridgeLib.AdaptiveLighting(
+      this.adaptiveLighting = new AdaptiveLighting(
         this.brightnessDelegate, this.colorTemperatureDelegate
       )
       if (this.values.activeTransitionCount > 0) {

package/lib/DeconzService/LightsResource.js

@@ -5,12 +5,11 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { timeout } = require('homebridge-lib')
 const Deconz = require('../Deconz')
 const DeconzService = require('../DeconzService')
 
 const { HttpError } = Deconz.ApiClient
-const { timeout } = homebridgeLib
 
 class LightsResource extends DeconzService {
   constructor (accessory, resource, params) {

package/lib/DeconzService/WindowCovering.js

@@ -5,11 +5,9 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { timeout } = require('homebridge-lib')
 const DeconzService = require('../DeconzService')
 
-const { timeout } = homebridgeLib
-
 class WindowCovering extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
     params.Service = accessory.Services.hap.WindowCovering

package/lib/DeconzService/index.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const homebridgeLib = require('homebridge-lib')
+const { ServiceDelegate } = require('homebridge-lib')
 const Deconz = require('../Deconz')
 
 const { dateToString } = Deconz.ApiClient
@@ -13,7 +13,7 @@ const { dateToString } = Deconz.ApiClient
 /** Service delegates.
   * @extends ServiceDelegate
   */
-class DeconzService extends homebridgeLib.ServiceDelegate {
+class DeconzService extends ServiceDelegate {
   static get AirPressure () { return require('./AirPressure') }
   static get AirPurifier () { return require('./AirPurifier') }
   static get AirQuality () { return require('./AirQuality') }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -18,16 +18,16 @@
   "main": "index.js",
   "bin": {
     "deconz": "cli/deconz.js",
-    "ui": "cli/ui.sh"
+    "ui": "cli/ui.js"
   },
   "engines": {
     "deCONZ": "2.19.3",
     "homebridge": "^1.6.0",
-    "node": "^18.14.0"
+    "node": "^18.14.1"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.8",
-    "ws": "^8.12.0",
+    "homebridge-lib": "~6.3.10",
+    "ws": "^8.12.1",
     "xml2js": "~0.4.23"
   },
   "scripts": {

package/cli/ui.sh

@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-
-# homebridge-deconz/cli/ui.sh
-# Copyright © 2023 Erik Baauw. All rights reserved.
-#
-# Command line interface to Homebridge deCONZ UI Server.
-
-me=$(basename "$0")
-
-function fatal() {
-    echo "${me}: $1" >&2
-    exit 1
-}
-
-if [ -z "${HOMEBRIDGE_DIR}" ] ; then
-    if [ -d /var/lib/homebridge ] ; then
-        HOMEBRIDGE_DIR=/var/lib/homebridge
-    elif [ -d ~/.homebridge ] ; then
-        HOMEBRIDGE_DIR=~/.homebridge
-    else
-        fatal "cannot find Homebridge directory - set HOMEBRIDGE_DIR"
-    fi
-fi
-
-if [ ! -f "${HOMEBRIDGE_DIR}/config.json" ] ; then
-    fatal "${HOMEBRIDGE_DIR|}/config.json: no such file"
-fi
-
-platformId=$(json -alp /platforms "${HOMEBRIDGE_DIR}/config.json" | grep /platform:\"deCONZ\" | cut -d / -f 2)
-if [ -z "${platformId}" ] ; then
-    fatal "${HOMEBRIDGE_DIR}/config.json: cannot find deCONZ platform"
-fi
-
-username=$(json -alp /platforms/${platformId}/_bridge "${HOMEBRIDGE_DIR}/config.json" | grep /username: | cut -d \" -f 2 | sed -e "s/://g")
-if [ -z "${username}" ] ; then
-    # Main Homebridge instance
-    cachedAccessories="${HOMEBRIDGE_DIR}/accessories/cachedAccessories"
-else
-    # Child bridge instance
-    cachedAccessories="${HOMEBRIDGE_DIR}/accessories/cachedAccessories.${username}"
-fi
-if [ ! -f "${cachedAccessories}" ] ; then
-    fatal "${cachedAccessories}: no such file"
-    exit 1
-fi
-
-uiPort=$(json -alp /${platformId}/context "${cachedAccessories}" | grep /uiPort: | cut -d : -f 2)
-gateway=$(json -alp /${platformId}/context "${cachedAccessories}" | grep /gid: | cut -d \" -f 2)
-
-url="http://127.0.0.1:${uiPort}"
-
-if [ "$(curl -s ${url}/ping)" != '"pong"' ] ; then
-   fatal "${url}: cannot connect to UI server"
-fi
-
-if [ -z "${1}" ] ; then
-    cat - >&2 <<+
-Usage: ${me} command [arguments]
-
-Commands:
-  get                       Get gateway details.
-  put body                  Update gateway settings.
-  getDevices                Get list of devices.
-  getDevice id              Get device details.
-  putDevice id body         Update device settings.
-  getAccessories            Get list of accessories
-  getAccessory id           Get accessory details
-  putAccessory id body      Update accessory settings.
-+
-    exit 1
-fi
-
-case "$1" in
-    get)            curl -s ${url}/gateways/${gateway} | json ;;
-    put)            curl -s -X PUT -d "${2}" ${url}/gateways/${gateway}/settings | json ;;
-    getDevices)     curl -s ${url}/gateways/${gateway}/devices | json ;;
-    getDevice)      curl -s ${url}/gateways/${gateway}/devices/${1} | json ;;
-    putDevice)      curl -s -X PUT -d "${2}" ${url}/gateways/${gateway}/devices/${1}/settings | json ;;
-    getAccessories) curl -s ${url}/gateways/${gateway}/accessories | json ;;
-    getAccessory)   curl -s ${url}/gateways/${gateway}/accessories/${1} | json ;;
-    putAccessory)   curl -s -X PUT -d "${2}" ${url}/gateways/${gateway}/accessories/${1}/settings | json ;;
-    *)              fatal "${1}: invalid command" ;;
-esac