tsvesync 1.0.98 → 1.0.99

package/dist/lib/helpers.d.ts

@@ -117,7 +117,7 @@ export declare class Helpers {
     /**
      * Build request body for second authentication step (login with authorize code)
      */
-    static reqBodyAuthStep2(authorizeCode: string, bizToken: string | null, appId: string, terminalId: 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

@@ -194,7 +194,7 @@ class Helpers {
     /**
      * Build request body for second authentication step (login with authorize code)
      */
-    static reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, userCountryCode) {
+    static reqBodyAuthStep2(authorizeCode, bizToken, appId, terminalId, userCountryCode, regionChange) {
         const body = {
             'method': 'loginByAuthorizeCode4Vesync',
             'authorizeCode': authorizeCode,
@@ -214,6 +214,10 @@ class Helpers {
         if (bizToken) {
             body.bizToken = bizToken;
         }
+        // Only include regionChange if provided
+        if (regionChange) {
+            body.regionChange = regionChange;
+        }
         return body;
     }
     /**
@@ -444,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.98",
+  "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

@@ -264,7 +264,7 @@ export class Helpers {
     /**
      * Build request body for second authentication step (login with authorize code)
      */
-    static reqBodyAuthStep2(authorizeCode: string, bizToken: string | null, appId: string, terminalId: 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,
@@ -285,6 +285,11 @@ export class Helpers {
         if (bizToken) {
             body.bizToken = bizToken;
         }
+        
+        // Only include regionChange if provided
+        if (regionChange) {
+            body.regionChange = regionChange;
+        }
 
         return body;
     }
@@ -573,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];
             }