homebridge-yoto 0.0.39 → 0.0.41

package/lib/accessory.js

@@ -8,6 +8,7 @@
 /** @import { YotoDevice } from 'yoto-nodejs-client/lib/api-endpoints/devices.js' */
 /** @import { YotoAccessoryContext } from './platform.js' */
 /** @import { ServiceSchemaKey } from '../config.schema.cjs' */
+/** @import { CardControlConfig } from './card-controls.js' */
 
 /**
  * Device capabilities detected from metadata
@@ -22,10 +23,11 @@
  * @typedef {Object} YotoServiceToggles
  * @property {boolean} playback
  * @property {boolean} volume
+ * @property {boolean} battery
  * @property {boolean} temperature
  * @property {boolean} nightlight
  * @property {boolean} cardSlot
- * @property {boolean} nightMode
+ * @property {boolean} dayMode
  * @property {boolean} sleepTimer
  * @property {boolean} bluetooth
  * @property {boolean} volumeLimits
@@ -41,6 +43,8 @@ import {
 import { sanitizeName } from './sanitize-name.js'
 import { syncServiceNames } from './sync-service-names.js'
 import { serviceSchema } from '../config.schema.cjs'
+import { getPlaybackAccessoryConfig } from './service-config.js'
+import { getCardControlConfigs } from './card-controls.js'
 
 // Use syncServiceNames for every visible service so HomeKit labels stay stable.
 // Exceptions: AccessoryInformation (named in platform) and Battery (set Characteristic.Name only).
@@ -60,7 +64,7 @@ function getBooleanSetting (value, fallback) {
  */
 function getServiceDefault (key) {
   const entry = serviceSchema[key]
-  if (entry?.default !== undefined && typeof entry.default === 'boolean') {
+  if (entry && 'default' in entry && typeof entry.default === 'boolean') {
     return entry.default
   }
   return false
@@ -87,7 +91,7 @@ export class YotoPlayerAccessory {
   /** @type {Service | undefined} */ dayNightlightActiveService
   /** @type {Service | undefined} */ nightNightlightActiveService
   /** @type {Service | undefined} */ cardSlotService
-  /** @type {Service | undefined} */ nightModeService
+  /** @type {Service | undefined} */ dayModeService
   /** @type {Service | undefined} */ sleepTimerService
   /** @type {Service | undefined} */ bluetoothService
   /** @type {Service | undefined} */ dayMaxVolumeService
@@ -127,14 +131,16 @@ export class YotoPlayerAccessory {
     const serviceConfig = typeof services === 'object' && services !== null
       ? /** @type {Record<string, unknown>} */ (services)
       : {}
+    const playbackConfig = getPlaybackAccessoryConfig(this.#platform.config)
 
     return {
-      playback: getBooleanSetting(serviceConfig['playback'], getServiceDefault('playback')),
-      volume: getBooleanSetting(serviceConfig['volume'], getServiceDefault('volume')),
+      playback: playbackConfig.playbackEnabled,
+      volume: playbackConfig.volumeEnabled,
+      battery: getBooleanSetting(serviceConfig['battery'], getServiceDefault('battery')),
       temperature: getBooleanSetting(serviceConfig['temperature'], getServiceDefault('temperature')),
       nightlight: getBooleanSetting(serviceConfig['nightlight'], getServiceDefault('nightlight')),
       cardSlot: getBooleanSetting(serviceConfig['cardSlot'], getServiceDefault('cardSlot')),
-      nightMode: getBooleanSetting(serviceConfig['nightMode'], getServiceDefault('nightMode')),
+      dayMode: getBooleanSetting(serviceConfig['dayMode'], getServiceDefault('dayMode')),
       sleepTimer: getBooleanSetting(serviceConfig['sleepTimer'], getServiceDefault('sleepTimer')),
       bluetooth: getBooleanSetting(serviceConfig['bluetooth'], getServiceDefault('bluetooth')),
       volumeLimits: getBooleanSetting(serviceConfig['volumeLimits'], getServiceDefault('volumeLimits')),
@@ -173,7 +179,9 @@ export class YotoPlayerAccessory {
       this.setupVolumeService()
     }
 
-    this.setupBatteryService()
+    if (serviceToggles.battery) {
+      this.setupBatteryService()
+    }
 
     // Setup optional services based on device capabilities
     if (serviceToggles.temperature && this.#deviceModel.capabilities.hasTemperatureSensor) {
@@ -188,8 +196,8 @@ export class YotoPlayerAccessory {
     if (serviceToggles.cardSlot) {
       this.setupCardSlotService()
     }
-    if (serviceToggles.nightMode) {
-      this.setupNightModeService()
+    if (serviceToggles.dayMode) {
+      this.setupDayModeService()
     }
     if (serviceToggles.sleepTimer) {
       this.setupSleepTimerService()
@@ -200,6 +208,7 @@ export class YotoPlayerAccessory {
     if (serviceToggles.volumeLimits) {
       this.setupVolumeLimitServices()
     }
+    this.setupCardControlServices()
 
     // Remove any services that aren't in our current set
     // (except AccessoryInformation which should always be preserved)
@@ -515,21 +524,21 @@ export class YotoPlayerAccessory {
   }
 
   /**
-   * Setup night mode ContactSensor service
-   * Shows if device is in night mode (vs day mode)
+   * Setup day mode ContactSensor service
+   * Shows if device is in day mode (vs night mode)
    */
-  setupNightModeService () {
+  setupDayModeService () {
     const { Service, Characteristic } = this.#platform
-    const serviceName = this.generateServiceName('Night Mode')
+    const serviceName = this.generateServiceName('Day Mode')
 
-    const service = this.#accessory.getServiceById(Service.ContactSensor, 'NightModeStatus') ||
-      this.#accessory.addService(Service.ContactSensor, serviceName, 'NightModeStatus')
+    const service = this.#accessory.getServiceById(Service.ContactSensor, 'DayModeStatus') ||
+      this.#accessory.addService(Service.ContactSensor, serviceName, 'DayModeStatus')
     syncServiceNames({ Characteristic, service, name: serviceName })
 
     service.getCharacteristic(Characteristic.ContactSensorState)
-      .onGet(this.getNightModeStatus.bind(this))
+      .onGet(this.getDayModeStatus.bind(this))
 
-    this.nightModeService = service
+    this.dayModeService = service
     this.#currentServices.add(service)
   }
 
@@ -632,6 +641,39 @@ export class YotoPlayerAccessory {
     this.#currentServices.add(nightService)
   }
 
+  /**
+   * Setup card control Switch services
+   */
+  setupCardControlServices () {
+    const cardControls = getCardControlConfigs(this.#platform.config)
+    if (cardControls.length === 0) {
+      return
+    }
+
+    const { Service, Characteristic } = this.#platform
+
+    for (const control of cardControls) {
+      const serviceName = this.generateServiceName(control.label)
+      const subtype = `CardControl:${control.id}`
+
+      const service = this.#accessory.getServiceById(Service.Switch, subtype) ||
+        this.#accessory.addService(Service.Switch, serviceName, subtype)
+
+      syncServiceNames({ Characteristic, service, name: serviceName })
+
+      service
+        .getCharacteristic(Characteristic.On)
+        .onGet(() => false)
+        .onSet(async (value) => {
+          await this.setCardControl(service, control, value)
+        })
+
+      service.updateCharacteristic(Characteristic.On, false)
+
+      this.#currentServices.add(service)
+    }
+  }
+
   /**
    * Setup event listeners for device model updates
    * Uses exhaustive switch pattern for type safety
@@ -677,8 +719,8 @@ export class YotoPlayerAccessory {
             break
 
           case 'dayMode':
-            // Update night mode ContactSensor
-            this.updateNightModeCharacteristic()
+            // Update day mode ContactSensor
+            this.updateDayModeCharacteristic()
             // Update nightlight status ContactSensors (depends on dayMode)
             if (this.#deviceModel.capabilities.hasColoredNightlight) {
               this.updateNightlightStatusCharacteristics()
@@ -879,7 +921,8 @@ export class YotoPlayerAccessory {
     })
 
     this.#deviceModel.on('error', (error) => {
-      this.#log.error(`[${this.#device.name}] Device error:`, error.message)
+      const details = error instanceof Error ? (error.stack || error.message) : String(error)
+      this.#log.error(`[${this.#device.name}] Device error:`, details)
     })
   }
 
@@ -927,7 +970,7 @@ export class YotoPlayerAccessory {
     const percent = Math.round((clampedSteps / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Get volume rawSteps=${volumeSteps} steps=${clampedSteps} percent=${percent}`
+      `[${this.#device.name}] Get volume rawSteps=${volumeSteps} percent=${percent}`
     )
     return percent
   }
@@ -966,13 +1009,12 @@ export class YotoPlayerAccessory {
       await deviceModel.setVolume(steps)
       if (this.volumeService) {
         const { Characteristic } = this.#platform
-
+        const clampedPercent = Math.round((steps / 16) * 100)
         this.volumeService
           .getCharacteristic(Characteristic.On)
           .updateValue(steps > 0)
 
         if (steps !== requestedSteps || normalizedPercent !== requestedPercent) {
-          const clampedPercent = Math.round((steps / 16) * 100)
           this.volumeService
             .getCharacteristic(Characteristic.Brightness)
             .updateValue(clampedPercent)
@@ -1149,19 +1191,26 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value
    */
   async setDayNightlightOn (value) {
-    if (value) {
-      // Turn ON - restore previous color or default to white
-      const colorToSet = this.#lastDayColor || '0xffffff'
-      this.#log.debug(LOG_PREFIX.ACCESSORY, `Turning day nightlight ON with color: ${colorToSet}`)
-      await this.#deviceModel.updateConfig({ ambientColour: colorToSet })
-    } else {
-      // Turn OFF - save current color and set to black
-      const currentColor = this.#deviceModel.config.ambientColour
-      if (!this.isColorOff(currentColor)) {
-        this.#lastDayColor = currentColor
+    try {
+      if (value) {
+        // Turn ON - restore previous color or default to white
+        const colorToSet = this.#lastDayColor || '0xffffff'
+        this.#log.debug(LOG_PREFIX.ACCESSORY, `Turning day nightlight ON with color: ${colorToSet}`)
+        await this.#deviceModel.updateConfig({ ambientColour: colorToSet })
+      } else {
+        // Turn OFF - save current color and set to black
+        const currentColor = this.#deviceModel.config.ambientColour
+        if (!this.isColorOff(currentColor)) {
+          this.#lastDayColor = currentColor
+        }
+        this.#log.debug(LOG_PREFIX.ACCESSORY, 'Turning day nightlight OFF')
+        await this.#deviceModel.updateConfig({ ambientColour: '0x000000' })
       }
-      this.#log.debug(LOG_PREFIX.ACCESSORY, 'Turning day nightlight OFF')
-      await this.#deviceModel.updateConfig({ ambientColour: '0x000000' })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set day nightlight:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
     }
   }
 
@@ -1191,10 +1240,17 @@ export class YotoPlayerAccessory {
 
     const brightnessValue = Math.max(0, Math.min(Math.round(rawBrightness), 100))
     this.#log.debug(LOG_PREFIX.ACCESSORY, `Setting day display brightness: ${brightnessValue}`)
-    await this.#deviceModel.updateConfig({
-      dayDisplayBrightness: brightnessValue,
-      dayDisplayBrightnessAuto: false
-    })
+    try {
+      await this.#deviceModel.updateConfig({
+        dayDisplayBrightness: brightnessValue,
+        dayDisplayBrightnessAuto: false
+      })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set day brightness:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   /**
@@ -1238,7 +1294,14 @@ export class YotoPlayerAccessory {
     const formattedColor = this.formatHexColor(newHex)
 
     this.#log.debug(LOG_PREFIX.ACCESSORY, `Setting day nightlight hue: ${hue}° → ${formattedColor}`)
-    await this.#deviceModel.updateConfig({ ambientColour: formattedColor })
+    try {
+      await this.#deviceModel.updateConfig({ ambientColour: formattedColor })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set day nightlight hue:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   /**
@@ -1282,7 +1345,14 @@ export class YotoPlayerAccessory {
     const formattedColor = this.formatHexColor(newHex)
 
     this.#log.debug(LOG_PREFIX.ACCESSORY, `Setting day nightlight saturation: ${saturation}% → ${formattedColor}`)
-    await this.#deviceModel.updateConfig({ ambientColour: formattedColor })
+    try {
+      await this.#deviceModel.updateConfig({ ambientColour: formattedColor })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set day nightlight saturation:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   // ---------- Night Nightlight Handlers ----------
@@ -1301,19 +1371,26 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value
    */
   async setNightNightlightOn (value) {
-    if (value) {
-      // Turn ON - restore previous color or default to white
-      const colorToSet = this.#lastNightColor || '0xffffff'
-      this.#log.debug(LOG_PREFIX.ACCESSORY, `Turning night nightlight ON with color: ${colorToSet}`)
-      await this.#deviceModel.updateConfig({ nightAmbientColour: colorToSet })
-    } else {
-      // Turn OFF - save current color and set to black
-      const currentColor = this.#deviceModel.config.nightAmbientColour
-      if (!this.isColorOff(currentColor)) {
-        this.#lastNightColor = currentColor
+    try {
+      if (value) {
+        // Turn ON - restore previous color or default to white
+        const colorToSet = this.#lastNightColor || '0xffffff'
+        this.#log.debug(LOG_PREFIX.ACCESSORY, `Turning night nightlight ON with color: ${colorToSet}`)
+        await this.#deviceModel.updateConfig({ nightAmbientColour: colorToSet })
+      } else {
+        // Turn OFF - save current color and set to black
+        const currentColor = this.#deviceModel.config.nightAmbientColour
+        if (!this.isColorOff(currentColor)) {
+          this.#lastNightColor = currentColor
+        }
+        this.#log.debug(LOG_PREFIX.ACCESSORY, 'Turning night nightlight OFF')
+        await this.#deviceModel.updateConfig({ nightAmbientColour: '0x000000' })
       }
-      this.#log.debug(LOG_PREFIX.ACCESSORY, 'Turning night nightlight OFF')
-      await this.#deviceModel.updateConfig({ nightAmbientColour: '0x000000' })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set night nightlight:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
     }
   }
 
@@ -1343,10 +1420,17 @@ export class YotoPlayerAccessory {
 
     const brightnessValue = Math.max(0, Math.min(Math.round(rawBrightness), 100))
     this.#log.debug(LOG_PREFIX.ACCESSORY, `Setting night display brightness: ${brightnessValue}`)
-    await this.#deviceModel.updateConfig({
-      nightDisplayBrightness: brightnessValue,
-      nightDisplayBrightnessAuto: false
-    })
+    try {
+      await this.#deviceModel.updateConfig({
+        nightDisplayBrightness: brightnessValue,
+        nightDisplayBrightnessAuto: false
+      })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set night brightness:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   /**
@@ -1390,7 +1474,14 @@ export class YotoPlayerAccessory {
     const formattedColor = this.formatHexColor(newHex)
 
     this.#log.debug(LOG_PREFIX.ACCESSORY, `Setting night nightlight hue: ${hue}° → ${formattedColor}`)
-    await this.#deviceModel.updateConfig({ nightAmbientColour: formattedColor })
+    try {
+      await this.#deviceModel.updateConfig({ nightAmbientColour: formattedColor })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set night nightlight hue:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   /**
@@ -1434,7 +1525,14 @@ export class YotoPlayerAccessory {
     const formattedColor = this.formatHexColor(newHex)
 
     this.#log.debug(LOG_PREFIX.ACCESSORY, `Setting night nightlight saturation: ${saturation}% → ${formattedColor}`)
-    await this.#deviceModel.updateConfig({ nightAmbientColour: formattedColor })
+    try {
+      await this.#deviceModel.updateConfig({ nightAmbientColour: formattedColor })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set night nightlight saturation:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   // ==================== Nightlight Status ContactSensor Getters ====================
@@ -1489,17 +1587,17 @@ export class YotoPlayerAccessory {
     return hasCard ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
 
-  // ==================== Night Mode ContactSensor Getter ====================
+  // ==================== Day Mode ContactSensor Getter ====================
 
   /**
-   * Get night mode status
+   * Get day mode status
    * @returns {Promise<CharacteristicValue>}
    */
-  async getNightModeStatus () {
+  async getDayModeStatus () {
     const { Characteristic } = this.#platform
     const status = this.#deviceModel.status
-    const isNightMode = status.dayMode === 'night'
-    return isNightMode
+    const isDayMode = status.dayMode === 'day'
+    return isDayMode
       ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
       : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
@@ -1557,7 +1655,62 @@ export class YotoPlayerAccessory {
   async setBluetoothState (value) {
     const enabled = Boolean(value)
     this.#log.debug(LOG_PREFIX.ACCESSORY, `Setting Bluetooth: ${enabled ? 'ON' : 'OFF'}`)
-    await this.#deviceModel.updateConfig({ bluetoothEnabled: enabled })
+    try {
+      await this.#deviceModel.updateConfig({ bluetoothEnabled: enabled })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set Bluetooth:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
+  }
+
+  // ==================== Card Control Switch Setter ====================
+
+  /**
+   * Trigger card playback for a configured card control.
+   * @param {Service} service
+   * @param {CardControlConfig} control
+   * @param {CharacteristicValue} value
+   * @returns {Promise<void>}
+   */
+  async setCardControl (service, control, value) {
+    const { Characteristic } = this.#platform
+    const isOn = Boolean(value)
+
+    if (!isOn) {
+      service.getCharacteristic(Characteristic.On).updateValue(false)
+      return
+    }
+
+    if (!this.#deviceModel.status.isOnline) {
+      this.#log.warn(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Card control skipped (offline): ${control.label}`)
+      service.getCharacteristic(Characteristic.On).updateValue(false)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
+
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Play card control: ${control.label} (${control.cardId})`
+    )
+
+    try {
+      await this.#deviceModel.startCard({ cardId: control.cardId })
+    } catch (error) {
+      this.#log.error(
+        LOG_PREFIX.ACCESSORY,
+        `[${this.#device.name}] Failed to play card ${control.cardId}:`,
+        error
+      )
+      service.getCharacteristic(Characteristic.On).updateValue(false)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
+
+    service.getCharacteristic(Characteristic.On).updateValue(false)
   }
 
   // ==================== Volume Limit Lightbulb Getters/Setters ====================
@@ -1573,7 +1726,7 @@ export class YotoPlayerAccessory {
     const percent = Math.round((clampedSteps / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Get day max volume limit rawSteps=${limit} steps=${clampedSteps} percent=${percent}`
+      `[${this.#device.name}] Get day max volume limit rawSteps=${limit} percent=${percent}`
     )
     return percent
   }
@@ -1598,7 +1751,14 @@ export class YotoPlayerAccessory {
       LOG_PREFIX.ACCESSORY,
       `[${this.#device.name}] Set day max volume limit raw=${value} normalizedPercent=${normalizedPercent} requestedSteps=${requestedSteps} -> steps=${limit} percent=${limitPercent}`
     )
-    await this.#deviceModel.updateConfig({ maxVolumeLimit: limit })
+    try {
+      await this.#deviceModel.updateConfig({ maxVolumeLimit: limit })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set day max volume limit:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   /**
@@ -1612,7 +1772,7 @@ export class YotoPlayerAccessory {
     const percent = Math.round((clampedSteps / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Get night max volume limit rawSteps=${limit} steps=${clampedSteps} percent=${percent}`
+      `[${this.#device.name}] Get night max volume limit rawSteps=${limit} percent=${percent}`
     )
     return percent
   }
@@ -1637,7 +1797,14 @@ export class YotoPlayerAccessory {
       LOG_PREFIX.ACCESSORY,
       `[${this.#device.name}] Set night max volume limit raw=${value} normalizedPercent=${normalizedPercent} requestedSteps=${requestedSteps} -> steps=${limit} percent=${limitPercent}`
     )
-    await this.#deviceModel.updateConfig({ nightMaxVolumeLimit: limit })
+    try {
+      await this.#deviceModel.updateConfig({ nightMaxVolumeLimit: limit })
+    } catch (error) {
+      this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set night max volume limit:`, error)
+      throw new this.#platform.api.hap.HapStatusError(
+        this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
+      )
+    }
   }
 
   // ==================== Characteristic Update Methods ====================
@@ -1663,7 +1830,6 @@ export class YotoPlayerAccessory {
   updateVolumeCharacteristic (volumeSteps) {
     if (!this.volumeService) return
 
-    const { Characteristic } = this.#platform
     if (volumeSteps > 0) {
       this.#lastNonZeroVolume = Math.round((volumeSteps / 16) * 100)
     }
@@ -1673,8 +1839,10 @@ export class YotoPlayerAccessory {
     const percent = Math.round((clampedVolume / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Update volume characteristic rawSteps=${volumeSteps} steps=${clampedVolume} percent=${percent}`
+      `[${this.#device.name}] Update volume characteristic rawSteps=${volumeSteps} percent=${percent}`
     )
+
+    const { Characteristic } = this.#platform
     this.volumeService
       .getCharacteristic(Characteristic.Brightness)
       .updateValue(percent)
@@ -1797,9 +1965,9 @@ export class YotoPlayerAccessory {
         .updateValue(isOnline)
     }
 
-    // Update night mode ContactSensor (device state)
-    if (this.nightModeService) {
-      this.nightModeService
+    // Update day mode ContactSensor (device state)
+    if (this.dayModeService) {
+      this.dayModeService
         .getCharacteristic(Characteristic.StatusActive)
         .updateValue(isOnline)
     }
@@ -1883,20 +2051,20 @@ export class YotoPlayerAccessory {
   }
 
   /**
-   * Update night mode ContactSensor characteristic
+   * Update day mode ContactSensor characteristic
    */
-  updateNightModeCharacteristic () {
-    if (!this.nightModeService) {
+  updateDayModeCharacteristic () {
+    if (!this.dayModeService) {
       return
     }
 
     const { Characteristic } = this.#platform
     const status = this.#deviceModel.status
-    const isNightMode = status.dayMode === 'night'
+    const isDayMode = status.dayMode === 'day'
 
-    this.nightModeService
+    this.dayModeService
       .getCharacteristic(Characteristic.ContactSensorState)
-      .updateValue(isNightMode ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : Characteristic.ContactSensorState.CONTACT_DETECTED)
+      .updateValue(isDayMode ? Characteristic.ContactSensorState.CONTACT_NOT_DETECTED : Characteristic.ContactSensorState.CONTACT_DETECTED)
   }
 
   /**
@@ -1944,7 +2112,7 @@ export class YotoPlayerAccessory {
       const percent = Math.round((clampedLimit / 16) * 100)
       this.#log.debug(
         LOG_PREFIX.ACCESSORY,
-        `[${this.#device.name}] Update day max volume characteristic rawSteps=${limit} steps=${clampedLimit} percent=${percent}`
+        `[${this.#device.name}] Update day max volume characteristic rawSteps=${limit} percent=${percent}`
       )
       this.dayMaxVolumeService
         .getCharacteristic(Characteristic.Brightness)
@@ -1957,7 +2125,7 @@ export class YotoPlayerAccessory {
       const percent = Math.round((clampedLimit / 16) * 100)
       this.#log.debug(
         LOG_PREFIX.ACCESSORY,
-        `[${this.#device.name}] Update night max volume characteristic rawSteps=${limit} steps=${clampedLimit} percent=${percent}`
+        `[${this.#device.name}] Update night max volume characteristic rawSteps=${limit} percent=${percent}`
       )
       this.nightMaxVolumeService
         .getCharacteristic(Characteristic.Brightness)