homebridge-lib 7.0.0-0 → 7.0.0

package/cli/hap.js

@@ -7,6 +7,11 @@
 //
 // Logger for HomeKit accessory announcements.
 
-import { HapTool } from 'hb-lib-tools'
+import { createRequire } from 'node:module'
 
-new HapTool(import.meta.dirname).main()
+import { HapTool } from 'hb-lib-tools/HapTool'
+
+const require = createRequire(import.meta.url)
+const packageJson = require('../package.json')
+
+new HapTool(packageJson).main()

package/cli/json.js

@@ -7,6 +7,11 @@
 //
 // JSON formatter.
 
-import { JsonTool } from 'hb-lib-tools'
+import { createRequire } from 'node:module'
 
-new JsonTool(import.meta.dirname).main()
+import { JsonTool } from 'hb-lib-tools/JsonTool'
+
+const require = createRequire(import.meta.url)
+const packageJson = require('../package.json')
+
+new JsonTool(packageJson).main()

package/cli/sysinfo.js

@@ -7,6 +7,11 @@
 //
 // Show system info.
 
-import { SysinfoTool } from 'hb-lib-tools'
+import { createRequire } from 'node:module'
 
-new SysinfoTool(import.meta.dirname).main()
+import { SysinfoTool } from 'hb-lib-tools/SysinfoTool'
+
+const require = createRequire(import.meta.url)
+const packageJson = require('../package.json')
+
+new SysinfoTool(packageJson).main()

package/cli/upnp.js

@@ -7,6 +7,11 @@
 //
 // Logger for UPnP device announcements.
 
-import { UpnpTool } from 'hb-lib-tools'
+import { createRequire } from 'node:module'
 
-new UpnpTool(import.meta.dirname).main()
+import { UpnpTool } from 'hb-lib-tools/UpnpTool'
+
+const require = createRequire(import.meta.url)
+const packageJson = require('../package.json')
+
+new UpnpTool(packageJson).main()

package/index.js

@@ -4,7 +4,7 @@
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
 /** Library for Homebridge plugins.
-  * see the {@tutorial homebridgeLib} tutorial.
+  * see the {@tutorial homebridge-lib} tutorial.
   *
   * Homebridge Lib provides:
   * - A series of base classes for building Homebridge dynamic platform plugins:
@@ -34,7 +34,7 @@
   * To access the classes provided by Homebridge Lib from your module,
   * simply load it by:
   * ```javascript
-  * import homebridgeLib from 'homebridge-lib'
+  * import { Class } from 'homebridge-lib/Class'
   * ```
   *
   * Note that each class provided by Homebridge Lib is implemented as a
@@ -42,188 +42,26 @@
   * Due to the way NodeJS deals with circular module dependencies, these modules
   * might not yet be initialised while your module is loading.
   *
-  * @module homebridgeLib
+  * @module homebridge-lib
   */
 
