homebridge-yoto 0.0.22 → 0.0.24

package/lib/playerAccessory.js

@@ -48,7 +48,7 @@ export class YotoPlayerAccessory {
     this.statusPollInterval = null
     this.mqttConnected = false
 
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Initializing accessory`)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Initializing accessory`)
 
     // Set up services
     this.setupAccessoryInformation()
@@ -116,9 +116,9 @@ export class YotoPlayerAccessory {
     // Fetch device config for cached access
     try {
       this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device config loaded`)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Device config loaded`)
     } catch (error) {
-      this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to load device config:`, error)
+      this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to load device config:`, error)
       // Continue without config - getters will return defaults
     }
 
@@ -138,10 +138,10 @@ export class YotoPlayerAccessory {
 
     // Handle state changes
     if (!wasOnline && isNowOnline) {
-      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device came online, connecting MQTT...`)
+      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Device came online, connecting MQTT...`)
       await this.connectMqtt()
     } else if (wasOnline && !isNowOnline) {
-      this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device went offline`)
+      this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Device went offline`)
       await this.disconnectMqtt()
     }
   }
@@ -155,9 +155,9 @@ export class YotoPlayerAccessory {
       try {
         await this.mqtt.disconnect()
         this.mqttConnected = false
-        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT disconnected`)
+        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] MQTT disconnected`)
       } catch (error) {
-        this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to disconnect MQTT:`, error)
+        this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to disconnect MQTT:`, error)
       }
     }
   }
@@ -185,7 +185,7 @@ export class YotoPlayerAccessory {
       this.accessory.getService(this.platform.Service.SmartSpeaker) ||
       this.accessory.addService(this.platform.Service.SmartSpeaker)
 
-    this.speakerService.setCharacteristic(this.platform.Characteristic.Name, this.device.name)
+    this.speakerService.setCharacteristic(this.platform.Characteristic.Name, this.accessory.displayName)
 
     // Current Media State (read-only)
     this.speakerService
@@ -219,7 +219,7 @@ export class YotoPlayerAccessory {
       this.accessory.getService(this.platform.Service.Battery) ||
       this.accessory.addService(this.platform.Service.Battery)
 
-    this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Battery`)
+    this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Battery`)
 
     // Battery Level
     this.batteryService
@@ -245,7 +245,7 @@ export class YotoPlayerAccessory {
       this.accessory.getService(this.platform.Service.TemperatureSensor) ||
       this.accessory.addService(this.platform.Service.TemperatureSensor)
 
-    this.temperatureService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Temperature`)
+    this.temperatureService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Temperature`)
 
     this.temperatureService
       .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
@@ -260,7 +260,7 @@ export class YotoPlayerAccessory {
       this.accessory.getService(this.platform.Service.OccupancySensor) ||
       this.accessory.addService(this.platform.Service.OccupancySensor)
 
-    this.connectionService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Connection`)
+    this.connectionService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Connection`)
 
     this.connectionService
       .getCharacteristic(this.platform.Characteristic.OccupancyDetected)
@@ -279,7 +279,7 @@ export class YotoPlayerAccessory {
       this.accessory.getService(this.platform.Service.ContactSensor) ||
       this.accessory.addService(this.platform.Service.ContactSensor)
 
-    this.cardDetectionService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Card`)
+    this.cardDetectionService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Card`)
 
     this.cardDetectionService
       .getCharacteristic(this.platform.Characteristic.ContactSensorState)
@@ -294,7 +294,7 @@ export class YotoPlayerAccessory {
       this.accessory.getService(this.platform.Service.Lightbulb) ||
       this.accessory.addService(this.platform.Service.Lightbulb)
 
-    this.displayService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Display`)
+    this.displayService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Display`)
 
     // On/Off state
     this.displayService
@@ -315,10 +315,10 @@ export class YotoPlayerAccessory {
   setupAdvancedControlSwitches () {
     // Bluetooth enabled switch
     this.bluetoothSwitch =
-      this.accessory.getService(`${this.device.name} Bluetooth`) ||
-      this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Bluetooth`, 'bluetooth')
+      this.accessory.getServiceById(this.platform.Service.Switch, 'bluetooth') ||
+      this.accessory.addService(this.platform.Service.Switch, `${this.accessory.displayName} Bluetooth`, 'bluetooth')
 
-    this.bluetoothSwitch.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Bluetooth`)
+    this.bluetoothSwitch.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Bluetooth`)
 
     this.bluetoothSwitch
       .getCharacteristic(this.platform.Characteristic.On)
@@ -327,10 +327,10 @@ export class YotoPlayerAccessory {
 
     // Repeat all switch
     this.repeatSwitch =
-      this.accessory.getService(`${this.device.name} Repeat`) ||
-      this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Repeat`, 'repeat')
+      this.accessory.getServiceById(this.platform.Service.Switch, 'repeat') ||
+      this.accessory.addService(this.platform.Service.Switch, `${this.accessory.displayName} Repeat`, 'repeat')
 
-    this.repeatSwitch.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Repeat`)
+    this.repeatSwitch.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Repeat`)
 
     this.repeatSwitch
       .getCharacteristic(this.platform.Characteristic.On)
