homebridge-yoto 0.0.9 → 0.0.10

package/lib/playerAccessory.js

@@ -41,6 +41,10 @@ export class YotoPlayerAccessory {
     // Create dedicated MQTT client for this device
     this.mqtt = new YotoMqtt(this.log)
 
+    // Track online status polling
+    this.statusPollInterval = null
+    this.mqttConnected = false
+
     this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Initializing accessory`)
 
     // Set up services
@@ -107,6 +111,84 @@ 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)
+  }
+
+  /**
+   * Stop status polling
+   */
+  stopStatusPolling () {
+    if (this.statusPollInterval) {
+      clearInterval(this.statusPollInterval)
+      this.statusPollInterval = null
+    }
+  }
+
+  /**
+   * Check device online status and reconnect if needed
+   * @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
+
+      // 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)
+    }
+  }
+
+  /**
+   * Disconnect MQTT for this device
+   * @returns {Promise<void>}
+   */
+  async disconnectMqtt () {
+    if (this.mqtt && this.mqttConnected) {
+      try {
+        await this.mqtt.disconnect()
+        this.mqttConnected = false
+        this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT disconnected`)
+      } catch (error) {
+        this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to disconnect MQTT:`, error)
+      }
+    }
   }
 
   /**
@@ -397,11 +479,30 @@ export class YotoPlayerAccessory {
       .onSet(this.setAmbientLightBrightness.bind(this))
   }
 
+  /**
+   * Cleanup and destroy the accessory
+   */
+  async destroy () {
+    this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Destroying accessory`)
+
+    // Stop status polling
+    this.stopStatusPolling()
+
+    // Disconnect MQTT
+    await this.disconnectMqtt()
+  }
+
   /**
    * Connect MQTT for this device
    */
   async connectMqtt () {
     try {
+      // Check if device is online first
+      if (!this.device.online) {
+        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Device is offline, skipping MQTT connection`)
+        return
+      }
+
       // 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`)
@@ -410,6 +511,7 @@ export class YotoPlayerAccessory {
 
       // TEMPORARY: Debug logging for MQTT troubleshooting
       this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT Connection Details:`)
+      this.log.warn(LOG_PREFIX.ACCESSORY, `  Device Online: ${this.device.online}`)
       this.log.warn(LOG_PREFIX.ACCESSORY, `  Device ID: ${this.device.deviceId}`)
       this.log.warn(LOG_PREFIX.ACCESSORY, `  Access Token: ${this.platform.config.accessToken}`)
       this.log.warn(LOG_PREFIX.ACCESSORY, `  Token Length: ${this.platform.config.accessToken.length}`)
@@ -427,8 +529,26 @@ export class YotoPlayerAccessory {
         onResponse: this.handleCommandResponse.bind(this)
       })
 
+      this.mqttConnected = true
       this.log.debug(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT connected and subscribed`)
+
+      // Set up MQTT event listeners
+      this.mqtt.on('disconnected', () => {
+        this.mqttConnected = false
+        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT disconnected`)
+      })
+
+      this.mqtt.on('offline', () => {
+        this.mqttConnected = false
+        this.log.warn(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT offline`)
+      })
+
+      this.mqtt.on('connected', () => {
+        this.mqttConnected = true
+        this.log.info(LOG_PREFIX.ACCESSORY, `[${this.device.name}] MQTT reconnected`)
+      })
     } catch (error) {
+      this.mqttConnected = false
       this.log.error(LOG_PREFIX.ACCESSORY, `[${this.device.name}] Failed to connect MQTT:`, error)
     }
   }

package/lib/yotoMqtt.js

@@ -6,6 +6,7 @@
 /** @import { YotoDeviceStatus, YotoPlaybackEvents, MqttVolumeCommand, MqttAmbientCommand, MqttSleepTimerCommand, MqttCardStartCommand, MqttCommandResponse } from './types.js' */
 
 import mqtt from 'mqtt'
