tsvesync 1.4.5 → 1.4.6

package/dist/lib/constants.js

@@ -22,6 +22,7 @@ exports.CROSS_REGION_ERROR_CODES = [
 // pyvesync parity: `-11001000` maps to TOKEN_EXPIRED (invalid token)
 exports.TOKEN_ERROR_CODES = [
     -11001000, // token expired/invalid
+    -11001022, // token has expired (observed from device list responses)
 ];
 // Other error codes
 exports.APP_VERSION_ERROR_CODES = [

package/dist/lib/helpers.d.ts

@@ -34,6 +34,9 @@ export declare const AUTH_ERROR_CODES: {
     CROSS_REGION: number;
     CROSS_REGION_ALT: number;
 };
+type CallApiOptions = {
+    didRetryAuth?: boolean;
+};
 /**
  * Get list of country codes that use the US endpoint
  * These are tried when we get a cross-region error
@@ -154,7 +157,7 @@ export declare class Helpers {
     /**
      * Call VeSync API
      */
-    static callApi(endpoint: string, method: string, data: any | undefined, headers: Record<string, string> | undefined, manager: VeSync): Promise<[any, number]>;
+    static callApi(endpoint: string, method: string, data: any | undefined, headers: Record<string, string> | undefined, manager: VeSync, options?: CallApiOptions): Promise<[any, number]>;
     /**
      * Calculate hex value from energy response
      */
@@ -180,3 +183,4 @@ export declare class Helpers {
      */
     static authLegacyFlow(manager: VeSync): Promise<[boolean, string | null, string | null, string | null]>;
 }
+export {};

package/dist/lib/helpers.js

@@ -93,6 +93,9 @@ exports.AUTH_ERROR_CODES = {
     CROSS_REGION: -11260022,
     CROSS_REGION_ALT: -11261022
 };
+function isTokenExpiredMessage(msg) {
+    return typeof msg === 'string' && /token\s*(?:has\s*)?expired/i.test(msg);
+}
 /**
  * Get list of country codes that use the US endpoint
  * These are tried when we get a cross-region error
@@ -436,7 +439,8 @@ class Helpers {
     /**
      * Call VeSync API
      */
-    static async callApi(endpoint, method, data = null, headers = {}, manager) {
+    static async callApi(endpoint, method, data = null, headers = {}, manager, options = {}) {
+        var _a, _b;
         let url = '';
         try {
             // Prefer manager-scoped base URL (pyvesync resolves per-manager from current region).
@@ -457,6 +461,21 @@ class Helpers {
                 headers,
                 timeout: exports.API_TIMEOUT
             });
+            // Some VeSync API calls return HTTP 200 with an error `code` in the body.
+            // Treat token-expiration responses as recoverable: re-auth once and retry.
+            const didRetryAuth = options.didRetryAuth === true;
+            const responseCode = (_a = response.data) === null || _a === void 0 ? void 0 : _a.code;
+            const responseMsg = (_b = response.data) === null || _b === void 0 ? void 0 : _b.msg;
+            if (!didRetryAuth &&
+                response.status === 200 &&
+                ((typeof responseCode === 'number' && (0, constants_1.isTokenError)(responseCode)) ||
+                    isTokenExpiredMessage(responseMsg))) {
+                logger_1.logger.debug('Token expired, attempting to re-login...');
+                if (await manager.login()) {
+                    logger_1.logger.debug('Re-login successful, retrying original request...');
+                    return await this.callApi(endpoint, method, data, headers, manager, { ...options, didRetryAuth: true });
+                }
+            }
             return [response.data, response.status];
         }
         catch (error) {
@@ -465,16 +484,18 @@ class Helpers {
                 // Check for token expiration or auth invalidation
                 const httpStatus = error.response.status;
                 const msg = responseData === null || responseData === void 0 ? void 0 : responseData.msg;
-                if (httpStatus === 401 ||
+                const didRetryAuth = options.didRetryAuth === true;
+                if (!didRetryAuth && (httpStatus === 401 ||
                     httpStatus === 419 ||
                     (responseData === null || responseData === void 0 ? void 0 : responseData.code) === 4001004 ||
-                    (typeof msg === 'string' && /token\s*expired/i.test(msg))) {
+                    (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.code) === 'number' && (0, constants_1.isTokenError)(responseData.code)) ||
+                    isTokenExpiredMessage(msg))) {
                     logger_1.logger.debug('Token expired, attempting to re-login...');
                     // Re-login
                     if (await manager.login()) {
                         // Retry the original request
                         logger_1.logger.debug('Re-login successful, retrying original request...');
-                        return await this.callApi(endpoint, method, data, headers, manager);
+                        return await this.callApi(endpoint, method, data, headers, manager, { ...options, didRetryAuth: true });
                     }
                 }
                 // Log specific error details for debugging

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsvesync",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "A TypeScript library for interacting with VeSync smart home devices",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/lib/constants.ts

@@ -19,6 +19,7 @@ export const CROSS_REGION_ERROR_CODES = [
 // pyvesync parity: `-11001000` maps to TOKEN_EXPIRED (invalid token)
 export const TOKEN_ERROR_CODES = [
     -11001000,  // token expired/invalid
+    -11001022,  // token has expired (observed from device list responses)
 ];
 
 // Other error codes

package/src/lib/helpers.ts

@@ -6,7 +6,7 @@ import axios from 'axios';
 import crypto from 'crypto';
 import { VeSync } from './vesync';
 import { logger } from './logger';
-import { isCredentialError, isCrossRegionError } from './constants';
+import { isCredentialError, isCrossRegionError, isTokenError } from './constants';
 
 // API configuration - Support regional endpoints
 let _apiBaseUrl = 'https://smartapi.vesync.com';
@@ -91,6 +91,14 @@ export const AUTH_ERROR_CODES = {
     CROSS_REGION_ALT: -11261022
 };
 
+function isTokenExpiredMessage(msg: unknown): boolean {
+    return typeof msg === 'string' && /token\s*(?:has\s*)?expired/i.test(msg);
+}
+
+type CallApiOptions = {
+    didRetryAuth?: boolean;
+};
+
 /**
  * Get list of country codes that use the US endpoint
  * These are tried when we get a cross-region error
@@ -522,7 +530,8 @@ export class Helpers {
         method: string,
         data: any = null,
         headers: Record<string, string> = {},
-        manager: VeSync
+        manager: VeSync,
+        options: CallApiOptions = {}
     ): Promise<[any, number]> {
         let url = '';
         try {
@@ -548,6 +557,27 @@ export class Helpers {
                 timeout: API_TIMEOUT
             });
 
+            // Some VeSync API calls return HTTP 200 with an error `code` in the body.
+            // Treat token-expiration responses as recoverable: re-auth once and retry.
+            const didRetryAuth = options.didRetryAuth === true;
+            const responseCode = response.data?.code;
+            const responseMsg = response.data?.msg;
+            if (
+                !didRetryAuth &&
+                response.status === 200 &&
+                (
+                    (typeof responseCode === 'number' && isTokenError(responseCode)) ||
+                    isTokenExpiredMessage(responseMsg)
+                )
+            ) {
+                logger.debug('Token expired, attempting to re-login...');
+
+                if (await manager.login()) {
+                    logger.debug('Re-login successful, retrying original request...');
+                    return await this.callApi(endpoint, method, data, headers, manager, { ...options, didRetryAuth: true });
+                }
+            }
+
             return [response.data, response.status];
         } catch (error: any) {
             if (error.response) {
@@ -556,19 +586,21 @@ export class Helpers {
                 // Check for token expiration or auth invalidation
                 const httpStatus = error.response.status;
                 const msg: string | undefined = responseData?.msg;
-                if (
+                const didRetryAuth = options.didRetryAuth === true;
+                if (!didRetryAuth && (
                     httpStatus === 401 ||
                     httpStatus === 419 ||
                     responseData?.code === 4001004 ||
-                    (typeof msg === 'string' && /token\s*expired/i.test(msg))
-                ) {
+                    (typeof responseData?.code === 'number' && isTokenError(responseData.code)) ||
+                    isTokenExpiredMessage(msg)
+                )) {
                     logger.debug('Token expired, attempting to re-login...');
                     
                     // Re-login
                     if (await manager.login()) {
                         // Retry the original request
                         logger.debug('Re-login successful, retrying original request...');
-                        return await this.callApi(endpoint, method, data, headers, manager);
+                        return await this.callApi(endpoint, method, data, headers, manager, { ...options, didRetryAuth: true });
                     }
                 }