tsvesync 1.0.49 → 1.0.51

package/dist/lib/vesyncFanImpl.js

@@ -14,7 +14,6 @@ class VeSyncAirBypass extends vesyncFan_1.VeSyncFan {
     constructor(details, manager) {
         super(details, manager);
         this.modes = ['auto', 'manual', 'sleep'];
-        this.speeds = [1, 2, 3, 4, 5];
         this.displayModes = ['on', 'off'];
         this.childLockModes = ['on', 'off'];
         logger_1.logger.debug(`Initialized VeSyncAirBypass device: ${this.deviceName}`);
@@ -27,6 +26,7 @@ class VeSyncAirBypass extends vesyncFan_1.VeSyncFan {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
             cid: this.cid,
+            deviceId: this.cid, // Add deviceId to match YAML spec
             configModule: this.configModule,
             payload: {
                 method,
@@ -210,10 +210,11 @@ class VeSyncAirBypass extends vesyncFan_1.VeSyncFan {
      * Change fan speed
      */
     async changeFanSpeed(speed) {
-        if (!this.speeds.includes(speed)) {
-            const error = `Invalid speed: ${speed}. Must be one of: ${this.speeds.join(', ')}`;
-            logger_1.logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        var _a;
+        const speeds = (_a = this.config.levels) !== null && _a !== void 0 ? _a : [];
+        if (!speeds.includes(speed)) {
+            logger_1.logger.error(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')} for device: ${this.deviceName}`);
+            return false;
         }
         logger_1.logger.info(`Changing fan speed to ${speed} for device: ${this.deviceName}`);
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
@@ -241,10 +242,11 @@ class VeSyncAirBypass extends vesyncFan_1.VeSyncFan {
      * Set device mode
      */
     async setMode(mode) {
-        if (!this.modes.includes(mode)) {
-            const error = `Invalid mode: ${mode}. Must be one of: ${this.modes.join(', ')}`;
-            logger_1.logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        const modeStr = mode.toLowerCase();
+        if (!this.modes.includes(modeStr)) {
+            logger_1.logger.debug(`Invalid humidity mode used - ${mode}`);
+            logger_1.logger.debug(`Proper modes for this device are - ${this.modes.join(', ')}`);
+            return false;
         }
         logger_1.logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
@@ -253,15 +255,15 @@ class VeSyncAirBypass extends vesyncFan_1.VeSyncFan {
             configModule: this.configModule,
             payload: {
                 data: {
-                    mode
+                    workMode: this.deviceType.startsWith('Superior') && modeStr === 'auto' ? 'autoPro' : modeStr
                 },
-                method: 'setPurifierMode',
+                method: 'setHumidifierMode',
                 source: 'APP'
             }
         }, helpers_1.Helpers.reqHeaderBypass());
         const success = this.checkResponse([response, status], 'setMode');
         if (!success) {
-            logger_1.logger.error(`Failed to set mode to ${mode} for device: ${this.deviceName}`);
+            logger_1.logger.debug('Error setting humidity mode');
         }
         return success;
     }
@@ -488,6 +490,7 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
         this.modes = ['auto', 'manual', 'sleep'];
         this.displayModes = ['on', 'off'];
         this.humidityRange = { min: 30, max: 80 };
+        this.states = ['inactive', 'idle', 'humidifying'];
         // Set mist levels based on model
         switch (this.deviceType) {
             case 'Dual200S':
@@ -502,6 +505,66 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
         }
         logger_1.logger.debug(`Initialized VeSyncHumidifier device: ${this.deviceName}`);
     }
+    /**
+     * Get current operational state
+     */
+    get currentState() {
+        if (this.deviceStatus === 'off') {
+            return 'inactive';
+        }
+        if (this.details.water_lacks) {
+            return 'idle';
+        }
+        return 'humidifying';
+    }
+    /**
+     * Get water level percentage
+     */
+    get waterLevel() {
+        var _a;
+        return (_a = this.details.water_level) !== null && _a !== void 0 ? _a : 0;
+    }
+    /**
+     * Get water tank status
+     */
+    get waterTankLifted() {
+        var _a;
+        return (_a = this.details.water_tank_lifted) !== null && _a !== void 0 ? _a : false;
+    }
+    /**
+     * Get oscillation state
+     */
+    get oscillationEnabled() {
+        var _a;
+        return (_a = this.details.oscillation_enabled) !== null && _a !== void 0 ? _a : false;
+    }
+    /**
+     * Set oscillation state
+     */
+    async setOscillation(enabled) {
+        if (!this.hasFeature('oscillation')) {
+            logger_1.logger.debug('Oscillation not supported');
+            return false;
+        }
+        logger_1.logger.debug(`Setting oscillation to ${enabled ? 'on' : 'off'} for device: ${this.deviceName}`);
+        const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    oscillationEnabled: enabled
+                },
+                method: 'setSwing',
+                source: 'APP'
+            }
+        }, helpers_1.Helpers.reqHeaderBypass());
+        const success = this.checkResponse([response, status], 'setOscillation');
+        if (!success) {
+            logger_1.logger.debug('Error setting oscillation');
+        }
+        return success;
+    }
     /**
      * Get device details
      */
@@ -533,12 +596,13 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
                 humidity: result.humidity || 0,
                 mist_level: result.mistLevel || 0,
                 mist_virtual_level: result.virtualLevel || 0,
-                warm_level: result.warmLevel || 0,
                 water_lacks: result.waterLacks || false,
-                humidity_high: result.humidityHigh || false,
+                water_level: result.waterLevel || 0,
                 water_tank_lifted: result.waterTankLifted || false,
+                humidity_high: result.humidityHigh || false,
                 display: result.display || false,
                 automatic_stop: result.automaticStop || false,
+                oscillation_enabled: result.oscillationEnabled || false,
                 configuration: result.configuration || {},
                 connection_status: result.connectionStatus || null
             };
@@ -546,6 +610,34 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
         }
         return success;
     }
+    /**
+     * Display device info
+     */
+    display() {
+        super.display();
+        const info = [
+            ['Current State: ', this.currentState],
+            ['Water Level: ', this.waterLevel, '%'],
+            ['Water Tank: ', this.waterTankLifted ? 'Lifted' : 'Seated'],
+            ['Oscillation: ', this.oscillationEnabled ? 'On' : 'Off']
+        ];
+        for (const [key, value, unit = ''] of info) {
+            logger_1.logger.info(`${key.toString().padEnd(30, '.')} ${value}${unit}`);
+        }
+    }
+    /**
+     * Return JSON details
+     */
+    displayJSON() {
+        const baseInfo = JSON.parse(super.displayJSON());
+        return JSON.stringify({
+            ...baseInfo,
+            'Current State': this.currentState,
+            'Water Level': this.waterLevel,
+            'Water Tank': this.waterTankLifted ? 'Lifted' : 'Seated',
+            'Oscillation': this.oscillationEnabled ? 'On' : 'Off'
+        }, null, 4);
+    }
     /**
      * Turn device on
      */
@@ -610,9 +702,9 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
      */
     async setMistLevel(level) {
         if (!this.mistLevels.includes(level)) {
-            const error = `Invalid mist level: ${level}. Must be one of: ${this.mistLevels.join(', ')}`;
-            logger_1.logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+            logger_1.logger.debug(`Invalid mist level: ${level} for device: ${this.deviceName}`);
+            logger_1.logger.debug(`Valid levels for ${this.deviceType}: ${this.mistLevels.join(', ')}`);
+            return false;
         }
         logger_1.logger.info(`Setting mist level to ${level} for device: ${this.deviceName}`);
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
@@ -621,9 +713,9 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
             configModule: this.configModule,
             payload: {
                 data: {
-                    id: 0,
-                    level: level,
-                    type: 'mist'
+                    levelIdx: 0,
+                    virtualLevel: level,
+                    levelType: 'mist'
                 },
                 method: 'setVirtualLevel',
                 source: 'APP'
@@ -631,7 +723,7 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
         }, helpers_1.Helpers.reqHeaderBypass());
         const success = this.checkResponse([response, status], 'setMistLevel');
         if (!success) {
-            logger_1.logger.error(`Failed to set mist level to ${level} for device: ${this.deviceName}`);
+            logger_1.logger.debug('Error setting mist level');
         }
         return success;
     }
