tsvesync 1.3.9 → 1.3.11

package/dist/lib/vesyncBulb.d.ts

@@ -3,6 +3,11 @@
  */
 import { VeSyncBaseDevice } from './vesyncBaseDevice';
 import { VeSync } from './vesync';
+interface RgbValues {
+    red: number;
+    green: number;
+    blue: number;
+}
 interface BulbConfig {
     [key: string]: {
         module: string;
@@ -22,12 +27,11 @@ export declare abstract class VeSyncBulb extends VeSyncBaseDevice {
     protected colorSaturation: number;
     protected colorMode: string;
     protected features: string[];
-    protected rgbValues: {
-        red: number;
-        green: number;
-        blue: number;
-    };
+    protected rgbValues: RgbValues;
     constructor(details: Record<string, any>, manager: VeSync);
+    hasFeature(feature: string): boolean;
+    getColorModel(): string;
+    getBrightness(): number;
     /**
      * Get bulb details
      */
@@ -51,7 +55,6 @@ export declare abstract class VeSyncBulb extends VeSyncBaseDevice {
     /**
      * Get bulb brightness
      */
-    getBrightness(): number;
     /**
      * Get color temperature in Kelvin
      */
@@ -80,9 +83,23 @@ export declare abstract class VeSyncBulb extends VeSyncBaseDevice {
         green: number;
         blue: number;
     };
+    /**
+     * Set color temperature wrapper to maintain compatibility with consumers
+     */
+    setColorTemperature(colorTemp: number): Promise<boolean>;
+    /**
+     * Set color via hue/saturation/value when supported
+     */
+    setColor(hue: number, saturation: number, value?: number): Promise<boolean>;
+    /**
+     * Process standard bypass (v1) detail responses shared by multiple bulbs
+     */
+    protected processStandardBypassDetails(response: any, statusCode: number): boolean;
     /**
      * Set color temperature - Abstract method to be implemented by subclasses
      */
     abstract setColorTemp(colorTemp: number): Promise<boolean>;
+    protected static clamp(value: number, min: number, max: number): number;
+    protected static hsvToRgb(h: number, s: number, v: number): RgbValues;
 }
 export {};

package/dist/lib/vesyncBulb.js

@@ -50,6 +50,16 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
             blue: 0
         };
     }
+    hasFeature(feature) {
+        return this.features.includes(feature);
+    }
+    getColorModel() {
+        var _a, _b;
+        return (_b = (_a = exports.bulbConfig[this.deviceType]) === null || _a === void 0 ? void 0 : _a.colorModel) !== null && _b !== void 0 ? _b : 'none';
+    }
+    getBrightness() {
+        return this.brightness;
+    }
     /**
      * Get bulb details
      */
@@ -75,30 +85,7 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
             }
         };
         const [response, statusCode] = await this.callApi(endpoint, 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
-        const success = this.checkResponse([response, statusCode], 'getDetails');
-        if (success && (response === null || response === void 0 ? void 0 : response.result)) {
-            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 (exports.bulbConfig[this.deviceType].colorModel === 'rgb') {
-                    this.rgbValues = {
-                        red: response.result.red || this.rgbValues.red,
-                        green: response.result.green || this.rgbValues.green,
-                        blue: response.result.blue || this.rgbValues.blue
-                    };
-                }
-                else {
-                    this.colorHue = response.result.hue || this.colorHue;
-                    this.colorSaturation = response.result.saturation || this.colorSaturation;
-                    this.colorValue = response.result.value || this.colorValue;
-                }
-            }
-            logger_1.logger.debug(`[${this.deviceName}] Successfully retrieved bulb details`);
-        }
-        return success;
+        return this.processStandardBypassDetails(response, statusCode);
     }
     /**
      * Update bulb details
@@ -193,7 +180,8 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
             logger_1.logger.error(`[${this.deviceName}] Dimming not supported`);
             return false;
         }
-        logger_1.logger.debug(`[${this.deviceName}] Setting brightness to ${brightness}`);
+        const brightnessLevel = VeSyncBulb.clamp(Math.round(brightness), 0, 100);
+        logger_1.logger.debug(`[${this.deviceName}] Setting brightness to ${brightnessLevel}`);
         const isV2Device = this.deviceType === 'XYD0001';
         const endpoint = isV2Device ? '/cloud/v2/deviceManaged/bypassV2' : '/cloud/v1/deviceManaged/bypass';
         const body = isV2Device ? {
@@ -202,7 +190,7 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
             configModule: this.configModule,
             payload: {
                 data: {
-                    brightness: brightness,
+                    brightness: brightnessLevel,
                     colorMode: '',
                     colorTemp: '',
                     force: 0,
@@ -219,14 +207,14 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
             configModule: this.configModule,
             jsonCmd: {
                 light: {
-                    brightness: brightness
+                    brightness: brightnessLevel
                 }
             }
         };
         const [response] = await this.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.info(`[${this.deviceName}] Successfully set brightness to ${brightness}`);
+            this.brightness = brightnessLevel;
+            logger_1.logger.info(`[${this.deviceName}] Successfully set brightness to ${brightnessLevel}`);
             return true;
         }
         logger_1.logger.error(`[${this.deviceName}] Failed to set brightness: ${JSON.stringify(response)}`);
@@ -235,9 +223,6 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
     /**
      * Get bulb brightness
      */