-/** Abstract superclass for {@link Platform}, {@link AccessoryDelegate},
-  * {@link ServiceDelegate}, and {@link CharacteristicDelegate}.
-  * <br>See {@link Delegate}.
-  * @name Delegate
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { Delegate } from './lib/Delegate.js'
-
-/** Delegate of a HomeKit accessory.
-  * <br>See {@link AccessoryDelegate}.
-  * @name AccessoryDelegate
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { AccessoryDelegate } from './lib/AccessoryDelegate.js'
-
-/** Adaptive Lighting.
-  * <br>See {@link AdaptiveLighting}.
-  * @name AdaptiveLighting
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { AdaptiveLighting } from './lib/AdaptiveLighting.js'
-
-/** Return the `Bonjour` class from [`bonjour-hap`](https://github.com/homebridge/bonjour),
-  * so plugins don't have to list this as a separate dependency.
-  * @name Bonjour
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { Bonjour } from 'hb-lib-tools'
-
-/** Delegate of a HomeKit characteristic.
-  * <br>See {@link CharacteristicDelegate}.
-  * @name CharacteristicDelegate
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { CharacteristicDelegate } from './lib/CharacteristicDelegate.js'
-
-/** Colour conversions.
-  * <br>See {@link Colour}.
-  * @name Colour
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { Colour } from 'hb-lib-tools'
-
-/** Parser and validator for command-line arguments.
-  * <br>See {@link CommandLineParser}.
-  * @name CommandLineParser
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { CommandLineParser } from 'hb-lib-tools'
-
-/** Command-line tool.
-  * <br>See {@link CommandLineTool}.
-  * @name CommandLineTool
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { CommandLineTool } from 'hb-lib-tools'
-
-/** Abstract superclass for {@link EveHomeKitTypes}
-  * and {@link MyHomeKitTypes}.
-  * <br>See {@link CustomHomeKitTypes}.
-  * @name CustomHomeKitTypes
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { CustomHomeKitTypes } from './lib/CustomHomeKitTypes.js'
-
-/** Custom HomeKit services and characteristics used by
-  * [Eve](https://www.evehome.com/en) accessories and by the
-  * [Eve app](https://www.evehome.com/en/eve-app).
-  * <br>See {@link EveHomeKitTypes}.
-  * @name EveHomeKitTypes
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { EveHomeKitTypes } from './lib/EveHomeKitTypes.js'
-
-/** HTTP client.
-  * <br>See {@link HttpClient}.
-  * @name HttpClient
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { HttpClient } from 'hb-lib-tools'
-
-/** JSON formatter.
-  * <br>See {@link JsonFormatter}.
-  * @name JsonFormatter
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { JsonFormatter } from 'hb-lib-tools'
-
-/** My own collection of custom HomeKit services and characteristics.
-  * <br>See {@link MyHomeKitTypes}.
-  * @name MyHomeKitTypes
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { MyHomeKitTypes } from './lib/MyHomeKitTypes.js'
-
-/** Parser and validator for options and other parameters.
-  * <br>See {@link OptionParser}.
-  * @name OptionParser
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { OptionParser } from 'hb-lib-tools'
-
-/** Homebridge dynamic platform plugin.
-  * <br>See {@link Platform}.
-  * @name Platform
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { Platform } from './lib/Platform.js'
-
-/** Delegate of a property of a HomeKit accessory or service.
-  * <br>See {@link PropertyDelegate}.
-  * @name PropertyDelegate
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { PropertyDelegate } from './lib/PropertyDelegate.js'
-
-/** Delegate of a HomeKit service.
-  * <br>See {@link ServiceDelegate}.
-  * @name ServiceDelegate
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { ServiceDelegate } from './lib/ServiceDelegate/index.js'
-
-/** System information.
-  * <br>See {@link SystemInfo}.
-  * @name SystemInfo
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { SystemInfo } from 'hb-lib-tools'
-
-/** Universal Plug and Play client.
-  * <br>See {@link UpnpClient}.
-  * @name UpnpClient
-  * @type {Class}
-  * @memberof module:homebridgeLib
-  */
-export { UpnpClient } from 'hb-lib-tools'
-
-// /** Server for dynamic configuration settings through Homebridge UI.
-//   * <br>See {@link UiServer}.
-//   * @name UiServer
-//   * @type {Class}
-//   * @memberof module:homebridgeLib
-//   */
-// export { UiServer } from './lib/UiServer.js'
-
 /** Convert Error to string.
   *
   * Include the stack trace only for programming errors (JavaScript and NodeJS
   * runtime errors).
   * Translate system errors into more readable messages.
+  * @function formatError
   * @param {Error} e - The error.
   * @param {boolean} [useChalk=false] - Use chalk to grey out the stack trace.
   * @returns {string} - The error as string.
-  * @memberof module:homebridgeLib
+  * @memberof module:homebridge-lib
   */
 export { formatError } from 'hb-lib-tools'
 
 /** Return the recommended version of NodeJS from package.json.
   * This is the version used to develop and test the software,
   * typically the latest LTS version.
+  * @function recommendedNodeVersion
   * @param {string} packageJson - The contents of package.json
   * #return {string} - The recommended version.
   * @memberof module:hbLibTools
@@ -234,38 +72,24 @@ export { recommendedNodeVersion } from 'hb-lib-tools'
   *
   * E.g. to delay execution for 1.5 seconds, issue:
   * ```javascript
-  *   await homebridgeLib.timeout(1500)
+  *   import { timeout } from 'homebridge-lib'
+  *
+  *   await timeout(1500)
   * ```
   *
+  * @function timeout
   * @param {integer} msec - Period (in msec) to wait.
   * @throws {TypeError} On invalid parameter type.
   * @throws {RangeError} On invalid parameter value.
-  * @memberof module:homebridgeLib
+  * @memberof module:homebridge-lib
   */
 export { timeout } from 'hb-lib-tools'
 
 /** Convert integer to hex string.
+  * @function toHexString
   * @param {integer} i - The integer.
   * @param {integer} [length=4] - The number of digits in the hex string.
   * @returns {string} - The hex string.
-  * @memberof module:homebridgeLib
+  * @memberof module:homebridge-lib
   */
 export { toHexString } from 'hb-lib-tools'