@@ -339,10 +339,10 @@ export class YotoPlayerAccessory {
 
     // Bluetooth headphones switch
     this.btHeadphonesSwitch =
-      this.accessory.getService(`${this.device.name} BT Headphones`) ||
-      this.accessory.addService(this.platform.Service.Switch, `${this.device.name} BT Headphones`, 'bt-headphones')
+      this.accessory.getServiceById(this.platform.Service.Switch, 'bt-headphones') ||
+      this.accessory.addService(this.platform.Service.Switch, `${this.accessory.displayName} BT Headphones`, 'bt-headphones')
 
-    this.btHeadphonesSwitch.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} BT Headphones`)
+    this.btHeadphonesSwitch.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} BT Headphones`)
 
     this.btHeadphonesSwitch
       .getCharacteristic(this.platform.Characteristic.On)
@@ -358,7 +358,7 @@ export class YotoPlayerAccessory {
       this.accessory.getService(this.platform.Service.Fanv2) ||
       this.accessory.addService(this.platform.Service.Fanv2)
 
-    this.sleepTimerService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Sleep Timer`)
+    this.sleepTimerService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Sleep Timer`)
 
     // Active state (timer on/off)
     this.sleepTimerService
@@ -380,10 +380,10 @@ export class YotoPlayerAccessory {
   setupVolumeLimitsServices () {
     // Day volume limit
     this.dayVolumeLimitService =
-      this.accessory.getService(`${this.device.name} Day Volume Limit`) ||
-      this.accessory.addService(this.platform.Service.Lightbulb, `${this.device.name} Day Volume Limit`, 'day-volume-limit')
+      this.accessory.getServiceById(this.platform.Service.Lightbulb, 'day-volume-limit') ||
+      this.accessory.addService(this.platform.Service.Lightbulb, `${this.accessory.displayName} Day Volume Limit`, 'day-volume-limit')
 
-    this.dayVolumeLimitService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Day Volume Limit`)
+    this.dayVolumeLimitService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Day Volume Limit`)
 
     this.dayVolumeLimitService
       .getCharacteristic(this.platform.Characteristic.On)
@@ -398,10 +398,10 @@ export class YotoPlayerAccessory {
 
     // Night volume limit
     this.nightVolumeLimitService =
-      this.accessory.getService(`${this.device.name} Night Volume Limit`) ||
-      this.accessory.addService(this.platform.Service.Lightbulb, `${this.device.name} Night Volume Limit`, 'night-volume-limit')
+      this.accessory.getServiceById(this.platform.Service.Lightbulb, 'night-volume-limit') ||
+      this.accessory.addService(this.platform.Service.Lightbulb, `${this.accessory.displayName} Night Volume Limit`, 'night-volume-limit')
 
-    this.nightVolumeLimitService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Night Volume Limit`)
+    this.nightVolumeLimitService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Night Volume Limit`)
 
     this.nightVolumeLimitService
       .getCharacteristic(this.platform.Characteristic.On)
@@ -420,10 +420,10 @@ export class YotoPlayerAccessory {
    */
   setupAmbientLightService () {
     this.ambientLightService =
-      this.accessory.getService(`${this.device.name} Ambient Light`) ||
-      this.accessory.addService(this.platform.Service.Lightbulb, `${this.device.name} Ambient Light`, 'ambient-light')
+      this.accessory.getServiceById(this.platform.Service.Lightbulb, 'ambient-light') ||
+      this.accessory.addService(this.platform.Service.Lightbulb, `${this.accessory.displayName} Ambient Light`, 'ambient-light')
 
-    this.ambientLightService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Ambient Light`)
+    this.ambientLightService.setCharacteristic(this.platform.Characteristic.Name, `${this.accessory.displayName} Ambient Light`)
 
     // On/Off state
     this.ambientLightService
@@ -454,7 +454,7 @@ export class YotoPlayerAccessory {
    * Cleanup and destroy the accessory
    */
   async destroy () {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Destroying accessory`)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Destroying accessory`)
 
     // Disconnect MQTT
     await this.disconnectMqtt()
@@ -467,17 +467,17 @@ export class YotoPlayerAccessory {
     try {
       // Check if device is online first
       if (!this.device.online) {
-        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device is offline, skipping MQTT connection`)
+        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Device is offline, skipping MQTT connection`)
         return
       }
 
       // Ensure we have an access token
       if (!this.platform.config.accessToken) {
-        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] No access token available for MQTT connection`)
+        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] No access token available for MQTT connection`)
         return
       }
 
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Connecting to MQTT (device online: ${this.device.online})`)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Connecting to MQTT (device online: ${this.device.online})`)
 
       // Connect MQTT with device ID and access token
       await this.mqtt.connect(
@@ -493,26 +493,26 @@ export class YotoPlayerAccessory {
       })
 
       this.mqttConnected = true
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT connected and subscribed`)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] MQTT connected and subscribed`)
 
       // Set up MQTT event listeners
       this.mqtt.on('disconnected', () => {
         this.mqttConnected = false
-        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT disconnected`)
+        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] MQTT disconnected`)
       })
 
       this.mqtt.on('offline', () => {
         this.mqttConnected = false
-        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT offline`)
+        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] MQTT offline`)
       })
 
       this.mqtt.on('connected', () => {
         this.mqttConnected = true
-        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT reconnected`)
+        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] MQTT reconnected`)
       })
     } catch (error) {
       this.mqttConnected = false
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to connect MQTT:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to connect MQTT:`, error)
     }
   }
 
