tsvesync 1.0.101 → 1.0.103

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export { VeSyncBulb } from './lib/vesyncBulb';
 export { VeSyncWallSwitch } from './lib/vesyncSwitchImpl';
 export { VeSyncBaseDevice } from './lib/vesyncBaseDevice';
 export { Helpers, setApiBaseUrl } from './lib/helpers';
+export { CREDENTIAL_ERROR_CODES, CROSS_REGION_ERROR_CODES, isCredentialError, isCrossRegionError } from './lib/constants';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setApiBaseUrl = exports.Helpers = exports.VeSyncBaseDevice = exports.VeSyncWallSwitch = exports.VeSyncBulb = exports.VeSyncOutdoorPlug = exports.VeSyncOutlet15A = exports.VeSyncOutlet10A = exports.VeSyncOutlet7A = exports.VeSyncAirBypass = exports.VeSync = void 0;
+exports.isCrossRegionError = exports.isCredentialError = exports.CROSS_REGION_ERROR_CODES = exports.CREDENTIAL_ERROR_CODES = exports.setApiBaseUrl = exports.Helpers = exports.VeSyncBaseDevice = exports.VeSyncWallSwitch = exports.VeSyncBulb = exports.VeSyncOutdoorPlug = exports.VeSyncOutlet15A = exports.VeSyncOutlet10A = exports.VeSyncOutlet7A = exports.VeSyncAirBypass = exports.VeSync = void 0;
 // Export main VeSync manager class
 var vesync_1 = require("./lib/vesync");
 Object.defineProperty(exports, "VeSync", { enumerable: true, get: function () { return vesync_1.VeSync; } });
