homebridge-deconz 1.0.12 → 1.0.13

package/cli/deconz.js

@@ -5,9 +5,11 @@
 //
 // Command line interface to deCONZ gateway.
 
-'use strict'
+import { createRequire } from 'node:module'
 
-const { DeconzTool } = require('hb-deconz-tools')
-const pkgJson = require('../package.json')
+import { DeconzTool } from 'hb-deconz-tools/DeconzTool'
 
-new DeconzTool(pkgJson).main()
+const require = createRequire(import.meta.url)
+const packageJson = require('../package.json')
+
+new DeconzTool(packageJson).main()

package/cli/otau.js

@@ -5,9 +5,11 @@
 //
 // Command line interface to deCONZ gateway.
 
-'use strict'
+import { createRequire } from 'node:module'
 
-const { OtauTool } = require('hb-deconz-tools')
-const pkgJson = require('../package.json')
+import { OtauTool } from 'hb-deconz-tools/OtauTool'
 
-new OtauTool(pkgJson).main()
+const require = createRequire(import.meta.url)
+const packageJson = require('../package.json')
+
+new OtauTool(packageJson).main()

package/cli/ui.js

@@ -5,13 +5,16 @@
 //
 // Command line interface to Homebridge deCONZ UI Server.
 
-'use strict'
+import { readFile } from 'node:fs/promises'
+import { createRequire } from 'node:module'
 
-const fs = require('fs').promises
-// const Deconz = require('../lib/Deconz')
-const {
-  CommandLineParser, CommandLineTool, HttpClient, JsonFormatter, OptionParser
-} = require('hb-lib-tools')
+import { CommandLineParser } from 'hb-lib-tools/CommandLineParser'
+import { CommandLineTool } from 'hb-lib-tools/CommandLineTool'
+import { HttpClient } from 'hb-lib-tools/HttpClient'
+import { JsonFormatter } from 'hb-lib-tools/JsonFormatter'
+import { OptionParser } from 'hb-lib-tools/OptionParser'
+
+const require = createRequire(import.meta.url)
 const packageJson = require('../package.json')
 
 const { b, u } = CommandLineTool
