homebridge-yoto 0.0.4 → 0.0.6

package/config.schema.json

@@ -7,13 +7,6 @@
   "schema": {
     "type": "object",
     "properties": {
-      "name": {
-        "title": "Platform Name",
-        "type": "string",
-        "default": "Yoto",
-        "required": true,
-        "description": "The name of the platform as it appears in Homebridge logs"
-      },
       "clientId": {
         "title": "OAuth Client ID",
         "type": "string",
@@ -39,13 +32,7 @@
         "required": false,
         "description": "Token expiration timestamp (managed automatically)"
       },
-      "mqttBroker": {
-        "title": "MQTT Broker URL",
-        "type": "string",
-        "default": "mqtt://mqtt.yotoplay.com:1883",
-        "required": false,
-        "description": "MQTT broker URL for real-time device communication"
-      },
+
       "statusTimeoutSeconds": {
         "title": "Status Timeout (seconds)",
         "type": "number",
@@ -163,12 +150,6 @@
     }
   },
   "layout": [
-    {
-      "type": "section",
-      "title": "Platform Configuration",
-      "expandable": false,
-      "items": ["name"]
-    },
     {
       "type": "section",
       "title": "Authentication",
@@ -190,7 +171,7 @@
       "title": "MQTT Configuration",
       "expandable": true,
       "expanded": false,
-      "items": ["mqttBroker", "statusTimeoutSeconds"]
+      "items": ["statusTimeoutSeconds"]
     },
     {
       "type": "section",

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,14 +12,15 @@ 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 = 'mqtt://mqtt.yotoplay.com:1883'
+export const YOTO_MQTT_BROKER_URL = 'wss://aqrphjqbp3u2z-ats.iot.eu-west-2.amazonaws.com'
 export const MQTT_RECONNECT_PERIOD = 5000 // milliseconds
 export const MQTT_CONNECT_TIMEOUT = 30000 // milliseconds
 
@@ -45,7 +46,7 @@ export const MQTT_TOPIC_COMMAND_REBOOT = '/device/{deviceId}/command/reboot'
  */
 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 = 'profile offline_access'
 export const OAUTH_POLLING_INTERVAL = 5000 // milliseconds
 export const OAUTH_DEVICE_CODE_TIMEOUT = 300000 // 5 minutes
 
@@ -114,7 +115,6 @@ export const DEFAULT_CONFIG = {
   platform: PLATFORM_NAME,
   name: PLATFORM_NAME,
   clientId: OAUTH_CLIENT_ID,
-  mqttBroker: YOTO_MQTT_BROKER_URL,
   statusTimeoutSeconds: DEFAULT_STATUS_TIMEOUT_SECONDS,
   exposeTemperature: true,
   exposeBattery: true,

package/lib/platform.js

@@ -47,9 +47,7 @@ export class YotoPlatform {
     // Initialize API clients
     this.auth = new YotoAuth(log, this.config.clientId)
     this.yotoApi = new YotoApi(log, this.auth)
-    this.yotoMqtt = new YotoMqtt(log, {
-      brokerUrl: this.config.mqttBroker
-    })
+    this.yotoMqtt = new YotoMqtt(log)
 
     // Set up token refresh callback
     this.yotoApi.setTokenRefreshCallback(this.handleTokenRefresh.bind(this))

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