yoto-nodejs-client 0.0.10 → 0.0.11

package/bin/auth.js

@@ -108,7 +108,7 @@ async function main () {
     if (error.message === 'Device code has expired') {
       console.error('\n❌ Device code has expired. Please run the command again.')
       process.exit(1)
-    } else if (error.body?.error === 'expired_token') {
+    } else if (error.jsonBody?.error === 'expired_token') {
       console.error('\n❌ Device code has expired. Please run the command again.')
       process.exit(1)
     } else {

package/bin/device-model.js

@@ -256,19 +256,22 @@ async function main () {
         // Show only changed fields
         console.log(`\n${playbackIcon}  PLAYBACK UPDATE [${timestamp}]: (${changedFields.size} change${changedFields.size === 1 ? '' : 's'})`)
         for (const field of changedFields) {
+          if (field === 'trackLength' && changedFields.has('position')) {
+            continue
+          }
+
           let value = playback[field]
           if (field === 'position' || field === 'trackLength') {
-            // Show position/trackLength together if either changed
+            // Show position/trackLength together if either changed.
             value = `${playback.position}/${playback.trackLength}s`
             console.log(`   position/trackLength: ${value}`)
-            // Skip if we already printed this combo
-            if (field === 'trackLength') continue
-          } else {
-            if (field === 'cardDurationSeconds' && typeof value === 'number') {
-              value = `${value}s`
-            }
-            console.log(`   ${field}: ${value}`)
+            continue
+          }
+
+          if (field === 'cardDurationSeconds' && typeof value === 'number') {
+            value = `${value}s`
           }
+          console.log(`   ${field}: ${value}`)
         }
       } else {
         console.log(`\n${playbackIcon}  PLAYBACK UPDATE [${timestamp}]: (no changes)`)

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,CAwBtB;AAED;;;GAGG;AACH,sCAFW,GAAG,QAyBb;AAED;;;GAGG;AACH,mCAFW,MAAM,QAKhB;sDA5IoD,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,QA4Bb;AAED;;;GAGG;AACH,mCAFW,MAAM,QAKhB;sDA/IoD,YAAY;2BAGtC,yBAAyB"}

package/bin/lib/cli-helpers.js

@@ -116,17 +116,20 @@ export function handleCliError (error) {
     console.error(`Status Code: ${error.statusCode}`)
   }
 
-  if (error.body?.error) {
-    console.error(`Error: ${error.body.error}`)
+  if (error.jsonBody?.error) {
+    console.error(`Error: ${error.jsonBody.error}`)
   }
 
-  if (error.body?.error_description) {
-    console.error(`Description: ${error.body.error_description}`)
+  if (error.jsonBody?.error_description) {
+    console.error(`Description: ${error.jsonBody.error_description}`)
   }
 
-  if (error.body && typeof error.body === 'object') {
+  if (error.jsonBody && typeof error.jsonBody === 'object') {
     console.error('\nFull error response:')
-    console.error(JSON.stringify(error.body, null, 2))
+    console.error(JSON.stringify(error.jsonBody, null, 2))
+  } else if (error.textBody) {
+    console.error('\nRaw error response:')
+    console.error(error.textBody)
   }
 
   process.exit(1)

package/lib/api-endpoints/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["auth.js"],"names":[],"mappings":"AAWA;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;;;;GAgBG;AACH,4JAbG;IAA0B,QAAQ;IACR,KAAK;IACS,YAAY,EAA3C,qBAAqB;IACL,QAAQ,EAAxB,MAAM;IACU,WAAW,EAA3B,MAAM;IACU,KAAK,EAArB,MAAM;IACW,KAAK;IACQ,MAAM;IACnB,MAAM;IACN,aAAa;IACS,mBAAmB;CACnE,GAAS,MAAM,CA+BjB;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,4KAdG;IAAqC,SAAS,EAArC,kBAAkB;IACD,IAAI;IACJ,WAAW;IACX,YAAY;IACZ,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,YAAY;IACZ,UAAU;IACV,QAAQ;IACR,SAAS;IACD,cAAc;;;CAChD,GAAS,OAAO,CAAC,iBAAiB,CAAC,CAoErC;AAED;;;;;;;;;GASG;AAEH;;;;;;;;;;GAUG;AACH,4FAPG;IAAyB,QAAQ,EAAxB,MAAM;IACW,KAAK;IACL,QAAQ;IACR,SAAS;IACD,cAAc;;;CAChD,GAAS,OAAO,CAAC,sBAAsB,CAAC,CA+B1C;AAED;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,mHAVG;IAAwB,UAAU,EAA1B,MAAM;IACU,QAAQ,EAAxB,MAAM;IACW,QAAQ;IACR,eAAe;IACf,SAAS;IACD,cAAc;;;CAC/C,GAAU,OAAO,CAAC,oBAAoB,CAAC,CAuDzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,8IArCG;IAAwB,UAAU,EAA1B,MAAM;IACU,QAAQ,EAAxB,MAAM;IACW,QAAQ;IACR,eAAe;IACf,SAAS;IACT,SAAS;IACD,cAAc;;;IACU,MAAM,aAA9C,oBAAoB,KAAK,IAAI;CAC9C,GAAU,OAAO,CAAC,iBAAiB,CAAC,CA0EtC;;;;oCA5ZY,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,YAAY,GAAG,eAAe,GAAG,gBAAgB,GAAG,qBAAqB;;;;kCAKzG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,gBAAgB;;;;2CAK/C,MAAM,GAAG,OAAO;;;;iCAKhB,oBAAoB,GAAG,eAAe,GAAG,oBAAoB,GAAG,OAAO,sBAAsB;;kBAsD5F,MAAM;gBACN,MAAM;gBACN,MAAM;oBACN,MAAM;YACN,MAAM;eACN,MAAM;iBACN,MAAM;;;;;;iBA4FN,MAAM;;;;eACN,MAAM;;;;sBACN,MAAM;;;;gCACN,MAAM;;;;gBACN,MAAM;;;;cACN,MAAM;;;;;;;;;YAgDN,SAAS;;;;cACT,MAAM;;;;;;;;;YAMN,WAAW;;;;cACX,MAAM;;;;;;;;;YAMN,SAAS;;;;YACT,iBAAiB;;;;;mCAKlB,qBAAqB,GAAG,sBAAsB,GAAG,qBAAqB;uCAxPK,gBAAgB"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["auth.js"],"names":[],"mappings":"AAWA;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;;;;GAgBG;AACH,4JAbG;IAA0B,QAAQ;IACR,KAAK;IACS,YAAY,EAA3C,qBAAqB;IACL,QAAQ,EAAxB,MAAM;IACU,WAAW,EAA3B,MAAM;IACU,KAAK,EAArB,MAAM;IACW,KAAK;IACQ,MAAM;IACnB,MAAM;IACN,aAAa;IACS,mBAAmB;CACnE,GAAS,MAAM,CA+BjB;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,4KAdG;IAAqC,SAAS,EAArC,kBAAkB;IACD,IAAI;IACJ,WAAW;IACX,YAAY;IACZ,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,YAAY;IACZ,UAAU;IACV,QAAQ;IACR,SAAS;IACD,cAAc;;;CAChD,GAAS,OAAO,CAAC,iBAAiB,CAAC,CA8ErC;AAED;;;;;;;;;GASG;AAEH;;;;;;;;;;GAUG;AACH,4FAPG;IAAyB,QAAQ,EAAxB,MAAM;IACW,KAAK;IACL,QAAQ;IACR,SAAS;IACD,cAAc;;;CAChD,GAAS,OAAO,CAAC,sBAAsB,CAAC,CA+B1C;AAED;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,mHAVG;IAAwB,UAAU,EAA1B,MAAM;IACU,QAAQ,EAAxB,MAAM;IACW,QAAQ;IACR,eAAe;IACf,SAAS;IACD,cAAc;;;CAC/C,GAAU,OAAO,CAAC,oBAAoB,CAAC,CAuDzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,8IArCG;IAAwB,UAAU,EAA1B,MAAM;IACU,QAAQ,EAAxB,MAAM;IACW,QAAQ;IACR,eAAe;IACf,SAAS;IACT,SAAS;IACD,cAAc;;;IACU,MAAM,aAA9C,oBAAoB,KAAK,IAAI;CAC9C,GAAU,OAAO,CAAC,iBAAiB,CAAC,CA0EtC;;;;oCAtaY,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,YAAY,GAAG,eAAe,GAAG,gBAAgB,GAAG,qBAAqB;;;;kCAKzG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,gBAAgB;;;;2CAK/C,MAAM,GAAG,OAAO;;;;iCAKhB,oBAAoB,GAAG,eAAe,GAAG,oBAAoB,GAAG,OAAO,sBAAsB;;kBAsD5F,MAAM;gBACN,MAAM;gBACN,MAAM;oBACN,MAAM;YACN,MAAM;eACN,MAAM;iBACN,MAAM;;;;;;iBAsGN,MAAM;;;;eACN,MAAM;;;;sBACN,MAAM;;;;gCACN,MAAM;;;;gBACN,MAAM;;;;cACN,MAAM;;;;;;;;;YAgDN,SAAS;;;;cACT,MAAM;;;;;;;;;YAMN,WAAW;;;;cACX,MAAM;;;;;;;;;YAMN,SAAS;;;;YACT,iBAAiB;;;;;mCAKlB,qBAAqB,GAAG,sBAAsB,GAAG,qBAAqB;uCAlQK,gBAAgB"}

package/lib/api-endpoints/auth.js

@@ -158,14 +158,24 @@ export async function exchangeToken ({
   // For device_code grant, always parse JSON first so error details are available
   // 403 errors with authorization_pending/slow_down are expected during polling
   if (grantType === DEVICE_CODE_GRANT_TYPE) {
-    /** @type {any} */
-    const rawResponse = await response.body.json()
+    const textBody = await response.body.text()
+    let jsonBody = null
+
+    try {
+      jsonBody = JSON.parse(textBody)
+    } catch {
+      jsonBody = null
+    }
 
     if (response.statusCode > 299) {
-      throw new YotoAPIError(response, rawResponse, { grantType })
+      throw new YotoAPIError(response, textBody, jsonBody, { grantType })
+    }
+
+    if (!jsonBody || typeof jsonBody !== 'object') {
+      throw new Error('OAuth token response did not contain valid JSON')
     }
 
-    const responseBody = /** @type {YotoTokenResponse} */ (rawResponse)
+    const responseBody = /** @type {YotoTokenResponse} */ (jsonBody)
     return responseBody
   }
 
@@ -303,7 +313,7 @@ export async function pollForDeviceToken ({
     }
   } catch (err) {
     const error = /** @type {any} */ (err)
-    const errorCode = error.body?.error
+    const errorCode = error.jsonBody?.error
 
     // Handle recoverable polling states
     if (errorCode === 'authorization_pending') {

package/lib/api-endpoints/auth.test.js

@@ -19,7 +19,7 @@ test('exchangeToken - refresh flow', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode, 'Error should have statusCode')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )
@@ -40,7 +40,7 @@ test('pollForDeviceToken', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         // @ts-expect-error
-        assert.strictEqual(err.body?.error, 'invalid_grant', 'Should be invalid_grant error')
+        assert.strictEqual(err.jsonBody?.error, 'invalid_grant', 'Should be invalid_grant error')
         assert.ok(err.statusCode, 'Error should have statusCode')
         return true
       }
@@ -62,7 +62,7 @@ test('pollForDeviceToken', async (t) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         // Will get invalid_grant for malformed codes
         // @ts-expect-error
-        assert.ok(err.body?.error, 'Should have error code')
+        assert.ok(err.jsonBody?.error, 'Should have error code')
         return true
       }
     )

package/lib/api-endpoints/content.test.js

@@ -79,7 +79,7 @@ test('getUserMyoContent', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )

package/lib/api-endpoints/devices.test.js

@@ -43,7 +43,7 @@ test('getDevices', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )
@@ -185,7 +185,7 @@ test('getDeviceStatus', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.equal(err.statusCode, 404, 'Should return 404 for invalid device ID')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )
@@ -205,7 +205,7 @@ test('getDeviceStatus', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )
@@ -455,7 +455,7 @@ test('getDeviceConfig', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode >= 400, 'Should return error status code for invalid device ID')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )
@@ -475,7 +475,7 @@ test('getDeviceConfig', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )

package/lib/api-endpoints/family-library-groups.test.js

@@ -53,7 +53,7 @@ test('getGroups', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )

package/lib/api-endpoints/family.test.js

@@ -37,7 +37,7 @@ test('getFamilyImages', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )
@@ -164,7 +164,7 @@ test('getAFamilyImage', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )

package/lib/api-endpoints/helpers.d.ts

@@ -46,12 +46,14 @@ export function handleBadResponse(response: Dispatcher.ResponseData, extra?: any
 export class YotoAPIError extends Error {
     /**
      * @param  {Dispatcher.ResponseData} response A undici Response
-     * @param  {string | object} body response body
+     * @param  {string} textBody response body as text
+     * @param  {unknown | null} jsonBody parsed response body (or null if invalid JSON)
      * @param  {any} [extra] any extra info to attach to the error
      */
-    constructor(response: Dispatcher.ResponseData, body: string | object, extra?: any);
+    constructor(response: Dispatcher.ResponseData, textBody: string, jsonBody: unknown | null, extra?: any);
     /** @type { number } */ statusCode: number;
-    /** @type {string | object } */ body: string | object;
+    /** @type {string} */ textBody: string;
+    /** @type {unknown | null} */ jsonBody: unknown | null;
     /** @type {any} */ extra: any;
 }
 /**

package/lib/api-endpoints/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["helpers.js"],"names":[],"mappings":"AAOA;;;GAGG;AAEH;;;;GAIG;AACH,yCAHG;IAAyB,SAAS;IACD,cAAc;;;CACjD;;;EAWA;AAED;;;;GAIG;AACH,sEAHG;IAAwB,WAAW,EAA1B,MAAM;IACS,SAAS;CACnC;;;;EAMA;AAED;;;;;;;GAOG;AACH,iDAJW,cAAc,mBACd,cAAc,GACZ,MAAM,CAoBlB;AAED;;;GAGG;AACH,4CAHY,uBAAuB,UACvB,GAAG,iBAWd;AAED;IAKE;;;;OAIG;IACH,sBAJY,uBAAuB,QACvB,MAAM,GAAG,MAAM,UACf,GAAG,EAUd;IAjBD,uBAAuB,CAAC,YAAZ,MAAM,CAAgB;IAClC,+BAA+B,CAAC,MAArB,MAAM,GAAG,MAAM,CAAU;IACpC,kBAAkB,CAAC,OAAR,GAAG,CAAU;CAgBzB;;;;6BA9FY,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;gCARxB,QAAQ;6BACX,QAAQ"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["helpers.js"],"names":[],"mappings":"AAOA;;;GAGG;AAEH;;;;GAIG;AACH,yCAHG;IAAyB,SAAS;IACD,cAAc;;;CACjD;;;EAWA;AAED;;;;GAIG;AACH,sEAHG;IAAwB,WAAW,EAA1B,MAAM;IACS,SAAS;CACnC;;;;EAMA;AAED;;;;;;;GAOG;AACH,iDAJW,cAAc,mBACd,cAAc,GACZ,MAAM,CAoBlB;AAED;;;GAGG;AACH,4CAHY,uBAAuB,UACvB,GAAG,iBAed;AAED;IAME;;;;;OAKG;IACH,sBALY,uBAAuB,YACvB,MAAM,YACN,OAAO,GAAG,IAAI,UACd,GAAG,EAWd;IApBD,uBAAuB,CAAC,YAAZ,MAAM,CAAgB;IAClC,qBAAqB,CAAC,UAAX,MAAM,CAAa;IAC9B,6BAA6B,CAAC,UAAnB,OAAO,GAAG,IAAI,CAAa;IACtC,kBAAkB,CAAC,OAAR,GAAG,CAAU;CAkBzB;;;;6BArGY,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;gCARxB,QAAQ;6BACX,QAAQ"}

package/lib/api-endpoints/helpers.js

@@ -73,32 +73,39 @@ export function mergeRequestOptions (baseOptions, requestOptions) {
  */
 export async function handleBadResponse (response, extra) {
   if (response.statusCode > 299) {
-    const contentTypeHeaders = response.headers['Content-Type']
-    const contentType = Array.isArray(contentTypeHeaders) ? contentTypeHeaders[0] : contentTypeHeaders
-    const isJSON = contentType && contentType.match(/json/)
-    /** @type { any } */
-    const body = isJSON ? await response.body.json() : await response.body.text()
-    throw new YotoAPIError(response, body, extra)
+    const textBody = await response.body.text()
+    let jsonBody = null
+
+    try {
+      jsonBody = JSON.parse(textBody)
+    } catch {
+      jsonBody = null
+    }
+
+    throw new YotoAPIError(response, textBody, jsonBody, extra)
   }
 }
 
 export class YotoAPIError extends Error {
   /** @type { number } */ statusCode
-  /** @type {string | object } */ body
+  /** @type {string} */ textBody
+  /** @type {unknown | null} */ jsonBody
   /** @type {any} */ extra
 
   /**
    * @param  {Dispatcher.ResponseData} response A undici Response
-   * @param  {string | object} body response body
+   * @param  {string} textBody response body as text
+   * @param  {unknown | null} jsonBody parsed response body (or null if invalid JSON)
    * @param  {any} [extra] any extra info to attach to the error
    */
-  constructor (response, body, extra) {
+  constructor (response, textBody, jsonBody, extra) {
     super('Unexpected response status code')
     this.name = this.constructor.name
     Error.captureStackTrace(this, this.constructor)
 
     this.statusCode = response.statusCode
-    this.body = body
+    this.textBody = textBody
+    this.jsonBody = jsonBody
     this.extra = extra
   }
 }

package/lib/api-endpoints/icons.test.js

@@ -50,7 +50,7 @@ test('getPublicIcons', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )
@@ -96,7 +96,7 @@ test('getUserIcons', async (t) => {
       (err) => {
         assert.ok(err instanceof YotoAPIError, 'Should throw YotoAPIError')
         assert.ok(err.statusCode === 401 || err.statusCode === 403, 'Should return 401 or 403 for invalid token')
-        assert.ok(err.body, 'Error should have body')
+        assert.ok(err.jsonBody, 'Error should have jsonBody')
         return true
       }
     )

package/lib/token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["token.js"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;GASG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AAEH;IAwBE;;OAEG;IACH,oFAFW,oBAAoB,EAuB9B;IAED;;;;OAIG;IACH,kBAHa,OAAO,CAAC,MAAM,CAAC,CAkB3B;IAyGD;;OAEG;IACH,wBAGC;IAED;;OAEG;IACH,yBAQC;IAED;;;OAGG;IACH,wBAFa,OAAO,CAInB;IAED;;;OAGG;IACH,gBAFa,MAAM,CAIlB;IAED;;;;OAIG;IACH,mBAFa,MAAM,CAIlB;IAiED;;;OAGG;IACH,WAFa,OAAO,CASnB;IAED;;;OAGG;IACH,gBAFa,MAAM,CAIlB;IAED;;;OAGG;IACH,oBAFa,MAAM,CAKlB;IAED;;;;;OAKG;IACH,WAHa,OAAO,CAAC,mBAAmB,CAAC,CAUxC;;CACF;;;;;cAzXa,MAAM;;;;kBACN,MAAM;;;;iBACN,MAAM;;;;oBACN,qBAAqB;;;;oBACrB,MAAM;;;;;;;oCAQP,CAAC,mBAAmB,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;;;;;cAKjE,MAAM;;;;wBACN,MAAM;;;;yBACN,MAAM;;;;sBACN,MAAM;;;;qBACN,MAAM;;;;sBACN,MAAM;;;;mBACN,MAAM;;;;;uCAKP;IACZ,eAAmB,EAAE,EAAE,CAAC;IACxB,iBAAqB,EAAE,CAAC,mBAAmB,CAAC,CAAC;IAC7C,eAAmB,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7B,SAAa,EAAE,CAAC,KAAK,CAAC,CAAA;CACnB;6BA1CyB,aAAa"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["token.js"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;GASG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AAEH;IAwBE;;OAEG;IACH,oFAFW,oBAAoB,EAuB9B;IAED;;;;OAIG;IACH,kBAHa,OAAO,CAAC,MAAM,CAAC,CAkB3B;IA2GD;;OAEG;IACH,wBAGC;IAED;;OAEG;IACH,yBAQC;IAED;;;OAGG;IACH,wBAFa,OAAO,CAInB;IAED;;;OAGG;IACH,gBAFa,MAAM,CAIlB;IAED;;;;OAIG;IACH,mBAFa,MAAM,CAIlB;IAiED;;;OAGG;IACH,WAFa,OAAO,CASnB;IAED;;;OAGG;IACH,gBAFa,MAAM,CAIlB;IAED;;;OAGG;IACH,oBAFa,MAAM,CAKlB;IAED;;;;;OAKG;IACH,WAHa,OAAO,CAAC,mBAAmB,CAAC,CAUxC;;CACF;;;;;cA3Xa,MAAM;;;;kBACN,MAAM;;;;iBACN,MAAM;;;;oBACN,qBAAqB;;;;oBACrB,MAAM;;;;;;;oCAQP,CAAC,mBAAmB,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;;;;;cAKjE,MAAM;;;;wBACN,MAAM;;;;yBACN,MAAM;;;;sBACN,MAAM;;;;qBACN,MAAM;;;;sBACN,MAAM;;;;mBACN,MAAM;;;;;uCAKP;IACZ,eAAmB,EAAE,EAAE,CAAC;IACxB,iBAAqB,EAAE,CAAC,mBAAmB,CAAC,CAAC;IAC7C,eAAmB,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7B,SAAa,EAAE,CAAC,KAAK,CAAC,CAAA;CACnB;6BA1CyB,aAAa"}

package/lib/token.js

@@ -214,12 +214,14 @@ export class RefreshableToken extends EventEmitter {
         'refresh_token_expired'
       ]
 
-      if (error.body?.error && invalidRefreshErrors.includes(error.body.error)) {
+      const errorCode = error.jsonBody?.error
+      if (errorCode && invalidRefreshErrors.includes(errorCode)) {
         // Mark this token as permanently invalid
         this.#invalid = true
         this.#clearAutoRefreshTimeout()
         const statusCode = error.statusCode ? ` (${error.statusCode})` : ''
-        const invalidError = new Error(`Refresh token is invalid or expired${statusCode}: ${error.body.error}${error.body.error_description ? ` - ${error.body.error_description}` : ''}`)
+        const errorDescription = error.jsonBody?.error_description
+        const invalidError = new Error(`Refresh token is invalid or expired${statusCode}: ${errorCode}${errorDescription ? ` - ${errorDescription}` : ''}`)
         this.emit('invalid', invalidError)
         throw invalidError
       }

package/lib/yoto-device.d.ts.map

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

package/lib/yoto-device.js

@@ -20,6 +20,7 @@
 import { EventEmitter } from 'events'
 import fastq from 'fastq'
 import QuickLRU from 'quick-lru'
+import { YotoAPIError } from './api-endpoints/helpers.js'
 import { parseTemperature } from './helpers/temperature.js'
 import { detectPowerState } from './helpers/power-state.js'
 import { typedKeys } from './helpers/typed-keys.js'
@@ -1467,12 +1468,16 @@ export class YotoDeviceModel extends EventEmitter {
   #updateStatusFromFullStatus (fullStatus) {
     let statusChanged = false
     let configChanged = false
+    let playbackChanged = false
     const wasOnline = this.#deviceOnline
-    const { status, config } = this.#state
+    const { status, config, playback } = this.#state
+    const previousPlaybackCardId = playback.cardId
     /** @type {Set<keyof YotoDeviceStatus>} */
     const changedFields = new Set()
     /** @type {Set<keyof YotoDeviceModelConfig>} */
     const configChangedFields = new Set()
+    /** @type {Set<keyof YotoPlaybackState>} */
+    const playbackChangedFields = new Set()
 
     /**
      * Handler function for each status field
@@ -1837,6 +1842,20 @@ export class YotoDeviceModel extends EventEmitter {
       handleField(key, fullStatus)
     }
 
+    if (changedFields.has('activeCardId') && previousPlaybackCardId !== status.activeCardId) {
+      playback.cardId = status.activeCardId
+      playbackChangedFields.add('cardId')
+      playbackChanged = true
+
+      if (clearCardCachePlaybackFields(playback, playbackChangedFields)) {
+        playbackChanged = true
+      }
+
+      if (this.#applyCardCacheToPlayback(playback.cardId, playback, playbackChangedFields)) {
+        playbackChanged = true
+      }
+    }
+
     // Only emit if something actually changed
     if (statusChanged) {
       // Update metadata
@@ -1856,6 +1875,12 @@ export class YotoDeviceModel extends EventEmitter {
       this.emit('configUpdate', this.config, configChangedFields)
     }
 
+    if (playbackChanged) {
+      playback.updatedAt = new Date().toISOString()
+      this.#state.lastUpdate.playback = Date.now()
+      this.emit('playbackUpdate', this.playback, playbackChangedFields)
+    }
+
     // Check if device went offline (transition from online to offline)
     if (wasOnline && !this.#deviceOnline) {
       this.emit('offline', { reason: 'http-status', source: 'http' })
@@ -1870,10 +1895,14 @@ export class YotoDeviceModel extends EventEmitter {
    */
   #updateStatusFromStatusResponse (statusResponse) {
     let statusChanged = false
+    let playbackChanged = false
     const wasOnline = this.#deviceOnline
-    const { status } = this.#state
+    const { status, playback } = this.#state
+    const previousPlaybackCardId = playback.cardId
     /** @type {Set<keyof YotoDeviceStatus>} */
     const changedFields = new Set()
+    /** @type {Set<keyof YotoPlaybackState>} */
+    const playbackChangedFields = new Set()
 
     /**
      * Handler function for each status field
@@ -2114,6 +2143,20 @@ export class YotoDeviceModel extends EventEmitter {
       handleField(key, statusResponse)
     }
 
+    if (changedFields.has('activeCardId') && previousPlaybackCardId !== status.activeCardId) {
+      playback.cardId = status.activeCardId
+      playbackChangedFields.add('cardId')
+      playbackChanged = true
+
+      if (clearCardCachePlaybackFields(playback, playbackChangedFields)) {
+        playbackChanged = true
+      }
+
+      if (this.#applyCardCacheToPlayback(playback.cardId, playback, playbackChangedFields)) {
+        playbackChanged = true
+      }
+    }
+
     // Only emit if something actually changed
     if (statusChanged) {
       // Update metadata
@@ -2126,6 +2169,12 @@ export class YotoDeviceModel extends EventEmitter {
       this.emit('statusUpdate', this.status, 'http', changedFields)
     }
 
+    if (playbackChanged) {
+      playback.updatedAt = new Date().toISOString()
+      this.#state.lastUpdate.playback = Date.now()
+      this.emit('playbackUpdate', this.playback, playbackChangedFields)
+    }
+
     // Check if device went offline (transition from online to offline)
     if (wasOnline && !this.#deviceOnline) {
       this.emit('offline', { reason: 'http-status', source: 'http' })
@@ -3198,7 +3247,25 @@ export class YotoDeviceModel extends EventEmitter {
       }
 
       return entry
-    } catch {
+    } catch (err) {
+      if (err instanceof YotoAPIError) {
+        const errorBody = /** @type {{ error?: { code?: string, message?: string } } | null} */ (err.jsonBody)
+        const statusCode = err.statusCode
+        const extraCardId = err.extra?.cardId
+        const bodyCode = errorBody?.error?.code
+        const bodyMessage = errorBody?.error?.message
+
+        const ignoreForbiddenCard = statusCode === 403 &&
+          (!extraCardId || extraCardId === task.cardId) &&
+          bodyCode === 'forbidden' &&
+          bodyMessage?.includes('Access to card') &&
+          bodyMessage?.includes('forbidden')
+
+        if (ignoreForbiddenCard) return null
+      }
+
+      const error = err instanceof Error ? err : new Error(String(err))
+      this.emit('error', error)
       return null
     } finally {
       this.#cardCacheQueueTasks.delete(task.cardId)
@@ -3408,6 +3475,9 @@ export class YotoDeviceModel extends EventEmitter {
     }
 
     if (previousCardId !== playback.cardId) {
+      if (clearCardCachePlaybackFields(playback, playbackChangedFields)) {
+        playbackChanged = true
+      }
       if (this.#applyCardCacheToPlayback(playback.cardId, playback, playbackChangedFields)) {
         playbackChanged = true
       }
@@ -3517,6 +3587,77 @@ function buildCardCacheEntry (card) {
   }
 }
 
+/**
+ * @param {YotoPlaybackState} playback
+ * @param {Set<keyof YotoPlaybackState>} changedFields
+ * @returns {boolean}
+ */
+function clearCardCachePlaybackFields (playback, changedFields) {
+  let changed = false
+
+  if (!changedFields.has('cardTitle') && playback.cardTitle !== null) {
+    playback.cardTitle = null
+    changedFields.add('cardTitle')
+    changed = true
+  }
+
+  if (!changedFields.has('cardSlug') && playback.cardSlug !== null) {
+    playback.cardSlug = null
+    changedFields.add('cardSlug')
+    changed = true
+  }
+
+  if (!changedFields.has('cardCoverImageUrl') && playback.cardCoverImageUrl !== null) {
+    playback.cardCoverImageUrl = null
+    changedFields.add('cardCoverImageUrl')
+    changed = true
+  }
+
+  if (!changedFields.has('cardAuthor') && playback.cardAuthor !== null) {
+    playback.cardAuthor = null
+    changedFields.add('cardAuthor')
+    changed = true
+  }
+
+  if (!changedFields.has('cardReadBy') && playback.cardReadBy !== null) {
+    playback.cardReadBy = null
+    changedFields.add('cardReadBy')
+    changed = true
+  }
+
+  if (!changedFields.has('cardDurationSeconds') && playback.cardDurationSeconds !== null) {
+    playback.cardDurationSeconds = null
+    changedFields.add('cardDurationSeconds')
+    changed = true
+  }
+
+  if (!changedFields.has('trackTitle') && playback.trackTitle !== null) {
+    playback.trackTitle = null
+    changedFields.add('trackTitle')
+    changed = true
+  }
+
+  if (!changedFields.has('trackLength') && playback.trackLength !== null) {
+    playback.trackLength = null
+    changedFields.add('trackLength')
+    changed = true
+  }
+
+  if (!changedFields.has('chapterKey') && playback.chapterKey !== null) {
+    playback.chapterKey = null
+    changedFields.add('chapterKey')
+    changed = true
+  }
+
+  if (!changedFields.has('chapterTitle') && playback.chapterTitle !== null) {
+    playback.chapterTitle = null
+    changedFields.add('chapterTitle')
+    changed = true
+  }
+
+  return changed
+}
+
 /**
  * @param {YotoCardCacheEntry} entry
  * @param {YotoPlaybackState} playback

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "yoto-nodejs-client",
   "description": "(Unofficial) Node.js client for the Yoto API with automatic token refresh, MQTT device communication, and TypeScript support",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
   "bugs": {
     "url": "https://github.com/bcomnes/yoto-nodejs-client/issues"