homebridge-yoto 0.0.11 → 0.0.13

package/lib/platform.js

@@ -49,6 +49,13 @@ export class YotoPlatform {
     this.storagePath = api.user.storagePath()
     this.tokenFilePath = join(this.storagePath, 'homebridge-yoto-tokens.json')
 
+    // Track accessory handlers for status updates
+    /** @type {Map<string, import('./playerAccessory.js').YotoPlayerAccessory>} */
+    this.accessoryHandlers = new Map()
+
+    // Status polling interval
+    this.statusPollInterval = null
+
     // Initialize API clients
     this.auth = new YotoAuth(log, this.config.clientId)
     this.yotoApi = new YotoApi(log, this.auth)
@@ -100,11 +107,71 @@ export class YotoPlatform {
         }
         throw error
       }
+
+      // Start platform-level status polling (every 60 seconds)
+      this.startStatusPolling()
     } catch (error) {
       this.log.error(LOG_PREFIX.PLATFORM, 'Initialization failed:', error)
     }
   }
 
+  /**
+   * Start periodic status polling for all devices
+   */
+  startStatusPolling () {
+    // Poll every 60 seconds
+    this.statusPollInterval = setInterval(async () => {
+      try {
+        await this.checkAllDevicesStatus()
+      } catch (error) {
+        this.log.error(LOG_PREFIX.PLATFORM, 'Failed to check device status:', error)
+      }
+    }, 60000)
+  }
+
+  /**
+   * Stop status polling
+   */
+  stopStatusPolling () {
+    if (this.statusPollInterval) {
+      clearInterval(this.statusPollInterval)
+      this.statusPollInterval = null
+    }
+  }
+
+  /**
+   * Check all devices' online status and notify accessories
+   * @returns {Promise<void>}
+   */
+  async checkAllDevicesStatus () {
+    try {
+      // Fetch fresh device list from API (single call for all devices)
+      const devices = await this.yotoApi.getDevices()
+
+      // Update each accessory with fresh device info
+      for (const device of devices) {
+        const uuid = this.api.hap.uuid.generate(device.deviceId)
+        const accessory = this.accessories.get(uuid)
+
+        if (accessory) {
+          const wasOnline = accessory.context.device.online
+          const isNowOnline = device.online
+
+          // Update device info in context
+          accessory.context.device = device
+
+          // Notify accessory handler if status changed
+          const handler = this.accessoryHandlers.get(uuid)
+          if (handler && wasOnline !== isNowOnline) {
+            handler.handleOnlineStatusChange(isNowOnline, wasOnline)
+          }
+        }
+      }
+    } catch (error) {
+      this.log.error(LOG_PREFIX.PLATFORM, 'Error checking device status:', error)
+    }
+  }
+
   /**
    * Perform device authorization flow
    * @returns {Promise<void>}
@@ -286,6 +353,9 @@ export class YotoPlatform {
       // Create handler for this accessory
       const handler = new YotoPlayerAccessory(this, typedAccessory)
 
+      // Track handler for status updates
+      this.accessoryHandlers.set(uuid, handler)
+
       // Initialize accessory (connect MQTT, etc.)
       handler.initialize().catch(error => {
         this.log.error(LOG_PREFIX.PLATFORM, `Failed to initialize ${device.name}:`, error)
@@ -312,6 +382,9 @@ export class YotoPlatform {
       // Create handler for this accessory
       const handler = new YotoPlayerAccessory(this, typedAccessory)
 
+      // Track handler for status updates
+      this.accessoryHandlers.set(uuid, handler)
+
       // Initialize accessory (connect MQTT, etc.)
       handler.initialize().catch(error => {
         this.log.error(LOG_PREFIX.PLATFORM, `Failed to initialize ${device.name}:`, error)
@@ -341,8 +414,15 @@ export class YotoPlatform {
     if (staleAccessories.length > 0) {
       this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, staleAccessories)
 
-      // Remove from tracking map
+      // Remove from tracking map and handlers
       for (const accessory of staleAccessories) {
+        const handler = this.accessoryHandlers.get(accessory.UUID)
+        if (handler) {
+          handler.destroy().catch(error => {
+            this.log.error(LOG_PREFIX.PLATFORM, 'Error destroying accessory handler:', error)
+          })
+          this.accessoryHandlers.delete(accessory.UUID)
+        }
         this.accessories.delete(accessory.UUID)
       }
     }
@@ -353,6 +433,17 @@ export class YotoPlatform {
    */
   async shutdown () {
     this.log.info(LOG_PREFIX.PLATFORM, 'Shutting down...')
-    // MQTT cleanup is handled by individual accessories
+
+    // Stop status polling
+    this.stopStatusPolling()
+
+    // Cleanup all accessory handlers
+    for (const [, handler] of this.accessoryHandlers) {
+      try {
+        await handler.destroy()
+      } catch (error) {
+        this.log.error(LOG_PREFIX.PLATFORM, 'Error shutting down accessory:', error)
+      }
+    }
   }
 }

package/lib/playerAccessory.js