@@ -646,10 +738,11 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
      * Set device mode
      */
     async setMode(mode) {
-        if (!this.modes.includes(mode)) {
-            const error = `Invalid mode: ${mode}. Must be one of: ${this.modes.join(', ')}`;
-            logger_1.logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        const modeStr = mode.toLowerCase();
+        if (!this.modes.includes(modeStr)) {
+            logger_1.logger.debug(`Invalid humidity mode used - ${mode}`);
+            logger_1.logger.debug(`Proper modes for this device are - ${this.modes.join(', ')}`);
+            return false;
         }
         logger_1.logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
@@ -658,7 +751,7 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
             configModule: this.configModule,
             payload: {
                 data: {
-                    mode
+                    workMode: this.deviceType.startsWith('Superior') && modeStr === 'auto' ? 'autoPro' : modeStr
                 },
                 method: 'setHumidifierMode',
                 source: 'APP'
@@ -666,7 +759,7 @@ class VeSyncHumidifier extends vesyncFan_1.VeSyncFan {
         }, helpers_1.Helpers.reqHeaderBypass());
         const success = this.checkResponse([response, status], 'setMode');
         if (!success) {
-            logger_1.logger.error(`Failed to set mode to ${mode} for device: ${this.deviceName}`);
+            logger_1.logger.debug('Error setting humidity mode');
         }
         return success;
     }
@@ -896,7 +989,7 @@ class VeSyncWarmHumidifier extends VeSyncHumidifier {
             // Add warm humidifier specific fields
             this.details = {
                 ...this.details,
-                warm_enabled: this.details.warm_level > 0,
+                warm_enabled: Boolean(this.details.warm_level && this.details.warm_level > 0),
                 drying_mode_enabled: this.details.autoDryingSwitch === 1,
                 drying_mode_state: this.details.dryingMode || '',
                 drying_mode_level: this.details.dryingLevel || 0,
@@ -916,10 +1009,11 @@ class VeSyncWarmHumidifier extends VeSyncHumidifier {
      * Set device mode
      */
     async setMode(mode) {
-        if (!this.modes.includes(mode)) {
-            const error = `Invalid mode: ${mode}. Must be one of: ${this.modes.join(', ')}`;
-            logger_1.logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        const modeStr = mode.toLowerCase();
+        if (!this.modes.includes(modeStr)) {
+            logger_1.logger.debug(`Invalid humidity mode used - ${mode}`);
+            logger_1.logger.debug(`Proper modes for this device are - ${this.modes.join(', ')}`);
+            return false;
         }
         logger_1.logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
@@ -928,18 +1022,15 @@ class VeSyncWarmHumidifier extends VeSyncHumidifier {
             configModule: this.configModule,
             payload: {
                 data: {
-                    mode
+                    workMode: this.deviceType.startsWith('Superior') && modeStr === 'auto' ? 'autoPro' : modeStr
                 },
                 method: 'setHumidifierMode',
                 source: 'APP'
             }
         }, helpers_1.Helpers.reqHeaderBypass());
         const success = this.checkResponse([response, status], 'setMode');
-        if (success) {
-            this.details.mode = mode;
-        }
-        else {
-            logger_1.logger.error(`Failed to set mode to ${mode} for device: ${this.deviceName}`);
+        if (!success) {
+            logger_1.logger.debug('Error setting humidity mode');
         }
         return success;
     }
@@ -948,14 +1039,13 @@ class VeSyncWarmHumidifier extends VeSyncHumidifier {
      */
     async setWarmLevel(level) {
         if (!this.hasFeature('warm')) {
-            const error = 'Warm mist control not supported';
-            logger_1.logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+            logger_1.logger.debug('Warm mist control not supported');
+            return false;
         }
         if (!this.warmLevels.includes(level)) {
-            const error = `Invalid warm level: ${level}. Must be one of: ${this.warmLevels.join(', ')}`;
-            logger_1.logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+            logger_1.logger.debug(`Invalid warm level: ${level} for device: ${this.deviceName}`);
+            logger_1.logger.debug(`Valid levels for ${this.deviceType}: ${this.warmLevels.join(', ')}`);
+            return false;
         }
         logger_1.logger.debug(`Setting warm level to ${level} for device: ${this.deviceName}`);
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
@@ -1062,7 +1152,10 @@ class VeSyncAirBaseV2 extends VeSyncAirBypass {
     }
     buildConfigDict(configDict) {
         if (configDict) {
-            this.config = configDict;
+            this.config = {
+                ...this.config, // Preserve existing config
+                ...configDict // Merge in new config
+            };
         }
     }
     get mode() {
@@ -1091,6 +1184,7 @@ class VeSyncAirBaseV2 extends VeSyncAirBypass {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
             cid: this.cid,
+            deviceId: this.cid, // Add deviceId to match YAML spec
             configModule: this.configModule,
             payload: {
                 method,
@@ -1208,31 +1302,28 @@ class VeSyncAirBaseV2 extends VeSyncAirBypass {
      * Change fan speed
      */
     async changeFanSpeed(speed) {
-        var _a, _b, _c;
-        const speeds = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.levels) !== null && _b !== void 0 ? _b : [];
-        const currentSpeed = (_c = this.setSpeedLevel) !== null && _c !== void 0 ? _c : 0;
-        if (speed !== undefined) {
-            if (!speeds.includes(speed)) {
-                logger_1.logger.debug(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')}`);
-                return false;
-            }
+        var _a;
+        const speeds = (_a = this.config.levels) !== null && _a !== void 0 ? _a : [];
+        if (!speeds.includes(speed)) {
+            logger_1.logger.error(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')} for device: ${this.deviceName}`);
+            return false;
         }
-        else {
-            if (currentSpeed === speeds[speeds.length - 1] || currentSpeed === 0) {
-                speed = speeds[0];
-            }
-            else {
-                const currentIndex = speeds.indexOf(currentSpeed);
-                speed = speeds[currentIndex + 1];
+        logger_1.logger.info(`Changing fan speed to ${speed} for device: ${this.deviceName}`);
+        const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', {
+            ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
+            cid: this.cid,
+            configModule: this.configModule,
+            payload: {
+                data: {
+                    id: 0,
+                    level: speed,
+                    mode: 'manual',
+                    type: 'wind'
+                },
+                method: 'setLevel',
+                source: 'APP'
             }
-        }
-        const [head, body] = this.buildApiDict('setLevel');
-        body.payload.data = {
-            levelIdx: 0,
-            manualSpeedLevel: speed,
-            levelType: 'wind'
-        };
-        const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
+        }, helpers_1.Helpers.reqHeaderBypass());
         const success = this.checkResponse([response, status], 'changeFanSpeed');
         if (success) {
             this.setSpeedLevel = speed;
@@ -1419,22 +1510,23 @@ class VeSyncAirBaseV2 extends VeSyncAirBypass {
      * Display JSON details
      */
     displayJSON() {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const baseInfo = JSON.parse(super.displayJSON());
         const details = {
             ...baseInfo,
             'Mode': this.mode,
-            'Filter Life': this.details.filter_life.toString(),
+            'Filter Life': ((_a = this.details.filter_life) !== null && _a !== void 0 ? _a : 0).toString(),
             'Fan Level': this.speed.toString(),
-            'Display On': this.details.display.toString(),
-            'Child Lock': this.details.child_lock.toString(),
-            'Display Set On': this.details.screen_switch.toString(),
-            'Light Detection Enabled': this.details.light_detection_switch.toString(),
-            'Environment Light State': this.details.environment_light_state.toString()
+            'Display On': (_c = (_b = this.details.display) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : 'false',
+            'Child Lock': ((_d = this.details.child_lock) !== null && _d !== void 0 ? _d : false).toString(),
+            'Night Light': ((_e = this.details.night_light) !== null && _e !== void 0 ? _e : '').toString(),
+            'Display Set On': ((_f = this.details.screen_switch) !== null && _f !== void 0 ? _f : false).toString(),
+            'Light Detection Enabled': ((_g = this.details.light_detection_switch) !== null && _g !== void 0 ? _g : false).toString(),
+            'Environment Light State': ((_h = this.details.environment_light_state) !== null && _h !== void 0 ? _h : false).toString()
         };
         if (this.hasFeature('air_quality')) {
-            details['Air Quality Level'] = ((_a = this.details.air_quality) !== null && _a !== void 0 ? _a : '').toString();
-            details['Air Quality Value'] = ((_b = this.details.air_quality_value) !== null && _b !== void 0 ? _b : '').toString();
+            details['Air Quality Level'] = ((_j = this.details.air_quality) !== null && _j !== void 0 ? _j : '').toString();
+            details['Air Quality Value'] = ((_k = this.details.air_quality_value) !== null && _k !== void 0 ? _k : '').toString();
         }
         const everestKeys = {
             'pm1': 'PM1',
@@ -1444,7 +1536,7 @@ class VeSyncAirBaseV2 extends VeSyncAirBypass {
         };
         for (const [key, value] of Object.entries(everestKeys)) {
             if (key in this.details) {
-                details[value] = this.details[key].toString();
+                details[value] = (_m = (_l = this.details[key]) === null || _l === void 0 ? void 0 : _l.toString()) !== null && _m !== void 0 ? _m : '';
             }
         }
         return JSON.stringify(details, null, 4);
@@ -1476,7 +1568,6 @@ class VeSyncTowerFan extends VeSyncAirBaseV2 {
     constructor(details, manager) {
         super(details, manager);
         this.towerModes = ['normal', 'advancedSleep', 'off'];
-        this.speeds = Array.from({ length: 12 }, (_, i) => i + 1);
         logger_1.logger.debug(`Initialized VeSyncTowerFan device: ${this.deviceName}`);
     }
     /**
@@ -1502,6 +1593,7 @@ class VeSyncTowerFan extends VeSyncAirBaseV2 {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'bypassV2'),
             cid: this.cid,
+            deviceId: this.cid, // Add deviceId to match YAML spec
             configModule: this.configModule,
             payload: {
                 method,
@@ -1540,8 +1632,6 @@ class VeSyncTowerFan extends VeSyncAirBaseV2 {
             screenSwitch: deviceData.screenSwitch,
             oscillationState: deviceData.oscillationState,
             oscillationSwitch: deviceData.oscillationSwitch,
-            muteState: deviceData.muteState,
-            muteSwitch: deviceData.muteSwitch,
             timerRemain: deviceData.timerRemain,
             temperature: deviceData.temperature || 0,
             humidity: deviceData.humidity || 0,
@@ -1595,12 +1685,11 @@ class VeSyncTowerFan extends VeSyncAirBaseV2 {
      * Set tower fan mode
      */
     async mode_toggle(mode) {
-        const validModes = this.towerModes.map(m => m.toLowerCase());
-        if (!validModes.includes(mode.toLowerCase())) {
-            logger_1.logger.debug(`Invalid tower fan mode used - ${mode}`);
+        if (!this.towerModes.includes(mode)) {
+            logger_1.logger.debug(`Invalid mode: ${mode}. Must be one of: ${this.towerModes.join(', ')}`);
             return false;
         }
-        if (mode.toLowerCase() === 'off') {
+        if (mode === 'off') {
             return this.turnOff();
         }
         const [head, body] = this.buildApiDict('setTowerFanMode');
@@ -1614,7 +1703,7 @@ class VeSyncTowerFan extends VeSyncAirBaseV2 {
             this.details.workMode = mode;
         }
         else {
-            logger_1.logger.debug('Error setting tower fan mode');
+            logger_1.logger.error(`Failed to set ${mode} mode for device: ${this.deviceName}`);
         }
         return success;
     }
@@ -1622,8 +1711,10 @@ class VeSyncTowerFan extends VeSyncAirBaseV2 {
      * Change fan speed
      */
     async changeFanSpeed(speed) {
-        if (!this.speeds.includes(speed)) {
-            logger_1.logger.debug(`Invalid speed: ${speed}. Must be one of: ${this.speeds.join(', ')}`);
+        var _a;
+        const speeds = (_a = this.config.levels) !== null && _a !== void 0 ? _a : [];
+        if (!speeds.includes(speed)) {
+            logger_1.logger.debug(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')}`);
             return false;
         }
         const [head, body] = this.buildApiDict('setLevel');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsvesync",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "A TypeScript library for interacting with VeSync smart home devices",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",