homebridge-yoto 0.0.7 → 0.0.8

package/lib/platform.js

@@ -5,9 +5,10 @@
 /** @import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig } from 'homebridge' */
 /** @import { YotoDevice, YotoPlatformConfig, YotoAccessoryContext } from './types.js' */
 
+import { readFile, writeFile, mkdir } from 'fs/promises'
+import { join } from 'path'
 import { YotoAuth } from './auth.js'
 import { YotoApi } from './yotoApi.js'
-import { YotoMqtt } from './yotoMqtt.js'
 import { YotoPlayerAccessory } from './playerAccessory.js'
 import {
   PLATFORM_NAME,
@@ -44,10 +45,13 @@ export class YotoPlatform {
     /** @type {string[]} */
     this.discoveredUUIDs = []
 
+    // Persistent storage path for tokens
+    this.storagePath = api.user.storagePath()
+    this.tokenFilePath = join(this.storagePath, 'homebridge-yoto-tokens.json')
+
     // Initialize API clients
     this.auth = new YotoAuth(log, this.config.clientId)
     this.yotoApi = new YotoApi(log, this.auth)
-    this.yotoMqtt = new YotoMqtt(log)
 
     // Set up token refresh callback
     this.yotoApi.setTokenRefreshCallback(this.handleTokenRefresh.bind(this))
@@ -69,6 +73,9 @@ export class YotoPlatform {
    */
   async initialize () {
     try {
+      // Load tokens from persistent storage
+      await this.loadTokens()
+
       // Check if we have stored credentials
       if (!this.config.accessToken || !this.config.refreshToken) {
         await this.performDeviceFlow()
@@ -93,15 +100,6 @@ export class YotoPlatform {
         }
         throw error
       }
-
-      // Connect to MQTT with first device ID
-      if (this.accessories.size > 0) {
-        const firstAccessory = Array.from(this.accessories.values())[0]
-        if (firstAccessory) {
-          const firstDeviceId = firstAccessory.context.device.deviceId
-          await this.yotoMqtt.connect(this.config.accessToken || '', firstDeviceId)
-        }
-      }
     } catch (error) {
       this.log.error(LOG_PREFIX.PLATFORM, 'Initialization failed:', error)
     }
@@ -122,10 +120,10 @@ export class YotoPlatform {
     this.config.refreshToken = tokenResponse.refresh_token || ''
     this.config.tokenExpiresAt = this.auth.calculateExpiresAt(tokenResponse.expires_in)
 
-    // Save tokens to config file
-    await this.saveConfig()
+    // Save tokens to persistent storage
+    await this.saveTokens()
 
-    this.log.info(LOG_PREFIX.PLATFORM, '✓ Authentication successful and saved to config!')
+    this.log.info(LOG_PREFIX.PLATFORM, '✓ Authentication successful and saved!')
   }
 
   /**
@@ -138,8 +136,8 @@ export class YotoPlatform {
     this.config.refreshToken = ''
     this.config.tokenExpiresAt = 0
 
-    // Save cleared config
-    await this.saveConfig()
+    // Save cleared tokens
+    await this.saveTokens()
 
     // Restart initialization
     await this.initialize()
@@ -157,43 +155,62 @@ export class YotoPlatform {
     this.config.refreshToken = refreshToken
     this.config.tokenExpiresAt = expiresAt
 
-    // Save updated tokens to config file
-    this.saveConfig().catch(error => {
+    // Save updated tokens to persistent storage
+    this.saveTokens().catch(error => {
       this.log.error(LOG_PREFIX.PLATFORM, 'Failed to save refreshed tokens:', error)
     })
 
-    // Reconnect MQTT with new token
-    if (this.accessories.size > 0) {
-      const firstAccessory = Array.from(this.accessories.values())[0]
-      if (firstAccessory) {
-        const firstDeviceId = firstAccessory.context.device.deviceId
-        this.yotoMqtt.disconnect().then(() => {
-          return this.yotoMqtt.connect(accessToken, firstDeviceId)
-        }).catch(error => {
-          this.log.error(LOG_PREFIX.PLATFORM, 'Failed to reconnect MQTT after token refresh:', error)
-        })
+    // Note: MQTT reconnection is handled by each accessory's own MQTT client
+  }
+
+  /**
+   * Load tokens from config or persistent storage
+   * Priority: config.json > persistent storage file
+   * @returns {Promise<void>}
+   */
+  async loadTokens () {
+    // First check if tokens are in config.json
+    if (this.config.accessToken && this.config.refreshToken) {
+      this.log.debug(LOG_PREFIX.PLATFORM, 'Using tokens from config.json')
+      return
+    }
+
+    // Fall back to persistent storage file
+    try {
+      const data = await readFile(this.tokenFilePath, 'utf-8')
+      const tokens = JSON.parse(data)
+
+      if (tokens.accessToken && tokens.refreshToken) {
+        this.config.accessToken = tokens.accessToken
+        this.config.refreshToken = tokens.refreshToken
+        this.config.tokenExpiresAt = tokens.tokenExpiresAt
+        this.log.debug(LOG_PREFIX.PLATFORM, 'Loaded tokens from persistent storage')
       }
+    } catch (error) {
+      // File doesn't exist or is invalid - not an error on first run
+      this.log.debug(LOG_PREFIX.PLATFORM, 'No saved tokens found in storage')
     }
   }
 
   /**
-   * Save config to disk using Homebridge API
+   * Save tokens to persistent storage
    * @returns {Promise<void>}
    */
-  async saveConfig () {
+  async saveTokens () {
     try {
-      // Check if updatePlatformConfig is available (Homebridge 1.3.0+)
-      // @ts-expect-error - updatePlatformConfig may not exist in older Homebridge versions
-      if (typeof this.api.updatePlatformConfig === 'function') {
-        // @ts-expect-error - updatePlatformConfig may not exist in older Homebridge versions
-        await this.api.updatePlatformConfig([this.config])
-        this.log.debug(LOG_PREFIX.PLATFORM, 'Config saved to disk')
-      } else {
-        // Fallback for older Homebridge versions
-        this.log.debug(LOG_PREFIX.PLATFORM, 'Config updated in memory (restart Homebridge to persist)')
+      // Ensure storage directory exists
+      await mkdir(this.storagePath, { recursive: true })
+
+      const tokens = {
+        accessToken: this.config.accessToken || '',
+        refreshToken: this.config.refreshToken || '',
+        tokenExpiresAt: this.config.tokenExpiresAt || 0
       }
+
+      await writeFile(this.tokenFilePath, JSON.stringify(tokens, null, 2), 'utf-8')
+      this.log.debug(LOG_PREFIX.PLATFORM, 'Saved tokens to persistent storage')
     } catch (error) {
-      this.log.error(LOG_PREFIX.PLATFORM, 'Failed to save config:', error)
+      this.log.error(LOG_PREFIX.PLATFORM, 'Failed to save tokens:', error)
       throw error
     }
   }
@@ -267,8 +284,12 @@ export class YotoPlatform {
       this.api.updatePlatformAccessories([existingAccessory])
 
       // Create handler for this accessory
-      // eslint-disable-next-line no-new
-      new YotoPlayerAccessory(this, typedAccessory)
+      const handler = new YotoPlayerAccessory(this, typedAccessory)
+
+      // Initialize accessory (connect MQTT, etc.)
+      handler.initialize().catch(error => {
+        this.log.error(LOG_PREFIX.PLATFORM, `Failed to initialize ${device.name}:`, error)
+      })
     } else {
       // Create new accessory
       this.log.info(LOG_PREFIX.PLATFORM, 'Adding new accessory:', device.name)
@@ -289,8 +310,12 @@ export class YotoPlatform {
       }
 
       // Create handler for this accessory
-      // eslint-disable-next-line no-new
-      new YotoPlayerAccessory(this, typedAccessory)
+      const handler = new YotoPlayerAccessory(this, typedAccessory)
+
+      // Initialize accessory (connect MQTT, etc.)
+      handler.initialize().catch(error => {
+        this.log.error(LOG_PREFIX.PLATFORM, `Failed to initialize ${device.name}:`, error)
+      })
 
       // Register with Homebridge
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory])
@@ -328,11 +353,6 @@ export class YotoPlatform {
    */
   async shutdown () {
     this.log.info(LOG_PREFIX.PLATFORM, 'Shutting down...')
-
-    try {
-      await this.yotoMqtt.disconnect()
-    } catch (error) {
-      this.log.error(LOG_PREFIX.PLATFORM, 'Error during shutdown:', error)
-    }
+    // MQTT cleanup is handled by individual accessories
   }
 }

package/lib/playerAccessory.js

@@ -6,6 +6,7 @@
 /** @import { YotoPlatform } from './platform.js' */
 /** @import { YotoAccessoryContext, YotoDeviceStatus, YotoPlaybackEvents } from './types.js' */
 
+import { YotoMqtt } from './yotoMqtt.js'
 import {
   DEFAULT_MANUFACTURER,
   DEFAULT_MODEL,
@@ -37,6 +38,9 @@ export class YotoPlayerAccessory {
     this.currentEvents = accessory.context.lastEvents || null
     this.lastUpdateTime = Date.now()
 
+    // Create dedicated MQTT client for this device
+    this.mqtt = new YotoMqtt(this.log)
+
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Initializing accessory`)
 
     // Set up services
@@ -93,8 +97,16 @@ export class YotoPlayerAccessory {
       this.activeContentInfo = null
     }
 
-    // Connect MQTT for this device
-    this.connectMqtt()
+    // MQTT connection will be initiated by platform after construction
+  }
+
+  /**
+   * Initialize the accessory - connect MQTT and subscribe to updates
+   * Called by platform after construction
+   * @returns {Promise<void>}
+   */
+  async initialize () {
+    await this.connectMqtt()
   }
 
   /**
@@ -397,30 +409,21 @@ export class YotoPlayerAccessory {
       }
 
       // Connect MQTT with device ID and access token
-      await this.platform.yotoMqtt.connect(
+      await this.mqtt.connect(
         this.platform.config.accessToken,
         this.device.deviceId
       )
 
       // Subscribe to device topics
-      await this.subscribeMqtt()
-    } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to connect MQTT:`, error)
-    }
-  }
-
-  /**
-   * Subscribe to MQTT updates for this device
-   */
-  async subscribeMqtt () {
-    try {
-      await this.platform.yotoMqtt.subscribeToDevice(this.device.deviceId, {
+      await this.mqtt.subscribeToDevice(this.device.deviceId, {
         onStatus: this.handleStatusUpdate.bind(this),
         onEvents: this.handleEventsUpdate.bind(this),
         onResponse: this.handleCommandResponse.bind(this)
       })
+
+      this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT connected and subscribed`)
     } catch (error) {
-      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to subscribe to MQTT:`, error)
+      this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to connect MQTT:`, error)
     }
   }
 
@@ -681,11 +684,11 @@ export class YotoPlayerAccessory {
 
     try {
       if (value === this.platform.Characteristic.TargetMediaState.PLAY) {
-        await this.platform.yotoMqtt.resumeCard(this.device.deviceId)
+        await this.mqtt.resumeCard(this.device.deviceId)
       } else if (value === this.platform.Characteristic.TargetMediaState.PAUSE) {
-        await this.platform.yotoMqtt.pauseCard(this.device.deviceId)
+        await this.mqtt.pauseCard(this.device.deviceId)
       } else if (value === this.platform.Characteristic.TargetMediaState.STOP) {
-        await this.platform.yotoMqtt.stopCard(this.device.deviceId)
+        await this.mqtt.stopCard(this.device.deviceId)
       }
     } catch (error) {
       this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set media state:`, error)
@@ -714,7 +717,7 @@ export class YotoPlayerAccessory {
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Set volume:`, value)
 
     try {
-      await this.platform.yotoMqtt.setVolume(this.device.deviceId, Number(value))
+      await this.mqtt.setVolume(this.device.deviceId, Number(value))
     } catch (error) {
       this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set volume:`, error)
       throw new this.platform.api.hap.HapStatusError(
@@ -744,12 +747,12 @@ export class YotoPlayerAccessory {
     try {
       if (value) {
         // Mute - set volume to 0
-        await this.platform.yotoMqtt.setVolume(this.device.deviceId, 0)
+        await this.mqtt.setVolume(this.device.deviceId, 0)
       } else {
         // Unmute - restore to a reasonable volume if currently 0
         const currentVolume = this.currentStatus?.userVolume || 0
         const targetVolume = currentVolume === 0 ? 50 : currentVolume
-        await this.platform.yotoMqtt.setVolume(this.device.deviceId, targetVolume)
+        await this.mqtt.setVolume(this.device.deviceId, targetVolume)
       }
     } catch (error) {
       this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set mute:`, error)
@@ -1038,10 +1041,10 @@ export class YotoPlayerAccessory {
     try {
       if (value === this.platform.Characteristic.Active.INACTIVE) {
         // Turn off timer
-        await this.platform.yotoMqtt.setSleepTimer(this.device.deviceId, 0)
+        await this.mqtt.setSleepTimer(this.device.deviceId, 0)
       } else {
         // Turn on with default duration (30 minutes)
-        await this.platform.yotoMqtt.setSleepTimer(this.device.deviceId, 30 * 60)
+        await this.mqtt.setSleepTimer(this.device.deviceId, 30 * 60)
       }
     } catch (error) {
       this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set sleep timer active:`, error)
@@ -1080,10 +1083,10 @@ export class YotoPlayerAccessory {
 
       if (seconds === 0) {
         // Turn off timer
-        await this.platform.yotoMqtt.setSleepTimer(this.device.deviceId, 0)
+        await this.mqtt.setSleepTimer(this.device.deviceId, 0)
       } else {
         // Set timer with specified duration
-        await this.platform.yotoMqtt.setSleepTimer(this.device.deviceId, seconds)
+        await this.mqtt.setSleepTimer(this.device.deviceId, seconds)
       }
     } catch (error) {
       this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set sleep timer:`, error)
@@ -1229,10 +1232,10 @@ export class YotoPlayerAccessory {
     try {
       if (value) {
         // Turn on - set to white or previous color
-        await this.platform.yotoMqtt.setAmbientLight(this.device.deviceId, 255, 255, 255)
+        await this.mqtt.setAmbientLight(this.device.deviceId, 255, 255, 255)
       } else {
         // Turn off - set to black
-        await this.platform.yotoMqtt.setAmbientLight(this.device.deviceId, 0, 0, 0)
+        await this.mqtt.setAmbientLight(this.device.deviceId, 0, 0, 0)
       }
     } catch (error) {
       this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to set ambient light on:`, error)
@@ -1342,7 +1345,7 @@ export class YotoPlayerAccessory {
       const { r, g, b } = this.hsvToRgb(h, s, v)
 
       // Send MQTT command
-      await this.platform.yotoMqtt.setAmbientLight(this.device.deviceId, r, g, b)
+      await this.mqtt.setAmbientLight(this.device.deviceId, r, g, b)
 
       // Clear pending values
       this.pendingAmbientHue = undefined

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