homebridge-yoto 0.0.12 → 0.0.14

package/lib/platform.js

@@ -56,6 +56,10 @@ export class YotoPlatform {
     // Status polling interval
     this.statusPollInterval = null
 
+    // Cache of user's owned MYO card IDs
+    /** @type {Set<string>} */
+    this.ownedCardIds = new Set()
+
     // Initialize API clients
     this.auth = new YotoAuth(log, this.config.clientId)
     this.yotoApi = new YotoApi(log, this.auth)
@@ -108,6 +112,9 @@ export class YotoPlatform {
         throw error
       }
 
+      // Fetch user's owned cards for lookup optimization
+      await this.fetchOwnedCards()
+
       // Start platform-level status polling (every 60 seconds)
       this.startStatusPolling()
     } catch (error) {
@@ -173,6 +180,40 @@ export class YotoPlatform {
   }
 
   /**
+   * Fetch user's owned MYO cards and cache their IDs
+   * @returns {Promise<void>}
+   */
+  async fetchOwnedCards () {
+    try {
+      this.log.debug(LOG_PREFIX.PLATFORM, 'Fetching user\'s owned cards...')
+      const myContent = await this.yotoApi.getMyContent()
+
+      // Cache card IDs
+      if (myContent.cards && Array.isArray(myContent.cards)) {
+        this.ownedCardIds.clear()
+        for (const card of myContent.cards) {
+          if (card.cardId) {
+            this.ownedCardIds.add(card.cardId)
+          }
+        }
+        this.log.info(LOG_PREFIX.PLATFORM, `✓ Cached ${this.ownedCardIds.size} owned card(s)`)
+      }
+    } catch (error) {
+      this.log.warn(LOG_PREFIX.PLATFORM, 'Failed to fetch owned cards, card details may be limited:', error)
+    }
+  }
+
+  /**
+   * Check if a card is owned by the user
+   * @param {string} cardId - Card ID to check
+   * @returns {boolean}
+   */
+  isCardOwned (cardId) {
+    return this.ownedCardIds.has(cardId)
+  }
+
+  /**
+   * Handle token refresh - update config
    * Perform device authorization flow
    * @returns {Promise<void>}
    */

package/lib/playerAccessory.js

@@ -785,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
   }
 
   /**
@@ -813,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
   }
 
   /**
@@ -849,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
   }
 
   /**
@@ -1527,10 +1527,27 @@ 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
+    }
+
+    // Check if we own this card before attempting to fetch details
+    if (!this.platform.isCardOwned(cardId)) {
+      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
+      return
+    }
+
     this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Active card changed: ${cardId}`)
 
     try {
-      // Fetch card details
+      // Fetch card details for owned cards
       const content = await this.platform.yotoApi.getContent(cardId)
       this.activeContentInfo = content
 
@@ -1555,7 +1572,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/lib/yotoApi.js

@@ -114,7 +114,6 @@ export class YotoApi {
 
       if (!response.ok) {
         const errorText = await response.text()
-        this.log.error(LOG_PREFIX.API, `Request failed: ${response.status} ${errorText}`)
 
         // Handle 401 by attempting token refresh once
         if (response.status === 401 && !options._retried) {
@@ -124,6 +123,13 @@ export class YotoApi {
           return this.request(endpoint, { ...options, _retried: true })
         }
 
+        // Reduce noise for expected errors (403/404 on content endpoints)
+        if ((response.status === 403 || response.status === 404) && endpoint.startsWith('/content/')) {
+          this.log.debug(LOG_PREFIX.API, `Request failed: ${response.status} ${errorText}`)
+        } else {
+          this.log.error(LOG_PREFIX.API, `Request failed: ${response.status} ${errorText}`)
+        }
+
         throw new Error(`API request failed: ${response.status} ${errorText}`)
       }
 
@@ -134,7 +140,10 @@ export class YotoApi {
 
       return await response.json()
     } catch (error) {
-      this.log.error(LOG_PREFIX.API, `${ERROR_MESSAGES.API_ERROR}:`, error)
+      // Only log non-API errors (network issues, etc.)
+      if (!(error instanceof Error && error.message.startsWith('API request failed'))) {
+        this.log.error(LOG_PREFIX.API, `${ERROR_MESSAGES.API_ERROR}:`, error)
+      }
       throw 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.12",
+  "version": "0.0.14",
   "author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
   "bugs": {
     "url": "https://github.com/bcomnes/homebridge-yoto/issues"