@@ -521,14 +521,14 @@ export class YotoPlayerAccessory {
    * @param {YotoDeviceStatus | {status: YotoDeviceStatus}} statusMessage - Status data or wrapped status
    */
   handleStatusUpdate (statusMessage) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Raw MQTT status message:`, JSON.stringify(statusMessage, null, 2))
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Raw MQTT status message:`, JSON.stringify(statusMessage, null, 2))
 
     // Unwrap status if it's nested under a 'status' property
     const status = /** @type {YotoDeviceStatus} */ ('status' in statusMessage ? statusMessage.status : statusMessage)
 
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Unwrapped status - batteryLevel:`, status.batteryLevel)
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Unwrapped status - userVolume:`, status.userVolume)
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Unwrapped status - volume:`, status.volume)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Unwrapped status - batteryLevel:`, status.batteryLevel)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Unwrapped status - userVolume:`, status.userVolume)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Unwrapped status - volume:`, status.volume)
 
     this.currentStatus = status
     this.lastUpdateTime = Date.now()
@@ -543,12 +543,12 @@ export class YotoPlayerAccessory {
    * @param {YotoPlaybackEvents | {events: YotoPlaybackEvents}} eventsMessage - Playback events or wrapped events
    */
   handleEventsUpdate (eventsMessage) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Raw MQTT events message:`, JSON.stringify(eventsMessage, null, 2))
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Raw MQTT events message:`, JSON.stringify(eventsMessage, null, 2))
 
     // Unwrap events if it's nested under an 'events' property
     const events = /** @type {YotoPlaybackEvents} */ ('events' in eventsMessage ? eventsMessage.events : eventsMessage)
 
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Unwrapped events - cardId:`, events.cardId)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Unwrapped events - cardId:`, events.cardId)
     this.currentEvents = events
     this.lastUpdateTime = Date.now()
     this.accessory.context.lastEvents = events
