tsvesync 1.3.11 → 1.3.12

package/README.md

@@ -4,6 +4,9 @@ A TypeScript library for interacting with VeSync smart home devices. This librar
 
 ## 🆕 Recent Updates
 
+- **ESWD16 State Parity (v1.3.12)**: Bypass calls now reuse pyvesync-style trace IDs and mark the dimmer on after backlight tweaks, eliminating the lingering “off” state in HomeKit.
+- **ESWD16 Bypass Compatibility (v1.3.11)**: Migrated the dimmer switch to the modern bypass-v1 API so power, brightness, and indicator updates stay in sync with pyvesync.
+- **ESL Bulb API Parity (v1.3.10)**: ESL100/ESL100CW/ESL100MC now mirror pyvesync `/SmartBulb/v1` and `/cloud/v2` payloads for brightness and colour control.
 - **Enhanced Authentication**: Now supports the new VeSync authentication flow (pyvesync PR #340) with automatic fallback to legacy authentication
 - **Regional API Support**: Automatic detection and routing for US (`smartapi.vesync.com`) and EU (`smartapi.vesync.eu`) endpoints
 - **International Account Support**: Full support for accounts worldwide including Australia, New Zealand, Japan, and all European countries

package/dist/lib/helpers.d.ts

@@ -52,6 +52,7 @@ export declare function detectUserRegion(email: string): string;
 export declare function getCountryCodeFromRegion(region: string, email?: string): string;
 export declare function generateAppId(): string;
 export declare function generateTerminalId(): string;
+export declare function generateTraceId(): string;
 export interface RequestBody {
     acceptLanguage?: string;
     accountID?: string;
@@ -104,6 +105,7 @@ export interface LoginResponse {
 }
 export declare class Helpers {
     static shouldRedact: boolean;
+    static generateTraceId(): string;
     /**
      * Calculate MD5 hash
      */

package/dist/lib/helpers.js

@@ -18,6 +18,7 @@ exports.detectUserRegion = detectUserRegion;
 exports.getCountryCodeFromRegion = getCountryCodeFromRegion;
 exports.generateAppId = generateAppId;
 exports.generateTerminalId = generateTerminalId;
+exports.generateTraceId = generateTraceId;
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = __importDefault(require("crypto"));
 const logger_1 = require("./logger");
@@ -172,7 +173,15 @@ function generateTerminalId() {
     }
     return result;
 }
+function generateTraceId() {
+    const timestamp = Math.floor(Date.now() / 1000);
+    const randomPart = Math.floor(Math.random() * 100000).toString().padStart(5, '0');
+    return `APP${exports.MOBILE_ID.slice(-5, -1)}${timestamp}-${randomPart}`;
+}
 class Helpers {
+    static generateTraceId() {
+        return generateTraceId();
+    }
     /**
      * Calculate MD5 hash
      */

package/dist/lib/vesyncSwitchImpl.js

@@ -116,24 +116,25 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
      * Get dimmer switch details
      */
     async getDetails() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         logger_1.logger.debug(`Getting details for device: ${this.deviceName}`);
-        const [response, statusCode] = await this.callDimmerCommand('deviceDetail', {}, 'deviceDetail');
+        const [response, statusCode] = await this.callDimmerCommand('deviceDetail', {});
         const success = this.checkResponse([response, statusCode], 'getDetails');
-        if (success && (response === null || response === void 0 ? void 0 : response.result)) {
-            const result = response.result;
+        const resultWrapper = (_b = (_a = response === null || response === void 0 ? void 0 : response.result) === null || _a === void 0 ? void 0 : _a.result) !== null && _b !== void 0 ? _b : response === null || response === void 0 ? void 0 : response.result;
+        if (success && resultWrapper) {
+            const result = resultWrapper;
             this.stateSnapshot = {
-                activeTime: (_a = result.activeTime) !== null && _a !== void 0 ? _a : this.stateSnapshot.activeTime,
-                connectionStatus: (_b = result.connectionStatus) !== null && _b !== void 0 ? _b : this.stateSnapshot.connectionStatus,
-                brightness: Number((_c = result.brightness) !== null && _c !== void 0 ? _c : this.stateSnapshot.brightness),
-                rgbStatus: (_d = result.rgbStatus) !== null && _d !== void 0 ? _d : this.stateSnapshot.rgbStatus,
-                indicatorStatus: (_e = result.indicatorlightStatus) !== null && _e !== void 0 ? _e : this.stateSnapshot.indicatorStatus,
+                activeTime: (_c = result.activeTime) !== null && _c !== void 0 ? _c : this.stateSnapshot.activeTime,
+                connectionStatus: (_d = result.connectionStatus) !== null && _d !== void 0 ? _d : this.stateSnapshot.connectionStatus,
+                brightness: Number((_e = result.brightness) !== null && _e !== void 0 ? _e : this.stateSnapshot.brightness),
+                rgbStatus: (_f = result.rgbStatus) !== null && _f !== void 0 ? _f : this.stateSnapshot.rgbStatus,
+                indicatorStatus: (_g = result.indicatorlightStatus) !== null && _g !== void 0 ? _g : this.stateSnapshot.indicatorStatus,
                 rgbValue: {
-                    red: Number((_g = (_f = result.rgbValue) === null || _f === void 0 ? void 0 : _f.red) !== null && _g !== void 0 ? _g : this.stateSnapshot.rgbValue.red),
-                    green: Number((_j = (_h = result.rgbValue) === null || _h === void 0 ? void 0 : _h.green) !== null && _j !== void 0 ? _j : this.stateSnapshot.rgbValue.green),
-                    blue: Number((_l = (_k = result.rgbValue) === null || _k === void 0 ? void 0 : _k.blue) !== null && _l !== void 0 ? _l : this.stateSnapshot.rgbValue.blue)
+                    red: Number((_j = (_h = result.rgbValue) === null || _h === void 0 ? void 0 : _h.red) !== null && _j !== void 0 ? _j : this.stateSnapshot.rgbValue.red),
+                    green: Number((_l = (_k = result.rgbValue) === null || _k === void 0 ? void 0 : _k.green) !== null && _l !== void 0 ? _l : this.stateSnapshot.rgbValue.green),
+                    blue: Number((_o = (_m = result.rgbValue) === null || _m === void 0 ? void 0 : _m.blue) !== null && _o !== void 0 ? _o : this.stateSnapshot.rgbValue.blue)
                 },
-                deviceStatus: (_m = result.deviceStatus) !== null && _m !== void 0 ? _m : this.stateSnapshot.deviceStatus
+                deviceStatus: (_p = result.deviceStatus) !== null && _p !== void 0 ? _p : this.stateSnapshot.deviceStatus
             };
             this.details.active_time = this.stateSnapshot.activeTime;
             this.connectionStatus = this.stateSnapshot.connectionStatus;
@@ -184,12 +185,14 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Setting brightness to ${brightness} for device: ${this.deviceName}`);
         const value = Math.max(0, Math.min(100, Math.round(brightness)));
         const [response] = await this.callDimmerCommand('dimmerBrightnessCtl', {
-            brightness: String(value)
-        }, 'dimmerBrightnessCtl');
+            brightness: value
+        });
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.stateSnapshot.brightness = value;
             this.stateSnapshot.deviceStatus = 'on';
             this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger_1.logger.debug(`Successfully set brightness to ${value} for device: ${this.deviceName}`);
             return true;
         }
@@ -208,10 +211,14 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
                 green: Math.round(green),
                 blue: Math.round(blue)
             }
-        }, 'dimmerRgbValueCtl');
+        });
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.stateSnapshot.rgbValue = { red: Math.round(red), green: Math.round(green), blue: Math.round(blue) };
             this.stateSnapshot.rgbStatus = 'on';
+            this.stateSnapshot.deviceStatus = 'on';
+            this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger_1.logger.debug(`Successfully set RGB color for device: ${this.deviceName}`);
             return true;
         }
@@ -225,9 +232,13 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Turning off RGB color for device: ${this.deviceName}`);
         const [response] = await this.callDimmerCommand('dimmerRgbValueCtl', {
             status: 'off'
-        }, 'dimmerRgbValueCtl');
+        });
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.stateSnapshot.rgbStatus = 'off';
+            this.stateSnapshot.deviceStatus = 'on';
+            this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger_1.logger.debug(`Successfully turned off RGB color for device: ${this.deviceName}`);
             return true;
         }
@@ -241,9 +252,13 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Turning on RGB color for device: ${this.deviceName}`);
         const [response] = await this.callDimmerCommand('dimmerRgbValueCtl', {
             status: 'on'
-        }, 'dimmerRgbValueCtl');
+        });
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.stateSnapshot.rgbStatus = 'on';
+            this.stateSnapshot.deviceStatus = 'on';
+            this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger_1.logger.debug(`Successfully turned on RGB color for device: ${this.deviceName}`);
             return true;
         }
@@ -280,10 +295,12 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
     async toggleSwitch(turnOn) {
         const [response] = await this.callDimmerCommand('dimmerPowerSwitchCtl', {
             status: turnOn ? 'on' : 'off'
-        }, 'dimmerPowerSwitchCtl');
+        });
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.stateSnapshot.deviceStatus = turnOn ? 'on' : 'off';
             this.deviceStatus = this.stateSnapshot.deviceStatus;
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger_1.logger.debug(`Successfully toggled device: ${this.deviceName} to ${this.deviceStatus}`);
             return true;
         }
@@ -293,9 +310,11 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
     async toggleIndicatorLight(turnOn) {
         const [response] = await this.callDimmerCommand('dimmerIndicatorLightCtl', {
             status: turnOn ? 'on' : 'off'
-        }, 'dimmerIndicatorLightCtl');
+        });
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.stateSnapshot.indicatorStatus = turnOn ? 'on' : 'off';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger_1.logger.debug(`Successfully toggled indicator light for device: ${this.deviceName}`);
             return true;
         }
@@ -305,37 +324,30 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
     buildDimmerRequest(command, data = {}) {
         var _a, _b, _c, _d;
         const manager = this.manager;
+        const traceId = helpers_1.Helpers.generateTraceId();
         return {
             acceptLanguage: 'en',
             accountID: (_a = manager.accountId) !== null && _a !== void 0 ? _a : '',
             appVersion: helpers_1.APP_VERSION,
-            phoneBrand: helpers_1.PHONE_BRAND,
-            phoneOS: helpers_1.PHONE_OS,
             cid: this.cid,
             configModule: this.configModule,
             configModel: this.configModule,
             debugMode: false,
-            traceId: Date.now().toString(),
+            deviceId: this.cid,
+            method: command,
+            phoneBrand: helpers_1.PHONE_BRAND,
+            phoneOS: helpers_1.PHONE_OS,
+            traceId,
             timeZone: (_b = manager.timeZone) !== null && _b !== void 0 ? _b : helpers_1.DEFAULT_TZ,
             token: (_c = manager.token) !== null && _c !== void 0 ? _c : '',
             userCountryCode: (_d = manager.countryCode) !== null && _d !== void 0 ? _d : helpers_1.DEFAULT_REGION,
             uuid: this.uuid,
-            deviceId: this.cid,
-            mobileId: helpers_1.MOBILE_ID,
-            method: command,
-            payload: {
-                method: command,
-                source: 'APP',
-                data: {
-                    uuid: this.uuid,
-                    ...data
-                }
-            }
+            ...data
         };
     }
-    async callDimmerCommand(command, data, endpoint) {
+    async callDimmerCommand(command, data) {
         const request = this.buildDimmerRequest(command, data);
-        return await this.callApi(`/cloud/v1/deviceManaged/${endpoint}`, 'post', request, helpers_1.Helpers.reqHeaderBypass());
+        return await this.callApi(`/cloud/v1/deviceManaged/${command}`, 'post', request, helpers_1.Helpers.reqHeaderBypass());
     }
 }
 exports.VeSyncDimmerSwitch = VeSyncDimmerSwitch;

package/package.json

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

@@ -177,6 +177,12 @@ export function generateTerminalId(): string {
     return result;
 }
 
+export function generateTraceId(): string {
+    const timestamp = Math.floor(Date.now() / 1000);
+    const randomPart = Math.floor(Math.random() * 100000).toString().padStart(5, '0');
+    return `APP${MOBILE_ID.slice(-5, -1)}${timestamp}-${randomPart}`;
+}
+
 export interface RequestBody {
     acceptLanguage?: string;
     accountID?: string;
@@ -235,6 +241,10 @@ export interface LoginResponse {
 export class Helpers {
     static shouldRedact = true;
 
+    static generateTraceId(): string {
+        return generateTraceId();
+    }
+
     /**
      * Calculate MD5 hash
      */

package/src/lib/vesyncSwitchImpl.ts

@@ -4,9 +4,8 @@
 
 import { VeSyncSwitch } from './vesyncSwitch';
 import { VeSync } from './vesync';
-import { Helpers, APP_VERSION, PHONE_BRAND, PHONE_OS, DEFAULT_TZ, DEFAULT_REGION, MOBILE_ID } from './helpers';
+import { Helpers, APP_VERSION, PHONE_BRAND, PHONE_OS, DEFAULT_TZ, DEFAULT_REGION } from './helpers';
 import { logger } from './logger';
-import { switchConfig } from './vesyncSwitch';
 
 interface DimmerState {
     activeTime: number;
@@ -161,11 +160,12 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
      */
     async getDetails(): Promise<Boolean> {
         logger.debug(`Getting details for device: ${this.deviceName}`);
-        const [response, statusCode] = await this.callDimmerCommand('deviceDetail', {}, 'deviceDetail');
+        const [response, statusCode] = await this.callDimmerCommand('deviceDetail', {});
 
         const success = this.checkResponse([response, statusCode], 'getDetails');
-        if (success && response?.result) {
-            const result = response.result;
+        const resultWrapper = response?.result?.result ?? response?.result;
+        if (success && resultWrapper) {
+            const result = resultWrapper;
             this.stateSnapshot = {
                 activeTime: result.activeTime ?? this.stateSnapshot.activeTime,
                 connectionStatus: result.connectionStatus ?? this.stateSnapshot.connectionStatus,
@@ -239,13 +239,15 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Setting brightness to ${brightness} for device: ${this.deviceName}`);
         const value = Math.max(0, Math.min(100, Math.round(brightness)));
         const [response] = await this.callDimmerCommand('dimmerBrightnessCtl', {
-            brightness: String(value)
-        }, 'dimmerBrightnessCtl');
+            brightness: value
+        });
 
         if (response?.code === 0) {
             this.stateSnapshot.brightness = value;
             this.stateSnapshot.deviceStatus = 'on';
             this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger.debug(`Successfully set brightness to ${value} for device: ${this.deviceName}`);
             return true;
         }
