tsvesync 1.0.12 → 1.0.14

package/dist/lib/helpers.js

@@ -11,6 +11,7 @@ exports.getApiBaseUrl = getApiBaseUrl;
 exports.setApiBaseUrl = setApiBaseUrl;
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = __importDefault(require("crypto"));
+const logger_1 = require("./logger");
 // API configuration
 let _apiBaseUrl = 'https://smartapi.vesync.com';
 function getApiBaseUrl() {
@@ -175,7 +176,7 @@ class Helpers {
             if (error.response) {
                 return [error.response.data, error.response.status];
             }
-            console.error('API call failed:', error.message);
+            logger_1.logger.error('API call failed:', error.message);
             return [null, 0];
         }
     }
@@ -195,7 +196,7 @@ class Helpers {
             return decoded.readFloatBE(0).toString();
         }
         catch (error) {
-            console.debug('Error decoding hex value:', error);
+            logger_1.logger.debug('Error decoding hex value:', error);
             return '0';
         }
     }

package/dist/lib/logger.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Logger utility for TSVeSync
+ */
+export declare enum LogLevel {
+    DEBUG = 0,
+    INFO = 1,
+    WARN = 2,
+    ERROR = 3,
+    NONE = 4
+}
+export declare class Logger {
+    private static instance;
+    private currentLevel;
+    private constructor();
+    static getInstance(): Logger;
+    setLevel(level: LogLevel): void;
+    getLevel(): LogLevel;
+    debug(message: string, ...args: any[]): void;
+    info(message: string, ...args: any[]): void;
+    warn(message: string, ...args: any[]): void;
+    error(message: string, ...args: any[]): void;
+}
+export declare const logger: Logger;

package/dist/lib/logger.js

