tsvesync 1.0.88 → 1.0.90

package/dist/lib/helpers.d.ts

@@ -6,7 +6,7 @@ export declare function getApiBaseUrl(): string;
 export declare function setApiBaseUrl(url: string): void;
 export declare const API_RATE_LIMIT = 30;
 export declare const API_TIMEOUT = 15000;
-export declare const APP_VERSION = "5.6.53";
+export declare const APP_VERSION = "2.8.6";
 export declare const PHONE_BRAND = "SM N9005";
 export declare const PHONE_OS = "Android";
 export declare const USER_TYPE = "1";

package/dist/lib/helpers.js

@@ -12,7 +12,7 @@ exports.setApiBaseUrl = setApiBaseUrl;
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = __importDefault(require("crypto"));
 const logger_1 = require("./logger");
-// API configuration
+// API configuration - Always use US endpoint
 let _apiBaseUrl = 'https://smartapi.vesync.com';
 function getApiBaseUrl() {
     return _apiBaseUrl;
@@ -22,7 +22,7 @@ function setApiBaseUrl(url) {
 }
 exports.API_RATE_LIMIT = 30;
 exports.API_TIMEOUT = 15000;
-exports.APP_VERSION = '5.6.53';
+exports.APP_VERSION = '2.8.6';
 exports.PHONE_BRAND = 'SM N9005';
 exports.PHONE_OS = 'Android';
 exports.USER_TYPE = '1';
@@ -164,7 +164,13 @@ class Helpers {
      */
     static async callApi(endpoint, method, data = null, headers = {}, manager) {
         try {
+            // Ensure API base URL is properly set
+            if (!_apiBaseUrl || _apiBaseUrl === 'undefined') {
+                logger_1.logger.error('API base URL is not properly configured. Setting to default US endpoint...');
+                setApiBaseUrl('https://smartapi.vesync.com');
+            }
             const url = _apiBaseUrl + endpoint;
+            logger_1.logger.debug(`Making API call to: ${url}`);
             const response = await (0, axios_1.default)({
                 method,
                 url,
@@ -187,9 +193,20 @@ class Helpers {
                         return await this.callApi(endpoint, method, data, headers, manager);
                     }
                 }
+                // Log specific error details for debugging
+                logger_1.logger.error('API call failed with response:', {
+                    status: error.response.status,
+                    code: responseData === null || responseData === void 0 ? void 0 : responseData.code,
+                    message: responseData === null || responseData === void 0 ? void 0 : responseData.msg,
+                    url: _apiBaseUrl + endpoint
+                });
                 return [responseData, error.response.status];
             }
-            logger_1.logger.error('API call failed:', error.code, error.message);
+            logger_1.logger.error('API call failed:', {
+                code: error.code,
+                message: error.message,
+                url: _apiBaseUrl + endpoint
+            });
             return [null, 0];
         }
     }

package/dist/lib/vesync.d.ts

@@ -43,7 +43,7 @@ export declare class VeSync {
      * Initialize VeSync Manager
      * @param username - VeSync account username
      * @param password - VeSync account password
-     * @param timeZone - Optional timezone (defaults to America/New_York)
+     * @param timeZone - Optional timezone for device operations (defaults to America/New_York)
      * @param debug - Optional debug mode flag
      * @param redact - Optional redact mode flag
      * @param apiUrl - Optional API base URL override

package/dist/lib/vesync.js

@@ -124,7 +124,7 @@ class VeSync {
      * Initialize VeSync Manager
      * @param username - VeSync account username
      * @param password - VeSync account password
-     * @param timeZone - Optional timezone (defaults to America/New_York)
+     * @param timeZone - Optional timezone for device operations (defaults to America/New_York)
      * @param debug - Optional debug mode flag
      * @param redact - Optional redact mode flag
      * @param apiUrl - Optional API base URL override
@@ -158,14 +158,7 @@ class VeSync {
             switches: this.switches,
             bulbs: this.bulbs
         };
-        // Set custom API URL if provided
-        if (apiUrl) {
-            (0, helpers_1.setApiBaseUrl)(apiUrl);
-        }
-        // Set custom logger if provided
-        if (customLogger) {
-            (0, logger_1.setLogger)(customLogger);
-        }
+        // Set timezone first
         if (typeof timeZone === 'string' && timeZone) {
             const regTest = /[^a-zA-Z/_]/;
             if (regTest.test(timeZone)) {
@@ -180,6 +173,18 @@ class VeSync {
             this.timeZone = helpers_1.DEFAULT_TZ;
             logger_1.logger.debug('Time zone is not a string');
         }
+        // Set custom API URL if provided, otherwise use default US endpoint
+        if (apiUrl) {
+            (0, helpers_1.setApiBaseUrl)(apiUrl);
+        }
+        else {
+            // Always use US endpoint
+            (0, helpers_1.setApiBaseUrl)('https://smartapi.vesync.com');
+        }
+        // Set custom logger if provided
+        if (customLogger) {
+            (0, logger_1.setLogger)(customLogger);
+        }
         if (debug) {
             this.debug = true;
         }
@@ -408,19 +413,39 @@ class VeSync {
     async login(retryAttempts = 3, initialDelayMs = 1000) {
         var _a;
         const body = helpers_1.Helpers.reqBody(this, 'login');
-        logger_1.logger.debug('Login request:', {
-            url: `${process.env.VESYNC_API_URL}/cloud/v1/user/login`,
-            body
-        });
         for (let attempt = 0; attempt < retryAttempts; attempt++) {
             try {
+                logger_1.logger.debug('Login attempt', {
+                    attempt: attempt + 1,
+                    apiUrl: (0, helpers_1.getApiBaseUrl)(),
+                    timeZone: this.timeZone,
+                    appVersion: body.appVersion
+                });
                 const [response, status] = await helpers_1.Helpers.callApi('/cloud/v1/user/login', 'post', body, {}, this);
                 logger_1.logger.debug('Login response:', { status, response });
+                // Handle specific error codes
+                if (response && response.code) {
+                    switch (response.code) {
+                        case -11012022:
+                            logger_1.logger.error('App version too low error. Current version:', body.appVersion);
+                            logger_1.logger.error('This typically indicates an API version compatibility issue.');
+                            break;
+                        case -11003:
+                            logger_1.logger.error('Authentication failed - check credentials');
+                            break;
+                        case -11001:
+                            logger_1.logger.error('Invalid request format');
+                            break;
+                        default:
+                            logger_1.logger.error('API error code:', response.code, 'message:', response.msg);
+                    }
+                }
                 if ((_a = response === null || response === void 0 ? void 0 : response.result) === null || _a === void 0 ? void 0 : _a.token) {
                     this.token = response.result.token;
                     this.accountId = response.result.accountID;
                     this.countryCode = response.result.countryCode;
                     this.enabled = true;
+                    logger_1.logger.debug('Login successful for region:', this.countryCode);
                     return true;
                 }
                 // If we reach here, login failed but didn't throw an error

package/package.json

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

package/src/lib/helpers.ts

@@ -7,7 +7,7 @@ import crypto from 'crypto';
 import { VeSync } from './vesync';
 import { logger } from './logger';
 
-// API configuration
+// API configuration - Always use US endpoint
 let _apiBaseUrl = 'https://smartapi.vesync.com';
 
 export function getApiBaseUrl(): string {
@@ -18,10 +18,11 @@ export function setApiBaseUrl(url: string): void {
     _apiBaseUrl = url;
 }
 
+
 export const API_RATE_LIMIT = 30;
 export const API_TIMEOUT = 15000;
 
-export const APP_VERSION = '5.6.53';
+export const APP_VERSION = '2.8.6';
 export const PHONE_BRAND = 'SM N9005';
 export const PHONE_OS = 'Android';
 export const USER_TYPE = '1';
@@ -206,7 +207,15 @@ export class Helpers {
         manager: VeSync
     ): Promise<[any, number]> {
         try {
+            // Ensure API base URL is properly set
+            if (!_apiBaseUrl || _apiBaseUrl === 'undefined') {
+                logger.error('API base URL is not properly configured. Setting to default US endpoint...');
+                setApiBaseUrl('https://smartapi.vesync.com');
+            }
+            
             const url = _apiBaseUrl + endpoint;
+            logger.debug(`Making API call to: ${url}`);
+            
             const response = await axios({
                 method,
                 url,
@@ -231,10 +240,23 @@ export class Helpers {
                         return await this.callApi(endpoint, method, data, headers, manager);
                     }
                 }
+                
+                // Log specific error details for debugging
+                logger.error('API call failed with response:', {
+                    status: error.response.status,
+                    code: responseData?.code,
+                    message: responseData?.msg,
+                    url: _apiBaseUrl + endpoint
+                });
+                
                 return [responseData, error.response.status];
             }
 
-            logger.error('API call failed:', error.code, error.message);
+            logger.error('API call failed:', {
+                code: error.code,
+                message: error.message,
+                url: _apiBaseUrl + endpoint
+            });
             return [null, 0];
         }
     }

package/src/lib/vesync.ts

@@ -2,7 +2,7 @@
  * VeSync API Device Library
  */
 
-import { Helpers, API_RATE_LIMIT, DEFAULT_TZ, setApiBaseUrl } from './helpers';
+import { Helpers, API_RATE_LIMIT, DEFAULT_TZ, setApiBaseUrl, getApiBaseUrl } from './helpers';
 import { VeSyncBaseDevice } from './vesyncBaseDevice';
 import { fanModules } from './vesyncFanImpl';
 import { outletModules } from './vesyncOutletImpl';
@@ -180,7 +180,7 @@ export class VeSync {
      * Initialize VeSync Manager
      * @param username - VeSync account username
      * @param password - VeSync account password
-     * @param timeZone - Optional timezone (defaults to America/New_York)
+     * @param timeZone - Optional timezone for device operations (defaults to America/New_York)
      * @param debug - Optional debug mode flag
      * @param redact - Optional redact mode flag
      * @param apiUrl - Optional API base URL override
@@ -227,16 +227,7 @@ export class VeSync {
             bulbs: this.bulbs
         };
 
-        // Set custom API URL if provided
-        if (apiUrl) {
-            setApiBaseUrl(apiUrl);
-        }
-
-        // Set custom logger if provided
-        if (customLogger) {
-            setLogger(customLogger);
-        }
-
+        // Set timezone first
         if (typeof timeZone === 'string' && timeZone) {
             const regTest = /[^a-zA-Z/_]/;
             if (regTest.test(timeZone)) {
@@ -250,6 +241,19 @@ export class VeSync {
             logger.debug('Time zone is not a string');
         }
 
+        // Set custom API URL if provided, otherwise use default US endpoint
+        if (apiUrl) {
+            setApiBaseUrl(apiUrl);
+        } else {
+            // Always use US endpoint
+            setApiBaseUrl('https://smartapi.vesync.com');
+        }
+
+        // Set custom logger if provided
+        if (customLogger) {
+            setLogger(customLogger);
+        }
+
         if (debug) {
             this.debug = true;
         }
@@ -506,13 +510,16 @@ export class VeSync {
      */
     async login(retryAttempts: number = 3, initialDelayMs: number = 1000): Promise<boolean> {
         const body = Helpers.reqBody(this, 'login');
-        logger.debug('Login request:', {
-            url: `${process.env.VESYNC_API_URL}/cloud/v1/user/login`,
-            body
-        });
-
+        
         for (let attempt = 0; attempt < retryAttempts; attempt++) {
             try {
+                logger.debug('Login attempt', {
+                    attempt: attempt + 1,
+                    apiUrl: getApiBaseUrl(),
+                    timeZone: this.timeZone,
+                    appVersion: body.appVersion
+                });
+
                 const [response, status] = await Helpers.callApi(
                     '/cloud/v1/user/login',
                     'post',
@@ -523,11 +530,30 @@ export class VeSync {
 
                 logger.debug('Login response:', { status, response });
 
+                // Handle specific error codes
+                if (response && response.code) {
+                    switch (response.code) {
+                        case -11012022:
+                            logger.error('App version too low error. Current version:', body.appVersion);
+                            logger.error('This typically indicates an API version compatibility issue.');
+                            break;
+                        case -11003:
+                            logger.error('Authentication failed - check credentials');
+                            break;
+                        case -11001:
+                            logger.error('Invalid request format');
+                            break;
+                        default:
+                            logger.error('API error code:', response.code, 'message:', response.msg);
+                    }
+                }
+
                 if (response?.result?.token) {
                     this.token = response.result.token;
                     this.accountId = response.result.accountID;
                     this.countryCode = response.result.countryCode;
                     this.enabled = true;
+                    logger.debug('Login successful for region:', this.countryCode);
                     return true;
                 }