-
-/** Return the [`chalk`](https://github.com/chalk/chalk) module,
-  * so plugins don't have to list this as a separate dependency.
-  * @memberof module:homebridgeLib
-  */
-export { chalk } from 'hb-lib-tools'
-
-/** Return the [`semver`](https://github.com/npm/node-semver) module,
-  * so plugins don't have to list this as a separate dependency.
-  * @memberof module:homebridgeLib
-  */
-export { semver } from 'hb-lib-tools'
-
-export { AccessoryInformation } from './lib/ServiceDelegate/AccessoryInformation.js'
-export { Battery } from './lib/ServiceDelegate/Battery.js'
-export { Dummy } from './lib/ServiceDelegate/Dummy.js'
-export { History } from './lib/ServiceDelegate/History.js'
-export { ServiceLabel } from './lib/ServiceDelegate/ServiceLabel.js'

package/lib/AccessoryDelegate.js

@@ -3,10 +3,21 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { CharacteristicDelegate, Delegate, PropertyDelegate, ServiceDelegate } from '../index.js'
+import { CharacteristicDelegate } from 'homebridge-lib/CharacteristicDelegate'
+import { Delegate } from 'homebridge-lib/Delegate'
+import { PropertyDelegate } from 'homebridge-lib/PropertyDelegate'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
+import 'homebridge-lib/ServiceDelegate/AccessoryInformation'
 
 const startsWithUuid = /^[0-9A-F]{8}-[0-9A-F]{4}-[1-5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}/
 
+/** Delegate of a HomeKit accessory.
+  * <br>See {@link AccessoryDelegate}.
+  * @name AccessoryDelegate
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+
 /** Delegate of a HomeKit accessory.
   *
   * @abstract
@@ -73,8 +84,7 @@ class AccessoryDelegate extends Delegate {
 
     // Create delegate for AccessoryInformation service.
     this._serviceDelegates = {}
-    this._accessoryInformationDelegate =
-      new ServiceDelegate.AccessoryInformation(this, params)
+    this._accessoryInformationDelegate = new ServiceDelegate.AccessoryInformation(this, params)
 
     // Configure PlatformAccessory.
     this._accessory.on('identify', this._identify.bind(this))

package/lib/AdaptiveLighting.js

@@ -3,7 +3,7 @@
 // Library for Homebridge plugins.
 // Copyright © 2020-2024 Erik Baauw. All rights reserved.
 
-import { CharacteristicDelegate } from '../index.js'
+import { CharacteristicDelegate } from 'homebridge-lib/CharacteristicDelegate'
 
 /* global BigInt */
 
@@ -162,6 +162,13 @@ function tlvFromHexString (type, value) {
   return tlvFromBuffer(type, Buffer.from(value, 'hex'))
 }
 