+import { EventEmitter } from 'events'
 import {
   YOTO_MQTT_BROKER_URL,
   YOTO_MQTT_AUTH_NAME,
@@ -30,14 +31,16 @@ import {
 
 /**
  * MQTT client for Yoto device communication
+ * @extends EventEmitter
  */
-export class YotoMqtt {
+export class YotoMqtt extends EventEmitter {
   /**
    * @param {Logger} log - Homebridge logger
    * @param {Object} [options] - MQTT options
    * @param {string} [options.brokerUrl] - MQTT broker URL
    */
   constructor (log, options = {}) {
+    super()
     this.log = log
     this.brokerUrl = options.brokerUrl || YOTO_MQTT_BROKER_URL
     this.client = null
@@ -64,7 +67,7 @@ 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()}`
+      const clientId = `DASH${deviceId}`
       const username = `${deviceId}?x-amz-customauthorizer-name=${YOTO_MQTT_AUTH_NAME}`
 
       // TEMPORARY: Detailed debug logging for MQTT troubleshooting
@@ -92,7 +95,6 @@ export class YotoMqtt {
         reconnectPeriod: 0, // Disable auto-reconnect - we'll handle reconnection manually
         connectTimeout: MQTT_CONNECT_TIMEOUT,
         clientId,
-        clean: true,
         ALPNProtocols: ['x-amzn-mqtt-ca']
       })
 
@@ -102,6 +104,9 @@ export class YotoMqtt {
         this.reconnectDelay = MQTT_RECONNECT_PERIOD
         this.log.info(LOG_PREFIX.MQTT, '✓ Connected to MQTT broker')
 
+        // Emit connected event
+        this.emit('connected')
+
         // Resubscribe to all devices after reconnection
         this.resubscribeDevices()
 
@@ -110,7 +115,13 @@ export class YotoMqtt {
 
       this.client.on('error', (error) => {
         this.log.error(LOG_PREFIX.MQTT, 'Connection error:', error)
-        this.log.error(LOG_PREFIX.MQTT, 'Error details:', JSON.stringify(error, null, 2))
+        this.log.error(LOG_PREFIX.MQTT, 'Error message:', error.message)
+        const errorWithCode = /** @type {any} */ (error)
+        this.log.error(LOG_PREFIX.MQTT, 'Error code:', errorWithCode.code)
+        this.log.error(LOG_PREFIX.MQTT, 'Error stack:', error.stack)
+        if (errorWithCode.code) {
+          this.log.error(LOG_PREFIX.MQTT, `AWS IoT error code: ${errorWithCode.code}`)
+        }
         if (!this.connected) {
           reject(error)
         }
@@ -120,9 +131,14 @@ export class YotoMqtt {
         const wasConnected = this.connected
         this.connected = false
 
+        // Emit disconnected event
+        this.emit('disconnected')
+
         if (wasConnected) {
           this.log.warn(LOG_PREFIX.MQTT, ERROR_MESSAGES.MQTT_DISCONNECTED)
           this.handleReconnect()
+        } else {
+          this.log.error(LOG_PREFIX.MQTT, 'Connection closed before establishing connection')
         }
       })
 
@@ -140,7 +156,26 @@ export class YotoMqtt {
 
       this.client.on('offline', () => {
         this.connected = false
-        this.log.warn(LOG_PREFIX.MQTT, 'MQTT client offline')
+        this.log.warn(LOG_PREFIX.MQTT, 'MQTT client offline - connection failed or lost')
+
+        // Emit offline event
+        this.emit('offline')
+      })
+
+      this.client.on('end', () => {
+        this.log.warn(LOG_PREFIX.MQTT, 'MQTT client ended')
+      })
+
+      this.client.on('disconnect', (packet) => {
+        this.log.warn(LOG_PREFIX.MQTT, 'MQTT client disconnected:', packet)
+      })
+
+      this.client.on('packetreceive', (packet) => {
+        this.log.debug(LOG_PREFIX.MQTT, 'Packet received:', packet.cmd)
+      })
+
+      this.client.on('packetsend', (packet) => {
+        this.log.debug(LOG_PREFIX.MQTT, 'Packet sent:', packet.cmd)
       })
 
       this.client.on('message', (topic, message) => {

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