homebridge-soundtouchspeaker 0.2.4-beta.2 → 0.2.4

package/.commitlintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@commitlint/config-conventional"]
+}

package/.husky/commit-msg

@@ -0,0 +1 @@
+npx --no-install commitlint --edit "$1"

package/.releaserc.json

@@ -0,0 +1,9 @@
+{
+  "branches": ["latest", { "name": "beta", "prerelease": true }],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/npm",
+    "@semantic-release/github"
+  ]
+}

package/CONTRIBUTING.md

@@ -0,0 +1,80 @@
+# Contributing
+
+Thanks for helping improve this plugin. This document covers the branching
+model, commit/PR naming rules, and how releases are produced.
+
+## Local setup
+
+Requires Node.js 22 or 24.
+
+```sh
+npm install      # installs deps and Git hooks (husky)
+npm run build    # type-check and compile to dist/
+npm test         # run the test suite
+npm run lint     # eslint (use npm run format for prettier)
+npm run watch    # build, npm link, and reload on change for live testing
+```
+
+## Branching model
+
+The release pipeline flows **`latest` → `dev` → `beta` → `latest`**.
+
+| Branch           | Purpose                              | On push                                  |
+| ---------------- | ------------------------------------ | ---------------------------------------- |
+| `latest`         | stable release channel               | publishes `x.y.z` to npm `@latest`       |
+| `beta`           | pre-release channel                  | publishes `x.y.z-beta.n` to npm `@beta`  |
+| `dev`            | integration / active development     | CI only (no publish)                     |
+| feature branches | individual changes (`fix/…`, `feat/…`) | CI runs on the pull request            |
+
+Typical cycle:
+
+1. `dev` is cut from `latest` and tracks the next release.
+2. Branch feature work off `dev` and open a pull request **into `dev`**. CI
+   lints, builds, and tests it.
+3. Promote `dev` → `beta`. Merging publishes a pre-release to npm `@beta`.
+4. Once the pre-release is proven, promote `beta` → `latest`. Merging
+   publishes the stable release to npm `@latest`.
+
+> Use a regular merge (not squash) for the `dev → beta` and `beta → latest`
+> promotions so release tags stay reachable. Feature PRs into `dev` are
+> squash-merged.
+
+You never edit the `version` in `package.json`, write a changelog, or create
+GitHub Releases by hand — all of that is automated (see **Releases** below).
+
+## Commit and PR naming
+
+Commit messages **and pull request titles** must follow
+[Conventional Commits](https://www.conventionalcommits.org/). This is what
+decides the next version, so it is enforced:
+
+- a local `commit-msg` hook (commitlint) rejects invalid commit messages, and
+- a required **PR Title** check rejects invalid pull request titles.
+
+> Feature PRs are squash-merged, so the **PR title becomes the released commit
+> message**. Get the title right even if the individual commits were messy.
+
+| Prefix                              | Release  | Example                                  |
+| ----------------------------------- | -------- | ---------------------------------------- |
+| `fix:`                              | patch    | `fix: correct speaker discovery timeout` |
+| `feat:`                             | minor    | `feat: add volume control`               |
+| `feat!:` or a `BREAKING CHANGE:` footer | major | `feat!: drop Homebridge v1 support`      |
+| `chore:` / `docs:` / `ci:` / `test:` / `refactor:` | none | `chore: bump dev dependencies`  |
+
+If a change should not trigger a release (tooling, docs, CI), use one of the
+no-release types.
+
+## Releases
+
+Releases are fully automated with
+[semantic-release](https://semantic-release.gitbook.io/) when commits land on
+`beta` or `latest`. On a release-worthy commit it:
+
+- determines the next version from the commit messages,
+- publishes to npm (with provenance) on the matching dist-tag,
+- creates the git tag, and
+- creates a GitHub Release with notes generated from the commits.
+
+Because release branches are protected, semantic-release does **not** commit a
+version bump back to the repo — git tags are the source of truth, and the
+changelog lives in the GitHub Releases, not a committed file.

package/README.md

@@ -1,30 +1,38 @@
-# homebridge-soundtouch-platform
+# homebridge-soundtouch-speaker
 
 [![npm version](https://badge.fury.io/js/homebridge-soundtouchspeaker.svg)](https://badge.fury.io/js/homebridge-soundtouchspeaker)
 [![npm downloads](https://badgen.net/npm/dt/homebridge-soundtouchspeaker)](https://badgen.net/npm/dt/homebridge-soundtouchspeaker)
 
-[Bose SoundTouch](https://www.bose.com/soundtouch-systems.html) plugin for [Homebridge](https://github.com/nfarina/homebridge)
+[Bose SoundTouch](https://www.bose.com/soundtouch-systems.html) plugin for [Homebridge](https://github.com/homebridge/homebridge).
 
 This allows you to control your SoundTouch devices with HomeKit and Siri.
 
-Attempts to repair the [plugin](https://github.com/bbriatte/homebridge-soundtouch-platform/blob/master/README.md) originally 
-made by [@bbriatte](http://github.com/bbriatte) to work on Homebridge v1.8.
+Attempts to repair the [plugin](https://github.com/bbriatte/homebridge-soundtouch-platform/blob/master/README.md) originally
+made by [@bbriatte](http://github.com/bbriatte) to work on current Homebridge (v1.8 and v2).
 
 Initial version only supports a switch accessory type, to power a speaker on and off. Future versions hope to reinstate support
 for other features like volume control, sources, presets, lightbulb mode if there is demand.
 
 ## Prerequisites
-1. [Homebridge](https://github.com/homebridge/homebridge) v1.8.0 or later
-2. Node 18, 20, or 22
+1. [Homebridge](https://github.com/homebridge/homebridge) v1.8.0 or later (Homebridge v2 is supported)
+2. Node.js 22 or 24
 
 ## Installation
-1. Install the plugin to homebridge `hb-service add homebridge-soundtouchspeaker@beta` 
+Install through the [Homebridge UI](https://github.com/homebridge/homebridge-config-ui-x) (search for **SoundTouch Speaker**), or from the command line:
+
+```sh
+# stable
+hb-service add homebridge-soundtouchspeaker
+
+# latest pre-release
+hb-service add homebridge-soundtouchspeaker@beta
+```
 ## Configuration
 Example `config.json` to discover all SoundTouch accessories
 
 ```json
 {
-   "platform": "SoundTouchHomebridgePlugin",
+    "platform": "SoundTouchHomebridgePlugin",
     "discoverAllAccessories": true
 }
 ```
@@ -33,6 +41,7 @@ Example `config.json` to register a SoundTouch accessory using the speaker name
 
 ```json
 {
+    "platform": "SoundTouchHomebridgePlugin",
     "discoverAllAccessories": false,
     "accessories": [
         {
@@ -47,6 +56,7 @@ Example `config.json` to register a SoundTouch accessory using the ip address of
 
 ```json
 {
+    "platform": "SoundTouchHomebridgePlugin",
     "discoverAllAccessories": false,
     "accessories": [
         {
@@ -86,13 +96,19 @@ Example `config.json` for multiple speakers:
 * `global`: Default configuration for all accessories. see **Global element**
 
 ### Accessory element
+Each accessory must be matched to a device using either `ip` or `room`. If both are set, `ip` takes precedence.
+
 *Optional fields*
-* `name`: The name you want to use to control the SoundTouch. Defaults to the name of the device suffixed with speaker.
+* `name`: The name used for the accessory in HomeKit. Defaults to the device's own name as reported by the speaker.
 * `ip`: The ip address of your device on your network.
-* `room`: Should match exactly with the name of the SoundTouch device. Ignored if `ip` is set.
+* `port`: The port used to reach the device. Only used with `ip`. __default__: **8090**
+* `room`: Must match exactly the name of the SoundTouch device (as set in the Bose app). Ignored if `ip` is set.
+* `pollingInterval`: Poll this device every interval in milliseconds. Overrides the global value.
 
 
 ### Global element
+Default configuration applied to all accessories. Any value here can be overridden per accessory.
+
 *Optional fields*
-* `verbose`: Log all device information
-* `pollingInterval`: If set, poll the device each interval
+* `verbose`: Log all device information __default__: **false**
+* `pollingInterval`: Poll each device every interval in milliseconds __default__: **2000**

package/__mocks__/homebridge.js

@@ -0,0 +1,8 @@
+// Jest manual mock for homebridge — provides const enum values that SWC doesn't inline.
+export const LogLevel = {
+  INFO: 'info',
+  SUCCESS: 'success',
+  WARN: 'warn',
+  ERROR: 'error',
+  DEBUG: 'debug',
+};

package/config.schema.json

@@ -32,8 +32,8 @@
           "properties": {
             "name": {
               "type": "string",
-              "required": true,
-              "description": "Name of the speaker"
+              "required": false,
+              "description": "Name shown in HomeKit. Defaults to the device's own name."
             },
             "ip": {
               "type": "string",
@@ -42,6 +42,12 @@
               "pattern": "^[^{}/ :\\\\]+(?::\\d+)?$",
               "placeholder": "eg. 0.0.0.0"
             },
+            "port": {
+              "type": "integer",
+              "required": false,
+              "description": "Port to use with ip",
+              "placeholder": "8090"
+            },
             "room": {
               "type": "string",
               "required": false,

package/dist/PlatformConfiguration.js

@@ -5,11 +5,15 @@ const DEFAULT_POLLING_INTERVAL = 2 * 1000; // 2 seconds
 const DEFAULT_DISCOVER_ALL_ACCESSORIES = false;
 const DEFAULT_VERBOSE = false;
 export class PlatformConfiguration {
+    name;
+    discoverAllAccessories;
+    accessories;
+    pollingInterval;
+    verbose;
     constructor(props) {
-        var _a;
         this.name = props.name;
         this.discoverAllAccessories = props.discoverAllAccessories;
-        this.accessories = (_a = props === null || props === void 0 ? void 0 : props.accessories) !== null && _a !== void 0 ? _a : [];
+        this.accessories = props?.accessories ?? [];
         this.pollingInterval = props.pollingInterval;
         this.verbose = props.verbose;
     }
@@ -17,13 +21,12 @@ export class PlatformConfiguration {
         return JSON.stringify(this, null, 2);
     }
     static fromExternalConfiguration(props) {
-        var _a, _b, _c, _d, _e;
         return new PlatformConfiguration({
-            discoverAllAccessories: (_a = props.discoverAllAccessories) !== null && _a !== void 0 ? _a : DEFAULT_DISCOVER_ALL_ACCESSORIES,
+            discoverAllAccessories: props.discoverAllAccessories ?? DEFAULT_DISCOVER_ALL_ACCESSORIES,
             verbose: DEFAULT_VERBOSE,
             pollingInterval: DEFAULT_POLLING_INTERVAL,
-            accessories: (_d = (_c = (_b = props.accessories) === null || _b === void 0 ? void 0 : _b.map((accessory) => {
-                var _a, _b;
+            accessories: props.accessories
+                ?.map((accessory) => {
                 const resultingConfig = flattenAccessoryConfiguration({
                     accessory,
                     globalConfig: props.global,
@@ -31,15 +34,16 @@ export class PlatformConfiguration {
                 return resultingConfig
                     ? DeviceConfiguration.fromAccessoryConfiguration({
                         accessoryConfig: resultingConfig,
-                        name: accessory === null || accessory === void 0 ? void 0 : accessory.name,
+                        name: accessory?.name,
                     })
                     : DeviceConfiguration.create({
-                        name: accessory === null || accessory === void 0 ? void 0 : accessory.name,
-                        verboseLogging: (_a = props.global) === null || _a === void 0 ? void 0 : _a.verbose,
-                        pollingInterval: (_b = props.global) === null || _b === void 0 ? void 0 : _b.pollingInterval,
+                        name: accessory?.name,
+                        verboseLogging: props.global?.verbose,
+                        pollingInterval: props.global?.pollingInterval,
                     });
-            })) === null || _c === void 0 ? void 0 : _c.filter((d) => !!d)) !== null && _d !== void 0 ? _d : [],
-            name: (_e = props.name) !== null && _e !== void 0 ? _e : PLATFORM_NAME,
+            })
+                ?.filter((d) => !!d) ?? [],
+            name: props.name ?? PLATFORM_NAME,
         });
     }
 }

package/dist/PlatformConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformConfiguration.js","sourceRoot":"","sources":["../src/PlatformConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,GAE9B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,wBAAwB,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,YAAY;AACvD,MAAM,gCAAgC,GAAG,KAAK,CAAC;AAC/C,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B,MAAM,OAAO,qBAAqB;IAOhC,YAAY,KAMX;;QACC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,sBAAsB,CAAC;QAC3D,IAAI,CAAC,WAAW,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,mCAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,yBAAyB,CAAC,KAA6B;;QAC5D,OAAO,IAAI,qBAAqB,CAAC;YAC/B,sBAAsB,EACpB,MAAA,KAAK,CAAC,sBAAsB,mCAAI,gCAAgC;YAClE,OAAO,EAAE,eAAe;YACxB,eAAe,EAAE,wBAAwB;YACzC,WAAW,EACT,MAAA,MAAA,MAAA,KAAK,CAAC,WAAW,0CACb,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;;gBAClB,MAAM,eAAe,GAAG,6BAA6B,CAAC;oBACpD,SAAS;oBACT,YAAY,EAAE,KAAK,CAAC,MAAM;iBAC3B,CAAC,CAAC;gBACH,OAAO,eAAe;oBACpB,CAAC,CAAC,mBAAmB,CAAC,0BAA0B,CAAC;wBAC7C,eAAe,EAAE,eAAe;wBAChC,IAAI,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI;qBACtB,CAAC;oBACJ,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC;wBACzB,IAAI,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI;wBACrB,cAAc,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,OAAO;wBACrC,eAAe,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,eAAe;qBAC/C,CAAC,CAAC;YACT,CAAC,CAAC,0CACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,mCAAI,EAAE;YAC9B,IAAI,EAAE,MAAA,KAAK,CAAC,IAAI,mCAAI,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"PlatformConfiguration.js","sourceRoot":"","sources":["../src/PlatformConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,GAE9B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,wBAAwB,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,YAAY;AACvD,MAAM,gCAAgC,GAAG,KAAK,CAAC;AAC/C,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B,MAAM,OAAO,qBAAqB;IAChC,IAAI,CAAS;IACb,sBAAsB,CAAU;IAChC,WAAW,CAAwB;IACnC,eAAe,CAAS;IACxB,OAAO,CAAU;IAEjB,YAAY,KAMX;QACC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,sBAAsB,CAAC;QAC3D,IAAI,CAAC,WAAW,GAAG,KAAK,EAAE,WAAW,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,yBAAyB,CAAC,KAA6B;QAC5D,OAAO,IAAI,qBAAqB,CAAC;YAC/B,sBAAsB,EACpB,KAAK,CAAC,sBAAsB,IAAI,gCAAgC;YAClE,OAAO,EAAE,eAAe;YACxB,eAAe,EAAE,wBAAwB;YACzC,WAAW,EACT,KAAK,CAAC,WAAW;gBACf,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBAClB,MAAM,eAAe,GAAG,6BAA6B,CAAC;oBACpD,SAAS;oBACT,YAAY,EAAE,KAAK,CAAC,MAAM;iBAC3B,CAAC,CAAC;gBACH,OAAO,eAAe;oBACpB,CAAC,CAAC,mBAAmB,CAAC,0BAA0B,CAAC;wBAC7C,eAAe,EAAE,eAAe;wBAChC,IAAI,EAAE,SAAS,EAAE,IAAI;qBACtB,CAAC;oBACJ,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC;wBACzB,IAAI,EAAE,SAAS,EAAE,IAAI;wBACrB,cAAc,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO;wBACrC,eAAe,EAAE,KAAK,CAAC,MAAM,EAAE,eAAe;qBAC/C,CAAC,CAAC;YACT,CAAC,CAAC;gBACF,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YAC9B,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/accessories/SoundTouchSpeakerPlatformAccessory.js

@@ -1,93 +1,76 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { getServiceName, ServiceType, SoundTouchSpeakerCharacteristic, } from './services/SoundTouchSpeakerCharacteristic.js';
 import { SoundTouchSpeakerInformationCharacteristic } from './services/SoundTouchSpeakerInformationCharacteristic.js';
 import { SoundTouchSpeakerOnCharacteristic } from './services/SoundTouchSpeakerOnCharacteristic.js';
 export class SoundTouchSpeakerPlatformAccessory extends SoundTouchSpeakerCharacteristic {
-    constructor(_a) {
-        var { speakerCharacteristics } = _a, props = __rest(_a, ["speakerCharacteristics"]);
+    speakerCharacteristics;
+    _isPolling = false;
+    constructor({ speakerCharacteristics, ...props }) {
         super(props);
-        this._isPolling = false;
         this.speakerCharacteristics = speakerCharacteristics;
     }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const speakerCharacteristic of this.speakerCharacteristics) {
-                if (speakerCharacteristic.init) {
-                    yield speakerCharacteristic.init();
-                }
-            }
-            if (this.device.configuration.pollingInterval !== undefined) {
-                this._isPolling = true;
-                this._refreshDeviceServices().then(() => {
-                    //no-op
-                });
+    async init() {
+        for (const speakerCharacteristic of this.speakerCharacteristics) {
+            if (speakerCharacteristic.init) {
+                await speakerCharacteristic.init();
             }
-            this.log.info(`Device ready`);
-        });
+        }
+        if (this.device.configuration.pollingInterval !== undefined) {
+            this._isPolling = true;
+            this._refreshDeviceServices().then(() => {
+                //no-op
+            });
+        }
+        this.log.info(`Device ready`);
     }
-    refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const speakerCharacteristic of this.speakerCharacteristics) {
-                if (speakerCharacteristic.refresh) {
-                    yield speakerCharacteristic.refresh();
-                }
+    async refresh() {
+        for (const speakerCharacteristic of this.speakerCharacteristics) {
+            if (speakerCharacteristic.refresh) {
+                await speakerCharacteristic.refresh();
             }
-        });
+        }
     }
     stopPolling() {
         this._isPolling = false;
     }
-    _refreshDeviceServices() {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (this._isPolling) {
-                yield new Promise((resolve) => setTimeout(resolve, this.device.configuration.pollingInterval));
-                try {
-                    yield this.refresh();
-                }
-                catch (e) {
-                    this.log.error('Polling refresh failed', e);
-                }
+    async _refreshDeviceServices() {
+        while (this._isPolling) {
+            await new Promise((resolve) => setTimeout(resolve, this.device.configuration.pollingInterval));
+            try {
+                await this.refresh();
             }
-        });
+            catch (e) {
+                this.log.error('Polling refresh failed', e);
+            }
+        }
     }
-    static createAccessory(props) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const service = SoundTouchSpeakerPlatformAccessory.ensureAccessoryService(Object.assign({ serviceType: ServiceType.ON_OFF, service: props.platform.service.Switch }, props));
-            const characteristics = [
-                yield SoundTouchSpeakerOnCharacteristic.create(Object.assign({ service }, props)),
-                ...props.defaultCharacteristics,
-            ];
-            return new SoundTouchSpeakerPlatformAccessory(Object.assign({ speakerCharacteristics: [...characteristics] }, props));
+    static async createAccessory(props) {
+        const service = SoundTouchSpeakerPlatformAccessory.ensureAccessoryService({
+            serviceType: ServiceType.ON_OFF,
+            service: props.platform.service.Switch,
+            ...props,
+        });
+        const characteristics = [
+            await SoundTouchSpeakerOnCharacteristic.create({
+                service,
+                ...props,
+            }),
+            ...props.defaultCharacteristics,
+        ];
+        return new SoundTouchSpeakerPlatformAccessory({
+            speakerCharacteristics: [...characteristics],
+            ...props,
         });
     }
-    static create(props) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const defaultCharacteristics = [
-                yield SoundTouchSpeakerInformationCharacteristic.create(props),
-            ];
-            const accessory = yield SoundTouchSpeakerPlatformAccessory.createAccessory(Object.assign({ defaultCharacteristics }, props));
-            yield accessory.init();
-            return accessory;
+    static async create(props) {
+        const defaultCharacteristics = [
+            await SoundTouchSpeakerInformationCharacteristic.create(props),
+        ];
+        const accessory = await SoundTouchSpeakerPlatformAccessory.createAccessory({
+            defaultCharacteristics,
+            ...props,
         });
+        await accessory.init();
+        return accessory;
     }
     static ensureAccessoryService({ device, accessory, serviceType, service, }) {
         const serviceName = getServiceName({

package/dist/accessories/SoundTouchSpeakerPlatformAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"SoundTouchSpeakerPlatformAccessory.js","sourceRoot":"","sources":["../../src/accessories/SoundTouchSpeakerPlatformAccessory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAGA,OAAO,EACL,cAAc,EACd,WAAW,EACX,+BAA+B,GAChC,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,0CAA0C,EAAE,MAAM,0DAA0D,CAAC;AACtH,OAAO,EAAE,iCAAiC,EAAE,MAAM,iDAAiD,CAAC;AAEpG,MAAM,OAAO,kCAAmC,SAAQ,+BAA+B;IAIrF,YAAY,EAQX;YARW,EACV,sBAAsB,OAOvB,EANI,KAAK,cAFE,0BAGX,CADS;QAOR,KAAK,CAAC,KAAK,CAAC,CAAC;QAXP,eAAU,GAAG,KAAK,CAAC;QAYzB,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;IACvD,CAAC;IAEK,IAAI;;YACR,KAAK,MAAM,qBAAqB,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChE,IAAI,qBAAqB,CAAC,IAAI,EAAE,CAAC;oBAC/B,MAAM,qBAAqB,CAAC,IAAI,EAAE,CAAC;gBACrC,CAAC;YACH,CAAC;YAED,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;gBAC5D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBACtC,OAAO;gBACT,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAChC,CAAC;KAAA;IAEK,OAAO;;YACX,KAAK,MAAM,qBAAqB,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChE,IAAI,qBAAqB,CAAC,OAAO,EAAE,CAAC;oBAClC,MAAM,qBAAqB,CAAC,OAAO,EAAE,CAAC;gBACxC,CAAC;YACH,CAAC;QACH,CAAC;KAAA;IAED,WAAW;QACT,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAEa,sBAAsB;;YAClC,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;gBACvB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,CAC/D,CAAC;gBACF,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBACvB,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;gBAC9C,CAAC;YACH,CAAC;QACH,CAAC;KAAA;IAED,MAAM,CAAO,eAAe,CAAC,KAK5B;;YACC,MAAM,OAAO,GAAG,kCAAkC,CAAC,sBAAsB,iBACvE,WAAW,EAAE,WAAW,CAAC,MAAM,EAC/B,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,IACnC,KAAK,EACR,CAAC;YAEH,MAAM,eAAe,GAAG;gBACtB,MAAM,iCAAiC,CAAC,MAAM,iBAC5C,OAAO,IACJ,KAAK,EACR;gBACF,GAAG,KAAK,CAAC,sBAAsB;aAChC,CAAC;YAEF,OAAO,IAAI,kCAAkC,iBAC3C,sBAAsB,EAAE,CAAC,GAAG,eAAe,CAAC,IACzC,KAAK,EACR,CAAC;QACL,CAAC;KAAA;IAED,MAAM,CAAO,MAAM,CAAC,KAInB;;YACC,MAAM,sBAAsB,GAAsC;gBAChE,MAAM,0CAA0C,CAAC,MAAM,CAAC,KAAK,CAAC;aAC/D,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,kCAAkC,CAAC,eAAe,iBACxE,sBAAsB,IACnB,KAAK,EACR,CAAC;YAEH,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YAEvB,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEO,MAAM,CAAC,sBAAsB,CAAC,EACpC,MAAM,EACN,SAAS,EACT,WAAW,EACX,OAAO,GAMR;QACC,MAAM,WAAW,GAAG,cAAc,CAAC;YACjC,MAAM;YACN,WAAW;SACZ,CAAC,CAAC;QAEH,IAAI,gBAAgB,GAAG,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAEzD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,gBAAgB,GAAG,SAAS,CAAC,UAAU,CACrC,OAAO,EACP,WAAW,EACX,WAAW,CACZ,CAAC;QACJ,CAAC;QACD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;CACF"}
+{"version":3,"file":"SoundTouchSpeakerPlatformAccessory.js","sourceRoot":"","sources":["../../src/accessories/SoundTouchSpeakerPlatformAccessory.ts"],"names":[],"mappings":"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"}

package/dist/accessories/services/SoundTouchSpeakerCharacteristic.js

@@ -4,6 +4,10 @@ export var ServiceType;
     ServiceType["ON_OFF"] = "ON";
 })(ServiceType || (ServiceType = {}));
 export class SoundTouchSpeakerCharacteristic {
+    platform;
+    accessory;
+    device;
+    log;
     constructor({ accessory, platform, device, }) {
         this.accessory = accessory;
         this.platform = platform;

package/dist/accessories/services/SoundTouchSpeakerCharacteristic.js.map

@@ -1 +1 @@
-{"version":3,"file":"SoundTouchSpeakerCharacteristic.js","sourceRoot":"","sources":["../../../src/accessories/services/SoundTouchSpeakerCharacteristic.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAU,MAAM,gCAAgC,CAAC;AAEtE,MAAM,CAAN,IAAY,WAEX;AAFD,WAAY,WAAW;IACrB,4BAAe,CAAA;AACjB,CAAC,EAFW,WAAW,KAAX,WAAW,QAEtB;AAED,MAAM,OAAgB,+BAA+B;IAMnD,YAAsB,EACpB,SAAS,EACT,QAAQ,EACR,MAAM,GAKP;QACC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI;QACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,OAAO;QACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,EAC7B,WAAW,EACX,MAAM,GAIP;IACC,OAAO,GAAG,MAAM,CAAC,IAAI,IAAI,WAAW,UAAU,CAAC;AACjD,CAAC"}
+{"version":3,"file":"SoundTouchSpeakerCharacteristic.js","sourceRoot":"","sources":["../../../src/accessories/services/SoundTouchSpeakerCharacteristic.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAU,MAAM,gCAAgC,CAAC;AAEtE,MAAM,CAAN,IAAY,WAEX;AAFD,WAAY,WAAW;IACrB,4BAAe,CAAA;AACjB,CAAC,EAFW,WAAW,KAAX,WAAW,QAEtB;AAED,MAAM,OAAgB,+BAA+B;IACzC,QAAQ,CAA+B;IACvC,SAAS,CAAoB;IAC7B,MAAM,CAAmB;IACzB,GAAG,CAAS;IAEtB,YAAsB,EACpB,SAAS,EACT,QAAQ,EACR,MAAM,GAKP;QACC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI;QACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,OAAO;QACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,EAC7B,WAAW,EACX,MAAM,GAIP;IACC,OAAO,GAAG,MAAM,CAAC,IAAI,IAAI,WAAW,UAAU,CAAC;AACjD,CAAC"}

package/dist/accessories/services/SoundTouchSpeakerInformationCharacteristic.js

@@ -1,45 +1,32 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { SoundTouchSpeakerCharacteristic } from './SoundTouchSpeakerCharacteristic.js';
 const SOUNDTOUCH_MANUFACTURER = 'Bose';
 export class SoundTouchSpeakerInformationCharacteristic extends SoundTouchSpeakerCharacteristic {
     constructor(props) {
         super(props);
     }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.log.debug('initialising info');
-            const deviceName = this.calculateDeviceName();
-            const informationService = this.accessory.getService(this.platform.service.AccessoryInformation);
-            if (!informationService) {
-                throw new Error('No information service found');
-            }
-            informationService
-                .setCharacteristic(this.platform.characteristic.Name, deviceName)
-                .setCharacteristic(this.platform.characteristic.Manufacturer, SOUNDTOUCH_MANUFACTURER)
-                .setCharacteristic(this.platform.characteristic.Model, this.device.model)
-                .setCharacteristic(this.platform.characteristic.SerialNumber, this.device.id);
-            if (this.device.version) {
-                informationService.setCharacteristic(this.platform.characteristic.FirmwareRevision, this.device.version);
-            }
-        });
+    async init() {
+        this.log.debug('initialising info');
+        const deviceName = this.calculateDeviceName();
+        const informationService = this.accessory.getService(this.platform.service.AccessoryInformation);
+        if (!informationService) {
+            throw new Error('No information service found');
+        }
+        informationService
+            .setCharacteristic(this.platform.characteristic.Name, deviceName)
+            .setCharacteristic(this.platform.characteristic.Manufacturer, SOUNDTOUCH_MANUFACTURER)
+            .setCharacteristic(this.platform.characteristic.Model, this.device.model)
+            .setCharacteristic(this.platform.characteristic.SerialNumber, this.device.id);
+        if (this.device.version) {
+            informationService.setCharacteristic(this.platform.characteristic.FirmwareRevision, this.device.version);
+        }
     }
     calculateDeviceName() {
         return this.device.name.toLowerCase().endsWith('speaker')
             ? this.device.name
             : `${this.device.name} Speaker`;
     }
-    static create(props) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new SoundTouchSpeakerInformationCharacteristic(props);
-        });
+    static async create(props) {
+        return new SoundTouchSpeakerInformationCharacteristic(props);
     }
 }
 //# sourceMappingURL=SoundTouchSpeakerInformationCharacteristic.js.map

package/dist/accessories/services/SoundTouchSpeakerInformationCharacteristic.js.map

@@ -1 +1 @@
-{"version":3,"file":"SoundTouchSpeakerInformationCharacteristic.js","sourceRoot":"","sources":["../../../src/accessories/services/SoundTouchSpeakerInformationCharacteristic.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAKvF,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAEvC,MAAM,OAAO,0CAA2C,SAAQ,+BAA+B;IAE7F,YAAY,KAIX;QACC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAEK,IAAI;;YACR,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAE9C,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAClD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAC3C,CAAC;YACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,CAAC;YACD,kBAAkB;iBACf,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC;iBAChE,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,uBAAuB,CACxB;iBACA,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;iBACxE,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,IAAI,CAAC,MAAM,CAAC,EAAE,CACf,CAAC;YACJ,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACxB,kBAAkB,CAAC,iBAAiB,CAClC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAC7C,IAAI,CAAC,MAAM,CAAC,OAAO,CACpB,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;IAED,mBAAmB;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;YAClB,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC;IACpC,CAAC;IAED,MAAM,CAAO,MAAM,CAAC,KAInB;;YACC,OAAO,IAAI,0CAA0C,CAAC,KAAK,CAAC,CAAC;QAC/D,CAAC;KAAA;CACF"}
+{"version":3,"file":"SoundTouchSpeakerInformationCharacteristic.js","sourceRoot":"","sources":["../../../src/accessories/services/SoundTouchSpeakerInformationCharacteristic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAKvF,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAEvC,MAAM,OAAO,0CAA2C,SAAQ,+BAA+B;IAE7F,YAAY,KAIX;QACC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE9C,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAClD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAC3C,CAAC;QACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,kBAAkB;aACf,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC;aAChE,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,uBAAuB,CACxB;aACA,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;aACxE,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,IAAI,CAAC,MAAM,CAAC,EAAE,CACf,CAAC;QACJ,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACxB,kBAAkB,CAAC,iBAAiB,CAClC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAC7C,IAAI,CAAC,MAAM,CAAC,OAAO,CACpB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,mBAAmB;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;YAClB,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAInB;QACC,OAAO,IAAI,0CAA0C,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC;CACF"}