homebridge-yoto 0.0.37 → 0.0.38

package/lib/accessory.js

@@ -92,8 +92,8 @@ export class YotoPlayerAccessory {
   /** @type {Service | undefined} */ bluetoothService
   /** @type {Service | undefined} */ dayMaxVolumeService
   /** @type {Service | undefined} */ nightMaxVolumeService
-  // Volume state for mute/unmute (0-16 steps)
-  /** @type {number} */ #lastNonZeroVolume = 8
+  // Volume state for mute/unmute (0-100 percent)
+  /** @type {number} */ #lastNonZeroVolume = 50
   // Nightlight color state for restore-on-ON
   /** @type {string} */ #lastDayColor = '0xffffff'
   /** @type {string} */ #lastNightColor = '0xffffff'
@@ -325,7 +325,7 @@ export class YotoPlayerAccessory {
       .getCharacteristic(Characteristic.Brightness)
       .setProps({
         minValue: 0,
-        maxValue: 16,
+        maxValue: 100,
         minStep: 1,
       })
       .onGet(this.getVolume.bind(this))
@@ -598,7 +598,7 @@ export class YotoPlayerAccessory {
 
     dayService
       .getCharacteristic(Characteristic.Brightness)
-      .setProps({ minValue: 0, maxValue: 16, minStep: 1 })
+      .setProps({ minValue: 0, maxValue: 100, minStep: 1 })
       .onGet(this.getDayMaxVolume.bind(this))
       .onSet(this.setDayMaxVolume.bind(this))
 
@@ -622,7 +622,7 @@ export class YotoPlayerAccessory {
 
     nightService
       .getCharacteristic(Characteristic.Brightness)
-      .setProps({ minValue: 0, maxValue: 16, minStep: 1 })
+      .setProps({ minValue: 0, maxValue: 100, minStep: 1 })
       .onGet(this.getNightMaxVolume.bind(this))
       .onSet(this.setNightMaxVolume.bind(this))
 
@@ -917,16 +917,23 @@ export class YotoPlayerAccessory {
   }
 
   /**
-   * Get volume level (0-16 steps) from live status
+   * Get volume level as percentage (mapped from 0-16 steps)
    * @returns {Promise<CharacteristicValue>}
    */
   async getVolume () {
-    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get volume`)
-    return this.#deviceModel.status.volume
+    const volumeSteps = this.#deviceModel.status.volume
+    const normalizedSteps = Number.isFinite(volumeSteps) ? volumeSteps : 0
+    const clampedSteps = Math.max(0, Math.min(normalizedSteps, 16))
+    const percent = Math.round((clampedSteps / 16) * 100)
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Get volume rawSteps=${volumeSteps} steps=${clampedSteps} percent=${percent}`
+    )
+    return percent
   }
 
   /**
-   * Set volume level (0-16 steps)
+   * Set volume level as percentage (mapped to 0-16 steps)
    * @param {CharacteristicValue} value
    * @returns {Promise<void>}
    */
@@ -934,25 +941,28 @@ export class YotoPlayerAccessory {
     const deviceModel = this.#deviceModel
     this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Set volume:`, value)
 
-    const requestedSteps = typeof value === 'number' ? value : Number(value)
-    if (!Number.isFinite(requestedSteps)) {
+    const requestedPercent = typeof value === 'number' ? value : Number(value)
+    if (!Number.isFinite(requestedPercent)) {
       throw new this.#platform.api.hap.HapStatusError(
         this.#platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST
       )
     }
 
+    const normalizedPercent = Math.max(0, Math.min(Math.round(requestedPercent), 100))
+    const requestedSteps = Math.round((normalizedPercent / 100) * 16)
     const maxVolumeSteps = Number.isFinite(deviceModel.status.maxVolume)
       ? deviceModel.status.maxVolume
       : 16
     const steps = Math.max(0, Math.min(Math.round(requestedSteps), maxVolumeSteps))
+    const resultPercent = Math.round((steps / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Set volume raw=${value} steps=${requestedSteps} -> ${steps} (max ${maxVolumeSteps}/16)`
+      `[${this.#device.name}] Set volume raw=${value} normalizedPercent=${normalizedPercent} requestedSteps=${requestedSteps} -> steps=${steps} percent=${resultPercent} (maxSteps=${maxVolumeSteps})`
     )
 
     // Track last non-zero volume for unmute
     if (steps > 0) {
-      this.#lastNonZeroVolume = steps
+      this.#lastNonZeroVolume = Math.round((steps / 16) * 100)
     }
 
     try {
@@ -964,10 +974,11 @@ export class YotoPlayerAccessory {
           .getCharacteristic(Characteristic.On)
           .updateValue(steps > 0)
 
-        if (steps !== requestedSteps) {
+        if (steps !== requestedSteps || normalizedPercent !== requestedPercent) {
+          const clampedPercent = Math.round((steps / 16) * 100)
           this.volumeService
             .getCharacteristic(Characteristic.Brightness)
-            .updateValue(steps)
+            .updateValue(clampedPercent)
         }
       }
     } catch (error) {
@@ -1555,67 +1566,79 @@ export class YotoPlayerAccessory {
   // ==================== Volume Limit Lightbulb Getters/Setters ====================
 
   /**
-   * Get day max volume limit
+   * Get day max volume limit as percentage (mapped from 0-16 steps)
    * @returns {Promise<CharacteristicValue>}
    */
   async getDayMaxVolume () {
     const limit = this.#deviceModel.config.maxVolumeLimit
+    const steps = Number.isFinite(limit) ? limit : 16
+    const clampedSteps = Math.max(0, Math.min(steps, 16))
+    const percent = Math.round((clampedSteps / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Get day max volume limit: ${limit}`
+      `[${this.#device.name}] Get day max volume limit rawSteps=${limit} steps=${clampedSteps} percent=${percent}`
     )
-    return Number.isFinite(limit) ? limit : 16
+    return percent
   }
 
   /**
-   * Set day max volume limit
+   * Set day max volume limit as percentage (mapped to 0-16 steps)
    * @param {CharacteristicValue} value
    */
   async setDayMaxVolume (value) {
-    const requested = typeof value === 'number' ? value : Number(value)
-    if (!Number.isFinite(requested)) {
+    const requestedPercent = typeof value === 'number' ? value : Number(value)
+    if (!Number.isFinite(requestedPercent)) {
       throw new this.#platform.api.hap.HapStatusError(
         this.#platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST
       )
     }
 
-    const limit = Math.max(0, Math.min(Math.round(requested), 16))
+    const normalizedPercent = Math.max(0, Math.min(Math.round(requestedPercent), 100))
+    const requestedSteps = Math.round((normalizedPercent / 100) * 16)
+    const limit = Math.max(0, Math.min(Math.round(requestedSteps), 16))
+    const limitPercent = Math.round((limit / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Set day max volume limit raw=${value} requested=${requested} -> ${limit}/16`
+      `[${this.#device.name}] Set day max volume limit raw=${value} normalizedPercent=${normalizedPercent} requestedSteps=${requestedSteps} -> steps=${limit} percent=${limitPercent}`
     )
     await this.#deviceModel.updateConfig({ maxVolumeLimit: limit })
   }
 
   /**
-   * Get night max volume limit
+   * Get night max volume limit as percentage (mapped from 0-16 steps)
    * @returns {Promise<CharacteristicValue>}
    */
   async getNightMaxVolume () {
     const limit = this.#deviceModel.config.nightMaxVolumeLimit
+    const steps = Number.isFinite(limit) ? limit : 10
+    const clampedSteps = Math.max(0, Math.min(steps, 16))
+    const percent = Math.round((clampedSteps / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Get night max volume limit: ${limit}`
+      `[${this.#device.name}] Get night max volume limit rawSteps=${limit} steps=${clampedSteps} percent=${percent}`
     )
-    return Number.isFinite(limit) ? limit : 10
+    return percent
   }
 
   /**
-   * Set night max volume limit
+   * Set night max volume limit as percentage (mapped to 0-16 steps)
    * @param {CharacteristicValue} value
    */
   async setNightMaxVolume (value) {
-    const requested = typeof value === 'number' ? value : Number(value)
-    if (!Number.isFinite(requested)) {
+    const requestedPercent = typeof value === 'number' ? value : Number(value)
+    if (!Number.isFinite(requestedPercent)) {
       throw new this.#platform.api.hap.HapStatusError(
         this.#platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST
       )
     }
 
-    const limit = Math.max(0, Math.min(Math.round(requested), 16))
+    const normalizedPercent = Math.max(0, Math.min(Math.round(requestedPercent), 100))
+    const requestedSteps = Math.round((normalizedPercent / 100) * 16)
+    const limit = Math.max(0, Math.min(Math.round(requestedSteps), 16))
+    const limitPercent = Math.round((limit / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Set night max volume limit raw=${value} requested=${requested} -> ${limit}/16`
+      `[${this.#device.name}] Set night max volume limit raw=${value} normalizedPercent=${normalizedPercent} requestedSteps=${requestedSteps} -> steps=${limit} percent=${limitPercent}`
     )
     await this.#deviceModel.updateConfig({ nightMaxVolumeLimit: limit })
   }
@@ -1645,18 +1668,19 @@ export class YotoPlayerAccessory {
 
     const { Characteristic } = this.#platform
     if (volumeSteps > 0) {
-      this.#lastNonZeroVolume = volumeSteps
+      this.#lastNonZeroVolume = Math.round((volumeSteps / 16) * 100)
     }
 
     const normalizedVolume = Number.isFinite(volumeSteps) ? volumeSteps : 0
     const clampedVolume = Math.max(0, Math.min(normalizedVolume, 16))
+    const percent = Math.round((clampedVolume / 16) * 100)
     this.#log.debug(
       LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Update volume characteristic raw=${volumeSteps} -> ${clampedVolume}`
+      `[${this.#device.name}] Update volume characteristic rawSteps=${volumeSteps} steps=${clampedVolume} percent=${percent}`
     )
     this.volumeService
       .getCharacteristic(Characteristic.Brightness)
-      .updateValue(clampedVolume)
+      .updateValue(percent)
   }
 
   /**
@@ -1920,25 +1944,27 @@ export class YotoPlayerAccessory {
     if (this.dayMaxVolumeService) {
       const limit = Number.isFinite(config.maxVolumeLimit) ? config.maxVolumeLimit : 16
       const clampedLimit = Math.max(0, Math.min(limit, 16))
+      const percent = Math.round((clampedLimit / 16) * 100)
       this.#log.debug(
         LOG_PREFIX.ACCESSORY,
-        `[${this.#device.name}] Update day max volume characteristic raw=${limit} -> ${clampedLimit}`
+        `[${this.#device.name}] Update day max volume characteristic rawSteps=${limit} steps=${clampedLimit} percent=${percent}`
       )
       this.dayMaxVolumeService
         .getCharacteristic(Characteristic.Brightness)
-        .updateValue(clampedLimit)
+        .updateValue(percent)
     }
 
     if (this.nightMaxVolumeService) {
       const limit = Number.isFinite(config.nightMaxVolumeLimit) ? config.nightMaxVolumeLimit : 10
       const clampedLimit = Math.max(0, Math.min(limit, 16))
+      const percent = Math.round((clampedLimit / 16) * 100)
       this.#log.debug(
         LOG_PREFIX.ACCESSORY,
-        `[${this.#device.name}] Update night max volume characteristic raw=${limit} -> ${clampedLimit}`
+        `[${this.#device.name}] Update night max volume characteristic rawSteps=${limit} steps=${clampedLimit} percent=${percent}`
       )
       this.nightMaxVolumeService
         .getCharacteristic(Characteristic.Brightness)
-        .updateValue(clampedLimit)
+        .updateValue(percent)
     }
   }
 

package/lib/platform.js

@@ -188,68 +188,96 @@ export class YotoPlatform {
         this.log.info(`Device offline: ${deviceId}${reason}`)
       })
 
+      const getDeviceLabel = (deviceId) => {
+        const deviceName = this.yotoAccount?.getDevice(deviceId)?.device?.name
+        return deviceName || deviceId
+      }
+
+      const formatLegacyStatusFields = (message) => {
+        const status = message?.status
+        if (!status || typeof status !== 'object') return ''
+        const fields = Object.keys(status)
+        if (!fields.length) return ''
+        const preview = fields.slice(0, 8).join(', ')
+        const suffix = fields.length > 8 ? `, +${fields.length - 8} more` : ''
+        return ` fields: ${preview}${suffix}`
+      }
+
       this.yotoAccount.on('statusUpdate', ({ deviceId, source, changedFields }) => {
+        const label = getDeviceLabel(deviceId)
         const fields = Array.from(changedFields).join(', ')
-        this.log.debug(`Status update [${deviceId} ${source}]: ${fields}`)
+        this.log.debug(`Status update [${label} ${source}]: ${fields}`)
       })
 
       this.yotoAccount.on('configUpdate', ({ deviceId, changedFields }) => {
+        const label = getDeviceLabel(deviceId)
         const fields = Array.from(changedFields).join(', ')
-        this.log.debug(`Config update [${deviceId}]: ${fields}`)
+        this.log.debug(`Config update [${label}]: ${fields}`)
       })
 
       this.yotoAccount.on('playbackUpdate', ({ deviceId, changedFields }) => {
+        const label = getDeviceLabel(deviceId)
         const fields = Array.from(changedFields).join(', ')
-        this.log.debug(`Playback update [${deviceId}]: ${fields}`)
+        this.log.debug(`Playback update [${label}]: ${fields}`)
       })
 
       this.yotoAccount.on('mqttConnect', ({ deviceId }) => {
-        const deviceName = this.yotoAccount?.getDevice(deviceId)?.device?.name
-        const label = deviceName ? `${deviceName} (${deviceId})` : deviceId
+        const label = getDeviceLabel(deviceId)
         this.log.debug(`MQTT connected: ${label}`)
       })
 
       this.yotoAccount.on('mqttDisconnect', ({ deviceId, metadata }) => {
+        const label = getDeviceLabel(deviceId)
         const reasonCode = metadata?.packet?.reasonCode
         const reason = typeof reasonCode === 'number' ? ` (code ${reasonCode})` : ''
-        this.log.warn(`MQTT disconnected: ${deviceId}${reason}`)
+        this.log.warn(`MQTT disconnected: ${label}${reason}`)
       })
 
       this.yotoAccount.on('mqttClose', ({ deviceId, metadata }) => {
+        const label = getDeviceLabel(deviceId)
         const reason = metadata?.reason ? ` (${metadata.reason})` : ''
-        this.log.debug(`MQTT closed: ${deviceId}${reason}`)
+        this.log.debug(`MQTT closed: ${label}${reason}`)
       })
 
       this.yotoAccount.on('mqttReconnect', ({ deviceId }) => {
-        this.log.debug(`MQTT reconnecting: ${deviceId}`)
+        const label = getDeviceLabel(deviceId)
+        this.log.debug(`MQTT reconnecting: ${label}`)
       })
 
       this.yotoAccount.on('mqttOffline', ({ deviceId }) => {
-        this.log.debug(`MQTT offline: ${deviceId}`)
+        const label = getDeviceLabel(deviceId)
+        this.log.debug(`MQTT offline: ${label}`)
       })
 
       this.yotoAccount.on('mqttEnd', ({ deviceId }) => {
-        this.log.debug(`MQTT ended: ${deviceId}`)
+        const label = getDeviceLabel(deviceId)
+        this.log.debug(`MQTT ended: ${label}`)
       })
 
       this.yotoAccount.on('mqttStatus', ({ deviceId, topic }) => {
-        this.log.debug(`MQTT status [${deviceId}]: ${topic}`)
+        const label = getDeviceLabel(deviceId)
+        this.log.debug(`MQTT status [${label}]: ${topic}`)
       })
 
       this.yotoAccount.on('mqttEvents', ({ deviceId, topic }) => {
-        this.log.debug(`MQTT events [${deviceId}]: ${topic}`)
+        const label = getDeviceLabel(deviceId)
+        this.log.debug(`MQTT events [${label}]: ${topic}`)
       })
 
-      this.yotoAccount.on('mqttStatusLegacy', ({ deviceId, topic }) => {
-        this.log.debug(`MQTT legacy status [${deviceId}]: ${topic}`)
+      this.yotoAccount.on('mqttStatusLegacy', ({ deviceId, topic, message }) => {
+        const label = getDeviceLabel(deviceId)
+        const fields = formatLegacyStatusFields(message)
+        this.log.debug(`MQTT legacy status [${label}]: ${topic}${fields}`)
       })
 
       this.yotoAccount.on('mqttResponse', ({ deviceId, topic }) => {
-        this.log.debug(`MQTT response [${deviceId}]: ${topic}`)
+        const label = getDeviceLabel(deviceId)
+        this.log.debug(`MQTT response [${label}]: ${topic}`)
       })
 
       this.yotoAccount.on('mqttUnknown', ({ deviceId, topic }) => {
-        this.log.debug(`MQTT unknown [${deviceId}]: ${topic}`)
+        const label = getDeviceLabel(deviceId)
+        this.log.debug(`MQTT unknown [${label}]: ${topic}`)
       })
 
       // Start the account (discovers devices, creates device models, starts MQTT)

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