homebridge-yoto 0.0.41 → 0.0.42

package/lib/accessory.js

@@ -243,6 +243,11 @@ export class YotoPlayerAccessory {
     const { Service, Characteristic } = this.#platform
     const service = this.#accessory.getService(Service.AccessoryInformation) ||
       this.#accessory.addService(Service.AccessoryInformation)
+    const displayName = sanitizeName(this.#accessory.displayName)
+    const nameCharacteristic = service.getCharacteristic(Characteristic.Name)
+    const configuredCharacteristic = service.getCharacteristic(Characteristic.ConfiguredName)
+    const previousName = nameCharacteristic.value
+    const configuredName = configuredCharacteristic.value
 
     // Build hardware revision from generation and form factor
     const hardwareRevision = [
@@ -255,11 +260,16 @@ export class YotoPlayerAccessory {
 
     // Set standard characteristics
     service
+      .setCharacteristic(Characteristic.Name, displayName)
       .setCharacteristic(Characteristic.Manufacturer, DEFAULT_MANUFACTURER)
       .setCharacteristic(Characteristic.Model, model)
       .setCharacteristic(Characteristic.SerialNumber, this.#device.deviceId)
       .setCharacteristic(Characteristic.HardwareRevision, hardwareRevision)
 
+    if (typeof configuredName !== 'string' || configuredName === previousName) {
+      service.setCharacteristic(Characteristic.ConfiguredName, displayName)
+    }
+
     // Set firmware version from live status if available
     if (this.#deviceModel.status.firmwareVersion) {
       service.setCharacteristic(
@@ -933,7 +943,9 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getPlaybackOn () {
-    return this.#deviceModel.playback.playbackStatus === 'playing'
+    const isOn = this.#deviceModel.playback.playbackStatus === 'playing'
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get playback switch -> ${isOn}`)
+    return isOn
   }
 
   /**
@@ -1033,7 +1045,9 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getVolumeOn () {
-    return this.#deviceModel.status.volume > 0
+    const isOn = this.#deviceModel.status.volume > 0
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get volume on -> ${isOn}`)
+    return isOn
   }
 
   /**
@@ -1064,7 +1078,9 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getStatusActive () {
-    return this.#deviceModel.status.isOnline
+    const isOnline = this.#deviceModel.status.isOnline
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get status active -> ${isOnline}`)
+    return isOnline
   }
 
   /**
@@ -1073,7 +1089,9 @@ export class YotoPlayerAccessory {
    */
   async getOnlineStatus () {
     const { Characteristic } = this.#platform
-    return this.#deviceModel.status.isOnline
+    const isOnline = this.#deviceModel.status.isOnline
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get online status -> ${isOnline}`)
+    return isOnline
       ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
       : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
@@ -1086,7 +1104,9 @@ export class YotoPlayerAccessory {
    */
   async getBatteryLevel () {
     const battery = this.#deviceModel.status.batteryLevelPercentage
-    return Number.isFinite(battery) ? battery : 100
+    const level = Number.isFinite(battery) ? battery : 100
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get battery level -> ${level}`)
+    return level
   }
 
   /**
@@ -1095,6 +1115,7 @@ export class YotoPlayerAccessory {
    */
   async getChargingState () {
     const isCharging = this.#deviceModel.status.isCharging
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get charging state -> ${isCharging}`)
     return isCharging
       ? this.#platform.Characteristic.ChargingState.CHARGING
       : this.#platform.Characteristic.ChargingState.NOT_CHARGING
@@ -1107,6 +1128,7 @@ export class YotoPlayerAccessory {
   async getStatusLowBattery () {
     const battery = this.#deviceModel.status.batteryLevelPercentage
     const batteryLevel = Number.isFinite(battery) ? battery : 100
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get low battery -> ${batteryLevel}`)
     return batteryLevel <= LOW_BATTERY_THRESHOLD
       ? this.#platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
       : this.#platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
@@ -1123,9 +1145,11 @@ export class YotoPlayerAccessory {
 
     // Return a default value if temperature is not available
     if (temp === null || temp === 'notSupported') {
+      this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get temperature -> unavailable`)
       return 0
     }
 
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get temperature -> ${temp}`)
     return Number(temp)
   }
 
@@ -1135,13 +1159,18 @@ export class YotoPlayerAccessory {
    */
   async getTemperatureSensorFault () {
     // Report fault if device is offline or temperature is not available
-    if (!this.#deviceModel.status.isOnline ||
-        this.#deviceModel.status.temperatureCelsius === null ||
-        this.#deviceModel.status.temperatureCelsius === 'notSupported') {
-      return this.#platform.Characteristic.StatusFault.GENERAL_FAULT
-    }
-
-    return this.#platform.Characteristic.StatusFault.NO_FAULT
+    const isOffline = !this.#deviceModel.status.isOnline
+    const temp = this.#deviceModel.status.temperatureCelsius
+    const isUnavailable = temp === null || temp === 'notSupported'
+    const isFault = isOffline || isUnavailable
+    const fault = isFault
+      ? this.#platform.Characteristic.StatusFault.GENERAL_FAULT
+      : this.#platform.Characteristic.StatusFault.NO_FAULT
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get temperature sensor fault -> ${isFault} (online=${!isOffline} temp=${temp})`
+    )
+    return fault
   }
 
   // ==================== Nightlight Characteristic Handlers ====================
@@ -1183,7 +1212,9 @@ export class YotoPlayerAccessory {
    */
   async getDayNightlightOn () {
     const color = this.#deviceModel.config.ambientColour
-    return !this.isColorOff(color)
+    const isOn = !this.isColorOff(color)
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get day nightlight on -> ${isOn} (${color})`)
+    return isOn
   }
 
   /**
@@ -1220,10 +1251,16 @@ export class YotoPlayerAccessory {
    */
   async getDayNightlightBrightness () {
     const config = this.#deviceModel.config
-    if (config.dayDisplayBrightnessAuto || config.dayDisplayBrightness === null) {
-      return 100
-    }
-    return Math.max(0, Math.min(Math.round(config.dayDisplayBrightness), 100))
+    const isAuto = config.dayDisplayBrightnessAuto
+    const raw = config.dayDisplayBrightness
+    const brightness = isAuto || raw === null
+      ? 100
+      : Math.max(0, Math.min(Math.round(raw), 100))
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get day nightlight brightness -> ${brightness} (raw=${raw} auto=${isAuto})`
+    )
+    return brightness
   }
 
   /**
@@ -1260,10 +1297,12 @@ export class YotoPlayerAccessory {
   async getDayNightlightHue () {
     const color = this.#deviceModel.config.ambientColour
     if (this.isColorOff(color)) {
+      this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get day nightlight hue -> 0 (off)`)
       return 0
     }
     const hex = this.parseHexColor(color)
     const [h] = convert.hex.hsv(hex)
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get day nightlight hue -> ${h} (${color})`)
     return h
   }
 
@@ -1311,10 +1350,12 @@ export class YotoPlayerAccessory {
   async getDayNightlightSaturation () {
     const color = this.#deviceModel.config.ambientColour
     if (this.isColorOff(color)) {
+      this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get day nightlight saturation -> 0 (off)`)
       return 0
     }
     const hex = this.parseHexColor(color)
     const [, s] = convert.hex.hsv(hex)
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get day nightlight saturation -> ${s} (${color})`)
     return s
   }
 
@@ -1363,7 +1404,9 @@ export class YotoPlayerAccessory {
    */
   async getNightNightlightOn () {
     const color = this.#deviceModel.config.nightAmbientColour
-    return !this.isColorOff(color)
+    const isOn = !this.isColorOff(color)
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get night nightlight on -> ${isOn} (${color})`)
+    return isOn
   }
 
   /**
@@ -1400,10 +1443,16 @@ export class YotoPlayerAccessory {
    */
   async getNightNightlightBrightness () {
     const config = this.#deviceModel.config
-    if (config.nightDisplayBrightnessAuto || config.nightDisplayBrightness === null) {
-      return 100
-    }
-    return Math.max(0, Math.min(Math.round(config.nightDisplayBrightness), 100))
+    const isAuto = config.nightDisplayBrightnessAuto
+    const raw = config.nightDisplayBrightness
+    const brightness = isAuto || raw === null
+      ? 100
+      : Math.max(0, Math.min(Math.round(raw), 100))
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get night nightlight brightness -> ${brightness} (raw=${raw} auto=${isAuto})`
+    )
+    return brightness
   }
 
   /**
@@ -1440,10 +1489,12 @@ export class YotoPlayerAccessory {
   async getNightNightlightHue () {
     const color = this.#deviceModel.config.nightAmbientColour
     if (this.isColorOff(color)) {
+      this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get night nightlight hue -> 0 (off)`)
       return 0
     }
     const hex = this.parseHexColor(color)
     const [h] = convert.hex.hsv(hex)
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get night nightlight hue -> ${h} (${color})`)
     return h
   }
 
@@ -1491,10 +1542,12 @@ export class YotoPlayerAccessory {
   async getNightNightlightSaturation () {
     const color = this.#deviceModel.config.nightAmbientColour
     if (this.isColorOff(color)) {
+      this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get night nightlight saturation -> 0 (off)`)
       return 0
     }
     const hex = this.parseHexColor(color)
     const [, s] = convert.hex.hsv(hex)
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get night nightlight saturation -> ${s} (${color})`)
     return s
   }
 
@@ -1545,6 +1598,7 @@ export class YotoPlayerAccessory {
     const { Characteristic } = this.#platform
     const status = this.#deviceModel.status
     const isActive = status.nightlightMode !== 'off'
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get nightlight active -> ${isActive}`)
     return isActive ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
 