@@ -567,7 +567,7 @@ export class YotoPlayerAccessory {
    * @param {import('./types.js').MqttCommandResponse} response - Command response
    */
   handleCommandResponse (response) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Command response:`, response)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Command response:`, response)
   }
 
   /**
@@ -789,7 +789,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Target state
    */
   async setTargetMediaState (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set target media state:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set target media state:`, value)
 
     try {
       if (value === this.platform.Characteristic.TargetMediaState.PLAY) {
@@ -800,7 +800,7 @@ export class YotoPlayerAccessory {
         await this.mqtt.stopCard(this.device.deviceId)
       }
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set media state:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set media state:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -812,16 +812,16 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getVolume () {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getVolume - currentEvents:`, this.currentEvents)
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getVolume - events.volume:`, this.currentEvents?.volume)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getVolume - currentEvents:`, this.currentEvents)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getVolume - events.volume:`, this.currentEvents?.volume)
 
     // Volume comes from events, not status
     if (!this.currentEvents || this.currentEvents.volume === undefined) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getVolume - no volume in events, returning default: 50`)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getVolume - no volume in events, returning default: 50`)
       return 50
     }
     const volume = Number(this.currentEvents.volume) || 50
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getVolume - returning volume:`, volume)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getVolume - returning volume:`, volume)
     return volume
   }
 
@@ -830,12 +830,12 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Volume level (0-100)
    */
   async setVolume (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set volume:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set volume:`, value)
 
     try {
       await this.mqtt.setVolume(this.device.deviceId, Number(value))
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set volume:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set volume:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -859,7 +859,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Mute state
    */
   async setMute (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set mute:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set mute:`, value)
 
     try {
       if (value) {
@@ -872,7 +872,7 @@ export class YotoPlayerAccessory {
         await this.mqtt.setVolume(this.device.deviceId, targetVolume)
       }
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set mute:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set mute:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -884,15 +884,15 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getBatteryLevel () {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getBatteryLevel - currentStatus:`, this.currentStatus)
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getBatteryLevel - batteryLevel:`, this.currentStatus?.batteryLevel)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getBatteryLevel - currentStatus:`, this.currentStatus)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getBatteryLevel - batteryLevel:`, this.currentStatus?.batteryLevel)
 
     if (!this.currentStatus || this.currentStatus.batteryLevel === undefined) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getBatteryLevel - returning default: 100`)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getBatteryLevel - returning default: 100`)
       return 100
     }
     const battery = Number(this.currentStatus.batteryLevel) || 100
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] getBatteryLevel - returning:`, battery)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] getBatteryLevel - returning:`, battery)
     return battery
   }
 
@@ -998,7 +998,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - On/off state
    */
   async setDisplayOn (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set display on:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set display on:`, value)
 
     try {
       // Refresh config if not cached
@@ -1019,7 +1019,7 @@ export class YotoPlayerAccessory {
 
       await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, this.deviceConfig)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set display on:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set display on:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1048,7 +1048,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Brightness level (0-100)
    */
   async setDisplayBrightness (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set display brightness:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set display brightness:`, value)
 
     try {
       // Refresh config if not cached
@@ -1065,7 +1065,7 @@ export class YotoPlayerAccessory {
 
       await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, this.deviceConfig)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set display brightness:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set display brightness:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1088,7 +1088,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Enabled state
    */
   async setBluetoothEnabled (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set Bluetooth:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set Bluetooth:`, value)
 
     try {
       // Refresh config if not cached
@@ -1099,7 +1099,7 @@ export class YotoPlayerAccessory {
       this.deviceConfig.config.bluetoothEnabled = value ? 'true' : 'false'
       await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, this.deviceConfig)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set Bluetooth:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set Bluetooth:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1122,7 +1122,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Repeat state
    */
   async setRepeatAll (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set repeat all:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set repeat all:`, value)
 
     try {
       // Refresh config if not cached
@@ -1133,7 +1133,7 @@ export class YotoPlayerAccessory {
       this.deviceConfig.config.repeatAll = Boolean(value)
       await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, this.deviceConfig)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set repeat all:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set repeat all:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1156,7 +1156,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Enabled state
    */
   async setBtHeadphonesEnabled (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set BT headphones:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set BT headphones:`, value)
 
     try {
       // Refresh config if not cached
@@ -1167,7 +1167,7 @@ export class YotoPlayerAccessory {
       this.deviceConfig.config.btHeadphonesEnabled = Boolean(value)
       await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, this.deviceConfig)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set BT headphones:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set BT headphones:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1192,7 +1192,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Active state
    */
   async setSleepTimerActive (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set sleep timer active:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set sleep timer active:`, value)
 
     try {
       if (value === this.platform.Characteristic.Active.INACTIVE) {
@@ -1203,7 +1203,7 @@ export class YotoPlayerAccessory {
         await this.mqtt.setSleepTimer(this.device.deviceId, 30 * 60)
       }
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set sleep timer active:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set sleep timer active:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1230,7 +1230,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Rotation speed (0-100)
    */
   async setSleepTimerMinutes (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set sleep timer minutes:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set sleep timer minutes:`, value)
 
     try {
       // Map rotation speed (0-100) to minutes (0-120)
@@ -1245,7 +1245,7 @@ export class YotoPlayerAccessory {
         await this.mqtt.setSleepTimer(this.device.deviceId, seconds)
       }
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set sleep timer:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set sleep timer:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1267,7 +1267,7 @@ export class YotoPlayerAccessory {
    */
   async setDayVolumeLimitEnabled (_value) {
     // No-op - always enabled, use brightness to control
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Day volume limit always enabled`)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Day volume limit always enabled`)
   }
 
   /**
@@ -1287,7 +1287,7 @@ export class YotoPlayerAccessory {
       // Map 0-16 to 0-100
       return Math.round((limit / 16) * 100)
     } catch (error) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse day volume limit:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to parse day volume limit:`, error)
       return 100
     }
   }
@@ -1297,7 +1297,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Brightness value (0-100)
    */
   async setDayVolumeLimit (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set day volume limit:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set day volume limit:`, value)
 
     try {
       // Refresh config if not cached
@@ -1310,7 +1310,7 @@ export class YotoPlayerAccessory {
       this.deviceConfig.config.maxVolumeLimit = String(limit)
       await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, this.deviceConfig)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set day volume limit:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set day volume limit:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1332,7 +1332,7 @@ export class YotoPlayerAccessory {
    */
   async setNightVolumeLimitEnabled (_value) {
     // No-op - always enabled, use brightness to control
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Night volume limit always enabled`)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Night volume limit always enabled`)
   }
 
   /**
@@ -1352,7 +1352,7 @@ export class YotoPlayerAccessory {
       // Map 0-16 to 0-100
       return Math.round((limit / 16) * 100)
     } catch (error) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse night volume limit:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to parse night volume limit:`, error)
       return 100
     }
   }
@@ -1362,7 +1362,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Brightness value (0-100)
    */
   async setNightVolumeLimit (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set night volume limit:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set night volume limit:`, value)
 
     try {
       // Refresh config if not cached
@@ -1375,7 +1375,7 @@ export class YotoPlayerAccessory {
       this.deviceConfig.config.nightMaxVolumeLimit = String(limit)
       await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, this.deviceConfig)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set night volume limit:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set night volume limit:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1396,7 +1396,7 @@ export class YotoPlayerAccessory {
       // Consider light "on" if not pure black
       return color !== '000000'
     } catch (error) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient light state:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to parse ambient light state:`, error)
       return false
     }
   }
