homebridge-yoto 0.0.19 → 0.0.20

package/lib/playerAccessory.js

@@ -38,6 +38,9 @@ export class YotoPlayerAccessory {
     this.currentEvents = accessory.context.lastEvents || null
     this.lastUpdateTime = Date.now()
 
+    // Cache for device config
+    this.deviceConfig = null
+
     // Create dedicated MQTT client for this device
     this.mqtt = new YotoMqtt(this.log)
 
@@ -110,6 +113,15 @@ export class YotoPlayerAccessory {
    * @returns {Promise<void>}
    */
   async initialize () {
+    // 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`)
+    } catch (error) {
+      this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to load device config:`, error)
+      // Continue without config - getters will return defaults
+    }
+
     await this.connectMqtt()
     // Status polling is handled at platform level
   }
@@ -977,20 +989,23 @@ export class YotoPlayerAccessory {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set display on:`, value)
 
     try {
-      // Get current config to update brightness settings
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
 
       if (value) {
-        // Turn on - restore to auto or previous brightness
-        config.config.dayDisplayBrightness = 'auto'
-        config.config.nightDisplayBrightness = 'auto'
+        // Turn on - restore to previous brightness or default
+        const brightness = this.currentStatus?.dnowBrightness || 100
+        this.deviceConfig.config.dayDisplayBrightness = String(brightness)
+        this.deviceConfig.config.nightDisplayBrightness = String(brightness)
       } else {
         // Turn off - set brightness to 0
-        config.config.dayDisplayBrightness = '0'
-        config.config.nightDisplayBrightness = '0'
+        this.deviceConfig.config.dayDisplayBrightness = '0'
+        this.deviceConfig.config.nightDisplayBrightness = '0'
       }
 
-      await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, config)
+      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)
       throw new this.platform.api.hap.HapStatusError(
@@ -1024,16 +1039,19 @@ export class YotoPlayerAccessory {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set display brightness:`, value)
 
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
 
-      // Map 0-100 to brightness string
-      const brightness = String(Math.round(Number(value)))
+      // Clamp brightness to 0-100
+      const brightness = Math.max(0, Math.min(100, Number(value)))
 
       // Update both day and night brightness
-      config.config.dayDisplayBrightness = brightness
-      config.config.nightDisplayBrightness = brightness
+      this.deviceConfig.config.dayDisplayBrightness = String(brightness)
+      this.deviceConfig.config.nightDisplayBrightness = String(brightness)
 
-      await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, config)
+      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)
       throw new this.platform.api.hap.HapStatusError(
@@ -1058,12 +1076,16 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Enabled state
    */
   async setBluetoothEnabled (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set Bluetooth enabled:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set Bluetooth:`, value)
 
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      config.config.bluetoothEnabled = value ? '1' : '0'
-      await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, config)
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
+
+      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)
       throw new this.platform.api.hap.HapStatusError(
@@ -1091,11 +1113,15 @@ export class YotoPlayerAccessory {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set repeat all:`, value)
 
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      config.config.repeatAll = Boolean(value)
-      await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, config)
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
+
+      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:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set repeat all:`, error)
       throw new this.platform.api.hap.HapStatusError(
         this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
@@ -1118,12 +1144,16 @@ export class YotoPlayerAccessory {
    * @param {CharacteristicValue} value - Enabled state
    */
   async setBtHeadphonesEnabled (value) {
-    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set BT headphones enabled:`, value)
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set BT headphones:`, value)
 
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      config.config.btHeadphonesEnabled = Boolean(value)
-      await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, config)
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
+
+      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)
       throw new this.platform.api.hap.HapStatusError(
@@ -1233,16 +1263,19 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getDayVolumeLimit () {
+    if (!this.deviceConfig) {
+      return 100 // Default to max
+    }
+
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      const limit = parseInt(config.config.maxVolumeLimit || '16')
+      const limit = parseInt(this.deviceConfig.config.maxVolumeLimit || '16')
       if (isNaN(limit)) {
         return 100
       }
       // Map 0-16 to 0-100
       return Math.round((limit / 16) * 100)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to get day volume limit:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse day volume limit:`, error)
       return 100
     }
   }
@@ -1255,11 +1288,15 @@ export class YotoPlayerAccessory {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set day volume limit:`, value)
 
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
+
       // Map 0-100 to 0-16
       const limit = Math.round((Number(value) / 100) * 16)
-      config.config.maxVolumeLimit = String(limit)
-      await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, config)
+      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)
       throw new this.platform.api.hap.HapStatusError(
@@ -1291,16 +1328,19 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getNightVolumeLimit () {
+    if (!this.deviceConfig) {
+      return 100 // Default to max
+    }
+
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      const limit = parseInt(config.config.nightMaxVolumeLimit || '16')
+      const limit = parseInt(this.deviceConfig.config.nightMaxVolumeLimit || '16')
       if (isNaN(limit)) {
         return 100
       }
       // Map 0-16 to 0-100
       return Math.round((limit / 16) * 100)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to get night volume limit:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse night volume limit:`, error)
       return 100
     }
   }
@@ -1313,11 +1353,15 @@ export class YotoPlayerAccessory {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set night volume limit:`, value)
 
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
+
       // Map 0-100 to 0-16
       const limit = Math.round((Number(value) / 100) * 16)
-      config.config.nightMaxVolumeLimit = String(limit)
-      await this.platform.yotoApi.updateDeviceConfig(this.device.deviceId, config)
+      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)
       throw new this.platform.api.hap.HapStatusError(
@@ -1331,13 +1375,16 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getAmbientLightOn () {
+    if (!this.deviceConfig) {
+      return false // Default to off
+    }
+
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      const color = config.config.ambientColour || '#000000'
-      // Off if color is black (#000000)
-      return color !== '#000000' && color !== 'off'
+      const color = this.deviceConfig.config.ambientColour || '000000'
+      // Consider light "on" if not pure black
+      return color !== '000000'
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to get ambient light state:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient light state:`, error)
       return false
     }
   }
@@ -1350,11 +1397,16 @@ export class YotoPlayerAccessory {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set ambient light on:`, value)
 
     try {
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
+
       if (value) {
-        // Turn on - set to white or previous color
-        await this.mqtt.setAmbientLight(this.device.deviceId, 255, 255, 255)
+        // Restore to a default color (warm white) when turning on
+        await this.updateAmbientLightColor()
       } else {
-        // Turn off - set to black
+        // Turn off by setting to black
         await this.mqtt.setAmbientLight(this.device.deviceId, 0, 0, 0)
       }
     } catch (error) {
@@ -1370,16 +1422,19 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getAmbientLightHue () {
+    if (!this.deviceConfig) {
+      return 0 // Default hue
+    }
+
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      const hex = config.config.ambientColour || '#000000'
+      const hex = this.deviceConfig.config.ambientColour || '000000'
       const { h } = this.hexToHsv(hex)
       if (isNaN(h)) {
         return 0
       }
       return h
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to get ambient light hue:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient light hue:`, error)
       return 0
     }
   }
@@ -1400,16 +1455,19 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getAmbientLightSaturation () {
+    if (!this.deviceConfig) {
+      return 0 // Default saturation
+    }
+
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      const hex = config.config.ambientColour || '#000000'
+      const hex = this.deviceConfig.config.ambientColour || '000000'
       const { s } = this.hexToHsv(hex)
       if (isNaN(s)) {
         return 0
       }
       return s
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to get ambient light saturation:`, error)
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient light saturation:`, error)
       return 0
     }
   }
@@ -1430,18 +1488,21 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getAmbientLightBrightness () {
+    if (!this.deviceConfig) {
+      return 0 // Default brightness
+    }
+
     try {
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      const hex = config.config.ambientColour
+      const hex = this.deviceConfig.config.ambientColour || '000000'
       const { v } = this.hexToHsv(hex)
       const brightness = Math.round(v)
       if (isNaN(brightness)) {
-        return 100
+        return 0
       }
       return brightness
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to get ambient brightness:`, error)
-      return 100
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to parse ambient brightness:`, error)
+      return 0
     }
   }
 
@@ -1461,9 +1522,12 @@ export class YotoPlayerAccessory {
    */
   async updateAmbientLightColor () {
     try {
-      // Get current config to read existing HSV values
-      const config = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
-      const currentHex = config.config.ambientColour || '#ffffff'
+      // Refresh config if not cached
+      if (!this.deviceConfig) {
+        this.deviceConfig = await this.platform.yotoApi.getDeviceConfig(this.device.deviceId)
+      }
+
+      const currentHex = this.deviceConfig.config.ambientColour || '000000'
       const currentHsv = this.hexToHsv(currentHex)
 
       // Use pending values or current values

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