@tplnet/homebridge-denon-heos-audio 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes of this fork. The fork is based on [hov3rcraft/homebridge-denon-heos-audio](https://github.com/hov3rcraft/homebridge-denon-heos-audio) 1.0.0-beta.1.
 
+## 1.2.2
+
+### Fixed
+
+- The tile in the Homebridge UI / Home app no longer jumps back to "off" while switching on takes a few seconds: HomeKit gets the answer immediately and switching continues in the background. If switching fails, the tile shows the real state again and the error is logged.
+- A radio station that needs a few seconds to buffer is no longer replaced by the power on favorite: the plugin now waits up to 8 seconds (before: 3) for playback to start.
+
+## 1.2.1
+
+### Fixed
+
+- When switching on took a few seconds (e.g. while the power on favorite was being started), the tile briefly showed "off" before it switched to "on". The requested state is now reported from the moment of the tap, and intermediate states of the device are ignored until switching has finished.
+- The player list was requested twice per device at startup.
+
 ## 1.2.0
 
 ### New

package/README.md

@@ -56,7 +56,7 @@ Not sure what your device supports? Turn on [device discovery](#1-find-your-devi
 | **Hybrid** | AV receivers and amplifiers with HEOS (e.g. Marantz Cinema series, Denon AVR-X, Denon Home Amp) | Real power on / standby | ✅ | ✅ |
 
 **Why does "power" mean "playback" with HEOS CLI?** HEOS speakers have no real standby command. The plugin therefore treats "playing" as on and "stopped/paused" as off.
-Switching on resumes the last source. If there is nothing to resume (e.g. after the speaker was restarted or a streaming session ended), or playback doesn't start within 3 seconds, the first HEOS favorite is started, so switching on also works in scenes and automations. You can choose another favorite or turn this off with `powerOnFavorite`.
+Switching on resumes the last source. If there is nothing to resume (e.g. after the speaker was restarted or a streaming session ended), or playback doesn't start within 8 seconds, the first HEOS favorite is started, so switching on also works in scenes and automations. You can choose another favorite or turn this off with `powerOnFavorite`.
 
 > **Requirement:** at least one favorite in the HEOS app (*Music → Favorites*, e.g. a radio station). Without a favorite, a speaker that has nothing to resume can't be switched on from HomeKit.
 

package/dist/denonClientHeosCli.d.ts

@@ -204,7 +204,10 @@ export declare class DenonClientHeosCli extends DenonClient {
     private infoLog;
     private player_name;
     constructor(serialNumber: string, name: string, host: string, connect_timeout: number, response_timeout: number, debugLogCallback?: (message: string, ...parameters: any[]) => void, powerUpdateCallback?: (power: boolean) => void, muteUpdateCallback?: (mute: boolean) => void, volumeUpdateCallback?: (volume: number) => void, inputUpdateCallback?: (input: string) => void);
+    private playerIdLookup;
+    /** Looks up the player id; concurrent calls share one request. */
     private findPlayerId;
+    private findPlayerIdUncached;
     protected subscribeToChangeEvents(): Promise<void>;
     protected sendCommand(command: ProtocolCommand, commandMode: CommandMode, { value, passPayload }: {
         value?: string;

package/dist/denonClientHeosCli.js

@@ -248,7 +248,8 @@ export class DenonClientHeosCli extends DenonClient {
     player_id;
     /** HEOS favorite (1, 2, …) that is started when switching on without something to resume; 0 = disabled. */
     powerOnFavorite = 1;
-    static PLAY_VERIFY_CHECKS = 3;
+    // radio streams may need a few seconds of buffering before the device reports "play"
+    static PLAY_VERIFY_CHECKS = 8;
     playVerifyIntervalMs = 1000;
     /** Log for actions the user should see without debug logging (e.g. starting the power on favorite). */
     infoLog = (message) => this.debugLog(message);
@@ -275,7 +276,15 @@ export class DenonClientHeosCli extends DenonClient {
             }
         });
     }
-    async findPlayerId() {
+    playerIdLookup;
+    /** Looks up the player id; concurrent calls share one request. */
+    findPlayerId() {
+        this.playerIdLookup ??= this.findPlayerIdUncached().finally(() => {
+            this.playerIdLookup = undefined;
+        });
+        return this.playerIdLookup;
+    }
+    async findPlayerIdUncached() {
         const payload_str = await super.sendCommand(DenonClientHeosCli.PROTOCOL.PLAYERS, CommandMode.GET, { passPayload: true });
         const payload = JSON.parse(payload_str);
         if (!Array.isArray(payload)) {

package/dist/platformAccessory.d.ts

@@ -38,6 +38,9 @@ export declare class DenonAudioAccessory {
     private targetMediaState;
     private volumeChangeOngoing;
     private pendingActive;
+    private powerChangeInProgress;
+    /** The power change running in the background (for tests). */
+    private powerChange;
     private playingChangeOngoing;
     constructor(platform: DenonAudioPlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logger);
     /**

package/dist/platformAccessory.js

@@ -44,6 +44,9 @@ export class DenonAudioAccessory {
     targetMediaState;
     volumeChangeOngoing = false;
     pendingActive;
+    powerChangeInProgress = false;
+    /** The power change running in the background (for tests). */
+    powerChange;
     playingChangeOngoing = false;
     constructor(platform, accessory, config, log) {
         log.debug("Initializing DenonAudioAccessory...");
@@ -312,15 +315,27 @@ export class DenonAudioAccessory {
     async setActive(newValue) {
         this.log.debug(`setActive for ${this.name} set to ${newValue}`);
         const active = newValue === this.platform.Characteristic.Active.ACTIVE;
-        try {
-            await this.denonClient.setPower(active);
+        // Report the requested state right away: switching on can take a few seconds (e.g. when the power on favorite is
+        // started), and the device reports intermediate states during that time.
+        this.pendingActive = { value: active, until: Number.POSITIVE_INFINITY };
+        this.powerChangeInProgress = true;
+        // HomeKit gets the answer immediately; switching continues in the background. Otherwise HomeKit / the Homebridge UI
+        // would show the old state until switching on has finished (which can take several seconds).
+        this.powerChange = this.denonClient
+            .setPower(active)
+            .then(() => {
             this.pendingActive = { value: active, until: Date.now() + DenonAudioAccessory.POWER_STATE_SETTLE_TIME };
-        }
-        catch (error) {
+        })
+            .catch(async (error) => {
             this.pendingActive = undefined;
             this.log.error(`An error occured while setting power status for ${this.name}.`, error);
-            throw new this.platform.api.hap.HapStatusError(this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
-        }
+            // show the real state again
+            const deviceState = await this.denonClient.getPower().catch(() => !active);
+            this.tvService.updateCharacteristic(this.platform.Characteristic.Active, deviceState);
+        })
+            .finally(() => {
+            this.powerChangeInProgress = false;
+        });
     }
     async setActiveIdentifier(newValue) {
         this.log.debug(`setActiveIdentifier for ${this.name} set to ${newValue}`);
@@ -542,6 +557,10 @@ export class DenonAudioAccessory {
      * Handles characteristic updates from the API
      */
     callbackActive(active) {
+        if (this.powerChangeInProgress && this.pendingActive && this.pendingActive.value !== active) {
+            this.log.debug(`Ignoring intermediate power state ${active} of ${this.name} while switching.`);
+            return;
+        }
         if (this.pendingActive && this.pendingActive.value !== active) {
             // changed on the device (e.g. in the HEOS app) - the device state wins
             this.pendingActive = undefined;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tplnet/homebridge-denon-heos-audio",
   "displayName": "Homebridge Denon Heos Audio (tplnet)",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Control your Denon and Marantz HEOS speakers, amplifiers and AVRs via AVR Control and/or HEOS CLI",
   "author": "tplnet",
   "contributors": [