@@ -0,0 +1,54 @@
+"use strict";
+/**
+ * Logger utility for TSVeSync
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logger = exports.Logger = exports.LogLevel = void 0;
+var LogLevel;
+(function (LogLevel) {
+    LogLevel[LogLevel["DEBUG"] = 0] = "DEBUG";
+    LogLevel[LogLevel["INFO"] = 1] = "INFO";
+    LogLevel[LogLevel["WARN"] = 2] = "WARN";
+    LogLevel[LogLevel["ERROR"] = 3] = "ERROR";
+    LogLevel[LogLevel["NONE"] = 4] = "NONE";
+})(LogLevel || (exports.LogLevel = LogLevel = {}));
+class Logger {
+    constructor() {
+        this.currentLevel = LogLevel.INFO;
+    }
+    static getInstance() {
+        if (!Logger.instance) {
+            Logger.instance = new Logger();
+        }
+        return Logger.instance;
+    }
+    setLevel(level) {
+        this.currentLevel = level;
+    }
+    getLevel() {
+        return this.currentLevel;
+    }
+    debug(message, ...args) {
+        if (this.currentLevel <= LogLevel.DEBUG) {
+            console.log(`[DEBUG] ${message}`, ...args);
+        }
+    }
+    info(message, ...args) {
+        if (this.currentLevel <= LogLevel.INFO) {
+            console.log(`[INFO] ${message}`, ...args);
+        }
+    }
+    warn(message, ...args) {
+        if (this.currentLevel <= LogLevel.WARN) {
+            console.warn(`[WARN] ${message}`, ...args);
+        }
+    }
+    error(message, ...args) {
+        if (this.currentLevel <= LogLevel.ERROR) {
+            console.error(`[ERROR] ${message}`, ...args);
+        }
+    }
+}
+exports.Logger = Logger;
+// Export singleton instance
+exports.logger = Logger.getInstance();

package/dist/lib/vesync.js

@@ -9,6 +9,7 @@ const vesyncFanImpl_1 = require("./vesyncFanImpl");
 const vesyncOutletImpl_1 = require("./vesyncOutletImpl");
 const vesyncSwitchImpl_1 = require("./vesyncSwitchImpl");
 const vesyncBulbImpl_1 = require("./vesyncBulbImpl");
+const logger_1 = require("./logger");
 const DEFAULT_ENERGY_UPDATE_INTERVAL = 21600;
 /**
  * Create device instance based on type
@@ -29,7 +30,7 @@ function objectFactory(details, manager) {
         if (deviceType in modules) {
             DeviceClass = modules[deviceType];
             category = cat;
-            console.debug(`Found exact match for ${deviceType} in ${cat} modules`);
+            logger_1.logger.debug(`Found exact match for ${deviceType} in ${cat} modules`);
             break;
         }
     }
@@ -64,14 +65,14 @@ function objectFactory(details, manager) {
         for (const [prefix, cat] of Object.entries(prefixMap)) {
             if (deviceType.startsWith(prefix)) {
                 category = cat;
-                console.debug(`Device type ${deviceType} matched prefix ${prefix} -> category ${cat}`);
+                logger_1.logger.debug(`Device type ${deviceType} matched prefix ${prefix} -> category ${cat}`);
                 // Try to find a base class in this category's modules
                 const modules = allModules[cat];
                 for (const [moduleType, ModuleClass] of Object.entries(modules)) {
                     const baseType = moduleType.split('-')[0]; // e.g., ESL100 from ESL100-USA
                     if (deviceType.startsWith(baseType)) {
                         DeviceClass = ModuleClass;
-                        console.debug(`Found base type match: ${deviceType} -> ${baseType}`);
+                        logger_1.logger.debug(`Found base type match: ${deviceType} -> ${baseType}`);
                         break;
                     }
                 }
@@ -87,12 +88,12 @@ function objectFactory(details, manager) {
             return [category, device];
         }
         catch (error) {
-            console.error(`Error creating device instance for ${deviceType}:`, error);
+            logger_1.logger.error(`Error creating device instance for ${deviceType}:`, error);
             return [category, null];
         }
     }
     else {
-        console.warn(`No device class found for type: ${deviceType}`);
+        logger_1.logger.warn(`No device class found for type: ${deviceType}`);
         return [category, null];
     }
 }
@@ -133,7 +134,7 @@ class VeSync {
             const regTest = /[^a-zA-Z/_]/;
             if (regTest.test(timeZone)) {
                 this.timeZone = helpers_1.DEFAULT_TZ;
-                console.debug('Invalid characters in time zone - ', timeZone);
+                logger_1.logger.debug('Invalid characters in time zone - ', timeZone);
             }
             else {
                 this.timeZone = timeZone;
@@ -141,7 +142,7 @@ class VeSync {
         }
         else {
             this.timeZone = helpers_1.DEFAULT_TZ;
-            console.debug('Time zone is not a string');
+            logger_1.logger.debug('Time zone is not a string');
         }
         if (debug) {
             this.debug = true;
@@ -190,7 +191,7 @@ class VeSync {
                     return true;
                 }
             }
-            console.debug(`Device removed - ${device.deviceName} - ${device.deviceType}`);
+            logger_1.logger.debug(`Device removed - ${device.deviceName} - ${device.deviceType}`);
             return false;
         }
         return true;
@@ -219,7 +220,7 @@ class VeSync {
             this._devList[key] = deviceList.filter(device => VeSync.removeDevTest(device, devices));
             const after = this._devList[key].length;
             if (before !== after) {
-                console.debug(`${before - after} ${key} removed`);
+                logger_1.logger.debug(`${before - after} ${key} removed`);
             }
         }
         return true;
@@ -239,7 +240,7 @@ class VeSync {
                 }
                 else {
                     devRem.push(index);
-                    console.warn(`Device with no ID - ${dev.deviceName || ''}`);
+                    logger_1.logger.warn(`Device with no ID - ${dev.deviceName || ''}`);
                 }
             }
         });
@@ -260,12 +261,12 @@ class VeSync {
             numDevices += deviceList.length;
         }
         if (!devices || devices.length === 0) {
-            console.warn('No devices found in api return');
+            logger_1.logger.warn('No devices found in api return');
             return false;
         }
         // Initialize new device list or remove old devices
         if (numDevices === 0) {
-            console.debug('New device list initialized');
+            logger_1.logger.debug('New device list initialized');
         }
         else {
             this.removeOldDevices(devices);
@@ -278,7 +279,7 @@ class VeSync {
         for (const dev of newDevices) {
             // Verify required device properties
             if (!requiredKeys.every(key => key in dev)) {
-                console.debug(`Error adding device - missing required properties: ${dev.deviceName || 'Unknown'}`);
+                logger_1.logger.debug(`Error adding device - missing required properties: ${dev.deviceName || 'Unknown'}`);
                 continue;
             }
             const devType = dev.deviceType;
@@ -288,14 +289,14 @@ class VeSync {
                 // Add device to appropriate category if valid
                 if (deviceObj && category in this._devList) {
                     this._devList[category].push(deviceObj);
-                    console.debug(`Added ${devType} device to ${category} category`);
+                    logger_1.logger.debug(`Added ${devType} device to ${category} category`);
                 }
                 else if (category === 'unknown') {
-                    console.debug(`Unknown device type: ${devType}`);
+                    logger_1.logger.debug(`Unknown device type: ${devType}`);
                 }
             }
             catch (err) {
-                console.error(`Error creating device ${devType}:`, err);
+                logger_1.logger.error(`Error creating device ${devType}:`, err);
                 continue;
             }
         }
@@ -307,7 +308,7 @@ class VeSync {
     async getDevices() {
         var _a, _b;
         if (!this.enabled) {
-            console.error('Not logged in to VeSync');
+            logger_1.logger.error('Not logged in to VeSync');
             return false;
         }
         this._inProcess = true;
@@ -320,40 +321,40 @@ class VeSync {
                 // Update the main devices array with all devices
                 this.devices = Object.values(this._devList).flat();
                 // Log device discovery results
-                console.log('\n=== Device Discovery Summary ===');
-                console.log(`Total devices processed: ${deviceList.length}`);
+                logger_1.logger.debug('\n=== Device Discovery Summary ===');
+                logger_1.logger.debug(`Total devices processed: ${deviceList.length}`);
                 // Log device types found
                 const deviceTypes = deviceList.map((d) => d.deviceType);
-                console.log('\nDevice types found:', deviceTypes);
+                logger_1.logger.debug('\nDevice types found:', deviceTypes);
                 // Log devices by category with details
-                console.log('\nDevices by Category:');
-                console.log('---------------------');
+                logger_1.logger.debug('\nDevices by Category:');
+                logger_1.logger.debug('---------------------');
                 for (const [category, devices] of Object.entries(this._devList)) {
                     if (devices.length > 0) {
-                        console.log(`\n${category.toUpperCase()} (${devices.length} devices):`);
+                        logger_1.logger.debug(`\n${category.toUpperCase()} (${devices.length} devices):`);
                         devices.forEach((d) => {
-                            console.log(`  • ${d.deviceName}`);
-                            console.log(`    Type: ${d.deviceType}`);
-                            console.log(`    Status: ${d.deviceStatus}`);
-                            console.log(`    ID: ${d.cid}`);
+                            logger_1.logger.debug(`  • ${d.deviceName}`);
+                            logger_1.logger.debug(`    Type: ${d.deviceType}`);
+                            logger_1.logger.debug(`    Status: ${d.deviceStatus}`);
+                            logger_1.logger.debug(`    ID: ${d.cid}`);
                         });
                     }
                 }
                 // Log summary statistics
-                console.log('\nSummary Statistics:');
-                console.log('-------------------');
-                console.log(`Total Devices: ${((_b = this.devices) === null || _b === void 0 ? void 0 : _b.length) || 0}`);
+                logger_1.logger.debug('\nSummary Statistics:');
+                logger_1.logger.debug('-------------------');
+                logger_1.logger.debug(`Total Devices: ${((_b = this.devices) === null || _b === void 0 ? void 0 : _b.length) || 0}`);
                 for (const [category, devices] of Object.entries(this._devList)) {
-                    console.log(`${category}: ${devices.length} devices`);
+                    logger_1.logger.debug(`${category}: ${devices.length} devices`);
                 }
-                console.log('\n=== End of Device Discovery ===\n');
+                logger_1.logger.debug('\n=== End of Device Discovery ===\n');
             }
             else {
-                console.error('No devices found in response');
+                logger_1.logger.error('No devices found in response');
             }
         }
         catch (error) {
-            console.error('Unable to get device list:', error);
+            logger_1.logger.error('Unable to get device list:', error);
         }
         this._inProcess = false;
         return procReturn;
@@ -364,13 +365,13 @@ class VeSync {
     async login() {
         var _a;
         const body = helpers_1.Helpers.reqBody(this, 'login');
-        console.log('Login request:', {
+        logger_1.logger.debug('Login request:', {
             url: `${process.env.VESYNC_API_URL}/cloud/v1/user/login`,
             body
         });
         try {
             const [response, status] = await helpers_1.Helpers.callApi('/cloud/v1/user/login', 'post', body);
-            console.log('Login response:', { status, response });
+            logger_1.logger.debug('Login response:', { status, response });
             if ((_a = response === null || response === void 0 ? void 0 : response.result) === null || _a === void 0 ? void 0 : _a.token) {
                 this.token = response.result.token;
                 this.accountId = response.result.accountID;
@@ -378,11 +379,11 @@ class VeSync {
                 this.enabled = true;
                 return true;
             }
-            console.error('Unable to login with supplied credentials');
+            logger_1.logger.error('Unable to login with supplied credentials');
             return false;
         }
         catch (error) {
-            console.error('Login error:', error);
+            logger_1.logger.error('Login error:', error);
             return false;
         }
     }
@@ -399,18 +400,18 @@ class VeSync {
     async update() {
         if (this.deviceTimeCheck()) {
             if (!this.enabled) {
-                console.error('Not logged in to VeSync');
+                logger_1.logger.error('Not logged in to VeSync');
                 return;
             }
             await this.getDevices();
-            console.debug('Start updating the device details one by one');
+            logger_1.logger.debug('Start updating the device details one by one');
             for (const deviceList of Object.values(this._devList)) {
                 for (const device of deviceList) {
                     try {
                         await device.getDetails();
                     }
                     catch (error) {
-                        console.error(`Error updating ${device.deviceName}:`, error);
+                        logger_1.logger.error(`Error updating ${device.deviceName}:`, error);
                     }
                 }
             }

package/dist/lib/vesyncBaseDevice.js

@@ -4,6 +4,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VeSyncBaseDevice = void 0;
+const logger_1 = require("./logger");
 class VeSyncBaseDevice {
     constructor(details, manager) {
         this.config = {};
@@ -23,11 +24,11 @@ class VeSyncBaseDevice {
      * Return formatted device info to stdout
      */
     display() {
-        console.log(`Device Name: ${this.deviceName}`);
-        console.log(`Status: ${this.deviceStatus}`);
-        console.log(`Device Type: ${this.deviceType}`);
-        console.log(`Connection: ${this.connectionStatus}`);
-        console.log(`Version: ${this.config.current_firmware_version || 'Unknown'}`);
+        logger_1.logger.info(`Device Name: ${this.deviceName}`);
+        logger_1.logger.info(`Status: ${this.deviceStatus}`);
+        logger_1.logger.info(`Device Type: ${this.deviceType}`);
+        logger_1.logger.info(`Connection: ${this.connectionStatus}`);
+        logger_1.logger.info(`Version: ${this.config.current_firmware_version || 'Unknown'}`);
     }
     /**
      * Return JSON details for device
@@ -70,12 +71,12 @@ class VeSyncBaseDevice {
     logError(method, error) {
         var _a;
         const errorMsg = (error === null || error === void 0 ? void 0 : error.message) || error;
-        console.error(`[${this.deviceName}] ${method}: ${errorMsg}`);
+        logger_1.logger.error(`[${this.deviceName}] ${method}: ${errorMsg}`);
         // Log additional error details if available
         if ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) {
             const responseData = error.response.data;
             const msg = responseData.msg || responseData.message || JSON.stringify(responseData);
-            console.error(`Response: ${msg}`);
+            logger_1.logger.error(`Response: ${msg}`);
         }
     }
     /**

package/dist/lib/vesyncBulb.d.ts

@@ -3,6 +3,14 @@
  */
 import { VeSyncBaseDevice } from './vesyncBaseDevice';
 import { VeSync } from './vesync';