+/** Adaptive Lighting.
+  * <br>See {@link AdaptiveLighting}.
+  * @name AdaptiveLighting
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+
 /** Adaptive Lighting.
   */
 class AdaptiveLighting {

package/lib/Bonjour.js

@@ -0,0 +1,12 @@
+// homebridge-lib/lib/Bonjour.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** Return the `Bonjour` class from [`bonjour-hap`](https://github.com/homebridge/bonjour),
+  * so plugins don't have to list this as a separate dependency.
+  * @name Bonjour
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { Bonjour } from 'hb-lib-tools/Bonjour'

package/lib/CharacteristicDelegate.js

@@ -3,7 +3,16 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { Delegate, OptionParser, ServiceDelegate } from '../index.js'
+import { Delegate } from 'homebridge-lib/Delegate'
+import { OptionParser } from 'homebridge-lib/OptionParser'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
+
+/** Delegate of a HomeKit characteristic.
+  * <br>See {@link CharacteristicDelegate}.
+  * @name CharacteristicDelegate
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
 
 /** Delegate of a HomeKit characteristic.
   *

package/lib/Colour.js

@@ -0,0 +1,12 @@
+// homebridge-lib/lib/Colour.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** Colour conversions.
+  * <br>See {@link Colour}.
+  * @name Colour
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { Colour } from 'hb-lib-tools/Colour'

package/lib/CommandLineParser.js

@@ -0,0 +1,12 @@
+// homebridge-lib/lib/CommandLineParser.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** Parser and validator for command-line arguments.
+  * <br>See {@link CommandLineParser}.
+  * @name CommandLineParser
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { CommandLineParser } from 'hb-lib-tools/CommandLineParser'

package/lib/CommandLineTool.js

@@ -0,0 +1,12 @@
+// homebridge-lib/lib/CommandLineTool.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** Command-line tool.
+  * <br>See {@link CommandLineTool}.
+  * @name CommandLineTool
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { CommandLineTool } from 'hb-lib-tools/CommandLineTool'

package/lib/CustomHomeKitTypes.js

@@ -13,6 +13,14 @@ let hap
 let hapCharacteristics
 let hapServices
 
+/** Abstract superclass for {@link EveHomeKitTypes}
+  * and {@link MyHomeKitTypes}.
+  * <br>See {@link CustomHomeKitTypes}.
+  * @name CustomHomeKitTypes
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+
 /** Abstract superclass for {@link EveHomeKitTypes} and {@link MyHomeKitTypes}.
   *
   * `CustomHomeKitTypes` creates and manages a collection of:

package/lib/Delegate.js

@@ -5,7 +5,17 @@
 
 import { EventEmitter } from 'node:events'
 
-import { HttpClient, Platform } from '../index.js'
+import { HttpClient } from 'hb-lib-tools/HttpClient'
+
+import { Platform } from 'homebridge-lib/Platform'
+
+/** Abstract superclass for {@link Platform}, {@link AccessoryDelegate},
+  * {@link ServiceDelegate}, and {@link CharacteristicDelegate}.
+  * <br>See {@link Delegate}.
+  * @name Delegate
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
 
 /** Abstract superclass for {@link Platform}, {@link AccessoryDelegate},
   * {@link ServiceDelegate}, and {@link CharacteristicDelegate}.

package/lib/EveHomeKitTypes.js

@@ -3,7 +3,7 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { CustomHomeKitTypes } from '../index.js'
+import { CustomHomeKitTypes } from 'homebridge-lib/CustomHomeKitTypes'
 
 // Return long Eve UUID.
 function uuid (id) {
@@ -14,6 +14,15 @@ function uuid (id) {
   return `E863F${id}-079E-48FF-8F27-9C2605A29F52`
 }
 
+/** Custom HomeKit services and characteristics used by
+  * [Eve](https://www.evehome.com/en) accessories and by the
+  * [Eve app](https://www.evehome.com/en/eve-app).
+  * <br>See {@link EveHomeKitTypes}.
+  * @name EveHomeKitTypes
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+
 /** Custom HomeKit Services and Characteristic used by
   * [Eve](https://www.evehome.com/en) accessories and by the
   * [Eve app](https://www.evehome.com/en/eve-app).

package/lib/HttpClient.js

@@ -0,0 +1,7 @@
+/** HTTP client.
+  * <br>See {@link HttpClient}.
+  * @name HttpClient
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { HttpClient } from 'hb-lib-tools/HttpClient'

package/lib/JsonFormatter.js

@@ -0,0 +1,7 @@
+/** JSON formatter.
+  * <br>See {@link JsonFormatter}.
+  * @name JsonFormatter
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { JsonFormatter } from 'hb-lib-tools/JsonFormatter'

package/lib/MyHomeKitTypes.js

@@ -5,16 +5,21 @@
 //
 // My own collection of custom HomeKit Services and Characteristics.
 
-import { CustomHomeKitTypes } from '../index.js'
+import { CustomHomeKitTypes } from 'homebridge-lib/CustomHomeKitTypes'
 
 function uuid (id) {
   return MyHomeKitTypes.uuid(id, '-0000-1000-8000-656261617577')
 }
-
-/**
- * My own collection of custom HomeKit Services and Characteristics.
- * @extends CustomHomeKitTypes
- */
+/** My own collection of custom HomeKit services and characteristics.
+  * <br>See {@link MyHomeKitTypes}.
+  * @name MyHomeKitTypes
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+
+/** My own collection of custom HomeKit Services and Characteristics.
+  * @extends CustomHomeKitTypes
+  */
 class MyHomeKitTypes extends CustomHomeKitTypes {
   /**
    * Create my custom HomeKit Services and Characteristics.

package/lib/OptionParser.js

@@ -0,0 +1,12 @@
+// homebridge-lib/lib/OptionParser.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2017-2024 Erik Baauw. All rights reserved.
+
+/** Parser and validator for options and other parameters.
+  * <br>See {@link OptionParser}.
+  * @name OptionParser
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { OptionParser } from 'hb-lib-tools/OptionParser'

package/lib/Platform.js

@@ -4,21 +4,25 @@
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
 import { once } from 'node:events'
-import { readFileSync } from 'node:fs'
 import { writeFile, unlink } from 'node:fs/promises'
 import { Server, STATUS_CODES } from 'node:http'
-import { join } from 'node:path'
+import { createRequire } from 'node:module'
 import { format, promisify } from 'node:util'
 import zlib from 'node:zlib'
 
-import {
-  Delegate, EveHomeKitTypes, HttpClient, MyHomeKitTypes, SystemInfo,
-  UpnpClient, formatError, recommendedNodeVersion, semver
-} from '../index.js'
+import { HttpClient } from 'hb-lib-tools/HttpClient'
+import { SystemInfo } from 'hb-lib-tools/SystemInfo'
+import { UpnpClient } from 'hb-lib-tools/UpnpClient'
 
-const libPackageJson = JSON.parse(
-  readFileSync(join(import.meta.dirname, '../package.json'), 'utf8')
-)
+import { Delegate } from 'homebridge-lib/Delegate'
+import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes'
+import { MyHomeKitTypes } from 'homebridge-lib/MyHomeKitTypes'
+import { semver } from 'homebridge-lib/semver'
+
+import { formatError, recommendedNodeVersion } from 'homebridge-lib'
+
+const require = createRequire(import.meta.url)
+const libPackageJson = require('../package.json')
 
 const uuid = /^[0-9A-F]{8}-[0-9A-F]{4}-[1-5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/
 const gzip = promisify(zlib.gzip)
@@ -36,6 +40,13 @@ const context = {
   driftWarningThreshold: 2500
 }
 
+/** Homebridge dynamic platform plugin.
+  * <br>See {@link Platform}.
+  * @name Platform
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+
 /** Homebridge dynamic platform plugin.
   *
   * `Platform` provides the following features to a platform plugin:
@@ -59,12 +70,12 @@ class Platform extends Delegate {
     * @static
     * @param {!API} homebridge - Homebridge
     * [API](https://github.com/nfarina/homebridge/blob/master/lib/api.js).
-    * @param {!string} dirName - The name of the plugin's directory.
+    * @param {!object} packageJson - The contents of the plugin's `package.json`.
     * @param {!string} platformName - The name of the platform plugin, as used
     * in Homebridge's `config.json`.
     * @param {!Platform} Platform - The constructor of the platform plugin.
     */
-  static loadPlatform (homebridge, dirName, platformName, Platform) {
+  static loadPlatform (homebridge, packageJson, platformName, Platform) {
     if (context.homebridge == null) {
       context.homebridge = homebridge
       context.homebridgeVersion = homebridge.serverVersion
@@ -109,9 +120,6 @@ class Platform extends Delegate {
         my: Object.freeze(my.Characteristics)
       })
     }
-    const packageJson = JSON.parse(
-      readFileSync(join(dirName, 'package.json'), 'utf8')
-    )
     context[Platform.name] = { packageJson, platformName }
     // console.log(
     //   '%s v%s, node v%s, homebridge v%s, %s v%s',

package/lib/PropertyDelegate.js

@@ -3,7 +3,15 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { AccessoryDelegate, Delegate } from '../index.js'
+import { AccessoryDelegate } from 'homebridge-lib/AccessoryDelegate'
+import { Delegate } from 'homebridge-lib/Delegate'
+
+/** Delegate of a property of a HomeKit accessory or service.
+  * <br>See {@link PropertyDelegate}.
+  * @name PropertyDelegate
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
 
 /** Delegate of a property of a delegate of a HomeKit accessory or HomeKit
   * service.

package/lib/ServiceDelegate/AccessoryInformation.js

@@ -3,7 +3,7 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { ServiceDelegate } from './index.js'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
 /** Class for an _AccessoryInformation_ service delegate.
   *
@@ -109,4 +109,4 @@ class AccessoryInformation extends ServiceDelegate {
   }
 }
 
-export { AccessoryInformation }
+ServiceDelegate.AccessoryInformation = AccessoryInformation

package/lib/ServiceDelegate/Battery.js

@@ -3,7 +3,7 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { ServiceDelegate } from '../../index.js'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
 /** Class for a _Battery_ service delegate.
   *
@@ -103,4 +103,4 @@ class Battery extends ServiceDelegate {
   }
 }
 
-export { Battery }
+ServiceDelegate.Battery = Battery

package/lib/ServiceDelegate/Dummy.js

@@ -3,7 +3,7 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { ServiceDelegate } from '../../index.js'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
 /** Class for a delegate for a dummy _StatelessProgrammableSwitch_ service.
   *
@@ -42,4 +42,4 @@ class Dummy extends ServiceDelegate {
   }
 }
 
-export { Dummy }
+ServiceDelegate.Dummy = Dummy

package/lib/ServiceDelegate/History.js

@@ -7,7 +7,8 @@
 // fakagato-history repository, copyright © 2017 simont77.
 // See https://github.com/simont77/fakegato-history.
 
-import { CharacteristicDelegate, ServiceDelegate } from '../../index.js'
+import { CharacteristicDelegate } from 'homebridge-lib/CharacteristicDelegate'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
 // Eve history keeps time as # seconds since epoch of 2001/01/01.
 // @type {integer}
@@ -747,4 +748,4 @@ class History extends ServiceDelegate {
   }
 }
 
-export { History }
+ServiceDelegate.History = History

package/lib/ServiceDelegate/ServiceLabel.js

@@ -3,7 +3,7 @@
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import { ServiceDelegate } from '../../index.js'
+import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 
 /** Class for a _ServiceLabel_ service delegate.
   *
@@ -45,4 +45,4 @@ class ServiceLabel extends ServiceDelegate {
   }
 }
 
-export { ServiceLabel }
+ServiceDelegate.ServiceLabel = ServiceLabel

package/lib/{ServiceDelegate/index.js → ServiceDelegate.js}

@@ -1,12 +1,18 @@
-// homebridge-lib/lib/ServiceDelegate/index.js
+// homebridge-lib/lib/ServiceDelegate.js
 //
 // Library for Homebridge plugins.
 // Copyright © 2017-2024 Erik Baauw. All rights reserved.
 
-import {
-  AccessoryDelegate, CharacteristicDelegate, Delegate,
-  AccessoryInformation, Battery, Dummy, History, ServiceLabel
-} from '../../index.js'
+import { AccessoryDelegate } from 'homebridge-lib/AccessoryDelegate'
+import { CharacteristicDelegate } from 'homebridge-lib/CharacteristicDelegate'
+import { Delegate } from 'homebridge-lib/Delegate'
+
+/** Delegate of a HomeKit service.
+  * <br>See {@link ServiceDelegate}.
+  * @name ServiceDelegate
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
 
 /** Delegate of a HomeKit service.
   *
@@ -21,12 +27,6 @@ import {
   * @extends Delegate
   */
 class ServiceDelegate extends Delegate {
-  static get AccessoryInformation () { return AccessoryInformation }
-  static get Battery () { return Battery }
-  static get Dummy () { return Dummy }
-  static get History () { return History }
-  static get ServiceLabel () { return ServiceLabel }
-
   /** Create a new instance of a HomeKit service delegate.
     *
     * When the associated HomeKit service was restored from persistent

package/lib/SystemInfo.js

@@ -0,0 +1,12 @@
+// homebridge-lib/lib/SystemInfo.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** System information.
+  * <br>See {@link SystemInfo}.
+  * @name SystemInfo
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { SystemInfo } from 'hb-lib-tools/SystemInfo'

package/lib/UiServer.js

@@ -10,7 +10,16 @@ import { format } from 'node:util'
 // Somehow this causes Homebridge to crash with SIGTERM after ~9 seconds.
 import { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils'
 
-import { HttpClient, chalk, formatError } from '../index.js'
+import { formatError } from 'hb-lib-tools'
+import { chalk } from 'hb-lib-tools/chalk'
+import { HttpClient } from 'hb-lib-tools/HttpClient'
+
+/** Server for dynamic configuration settings through Homebridge UI.
+  * <br>See {@link UiServer}.
+  * @name UiServer
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
 
 /** Server for handling Homebridge Plugin UI requests.
   *

package/lib/UpnpClient.js

@@ -0,0 +1,12 @@
+// homebridge-lib/lib/UpnpClient.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** Universal Plug and Play client.
+  * <br>See {@link UpnpClient}.
+  * @name UpnpClient
+  * @type {Class}
+  * @memberof module:homebridge-lib
+  */
+export { UpnpClient } from 'hb-lib-tools/UpnpClient'

package/lib/chalk.js

@@ -0,0 +1,11 @@
+// homebridge-lib/lib/chalk.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** Return the [`chalk`](https://github.com/chalk/chalk) module,
+  * so plugins don't have to list this as a separate dependency.
+  * @name chalk
+  * @memberof module:homebridge-lib
+  */
+export { chalk } from 'hb-lib-tools/chalk'

package/lib/semver.js

@@ -0,0 +1,11 @@
+// homebridge-lib/lib/semver.js
+//
+// Library for Homebridge plugins.
+// Copyright © 2020-2024 Erik Baauw. All rights reserved.
+
+/** Return the [`semver`](https://github.com/npm/node-semver) module,
+  * so plugins don't have to list this as a separate dependency.
+  * @name semver
+  * @memberof module:homebridge-lib
+  */
+export { semver } from 'hb-lib-tools/semver'

package/package.json

@@ -3,13 +3,17 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "7.0.0-0",
+  "version": "7.0.0",
   "keywords": [
     "homekit",
     "homebridge"
   ],
   "type": "module",
   "main": "index.js",
+  "exports": {
+    ".": "./index.js",
+    "./*": "./lib/*.js"
+  },
   "files": [
     "index.js",
     "lib",
@@ -22,12 +26,12 @@
     "upnp": "cli/upnp.js"
   },
   "engines": {
-    "homebridge": "^1.7.0",
+    "homebridge": "^1.8.1",
     "node": "20.12.2||^20||^18"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "~1.0.3",
-    "hb-lib-tools": "~2.0.0-0"
+    "hb-lib-tools": "~2.0.0"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",