tsvesync 1.0.97 → 1.0.99

package/dist/lib/helpers.d.ts

@@ -12,6 +12,7 @@ export declare const API_TIMEOUT = 15000;
 export declare const APP_VERSION = "5.6.60";
 export declare const PHONE_BRAND = "SM N9005";
 export declare const PHONE_OS = "Android";
+export declare const CLIENT_INFO = "SM N9005";
 export declare const USER_TYPE = "1";
 export declare const DEFAULT_TZ = "America/New_York";
 export declare const DEFAULT_REGION = "US";
@@ -28,6 +29,7 @@ export declare const REGION_ENDPOINTS: {
 export declare const CROSS_REGION_ERROR_CODE = -11260022;
 export declare const APP_VERSION_TOO_LOW_ERROR_CODE = -11012022;
 export declare function generateAppId(): string;
+export declare function generateTerminalId(): string;
 export interface RequestBody {
     acceptLanguage?: string;
     accountID?: string;
@@ -111,11 +113,11 @@ export declare class Helpers {
     /**
      * Build request body for initial authentication step
      */
-    static reqBodyAuthStep1(manager: VeSync, appId: string): Record<string, any>;
+    static reqBodyAuthStep1(manager: VeSync, appId: string, terminalId: string): Record<string, any>;
     /**
      * Build request body for second authentication step (login with authorize code)
      */
-    static reqBodyAuthStep2(authorizeCode: string, bizToken: string, appId: string, userCountryCode?: string): Record<string, any>;
+    static reqBodyAuthStep2(authorizeCode: string, bizToken: string | null, appId: string, terminalId: string, userCountryCode?: string, regionChange?: string): Record<string, any>;
     /**
      * Builder for body of api requests
      */

package/dist/lib/helpers.js

@@ -6,13 +6,14 @@ 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.PHONE_OS = exports.PHONE_BRAND = exports.APP_VERSION = exports.API_TIMEOUT = exports.API_RATE_LIMIT = void 0;
+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.getApiBaseUrl = getApiBaseUrl;
 exports.setApiBaseUrl = setApiBaseUrl;
 exports.getCurrentRegion = getCurrentRegion;
 exports.setCurrentRegion = setCurrentRegion;
 exports.getRegionFromCountryCode = getRegionFromCountryCode;
 exports.generateAppId = generateAppId;
+exports.generateTerminalId = generateTerminalId;
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = __importDefault(require("crypto"));
 const logger_1 = require("./logger");
@@ -53,6 +54,7 @@ exports.API_TIMEOUT = 15000;
 exports.APP_VERSION = '5.6.60';
 exports.PHONE_BRAND = 'SM N9005';
 exports.PHONE_OS = 'Android';
+exports.CLIENT_INFO = 'SM N9005';
 exports.USER_TYPE = '1';
 exports.DEFAULT_TZ = 'America/New_York';
 exports.DEFAULT_REGION = 'US';
@@ -79,6 +81,15 @@ function generateAppId() {
     }
     return result;
 }
+// Generate unique terminal ID for authentication
+function generateTerminalId() {
+    const chars = 'abcdef0123456789';
+    let result = '';
+    for (let i = 0; i < 16; i++) {
+        result += chars.charAt(Math.floor(Math.random() * chars.length));
+    }
+    return result;
+}
 class Helpers {
     /**
      * Calculate MD5 hash
@@ -158,36 +169,54 @@ class Helpers {
     /**
      * Build request body for initial authentication step
      */
-    static reqBodyAuthStep1(manager, appId) {
+    static reqBodyAuthStep1(manager, appId, terminalId) {
         return {
             'email': manager.username,
+            'method': 'authByPWDOrOTM',
             'password': this.hashPassword(manager.password),
-            'timeZone': manager.timeZone,
             'acceptLanguage': 'en',
-            'appVersion': exports.APP_VERSION,
-            'phoneBrand': exports.PHONE_BRAND,
-            'phoneOS': exports.PHONE_OS,
-            'traceId': Date.now().toString(),
-            'authProtocolType': 'pwd',
-            'clientType': 'android',
-            'sourceAppID': 'vesync_android',
+            'accountID': '',
+            'authProtocolType': 'generic',
+            'clientInfo': exports.CLIENT_INFO,
+            'clientType': 'vesyncApp',
+            'clientVersion': exports.CLIENT_VERSION,
+            'debugMode': false,
+            'osInfo': exports.PHONE_OS,
+            'terminalId': terminalId,
+            'timeZone': manager.timeZone || exports.DEFAULT_TZ,
+            'token': '',
+            'userCountryCode': 'US',
             'appID': appId,
-            'clientVersion': exports.CLIENT_VERSION
+            'sourceAppID': appId,
+            'traceId': `APP${appId}${Math.floor(Date.now() / 1000)}`
         };
     }
     /**
      * Build request body for second authentication step (login with authorize code)
      */
-    static reqBodyAuthStep2(authorizeCode, bizToken, appId, userCountryCode) {
+    static reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, userCountryCode, regionChange) {
         const body = {
+            'method': 'loginByAuthorizeCode4Vesync',
             'authorizeCode': authorizeCode,
-            'bizToken': bizToken,
-            'appID': appId,
+            'acceptLanguage': 'en',
+            'clientInfo': exports.CLIENT_INFO,
+            'clientType': 'vesyncApp',
             'clientVersion': exports.CLIENT_VERSION,
-            'acceptLanguage': 'en'
+            'debugMode': false,
+            'emailSubscriptions': false,
+            'osInfo': exports.PHONE_OS,
+            'terminalId': terminalId,
+            'timeZone': exports.DEFAULT_TZ,
+            'userCountryCode': userCountryCode || 'US',
+            'traceId': `APP${appId}${Math.floor(Date.now() / 1000)}`
         };
-        if (userCountryCode) {
-            body.userCountryCode = userCountryCode;
+        // Only include bizToken if it's not null
+        if (bizToken) {
+            body.bizToken = bizToken;
+        }
+        // Only include regionChange if provided
+        if (regionChange) {
+            body.regionChange = regionChange;
         }
         return body;
     }
@@ -370,8 +399,10 @@ class Helpers {
      */
     static async authNewFlow(manager, appId, region = 'US') {
         try {
+            // Generate terminal ID to be used in both steps
+            const terminalId = generateTerminalId();
             // Step 1: Get authorization code
-            const step1Body = this.reqBodyAuthStep1(manager, appId);
+            const step1Body = this.reqBodyAuthStep1(manager, appId, terminalId);
             const step1Headers = this.reqHeaderAuth();
             // Set the correct regional endpoint
             const originalUrl = getApiBaseUrl();
@@ -401,14 +432,14 @@ class Helpers {
                 return [false, null, null, null];
             }
             const { authorizeCode, bizToken, userCountryCode } = authResponse.result || {};
-            if (!authorizeCode || !bizToken) {
-                logger_1.logger.error('Missing required fields in step 1 response:', authResponse.result);
+            if (!authorizeCode) {
+                logger_1.logger.error('Missing authorization code in step 1 response:', authResponse.result);
                 setApiBaseUrl(originalUrl); // Restore original URL
                 return [false, null, null, null];
             }
             logger_1.logger.debug('Step 1 successful, got authorization code');
             // Step 2: Login with authorization code
-            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, userCountryCode);
+            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, userCountryCode);
             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);
             setApiBaseUrl(originalUrl); // Restore original URL
@@ -417,6 +448,30 @@ class Helpers {
                 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) {
+                        // Retry Step 2 with region change token
+                        const retryBody = {
+                            ...step2Body,
+                            bizToken: regionChangeToken,
+                            regionChange: 'last_region',
+                            userCountryCode: newCountryCode || userCountryCode
+                        };
+                        logger_1.logger.debug('Retrying Step 2 with region change token...');
+                        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');
+                                return [true, token, accountID, countryCode || newCountryCode];
+                            }
+                        }
+                        logger_1.logger.error('Step 2 retry failed:', retryResponse);
+                    }
+                }
                 logger_1.logger.error('Step 2 error code:', loginResponse.code, 'message:', loginResponse.msg);
                 return [false, null, null, null];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsvesync",
-  "version": "1.0.97",
+  "version": "1.0.99",
   "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

@@ -54,6 +54,7 @@ export const API_TIMEOUT = 15000;
 export const APP_VERSION = '5.6.60';
 export const PHONE_BRAND = 'SM N9005';
 export const PHONE_OS = 'Android';
+export const CLIENT_INFO = 'SM N9005';
 export const USER_TYPE = '1';
 export const DEFAULT_TZ = 'America/New_York';
 export const DEFAULT_REGION = 'US';
@@ -84,6 +85,16 @@ export function generateAppId(): string {
     return result;
 }
 
+// Generate unique terminal ID for authentication
+export function generateTerminalId(): string {
+    const chars = 'abcdef0123456789';
+    let result = '';
+    for (let i = 0; i < 16; i++) {
+        result += chars.charAt(Math.floor(Math.random() * chars.length));
+    }
+    return result;
+}
+
 export interface RequestBody {
     acceptLanguage?: string;
     accountID?: string;
@@ -227,38 +238,57 @@ export class Helpers {
     /**
      * Build request body for initial authentication step
      */
-    static reqBodyAuthStep1(manager: VeSync, appId: string): Record<string, any> {
+    static reqBodyAuthStep1(manager: VeSync, appId: string, terminalId: string): Record<string, any> {
         return {
             'email': manager.username,
+            'method': 'authByPWDOrOTM',
             'password': this.hashPassword(manager.password),
-            'timeZone': manager.timeZone,
             'acceptLanguage': 'en',
-            'appVersion': APP_VERSION,
-            'phoneBrand': PHONE_BRAND,
-            'phoneOS': PHONE_OS,
-            'traceId': Date.now().toString(),
-            'authProtocolType': 'pwd',
-            'clientType': 'android',
-            'sourceAppID': 'vesync_android',
+            'accountID': '',
+            'authProtocolType': 'generic',
+            'clientInfo': CLIENT_INFO,
+            'clientType': 'vesyncApp',
+            'clientVersion': CLIENT_VERSION,
+            'debugMode': false,
+            'osInfo': PHONE_OS,
+            'terminalId': terminalId,
+            'timeZone': manager.timeZone || DEFAULT_TZ,
+            'token': '',
+            'userCountryCode': 'US',
             'appID': appId,
-            'clientVersion': CLIENT_VERSION
+            'sourceAppID': appId,
+            'traceId': `APP${appId}${Math.floor(Date.now() / 1000)}`
         };
     }
 
     /**
      * Build request body for second authentication step (login with authorize code)
      */
-    static reqBodyAuthStep2(authorizeCode: string, bizToken: string, appId: string, userCountryCode?: string): Record<string, any> {
+    static reqBodyAuthStep2(authorizeCode: string, bizToken: string | null, appId: string, terminalId: string, userCountryCode?: string, regionChange?: string): Record<string, any> {
         const body: Record<string, any> = {
+            'method': 'loginByAuthorizeCode4Vesync',
             'authorizeCode': authorizeCode,
-            'bizToken': bizToken,
-            'appID': appId,
+            'acceptLanguage': 'en',
+            'clientInfo': CLIENT_INFO,
+            'clientType': 'vesyncApp',
             'clientVersion': CLIENT_VERSION,
-            'acceptLanguage': 'en'
+            'debugMode': false,
+            'emailSubscriptions': false,
+            'osInfo': PHONE_OS,
+            'terminalId': terminalId,
+            'timeZone': DEFAULT_TZ,
+            'userCountryCode': userCountryCode || 'US',
+            'traceId': `APP${appId}${Math.floor(Date.now() / 1000)}`
         };
 
-        if (userCountryCode) {
-            body.userCountryCode = userCountryCode;
+        // Only include bizToken if it's not null
+        if (bizToken) {
+            body.bizToken = bizToken;
+        }
+        
+        // Only include regionChange if provided
+        if (regionChange) {
+            body.regionChange = regionChange;
         }
 
         return body;
@@ -470,8 +500,11 @@ export class Helpers {
      */
     static async authNewFlow(manager: VeSync, appId: string, region: string = 'US'): Promise<[boolean, string | null, string | null, string | null]> {
         try {
+            // Generate terminal ID to be used in both steps
+            const terminalId = generateTerminalId();
+            
             // Step 1: Get authorization code
-            const step1Body = this.reqBodyAuthStep1(manager, appId);
+            const step1Body = this.reqBodyAuthStep1(manager, appId, terminalId);
             const step1Headers = this.reqHeaderAuth();
             
             // Set the correct regional endpoint
@@ -516,8 +549,8 @@ export class Helpers {
 
             const { authorizeCode, bizToken, userCountryCode } = authResponse.result || {};
             
-            if (!authorizeCode || !bizToken) {
-                logger.error('Missing required fields in step 1 response:', authResponse.result);
+            if (!authorizeCode) {
+                logger.error('Missing authorization code in step 1 response:', authResponse.result);
                 setApiBaseUrl(originalUrl); // Restore original URL
                 return [false, null, null, null];
             }
@@ -525,7 +558,7 @@ export class Helpers {
             logger.debug('Step 1 successful, got authorization code');
 
             // Step 2: Login with authorization code
-            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, userCountryCode);
+            const step2Body = this.reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, userCountryCode);
             
             logger.debug('Step 2: Logging in with authorization code...');
 
@@ -545,6 +578,43 @@ 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) {
+                        // Retry Step 2 with region change token
+                        const retryBody = {
+                            ...step2Body,
+                            bizToken: regionChangeToken,
+                            regionChange: 'last_region',
+                            userCountryCode: newCountryCode || userCountryCode
+                        };
+                        
+                        logger.debug('Retrying Step 2 with region change token...');
+                        
+                        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');
+                                return [true, token, accountID, countryCode || newCountryCode];
+                            }
+                        }
+                        
+                        logger.error('Step 2 retry failed:', retryResponse);
+                    }
+                }
+                
                 logger.error('Step 2 error code:', loginResponse.code, 'message:', loginResponse.msg);
                 return [false, null, null, null];
             }