@@ -247,7 +250,7 @@ class Main extends CommandLineTool {
     */
   async readJsonFile (filename) {
     this.vdebug('reading %s', filename)
-    const text = await fs.readFile(filename)
+    const text = await readFile(filename)
     this.debug('%s: %d bytes', filename, text.length)
     const body = JSON.parse(text)
     this.vdebug('%s: %j', filename, body)

package/homebridge-ui/server.js

@@ -3,10 +3,8 @@
 // Homebridge plug-in for deCONZ.
 // Copyright © 2022-2024 Erik Baauw. All rights reserved.
 
-'use strict'
-
-const { UiServer } = require('homebridge-lib')
-const { Discovery } = require('hb-deconz-tools')
+import { UiServer } from 'hb-lib-tools/UiServer'
+import { Discovery } from 'hb-deconz-tools/Discovery'
 
 class DeconzUiServer extends UiServer {
   constructor () {

package/index.js

@@ -3,11 +3,15 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { createRequire } from 'node:module'
 
-const DeconzPlatform = require('./lib/DeconzPlatform')
+import { DeconzPlatform } from './lib/DeconzPlatform.js'
+
+const require = createRequire(import.meta.url)
 const packageJson = require('./package.json')
 
-module.exports = function (homebridge) {
+function main (homebridge) {
   DeconzPlatform.loadPlatform(homebridge, packageJson, 'deCONZ', DeconzPlatform)
 }
+
+export { main as default }

package/lib/Deconz/Device.js

@@ -3,7 +3,7 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { Deconz } from './index.js'
 
 /** Delegate class for a Zigbee or virtual device on a deCONZ gateway.
   *
@@ -112,4 +112,4 @@ class Device {
   }
 }
 
-module.exports = Device
+Deconz.Device = Device

package/lib/Deconz/Resource.js

@@ -3,12 +3,15 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { OptionParser } from 'homebridge-lib/OptionParser'
 
-const { OptionParser } = require('homebridge-lib')
-const { ApiClient } = require('hb-deconz-tools')
-const DeconzAccessory = require('../DeconzAccessory')
-const DeconzService = require('../DeconzService')
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
+
+import { Deconz } from './index.js'
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
+import '../DeconzAccessory/Gateway.js'
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/Button.js'
 
 const { toInstance, toInt, toObject, toString } = OptionParser
 const { buttonEvent } = ApiClient
@@ -1157,4 +1160,4 @@ class Resource {
   }
 }
 
-module.exports = Resource
+Deconz.Resource = Resource

package/lib/Deconz/index.js

@@ -3,14 +3,9 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
 /** Library to discover, monitor, and interact with a deCONZ gateway.
   * @hideconstructor
   */
-class Deconz {
-  static get Device () { return require('./Device') }
-  static get Resource () { return require('./Resource') }
-}
+class Deconz {}
 
-module.exports = Deconz
+export { Deconz }

package/lib/DeconzAccessory/AirPurifier.js

@@ -3,9 +3,7 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzAccessory = require('../DeconzAccessory')
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
 
 class AirPurifier extends DeconzAccessory {
   /** Instantiate a delegate for an accessory corresponding to a device.
@@ -33,4 +31,4 @@ class AirPurifier extends DeconzAccessory {
   }
 }
 
-module.exports = AirPurifier
+DeconzAccessory.AirPurifier = AirPurifier

package/lib/DeconzAccessory/Gateway.js

@@ -3,14 +3,29 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { timeout } from 'homebridge-lib'
+import { AccessoryDelegate } from 'homebridge-lib/AccessoryDelegate'
+import { OptionParser } from 'homebridge-lib/OptionParser'
+
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
+import { ApiError } from 'hb-deconz-tools/ApiError'
+import { WsClient } from 'hb-deconz-tools/WsClient'
+
+import { Deconz } from '../Deconz/index.js'
+import '../Deconz/Resource.js'
+import '../Deconz/Device.js'
+
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
+import '../DeconzAccessory/AirPurifier.js'
+import '../DeconzAccessory/Light.js'
+import '../DeconzAccessory/Sensor.js'
+import '../DeconzAccessory/Thermostat.js'
+import '../DeconzAccessory/WarningDevice.js'
+import '../DeconzAccessory/WindowCovering.js'
+
+import { DeconzService } from '../DeconzService/index.js'
 
-const { AccessoryDelegate, OptionParser, timeout } = require('homebridge-lib')
-const { ApiClient, ApiError, WsClient } = require('hb-deconz-tools')
 const { HttpError } = ApiClient
-const Deconz = require('../Deconz')
-const DeconzAccessory = require('../DeconzAccessory')
-const DeconzService = require('../DeconzService')
 
 const migration = {
   name: 'homebridge-deconz',
@@ -225,7 +240,7 @@ class Gateway extends AccessoryDelegate {
     this.exposeErrorById = {}
 
     /** The service delegate for the Gateway Settings settings.
-      * @type {DeconzService.GatewaySettings}
+      * @type {DeconzService.Gateway}
       */
     this.service = new DeconzService.Gateway(this, {
       name: this.name + ' Gateway',
@@ -1134,7 +1149,7 @@ class Gateway extends AccessoryDelegate {
               } else {
                 this.debug('%s: exposed by legacy code', name)
               }
-              this.addAccessory(id)
+              await this.addAccessory(id)
               changed = true
             }
           } else {
@@ -1160,6 +1175,9 @@ class Gateway extends AccessoryDelegate {
 
     this.vdebug('analysing schedules...')
     if (this.values.exposeSchedules) {
+      if (DeconzService.Schedule == null) {
+        await import('../DeconzService/Schedule.js')
+      }
       for (const rid in fullState.schedules) {
         if (this.scheduleServicesByRid[rid] == null) {
           this.scheduleServicesByRid[rid] = new DeconzService.Schedule(
@@ -1225,4 +1243,4 @@ class Gateway extends AccessoryDelegate {
   }
 }
 
-module.exports = Gateway
+DeconzAccessory.Gateway = Gateway

package/lib/DeconzAccessory/Light.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
+import 'homebridge-lib/ServiceDelegate/History'
 
-const { ServiceDelegate } = require('homebridge-lib')
-const DeconzAccessory = require('../DeconzAccessory')
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
 
 /** Delegate class for a HomeKit accessory, corresponding to a light device
   * or groups resource.
@@ -127,26 +127,33 @@ class Light extends DeconzAccessory {
         })
       }
     } else {
+      this.debug('servicesByServiceName: %j', Object.keys(this.servicesByServiceName))
+      this.debug('servicesByServiceName[%s]: %j', this.values.serviceName, Object.keys(this.servicesByServiceName[this.values.serviceName]))
       for (const i in this.servicesByServiceName[this.values.serviceName]) {
-        const service = this.servicesByServiceName[this.values.serviceName][i]
-        service.addCharacteristicDelegate({
-          key: 'index',
-          Characteristic: this.Characteristics.hap.ServiceLabelIndex,
-          silent: true,
-          value: Number(i) + 1
-        })
-        service.values.index = Number(i) + 1
-        if (i === '0') {
-          continue
-        }
-        this.historyService?.addLastOnDelegate(
-          service.characteristicDelegate('on'),
+        try {
+          const service = this.servicesByServiceName[this.values.serviceName][i]
+          this.debug('service %d: %j', i, service.rpath)
           service.addCharacteristicDelegate({
-            key: 'lastActivation',
-            Characteristic: this.Characteristics.eve.LastActivation,
-            silent: true
+            key: 'index',
+            Characteristic: this.Characteristics.hap.ServiceLabelIndex,
+            silent: true,
+            value: Number(i) + 1
           })
-        )
+          service.values.index = Number(i) + 1
+          if (i === '0') {
+            continue
+          }
+          this.historyService?.addLastOnDelegate(
+            service.characteristicDelegate('on'),
+            service.addCharacteristicDelegate({
+              key: 'lastActivation',
+              Characteristic: this.Characteristics.eve.LastActivation,
+              silent: true
+            })
+          )
+        } catch (error) {
+          this.warn(error)
+        }
       }
     }
 
@@ -157,4 +164,6 @@ class Light extends DeconzAccessory {
   }
 }
 
-module.exports = Light
+DeconzAccessory.Light = Light
+DeconzAccessory.Outlet = Light
+DeconzAccessory.Switch = Light

package/lib/DeconzAccessory/Sensor.js

@@ -8,10 +8,10 @@
 // Stateless Programmable Switch (Eve button)
 // Sensors
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
+import 'homebridge-lib/ServiceDelegate/History'
 
-const { ServiceDelegate } = require('homebridge-lib')
-const DeconzAccessory = require('../DeconzAccessory')
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
 
 class Sensor extends DeconzAccessory {
   constructor (gateway, device) {
@@ -150,4 +150,4 @@ class Sensor extends DeconzAccessory {
   }
 }
 
-module.exports = Sensor
+DeconzAccessory.Sensor = Sensor

package/lib/DeconzAccessory/Thermostat.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
+import 'homebridge-lib/ServiceDelegate/History'
 
-const { ServiceDelegate } = require('homebridge-lib')
-const DeconzAccessory = require('../DeconzAccessory')
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
 
 class Thermostat extends DeconzAccessory {
   /** Instantiate a delegate for an accessory corresponding to a device.
@@ -42,4 +42,4 @@ class Thermostat extends DeconzAccessory {
   }
 }
 
-module.exports = Thermostat
+DeconzAccessory.Thermostat = Thermostat

package/lib/DeconzAccessory/WarningDevice.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
+import 'homebridge-lib/ServiceDelegate/History'
 
-const { ServiceDelegate } = require('homebridge-lib')
-const DeconzAccessory = require('../DeconzAccessory')
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
 
 /** Delegate class for a HomeKit accessory, corresponding to a light device
   * or groups resource.
@@ -57,4 +57,4 @@ class WarningDevice extends DeconzAccessory {
   }
 }
 
-module.exports = WarningDevice
+DeconzAccessory.WarningDevice = WarningDevice

package/lib/DeconzAccessory/WindowCovering.js

@@ -3,9 +3,7 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzAccessory = require('../DeconzAccessory')
+import { DeconzAccessory } from '../DeconzAccessory/index.js'
 
 /** Delegate class for a HomeKit accessory, corresponding to a light device
   * or groups resource.
@@ -42,4 +40,4 @@ class WindowCovering extends DeconzAccessory {
   }
 }
 
-module.exports = WindowCovering
+DeconzAccessory.WindowCovering = WindowCovering

package/lib/DeconzAccessory/index.js

@@ -3,11 +3,41 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { AccessoryDelegate } from 'homebridge-lib/AccessoryDelegate'
+import { OptionParser } from 'homebridge-lib/OptionParser'
 
-const { AccessoryDelegate, OptionParser } = require('homebridge-lib')
-const { ApiClient } = require('hb-deconz-tools')
-const DeconzService = require('../DeconzService')
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
+
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/AirPressure.js'
+import '../DeconzService/AirPurifier.js'
+import '../DeconzService/AirQuality.js'
+import '../DeconzService/Alarm.js'
+import '../DeconzService/Battery.js'
+import '../DeconzService/Button.js'
+import '../DeconzService/CarbonMonoxide.js'
+import '../DeconzService/Consumption.js'
+import '../DeconzService/Contact.js'
+import '../DeconzService/Daylight.js'
+import '../DeconzService/Flag.js'
+import '../DeconzService/Gateway.js'
+import '../DeconzService/Humidity.js'
+import '../DeconzService/Label.js'
+import '../DeconzService/Leak.js'
+import '../DeconzService/Light.js'
+import '../DeconzService/LightLevel.js'
+import '../DeconzService/Motion.js'
+import '../DeconzService/Outlet.js'
+import '../DeconzService/Power.js'
+import '../DeconzService/Schedule.js'
+import '../DeconzService/Status.js'
+import '../DeconzService/Smoke.js'
+import '../DeconzService/Switch.js'
+import '../DeconzService/Temperature.js'
+import '../DeconzService/Thermostat.js'
+import '../DeconzService/Valve.js'
+import '../DeconzService/WarningDevice.js'
+import '../DeconzService/WindowCovering.js'
 
 const { HttpError } = ApiClient
 const { SINGLE, DOUBLE, LONG } = DeconzService.Button
@@ -17,14 +47,6 @@ const { SINGLE, DOUBLE, LONG } = DeconzService.Button
   * @extends AccessoryDelegate
   */
 class DeconzAccessory extends AccessoryDelegate {
-  static get Light () { return require('./Light') }
-  static get Gateway () { return require('./Gateway') }
-  static get Outlet () { return DeconzAccessory.Light }
-  static get Sensor () { return require('./Sensor') }
-  static get Switch () { return DeconzAccessory.Light }
-  static get WarningDevice () { return require('./WarningDevice') }
-  static get WindowCovering () { return require('./WindowCovering') }
-
   /** Instantiate a delegate for an accessory corresponding to a device.
     * @param {DeconzAccessory.Gateway} gateway - The gateway.
     * @param {Deconz.Device} device - The device.
@@ -330,4 +352,4 @@ class DeconzAccessory extends AccessoryDelegate {
   }
 }
 
-module.exports = DeconzAccessory
+export { DeconzAccessory }

package/lib/DeconzPlatform.js

@@ -3,12 +3,17 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { once } from 'node:events'
 
-const events = require('events')
-const { HttpClient, OptionParser, Platform, timeout } = require('homebridge-lib')
-const { Discovery } = require('hb-deconz-tools')
-const DeconzAccessory = require('./DeconzAccessory')
+import { timeout } from 'homebridge-lib'
+import { HttpClient } from 'homebridge-lib/HttpClient'
+import { OptionParser } from 'homebridge-lib/OptionParser'
+import { Platform } from 'homebridge-lib/Platform'
+
+import { Discovery } from 'hb-deconz-tools/Discovery'
+
+import { DeconzAccessory } from './DeconzAccessory/index.js'
+import './DeconzAccessory/Gateway.js'
 
 class DeconzPlatform extends Platform {
   constructor (log, configJson, homebridge, bridge) {
@@ -112,7 +117,7 @@ class DeconzPlatform extends Platform {
       this.gatewayMap[id] = new DeconzAccessory.Gateway(this, { config, host })
     }
     await this.gatewayMap[id].found(host, config)
-    await events.once(this.gatewayMap[id], 'initialised')
+    await once(this.gatewayMap[id], 'initialised')
     this.emit('found')
   }
 
@@ -137,12 +142,12 @@ class DeconzPlatform extends Platform {
         }
       } else {
         this.debug('job %d: find at least one gateway', jobs.length)
-        jobs.push(events.once(this, 'found'))
+        jobs.push(once(this, 'found'))
         for (const id in this.gatewayMap) {
           const gateway = this.gatewayMap[id]
           const host = gateway.values.host
           this.debug('job %d: find gateway %s', jobs.length, id)
-          jobs.push(events.once(gateway, 'initialised'))
+          jobs.push(once(gateway, 'initialised'))
           try {
             const config = await this.discovery.config(host)
             await this.foundGateway(host, config)
@@ -259,4 +264,4 @@ class DeconzPlatform extends Platform {
   }
 }
 
-module.exports = DeconzPlatform
+export { DeconzPlatform }

package/lib/DeconzService/AirPressure.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -47,4 +46,4 @@ class AirPressure extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = AirPressure
+DeconzService.AirPressure = AirPressure

package/lib/DeconzService/AirPurifier.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 class FilterMaintenance extends DeconzService.SensorsResource {
   constructor (accessory, resource, params = {}) {
@@ -203,4 +202,4 @@ class AirPurifier extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = AirPurifier
+DeconzService.AirPurifier = AirPurifier

package/lib/DeconzService/AirQuality.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
-const { ApiClient } = require('hb-deconz-tools')
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 const { dateToString } = ApiClient
 
@@ -170,4 +170,4 @@ class AirQuality extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = AirQuality
+DeconzService.AirQuality = AirQuality

package/lib/DeconzService/Alarm.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -33,4 +32,4 @@ class Alarm extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Alarm
+DeconzService.Alarm = Alarm

package/lib/DeconzService/Battery.js

@@ -3,10 +3,13 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
+import 'homebridge-lib/ServiceDelegate/Battery'
+
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
+
+import { DeconzService } from '../DeconzService/index.js'
 
-const { ApiClient } = require('hb-deconz-tools')
-const { ServiceDelegate } = require('homebridge-lib')
 const { dateToString } = ApiClient
 
 /**
@@ -74,4 +77,4 @@ class Battery extends ServiceDelegate.Battery {
   }
 }
 
-module.exports = Battery
+DeconzService.Battery = Battery

package/lib/DeconzService/Button.js

@@ -3,9 +3,9 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
-const { ServiceDelegate } = require('homebridge-lib')
+import { DeconzService } from './index.js'
 
 const deconzEvent = {
   PRESS: 0,
@@ -174,4 +174,4 @@ class Button extends ServiceDelegate {
   }
 }
 
-module.exports = Button
+DeconzService.Button = Button

package/lib/DeconzService/CarbonMonoxide.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -35,4 +34,4 @@ class CarbonMonoxide extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = CarbonMonoxide
+DeconzService.CarbonMonoxide = CarbonMonoxide

package/lib/DeconzService/Consumption.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
-const { ApiClient } = require('hb-deconz-tools')
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 const { dateToString } = ApiClient
 
@@ -74,4 +74,4 @@ class Consumption extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Consumption
+DeconzService.Consumption = Consumption

package/lib/DeconzService/Contact.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -37,4 +36,4 @@ class Contact extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Contact
+DeconzService.Contact = Contact

package/lib/DeconzService/Daylight.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
-const { ApiClient } = require('hb-deconz-tools')
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 const { dateToString } = ApiClient
 
@@ -132,4 +132,4 @@ class Daylight extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Daylight
+DeconzService.Daylight = Daylight

package/lib/DeconzService/Flag.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -49,4 +48,4 @@ class Flag extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Flag
+DeconzService.Flag = Flag

package/lib/DeconzService/Gateway.js

@@ -3,9 +3,9 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
-const { ServiceDelegate } = require('homebridge-lib')
+import { DeconzService } from './index.js'
 
 /** Delegate class for a DeconzGateway service.
   * @extends ServiceDelegate
@@ -55,4 +55,4 @@ class Gateway extends ServiceDelegate {
   }
 }
 
-module.exports = Gateway
+DeconzService.Gateway = Gateway

package/lib/DeconzService/Humidity.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -38,4 +37,4 @@ class Humidity extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Humidity
+DeconzService.Humidity = Humidity

package/lib/DeconzService/Label.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -105,4 +104,4 @@ class Label extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Label
+DeconzService.Label = Label

package/lib/DeconzService/Leak.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -35,4 +34,4 @@ class Leak extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Leak
+DeconzService.Leak = Leak

package/lib/DeconzService/Light.js

@@ -3,10 +3,13 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { timeout } from 'homebridge-lib'
+import { AdaptiveLighting } from 'homebridge-lib/AdaptiveLighting'
+import { Colour } from 'homebridge-lib/Colour'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
-const { AdaptiveLighting, Colour, ServiceDelegate, timeout } = require('homebridge-lib')
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/LightsResource.js'
 
 const { defaultGamut, xyToHsv, hsvToXy, ctToXy } = Colour
 
@@ -589,4 +592,4 @@ class Light extends DeconzService.LightsResource {
   }
 }
 
-module.exports = Light
+DeconzService.Light = Light

package/lib/DeconzService/LightLevel.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
-const { ApiClient } = require('hb-deconz-tools')
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 const { lightLevelToLux } = ApiClient
 
@@ -53,4 +53,4 @@ class LightLevel extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = LightLevel
+DeconzService.LightLevel = LightLevel

package/lib/DeconzService/LightsResource.js

@@ -3,10 +3,9 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { timeout } from 'homebridge-lib'
 
-const { timeout } = require('homebridge-lib')
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
 
 class LightsResource extends DeconzService {
   constructor (accessory, resource, params) {
@@ -104,4 +103,4 @@ class LightsResource extends DeconzService {
   }
 }
 
-module.exports = LightsResource
+DeconzService.LightsResource = LightsResource

package/lib/DeconzService/Motion.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -88,4 +87,4 @@ class Motion extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Motion
+DeconzService.Motion = Motion

package/lib/DeconzService/Outlet.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/LightsResource.js'
 
 class Outlet extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -81,4 +80,4 @@ class Outlet extends DeconzService.LightsResource {
   }
 }
 
-module.exports = Outlet
+DeconzService.Outlet = Outlet

package/lib/DeconzService/Power.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
-const DeconzService = require('../DeconzService')
-const { ApiClient } = require('hb-deconz-tools')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 const { dateToString } = ApiClient
 
@@ -84,4 +84,4 @@ class Power extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Power
+DeconzService.Power = Power

package/lib/DeconzService/Schedule.js

@@ -3,10 +3,11 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
-const { ApiClient } = require('hb-deconz-tools')
-const { ServiceDelegate } = require('homebridge-lib')
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
+
+import { DeconzService } from '../DeconzService/index.js'
 
 const { HttpError } = ApiClient
 
@@ -66,4 +67,4 @@ class Schedule extends ServiceDelegate {
   }
 }
 
-module.exports = Schedule
+DeconzService.Schedule = Schedule

package/lib/DeconzService/SensorsResource.js

@@ -3,10 +3,9 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
-const { ApiClient } = require('hb-deconz-tools')
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
 
 const { dateToString } = ApiClient
 
@@ -86,4 +85,4 @@ class SensorsResource extends DeconzService {
   }
 }
 
-module.exports = SensorsResource
+DeconzService.SensorsResource = SensorsResource

package/lib/DeconzService/Smoke.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -48,4 +47,4 @@ class Smoke extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Smoke
+DeconzService.Smoke = Smoke

package/lib/DeconzService/Status.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -74,4 +73,4 @@ class Status extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Status
+DeconzService.Status = Status

package/lib/DeconzService/Switch.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/LightsResource.js'
 
 class Switch extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -75,4 +74,4 @@ class Switch extends DeconzService.LightsResource {
   }
 }
 
-module.exports = Switch
+DeconzService.Switch = Switch

package/lib/DeconzService/Temperature.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -67,4 +66,4 @@ class Temperature extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Temperature
+DeconzService.Temperature = Temperature

package/lib/DeconzService/Thermostat.js

@@ -3,9 +3,8 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
-
-const DeconzService = require('../DeconzService')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/SensorsResource.js'
 
 /**
   * @memberof DeconzService
@@ -183,4 +182,4 @@ class Thermostat extends DeconzService.SensorsResource {
   }
 }
 
-module.exports = Thermostat
+DeconzService.Thermostat = Thermostat

package/lib/DeconzService/Valve.js

@@ -3,12 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/LightsResource.js'
 
-const DeconzService = require('../DeconzService')
-// const timeout = require('homebridge-lib')
-
-class Switch extends DeconzService.LightsResource {
+class Valve extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
     params.Service = accessory.Services.hap.Valve
     super(accessory, resource, params)
@@ -122,4 +120,4 @@ class Switch extends DeconzService.LightsResource {
   }
 }
 
-module.exports = Switch
+DeconzService.Valve = Valve

package/lib/DeconzService/WarningDevice.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { timeout } from 'homebridge-lib'
 
-const DeconzService = require('../DeconzService')
-const { timeout } = require('homebridge-lib')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/LightsResource.js'
 
 class WarningDevice extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -61,4 +61,4 @@ class WarningDevice extends DeconzService.LightsResource {
   }
 }
 
-module.exports = WarningDevice
+DeconzService.WarningDevice = WarningDevice

package/lib/DeconzService/WindowCovering.js

@@ -3,10 +3,10 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { timeout } from 'homebridge-lib'
 
-const DeconzService = require('../DeconzService')
-const { timeout } = require('homebridge-lib')
+import { DeconzService } from '../DeconzService/index.js'
+import '../DeconzService/LightsResource.js'
 
 class WindowCovering extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -166,4 +166,4 @@ class WindowCovering extends DeconzService.LightsResource {
   }
 }
 
-module.exports = WindowCovering
+DeconzService.WindowCovering = WindowCovering

package/lib/DeconzService/index.js

@@ -3,10 +3,9 @@
 //
 // Homebridge plugin for deCONZ.
 
-'use strict'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
-const { ApiClient } = require('hb-deconz-tools')
-const { ServiceDelegate } = require('homebridge-lib')
+import { ApiClient } from 'hb-deconz-tools/ApiClient'
 
 const { HttpError, dateToString } = ApiClient
 
@@ -14,38 +13,6 @@ const { HttpError, dateToString } = ApiClient
   * @extends ServiceDelegate
   */
 class DeconzService extends ServiceDelegate {
-  static get AirPressure () { return require('./AirPressure') }
-  static get AirPurifier () { return require('./AirPurifier') }
-  static get AirQuality () { return require('./AirQuality') }
-  static get Alarm () { return require('./Alarm') }
-  static get Battery () { return require('./Battery') }
-  static get Button () { return require('./Button') }
-  static get CarbonMonoxide () { return require('./CarbonMonoxide') }
-  static get Consumption () { return require('./Consumption') }
-  static get Contact () { return require('./Contact') }
-  static get Daylight () { return require('./Daylight') }
-  static get Flag () { return require('./Flag') }
-  static get Gateway () { return require('./Gateway') }
-  static get Humidity () { return require('./Humidity') }
-  static get Label () { return require('./Label') }
-  static get Leak () { return require('./Leak') }
-  static get Light () { return require('./Light') }
-  static get LightsResource () { return require('./LightsResource') }
-  static get LightLevel () { return require('./LightLevel') }
-  static get Motion () { return require('./Motion') }
-  static get Outlet () { return require('./Outlet') }
-  static get Power () { return require('./Power') }
-  static get Schedule () { return require('./Schedule') }
-  static get SensorsResource () { return require('./SensorsResource') }
-  static get Status () { return require('./Status') }
-  static get Smoke () { return require('./Smoke') }
-  static get Switch () { return require('./Switch') }
-  static get Temperature () { return require('./Temperature') }
-  static get Thermostat () { return require('./Thermostat') }
-  static get Valve () { return require('./Valve') }
-  static get WarningDevice () { return require('./WarningDevice') }
-  static get WindowCovering () { return require('./WindowCovering') }
-
   constructor (accessory, resource, params) {
     super(accessory, {
       id: resource.id,
@@ -129,4 +96,4 @@ class DeconzService extends ServiceDelegate {
   }
 }
 
-module.exports = DeconzService
+export { DeconzService }

package/package.json

@@ -3,8 +3,11 @@
   "description": "Homebridge plugin for deCONZ",
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
+  "maintainers": [
+    "ebaauw"
+  ],
   "license": "Apache-2.0",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -15,6 +18,7 @@
     "dresden-elektronik",
     "dresdenelektronik"
   ],
+  "type": "module",
   "main": "index.js",
   "bin": {
     "deconz": "cli/deconz.js",
@@ -22,13 +26,13 @@
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.26.3",
-    "homebridge": "^1.7.0",
+    "deCONZ": "2.27.6",
+    "homebridge": "^1.8.4||^2.0.0-beta",
     "node": "^20||^18"
   },
   "dependencies": {
-    "hb-deconz-tools": "~1.0.15",
-    "homebridge-lib": "~6.7.5"
+    "hb-deconz-tools": "~2.0.3",
+    "homebridge-lib": "~7.0.5"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",