@@ -1406,7 +1406,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - On/off state
    */
   async setAmbientLightOn (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set ambient light on:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set ambient light on:`, value)
 
     try {
       // Refresh config if not cached
@@ -1422,7 +1422,7 @@ export class YotoPlayerAccessory {
         await this.mqtt.setAmbientLight(this.device.deviceId, 0, 0, 0)
       }
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set ambient light on:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to set ambient light on:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1446,7 +1446,7 @@ export class YotoPlayerAccessory {
       }
       return h
     } catch (error) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient light hue:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to parse ambient light hue:`, error)
       return 0
     }
   }
@@ -1456,7 +1456,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Hue value (0-360)
    */
   async setAmbientLightHue (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set ambient light hue:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set ambient light hue:`, value)
     // Store for combined update with saturation and brightness
     this.pendingAmbientHue = Number(value)
     await this.updateAmbientLightColor()
@@ -1479,7 +1479,7 @@ export class YotoPlayerAccessory {
       }
       return s
     } catch (error) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient light saturation:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to parse ambient light saturation:`, error)
       return 0
     }
   }
@@ -1489,7 +1489,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Saturation value (0-100)
    */
   async setAmbientLightSaturation (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set ambient light saturation:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set ambient light saturation:`, value)
     // Store for combined update with hue and brightness
     this.pendingAmbientSaturation = Number(value)
     await this.updateAmbientLightColor()
@@ -1513,7 +1513,7 @@ export class YotoPlayerAccessory {
       }
       return brightness
     } catch (error) {
-      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient brightness:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to parse ambient brightness:`, error)
       return 0
     }
   }