@@ -23,3 +23,9 @@ Object.defineProperty(exports, "VeSyncBaseDevice", { enumerable: true, get: func
 var helpers_1 = require("./lib/helpers");
 Object.defineProperty(exports, "Helpers", { enumerable: true, get: function () { return helpers_1.Helpers; } });
 Object.defineProperty(exports, "setApiBaseUrl", { enumerable: true, get: function () { return helpers_1.setApiBaseUrl; } });
+// Export constants
+var constants_1 = require("./lib/constants");
+Object.defineProperty(exports, "CREDENTIAL_ERROR_CODES", { enumerable: true, get: function () { return constants_1.CREDENTIAL_ERROR_CODES; } });
+Object.defineProperty(exports, "CROSS_REGION_ERROR_CODES", { enumerable: true, get: function () { return constants_1.CROSS_REGION_ERROR_CODES; } });
+Object.defineProperty(exports, "isCredentialError", { enumerable: true, get: function () { return constants_1.isCredentialError; } });
+Object.defineProperty(exports, "isCrossRegionError", { enumerable: true, get: function () { return constants_1.isCrossRegionError; } });

package/dist/lib/constants.d.ts

@@ -0,0 +1,14 @@
+/**
+ * VeSync API Error Codes
+ */
+export declare const CREDENTIAL_ERROR_CODES: number[];
+export declare const CROSS_REGION_ERROR_CODES: number[];
+export declare const APP_VERSION_ERROR_CODES: number[];
+/**
+ * Check if an error code indicates bad credentials
+ */
+export declare function isCredentialError(code: number): boolean;
+/**
+ * Check if an error code indicates cross-region issue
+ */
+export declare function isCrossRegionError(code: number): boolean;

package/dist/lib/constants.js

@@ -0,0 +1,35 @@
+"use strict";
+/**
+ * VeSync API Error Codes
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.APP_VERSION_ERROR_CODES = exports.CROSS_REGION_ERROR_CODES = exports.CREDENTIAL_ERROR_CODES = void 0;
+exports.isCredentialError = isCredentialError;
+exports.isCrossRegionError = isCrossRegionError;
+// Authentication error codes that indicate bad credentials (no point retrying)
+exports.CREDENTIAL_ERROR_CODES = [
+    -11201129, // account or password incorrect
+    -11202129, // the account does not exist
+    -11000129, // illegal argument (empty credentials)
+];
+// Cross-region error codes that require region switching
+exports.CROSS_REGION_ERROR_CODES = [
+    -11260022, // cross region error
+    -11261022, // access region conflict error
+];
+// Other error codes
+exports.APP_VERSION_ERROR_CODES = [
+    -11012022, // app version is too low
+];
+/**
+ * Check if an error code indicates bad credentials
+ */
+function isCredentialError(code) {
+    return exports.CREDENTIAL_ERROR_CODES.includes(code);
+}
+/**
+ * Check if an error code indicates cross-region issue
+ */
+function isCrossRegionError(code) {
+    return exports.CROSS_REGION_ERROR_CODES.includes(code);
+}

package/dist/lib/helpers.d.ts

@@ -9,7 +9,7 @@ export declare function setCurrentRegion(region: string): void;
 export declare function getRegionFromCountryCode(countryCode: string): string;
 export declare const API_RATE_LIMIT = 30;
 export declare const API_TIMEOUT = 15000;
-export declare const APP_VERSION = "5.6.60";
+export declare const APP_VERSION = "5.7.16";
 export declare const PHONE_BRAND = "SM N9005";
 export declare const PHONE_OS = "Android";
 export declare const CLIENT_INFO = "SM N9005";
@@ -18,7 +18,7 @@ export declare const DEFAULT_TZ = "America/New_York";
 export declare const DEFAULT_REGION = "US";
 export declare const MOBILE_ID = "1234567890123456";
 export declare const BYPASS_HEADER_UA = "okhttp/3.12.1";
-export declare const CLIENT_VERSION = "VeSync 5.6.60";
+export declare const CLIENT_VERSION = "VeSync 5.7.16";
 export declare const REGION_ENDPOINTS: {
     US: string;
     CA: string;
@@ -26,8 +26,21 @@ export declare const REGION_ENDPOINTS: {
     JP: string;
     EU: string;
 };
-export declare const CROSS_REGION_ERROR_CODE = -11260022;
 export declare const APP_VERSION_TOO_LOW_ERROR_CODE = -11012022;
+export declare const AUTH_ERROR_CODES: {
+    ACCOUNT_PASSWORD_INCORRECT: number;
+    ILLEGAL_ARGUMENT: number;
+    CROSS_REGION: number;
+    CROSS_REGION_ALT: number;
+};
+/**
+ * Detect user's home region from email domain or country hints
+ */
+export declare function detectUserRegion(email: string): string;
+/**
+ * Get country code from region
+ */
+export declare function getCountryCodeFromRegion(region: string, email?: string): string;
 export declare function generateAppId(): string;
 export declare function generateTerminalId(): string;
 export interface RequestBody {
@@ -113,7 +126,7 @@ export declare class Helpers {
     /**
      * Build request body for initial authentication step
      */
-    static reqBodyAuthStep1(manager: VeSync, appId: string, terminalId: string): Record<string, any>;
+    static reqBodyAuthStep1(manager: VeSync, appId: string, terminalId: string, region?: string): Record<string, any>;
     /**
      * Build request body for second authentication step (login with authorize code)
      */

package/dist/lib/helpers.js

@@ -6,17 +6,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Helpers = exports.APP_VERSION_TOO_LOW_ERROR_CODE = exports.CROSS_REGION_ERROR_CODE = exports.REGION_ENDPOINTS = exports.CLIENT_VERSION = exports.BYPASS_HEADER_UA = exports.MOBILE_ID = exports.DEFAULT_REGION = exports.DEFAULT_TZ = exports.USER_TYPE = exports.CLIENT_INFO = exports.PHONE_OS = exports.PHONE_BRAND = exports.APP_VERSION = exports.API_TIMEOUT = exports.API_RATE_LIMIT = void 0;
+exports.Helpers = exports.AUTH_ERROR_CODES = exports.APP_VERSION_TOO_LOW_ERROR_CODE = exports.REGION_ENDPOINTS = exports.CLIENT_VERSION = exports.BYPASS_HEADER_UA = exports.MOBILE_ID = exports.DEFAULT_REGION = exports.DEFAULT_TZ = exports.USER_TYPE = exports.CLIENT_INFO = exports.PHONE_OS = exports.PHONE_BRAND = exports.APP_VERSION = exports.API_TIMEOUT = exports.API_RATE_LIMIT = void 0;
 exports.getApiBaseUrl = getApiBaseUrl;
 exports.setApiBaseUrl = setApiBaseUrl;
 exports.getCurrentRegion = getCurrentRegion;
 exports.setCurrentRegion = setCurrentRegion;
 exports.getRegionFromCountryCode = getRegionFromCountryCode;
+exports.detectUserRegion = detectUserRegion;
+exports.getCountryCodeFromRegion = getCountryCodeFromRegion;
 exports.generateAppId = generateAppId;
 exports.generateTerminalId = generateTerminalId;
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = __importDefault(require("crypto"));
 const logger_1 = require("./logger");
+const constants_1 = require("./constants");
 // API configuration - Support regional endpoints
 let _apiBaseUrl = 'https://smartapi.vesync.com';
 let _currentRegion = 'US';
@@ -51,7 +54,7 @@ function getRegionFromCountryCode(countryCode) {
 }
 exports.API_RATE_LIMIT = 30;
 exports.API_TIMEOUT = 15000;
-exports.APP_VERSION = '5.6.60';
+exports.APP_VERSION = '5.7.16'; // Updated to newer version
 exports.PHONE_BRAND = 'SM N9005';
 exports.PHONE_OS = 'Android';
 exports.CLIENT_INFO = 'SM N9005';
@@ -60,7 +63,7 @@ exports.DEFAULT_TZ = 'America/New_York';
 exports.DEFAULT_REGION = 'US';
 exports.MOBILE_ID = '1234567890123456';
 exports.BYPASS_HEADER_UA = 'okhttp/3.12.1';
-exports.CLIENT_VERSION = 'VeSync 5.6.60';
+exports.CLIENT_VERSION = 'VeSync 5.7.16';
 // Regional API endpoints
 exports.REGION_ENDPOINTS = {
     'US': 'https://smartapi.vesync.com',
@@ -69,12 +72,57 @@ exports.REGION_ENDPOINTS = {
     'JP': 'https://smartapi.vesync.com',
     'EU': 'https://smartapi.vesync.eu'
 };
-// Cross-region error code
-exports.CROSS_REGION_ERROR_CODE = -11260022;
+// Cross-region error codes - multiple versions exist
+// CROSS_REGION_ERROR_CODES moved to constants.ts
 exports.APP_VERSION_TOO_LOW_ERROR_CODE = -11012022;
+// Authentication error codes
+exports.AUTH_ERROR_CODES = {
+    ACCOUNT_PASSWORD_INCORRECT: -11201129,
+    ILLEGAL_ARGUMENT: -11000022,
+    CROSS_REGION: -11260022,
+    CROSS_REGION_ALT: -11261022
+};
+/**
+ * Detect user's home region from email domain or country hints
+ */
+function detectUserRegion(email) {
+    // Check for common EU email domains
+    const euDomains = ['.de', '.fr', '.it', '.es', '.nl', '.be', '.at', '.dk', '.se', '.no', '.fi', '.eu'];
+    const emailLower = email.toLowerCase();
+    for (const domain of euDomains) {
+        if (emailLower.includes(domain)) {
+            return 'EU';
+        }
+    }
+    // Default to US for unknown domains
+    return 'US';
+}
+/**
+ * Get country code from region
+ */
+function getCountryCodeFromRegion(region, email) {
+    if (region === 'EU') {
+        // Try to detect specific EU country from email
+        if (email) {
+            const emailLower = email.toLowerCase();
+            if (emailLower.includes('.de') || emailLower.includes('german'))
+                return 'DE';
+            if (emailLower.includes('.fr'))
+                return 'FR';
+            if (emailLower.includes('.it'))
+                return 'IT';
+            if (emailLower.includes('.es'))
+                return 'ES';
+            if (emailLower.includes('.nl'))
+                return 'NL';
+        }
+        return 'DE'; // Default to Germany for EU
+    }
+    return 'US'; // Default for non-EU
+}
 // Generate unique APP_ID for each session
 function generateAppId() {
-    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    const chars = 'ABCDEFGHIJKLMNOPqRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
     let result = '';
     for (let i = 0; i < 8; i++) {
         result += chars.charAt(Math.floor(Math.random() * chars.length));
@@ -131,7 +179,9 @@ class Helpers {
         return {
             'Content-Type': 'application/json; charset=UTF-8',
             'User-Agent': exports.BYPASS_HEADER_UA,
-            'accept-language': 'en'
+            'accept-language': 'en',
+            'appVersion': exports.APP_VERSION,
+            'clientVersion': exports.CLIENT_VERSION
         };
     }
     /**
@@ -169,7 +219,16 @@ class Helpers {
     /**
      * Build request body for initial authentication step
      */
-    static reqBodyAuthStep1(manager, appId, terminalId) {
+    static reqBodyAuthStep1(manager, appId, terminalId, region = 'US') {
+        // Detect user's home region and country code
+        const userRegion = detectUserRegion(manager.username);
+        const userCountryCode = getCountryCodeFromRegion(region === 'EU' ? 'EU' : userRegion, manager.username);
+        logger_1.logger.debug('Authentication Step 1 - Region detection:', {
+            email: manager.username,
+            detectedRegion: userRegion,
+            requestRegion: region,
+            userCountryCode: userCountryCode
+        });
         return {
             'email': manager.username,
             'method': 'authByPWDOrOTM',
@@ -185,7 +244,7 @@ class Helpers {
             'terminalId': terminalId,
             'timeZone': manager.timeZone || exports.DEFAULT_TZ,
             'token': '',
-            'userCountryCode': 'US',
+            'userCountryCode': userCountryCode,
             'appID': appId,
             'sourceAppID': appId,
             'traceId': `APP${appId}${Math.floor(Date.now() / 1000)}`
@@ -402,7 +461,7 @@ class Helpers {
             // Generate terminal ID to be used in both steps
             const terminalId = generateTerminalId();
             // Step 1: Get authorization code
-            const step1Body = this.reqBodyAuthStep1(manager, appId, terminalId);
+            const step1Body = this.reqBodyAuthStep1(manager, appId, terminalId, region);
             const step1Headers = this.reqHeaderAuth();
             // Set the correct regional endpoint
             const originalUrl = getApiBaseUrl();
@@ -422,16 +481,22 @@ class Helpers {
             }
             if (authResponse.code !== 0) {
                 logger_1.logger.error('Step 1 error code:', authResponse.code, 'message:', authResponse.msg);
-                // Handle cross-region error
-                if (authResponse.code === exports.CROSS_REGION_ERROR_CODE) {
-                    logger_1.logger.debug('Cross-region error detected, will try different region');
+                // Check if it's a credential error (no point retrying)
+                if ((0, constants_1.isCredentialError)(authResponse.code)) {
+                    logger_1.logger.error('Credential error detected - invalid username or password');
+                    setApiBaseUrl(originalUrl); // Restore original URL
+                    return [false, null, null, 'credential_error'];
+                }
+                // Handle cross-region error (multiple error codes possible)
+                if ((0, constants_1.isCrossRegionError)(authResponse.code)) {
+                    logger_1.logger.debug('Cross-region error detected:', authResponse.code, 'will try different region');
                     setApiBaseUrl(originalUrl); // Restore original URL
                     return [false, null, null, 'cross_region'];
                 }
                 setApiBaseUrl(originalUrl); // Restore original URL
                 return [false, null, null, null];
             }
-            const { authorizeCode, bizToken, userCountryCode } = authResponse.result || {};
+            const { authorizeCode, bizToken } = authResponse.result || {};
             if (!authorizeCode) {
                 logger_1.logger.error('Missing authorization code in step 1 response:', authResponse.result);
                 setApiBaseUrl(originalUrl); // Restore original URL
@@ -439,59 +504,31 @@ class Helpers {
             }
             logger_1.logger.debug('Step 1 successful, got authorization code');
             // Step 2: Login with authorization code
-            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, userCountryCode);
+            // Use the appropriate country code based on the region we're authenticating with
+            const countryCodeForStep2 = region === 'EU' ? 'DE' : 'US';
+            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, countryCodeForStep2);
             logger_1.logger.debug('Step 2: Logging in with authorization code...');
             const [loginResponse, loginStatus] = await this.callApi('/user/api/accountManage/v1/loginByAuthorizeCode4Vesync', 'post', step2Body, step1Headers, manager);
+            logger_1.logger.debug('Step 2 response:', {
+                status: loginStatus,
+                code: loginResponse === null || loginResponse === void 0 ? void 0 : loginResponse.code,
+                hasResult: !!(loginResponse === null || loginResponse === void 0 ? void 0 : loginResponse.result),
+                msg: loginResponse === null || loginResponse === void 0 ? void 0 : loginResponse.msg
+            });
             if (!loginResponse || loginStatus !== 200) {
                 logger_1.logger.error('Step 2 failed:', loginResponse);
                 setApiBaseUrl(originalUrl); // Restore original URL on failure
                 return [false, null, null, null];
             }
             if (loginResponse.code !== 0) {
-                // Handle cross-region error with retry (like pyvesync PR #340)
-                if (loginResponse.code === exports.CROSS_REGION_ERROR_CODE) {
-                    logger_1.logger.debug('Cross-region error detected in Step 2, retrying with region change token...');
-                    const { bizToken: regionChangeToken, countryCode: newCountryCode } = loginResponse.result || {};
-                    if (regionChangeToken && newCountryCode) {
-                        // Retry Step 2 with region change token on the SAME endpoint
-                        // The region change token tells the server to handle the cross-region authentication
-                        const retryBody = {
-                            method: 'loginByAuthorizeCode4Vesync',
-                            authorizeCode: authorizeCode,
-                            acceptLanguage: 'en',
-                            clientInfo: exports.CLIENT_INFO,
-                            clientType: 'vesyncApp',
-                            clientVersion: exports.CLIENT_VERSION,
-                            debugMode: false,
-                            emailSubscriptions: false,
-                            osInfo: exports.PHONE_OS,
-                            terminalId: terminalId,
-                            timeZone: exports.DEFAULT_TZ,
-                            userCountryCode: newCountryCode,
-                            traceId: `APP${appId}${Math.floor(Date.now() / 1000)}`,
-                            bizToken: regionChangeToken,
-                            regionChange: 'last_region'
-                        };
-                        logger_1.logger.debug('Retrying Step 2 with region change token...', {
-                            newCountryCode,
-                            currentEndpoint: getApiBaseUrl()
-                        });
-                        const [retryResponse, retryStatus] = await this.callApi('/user/api/accountManage/v1/loginByAuthorizeCode4Vesync', 'post', retryBody, step1Headers, manager);
-                        if (retryResponse && retryResponse.code === 0) {
-                            const { token, accountID, countryCode } = retryResponse.result || {};
-                            if (token && accountID) {
-                                logger_1.logger.debug('Step 2 retry successful with region change');
-                                setApiBaseUrl(originalUrl); // Restore original URL on success
-                                return [true, token, accountID, countryCode || newCountryCode];
-                            }
-                        }
-                        logger_1.logger.error('Step 2 retry failed:', retryResponse);
-                        setApiBaseUrl(originalUrl); // Restore original URL on failure
-                        return [false, null, null, null];
-                    }
-                    else {
-                        logger_1.logger.error('No region change token in cross-region error response');
-                    }
+                logger_1.logger.debug('Step 2 error, code:', loginResponse.code, 'checking if cross-region...');
+                // Handle cross-region error - for EU accounts, we need to switch regions entirely
+                if (constants_1.CROSS_REGION_ERROR_CODES.includes(loginResponse.code)) {
+                    logger_1.logger.debug('Cross-region error detected in Step 2 - need to use different region');
+                    // For cross-region errors, we need to retry the entire flow with a different region
+                    // The authorization code from Step 1 is tied to the endpoint it was obtained from
+                    setApiBaseUrl(originalUrl); // Restore original URL
+                    return [false, null, null, 'cross_region_retry'];
                 }
                 logger_1.logger.error('Step 2 error code:', loginResponse.code, 'message:', loginResponse.msg);
                 setApiBaseUrl(originalUrl); // Restore original URL on error
@@ -504,7 +541,7 @@ class Helpers {
                 return [false, null, null, null];
             }
             logger_1.logger.debug('Step 2 successful, got token and accountID');
-            return [true, token, accountID, countryCode || userCountryCode];
+            return [true, token, accountID, countryCode || countryCodeForStep2];
         }
         catch (error) {
             logger_1.logger.error('New authentication flow error:', error);
@@ -528,6 +565,11 @@ class Helpers {
             }
             if (response.code && response.code !== 0) {
                 logger_1.logger.error('Legacy login error code:', response.code, 'message:', response.msg);
+                // Check if it's a credential error
+                if ((0, constants_1.isCredentialError)(response.code)) {
+                    logger_1.logger.error('Legacy auth: Credential error detected');
+                    return [false, null, null, 'credential_error'];
+                }
                 return [false, null, null, null];
             }
             const { token, accountID, countryCode } = response.result || {};

package/dist/lib/vesync.d.ts

@@ -36,6 +36,8 @@ export declare class VeSync {
     enabled: boolean;
     updateInterval: number;
     timeZone: string;
+    authFlowUsed?: 'legacy' | 'new';
+    apiBaseUrl?: string;
     fans: VeSyncBaseDevice[];
     outlets: VeSyncBaseDevice[];
     switches: VeSyncBaseDevice[];
@@ -46,13 +48,21 @@ export declare class VeSync {
      * @param username - VeSync account username
      * @param password - VeSync account password
      * @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
-     * @param customLogger - Optional custom logger implementation
-     * @param excludeConfig - Optional device exclusion configuration
-     */
-    constructor(username: string, password: string, timeZone?: string, debug?: boolean, redact?: boolean, apiUrl?: string, customLogger?: Logger, excludeConfig?: ExcludeConfig);
+     * @param optionsOrDebug - Either options object or debug flag for backward compatibility
+     * @param redact - Optional redact mode flag (used when optionsOrDebug is boolean)
+     * @param apiUrl - Optional API base URL override (used when optionsOrDebug is boolean)
+     * @param customLogger - Optional custom logger implementation (used when optionsOrDebug is boolean)
+     * @param excludeConfig - Optional device exclusion configuration (used when optionsOrDebug is boolean)
+     */
+    constructor(username: string, password: string, timeZone?: string, optionsOrDebug?: boolean | {
+        debug?: boolean;
+        redact?: boolean;
+        apiUrl?: string;
+        customLogger?: Logger;
+        excludeConfig?: ExcludeConfig;
+        region?: string;
+        debugMode?: boolean;
+    }, redact?: boolean, apiUrl?: string, customLogger?: Logger, excludeConfig?: ExcludeConfig);
     /**
      * Get/Set debug mode
      */

package/dist/lib/vesync.js

@@ -125,22 +125,37 @@ class VeSync {
      * @param username - VeSync account username
      * @param password - VeSync account password
      * @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
-     * @param customLogger - Optional custom logger implementation
-     * @param excludeConfig - Optional device exclusion configuration
+     * @param optionsOrDebug - Either options object or debug flag for backward compatibility
+     * @param redact - Optional redact mode flag (used when optionsOrDebug is boolean)
+     * @param apiUrl - Optional API base URL override (used when optionsOrDebug is boolean)
+     * @param customLogger - Optional custom logger implementation (used when optionsOrDebug is boolean)
+     * @param excludeConfig - Optional device exclusion configuration (used when optionsOrDebug is boolean)
      */
-    constructor(username, password, timeZone = helpers_1.DEFAULT_TZ, debug = false, redact = true, apiUrl, customLogger, excludeConfig) {
-        this._debug = debug;
-        this._redact = redact;
+    constructor(username, password, timeZone = helpers_1.DEFAULT_TZ, optionsOrDebug = false, redact = true, apiUrl, customLogger, excludeConfig) {
+        // Handle options object or backward compatible parameters
+        let options = {};
+        if (typeof optionsOrDebug === 'object' && optionsOrDebug !== null) {
+            // Using new options pattern
+            options = optionsOrDebug;
+            this._debug = options.debug || options.debugMode || false;
+            this._redact = options.redact !== undefined ? options.redact : true;
+            this._excludeConfig = options.excludeConfig || null;
+            this._region = options.region || 'US';
+            customLogger = options.customLogger;
+            apiUrl = options.apiUrl;
+        }
+        else {
+            // Using old parameter pattern for backward compatibility
+            this._debug = optionsOrDebug;
+            this._redact = redact;
+            this._excludeConfig = excludeConfig || null;
+            this._region = 'US';
+        }
         this._energyUpdateInterval = DEFAULT_ENERGY_UPDATE_INTERVAL;
         this._energyCheck = true;
         this._lastUpdateTs = null;
         this._inProcess = false;
-        this._excludeConfig = excludeConfig || null;
         this._appId = (0, helpers_1.generateAppId)();
-        this._region = 'US';
         this.username = username;
         this.password = password;
         this.token = null;
@@ -175,25 +190,28 @@ 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
+        // Set custom API URL if provided, otherwise use region-based endpoint
         if (apiUrl) {
             (0, helpers_1.setApiBaseUrl)(apiUrl);
         }
         else {
-            // Start with US endpoint as default
-            (0, helpers_1.setApiBaseUrl)('https://smartapi.vesync.com');
-            (0, helpers_1.setCurrentRegion)('US');
+            // Set endpoint based on region
+            const regionEndpoints = {
+                'US': 'https://smartapi.vesync.com',
+                'EU': 'https://smartapi.vesync.eu',
+                'CA': 'https://smartapi.vesync.com',
+                'MX': 'https://smartapi.vesync.com',
+                'JP': 'https://smartapi.vesync.com'
+            };
+            const endpoint = regionEndpoints[this._region] || 'https://smartapi.vesync.com';
+            (0, helpers_1.setApiBaseUrl)(endpoint);
+            (0, helpers_1.setCurrentRegion)(this._region);
         }
         // Set custom logger if provided
         if (customLogger) {
             (0, logger_1.setLogger)(customLogger);
         }
-        if (debug) {
-            this.debug = true;
-        }
-        if (redact) {
-            this.redact = true;
-        }
+        // Debug and redact are already set above in the options handling
     }
     /**
      * Get/Set debug mode
@@ -443,20 +461,55 @@ class VeSync {
         for (let attempt = 0; attempt < retryAttempts; attempt++) {
             try {
                 logger_1.logger.debug(`Authentication attempt ${attempt + 1} of ${retryAttempts}`);
-                // Try new authentication flow first
+                // Skip email-based region detection for now since we'll handle cross-region errors
+                // The cross-region error handling below will automatically switch to the correct region
+                // Try new authentication flow first with detected region
                 let [success, token, accountId, countryCode] = await helpers_1.Helpers.authNewFlow(this, this._appId, this._region);
+                // Track if new flow succeeded
+                if (success) {
+                    this.authFlowUsed = 'new';
+                }
                 if (!success) {
+                    // Check if it's a credential error (no point retrying)
+                    if (countryCode === 'credential_error') {
+                        logger_1.logger.error('Authentication failed due to invalid credentials');
+                        return false; // Exit immediately, don't retry
+                    }
                     // Check if we need to try a different region
-                    if (countryCode === 'cross_region') {
-                        logger_1.logger.debug('Cross-region error detected, trying EU region...');
-                        this._region = 'EU';
-                        (0, helpers_1.setCurrentRegion)('EU');
-                        [success, token, accountId, countryCode] = await helpers_1.Helpers.authNewFlow(this, this._appId, 'EU');
+                    if (countryCode === 'cross_region' || countryCode === 'cross_region_retry') {
+                        logger_1.logger.debug('Cross-region error detected, trying opposite region...');
+                        const alternateRegion = this._region === 'US' ? 'EU' : 'US';
+                        logger_1.logger.debug(`Switching from ${this._region} to ${alternateRegion} region`);
+                        this._region = alternateRegion;
+                        (0, helpers_1.setCurrentRegion)(alternateRegion);
+                        // Update the API endpoint for the new region
+                        const regionEndpoints = {
+                            'US': 'https://smartapi.vesync.com',
+                            'EU': 'https://smartapi.vesync.eu'
+                        };
+                        if (alternateRegion in regionEndpoints) {
+                            (0, helpers_1.setApiBaseUrl)(regionEndpoints[alternateRegion]);
+                            logger_1.logger.debug(`API endpoint set to ${regionEndpoints[alternateRegion]}`);
+                        }
+                        // Retry with the alternate region
+                        [success, token, accountId, countryCode] = await helpers_1.Helpers.authNewFlow(this, this._appId, alternateRegion);
+                        if (success) {
+                            this.authFlowUsed = 'new';
+                            logger_1.logger.debug(`Authentication successful with ${alternateRegion} region`);
+                        }
                     }
                     // If new flow still fails, try legacy authentication as fallback
                     if (!success) {
                         logger_1.logger.debug('New authentication flow failed, trying legacy flow...');
                         [success, token, accountId, countryCode] = await helpers_1.Helpers.authLegacyFlow(this);
+                        if (success) {
+                            this.authFlowUsed = 'legacy';
+                        }
+                        else if (countryCode === 'credential_error') {
+                            // Legacy auth also detected bad credentials
+                            logger_1.logger.error('Both authentication methods report invalid credentials');
+                            return false; // Exit immediately
+                        }
                     }
                 }
                 if (success && token && accountId) {
@@ -464,6 +517,7 @@ class VeSync {
                     this.accountId = accountId;
                     this.countryCode = countryCode;
                     this.enabled = true;
+                    this.apiBaseUrl = (0, helpers_1.getApiBaseUrl)(); // Track the API endpoint being used
                     // Set region based on country code if we got one
                     if (countryCode) {
                         const detectedRegion = (0, helpers_1.getRegionFromCountryCode)(countryCode);
@@ -474,6 +528,7 @@ class VeSync {
                         }
                     }
                     logger_1.logger.debug('Authentication successful!', {
+                        authFlow: this.authFlowUsed,
                         region: this._region,
                         countryCode: countryCode,
                         endpoint: (0, helpers_1.getApiBaseUrl)()

package/package.json

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

package/src/index.ts

@@ -11,4 +11,12 @@ export { VeSyncWallSwitch } from './lib/vesyncSwitchImpl';
 export { VeSyncBaseDevice } from './lib/vesyncBaseDevice';
 
 // Export helper functions
-export { Helpers, setApiBaseUrl } from './lib/helpers'; 
+export { Helpers, setApiBaseUrl } from './lib/helpers';
+
+// Export constants
+export {
+    CREDENTIAL_ERROR_CODES,
+    CROSS_REGION_ERROR_CODES,
+    isCredentialError,
+    isCrossRegionError
+} from './lib/constants'; 

package/src/lib/constants.ts

@@ -0,0 +1,35 @@
+/**
+ * VeSync API Error Codes
+ */
+
+// Authentication error codes that indicate bad credentials (no point retrying)
+export const CREDENTIAL_ERROR_CODES = [
+    -11201129,  // account or password incorrect
+    -11202129,  // the account does not exist
+    -11000129,  // illegal argument (empty credentials)
+];
+
+// Cross-region error codes that require region switching
+export const CROSS_REGION_ERROR_CODES = [
+    -11260022,  // cross region error
+    -11261022,  // access region conflict error
+];
+
+// Other error codes
+export const APP_VERSION_ERROR_CODES = [
+    -11012022,  // app version is too low
+];
+
+/**
+ * Check if an error code indicates bad credentials
+ */
+export function isCredentialError(code: number): boolean {
+    return CREDENTIAL_ERROR_CODES.includes(code);
+}
+
+/**
+ * Check if an error code indicates cross-region issue
+ */
+export function isCrossRegionError(code: number): boolean {
+    return CROSS_REGION_ERROR_CODES.includes(code);
+}

package/src/lib/helpers.ts

@@ -6,6 +6,7 @@ import axios from 'axios';
 import crypto from 'crypto';
 import { VeSync } from './vesync';
 import { logger } from './logger';
+import { isCredentialError, isCrossRegionError, CROSS_REGION_ERROR_CODES } from './constants';
 
 // API configuration - Support regional endpoints
 let _apiBaseUrl = 'https://smartapi.vesync.com';
@@ -51,7 +52,7 @@ export function getRegionFromCountryCode(countryCode: string): string {
 export const API_RATE_LIMIT = 30;
 export const API_TIMEOUT = 15000;
 
-export const APP_VERSION = '5.6.60';
+export const APP_VERSION = '5.7.16'; // Updated to newer version
 export const PHONE_BRAND = 'SM N9005';
 export const PHONE_OS = 'Android';
 export const CLIENT_INFO = 'SM N9005';
@@ -60,7 +61,7 @@ export const DEFAULT_TZ = 'America/New_York';
 export const DEFAULT_REGION = 'US';
 export const MOBILE_ID = '1234567890123456';
 export const BYPASS_HEADER_UA = 'okhttp/3.12.1';
-export const CLIENT_VERSION = 'VeSync 5.6.60';
+export const CLIENT_VERSION = 'VeSync 5.7.16';
 
 // Regional API endpoints
 export const REGION_ENDPOINTS = {
@@ -71,13 +72,58 @@ export const REGION_ENDPOINTS = {
     'EU': 'https://smartapi.vesync.eu'
 };
 
-// Cross-region error code
-export const CROSS_REGION_ERROR_CODE = -11260022;
+// Cross-region error codes - multiple versions exist
+// CROSS_REGION_ERROR_CODES moved to constants.ts
 export const APP_VERSION_TOO_LOW_ERROR_CODE = -11012022;
 
+// Authentication error codes
+export const AUTH_ERROR_CODES = {
+    ACCOUNT_PASSWORD_INCORRECT: -11201129,
+    ILLEGAL_ARGUMENT: -11000022,
+    CROSS_REGION: -11260022,
+    CROSS_REGION_ALT: -11261022
+};
+
+/**
+ * Detect user's home region from email domain or country hints
+ */
+export function detectUserRegion(email: string): string {
+    // Check for common EU email domains
+    const euDomains = ['.de', '.fr', '.it', '.es', '.nl', '.be', '.at', '.dk', '.se', '.no', '.fi', '.eu'];
+    const emailLower = email.toLowerCase();
+    
+    for (const domain of euDomains) {
+        if (emailLower.includes(domain)) {
+            return 'EU';
+        }
+    }
+    
+    // Default to US for unknown domains
+    return 'US';
+}
+
+/**
+ * Get country code from region
+ */
+export function getCountryCodeFromRegion(region: string, email?: string): string {
+    if (region === 'EU') {
+        // Try to detect specific EU country from email
+        if (email) {
+            const emailLower = email.toLowerCase();
+            if (emailLower.includes('.de') || emailLower.includes('german')) return 'DE';
+            if (emailLower.includes('.fr')) return 'FR';
+            if (emailLower.includes('.it')) return 'IT';
+            if (emailLower.includes('.es')) return 'ES';
+            if (emailLower.includes('.nl')) return 'NL';
+        }
+        return 'DE'; // Default to Germany for EU
+    }
+    return 'US'; // Default for non-EU
+}
+
 // Generate unique APP_ID for each session
 export function generateAppId(): string {
-    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    const chars = 'ABCDEFGHIJKLMNOPqRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
     let result = '';
     for (let i = 0; i < 8; i++) {
         result += chars.charAt(Math.floor(Math.random() * chars.length));
@@ -196,7 +242,9 @@ export class Helpers {
         return {
             'Content-Type': 'application/json; charset=UTF-8',
             'User-Agent': BYPASS_HEADER_UA,
-            'accept-language': 'en'
+            'accept-language': 'en',
+            'appVersion': APP_VERSION,
+            'clientVersion': CLIENT_VERSION
         };
     }
 
@@ -238,7 +286,18 @@ export class Helpers {
     /**
      * Build request body for initial authentication step
      */
-    static reqBodyAuthStep1(manager: VeSync, appId: string, terminalId: string): Record<string, any> {
+    static reqBodyAuthStep1(manager: VeSync, appId: string, terminalId: string, region: string = 'US'): Record<string, any> {
+        // Detect user's home region and country code
+        const userRegion = detectUserRegion(manager.username);
+        const userCountryCode = getCountryCodeFromRegion(region === 'EU' ? 'EU' : userRegion, manager.username);
+        
+        logger.debug('Authentication Step 1 - Region detection:', {
+            email: manager.username,
+            detectedRegion: userRegion,
+            requestRegion: region,
+            userCountryCode: userCountryCode
+        });
+        
         return {
             'email': manager.username,
             'method': 'authByPWDOrOTM',
@@ -254,7 +313,7 @@ export class Helpers {
             'terminalId': terminalId,
             'timeZone': manager.timeZone || DEFAULT_TZ,
             'token': '',
-            'userCountryCode': 'US',
+            'userCountryCode': userCountryCode,
             'appID': appId,
             'sourceAppID': appId,
             'traceId': `APP${appId}${Math.floor(Date.now() / 1000)}`
@@ -504,7 +563,7 @@ export class Helpers {
             const terminalId = generateTerminalId();
             
             // Step 1: Get authorization code
-            const step1Body = this.reqBodyAuthStep1(manager, appId, terminalId);
+            const step1Body = this.reqBodyAuthStep1(manager, appId, terminalId, region);
             const step1Headers = this.reqHeaderAuth();
             
             // Set the correct regional endpoint
@@ -536,9 +595,16 @@ export class Helpers {
             if (authResponse.code !== 0) {
                 logger.error('Step 1 error code:', authResponse.code, 'message:', authResponse.msg);
                 
-                // Handle cross-region error
-                if (authResponse.code === CROSS_REGION_ERROR_CODE) {
-                    logger.debug('Cross-region error detected, will try different region');
+                // Check if it's a credential error (no point retrying)
+                if (isCredentialError(authResponse.code)) {
+                    logger.error('Credential error detected - invalid username or password');
+                    setApiBaseUrl(originalUrl); // Restore original URL
+                    return [false, null, null, 'credential_error'];
+                }
+                
+                // Handle cross-region error (multiple error codes possible)
+                if (isCrossRegionError(authResponse.code)) {
+                    logger.debug('Cross-region error detected:', authResponse.code, 'will try different region');
                     setApiBaseUrl(originalUrl); // Restore original URL
                     return [false, null, null, 'cross_region'];
                 }
@@ -547,7 +613,7 @@ export class Helpers {
                 return [false, null, null, null];
             }
 
-            const { authorizeCode, bizToken, userCountryCode } = authResponse.result || {};
+            const { authorizeCode, bizToken } = authResponse.result || {};
             
             if (!authorizeCode) {
                 logger.error('Missing authorization code in step 1 response:', authResponse.result);
@@ -558,7 +624,9 @@ export class Helpers {
             logger.debug('Step 1 successful, got authorization code');
 
             // Step 2: Login with authorization code
-            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, userCountryCode);
+            // Use the appropriate country code based on the region we're authenticating with
+            const countryCodeForStep2 = region === 'EU' ? 'DE' : 'US';
+            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, countryCodeForStep2);
             
             logger.debug('Step 2: Logging in with authorization code...');
 
@@ -570,6 +638,13 @@ export class Helpers {
                 manager
             );
 
+            logger.debug('Step 2 response:', { 
+                status: loginStatus, 
+                code: loginResponse?.code, 
+                hasResult: !!loginResponse?.result,
+                msg: loginResponse?.msg 
+            });
+
             if (!loginResponse || loginStatus !== 200) {
                 logger.error('Step 2 failed:', loginResponse);
                 setApiBaseUrl(originalUrl); // Restore original URL on failure
@@ -577,61 +652,14 @@ export class Helpers {
             }
 
             if (loginResponse.code !== 0) {
-                // Handle cross-region error with retry (like pyvesync PR #340)
-                if (loginResponse.code === CROSS_REGION_ERROR_CODE) {
-                    logger.debug('Cross-region error detected in Step 2, retrying with region change token...');
-                    
-                    const { bizToken: regionChangeToken, countryCode: newCountryCode } = loginResponse.result || {};
-                    
-                    if (regionChangeToken && newCountryCode) {
-                        // Retry Step 2 with region change token on the SAME endpoint
-                        // The region change token tells the server to handle the cross-region authentication
-                        const retryBody = {
-                            method: 'loginByAuthorizeCode4Vesync',
-                            authorizeCode: authorizeCode,
-                            acceptLanguage: 'en',
-                            clientInfo: CLIENT_INFO,
-                            clientType: 'vesyncApp',
-                            clientVersion: CLIENT_VERSION,
-                            debugMode: false,
-                            emailSubscriptions: false,
-                            osInfo: PHONE_OS,
-                            terminalId: terminalId,
-                            timeZone: DEFAULT_TZ,
-                            userCountryCode: newCountryCode,
-                            traceId: `APP${appId}${Math.floor(Date.now() / 1000)}`,
-                            bizToken: regionChangeToken,
-                            regionChange: 'last_region'
-                        };
-                        
-                        logger.debug('Retrying Step 2 with region change token...', {
-                            newCountryCode,
-                            currentEndpoint: getApiBaseUrl()
-                        });
-                        
-                        const [retryResponse, retryStatus] = await this.callApi(
-                            '/user/api/accountManage/v1/loginByAuthorizeCode4Vesync',
-                            'post',
-                            retryBody,
-                            step1Headers,
-                            manager
-                        );
-                        
-                        if (retryResponse && retryResponse.code === 0) {
-                            const { token, accountID, countryCode } = retryResponse.result || {};
-                            if (token && accountID) {
-                                logger.debug('Step 2 retry successful with region change');
-                                setApiBaseUrl(originalUrl); // Restore original URL on success
-                                return [true, token, accountID, countryCode || newCountryCode];
-                            }
-                        }
-                        
-                        logger.error('Step 2 retry failed:', retryResponse);
-                        setApiBaseUrl(originalUrl); // Restore original URL on failure
-                        return [false, null, null, null];
-                    } else {
-                        logger.error('No region change token in cross-region error response');
-                    }
+                logger.debug('Step 2 error, code:', loginResponse.code, 'checking if cross-region...');
+                // Handle cross-region error - for EU accounts, we need to switch regions entirely
+                if (CROSS_REGION_ERROR_CODES.includes(loginResponse.code)) {
+                    logger.debug('Cross-region error detected in Step 2 - need to use different region');
+                    // For cross-region errors, we need to retry the entire flow with a different region
+                    // The authorization code from Step 1 is tied to the endpoint it was obtained from
+                    setApiBaseUrl(originalUrl); // Restore original URL
+                    return [false, null, null, 'cross_region_retry'];
                 }
                 
                 logger.error('Step 2 error code:', loginResponse.code, 'message:', loginResponse.msg);
@@ -649,7 +677,7 @@ export class Helpers {
             }
 
             logger.debug('Step 2 successful, got token and accountID');
-            return [true, token, accountID, countryCode || userCountryCode];
+            return [true, token, accountID, countryCode || countryCodeForStep2];
 
         } catch (error) {
             logger.error('New authentication flow error:', error);
@@ -684,6 +712,13 @@ export class Helpers {
 
             if (response.code && response.code !== 0) {
                 logger.error('Legacy login error code:', response.code, 'message:', response.msg);
+                
+                // Check if it's a credential error
+                if (isCredentialError(response.code)) {
+                    logger.error('Legacy auth: Credential error detected');
+                    return [false, null, null, 'credential_error'];
+                }
+                
                 return [false, null, null, null];
             }
 

package/src/lib/vesync.ts

@@ -2,7 +2,7 @@
  * VeSync API Device Library
  */
 
-import { Helpers, API_RATE_LIMIT, DEFAULT_TZ, setApiBaseUrl, getApiBaseUrl, generateAppId, getRegionFromCountryCode, setCurrentRegion, getCurrentRegion, REGION_ENDPOINTS } from './helpers';
+import { Helpers, API_RATE_LIMIT, DEFAULT_TZ, setApiBaseUrl, getApiBaseUrl, generateAppId, getRegionFromCountryCode, setCurrentRegion, getCurrentRegion, REGION_ENDPOINTS, getCountryCodeFromRegion } from './helpers';
 import { VeSyncBaseDevice } from './vesyncBaseDevice';
 import { fanModules } from './vesyncFanImpl';
 import { outletModules } from './vesyncOutletImpl';
@@ -171,6 +171,8 @@ export class VeSync {
     enabled: boolean;
     updateInterval: number;
     timeZone: string;
+    authFlowUsed?: 'legacy' | 'new';  // Track which auth flow was used
+    apiBaseUrl?: string;  // Track which API endpoint is being used
 
     fans: VeSyncBaseDevice[];
     outlets: VeSyncBaseDevice[];
@@ -183,31 +185,54 @@ export class VeSync {
      * @param username - VeSync account username
      * @param password - VeSync account password
      * @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
-     * @param customLogger - Optional custom logger implementation
-     * @param excludeConfig - Optional device exclusion configuration
+     * @param optionsOrDebug - Either options object or debug flag for backward compatibility
+     * @param redact - Optional redact mode flag (used when optionsOrDebug is boolean)
+     * @param apiUrl - Optional API base URL override (used when optionsOrDebug is boolean)
+     * @param customLogger - Optional custom logger implementation (used when optionsOrDebug is boolean)
+     * @param excludeConfig - Optional device exclusion configuration (used when optionsOrDebug is boolean)
      */
     constructor(
         username: string,
         password: string,
         timeZone: string = DEFAULT_TZ,
-        debug = false,
+        optionsOrDebug: boolean | {
+            debug?: boolean;
+            redact?: boolean;
+            apiUrl?: string;
+            customLogger?: Logger;
+            excludeConfig?: ExcludeConfig;
+            region?: string;
+            debugMode?: boolean;  // Alias for debug
+        } = false,
         redact = true,
         apiUrl?: string,
         customLogger?: Logger,
         excludeConfig?: ExcludeConfig
     ) {
-        this._debug = debug;
-        this._redact = redact;
+        // Handle options object or backward compatible parameters
+        let options: any = {};
+        if (typeof optionsOrDebug === 'object' && optionsOrDebug !== null) {
+            // Using new options pattern
+            options = optionsOrDebug;
+            this._debug = options.debug || options.debugMode || false;
+            this._redact = options.redact !== undefined ? options.redact : true;
+            this._excludeConfig = options.excludeConfig || null;
+            this._region = options.region || 'US';
+            customLogger = options.customLogger;
+            apiUrl = options.apiUrl;
+        } else {
+            // Using old parameter pattern for backward compatibility
+            this._debug = optionsOrDebug as boolean;
+            this._redact = redact;
+            this._excludeConfig = excludeConfig || null;
+            this._region = 'US';
+        }
+
         this._energyUpdateInterval = DEFAULT_ENERGY_UPDATE_INTERVAL;
         this._energyCheck = true;
         this._lastUpdateTs = null;
         this._inProcess = false;
-        this._excludeConfig = excludeConfig || null;
         this._appId = generateAppId();
-        this._region = 'US';
 
         this.username = username;
         this.password = password;
@@ -245,13 +270,21 @@ export class VeSync {
             logger.debug('Time zone is not a string');
         }
 
-        // Set custom API URL if provided, otherwise use default US endpoint
+        // Set custom API URL if provided, otherwise use region-based endpoint
         if (apiUrl) {
             setApiBaseUrl(apiUrl);
         } else {
-            // Start with US endpoint as default
-            setApiBaseUrl('https://smartapi.vesync.com');
-            setCurrentRegion('US');
+            // Set endpoint based on region
+            const regionEndpoints: Record<string, string> = {
+                'US': 'https://smartapi.vesync.com',
+                'EU': 'https://smartapi.vesync.eu',
+                'CA': 'https://smartapi.vesync.com',
+                'MX': 'https://smartapi.vesync.com',
+                'JP': 'https://smartapi.vesync.com'
+            };
+            const endpoint = regionEndpoints[this._region] || 'https://smartapi.vesync.com';
+            setApiBaseUrl(endpoint);
+            setCurrentRegion(this._region);
         }
 
         // Set custom logger if provided
@@ -259,13 +292,7 @@ export class VeSync {
             setLogger(customLogger);
         }
 
-        if (debug) {
-            this.debug = true;
-        }
-
-        if (redact) {
-            this.redact = true;
-        }
+        // Debug and redact are already set above in the options handling
     }
 
     /**
@@ -548,22 +575,62 @@ export class VeSync {
             try {
                 logger.debug(`Authentication attempt ${attempt + 1} of ${retryAttempts}`);
 
-                // Try new authentication flow first
+                // Skip email-based region detection for now since we'll handle cross-region errors
+                // The cross-region error handling below will automatically switch to the correct region
+
+                // Try new authentication flow first with detected region
                 let [success, token, accountId, countryCode] = await Helpers.authNewFlow(this, this._appId, this._region);
+                
+                // Track if new flow succeeded
+                if (success) {
+                    this.authFlowUsed = 'new';
+                }
 
                 if (!success) {
+                    // Check if it's a credential error (no point retrying)
+                    if (countryCode === 'credential_error') {
+                        logger.error('Authentication failed due to invalid credentials');
+                        return false;  // Exit immediately, don't retry
+                    }
+                    
                     // Check if we need to try a different region
-                    if (countryCode === 'cross_region') {
-                        logger.debug('Cross-region error detected, trying EU region...');
-                        this._region = 'EU';
-                        setCurrentRegion('EU');
-                        [success, token, accountId, countryCode] = await Helpers.authNewFlow(this, this._appId, 'EU');
+                    if (countryCode === 'cross_region' || countryCode === 'cross_region_retry') {
+                        logger.debug('Cross-region error detected, trying opposite region...');
+                        const alternateRegion = this._region === 'US' ? 'EU' : 'US';
+                        logger.debug(`Switching from ${this._region} to ${alternateRegion} region`);
+                        
+                        this._region = alternateRegion;
+                        setCurrentRegion(alternateRegion);
+                        
+                        // Update the API endpoint for the new region
+                        const regionEndpoints: Record<string, string> = {
+                            'US': 'https://smartapi.vesync.com',
+                            'EU': 'https://smartapi.vesync.eu'
+                        };
+                        if (alternateRegion in regionEndpoints) {
+                            setApiBaseUrl(regionEndpoints[alternateRegion]);
+                            logger.debug(`API endpoint set to ${regionEndpoints[alternateRegion]}`);
+                        }
+                        
+                        // Retry with the alternate region
+                        [success, token, accountId, countryCode] = await Helpers.authNewFlow(this, this._appId, alternateRegion);
+                        if (success) {
+                            this.authFlowUsed = 'new';
+                            logger.debug(`Authentication successful with ${alternateRegion} region`);
+                        }
                     }
 
                     // If new flow still fails, try legacy authentication as fallback
                     if (!success) {
                         logger.debug('New authentication flow failed, trying legacy flow...');
                         [success, token, accountId, countryCode] = await Helpers.authLegacyFlow(this);
+                        if (success) {
+                            this.authFlowUsed = 'legacy';
+                        } else if (countryCode === 'credential_error') {
+                            // Legacy auth also detected bad credentials
+                            logger.error('Both authentication methods report invalid credentials');
+                            return false;  // Exit immediately
+                        }
                     }
                 }
 
@@ -572,6 +639,7 @@ export class VeSync {
                     this.accountId = accountId;
                     this.countryCode = countryCode;
                     this.enabled = true;
+                    this.apiBaseUrl = getApiBaseUrl();  // Track the API endpoint being used
 
                     // Set region based on country code if we got one
                     if (countryCode) {
@@ -584,6 +652,7 @@ export class VeSync {
                     }
 
                     logger.debug('Authentication successful!', {
+                        authFlow: this.authFlowUsed,
                         region: this._region,
                         countryCode: countryCode,
                         endpoint: getApiBaseUrl()