@@ -1558,6 +1612,10 @@ export class YotoPlayerAccessory {
     const isDay = status.dayMode === 'day'
     const isActive = status.nightlightMode !== 'off'
     const isShowing = isDay && isActive
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get day nightlight active -> ${isShowing} (day=${isDay} active=${isActive})`
+    )
     return isShowing ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
 
@@ -1571,6 +1629,10 @@ export class YotoPlayerAccessory {
     const isNight = status.dayMode === 'night'
     const isActive = status.nightlightMode !== 'off'
     const isShowing = isNight && isActive
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get night nightlight active -> ${isShowing} (night=${isNight} active=${isActive})`
+    )
     return isShowing ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
 
@@ -1584,6 +1646,7 @@ export class YotoPlayerAccessory {
     const { Characteristic } = this.#platform
     const status = this.#deviceModel.status
     const hasCard = status.cardInsertionState !== 'none'
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get card slot -> ${hasCard} (${status.cardInsertionState})`)
     return hasCard ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
 
@@ -1597,6 +1660,7 @@ export class YotoPlayerAccessory {
     const { Characteristic } = this.#platform
     const status = this.#deviceModel.status
     const isDayMode = status.dayMode === 'day'
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get day mode -> ${isDayMode}`)
     return isDayMode
       ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
       : Characteristic.ContactSensorState.CONTACT_DETECTED
