tsvesync 1.0.49 → 1.0.51

package/src/lib/vesyncFanImpl.ts

@@ -12,7 +12,6 @@ import { logger } from './logger';
  */
 export class VeSyncAirBypass extends VeSyncFan {
     protected readonly modes = ['auto', 'manual', 'sleep'] as const;
-    protected readonly speeds = [1, 2, 3, 4, 5];
     protected readonly displayModes = ['on', 'off'] as const;
     protected readonly childLockModes = ['on', 'off'] as const;
 
@@ -29,6 +28,7 @@ export class VeSyncAirBypass extends VeSyncFan {
         const body = {
             ...Helpers.reqBody(this.manager, 'bypassV2'),
             cid: this.cid,
+            deviceId: this.cid,  // Add deviceId to match YAML spec
             configModule: this.configModule,
             payload: {
                 method,
@@ -258,10 +258,10 @@ export class VeSyncAirBypass extends VeSyncFan {
      * Change fan speed
      */
     async changeFanSpeed(speed: number): Promise<boolean> {
-        if (!this.speeds.includes(speed)) {
-            const error = `Invalid speed: ${speed}. Must be one of: ${this.speeds.join(', ')}`;
-            logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        const speeds = this.config.levels ?? [];
+        if (!speeds.includes(speed)) {
+            logger.error(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')} for device: ${this.deviceName}`);
+            return false;
         }
 
         logger.info(`Changing fan speed to ${speed} for device: ${this.deviceName}`);
@@ -297,10 +297,11 @@ export class VeSyncAirBypass extends VeSyncFan {
      * Set device mode
      */
     async setMode(mode: string): Promise<boolean> {
-        if (!this.modes.includes(mode as any)) {
-            const error = `Invalid mode: ${mode}. Must be one of: ${this.modes.join(', ')}`;
-            logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        const modeStr = mode.toLowerCase();
+        if (!this.modes.includes(modeStr as any)) {
+            logger.debug(`Invalid humidity mode used - ${mode}`);
+            logger.debug(`Proper modes for this device are - ${this.modes.join(', ')}`);
+            return false;
         }
 
         logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
@@ -313,9 +314,9 @@ export class VeSyncAirBypass extends VeSyncFan {
                 configModule: this.configModule,
                 payload: {
                     data: {
-                        mode
+                        workMode: this.deviceType.startsWith('Superior') && modeStr === 'auto' ? 'autoPro' : modeStr
                     },
-                    method: 'setPurifierMode',
+                    method: 'setHumidifierMode',
                     source: 'APP'
                 }
             },
@@ -324,7 +325,7 @@ export class VeSyncAirBypass extends VeSyncFan {
 
         const success = this.checkResponse([response, status], 'setMode');
         if (!success) {
-            logger.error(`Failed to set mode to ${mode} for device: ${this.deviceName}`);
+            logger.debug('Error setting humidity mode');
         }
         return success;
     }
@@ -601,6 +602,7 @@ export class VeSyncHumidifier extends VeSyncFan {
     protected readonly mistLevels: number[];
     protected readonly displayModes = ['on', 'off'] as const;
     protected readonly humidityRange = { min: 30, max: 80 };
+    protected readonly states = ['inactive', 'idle', 'humidifying'] as const;
 
     constructor(details: Record<string, any>, manager: VeSync) {
         super(details, manager);
@@ -619,6 +621,75 @@ export class VeSyncHumidifier extends VeSyncFan {
         logger.debug(`Initialized VeSyncHumidifier device: ${this.deviceName}`);
     }
 
+    /**
+     * Get current operational state
+     */
+    get currentState(): string {
+        if (this.deviceStatus === 'off') {
+            return 'inactive';
+        }
+        if (this.details.water_lacks) {
+            return 'idle';
+        }
+        return 'humidifying';
+    }
+
+    /**
+     * Get water level percentage
+     */
+    get waterLevel(): number {
+        return this.details.water_level ?? 0;
+    }
+
+    /**
+     * Get water tank status
+     */
+    get waterTankLifted(): boolean {
+        return this.details.water_tank_lifted ?? false;
+    }
+
+    /**
+     * Get oscillation state
+     */
+    get oscillationEnabled(): boolean {
+        return this.details.oscillation_enabled ?? false;
+    }
+
+    /**
+     * Set oscillation state
+     */
+    async setOscillation(enabled: boolean): Promise<boolean> {
+        if (!this.hasFeature('oscillation')) {
+            logger.debug('Oscillation not supported');
+            return false;
+        }
+
+        logger.debug(`Setting oscillation to ${enabled ? 'on' : 'off'} for device: ${this.deviceName}`);
+        const [response, status] = await this.callApi(
+            '/cloud/v2/deviceManaged/bypassV2',
+            'post',
+            {
+                ...Helpers.reqBody(this.manager, 'bypassV2'),
+                cid: this.cid,
+                configModule: this.configModule,
+                payload: {
+                    data: {
+                        oscillationEnabled: enabled
+                    },
+                    method: 'setSwing',
+                    source: 'APP'
+                }
+            },
+            Helpers.reqHeaderBypass()
+        );
+
+        const success = this.checkResponse([response, status], 'setOscillation');
+        if (!success) {
+            logger.debug('Error setting oscillation');
+        }
+        return success;
+    }
+
     /**
      * Get device details
      */
@@ -656,12 +727,13 @@ export class VeSyncHumidifier extends 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
             };
@@ -670,6 +742,37 @@ export class VeSyncHumidifier extends VeSyncFan {
         return success;
     }
 
+    /**
+     * Display device info
+     */
+    override display(): void {
+        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.info(`${key.toString().padEnd(30, '.')} ${value}${unit}`);
+        }
+    }
+
+    /**
+     * Return JSON details
+     */
+    override displayJSON(): string {
+        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
      */
@@ -741,9 +844,9 @@ export class VeSyncHumidifier extends VeSyncFan {
      */
     async setMistLevel(level: number): Promise<boolean> {
         if (!this.mistLevels.includes(level)) {
-            const error = `Invalid mist level: ${level}. Must be one of: ${this.mistLevels.join(', ')}`;
-            logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+            logger.debug(`Invalid mist level: ${level} for device: ${this.deviceName}`);
+            logger.debug(`Valid levels for ${this.deviceType}: ${this.mistLevels.join(', ')}`);
+            return false;
         }
 
         logger.info(`Setting mist level to ${level} for device: ${this.deviceName}`);
@@ -756,9 +859,9 @@ export class VeSyncHumidifier extends VeSyncFan {
                 configModule: this.configModule,
                 payload: {
                     data: {
-                        id: 0,
-                        level: level,
-                        type: 'mist'
+                        levelIdx: 0,
+                        virtualLevel: level,
+                        levelType: 'mist'
                     },
                     method: 'setVirtualLevel',
                     source: 'APP'
@@ -769,7 +872,7 @@ export class VeSyncHumidifier extends VeSyncFan {
 
         const success = this.checkResponse([response, status], 'setMistLevel');
         if (!success) {
-            logger.error(`Failed to set mist level to ${level} for device: ${this.deviceName}`);
+            logger.debug('Error setting mist level');
         }
         return success;
     }
@@ -786,10 +889,11 @@ export class VeSyncHumidifier extends VeSyncFan {
      * Set device mode
      */
     async setMode(mode: string): Promise<boolean> {
-        if (!this.modes.includes(mode as any)) {
-            const error = `Invalid mode: ${mode}. Must be one of: ${this.modes.join(', ')}`;
-            logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        const modeStr = mode.toLowerCase();
+        if (!this.modes.includes(modeStr as any)) {
+            logger.debug(`Invalid humidity mode used - ${mode}`);
+            logger.debug(`Proper modes for this device are - ${this.modes.join(', ')}`);
+            return false;
         }
 
         logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
@@ -802,7 +906,7 @@ export class VeSyncHumidifier extends VeSyncFan {
                 configModule: this.configModule,
                 payload: {
                     data: {
-                        mode
+                        workMode: this.deviceType.startsWith('Superior') && modeStr === 'auto' ? 'autoPro' : modeStr
                     },
                     method: 'setHumidifierMode',
                     source: 'APP'
@@ -813,7 +917,7 @@ export class VeSyncHumidifier extends VeSyncFan {
 
         const success = this.checkResponse([response, status], 'setMode');
         if (!success) {
-            logger.error(`Failed to set mode to ${mode} for device: ${this.deviceName}`);
+            logger.debug('Error setting humidity mode');
         }
         return success;
     }
@@ -1096,7 +1200,7 @@ export 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,
@@ -1118,10 +1222,11 @@ export class VeSyncWarmHumidifier extends VeSyncHumidifier {
      * Set device mode
      */
     async setMode(mode: string): Promise<boolean> {
-        if (!this.modes.includes(mode as any)) {
-            const error = `Invalid mode: ${mode}. Must be one of: ${this.modes.join(', ')}`;
-            logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+        const modeStr = mode.toLowerCase();
+        if (!this.modes.includes(modeStr as any)) {
+            logger.debug(`Invalid humidity mode used - ${mode}`);
+            logger.debug(`Proper modes for this device are - ${this.modes.join(', ')}`);
+            return false;
         }
 
         logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
@@ -1134,7 +1239,7 @@ export class VeSyncWarmHumidifier extends VeSyncHumidifier {
                 configModule: this.configModule,
                 payload: {
                     data: {
-                        mode
+                        workMode: this.deviceType.startsWith('Superior') && modeStr === 'auto' ? 'autoPro' : modeStr
                     },
                     method: 'setHumidifierMode',
                     source: 'APP'
@@ -1144,10 +1249,8 @@ export class VeSyncWarmHumidifier extends VeSyncHumidifier {
         );
 
         const success = this.checkResponse([response, status], 'setMode');
-        if (success) {
-            this.details.mode = mode;
-        } else {
-            logger.error(`Failed to set mode to ${mode} for device: ${this.deviceName}`);
+        if (!success) {
+            logger.debug('Error setting humidity mode');
         }
         return success;
     }
@@ -1157,15 +1260,14 @@ export class VeSyncWarmHumidifier extends VeSyncHumidifier {
      */
     async setWarmLevel(level: number): Promise<boolean> {
         if (!this.hasFeature('warm')) {
-            const error = 'Warm mist control not supported';
-            logger.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+            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.error(`${error} for device: ${this.deviceName}`);
-            throw new Error(error);
+            logger.debug(`Invalid warm level: ${level} for device: ${this.deviceName}`);
+            logger.debug(`Valid levels for ${this.deviceType}: ${this.warmLevels.join(', ')}`);
+            return false;
         }
 
         logger.debug(`Setting warm level to ${level} for device: ${this.deviceName}`);
@@ -1292,7 +1394,10 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
 
     protected buildConfigDict(configDict: Record<string, any>): void {
         if (configDict) {
-            this.config = configDict;
+            this.config = {
+                ...this.config,  // Preserve existing config
+                ...configDict    // Merge in new config
+            };
         }
     }
 
@@ -1328,6 +1433,7 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         const body = {
             ...Helpers.reqBody(this.manager, 'bypassV2'),
             cid: this.cid,
+            deviceId: this.cid,  // Add deviceId to match YAML spec
             configModule: this.configModule,
             payload: {
                 method,
@@ -1467,35 +1573,32 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
      * Change fan speed
      */
     async changeFanSpeed(speed: number): Promise<boolean> {
-        const speeds: number[] = this.config?.levels ?? [];
-        const currentSpeed = this.setSpeedLevel ?? 0;
-
-        if (speed !== undefined) {
-            if (!speeds.includes(speed)) {
-                logger.debug(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')}`);
-                return false;
-            }
-        } else {
-            if (currentSpeed === speeds[speeds.length - 1] || currentSpeed === 0) {
-                speed = speeds[0];
-            } else {
-                const currentIndex = speeds.indexOf(currentSpeed);
-                speed = speeds[currentIndex + 1];
-            }
+        const speeds = this.config.levels ?? [];
+        if (!speeds.includes(speed)) {
+            logger.error(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')} for device: ${this.deviceName}`);
+            return false;
         }
 
-        const [head, body] = this.buildApiDict('setLevel');
-        body.payload.data = {
-            levelIdx: 0,
-            manualSpeedLevel: speed,
-            levelType: 'wind'
-        };
-
+        logger.info(`Changing fan speed to ${speed} for device: ${this.deviceName}`);
         const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
-            body,
-            head
+            {
+                ...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'
+                }
+            },
+            Helpers.reqHeaderBypass()
         );
 
         const success = this.checkResponse([response, status], 'changeFanSpeed');
@@ -1757,13 +1860,14 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         const details: Record<string, string> = {
             ...baseInfo,
             'Mode': this.mode,
-            'Filter Life': this.details.filter_life.toString(),
+            'Filter Life': (this.details.filter_life ?? 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': this.details.display?.toString() ?? 'false',
+            'Child Lock': (this.details.child_lock ?? false).toString(),
+            'Night Light': (this.details.night_light ?? '').toString(),
+            'Display Set On': (this.details.screen_switch ?? false).toString(),
+            'Light Detection Enabled': (this.details.light_detection_switch ?? false).toString(),
+            'Environment Light State': (this.details.environment_light_state ?? false).toString()
         };
 
         if (this.hasFeature('air_quality')) {
@@ -1780,7 +1884,7 @@ export 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] = this.details[key]?.toString() ?? '';
             }
         }
 
@@ -1820,7 +1924,6 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
  */
 export class VeSyncTowerFan extends VeSyncAirBaseV2 {
     protected readonly towerModes = ['normal', 'advancedSleep', 'off'] as const;
-    protected readonly speeds = Array.from({length: 12}, (_, i) => i + 1);
 
     constructor(details: Record<string, any>, manager: VeSync) {
         super(details, manager);
@@ -1851,6 +1954,7 @@ export class VeSyncTowerFan extends VeSyncAirBaseV2 {
         const body = {
             ...Helpers.reqBody(this.manager, 'bypassV2'),
             cid: this.cid,
+            deviceId: this.cid,  // Add deviceId to match YAML spec
             configModule: this.configModule,
             payload: {
                 method,
@@ -1899,8 +2003,6 @@ export 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,
@@ -1966,13 +2068,12 @@ export class VeSyncTowerFan extends VeSyncAirBaseV2 {
      * Set tower fan mode
      */
     async mode_toggle(mode: string): Promise<boolean> {
-        const validModes = this.towerModes.map(m => m.toLowerCase());
-        if (!validModes.includes(mode.toLowerCase())) {
-            logger.debug(`Invalid tower fan mode used - ${mode}`);
+        if (!this.towerModes.includes(mode as any)) {
+            logger.debug(`Invalid mode: ${mode}. Must be one of: ${this.towerModes.join(', ')}`);
             return false;
         }
 
-        if (mode.toLowerCase() === 'off') {
+        if (mode === 'off') {
             return this.turnOff();
         }
 
@@ -1993,7 +2094,7 @@ export class VeSyncTowerFan extends VeSyncAirBaseV2 {
         if (success) {
             this.details.workMode = mode;
         } else {
-            logger.debug('Error setting tower fan mode');
+            logger.error(`Failed to set ${mode} mode for device: ${this.deviceName}`);
         }
         return success;
     }
@@ -2002,8 +2103,9 @@ export class VeSyncTowerFan extends VeSyncAirBaseV2 {
      * Change fan speed
      */
     async changeFanSpeed(speed: number): Promise<boolean> {
-        if (!this.speeds.includes(speed)) {
-            logger.debug(`Invalid speed: ${speed}. Must be one of: ${this.speeds.join(', ')}`);
+        const speeds = this.config.levels ?? [];
+        if (!speeds.includes(speed)) {
+            logger.debug(`Invalid speed: ${speed}. Must be one of: ${speeds.join(', ')}`);
             return false;
         }