@@ -1523,7 +1523,7 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Brightness value (0-100)
    */
   async setAmbientLightBrightness (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set ambient light brightness:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Set ambient light brightness:`, value)
     // Store for combined update with hue and saturation
     this.pendingAmbientBrightness = Number(value)
     await this.updateAmbientLightColor()
@@ -1558,7 +1558,7 @@ export class YotoPlayerAccessory {
       this.pendingAmbientSaturation = undefined
       this.pendingAmbientBrightness = undefined
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to update ambient light:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to update ambient light:`, error)
     }
   }
 
@@ -1655,33 +1655,33 @@ export class YotoPlayerAccessory {
 
     // Handle no card inserted
     if (!cardId || cardId === 'none' || cardId === 'null') {
-      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] No card inserted`)
+      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] No card inserted`)
       this.activeContentInfo = null
       this.accessory.context.activeContentInfo = null
       return
     }
 
-    this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Active card changed: ${cardId}`)
+    this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Active card changed: ${cardId}`)
 
     // Use event data if available for immediate content info
     if (events?.trackTitle || events?.chapterTitle) {
       const title = events.trackTitle || events.chapterTitle || cardId
-      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Now playing: "${title}"`)
+      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Now playing: "${title}"`)
 
       if (events.chapterKey && events.chapterKey !== events.chapterTitle) {
-        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Chapter: ${events.chapterKey}`)
+        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Chapter: ${events.chapterKey}`)
       }
 
       // Optionally update accessory display name with current content
       if (this.platform.config.updateAccessoryName) {
-        this.accessory.displayName = `${this.device.name} - ${title}`
-        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Updated display name`)
+        this.accessory.displayName = `${this.accessory.displayName} - ${title}`
+        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Updated display name`)
       }
     }
 
     // Check if we own this card to fetch additional details
     if (!this.platform.isCardOwned(cardId)) {
-      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Card ${cardId} (not in library - using event data)`)
+      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Card ${cardId} (not in library - using event data)`)
       this.activeContentInfo = null
       this.accessory.context.activeContentInfo = null
       return
@@ -1694,11 +1694,11 @@ export class YotoPlayerAccessory {
 
       // Log additional metadata from API
       if (content.card?.metadata?.author) {
-        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Author: ${content.card.metadata.author}`)
+        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Author: ${content.card.metadata.author}`)
       }
 
       if (content.card?.metadata?.category) {
-        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Category: ${content.card.metadata.category}`)
+        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Category: ${content.card.metadata.category}`)
       }
 
       // Store in context for persistence
@@ -1706,17 +1706,17 @@ export class YotoPlayerAccessory {
     } catch (error) {
       // Handle 403 Forbidden (store-bought cards user doesn't own)
       if (error instanceof Error && error.message.includes('403')) {
-        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Card ${cardId} API access denied (using event data)`)
+        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Card ${cardId} API access denied (using event data)`)
         this.activeContentInfo = null
         this.accessory.context.activeContentInfo = null
       } else if (error instanceof Error && error.message.includes('404')) {
         // Card not found - might be deleted or invalid
-        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Card ${cardId} not found in API`)
+        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Card ${cardId} not found in API`)
         this.activeContentInfo = null
         this.accessory.context.activeContentInfo = null
       } else {
         // Other errors
-        this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to fetch content details:`, error)
+        this.log.error(LOG_PREFIX.ACCESSORY, `[${this.accessory.displayName}] Failed to fetch content details:`, error)
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-yoto",
   "description": "Control your Yoto players through Apple HomeKit with real-time MQTT updates",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
   "bugs": {
     "url": "https://github.com/bcomnes/homebridge-yoto/issues"