@@ -111,67 +111,26 @@ export class YotoPlayerAccessory {
    */
   async initialize () {
     await this.connectMqtt()
-
-    // Start polling for device status updates (every 60 seconds)
-    this.startStatusPolling()
-  }
-
-  /**
-   * Start periodic status polling to detect online/offline changes
-   */
-  startStatusPolling () {
-    // Poll every 60 seconds
-    this.statusPollInterval = setInterval(async () => {
-      try {
-        await this.checkDeviceStatus()
-      } catch (error) {
-        this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to check device status:`, error)
-      }
-    }, 60000)
+    // Status polling is handled at platform level
   }
 
   /**
-   * Stop status polling
-   */
-  stopStatusPolling () {
-    if (this.statusPollInterval) {
-      clearInterval(this.statusPollInterval)
-      this.statusPollInterval = null
-    }
-  }
-
-  /**
-   * Check device online status and reconnect if needed
+   * Handle online status change from platform polling
+   * @param {boolean} isNowOnline - Current online status
+   * @param {boolean} wasOnline - Previous online status
    * @returns {Promise<void>}
    */
-  async checkDeviceStatus () {
-    try {
-      // Fetch fresh device list from API
-      const devices = await this.platform.yotoApi.getDevices()
-      const currentDevice = devices.find(d => d.deviceId === this.device.deviceId)
-
-      if (!currentDevice) {
-        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device no longer found in API`)
-        return
-      }
-
-      const wasOnline = this.device.online
-      const isNowOnline = currentDevice.online
+  async handleOnlineStatusChange (isNowOnline, wasOnline) {
+    // Update device reference from accessory context (platform already updated it)
+    this.device = this.accessory.context.device
 
-      // Update device info
-      this.device = currentDevice
-      this.accessory.context.device = currentDevice
-
-      // Handle state changes
-      if (!wasOnline && isNowOnline) {
-        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device came online, connecting MQTT...`)
-        await this.connectMqtt()
-      } else if (wasOnline && !isNowOnline) {
-        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device went offline`)
-        await this.disconnectMqtt()
-      }
-    } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Error checking device status:`, error)
+    // Handle state changes
+    if (!wasOnline && isNowOnline) {
+      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device came online, connecting MQTT...`)
+      await this.connectMqtt()
+    } else if (wasOnline && !isNowOnline) {
+      this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device went offline`)
+      await this.disconnectMqtt()
     }
   }
 
@@ -485,9 +444,6 @@ export class YotoPlayerAccessory {
   async destroy () {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Destroying accessory`)
 
-    // Stop status polling
-    this.stopStatusPolling()
-
     // Disconnect MQTT
     await this.disconnectMqtt()
   }
@@ -829,10 +785,10 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getVolume () {
-    if (!this.currentStatus) {
+    if (!this.currentStatus || this.currentStatus.userVolume === undefined) {
       return 50
     }
-    return this.currentStatus.userVolume
+    return Number(this.currentStatus.userVolume) || 50
   }
 
   /**
@@ -857,10 +813,10 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getMute () {
-    if (!this.currentStatus) {
+    if (!this.currentStatus || this.currentStatus.userVolume === undefined) {
       return false
     }
-    return this.currentStatus.userVolume === 0
+    return Number(this.currentStatus.userVolume) === 0
   }
 
   /**
@@ -893,10 +849,10 @@ export class YotoPlayerAccessory {
    * @returns {Promise<CharacteristicValue>}
    */
   async getBatteryLevel () {
-    if (!this.currentStatus) {
+    if (!this.currentStatus || this.currentStatus.batteryLevel === undefined) {
       return 100
     }
-    return this.currentStatus.batteryLevel
+    return Number(this.currentStatus.batteryLevel) || 100
   }
 
   /**
@@ -1571,6 +1527,15 @@ export class YotoPlayerAccessory {
     }
 
     this.activeContentCardId = cardId
+
+    // Handle no card inserted
+    if (!cardId || cardId === 'none' || cardId === 'null') {
+      this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] No card inserted`)
+      this.activeContentInfo = null
+      this.accessory.context.activeContentInfo = null
+      return
+    }
+
     this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Active card changed: ${cardId}`)
 
     try {
@@ -1599,7 +1564,20 @@ export class YotoPlayerAccessory {
       // Store in context for persistence
       this.accessory.context.activeContentInfo = this.activeContentInfo
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to fetch content details:`, error)
+      // Handle 403 Forbidden (store-bought cards user doesn't own)
+      if (error instanceof Error && error.message.includes('403')) {
+        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Playing card ${cardId} (store content - details not available)`)
+        this.activeContentInfo = null
+        this.accessory.context.activeContentInfo = null
+      } else if (error instanceof Error && error.message.includes('404')) {
+        // Card not found - might be deleted or invalid
+        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Card ${cardId} not found`)
+        this.activeContentInfo = null
+        this.accessory.context.activeContentInfo = null
+      } else {
+        // Other errors
+        this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to fetch content details:`, error)
+      }
     }
   }
 }

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