-    getBrightness() {
-        return this.brightness;
-    }
     /**
      * Get color temperature in Kelvin
      */
@@ -292,5 +277,132 @@ class VeSyncBulb extends vesyncBaseDevice_1.VeSyncBaseDevice {
         }
         return this.rgbValues;
     }
+    /**
+     * Set color temperature wrapper to maintain compatibility with consumers
+     */
+    async setColorTemperature(colorTemp) {
+        return this.setColorTemp(colorTemp);
+    }
+    /**
+     * Set color via hue/saturation/value when supported
+     */
+    async setColor(hue, saturation, value = 100) {
+        var _a;
+        if (!this.features.includes('rgb_shift')) {
+            logger_1.logger.error(`[${this.deviceName}] Color control not supported`);
+            return false;
+        }
+        const colorModel = (_a = exports.bulbConfig[this.deviceType]) === null || _a === void 0 ? void 0 : _a.colorModel;
+        if (colorModel === 'rgb' && typeof this.setRgb === 'function') {
+            const rgb = VeSyncBulb.hsvToRgb(hue, saturation, value);
+            return this.setRgb(rgb.red, rgb.green, rgb.blue);
+        }
+        if (typeof this.setHsv === 'function') {
+            return this.setHsv(hue, saturation, value);
+        }
+        logger_1.logger.error(`[${this.deviceName}] No compatible color handler found`);
+        return false;
+    }
+    /**
+     * Process standard bypass (v1) detail responses shared by multiple bulbs
+     */
+    processStandardBypassDetails(response, statusCode) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const success = this.checkResponse([response, statusCode], 'getDetails');
+        if (success && (response === null || response === void 0 ? void 0 : response.result)) {
+            const innerResult = ((_a = response.result) === null || _a === void 0 ? void 0 : _a.result) || response.result;
+            if (innerResult) {
+                if (typeof innerResult.enabled === 'boolean') {
+                    this.deviceStatus = innerResult.enabled ? 'on' : 'off';
+                }
+                else if (innerResult.action) {
+                    this.deviceStatus = innerResult.action === 'on' ? 'on' : 'off';
+                }
+                if (innerResult.connectionStatus) {
+                    this.connectionStatus = innerResult.connectionStatus;
+                }
+                if (this.features.includes('dimmable') && innerResult.brightness !== undefined) {
+                    this.brightness = Number(innerResult.brightness);
+                }
+                if (this.features.includes('color_temp')) {
+                    if (innerResult.colorTemp !== undefined) {
+                        this.colorTemp = Number(innerResult.colorTemp);
+                    }
+                    else if (innerResult.colorTempe !== undefined) {
+                        this.colorTemp = Number(innerResult.colorTempe);
+                    }
+                }
+                if (this.features.includes('rgb_shift')) {
+                    if (((_b = exports.bulbConfig[this.deviceType]) === null || _b === void 0 ? void 0 : _b.colorModel) === 'rgb') {
+                        this.rgbValues = {
+                            red: Number((_c = innerResult.red) !== null && _c !== void 0 ? _c : this.rgbValues.red),
+                            green: Number((_d = innerResult.green) !== null && _d !== void 0 ? _d : this.rgbValues.green),
+                            blue: Number((_e = innerResult.blue) !== null && _e !== void 0 ? _e : this.rgbValues.blue)
+                        };
+                    }
+                    else {
+                        this.colorHue = Number((_f = innerResult.hue) !== null && _f !== void 0 ? _f : this.colorHue);
+                        this.colorSaturation = Number((_g = innerResult.saturation) !== null && _g !== void 0 ? _g : this.colorSaturation);
+                        this.colorValue = Number((_h = innerResult.value) !== null && _h !== void 0 ? _h : this.colorValue);
+                    }
+                }
+            }
+            logger_1.logger.debug(`[${this.deviceName}] Successfully retrieved bulb details`);
+        }
+        return success;
+    }
+    static clamp(value, min, max) {
+        return Math.min(Math.max(value, min), max);
+    }
+    static hsvToRgb(h, s, v) {
+        const saturation = VeSyncBulb.clamp(s, 0, 100) / 100;
+        const value = VeSyncBulb.clamp(v, 0, 100) / 100;
+        const hue = ((h % 360) + 360) % 360 / 60;
+        const i = Math.floor(hue);
+        const f = hue - i;
+        const p = value * (1 - saturation);
+        const q = value * (1 - saturation * f);
+        const t = value * (1 - saturation * (1 - f));
+        let r = 0;
+        let g = 0;
+        let b = 0;
+        switch (i) {
+            case 0:
+                r = value;
+                g = t;
+                b = p;
+                break;
+            case 1:
+                r = q;
+                g = value;
+                b = p;
+                break;
+            case 2:
+                r = p;
+                g = value;
+                b = t;
+                break;
+            case 3:
+                r = p;
+                g = q;
+                b = value;
+                break;
+            case 4:
+                r = t;
+                g = p;
+                b = value;
+                break;
+            default:
+                r = value;
+                g = p;
+                b = q;
+                break;
+        }
+        return {
+            red: Math.round(r * 255),
+            green: Math.round(g * 255),
+            blue: Math.round(b * 255)
+        };
+    }
 }
 exports.VeSyncBulb = VeSyncBulb;