@@ -265,11 +267,15 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
                 green: Math.round(green),
                 blue: Math.round(blue)
             }
-        }, 'dimmerRgbValueCtl');
+        });
 
         if (response?.code === 0) {
             this.stateSnapshot.rgbValue = { red: Math.round(red), green: Math.round(green), blue: Math.round(blue) };
             this.stateSnapshot.rgbStatus = 'on';
+            this.stateSnapshot.deviceStatus = 'on';
+            this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger.debug(`Successfully set RGB color for device: ${this.deviceName}`);
             return true;
         }
@@ -284,10 +290,14 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Turning off RGB color for device: ${this.deviceName}`);
         const [response] = await this.callDimmerCommand('dimmerRgbValueCtl', {
             status: 'off'
-        }, 'dimmerRgbValueCtl');
+        });
 
         if (response?.code === 0) {
             this.stateSnapshot.rgbStatus = 'off';
+            this.stateSnapshot.deviceStatus = 'on';
+            this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger.debug(`Successfully turned off RGB color for device: ${this.deviceName}`);
             return true;
         }
@@ -302,10 +312,14 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Turning on RGB color for device: ${this.deviceName}`);
         const [response] = await this.callDimmerCommand('dimmerRgbValueCtl', {
             status: 'on'
-        }, 'dimmerRgbValueCtl');
+        });
 
         if (response?.code === 0) {
             this.stateSnapshot.rgbStatus = 'on';
+            this.stateSnapshot.deviceStatus = 'on';
+            this.deviceStatus = 'on';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger.debug(`Successfully turned on RGB color for device: ${this.deviceName}`);
             return true;
         }
