yoto-nodejs-client 0.0.5 → 0.0.7

package/README.md

@@ -169,7 +169,15 @@ console.log('Current playback:', deviceClient.playback)
 console.log('Device capabilities:', deviceClient.capabilities)
 
 // Control the device
-await deviceClient.updateConfig({ maxVolumeLimit: '14' })
+await deviceClient.updateConfig({ maxVolumeLimit: 14 })
+await deviceClient.updateConfig({
+  dayDisplayBrightnessAuto: false,
+  dayDisplayBrightness: 80
+})
+await deviceClient.updateConfig({
+  nightYotoRadioEnabled: true,
+  nightYotoRadio: 'favourites'
+})
 await deviceClient.sendCommand({ volume: 50 })
 
 // Stop when done
@@ -203,24 +211,21 @@ account.on('started', (metadata) => {
 
 
 
-// Listen for device-specific events from individual devices
-account.on('deviceAdded', (deviceId, deviceModel) => {
-  // Attach event listeners to each device as it's added
-  deviceModel.on('statusUpdate', (status, source) => {
-    console.log(`${deviceId} battery: ${status.batteryLevelPercentage}%`)
-  })
+// Listen for device events across all devices via the unified bus
+account.on('statusUpdate', ({ deviceId, status, source }) => {
+  console.log(`${deviceId} battery: ${status.batteryLevelPercentage}% (${source})`)
+})
 
-  deviceModel.on('online', (metadata) => {
-    console.log(`${deviceId} came online`)
-  })
+account.on('online', ({ deviceId }) => {
+  console.log(`${deviceId} came online`)
+})
 
-  deviceModel.on('offline', (metadata) => {
-    console.log(`${deviceId} went offline`)
-  })
+account.on('offline', ({ deviceId }) => {
+  console.log(`${deviceId} went offline`)
 })
 
 // Unified error handling
-account.on('error', (error, context) => {
+account.on('error', ({ error, context }) => {
   console.error(`Error in ${context.source}:`, error.message)
   if (context.deviceId) {
     console.error(`Device: ${context.deviceId}`)
@@ -938,7 +943,7 @@ Create a stateful device client that manages device state primarily from MQTT wi
 **State Accessors:**
 - `deviceClient.device` - Device information
 - `deviceClient.status` - Current device status (normalized from HTTP/MQTT)
-- `deviceClient.config` - Device configuration
+- `deviceClient.config` - Device configuration (normalized numbers/booleans; auto fields split into `<field>Auto` + value)
 - `deviceClient.shortcuts` - Button shortcuts
 - `deviceClient.playback` - Current playback state
 - `deviceClient.capabilities` - Hardware capabilities (sensors, nightlight support, etc.)
@@ -962,8 +967,17 @@ Create a stateful device client that manages device state primarily from MQTT wi
 - `playbackUpdate(playback, changedFields)` - Playback state changed, passes (playback, changedFields)
 - `online(metadata)` - Device came online, passes metadata with reason and optional upTime
 - `offline(metadata)` - Device went offline, passes metadata with reason and optional shutDownReason or timeSinceLastSeen
-- `mqttConnected()` - MQTT client connected
-- `mqttDisconnected()` - MQTT client disconnected
+- `mqttConnect(metadata)` - MQTT client connected, passes CONNACK metadata
+- `mqttDisconnect(metadata)` - MQTT disconnect packet received, passes metadata with disconnect packet
+- `mqttClose(metadata)` - MQTT connection closed, passes metadata with close reason
+- `mqttReconnect()` - MQTT client is reconnecting
+- `mqttOffline()` - MQTT client goes offline
+- `mqttEnd()` - MQTT client end is called
+- `mqttStatus(topic, message)` - Raw MQTT status messages (documented status topic)
+- `mqttEvents(topic, message)` - Raw MQTT events messages
+- `mqttStatusLegacy(topic, message)` - Raw legacy MQTT status messages (undocumented status topic)
+- `mqttResponse(topic, message)` - Raw MQTT response messages
+- `mqttUnknown(topic, message)` - Raw MQTT messages that do not match known types
 - `error(error)` - Error occurred, passes error
 
 **Static Properties & Methods:**
@@ -1001,7 +1015,15 @@ console.log('Available colors:', YotoDeviceModel.NIGHTLIGHT_COLORS)
 console.log('Color name:', YotoDeviceModel.getNightlightColorName('0x643600'))
 
 // Control device
-await deviceClient.updateConfig({ maxVolumeLimit: '14' })
+await deviceClient.updateConfig({ maxVolumeLimit: 14 })
+await deviceClient.updateConfig({
+  nightDisplayBrightnessAuto: true,
+  nightDisplayBrightness: null
+})
+await deviceClient.updateConfig({
+  nightYotoRadioEnabled: false,
+  nightYotoRadio: null
+})
 
 await deviceClient.stop()
 ```
@@ -1033,11 +1055,27 @@ Create an account manager that automatically discovers and manages all devices f
 **Events:**
 - `started(metadata)` - Account started (metadata: { deviceCount, devices })
 - `stopped()` - Account stopped
-- `deviceAdded(deviceId, deviceModel)` - Device was added
-- `deviceRemoved(deviceId)` - Device was removed
-- `error(error, context)` - Error occurred (context: { source, deviceId, operation })
-
-**Note:** To listen to individual device events (statusUpdate, configUpdate, playbackUpdate, online, offline, mqttConnected, mqttDisconnected, etc.), access the device models directly via `account.devices` or `account.getDevice(deviceId)` and attach listeners to them.
+- `deviceAdded({ deviceId })` - Device was added
+- `deviceRemoved({ deviceId })` - Device was removed
+- `statusUpdate({ deviceId, status, source, changedFields })` - Re-emitted device status update
+- `configUpdate({ deviceId, config, changedFields })` - Re-emitted config update
+- `playbackUpdate({ deviceId, playback, changedFields })` - Re-emitted playback update
+- `online({ deviceId, metadata })` - Re-emitted online event
+- `offline({ deviceId, metadata })` - Re-emitted offline event
+- `mqttConnect({ deviceId, metadata })` - Re-emitted MQTT connect
+- `mqttDisconnect({ deviceId, metadata })` - Re-emitted MQTT disconnect
+- `mqttClose({ deviceId, metadata })` - Re-emitted MQTT close
+- `mqttReconnect({ deviceId })` - Re-emitted MQTT reconnect
+- `mqttOffline({ deviceId })` - Re-emitted MQTT offline
+- `mqttEnd({ deviceId })` - Re-emitted MQTT end
+- `mqttStatus({ deviceId, topic, message })` - Re-emitted raw MQTT status
+- `mqttEvents({ deviceId, topic, message })` - Re-emitted raw MQTT events
+- `mqttStatusLegacy({ deviceId, topic, message })` - Re-emitted raw MQTT legacy status
+- `mqttResponse({ deviceId, topic, message })` - Re-emitted raw MQTT response
+- `mqttUnknown({ deviceId, topic, message })` - Re-emitted raw MQTT unknown message
+- `error({ error, context })` - Error occurred (context: { source, deviceId, operation })
+
+**Note:** You can still listen to individual device events by attaching listeners to each `YotoDeviceModel`, but the account now re-emits device and MQTT events with device context for unified handling.
 
 ```js
 import { YotoAccount } from 'yoto-nodejs-client'
@@ -1057,26 +1095,21 @@ const account = new YotoAccount({
 })
 
 // Account-level error handling
-account.on('error', (error, context) => {
+account.on('error', ({ error, context }) => {
   console.error(`Error in ${context.source}:`, error.message)
 })
 
-// Listen to device added events
-account.on('deviceAdded', (deviceId, deviceModel) => {
-  console.log(`Device ${deviceId} added`)
-  
-  // Attach listeners to individual devices
-  deviceModel.on('statusUpdate', (status, source) => {
-    console.log(`${deviceId} battery: ${status.batteryLevelPercentage}%`)
-  })
-  
-  deviceModel.on('online', (metadata) => {
-    console.log(`${deviceId} came online (${metadata.reason})`)
-  })
-  
-  deviceModel.on('offline', (metadata) => {
-    console.log(`${deviceId} went offline (${metadata.reason})`)
-  })
+// Unified device events across all devices
+account.on('statusUpdate', ({ deviceId, status, source }) => {
+  console.log(`${deviceId} battery: ${status.batteryLevelPercentage}% (${source})`)
+})
+
+account.on('online', ({ deviceId, metadata }) => {
+  console.log(`${deviceId} came online (${metadata.reason})`)
+})
+
+account.on('offline', ({ deviceId, metadata }) => {
+  console.log(`${deviceId} went offline (${metadata.reason})`)
 })
 
 await account.start()

package/bin/auth.js

@@ -6,6 +6,7 @@
 
 import { printHelpText } from 'argsclopts'
 import { parseArgs } from 'node:util'
+import { join } from 'node:path'
 import { YotoClient } from '../index.js'
 import { pkg } from '../lib/pkg.cjs'
 import { DEFAULT_CLIENT_ID } from '../lib/api-endpoints/constants.js'
@@ -41,7 +42,7 @@ if (args.values['help']) {
 
 const clientId = String(args.values['client-id'] || process.env['YOTO_CLIENT_ID'] || DEFAULT_CLIENT_ID)
 
-const outputFile = String(args.values['output'] || '.env')
+const outputFile = String(args.values['output'] || join(process.cwd(), '.env'))
 
 async function main () {
   printHeader('Yoto Device Flow Authentication')
@@ -93,9 +94,9 @@ async function main () {
     // Success! Save tokens to .env file
     console.log('\n✅ Authorization successful!\n')
 
-    await saveTokensToEnv(outputFile, tokens, clientId)
+    const { resolvedPath } = await saveTokensToEnv(outputFile, tokens, clientId)
 
-    console.log(`✨ Tokens saved to ${outputFile}`)
+    console.log(`✨ Tokens saved to ${resolvedPath}`)
     console.log('\nYou can now use these environment variables:')
     console.log('  - YOTO_ACCESS_TOKEN')
     console.log('  - YOTO_REFRESH_TOKEN')

package/bin/device-model.js

@@ -191,8 +191,8 @@ async function main () {
         console.log(`   Bluetooth Enabled: ${config.bluetoothEnabled}`)
         console.log(`   BT Headphones Enabled: ${config.btHeadphonesEnabled}`)
         console.log(`   Clock Face: ${config.clockFace}`)
-        console.log(`   Day Display Brightness: ${config.dayDisplayBrightness}`)
-        console.log(`   Night Display Brightness: ${config.nightDisplayBrightness}`)
+        console.log(`   💡 Day Display Brightness: ${config.dayDisplayBrightness}`)
+        console.log(`   💡 Night Display Brightness: ${config.nightDisplayBrightness}`)
         console.log(`   Shutdown Timeout: ${config.shutdownTimeout}`)
         console.log(`   Volume Level: ${config.volumeLevel}`)
         console.log(`   Ambient Colour: ${config.ambientColour}`)
@@ -202,7 +202,9 @@ async function main () {
         // Show only changed fields
         console.log(`\n⚙️  CONFIG UPDATE [${timestamp}]: (${changedFields.size} change${changedFields.size === 1 ? '' : 's'})`)
         for (const field of changedFields) {
-          console.log(`   ${field}: ${config[field]}`)
+          // Highlight brightness changes
+          const prefix = (field === 'dayDisplayBrightness' || field === 'nightDisplayBrightness') ? '💡 ' : ''
+          console.log(`   ${prefix}${field}: ${config[field]}`)
         }
       } else {
         console.log(`\n⚙️  CONFIG UPDATE [${timestamp}]: (no changes)`)
@@ -284,14 +286,28 @@ async function main () {
       }
     })
 
-    deviceModel.on('mqttConnected', () => {
+    deviceModel.on('mqttConnect', () => {
       const timestamp = new Date().toISOString()
       console.log(`\n🔌 MQTT CONNECTED [${timestamp}]`)
     })
 
-    deviceModel.on('mqttDisconnected', () => {
+    deviceModel.on('mqttDisconnect', (metadata) => {
       const timestamp = new Date().toISOString()
       console.log(`\n🔌 MQTT DISCONNECTED [${timestamp}]`)
+      const reasonCode = metadata.packet.reasonCode ?? 'unknown'
+      console.log(`   Reason Code: ${reasonCode}`)
+      console.log('   Packet:', metadata.packet)
+    })
+
+    deviceModel.on('mqttClose', (metadata) => {
+      const timestamp = new Date().toISOString()
+      console.log(`\n🔌 MQTT CLOSED [${timestamp}]`)
+      console.log(`   Reason: ${metadata.reason}`)
+    })
+
+    deviceModel.on('mqttReconnect', () => {
+      const timestamp = new Date().toISOString()
+      console.log(`\n🔌 MQTT RECONNECTING [${timestamp}]`)
     })
 
     deviceModel.on('error', (error) => {
@@ -329,6 +345,10 @@ async function main () {
     console.log(`   Initialized: ${deviceModel.initialized}`)
     console.log(`   Running: ${deviceModel.running}`)
 
+    console.log('\n💡 Current Brightness Config:')
+    console.log(`   Day Display Brightness: ${deviceModel.config.dayDisplayBrightness}`)
+    console.log(`   Night Display Brightness: ${deviceModel.config.nightDisplayBrightness}`)
+
     console.log('\n🔧 Capabilities:')
     console.log(`   Temperature Sensor: ${deviceModel.capabilities.hasTemperatureSensor}`)
     console.log(`   Ambient Light Sensor: ${deviceModel.capabilities.hasAmbientLightSensor}`)

package/bin/device-tui.js

@@ -725,12 +725,14 @@ async function main () {
       refreshToken,
       accessToken,
       onTokenRefresh: async (tokens) => {
-        await saveTokensToEnv(envFile, {
+        const { resolvedPath } = await saveTokensToEnv(envFile, {
           access_token: tokens.updatedAccessToken,
           refresh_token: tokens.updatedRefreshToken,
           token_type: 'Bearer',
           expires_in: tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
         }, tokens.clientId)
+
+        console.log(`Auth token refreshed: ${resolvedPath}`)
       }
     },
     deviceOptions: {
@@ -988,7 +990,7 @@ async function main () {
       screen.render()
     })
 
-    model.on('mqttConnected', () => {
+    model.on('mqttConnect', () => {
       updateDeviceCard(card, index === selectedIndex)
 
       if (currentView === 'detail' && detailView.model === model) {
@@ -998,7 +1000,7 @@ async function main () {
       screen.render()
     })
 
-    model.on('mqttDisconnected', () => {
+    model.on('mqttDisconnect', () => {
       updateDeviceCard(card, index === selectedIndex)
 
       if (currentView === 'detail' && detailView.model === model) {
@@ -1008,6 +1010,26 @@ async function main () {
       screen.render()
     })
 
+    model.on('mqttClose', () => {
+      updateDeviceCard(card, index === selectedIndex)
+
+      if (currentView === 'detail' && detailView.model === model) {
+        logToDetail(detailView, 'MQTT closed', 'mqtt')
+        updateDetailView(detailView)
+      }
+      screen.render()
+    })
+
+    model.on('mqttReconnect', () => {
+      updateDeviceCard(card, index === selectedIndex)
+
+      if (currentView === 'detail' && detailView.model === model) {
+        logToDetail(detailView, 'MQTT reconnecting', 'mqtt')
+        updateDetailView(detailView)
+      }
+      screen.render()
+    })
+
     model.on('error', (error) => {
       if (currentView === 'detail' && detailView.model === model) {
         logToDetail(detailView, `Error: ${error.message}`, 'error')

package/bin/devices.js

@@ -15,7 +15,6 @@ import {
   handleCliError,
   printHeader
 } from './lib/cli-helpers.js'
-import { createYotoMqttClient } from '../lib/mqtt/index.js'
 import { parseTemperature } from '../lib/helpers/temperature.js'
 
 /** @type {ArgscloptsParseArgsOptionsConfig} */
@@ -160,10 +159,7 @@ async function main () {
       console.log('🔌 Connecting to MQTT...')
       console.log('='.repeat(60))
 
-      const mqttClient = createYotoMqttClient({
-        deviceId,
-        accessToken
-      })
+      const mqttClient = await client.createMqttClient({ deviceId })
 
       // Setup interactive keyboard input (once, before connecting)
       readline.emitKeypressEvents(process.stdin)
@@ -200,8 +196,9 @@ async function main () {
       })
 
       // Setup message handlers
-      mqttClient.on('connected', () => {
+      mqttClient.on('connect', (connack) => {
         console.log('✅ Connected to MQTT broker')
+        console.log(`   Session present: ${connack.sessionPresent ? 'yes' : 'no'}`)
         console.log('📡 Subscribed to topics:')
         console.log(`   • device/${deviceId}/data/events (playback events)`)
         console.log(`   • device/${deviceId}/data/status (regular status)`)
@@ -316,18 +313,37 @@ async function main () {
         console.dir(payload, { depth: null, colors: true })
       })
 
-      mqttClient.on('disconnected', () => {
-        console.log('\n❌ Disconnected from MQTT broker')
+      mqttClient.on('disconnect', (metadata) => {
+        const timestamp = new Date().toISOString()
+        console.log(`\n❌ MQTT DISCONNECTED [${timestamp}]`)
+        const reasonCode = metadata.packet.reasonCode ?? 'unknown'
+        console.log(`   Reason Code: ${reasonCode}`)
+      })
+
+      mqttClient.on('close', (metadata) => {
+        const timestamp = new Date().toISOString()
+        console.log(`\n❌ MQTT CLOSED [${timestamp}]`)
+        console.log(`   Reason: ${metadata.reason}`)
       })
 
-      mqttClient.on('reconnecting', () => {
+      mqttClient.on('reconnect', () => {
         console.log('\n🔄 Reconnecting to MQTT broker...')
       })
 
+      mqttClient.on('offline', () => {
+        const timestamp = new Date().toISOString()
+        console.log(`\n📴 MQTT OFFLINE [${timestamp}]`)
+      })
+
       mqttClient.on('error', (error) => {
         console.error('\n⚠️  MQTT Error:', error.message)
       })
 
+      mqttClient.on('end', () => {
+        const timestamp = new Date().toISOString()
+        console.log(`\n🛑 MQTT END [${timestamp}]`)
+      })
+
       // Handle graceful shutdown
       const cleanup = async () => {
         console.log('\n\n🛑 Shutting down...')

package/bin/lib/cli-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-helpers.d.ts","sourceRoot":"","sources":["cli-helpers.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH,oCAFa,gCAAgC,CAoB5C;AAED;;;;GAIG;AACH,sCAHW,MAAM,GACJ,MAAM,CAUlB;AAED;;;;;GAKG;AACH,wCAJW;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAA;CAAE,GACtD;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAoB5F;AAED;;;;;;;;GAQG;AACH,sFANG;IAAwB,QAAQ,EAAxB,MAAM;IACU,YAAY,EAA5B,MAAM;IACU,WAAW,EAA3B,MAAM;IACW,UAAU;CACnC,GAAU,UAAU,CAsBtB;AAED;;;GAGG;AACH,sCAFW,GAAG,QAyBb;AAED;;;GAGG;AACH,mCAFW,MAAM,QAKhB;sDA1IoD,YAAY;2BAGtC,yBAAyB"}
+{"version":3,"file":"cli-helpers.d.ts","sourceRoot":"","sources":["cli-helpers.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH,oCAFa,gCAAgC,CAoB5C;AAED;;;;GAIG;AACH,sCAHW,MAAM,GACJ,MAAM,CAUlB;AAED;;;;;GAKG;AACH,wCAJW;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAA;CAAE,GACtD;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAoB5F;AAED;;;;;;;;GAQG;AACH,sFANG;IAAwB,QAAQ,EAAxB,MAAM;IACU,YAAY,EAA5B,MAAM;IACU,WAAW,EAA3B,MAAM;IACW,UAAU;CACnC,GAAU,UAAU,CAwBtB;AAED;;;GAGG;AACH,sCAFW,GAAG,QAyBb;AAED;;;GAGG;AACH,mCAFW,MAAM,QAKhB;sDA5IoD,YAAY;2BAGtC,yBAAyB"}

package/bin/lib/cli-helpers.js

@@ -86,12 +86,14 @@ export function createYotoClient ({ clientId, refreshToken, accessToken, outputF
     accessToken,
     onTokenRefresh: async (tokens) => {
       // Save tokens if they refresh during operation
-      await saveTokensToEnv(outputFile, {
+      const { resolvedPath } = await saveTokensToEnv(outputFile, {
         access_token: tokens.updatedAccessToken,
         refresh_token: tokens.updatedRefreshToken,
         token_type: 'Bearer',
         expires_in: tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
       }, tokens.clientId)
+
+      console.log(`Auth token refreshed: ${resolvedPath}`)
     },
     onRefreshStart: () => {
       console.log('\n🔄 Token refresh triggered...')

package/bin/lib/token-helpers.d.ts

@@ -32,11 +32,13 @@ export function checkTokenExpiration(token: string, bufferSeconds?: number): {
 export function decodeJwt(token: string): any;
 /**
  * Save tokens to .env file
- * @param {string} filename
+ * @param {string} envFilePath file path
  * @param {YotoTokenResponse} tokens
  * @param {string} clientId
  */
-export function saveTokensToEnv(filename: string, tokens: YotoTokenResponse, clientId: string): Promise<void>;
+export function saveTokensToEnv(envFilePath: string, tokens: YotoTokenResponse, clientId: string): Promise<{
+    resolvedPath: string;
+}>;
 /**
  * Sleep for a specified number of milliseconds
  * @param {number} ms

package/bin/lib/token-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-helpers.d.ts","sourceRoot":"","sources":["token-helpers.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,2CAHW,MAAM,GACJ,MAAM,CAKlB;AAED;;;;;GAKG;AACH,qCAJW,MAAM,kBACN,MAAM,GACJ;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAmB/C;AAED;;;;;GAKG;AACH,4CAJW,MAAM,kBACN,MAAM,GACJ;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAa/C;AAED;;;;GAIG;AACH,iCAHW,MAAM,GACJ,GAAG,CASf;AAED;;;;;GAKG;AACH,0CAJW,MAAM,UACN,iBAAiB,YACjB,MAAM,iBA8DhB;AAED;;;GAGG;AACH,0BAFW,MAAM,gBAIhB;uCArJmC,iCAAiC"}
+{"version":3,"file":"token-helpers.d.ts","sourceRoot":"","sources":["token-helpers.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,2CAHW,MAAM,GACJ,MAAM,CAKlB;AAED;;;;;GAKG;AACH,qCAJW,MAAM,kBACN,MAAM,GACJ;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAmB/C;AAED;;;;;GAKG;AACH,4CAJW,MAAM,kBACN,MAAM,GACJ;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAa/C;AAED;;;;GAIG;AACH,iCAHW,MAAM,GACJ,GAAG,CASf;AAED;;;;;GAKG;AACH,6CAJW,MAAM,UACN,iBAAiB,YACjB,MAAM;;GA+DhB;AAED;;;GAGG;AACH,0BAFW,MAAM,gBAIhB;uCAtJmC,iCAAiC"}

package/bin/lib/token-helpers.js

@@ -3,7 +3,7 @@
  */
 
 import { promises as fs } from 'node:fs'
-import { join } from 'node:path'
+import { resolve } from 'node:path'
 import { jwtDecode } from 'jwt-decode'
 
 /**
@@ -76,19 +76,18 @@ export function decodeJwt (token) {
 
 /**
  * Save tokens to .env file
- * @param {string} filename
+ * @param {string} envFilePath file path
  * @param {YotoTokenResponse} tokens
  * @param {string} clientId
  */
-export async function saveTokensToEnv (filename, tokens, clientId) {
-  const cwd = process.cwd()
-  const filePath = join(cwd, filename)
-
+export async function saveTokensToEnv (envFilePath, tokens, clientId) {
   let existingContent = ''
 
+  const resolvedPath = resolve(envFilePath)
+
   // Read existing .env file if it exists
   try {
-    existingContent = await fs.readFile(filePath, 'utf8')
+    existingContent = await fs.readFile(envFilePath, 'utf8')
   } catch (err) {
     // File doesn't exist, that's okay
   }
@@ -139,7 +138,9 @@ export async function saveTokensToEnv (filename, tokens, clientId) {
   lines.push(`YOTO_CLIENT_ID=${clientId}`)
 
   // Write back to file
-  await fs.writeFile(filePath, lines.join('\n'), 'utf8')
+  await fs.writeFile(envFilePath, lines.join('\n'), 'utf8')
+
+  return { resolvedPath }
 }
 
 /**

package/bin/refresh-token.js

@@ -16,6 +16,7 @@ import {
   handleCliError
 } from './lib/cli-helpers.js'
 import { DEFAULT_CLIENT_ID } from '../lib/api-endpoints/constants.js'
+import { join } from 'node:path'
 
 /** @type {ArgscloptsParseArgsOptionsConfig} */
 const options = {
@@ -51,7 +52,7 @@ if (args.values['help']) {
 }
 
 // Load .env file if specified or use default
-const outputFile = String(args.values['output'] || '.env')
+const outputFile = String(args.values['output'] || join(process.cwd(), '.env'))
 loadEnvFile(args.values['env-file'] ? String(args.values['env-file']) : outputFile)
 
 const clientId = String(args.values['client-id'] || process.env['YOTO_CLIENT_ID'] || DEFAULT_CLIENT_ID)
@@ -90,12 +91,13 @@ async function main () {
       onTokenRefresh: async (tokens) => {
         // This will be called after successful refresh
         // Convert RefreshSuccessEvent to YotoTokenResponse format
-        await saveTokensToEnv(outputFile, {
+        const { resolvedPath } = await saveTokensToEnv(outputFile, {
           access_token: tokens.updatedAccessToken,
           refresh_token: tokens.updatedRefreshToken,
           token_type: 'Bearer',
           expires_in: tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
         }, tokens.clientId)
+        console.log(`Token Refreshed: ${resolvedPath}`)
       },
       onRefreshStart: () => {
         console.log('\n🔄 Refreshing tokens...')

package/bin/token-info.js

@@ -297,13 +297,13 @@ try {
     onTokenRefresh: async (tokens) => {
       // Save tokens if they refresh during inspection
       console.log('\n⚠️  Token was refreshed during inspection! Saving...')
-      await saveTokensToEnv(outputFile, {
+      const { resolvedPath } = await saveTokensToEnv(outputFile, {
         access_token: tokens.updatedAccessToken,
         refresh_token: tokens.updatedRefreshToken,
         token_type: 'Bearer',
         expires_in: tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
       }, tokens.clientId)
-      console.log(`✅ Updated tokens saved to ${outputFile}`)
+      console.log(`✅ Updated tokens saved to ${resolvedPath}`)
     },
     onRefreshStart: () => {
       console.log('\n🔄 Token refresh triggered during inspection...')

package/lib/api-client.d.ts

@@ -3,11 +3,12 @@
  * @property {string} clientId - OAuth client ID
  * @property {string} refreshToken - OAuth refresh token
  * @property {string} accessToken - Initial OAuth access token (JWT)
- * @property {(refreshedTokenData: RefreshSuccessEvent) => void | Promise<void>} onTokenRefresh - **REQUIRED** Callback invoked when tokens are refreshed. You MUST persist these tokens (to file, database, etc.) as the refresh can happen at any time during API calls. The refresh token may be rotated by the auth server. **DO NOT STUB THIS CALLBACK** - always implement proper persistence logic.
+ * @property {OnTokenRefreshHandler} onTokenRefresh - **REQUIRED** Callback invoked when tokens are refreshed. You MUST persist these tokens (to file, database, etc.) as the refresh can happen at any time during API calls. The refresh token may be rotated by the auth server. **DO NOT STUB THIS CALLBACK** - always implement proper persistence logic.
  * @property {number} [bufferSeconds=30] - Seconds before expiration to consider token expired
  * @property {() => void | Promise<void>} [onRefreshStart] - Optional callback invoked when token refresh starts. Defaults to console.log.
  * @property {(error: Error) => void | Promise<void>} [onRefreshError] - Optional callback invoked when token refresh fails with a transient error. Defaults to console.warn.
  * @property {(error: Error) => void | Promise<void>} [onInvalid] - Optional callback invoked when refresh token is permanently invalid. Defaults to console.error.
+ * @property {string} [mqttSessionId] - Stable unique client ID suffix used for MQTT connections (defaults to a random UUID per YotoClient instance)
  * @property {string} [userAgent] - Optional user agent string to identify your application
  * @property {RequestOptions} [defaultRequestOptions] - Default undici request options for all requests (dispatcher, timeouts, etc.)
  */
@@ -509,15 +510,10 @@ export class YotoClient {
     }): Promise<Media.YotoUploadCoverImageResponse>;
     /**
      * Create an MQTT client for a device
-     * @param {Object} params
-     * @param {string} params.deviceId - Device ID to connect to
-     * @param {MqttClientOptions} [params.mqttOptions] - MQTT.js client options (excluding deviceId and accessToken which are provided automatically)
+     * @param {Omit<YotoMqttOptions, 'token'>} YotoMqttOptions
      * @returns {Promise<YotoMqttClient>}
      */
-    createMqttClient({ deviceId, mqttOptions }: {
-        deviceId: string;
-        mqttOptions?: Partial<import("mqtt").IClientOptions> | undefined;
-    }): Promise<YotoMqttClient>;
+    createMqttClient({ deviceId, mqttOptions }: Omit<YotoMqttOptions, "token">): Promise<YotoMqttClient>;
     #private;
 }
 export type YotoClientConstructorOptions = {
@@ -536,7 +532,7 @@ export type YotoClientConstructorOptions = {
     /**
      * - **REQUIRED** Callback invoked when tokens are refreshed. You MUST persist these tokens (to file, database, etc.) as the refresh can happen at any time during API calls. The refresh token may be rotated by the auth server. **DO NOT STUB THIS CALLBACK** - always implement proper persistence logic.
      */
-    onTokenRefresh: (refreshedTokenData: RefreshSuccessEvent) => void | Promise<void>;
+    onTokenRefresh: OnTokenRefreshHandler;
     /**
      * - Seconds before expiration to consider token expired
      */
@@ -553,6 +549,10 @@ export type YotoClientConstructorOptions = {
      * - Optional callback invoked when refresh token is permanently invalid. Defaults to console.error.
      */
     onInvalid?: (error: Error) => void | Promise<void>;
+    /**
+     * - Stable unique client ID suffix used for MQTT connections (defaults to a random UUID per YotoClient instance)
+     */
+    mqttSessionId?: string;
     /**
      * - Optional user agent string to identify your application
      */
@@ -569,8 +569,9 @@ import * as FamilyLibraryGroups from './api-endpoints/family-library-groups.js';
 import * as Family from './api-endpoints/family.js';
 import * as Icons from './api-endpoints/icons.js';
 import * as Media from './api-endpoints/media.js';
+import type { YotoMqttOptions } from './mqtt/factory.js';
 import type { YotoMqttClient } from './mqtt/client.js';
 import * as Auth from './api-endpoints/auth.js';
-import type { RefreshSuccessEvent } from './token.js';
+import type { OnTokenRefreshHandler } from './token.js';
 import type { RequestOptions } from './api-endpoints/helpers.js';
 //# sourceMappingURL=api-client.d.ts.map

package/lib/api-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["api-client.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["api-client.js"],"names":[],"mappings":"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"}