package/dist/lib/vesyncBulbImpl.d.ts

@@ -8,6 +8,10 @@ import { VeSync } from './vesync';
  */
 export declare class VeSyncBulbESL100 extends VeSyncBulb {
     constructor(details: Record<string, any>, manager: VeSync);
+    getDetails(): Promise<boolean>;
+    turnOn(): Promise<boolean>;
+    turnOff(): Promise<boolean>;
+    setBrightness(brightness: number): Promise<boolean>;
     setColorTemp(colorTemp: number): Promise<boolean>;
 }
 /**
@@ -15,6 +19,11 @@ export declare class VeSyncBulbESL100 extends VeSyncBulb {
  */
 export declare class VeSyncBulbESL100CW extends VeSyncBulb {
     constructor(details: Record<string, any>, manager: VeSync);
+    private buildBypassBody;
+    getDetails(): Promise<boolean>;
+    turnOn(): Promise<boolean>;
+    turnOff(): Promise<boolean>;
+    setBrightness(brightness: number): Promise<boolean>;
     setColorTemp(colorTemp: number): Promise<boolean>;
 }
 /**
@@ -31,8 +40,14 @@ export declare class VeSyncBulbXYD0001 extends VeSyncBulb {
  */
 export declare class VeSyncBulbESL100MC extends VeSyncBulb {
     constructor(details: Record<string, any>, manager: VeSync);
-    setColorTemp(colorTemp: number): Promise<boolean>;
+    private buildBypassV2Payload;
+    private handleBypassV2Response;
+    getDetails(): Promise<boolean>;
+    turnOn(): Promise<boolean>;
+    turnOff(): Promise<boolean>;
+    setBrightness(brightness: number): Promise<boolean>;
     setRgb(red: number, green: number, blue: number): Promise<boolean>;
     enableWhiteMode(): Promise<boolean>;
+    setColorTemp(colorTemp: number): Promise<boolean>;
 }
 export declare const bulbModules: Record<string, new (details: Record<string, any>, manager: VeSync) => VeSyncBulb>;