@@ -349,11 +363,13 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
     private async toggleSwitch(turnOn: boolean): Promise<boolean> {
         const [response] = await this.callDimmerCommand('dimmerPowerSwitchCtl', {
             status: turnOn ? 'on' : 'off'
-        }, 'dimmerPowerSwitchCtl');
+        });
 
         if (response?.code === 0) {
             this.stateSnapshot.deviceStatus = turnOn ? 'on' : 'off';
             this.deviceStatus = this.stateSnapshot.deviceStatus;
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger.debug(`Successfully toggled device: ${this.deviceName} to ${this.deviceStatus}`);
             return true;
         }
@@ -364,10 +380,12 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
     private async toggleIndicatorLight(turnOn: boolean): Promise<boolean> {
         const [response] = await this.callDimmerCommand('dimmerIndicatorLightCtl', {
             status: turnOn ? 'on' : 'off'
-        }, 'dimmerIndicatorLightCtl');
+        });
 
         if (response?.code === 0) {
             this.stateSnapshot.indicatorStatus = turnOn ? 'on' : 'off';
+            this.stateSnapshot.connectionStatus = 'online';
+            this.connectionStatus = 'online';
             logger.debug(`Successfully toggled indicator light for device: ${this.deviceName}`);
             return true;
         }
@@ -376,40 +394,40 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
     }
 
     private buildDimmerRequest(command: string, data: Record<string, any> = {}): Record<string, any> {
-        const manager = this.manager as unknown as { accountId?: string | null; token?: string | null; timeZone?: string; countryCode?: string | null; };
+        const manager = this.manager as unknown as {
+            accountId?: string | null;
+            token?: string | null;
+            timeZone?: string | null;
+            countryCode?: string | null;
+        };
+
+        const traceId = Helpers.generateTraceId();
+
         return {
             acceptLanguage: 'en',
             accountID: manager.accountId ?? '',
             appVersion: APP_VERSION,
-            phoneBrand: PHONE_BRAND,
-            phoneOS: PHONE_OS,
             cid: this.cid,
             configModule: this.configModule,
             configModel: this.configModule,
             debugMode: false,
-            traceId: Date.now().toString(),
+            deviceId: this.cid,
+            method: command,
+            phoneBrand: PHONE_BRAND,
+            phoneOS: PHONE_OS,
+            traceId,
             timeZone: manager.timeZone ?? DEFAULT_TZ,
             token: manager.token ?? '',
             userCountryCode: manager.countryCode ?? DEFAULT_REGION,
             uuid: this.uuid,
-            deviceId: this.cid,
-            mobileId: MOBILE_ID,
-            method: command,
-            payload: {
-                method: command,
-                source: 'APP',
-                data: {
-                    uuid: this.uuid,
-                    ...data
-                }
-            }
+            ...data
         };
     }
 
-    private async callDimmerCommand(command: string, data: Record<string, any>, endpoint: string): Promise<[any, number]> {
+    private async callDimmerCommand(command: string, data: Record<string, any>): Promise<[any, number]> {
         const request = this.buildDimmerRequest(command, data);
         return await this.callApi(
-            `/cloud/v1/deviceManaged/${endpoint}`,
+            `/cloud/v1/deviceManaged/${command}`,
             'post',
             request,
             Helpers.reqHeaderBypass()