yoto-nodejs-client 0.0.2 → 0.0.3

package/bin/devices.js

@@ -6,6 +6,7 @@
 
 import { printHelpText } from 'argsclopts'
 import { parseArgs } from 'node:util'
+import * as readline from 'node:readline'
 import { pkg } from '../lib/pkg.cjs'
 import {
   getCommonOptions,
@@ -15,6 +16,7 @@ import {
   printHeader
 } from './lib/cli-helpers.js'
 import { createYotoMqttClient } from '../lib/mqtt/index.js'
+import { parseTemperature } from '../lib/helpers/temperature.js'
 
 /** @type {ArgscloptsParseArgsOptionsConfig} */
 const options = {
@@ -27,16 +29,24 @@ const options = {
   status: {
     type: 'boolean',
     short: 's',
-    help: 'Get device status (requires --device-id)'
+    help: 'Get only device status - battery, charging, online state (requires --device-id)'
   },
   mqtt: {
     type: 'boolean',
     short: 'm',
     help: 'Connect to MQTT and listen for device messages (requires --device-id)'
   },
-  'mqtt-stop-after-seconds': {
+  'mqtt-timeout': {
     type: 'string',
     help: 'Auto-disconnect MQTT after N seconds (requires --mqtt)'
+  },
+  'mqtt-request-status': {
+    type: 'string',
+    help: 'Request device status after N milliseconds of connecting (requires --mqtt, default: 1000)'
+  },
+  'mqtt-request-events': {
+    type: 'string',
+    help: 'Request device events after N milliseconds of connecting (requires --mqtt, default: 3000)'
   }
 }
 
@@ -47,7 +57,7 @@ if (args.values['help']) {
     options,
     name: 'yoto-devices',
     version: pkg.version,
-    exampleFn: ({ name }) => `    Yoto devices information helper\n\n    Examples:\n      ${name}                              # List all devices\n      ${name} --device-id abc123           # Get specific device\n      ${name} --device-id abc123 --status  # Get device status\n      ${name} --device-id abc123 --mqtt    # Listen to MQTT messages\n      ${name} --device-id abc123 --mqtt --mqtt-stop-after-seconds 10  # Sample MQTT for 10s\n`
+    exampleFn: ({ name }) => `    Yoto devices information helper\n\n    Examples:\n      ${name}                              # List all devices (GET /device-v2/devices/mine)\n      ${name} --device-id abc123           # Get device details + config + shortcuts\n      ${name} --device-id abc123 --status  # Get only status (battery, charging, online)\n      ${name} --device-id abc123 --mqtt    # Listen to MQTT messages\n      ${name} --device-id abc123 --mqtt --mqtt-timeout 10  # Sample MQTT for 10s\n      ${name} --device-id abc123 --mqtt --mqtt-request-status 500  # Request status after 500ms\n      ${name} --device-id abc123 --mqtt --mqtt-request-events 2000  # Request events after 2s\n`
   })
   process.exit(0)
 }
@@ -58,7 +68,9 @@ const { clientId, refreshToken, accessToken, envFile } = loadTokensFromEnv(args)
 const deviceId = args.values['device-id'] ? String(args.values['device-id']) : null
 const getStatus = Boolean(args.values['status'])
 const useMqtt = Boolean(args.values['mqtt'])
-const mqttStopAfter = args.values['mqtt-stop-after-seconds'] ? Number(args.values['mqtt-stop-after-seconds']) : null
+const mqttStopAfter = args.values['mqtt-timeout'] ? Number(args.values['mqtt-timeout']) : null
+const mqttRequestStatus = useMqtt && args.values['mqtt-request-status'] !== undefined ? Number(args.values['mqtt-request-status']) : null
+const mqttRequestEvents = useMqtt && args.values['mqtt-request-events'] !== undefined ? Number(args.values['mqtt-request-events']) : null
 
 if (getStatus && !deviceId) {
   console.error('❌ --status flag requires --device-id')
@@ -73,8 +85,8 @@ if (useMqtt && !deviceId) {
 }
 
 if (mqttStopAfter && !useMqtt) {
-  console.error('❌ --mqtt-stop-after-seconds requires --mqtt')
-  console.error('Usage: yoto-devices --device-id abc123 --mqtt --mqtt-stop-after-seconds 10')
+  console.error('❌ --mqtt-timeout requires --mqtt')
+  console.error('Usage: yoto-devices --device-id abc123 --mqtt --mqtt-timeout 10')
   process.exit(1)
 }
 
@@ -93,12 +105,14 @@ async function main () {
     if (deviceId) {
       if (getStatus) {
         // Get device status
-        console.log(`\nFetching status for device: ${deviceId}\n`)
+        console.log(`\n📡 GET /device-v2/devices/${deviceId}/status`)
+        console.log(`Fetching status for device: ${deviceId}\n`)
         const status = await client.getDeviceStatus({ deviceId })
         console.dir(status, { depth: null, colors: true })
       } else {
         // Get specific device from list
-        console.log(`\nFetching device: ${deviceId}\n`)
+        console.log('\n📡 GET /device-v2/devices/mine')
+        console.log(`Fetching device: ${deviceId}\n`)
         const devicesResponse = await client.getDevices()
         const device = devicesResponse.devices.find(d => d.deviceId === deviceId)
 
@@ -106,13 +120,21 @@ async function main () {
           console.log('Device:')
           console.dir(device, { depth: null, colors: true })
 
+          // Get device status
+          console.log(`\n📡 GET /device-v2/devices/${deviceId}/status`)
+          console.log('Device Status:')
+          const status = await client.getDeviceStatus({ deviceId })
+          console.dir(status, { depth: null, colors: true })
+
           // Get device config
-          console.log('\nDevice Config:')
+          console.log(`\n📡 GET /device-v2/devices/${deviceId}/config`)
+          console.log('Device Config:')
           const config = await client.getDeviceConfig({ deviceId })
           console.dir(config, { depth: null, colors: true })
 
           // Get device shortcuts
-          console.log('\nDevice Shortcuts:')
+          console.log(`\n📡 GET /device-v2/devices/${deviceId}/config`)
+          console.log('Device Shortcuts:')
           const shortcuts = await client.getDeviceConfig({ deviceId })
           if (shortcuts.device?.shortcuts) {
             console.dir(shortcuts.device.shortcuts, { depth: null, colors: true })
@@ -126,7 +148,8 @@ async function main () {
       }
     } else {
       // Get all devices
-      console.log('\nFetching all devices...\n')
+      console.log('\n📡 GET /device-v2/devices/mine')
+      console.log('Fetching all devices...\n')
       const devicesResponse = await client.getDevices()
       console.dir(devicesResponse, { depth: null, colors: true })
     }
@@ -145,43 +168,152 @@ async function main () {
       // Setup message handlers
       mqttClient.on('connected', () => {
         console.log('✅ Connected to MQTT broker')
-        console.log(`📡 Subscribed to device/${deviceId}/*`)
-        console.log('\n👂 Listening for messages... (Ctrl+C to stop)\n')
+        console.log('📡 Subscribed to topics:')
+        console.log(`   • device/${deviceId}/data/events (playback events)`)
+        console.log(`   • device/${deviceId}/data/status (regular status)`)
+        console.log(`   • device/${deviceId}/status (legacy status - lifecycle events)`)
+        console.log(`   • device/${deviceId}/response (command responses)`)
+        console.log('\n👂 Listening for messages... (Ctrl+C to stop)')
+        console.log('\n⌨️  Interactive Controls:')
+        console.log('   s = Request status')
+        console.log('   e = Request events')
+        console.log('   Enter = Insert dated separator line')
+        console.log('   q = Quit\n')
 
         if (mqttStopAfter) {
           console.log(`⏱️  Will auto-disconnect after ${mqttStopAfter} seconds\n`)
         }
 
-        // Request initial status and events after a delay to ensure subscriptions are ready
-        setTimeout(() => {
-          mqttClient.requestStatus().catch(err => {
-            console.error('⚠️  Failed to request status:', err.message)
-          })
-          mqttClient.requestEvents().catch(err => {
-            console.error('⚠️  Failed to request events:', err.message)
-          })
-        }, 1000)
+        // Request initial status if configured
+        if (mqttRequestStatus !== null) {
+          console.log(`⏱️  Will request status after ${mqttRequestStatus}ms`)
+          setTimeout(() => {
+            const requestId = `auto-status-${Date.now()}`
+            mqttClient.requestStatus(requestId).catch(err => {
+              console.error('⚠️  Failed to request status:', err.message)
+            })
+          }, mqttRequestStatus)
+        }
+
+        // Request initial events if configured
+        if (mqttRequestEvents !== null) {
+          console.log(`⏱️  Will request events after ${mqttRequestEvents}ms`)
+          setTimeout(() => {
+            const requestId = `auto-events-${Date.now()}`
+            mqttClient.requestEvents(requestId).catch(err => {
+              console.error('⚠️  Failed to request events:', err.message)
+            })
+          }, mqttRequestEvents)
+        }
+
+        if (mqttRequestStatus === null && mqttRequestEvents === null) {
+          console.log('💡 Tip: Use --mqtt-request-status or --mqtt-request-events to request initial data')
+        }
+
+        console.log() // Add blank line for spacing
+
+        // Setup interactive keyboard input
+        readline.emitKeypressEvents(process.stdin)
+        if (process.stdin.isTTY) {
+          process.stdin.setRawMode(true)
+        }
+
+        process.stdin.on('keypress', (_str, key) => {
+          if (key.ctrl && key.name === 'c') {
+            cleanup()
+            return
+          }
+
+          if (key.name === 's') {
+            const requestId = `interactive-${Date.now()}`
+            console.log(`\n⌨️  Requesting status [${requestId}]...`)
+            mqttClient.requestStatus(requestId).catch(err => {
+              console.error('⚠️  Failed to request status:', err.message)
+            })
+          } else if (key.name === 'e') {
+            const requestId = `interactive-${Date.now()}`
+            console.log(`\n⌨️  Requesting events [${requestId}]...`)
+            mqttClient.requestEvents(requestId).catch(err => {
+              console.error('⚠️  Failed to request events:', err.message)
+            })
+          } else if (key.name === 'return') {
+            const timestamp = new Date().toISOString()
+            console.log(`\n${'─'.repeat(60)}`)
+            console.log(`📍 MARKER [${timestamp}]`)
+            console.log(`${'─'.repeat(60)}\n`)
+          } else if (key.name === 'q') {
+            cleanup()
+          }
+        })
       })
 
-      mqttClient.on('events', (message) => {
+      mqttClient.on('events', (topic, payload) => {
         const timestamp = new Date().toISOString()
         console.log(`\n📨 EVENTS MESSAGE [${timestamp}]:`)
+        console.log(`Topic: ${topic}`)
         console.log('─'.repeat(60))
-        console.dir(message, { depth: null, colors: true })
+        console.dir(payload, { depth: null, colors: true })
       })
 
-      mqttClient.on('status', (message) => {
+      mqttClient.on('status', (topic, payload) => {
         const timestamp = new Date().toISOString()
         console.log(`\n📊 STATUS MESSAGE [${timestamp}]:`)
+        console.log(`Topic: ${topic}`)
+        console.log('─'.repeat(60))
+        console.dir(payload, { depth: null, colors: true })
+      })
+
+      mqttClient.on('status-legacy', (topic, payload) => {
+        const timestamp = new Date().toISOString()
+        console.log(`\n🔧 STATUS-LEGACY MESSAGE [${timestamp}]:`)
+        console.log(`Topic: ${topic}`)
         console.log('─'.repeat(60))
-        console.dir(message, { depth: null, colors: true })
+
+        // Highlight lifecycle fields
+        if (payload.status?.shutDown) {
+          const shutDown = payload.status.shutDown
+          if (shutDown === 'nA') {
+            console.log('🟢 Device Status: RUNNING (shutDown: "nA")')
+          } else {
+            console.log(`🔴 Device Status: SHUTDOWN (shutDown: "${shutDown}")`)
+          }
+        }
+        if (payload.status?.upTime !== undefined) {
+          console.log(`⏱️  Uptime: ${payload.status.upTime}s`)
+        }
+        if (payload.status?.wifiStrength !== undefined) {
+          console.log(`📶 WiFi: ${payload.status.wifiStrength} dBm`)
+        }
+        if (payload.status?.battery !== undefined) {
+          console.log(`🔋 Battery: ${payload.status.battery} mV`)
+        }
+        if (payload.status?.temp !== undefined) {
+          const tempStr = String(payload.status.temp)
+          const parsedTemp = parseTemperature(payload.status.temp)
+          if (parsedTemp !== null) {
+            console.log(`🌡️  Temperature: ${parsedTemp}°C (raw: "${tempStr}")`)
+          } else {
+            console.log(`🌡️  Temperature: ${tempStr} (unavailable)`)
+          }
+        }
+        console.log('─'.repeat(60))
+        console.dir(payload, { depth: null, colors: true })
       })
 
-      mqttClient.on('response', (message) => {
+      mqttClient.on('response', (topic, payload) => {
         const timestamp = new Date().toISOString()
         console.log(`\n✉️  RESPONSE MESSAGE [${timestamp}]:`)
+        console.log(`Topic: ${topic}`)
         console.log('─'.repeat(60))
-        console.dir(message, { depth: null, colors: true })
+        console.dir(payload, { depth: null, colors: true })
+      })
+
+      mqttClient.on('unknown', (topic, payload) => {
+        const timestamp = new Date().toISOString()
+        console.log(`\n❓ UNKNOWN MESSAGE [${timestamp}]:`)
+        console.log(`Topic: ${topic}`)
+        console.log('─'.repeat(60))
+        console.dir(payload, { depth: null, colors: true })
       })
 
       mqttClient.on('disconnected', () => {
@@ -200,6 +332,12 @@ async function main () {
       const cleanup = async () => {
         console.log('\n\n🛑 Shutting down...')
         try {
+          // Restore terminal
+          if (process.stdin.isTTY) {
+            process.stdin.setRawMode(false)
+          }
+          process.stdin.pause()
+
           await mqttClient.disconnect()
           console.log('✅ Disconnected cleanly')
           process.exit(0)

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

@@ -49,5 +49,5 @@ export function handleCliError(error: any): void;
  */
 export function printHeader(title: string): void;
 import type { ArgscloptsParseArgsOptionsConfig } from 'argsclopts';
-import { YotoClient } from '../../index.js';
+import { YotoClient } from '../../lib/api-client.js';
 //# sourceMappingURL=cli-helpers.d.ts.map

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,gBAAgB"}
+{"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"}

package/bin/lib/cli-helpers.js

@@ -2,7 +2,7 @@
  * @import { ArgscloptsParseArgsOptionsConfig } from 'argsclopts'
  */
 
-import { YotoClient } from '../../index.js'
+import { YotoClient } from '../../lib/api-client.js'
 import { DEFAULT_CLIENT_ID } from '../../lib/api-endpoints/constants.js'
 import { saveTokensToEnv } from './token-helpers.js'
 
@@ -39,7 +39,7 @@ export function loadEnvFile (envFile) {
   const envPath = envFile || '.env'
   try {
     process.loadEnvFile(envPath)
-  } catch (err) {
+  } catch (_err) {
     // File doesn't exist or can't be loaded, that's okay
   }
   return envPath
@@ -87,10 +87,10 @@ export function createYotoClient ({ clientId, refreshToken, accessToken, outputF
     onTokenRefresh: async (tokens) => {
       // Save tokens if they refresh during operation
       await saveTokensToEnv(outputFile, {
-        access_token: tokens.accessToken,
-        refresh_token: tokens.refreshToken,
+        access_token: tokens.updatedAccessToken,
+        refresh_token: tokens.updatedRefreshToken,
         token_type: 'Bearer',
-        expires_in: tokens.expiresAt - Math.floor(Date.now() / 1000)
+        expires_in: tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
       }, tokens.clientId)
     },
     onRefreshStart: () => {

package/bin/refresh-token.js

@@ -6,7 +6,7 @@
 
 import { printHelpText } from 'argsclopts'
 import { parseArgs } from 'node:util'
-import { YotoClient } from '../index.js'
+import { YotoClient } from '../lib/api-client.js'
 import { pkg } from '../lib/pkg.cjs'
 import { saveTokensToEnv } from './lib/token-helpers.js'
 import {
@@ -91,10 +91,10 @@ async function main () {
         // This will be called after successful refresh
         // Convert RefreshSuccessEvent to YotoTokenResponse format
         await saveTokensToEnv(outputFile, {
-          access_token: tokens.accessToken,
-          refresh_token: tokens.refreshToken,
+          access_token: tokens.updatedAccessToken,
+          refresh_token: tokens.updatedRefreshToken,
           token_type: 'Bearer',
-          expires_in: tokens.expiresAt - Math.floor(Date.now() / 1000)
+          expires_in: tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
         }, tokens.clientId)
       },
       onRefreshStart: () => {
@@ -136,8 +136,8 @@ async function main () {
     console.log('\n✅ Token refresh successful!')
 
     // Show expiration info
-    const expiresDate = new Date(tokens.expiresAt * 1000)
-    const timeRemaining = tokens.expiresAt - Math.floor(Date.now() / 1000)
+    const expiresDate = new Date(tokens.updatedExpiresAt * 1000)
+    const timeRemaining = tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
     const minutes = Math.floor(timeRemaining / 60)
     const hours = Math.floor(minutes / 60)
 

package/bin/token-info.js

@@ -298,10 +298,10 @@ try {
       // Save tokens if they refresh during inspection
       console.log('\n⚠️  Token was refreshed during inspection! Saving...')
       await saveTokensToEnv(outputFile, {
-        access_token: tokens.accessToken,
-        refresh_token: tokens.refreshToken,
+        access_token: tokens.updatedAccessToken,
+        refresh_token: tokens.updatedRefreshToken,
         token_type: 'Bearer',
-        expires_in: tokens.expiresAt - Math.floor(Date.now() / 1000)
+        expires_in: tokens.updatedExpiresAt - Math.floor(Date.now() / 1000)
       }, tokens.clientId)
       console.log(`✅ Updated tokens saved to ${outputFile}`)
     },