@@ -1610,6 +1674,10 @@ export class YotoPlayerAccessory {
    */
   async getSleepTimerState () {
     const playback = this.#deviceModel.playback
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get sleep timer -> ${playback.sleepTimerActive ?? false}`
+    )
     return playback.sleepTimerActive ?? false
   }
 
@@ -1645,7 +1713,9 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getBluetoothState () {
-    return this.#deviceModel.config.bluetoothEnabled ?? false
+    const enabled = this.#deviceModel.config.bluetoothEnabled ?? false
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get Bluetooth -> ${enabled}`)
+    return enabled
   }
 
   /**
@@ -1677,6 +1747,10 @@ export class YotoPlayerAccessory {
   async setCardControl (service, control, value) {
     const { Characteristic } = this.#platform
     const isOn = Boolean(value)
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Set card control: ${control.label} (${control.cardId}) -> ${isOn}`
+    )
 
     if (!isOn) {
       service.getCharacteristic(Characteristic.On).updateValue(false)

package/lib/card-control-accessory.js

@@ -72,13 +72,20 @@ export class YotoCardControlAccessory {
       this.#accessory.addService(Service.AccessoryInformation)
 
     const displayName = sanitizeName(this.#accessory.displayName)
+    const nameCharacteristic = service.getCharacteristic(Characteristic.Name)
+    const configuredCharacteristic = service.getCharacteristic(Characteristic.ConfiguredName)
+    const previousName = nameCharacteristic.value
+    const configuredName = configuredCharacteristic.value
 
     service
       .setCharacteristic(Characteristic.Manufacturer, DEFAULT_MANUFACTURER)
       .setCharacteristic(Characteristic.Model, DEFAULT_MODEL)
       .setCharacteristic(Characteristic.SerialNumber, this.#cardControl.id)
       .setCharacteristic(Characteristic.Name, displayName)
-      .setCharacteristic(Characteristic.ConfiguredName, displayName)
+
+    if (typeof configuredName !== 'string' || configuredName === previousName) {
+      service.setCharacteristic(Characteristic.ConfiguredName, displayName)
+    }
 
     this.#currentServices.add(service)
   }
@@ -114,6 +121,10 @@ export class YotoCardControlAccessory {
   async setCardControl (value) {
     const { Characteristic } = this.#platform
     const isOn = Boolean(value)
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `Card control toggle requested: ${this.#cardControl.label} (${this.#cardControl.cardId}) -> ${isOn}`
+    )
 
     if (!isOn) {
       this.switchService?.getCharacteristic(Characteristic.On).updateValue(false)

package/lib/platform.js

@@ -170,7 +170,7 @@ export class YotoPlatform {
    */
   configureAccessory (accessory) {
     const { log, accessories, cardAccessories } = this
-    log.debug('Loading accessory from cache:', accessory.displayName)
+    log.debug('Loading accessory from cache:', accessory.displayName, accessory.UUID)
 
     const context = accessory.context
     const record = context && typeof context === 'object'
@@ -179,6 +179,7 @@ export class YotoPlatform {
     const accessoryType = record && typeof record['type'] === 'string'
       ? record['type']
       : undefined
+    log.debug('Cached accessory context type:', accessory.displayName, accessoryType ?? 'device')
 
     if (accessoryType === 'card-control' || record?.['cardControl']) {
       cardAccessories.set(accessory.UUID, /** @type {PlatformAccessory<YotoCardAccessoryContext>} */ (accessory))
@@ -200,6 +201,7 @@ export class YotoPlatform {
 
     try {
       this.log.debug('Starting Yoto account...')
+      this.log.debug('Playback accessory mode:', this.playbackAccessoryConfig.mode)
 
       // Listen for devices being added
       this.yotoAccount.on('deviceAdded', async ({ deviceId }) => {
@@ -212,6 +214,7 @@ export class YotoPlatform {
 
         const device = deviceModel.device
         this.log.info(`Device discovered: ${device.name} (${deviceId})`)
+        this.log.debug('Registering device from account discovery:', device.name, deviceId)
         await this.registerDevice(device, deviceModel)
       })
 
@@ -334,10 +337,15 @@ export class YotoPlatform {
       await this.yotoAccount.start()
 
       this.log.info(`✓ Yoto account started with ${this.yotoAccount.devices.size} device(s)`)
+      this.log.debug(
+        'Account devices:',
+        Array.from(this.yotoAccount.devices.keys()).join(', ') || 'none'
+      )
 
       // Remove stale accessories after all devices are registered
       this.removeStaleAccessories()
 
+      this.log.debug('Registering card control accessories (playOnAll).')
       await this.registerCardControlAccessories()
     } catch (error) {
       this.log.error('Failed to start account:', error instanceof Error ? error.message : String(error))
@@ -401,28 +409,24 @@ export class YotoPlatform {
     const uuid = this.api.hap.uuid.generate(device.deviceId)
     const sanitizedDeviceName = sanitizeName(device.name)
     const accessoryCategory = this.api.hap.Categories.SPEAKER
+    this.log.debug(
+      'Register device:',
+      `${device.name} (${device.deviceId})`,
+      `uuid=${uuid}`,
+      `category=${accessoryCategory}`
+    )
 
     // Check if accessory already exists
     const existingAccessory = this.accessories.get(uuid)
 
     if (existingAccessory) {
       // Accessory exists - update it
-      this.log.debug('Restoring existing accessory from cache:', device.name)
+      this.log.debug('Restoring existing accessory from cache:', device.name, existingAccessory.UUID)
 
       // Update display name if it has changed
       if (existingAccessory.displayName !== sanitizedDeviceName) {
+        this.log.debug('Updating accessory display name:', existingAccessory.displayName, '->', sanitizedDeviceName)
         existingAccessory.updateDisplayName(sanitizedDeviceName)
-        const infoService = existingAccessory.getService(this.api.hap.Service.AccessoryInformation)
-        if (infoService) {
-          // Only update Name, preserve user's ConfiguredName customization
-          // ConfiguredName is intentionally NOT updated here because:
-          // - It allows users to rename accessories in the Home app
-          // - Their custom names should survive Homebridge restarts and Yoto device name changes
-          // - Name stays in sync with Yoto's device name for plugin identification
-          infoService
-            .setCharacteristic(this.api.hap.Characteristic.Name, sanitizedDeviceName)
-            .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, sanitizedDeviceName)
-        }
       }
 
       // Update context with fresh device data
@@ -439,6 +443,7 @@ export class YotoPlatform {
 
       // Update accessory information
       this.api.updatePlatformAccessories([existingAccessory])
+      this.log.debug('Updated accessory cache entry:', existingAccessory.displayName, existingAccessory.UUID)
 
       // Create handler for this accessory with device model
       const handler = new YotoPlayerAccessory({
@@ -449,9 +454,11 @@ export class YotoPlatform {
 
       // Track handler
       this.accessoryHandlers.set(uuid, handler)
+      this.log.debug('Created accessory handler:', existingAccessory.displayName, uuid)
 
       // Initialize accessory (setup services and event listeners)
       await handler.setup()
+      this.log.debug('Accessory setup complete:', existingAccessory.displayName)
 
       if (this.playbackAccessoryConfig.mode === 'external') {
         await this.registerSpeakerAccessory(device, deviceModel)
@@ -460,21 +467,13 @@ export class YotoPlatform {
       return { success: true }
     } else {
       // Create new accessory
-      this.log.debug('Adding new accessory:', device.name)
+      this.log.debug('Adding new accessory:', device.name, uuid)
 
       // Create platform accessory
       /** @type {PlatformAccessory<YotoAccessoryContext>} */
       // eslint-disable-next-line new-cap
       const accessory = new this.api.platformAccessory(sanitizedDeviceName, uuid, accessoryCategory)
 
-      // Set Name and ConfiguredName on AccessoryInformation service
-      const infoService = accessory.getService(this.api.hap.Service.AccessoryInformation)
-      if (infoService) {
-        infoService
-          .setCharacteristic(this.api.hap.Characteristic.Name, sanitizedDeviceName)
-          .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, sanitizedDeviceName)
-      }
-
       // Set accessory context
       accessory.context = {
         type: 'device',
@@ -490,13 +489,16 @@ export class YotoPlatform {
 
       // Track handler
       this.accessoryHandlers.set(uuid, handler)
+      this.log.debug('Created accessory handler:', device.name, uuid)
 
       // Initialize accessory (setup services and event listeners)
       await handler.setup()
+      this.log.debug('Accessory setup complete:', device.name)
 
       // Register as a platform accessory (bridged).
       this.log.debug(`Registering new accessory: ${device.name}`)
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory])
+      this.log.debug('Registered platform accessory:', device.name, uuid)
 
       if (this.playbackAccessoryConfig.mode === 'external') {
         await this.registerSpeakerAccessory(device, deviceModel)
@@ -504,6 +506,7 @@ export class YotoPlatform {
 
       // Add to our tracking map (cast to typed version)
       this.accessories.set(uuid, accessory)
+      this.log.debug('Tracked new accessory:', device.name, uuid)
 
       return { success: true }
     }
@@ -519,11 +522,12 @@ export class YotoPlatform {
     const uuid = this.getSpeakerAccessoryUuid(device.deviceId)
     const speakerName = this.getSpeakerAccessoryName(device)
     if (this.speakerAccessories.has(uuid)) {
-      this.log.debug('SmartSpeaker accessory already published:', speakerName)
+      this.log.debug('SmartSpeaker accessory already published:', speakerName, uuid)
       return { success: true }
     }
 
     this.log.info('Adding new SmartSpeaker accessory:', speakerName)
+    this.log.debug('Creating SmartSpeaker accessory:', speakerName, uuid)
 
     /** @type {PlatformAccessory<YotoAccessoryContext>} */
     // eslint-disable-next-line new-cap
@@ -533,13 +537,6 @@ export class YotoPlatform {
       this.api.hap.Categories.SPEAKER
     )
 
-    const infoService = accessory.getService(this.api.hap.Service.AccessoryInformation)
-    if (infoService) {
-      infoService
-        .setCharacteristic(this.api.hap.Characteristic.Name, speakerName)
-        .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, speakerName)
-    }
-
     accessory.context = {
       device,
     }
@@ -551,11 +548,14 @@ export class YotoPlatform {
     })
 
     this.speakerAccessoryHandlers.set(uuid, handler)
+    this.log.debug('Created SmartSpeaker handler:', speakerName, uuid)
 
     await handler.setup()
+    this.log.debug('SmartSpeaker setup complete:', speakerName)
 
     this.log.info(`Publishing external SmartSpeaker accessory: ${speakerName}`)
     this.api.publishExternalAccessories(PLUGIN_NAME, [accessory])
+    this.log.debug('Published external SmartSpeaker accessory:', speakerName, uuid)
 
     this.speakerAccessories.set(uuid, accessory)
 
@@ -569,24 +569,21 @@ export class YotoPlatform {
   async registerCardControlAccessories () {
     const cardControls = getCardControlConfigs(this.config).filter(control => control.playOnAll)
     const desiredUuids = new Set()
+    this.log.debug('Card control configs (playOnAll):', cardControls.length)
 
     for (const control of cardControls) {
       const uuid = this.getCardControlAccessoryUuid(control)
       const accessoryName = this.getCardControlAccessoryName(control)
       desiredUuids.add(uuid)
+      this.log.debug('Ensuring card control accessory:', accessoryName, uuid)
 
       const existingAccessory = this.cardAccessories.get(uuid)
       if (existingAccessory) {
-        this.log.debug('Restoring existing card control accessory from cache:', accessoryName)
+        this.log.debug('Restoring existing card control accessory from cache:', accessoryName, uuid)
 
         if (existingAccessory.displayName !== accessoryName) {
+          this.log.debug('Updating card control display name:', existingAccessory.displayName, '->', accessoryName)
           existingAccessory.updateDisplayName(accessoryName)
-          const infoService = existingAccessory.getService(this.api.hap.Service.AccessoryInformation)
-          if (infoService) {
-            infoService
-              .setCharacteristic(this.api.hap.Characteristic.Name, accessoryName)
-              .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, accessoryName)
-          }
         }
 
         existingAccessory.context = {
@@ -595,6 +592,7 @@ export class YotoPlatform {
         }
 
         this.api.updatePlatformAccessories([existingAccessory])
+        this.log.debug('Updated card control cache entry:', existingAccessory.displayName, uuid)
 
         const existingHandler = this.cardAccessoryHandlers.get(uuid)
         if (existingHandler) {
@@ -612,10 +610,11 @@ export class YotoPlatform {
 
         this.cardAccessoryHandlers.set(uuid, handler)
         await handler.setup()
+        this.log.debug('Card control setup complete:', accessoryName)
         continue
       }
 
-      this.log.debug('Adding new card control accessory:', accessoryName)
+      this.log.debug('Adding new card control accessory:', accessoryName, uuid)
 
       /** @type {PlatformAccessory<YotoCardAccessoryContext>} */
       // eslint-disable-next-line new-cap
@@ -625,13 +624,6 @@ export class YotoPlatform {
         this.api.hap.Categories.SWITCH
       )
 
-      const infoService = accessory.getService(this.api.hap.Service.AccessoryInformation)
-      if (infoService) {
-        infoService
-          .setCharacteristic(this.api.hap.Characteristic.Name, accessoryName)
-          .setCharacteristic(this.api.hap.Characteristic.ConfiguredName, accessoryName)
-      }
-
       accessory.context = {
         type: 'card-control',
         cardControl: control,
@@ -645,11 +637,14 @@ export class YotoPlatform {
 
       this.cardAccessoryHandlers.set(uuid, handler)
       await handler.setup()
+      this.log.debug('Card control setup complete:', accessoryName)
 
       this.log.debug(`Registering card control accessory: ${accessoryName}`)
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory])
+      this.log.debug('Registered card control accessory:', accessoryName, uuid)
 
       this.cardAccessories.set(uuid, accessory)
+      this.log.debug('Tracked card control accessory:', accessoryName, uuid)
     }
 
     for (const [uuid, accessory] of this.cardAccessories) {
@@ -657,7 +652,7 @@ export class YotoPlatform {
         continue
       }
 
-      this.log.debug('Removing card control accessory from cache:', accessory.displayName)
+      this.log.debug('Removing card control accessory from cache:', accessory.displayName, uuid)
 
       const handler = this.cardAccessoryHandlers.get(uuid)
       if (handler) {
@@ -669,6 +664,7 @@ export class YotoPlatform {
 
       this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory])
       this.cardAccessories.delete(uuid)
+      this.log.debug('Removed card control accessory:', accessory.displayName, uuid)
     }
   }
 
@@ -683,10 +679,16 @@ export class YotoPlatform {
     // Get current device IDs from account
     const currentDeviceIds = this.yotoAccount.getDeviceIds()
     const currentUUIDs = currentDeviceIds.map(id => this.api.hap.uuid.generate(id))
+    this.log.debug(
+      'Evaluating stale accessories:',
+      `accountDevices=${currentDeviceIds.length}`,
+      `cachedAccessories=${this.accessories.size}`,
+      `externalSpeakers=${this.speakerAccessories.size}`
+    )
 
     for (const [uuid, accessory] of this.accessories) {
       if (!currentUUIDs.includes(uuid)) {
-        this.log.debug('Removing existing accessory from cache:', accessory.displayName)
+        this.log.debug('Removing existing accessory from cache:', accessory.displayName, uuid)
 
         // Stop handler if it exists
         const handler = this.accessoryHandlers.get(uuid)
@@ -699,16 +701,18 @@ export class YotoPlatform {
 
         // Unregister from Homebridge
         this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory])
+        this.log.debug('Unregistered accessory from Homebridge:', accessory.displayName, uuid)
 
         // Remove from our tracking map
         this.accessories.delete(uuid)
+        this.log.debug('Removed accessory from tracking map:', accessory.displayName, uuid)
       }
     }
 
     for (const [uuid, accessory] of this.speakerAccessories) {
       const deviceId = accessory.context.device?.deviceId
       if (!deviceId || !currentDeviceIds.includes(deviceId)) {
-        this.log.debug('Removing external SmartSpeaker accessory from runtime:', accessory.displayName)
+        this.log.debug('Removing external SmartSpeaker accessory from runtime:', accessory.displayName, uuid)
 
         const handler = this.speakerAccessoryHandlers.get(uuid)
         if (handler) {
@@ -719,6 +723,7 @@ export class YotoPlatform {
         }
 
         this.speakerAccessories.delete(uuid)
+        this.log.debug('Removed external SmartSpeaker accessory:', accessory.displayName, uuid)
       }
     }
   }
@@ -728,6 +733,12 @@ export class YotoPlatform {
    */
   async shutdown () {
     this.log.debug('Shutting down Yoto platform...')
+    this.log.debug(
+      'Handlers to stop:',
+      `devices=${this.accessoryHandlers.size}`,
+      `speakers=${this.speakerAccessoryHandlers.size}`,
+      `cardControls=${this.cardAccessoryHandlers.size}`
+    )
 
     // Stop all accessory handlers
     const stopPromises = []

package/lib/speaker-accessory.js

@@ -78,6 +78,11 @@ export class YotoSpeakerAccessory {
     const { Service, Characteristic } = this.#platform
     const service = this.#accessory.getService(Service.AccessoryInformation) ||
       this.#accessory.addService(Service.AccessoryInformation)
+    const displayName = sanitizeName(this.#accessory.displayName)
+    const nameCharacteristic = service.getCharacteristic(Characteristic.Name)
+    const configuredCharacteristic = service.getCharacteristic(Characteristic.ConfiguredName)
+    const previousName = nameCharacteristic.value
+    const configuredName = configuredCharacteristic.value
 
     const hardwareRevision = [
       this.#device.generation,
@@ -87,11 +92,16 @@ export class YotoSpeakerAccessory {
     const model = this.#device.deviceFamily || this.#device.deviceType || DEFAULT_MODEL
 
     service
+      .setCharacteristic(Characteristic.Name, displayName)
       .setCharacteristic(Characteristic.Manufacturer, DEFAULT_MANUFACTURER)
       .setCharacteristic(Characteristic.Model, model)
       .setCharacteristic(Characteristic.SerialNumber, this.#device.deviceId)
       .setCharacteristic(Characteristic.HardwareRevision, hardwareRevision)
 
+    if (typeof configuredName !== 'string' || configuredName === previousName) {
+      service.setCharacteristic(Characteristic.ConfiguredName, displayName)
+    }
+
     if (this.#deviceModel.status.firmwareVersion) {
       service.setCharacteristic(
         Characteristic.FirmwareRevision,
@@ -285,7 +295,12 @@ export class YotoSpeakerAccessory {
    */
   async getCurrentMediaState () {
     const playbackStatus = this.#deviceModel.playback.playbackStatus ?? null
-    return this.getMediaStateValues(playbackStatus).current
+    const current = this.getMediaStateValues(playbackStatus).current
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get current media state -> ${current} (${playbackStatus ?? 'unknown'})`
+    )
+    return current
   }
 
   /**
@@ -294,7 +309,12 @@ export class YotoSpeakerAccessory {
    */
   async getTargetMediaState () {
     const playbackStatus = this.#deviceModel.playback.playbackStatus ?? null
-    return this.getMediaStateValues(playbackStatus).target
+    const target = this.getMediaStateValues(playbackStatus).target
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get target media state -> ${target} (${playbackStatus ?? 'unknown'})`
+    )
+    return target
   }
 
   /**
@@ -337,7 +357,12 @@ export class YotoSpeakerAccessory {
     const volumeSteps = this.#deviceModel.status.volume
     const normalizedSteps = Number.isFinite(volumeSteps) ? volumeSteps : 0
     const clampedSteps = Math.max(0, Math.min(normalizedSteps, 16))
-    return Math.round((clampedSteps / 16) * 100)
+    const percent = Math.round((clampedSteps / 16) * 100)
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get speaker volume -> ${percent} (rawSteps=${volumeSteps})`
+    )
+    return percent
   }
 
   /**
@@ -380,7 +405,9 @@ export class YotoSpeakerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getMute () {
-    return this.#deviceModel.status.volume === 0
+    const isMuted = this.#deviceModel.status.volume === 0
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get speaker mute -> ${isMuted}`)
+    return isMuted
   }
 
   /**
@@ -405,7 +432,9 @@ export class YotoSpeakerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getStatusActive () {
-    return this.#deviceModel.status.isOnline
+    const isOnline = this.#deviceModel.status.isOnline
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get speaker status active -> ${isOnline}`)
+    return isOnline
   }
 
   /**

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.41",
+  "version": "0.0.42",
   "author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
   "bugs": {
     "url": "https://github.com/bcomnes/homebridge-yoto/issues"