homebridge-yoto 0.0.5 → 0.0.7

package/lib/auth.js

@@ -36,22 +36,34 @@ export class YotoAuth {
    */
   async initiateDeviceFlow () {
     this.log.info(LOG_PREFIX.AUTH, 'Initiating device authorization flow...')
+    this.log.debug(LOG_PREFIX.AUTH, `Client ID: ${this.clientId}`)
+    this.log.debug(LOG_PREFIX.AUTH, `Endpoint: ${YOTO_OAUTH_DEVICE_CODE_URL}`)
+    this.log.debug(LOG_PREFIX.AUTH, `Scope: ${OAUTH_SCOPE}`)
+    this.log.debug(LOG_PREFIX.AUTH, `Audience: ${OAUTH_AUDIENCE}`)
 
     try {
+      const params = new URLSearchParams({
+        client_id: this.clientId,
+        scope: OAUTH_SCOPE,
+        audience: OAUTH_AUDIENCE
+      })
+      this.log.debug(LOG_PREFIX.AUTH, 'Request body:', params.toString())
+
       const response = await fetch(YOTO_OAUTH_DEVICE_CODE_URL, {
         method: 'POST',
         headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/x-www-form-urlencoded'
         },
-        body: JSON.stringify({
-          client_id: this.clientId,
-          scope: OAUTH_SCOPE,
-          audience: OAUTH_AUDIENCE
-        })
+        body: params
       })
 
+      this.log.debug(LOG_PREFIX.AUTH, `Response status: ${response.status}`)
+      this.log.debug(LOG_PREFIX.AUTH, 'Response headers:', Object.fromEntries(response.headers.entries()))
+
       if (!response.ok) {
         const errorText = await response.text()
+        this.log.error(LOG_PREFIX.AUTH, `Device code request failed with status ${response.status}`)
+        this.log.error(LOG_PREFIX.AUTH, `Error response: ${errorText}`)
         throw new Error(`Device code request failed: ${response.status} ${errorText}`)
       }
 
@@ -89,16 +101,19 @@ export class YotoAuth {
 
     while (Date.now() - startTime < timeout) {
       try {
+        const params = new URLSearchParams({
+          grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
+          device_code: deviceCode,
+          client_id: this.clientId,
+          audience: OAUTH_AUDIENCE
+        })
+
         const response = await fetch(YOTO_OAUTH_TOKEN_URL, {
           method: 'POST',
           headers: {
-            'Content-Type': 'application/json'
+            'Content-Type': 'application/x-www-form-urlencoded'
           },
-          body: JSON.stringify({
-            grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
-            device_code: deviceCode,
-            client_id: this.clientId
-          })
+          body: params
         })
 
         if (response.ok) {
@@ -153,16 +168,18 @@ export class YotoAuth {
     this.log.debug(LOG_PREFIX.AUTH, 'Refreshing access token...')
 
     try {
+      const params = new URLSearchParams({
+        grant_type: 'refresh_token',
+        refresh_token: refreshToken,
+        client_id: this.clientId
+      })
+
       const response = await fetch(YOTO_OAUTH_TOKEN_URL, {
         method: 'POST',
         headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/x-www-form-urlencoded'
         },
-        body: JSON.stringify({
-          grant_type: 'refresh_token',
-          refresh_token: refreshToken,
-          client_id: this.clientId
-        })
+        body: params
       })
 
       if (!response.ok) {

package/lib/constants.js

@@ -12,40 +12,42 @@ export const PLUGIN_NAME = 'homebridge-yoto'
  * Yoto API endpoints
  */
 export const YOTO_API_BASE_URL = 'https://api.yotoplay.com'
-export const YOTO_OAUTH_AUTHORIZE_URL = `${YOTO_API_BASE_URL}/authorize`
-export const YOTO_OAUTH_TOKEN_URL = `${YOTO_API_BASE_URL}/oauth/token`
-export const YOTO_OAUTH_DEVICE_CODE_URL = `${YOTO_API_BASE_URL}/oauth/device/code`
+export const YOTO_OAUTH_BASE_URL = 'https://login.yotoplay.com'
+export const YOTO_OAUTH_AUTHORIZE_URL = `${YOTO_OAUTH_BASE_URL}/authorize`
+export const YOTO_OAUTH_TOKEN_URL = `${YOTO_OAUTH_BASE_URL}/oauth/token`
+export const YOTO_OAUTH_DEVICE_CODE_URL = `${YOTO_OAUTH_BASE_URL}/oauth/device/code`
 
 /**
  * MQTT configuration
  */
 export const YOTO_MQTT_BROKER_URL = 'wss://aqrphjqbp3u2z-ats.iot.eu-west-2.amazonaws.com'
+export const YOTO_MQTT_AUTH_NAME = 'PublicJWTAuthorizer'
 export const MQTT_RECONNECT_PERIOD = 5000 // milliseconds
 export const MQTT_CONNECT_TIMEOUT = 30000 // milliseconds
 
 /**
  * MQTT topic templates
  */
-export const MQTT_TOPIC_DATA_STATUS = '/device/{deviceId}/data/status'
-export const MQTT_TOPIC_DATA_EVENTS = '/device/{deviceId}/data/events'
-export const MQTT_TOPIC_RESPONSE = '/device/{deviceId}/response'
-export const MQTT_TOPIC_COMMAND_STATUS_REQUEST = '/device/{deviceId}/command/status/request'
-export const MQTT_TOPIC_COMMAND_EVENTS_REQUEST = '/device/{deviceId}/command/events/request'
-export const MQTT_TOPIC_COMMAND_VOLUME_SET = '/device/{deviceId}/command/volume/set'
-export const MQTT_TOPIC_COMMAND_CARD_START = '/device/{deviceId}/command/card/start'
-export const MQTT_TOPIC_COMMAND_CARD_STOP = '/device/{deviceId}/command/card/stop'
-export const MQTT_TOPIC_COMMAND_CARD_PAUSE = '/device/{deviceId}/command/card/pause'
-export const MQTT_TOPIC_COMMAND_CARD_RESUME = '/device/{deviceId}/command/card/resume'
-export const MQTT_TOPIC_COMMAND_SLEEP_TIMER = '/device/{deviceId}/command/sleep-timer/set'
-export const MQTT_TOPIC_COMMAND_AMBIENTS_SET = '/device/{deviceId}/command/ambients/set'
-export const MQTT_TOPIC_COMMAND_REBOOT = '/device/{deviceId}/command/reboot'
+export const MQTT_TOPIC_DATA_STATUS = 'device/{deviceId}/status'
+export const MQTT_TOPIC_DATA_EVENTS = 'device/{deviceId}/events'
+export const MQTT_TOPIC_RESPONSE = 'device/{deviceId}/response'
+export const MQTT_TOPIC_COMMAND_STATUS_REQUEST = 'device/{deviceId}/command/status/request'
+export const MQTT_TOPIC_COMMAND_EVENTS_REQUEST = 'device/{deviceId}/command/events/request'
+export const MQTT_TOPIC_COMMAND_VOLUME_SET = 'device/{deviceId}/command/volume/set'
+export const MQTT_TOPIC_COMMAND_CARD_START = 'device/{deviceId}/command/card/start'
+export const MQTT_TOPIC_COMMAND_CARD_STOP = 'device/{deviceId}/command/card/stop'
+export const MQTT_TOPIC_COMMAND_CARD_PAUSE = 'device/{deviceId}/command/card/pause'
+export const MQTT_TOPIC_COMMAND_CARD_RESUME = 'device/{deviceId}/command/card/resume'
+export const MQTT_TOPIC_COMMAND_SLEEP_TIMER = 'device/{deviceId}/command/sleep-timer/set'
+export const MQTT_TOPIC_COMMAND_AMBIENTS_SET = 'device/{deviceId}/command/ambients/set'
+export const MQTT_TOPIC_COMMAND_REBOOT = 'device/{deviceId}/command/reboot'
 
 /**
  * OAuth configuration
  */
 export const OAUTH_CLIENT_ID = 'Y4HJ8BFqRQ24GQoLzgOzZ2KSqWmFG8LI'
 export const OAUTH_AUDIENCE = 'https://api.yotoplay.com'
-export const OAUTH_SCOPE = 'profile offline_access openid'
+export const OAUTH_SCOPE = 'openid profile offline_access'
 export const OAUTH_POLLING_INTERVAL = 5000 // milliseconds
 export const OAUTH_DEVICE_CODE_TIMEOUT = 300000 // 5 minutes
 

package/lib/platform.js

@@ -71,23 +71,7 @@ export class YotoPlatform {
     try {
       // Check if we have stored credentials
       if (!this.config.accessToken || !this.config.refreshToken) {
-        this.log.warn(LOG_PREFIX.PLATFORM, ERROR_MESSAGES.NO_AUTH)
-        this.log.info(LOG_PREFIX.PLATFORM, 'Starting OAuth flow...')
-
-        const tokenResponse = await this.auth.authorize()
-
-        // Store tokens in config
-        this.config.accessToken = tokenResponse.access_token
-        this.config.refreshToken = tokenResponse.refresh_token || ''
-        this.config.tokenExpiresAt = this.auth.calculateExpiresAt(tokenResponse.expires_in)
-
-        this.log.info(LOG_PREFIX.PLATFORM, '✓ Authentication successful!')
-        this.log.warn(LOG_PREFIX.PLATFORM, 'IMPORTANT: Please update your Homebridge config with the following:')
-        this.log.warn(LOG_PREFIX.PLATFORM, JSON.stringify({
-          accessToken: this.config.accessToken,
-          refreshToken: this.config.refreshToken,
-          tokenExpiresAt: this.config.tokenExpiresAt
-        }, null, 2))
+        await this.performDeviceFlow()
       }
 
       // Set tokens in API client
@@ -97,16 +81,70 @@ export class YotoPlatform {
         this.config.tokenExpiresAt || 0
       )
 
-      // Connect to MQTT
-      await this.yotoMqtt.connect(this.config.accessToken)
-
       // Discover and register devices
-      await this.discoverDevices()
+      try {
+        await this.discoverDevices()
+      } catch (error) {
+        // Check if this is an auth error that requires re-authentication
+        if (error instanceof Error && error.message.includes('TOKEN_REFRESH_FAILED')) {
+          this.log.warn(LOG_PREFIX.PLATFORM, 'Token refresh failed, clearing tokens and restarting auth flow...')
+          await this.clearTokensAndReauth()
+          return
+        }
+        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)
     }
   }
 
+  /**
+   * Perform device authorization flow
+   * @returns {Promise<void>}
+   */
+  async performDeviceFlow () {
+    this.log.warn(LOG_PREFIX.PLATFORM, ERROR_MESSAGES.NO_AUTH)
+    this.log.info(LOG_PREFIX.PLATFORM, 'Starting OAuth flow...')
+
+    const tokenResponse = await this.auth.authorize()
+
+    // Store tokens in config
+    this.config.accessToken = tokenResponse.access_token
+    this.config.refreshToken = tokenResponse.refresh_token || ''
+    this.config.tokenExpiresAt = this.auth.calculateExpiresAt(tokenResponse.expires_in)
+
+    // Save tokens to config file
+    await this.saveConfig()
+
+    this.log.info(LOG_PREFIX.PLATFORM, '✓ Authentication successful and saved to config!')
+  }
+
+  /**
+   * Clear invalid tokens and restart authentication
+   * @returns {Promise<void>}
+   */
+  async clearTokensAndReauth () {
+    // Clear tokens from config
+    this.config.accessToken = ''
+    this.config.refreshToken = ''
+    this.config.tokenExpiresAt = 0
+
+    // Save cleared config
+    await this.saveConfig()
+
+    // Restart initialization
+    await this.initialize()
+  }
+
   /**
    * Handle token refresh - update config
    * @param {string} accessToken - New access token
@@ -114,17 +152,50 @@ export class YotoPlatform {
    * @param {number} expiresAt - New expiration timestamp
    */
   handleTokenRefresh (accessToken, refreshToken, expiresAt) {
-    this.log.info(LOG_PREFIX.PLATFORM, 'Token refreshed, please update your config')
+    this.log.info(LOG_PREFIX.PLATFORM, 'Token refreshed')
     this.config.accessToken = accessToken
     this.config.refreshToken = refreshToken
     this.config.tokenExpiresAt = expiresAt
 
-    // Update MQTT connection with new token
-    this.yotoMqtt.disconnect().then(() => {
-      return this.yotoMqtt.connect(accessToken)
-    }).catch(error => {
-      this.log.error(LOG_PREFIX.PLATFORM, 'Failed to reconnect MQTT after token refresh:', error)
+    // Save updated tokens to config file
+    this.saveConfig().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)
+        })
+      }
+    }
+  }
+
+  /**
+   * Save config to disk using Homebridge API
+   * @returns {Promise<void>}
+   */
+  async saveConfig () {
+    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)')
+      }
+    } catch (error) {
+      this.log.error(LOG_PREFIX.PLATFORM, 'Failed to save config:', error)
+      throw error
+    }
   }
 
   /**

package/lib/playerAccessory.js

@@ -93,8 +93,8 @@ export class YotoPlayerAccessory {
       this.activeContentInfo = null
     }
 
-    // Subscribe to MQTT updates
-    this.subscribeMqtt()
+    // Connect MQTT for this device
+    this.connectMqtt()
   }
 
   /**
@@ -385,6 +385,30 @@ export class YotoPlayerAccessory {
       .onSet(this.setAmbientLightBrightness.bind(this))
   }
 
+  /**
+   * Connect MQTT for this device
+   */
+  async connectMqtt () {
+    try {
+      // Ensure we have an access token
+      if (!this.platform.config.accessToken) {
+        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] No access token available for MQTT connection`)
+        return
+      }
+
+      // Connect MQTT with device ID and access token
+      await this.platform.yotoMqtt.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
    */

package/lib/yotoApi.js

@@ -81,7 +81,8 @@ export class YotoApi {
         }
       } catch (error) {
         this.log.error(LOG_PREFIX.API, 'Token refresh failed:', error)
-        throw error
+        // Throw specific error so platform can detect and restart auth flow
+        throw new Error('TOKEN_REFRESH_FAILED')
       }
     }
   }

package/lib/yotoMqtt.js

@@ -8,6 +8,7 @@
 import mqtt from 'mqtt'
 import {
   YOTO_MQTT_BROKER_URL,
+  YOTO_MQTT_AUTH_NAME,
   MQTT_RECONNECT_PERIOD,
   MQTT_CONNECT_TIMEOUT,
   MQTT_TOPIC_DATA_STATUS,
@@ -51,9 +52,10 @@ export class YotoMqtt {
   /**
    * Connect to MQTT broker
    * @param {string} accessToken - Yoto access token for authentication
+   * @param {string} deviceId - Device ID for MQTT client identification
    * @returns {Promise<void>}
    */
-  async connect (accessToken) {
+  async connect (accessToken, deviceId) {
     if (this.client) {
       this.log.warn(LOG_PREFIX.MQTT, 'Already connected, disconnecting first...')
       await this.disconnect()
@@ -62,12 +64,19 @@ export class YotoMqtt {
     return new Promise((resolve, reject) => {
       this.log.info(LOG_PREFIX.MQTT, `Connecting to ${this.brokerUrl}...`)
 
+      const clientId = `homebridge-yoto-${deviceId}-${Date.now()}`
+
       this.client = mqtt.connect(this.brokerUrl, {
-        username: accessToken,
-        password: '',
+        keepalive: 300,
+        port: 443,
+        protocol: 'wss',
+        username: `${deviceId}?x-amz-customauthorizer-name=${YOTO_MQTT_AUTH_NAME}`,
+        password: accessToken,
         reconnectPeriod: MQTT_RECONNECT_PERIOD,
         connectTimeout: MQTT_CONNECT_TIMEOUT,
-        clean: true
+        clientId,
+        clean: true,
+        ALPNProtocols: ['x-amzn-mqtt-ca']
       })
 
       this.client.on('connect', () => {
@@ -319,10 +328,10 @@ export class YotoMqtt {
         return
       }
 
-      if (topic.includes('/data/status')) {
+      if (topic.includes('/status')) {
         this.log.debug(LOG_PREFIX.MQTT, `Status update for ${deviceId}`)
         callbacks.onStatus?.(payload)
-      } else if (topic.includes('/data/events')) {
+      } else if (topic.includes('/events')) {
         this.log.debug(LOG_PREFIX.MQTT, `Events update for ${deviceId}`)
         callbacks.onEvents?.(payload)
       } else if (topic.includes('/response')) {

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