+interface BulbConfig {
+    [key: string]: {
+        module: string;
+        features: string[];
+        colorModel: string;
+    };
+}
+export declare const bulbConfig: BulbConfig;
 /**
  * VeSync Bulb Base Class
  */
@@ -77,3 +85,4 @@ export declare abstract class VeSyncBulb extends VeSyncBaseDevice {
      */
     abstract setColorTemp(colorTemp: number): Promise<boolean>;
 }
+export {};

package/dist/lib/vesyncBulb.js

@@ -3,24 +3,29 @@
  * VeSync Bulb Base Class
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VeSyncBulb = void 0;
+exports.VeSyncBulb = exports.bulbConfig = void 0;
 const vesyncBaseDevice_1 = require("./vesyncBaseDevice");
 const helpers_1 = require("./helpers");
-// Feature dictionary for bulb types
-const featureDict = {
+const logger_1 = require("./logger");
+// Bulb configuration
+exports.bulbConfig = {
     'ESL100': {
+        module: 'VeSyncBulbESL100',
         features: ['dimmable'],
         colorModel: 'none'
     },
     'ESL100CW': {
+        module: 'VeSyncBulbESL100CW',
         features: ['dimmable', 'color_temp'],
         colorModel: 'none'
     },
     'XYD0001': {
+        module: 'VeSyncBulbXYD0001',
         features: ['dimmable', 'color_temp', 'rgb_shift'],
         colorModel: 'hsv'
     },
     'ESL100MC': {
+        module: 'VeSyncBulbESL100MC',
         features: ['dimmable', 'rgb_shift'],
         colorModel: 'rgb'
     }
@@ -38,7 +43,7 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
         this.colorHue = 0;
         this.colorSaturation = 0;
         this.colorMode = '';
-        this.features = ((_a = featureDict[this.deviceType]) === null || _a === void 0 ? void 0 : _a.features) || [];
+        this.features = ((_a = exports.bulbConfig[this.deviceType]) === null || _a === void 0 ? void 0 : _a.features) || [];
         this.rgbValues = {
             red: 0,
             green: 0,
@@ -49,20 +54,35 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
      * Get bulb details
      */
     async getDetails() {
-        const body = {
-            ...helpers_1.Helpers.reqBody(this.manager, 'devicedetail'),
-            uuid: this.cid,
-            method: 'devicedetail'
+        logger_1.logger.debug(`[${this.deviceName}] Getting bulb details`);
+        const isV2Device = this.deviceType === 'XYD0001';
+        const endpoint = isV2Device ? '/cloud/v2/deviceManaged/bypassV2' : '/cloud/v1/deviceManaged/bypass';
+        const body = isV2Device ? {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {},
+                method: 'getLightStatusV2',
+                source: 'APP'
+            }
+        } : {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypass'),
+            cid: this.cid,
+            configModule: this.configModule,
+            jsonCmd: {
+                getLightStatus: 'get'
+            }
         };
-        const [response] = await helpers_1.Helpers.callApi('/SmartBulb/v1/device/devicedetail', 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
+        const [response] = await helpers_1.Helpers.callApi(endpoint, 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0 && (response === null || response === void 0 ? void 0 : response.result)) {
-            this.deviceStatus = response.result.deviceStatus || this.deviceStatus;
+            this.deviceStatus = response.result.enabled ? 'on' : 'off';
             this.brightness = response.result.brightness || this.brightness;
             if (this.features.includes('color_temp')) {
                 this.colorTemp = response.result.colorTemp || this.colorTemp;
             }
             if (this.features.includes('rgb_shift')) {
-                if (featureDict[this.deviceType].colorModel === 'rgb') {
+                if (exports.bulbConfig[this.deviceType].colorModel === 'rgb') {
                     this.rgbValues = {
                         red: response.result.red || this.rgbValues.red,
                         green: response.result.green || this.rgbValues.green,
@@ -75,44 +95,94 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
                     this.colorValue = response.result.value || this.colorValue;
                 }
             }
+            logger_1.logger.debug(`[${this.deviceName}] Successfully retrieved bulb details`);
+        }
+        else {
+            logger_1.logger.error(`[${this.deviceName}] Failed to get bulb details: ${JSON.stringify(response)}`);
         }
     }
     /**
      * Update bulb status
      */
     async update() {
+        logger_1.logger.debug(`[${this.deviceName}] Updating bulb information`);
         await this.getDetails();
+        logger_1.logger.debug(`[${this.deviceName}] Successfully updated bulb information`);
     }
     /**
      * Turn bulb on
      */
     async turnOn() {
-        const body = {
-            ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on'
+        logger_1.logger.debug(`[${this.deviceName}] Turning bulb on`);
+        const isV2Device = this.deviceType === 'XYD0001';
+        const endpoint = isV2Device ? '/cloud/v2/deviceManaged/bypassV2' : '/cloud/v1/deviceManaged/bypass';
+        const body = isV2Device ? {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    enabled: true,
+                    id: 0
+                },
+                method: 'setSwitch',
+                source: 'APP'
+            }
+        } : {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypass'),
+            cid: this.cid,
+            configModule: this.configModule,
+            jsonCmd: {
+                light: {
+                    action: 'on'
+                }
+            }
         };
-        const [response] = await helpers_1.Helpers.callApi('/SmartBulb/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
+        const [response] = await helpers_1.Helpers.callApi(endpoint, 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.deviceStatus = 'on';
+            logger_1.logger.debug(`[${this.deviceName}] Successfully turned bulb on`);
             return true;
         }
+        logger_1.logger.error(`[${this.deviceName}] Failed to turn bulb on: ${JSON.stringify(response)}`);
         return false;
     }
     /**
      * Turn bulb off
      */
     async turnOff() {
-        const body = {
-            ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'off'
+        logger_1.logger.debug(`[${this.deviceName}] Turning bulb off`);
+        const isV2Device = this.deviceType === 'XYD0001';
+        const endpoint = isV2Device ? '/cloud/v2/deviceManaged/bypassV2' : '/cloud/v1/deviceManaged/bypass';
+        const body = isV2Device ? {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    enabled: false,
+                    id: 0
+                },
+                method: 'setSwitch',
+                source: 'APP'
+            }
+        } : {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypass'),
+            cid: this.cid,
+            configModule: this.configModule,
+            jsonCmd: {
+                light: {
+                    action: 'off'
+                }
+            }
         };
-        const [response] = await helpers_1.Helpers.callApi('/SmartBulb/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
+        const [response] = await helpers_1.Helpers.callApi(endpoint, 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.deviceStatus = 'off';
+            logger_1.logger.debug(`[${this.deviceName}] Successfully turned bulb off`);
             return true;
         }
+        logger_1.logger.error(`[${this.deviceName}] Failed to turn bulb off: ${JSON.stringify(response)}`);
         return false;
     }
     /**
@@ -120,19 +190,46 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
      */
     async setBrightness(brightness) {
         if (!this.features.includes('dimmable')) {
+            logger_1.logger.error(`[${this.deviceName}] Dimming not supported`);
             return false;
         }
-        const body = {
-            ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
-            status: 'on',
-            brightNess: brightness.toString()
+        logger_1.logger.debug(`[${this.deviceName}] Setting brightness to ${brightness}`);
+        const isV2Device = this.deviceType === 'XYD0001';
+        const endpoint = isV2Device ? '/cloud/v2/deviceManaged/bypassV2' : '/cloud/v1/deviceManaged/bypass';
+        const body = isV2Device ? {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    brightness: brightness,
+                    colorMode: '',
+                    colorTemp: '',
+                    force: 0,
+                    hue: '',
+                    saturation: '',
+                    value: ''
+                },
+                method: 'setLightStatusV2',
+                source: 'APP'
+            }
+        } : {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypass'),
+            cid: this.cid,
+            configModule: this.configModule,
+            jsonCmd: {
+                light: {
+                    brightness: brightness
+                }
+            }
         };
-        const [response] = await helpers_1.Helpers.callApi('/SmartBulb/v1/device/updateBrightness', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
+        const [response] = await helpers_1.Helpers.callApi(endpoint, 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
             this.brightness = brightness;
+            logger_1.logger.debug(`[${this.deviceName}] Successfully set brightness to ${brightness}`);
             return true;
         }
+        logger_1.logger.error(`[${this.deviceName}] Failed to set brightness: ${JSON.stringify(response)}`);
         return false;
     }
     /**
@@ -190,7 +287,7 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
      * Get RGB values
      */
     getRGBValues() {
-        if (!this.features.includes('rgb_shift') || featureDict[this.deviceType].colorModel !== 'rgb') {
+        if (!this.features.includes('rgb_shift') || exports.bulbConfig[this.deviceType].colorModel !== 'rgb') {
             return { red: 0, green: 0, blue: 0 };
         }
         return this.rgbValues;