tsvesync 1.0.11 → 1.0.13

package/src/lib/vesyncBulbImpl.ts

@@ -2,9 +2,10 @@
  * VeSync Bulb Implementations
  */
 
-import { VeSyncBulb } from './vesyncBulb';
+import { VeSyncBulb, bulbConfig } from './vesyncBulb';
 import { VeSync } from './vesync';
 import { Helpers } from './helpers';
+import { logger } from './logger';
 
 /**
  * ESL100 Bulb Implementation
@@ -15,6 +16,7 @@ export class VeSyncBulbESL100 extends VeSyncBulb {
     }
 
     async setColorTemp(colorTemp: number): Promise<boolean> {
+        logger.error(`[${this.deviceName}] Color temperature control not supported`);
         return false;
     }
 }
@@ -29,27 +31,35 @@ export class VeSyncBulbESL100CW extends VeSyncBulb {
 
     async setColorTemp(colorTemp: number): Promise<boolean> {
         if (!this.features.includes('color_temp')) {
+            logger.error(`[${this.deviceName}] Color temperature control not supported`);
             return false;
         }
 
+        logger.debug(`[${this.deviceName}] Setting color temperature to ${colorTemp}`);
         const body = {
-            ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on',
-            colorTemp: colorTemp.toString()
+            ...Helpers.reqBody(this.manager, 'bypass'),
+            cid: this.cid,
+            configModule: this.configModule,
+            jsonCmd: {
+                light: {
+                    colorTempe: colorTemp
+                }
+            }
         };
 
         const [response] = await Helpers.callApi(
-            '/SmartBulb/v1/device/updateColorTemperature',
-            'put',
+            '/cloud/v1/deviceManaged/bypass',
+            'post',
             body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.colorTemp = colorTemp;
+            logger.debug(`[${this.deviceName}] Successfully set color temperature to ${colorTemp}`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to set color temperature: ${JSON.stringify(response)}`);
         return false;
     }
 }
@@ -64,48 +74,75 @@ export class VeSyncBulbXYD0001 extends VeSyncBulb {
 
     async setColorTemp(colorTemp: number): Promise<boolean> {
         if (!this.features.includes('color_temp')) {
+            logger.error(`[${this.deviceName}] Color temperature control not supported`);
             return false;
         }
 
+        logger.debug(`[${this.deviceName}] Setting color temperature to ${colorTemp}`);
         const body = {
-            ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on',
-            colorTemp: colorTemp.toString()
+            ...Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    brightness: '',
+                    colorMode: 'white',
+                    colorTemp: colorTemp,
+                    force: 1,
+                    hue: '',
+                    saturation: '',
+                    value: ''
+                },
+                method: 'setLightStatusV2',
+                source: 'APP'
+            }
         };
 
         const [response] = await Helpers.callApi(
-            '/SmartBulb/v1/device/updateColorTemperature',
-            'put',
+            '/cloud/v2/deviceManaged/bypassV2',
+            'post',
             body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.colorTemp = colorTemp;
+            logger.debug(`[${this.deviceName}] Successfully set color temperature to ${colorTemp}`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to set color temperature: ${JSON.stringify(response)}`);
         return false;
     }
 
     async setHsv(hue: number, saturation: number, value: number): Promise<boolean> {
         if (!this.features.includes('rgb_shift')) {
+            logger.error(`[${this.deviceName}] Color control not supported`);
             return false;
         }
 
+        logger.debug(`[${this.deviceName}] Setting HSV color to H:${hue} S:${saturation} V:${value}`);
         const body = {
-            ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on',
-            mode: 'color',
-            hue: Math.round(hue).toString(),
-            saturation: Math.round(saturation).toString(),
-            brightness: Math.round(value).toString()
+            ...Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    brightness: value,
+                    colorMode: 'hsv',
+                    colorTemp: '',
+                    force: 1,
+                    hue: hue,
+                    saturation: saturation,
+                    value: value
+                },
+                method: 'setLightStatusV2',
+                source: 'APP'
+            }
         };
 
         const [response] = await Helpers.callApi(
-            '/SmartBulb/v1/device/updateColor',
-            'put',
+            '/cloud/v2/deviceManaged/bypassV2',
+            'post',
             body,
             Helpers.reqHeaders(this.manager)
         );
@@ -114,30 +151,47 @@ export class VeSyncBulbXYD0001 extends VeSyncBulb {
             this.colorHue = hue;
             this.colorSaturation = saturation;
             this.colorValue = value;
+            logger.debug(`[${this.deviceName}] Successfully set HSV color`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to set HSV color: ${JSON.stringify(response)}`);
         return false;
     }
 
     async enableWhiteMode(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Enabling white mode`);
         const body = {
-            ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on',
-            colorMode: 'white'
+            ...Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    brightness: '',
+                    colorMode: 'white',
+                    colorTemp: '',
+                    force: 1,
+                    red: '',
+                    green: '',
+                    blue: ''
+                },
+                method: 'setLightStatusV2',
+                source: 'APP'
+            }
         };
 
         const [response] = await Helpers.callApi(
-            '/SmartBulb/v1/device/updateColorMode',
-            'put',
+            '/cloud/v2/deviceManaged/bypassV2',
+            'post',
             body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.colorMode = 'white';
+            logger.debug(`[${this.deviceName}] Successfully enabled white mode`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to enable white mode: ${JSON.stringify(response)}`);
         return false;
     }
 }
@@ -151,63 +205,78 @@ export class VeSyncBulbESL100MC extends VeSyncBulb {
     }
 
     async setColorTemp(colorTemp: number): Promise<boolean> {
+        logger.error(`[${this.deviceName}] Color temperature control not supported`);
         return false;
     }
 
     async setRgb(red: number, green: number, blue: number): Promise<boolean> {
         if (!this.features.includes('rgb_shift')) {
+            logger.error(`[${this.deviceName}] Color control not supported`);
             return false;
         }
 
+        logger.debug(`[${this.deviceName}] Setting RGB color to R:${red} G:${green} B:${blue}`);
         const body = {
-            ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on',
-            mode: 'color',
-            red: Math.round(red).toString(),
-            green: Math.round(green).toString(),
-            blue: Math.round(blue).toString()
+            ...Helpers.reqBody(this.manager, 'bypass'),
+            cid: this.cid,
+            configModule: this.configModule,
+            jsonCmd: {
+                light: {
+                    red: Math.round(red),
+                    green: Math.round(green),
+                    blue: Math.round(blue)
+                }
+            }
         };
 
         const [response] = await Helpers.callApi(
-            '/SmartBulb/v1/device/updateColor',
-            'put',
+            '/cloud/v1/deviceManaged/bypass',
+            'post',
             body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.rgbValues = { red, green, blue };
+            logger.debug(`[${this.deviceName}] Successfully set RGB color`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to set RGB color: ${JSON.stringify(response)}`);
         return false;
     }
 
     async enableWhiteMode(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Enabling white mode`);
         const body = {
-            ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on',
-            colorMode: 'white'
+            ...Helpers.reqBody(this.manager, 'bypass'),
+            cid: this.cid,
+            configModule: this.configModule,
+            jsonCmd: {
+                light: {
+                    mode: 'white'
+                }
+            }
         };
 
         const [response] = await Helpers.callApi(
-            '/SmartBulb/v1/device/updateColorMode',
-            'put',
+            '/cloud/v1/deviceManaged/bypass',
+            'post',
             body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.colorMode = 'white';
+            logger.debug(`[${this.deviceName}] Successfully enabled white mode`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to enable white mode: ${JSON.stringify(response)}`);
         return false;
     }
 }
 
 // Export the bulb modules dictionary
-export const bulbModules: Record<string, any> = {
+export const bulbModules: Record<string, new (details: Record<string, any>, manager: VeSync) => VeSyncBulb> = {
     'ESL100': VeSyncBulbESL100,
     'ESL100CW': VeSyncBulbESL100CW,
     'XYD0001': VeSyncBulbXYD0001,

package/src/lib/vesyncFan.ts

@@ -4,9 +4,7 @@
 
 import { VeSyncBaseDevice } from './vesyncBaseDevice';
 import { VeSync } from './vesync';
-import { Helpers } from './helpers';
-
-type DeviceConstructor = new (config: Record<string, any>, manager: VeSync) => VeSyncBaseDevice;
+import { logger } from './logger';
 
 interface FanConfig {
     [key: string]: {
@@ -396,7 +394,7 @@ export abstract class VeSyncFan extends VeSyncBaseDevice {
         }
 
         for (const [key, value, unit = ''] of info) {
-            console.log(`${key.toString().padEnd(30, '.')} ${value}${unit}`);
+            logger.info(`${key.toString().padEnd(30, '.')} ${value}${unit}`);
         }
     }