tsvesync 1.3.7 → 1.3.9

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { VeSync } from './lib/vesync';
 export { VeSyncAirBypass } from './lib/vesyncFanImpl';
 export { VeSyncOutlet7A, VeSyncOutlet10A, VeSyncOutlet15A, VeSyncOutdoorPlug } from './lib/vesyncOutletImpl';
 export { VeSyncBulb } from './lib/vesyncBulb';
-export { VeSyncWallSwitch } from './lib/vesyncSwitchImpl';
+export { VeSyncWallSwitch, VeSyncDimmerSwitch } from './lib/vesyncSwitchImpl';
 export { VeSyncBaseDevice } from './lib/vesyncBaseDevice';
 export { Helpers, setApiBaseUrl } from './lib/helpers';
 export { CREDENTIAL_ERROR_CODES, CROSS_REGION_ERROR_CODES, isCredentialError, isCrossRegionError } from './lib/constants';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeJwtTimestamps = exports.isCrossRegionError = exports.isCredentialError = exports.CROSS_REGION_ERROR_CODES = exports.CREDENTIAL_ERROR_CODES = exports.setApiBaseUrl = exports.Helpers = exports.VeSyncBaseDevice = exports.VeSyncWallSwitch = exports.VeSyncBulb = exports.VeSyncOutdoorPlug = exports.VeSyncOutlet15A = exports.VeSyncOutlet10A = exports.VeSyncOutlet7A = exports.VeSyncAirBypass = exports.VeSync = void 0;
+exports.decodeJwtTimestamps = exports.isCrossRegionError = exports.isCredentialError = exports.CROSS_REGION_ERROR_CODES = exports.CREDENTIAL_ERROR_CODES = exports.setApiBaseUrl = exports.Helpers = exports.VeSyncBaseDevice = exports.VeSyncDimmerSwitch = exports.VeSyncWallSwitch = exports.VeSyncBulb = exports.VeSyncOutdoorPlug = exports.VeSyncOutlet15A = exports.VeSyncOutlet10A = exports.VeSyncOutlet7A = exports.VeSyncAirBypass = exports.VeSync = void 0;
 // Export main VeSync manager class
 var vesync_1 = require("./lib/vesync");
 Object.defineProperty(exports, "VeSync", { enumerable: true, get: function () { return vesync_1.VeSync; } });
@@ -16,6 +16,7 @@ var vesyncBulb_1 = require("./lib/vesyncBulb");
 Object.defineProperty(exports, "VeSyncBulb", { enumerable: true, get: function () { return vesyncBulb_1.VeSyncBulb; } });
 var vesyncSwitchImpl_1 = require("./lib/vesyncSwitchImpl");
 Object.defineProperty(exports, "VeSyncWallSwitch", { enumerable: true, get: function () { return vesyncSwitchImpl_1.VeSyncWallSwitch; } });
+Object.defineProperty(exports, "VeSyncDimmerSwitch", { enumerable: true, get: function () { return vesyncSwitchImpl_1.VeSyncDimmerSwitch; } });
 // Export base device class
 var vesyncBaseDevice_1 = require("./lib/vesyncBaseDevice");
 Object.defineProperty(exports, "VeSyncBaseDevice", { enumerable: true, get: function () { return vesyncBaseDevice_1.VeSyncBaseDevice; } });

package/dist/lib/fans/airBaseV2.d.ts

@@ -30,10 +30,9 @@ export declare class VeSyncAirBaseV2 extends VeSyncAirBypass {
         action: string;
     } | null);
     /**
-     * Check response for Vital series devices
-     * These devices return success at API level but may have inner errors
+     * Check response for bypassV2 purifiers that surface nested result codes.
      */
-    protected checkVitalResponse(response: any, status: number, method: string): boolean;
+    protected checkV2Response(response: any, status: number, method: string): boolean;
     /**
      * Get device details
      */
@@ -43,24 +42,23 @@ export declare class VeSyncAirBaseV2 extends VeSyncAirBypass {
      */
     protected buildPurifierDict(devDict: Record<string, any>): void;
     /**
-     * Check if the current device is a Vital series model
-     * @returns true if this is a LAP-V102S or LAP-V201S device
+     * Determine whether this purifier requires the powerSwitch payload and nested response handling.
      */
-    private isVitalSeries;
+    private requiresPowerSwitchPayload;
     /**
-     * Override turn on method to handle Vital series special cases
+     * Override turn on to use the powerSwitch payload required by bypassV2 purifiers.
      */
     turnOn(): Promise<boolean>;
     /**
-     * Override turn off method to handle Vital series special cases
+     * Override turn off to use the powerSwitch payload required by bypassV2 purifiers.
      */
     turnOff(): Promise<boolean>;
     /**
-     * Override setMode method to handle Vital series special cases
+     * Override setMode to send workMode payloads for bypassV2 purifiers.
      */
     setMode(mode: string): Promise<boolean>;
     /**
-     * Override changeFanSpeed method to handle Vital series special cases
+     * Override changeFanSpeed to use manualSpeedLevel for bypassV2 purifiers.
      */
     changeFanSpeed(speed: number): Promise<boolean>;
     /**

package/dist/lib/fans/airBaseV2.js

@@ -46,26 +46,21 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         this._timer = value;
     }
     /**
-     * Check response for Vital series devices
-     * These devices return success at API level but may have inner errors
+     * Check response for bypassV2 purifiers that surface nested result codes.
      */
-    checkVitalResponse(response, status, method) {
-        // First check basic response
+    checkV2Response(response, status, method) {
+        // First check basic response structure
         if (!this.checkResponse([response, status], method)) {
             return false;
         }
-        // Check if this is a Vital series device
-        const isVitalSeries = this.deviceType.includes('LAP-V102S') || this.deviceType.includes('LAP-V201S');
-        if (!isVitalSeries) {
-            return true; // Not a Vital series device, standard check is enough
+        // Only apply extended handling to bypassV2 purifiers (Vital/Everest)
+        if (!this.requiresPowerSwitchPayload()) {
+            return true;
         }
-        // For Vital series, we need to check the inner result code
+        // These devices frequently succeed with a nested non-zero code
         if (response.result && response.result.code !== undefined && response.result.code !== 0) {
-            // Vital series often returns code -1 but still succeeds
-            // Let's update the state optimistically
-            logger_1.logger.debug(`Vital series device ${this.deviceName} returned inner code ${response.result.code} for ${method}`);
-            logger_1.logger.debug('This is normal for Vital series devices - proceeding with operation');
-            // Keep the device online despite inner error
+            logger_1.logger.debug(`${this.deviceName} returned inner code ${response.result.code} for ${method}`);
+            logger_1.logger.debug('BypassV2 purifier reports non-zero inner code but request still succeeded');
             this.connectionStatus = 'online';
             return true;
         }
@@ -79,22 +74,20 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         logger_1.logger.debug(`Getting details for device: ${this.deviceName}`);
         const [head, body] = this.buildApiDict('getPurifierStatus');
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
-        // Check if this is a Vital series device (LAP-V102S or LAP-V201S)
-        const isVitalSeries = this.deviceType.includes('LAP-V102S') || this.deviceType.includes('LAP-V201S');
+        const needsV2Handling = this.requiresPowerSwitchPayload();
         // First check the outer response
         if (!response || status !== 200) {
             logger_1.logger.debug(`Error getting purifier details for ${this.deviceName}: Invalid response`);
             this.connectionStatus = 'offline';
             return false;
         }
-        // For Vital series, we need special handling as they return inner code -1 for details
-        // but still provide valid status information
-        if (isVitalSeries && response.result) {
+        // For bypassV2 purifier families the API nests the result and may surface non-zero codes
+        if (needsV2Handling && response.result) {
             // Check if we have a valid getPurifierStatus response
             if (response.code === 0 && ((_a = response.result) === null || _a === void 0 ? void 0 : _a.result)) {
                 const statusResponse = response.result.result;
                 // If we have valid status data, use it regardless of inner result code
-                logger_1.logger.debug(`Using status data for Vital series device: ${this.deviceName}`);
+                logger_1.logger.debug(`Using nested status data for bypassV2 purifier: ${this.deviceName}`);
                 this.buildPurifierDict(statusResponse);
                 if (statusResponse.configuration) {
                     this.buildConfigDict(statusResponse.configuration);
@@ -104,7 +97,7 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
                 return true;
             }
         }
-        // Standard processing for non-Vital devices or when no status data is available
+        // Standard processing for non-bypassV2 devices or when no status data is available
         if (!this.checkResponse([response, status], 'getDetails') || !(response === null || response === void 0 ? void 0 : response.result)) {
             logger_1.logger.debug('Error getting purifier details');
             this.connectionStatus = 'offline';
@@ -133,7 +126,9 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         this.enabled = powerSwitch;
         this.deviceStatus = powerSwitch ? 'on' : 'off';
         this.mode = (_b = devDict.workMode) !== null && _b !== void 0 ? _b : 'manual';
-        this.speed = (_c = devDict.fanSpeedLevel) !== null && _c !== void 0 ? _c : 0;
+        const reportedFanSpeed = (_c = devDict.fanSpeedLevel) !== null && _c !== void 0 ? _c : 0;
+        const isAutoSentinel = reportedFanSpeed === 255;
+        this.speed = isAutoSentinel ? 0 : reportedFanSpeed;
         this.setSpeedLevel = (_d = devDict.manualSpeedLevel) !== null && _d !== void 0 ? _d : 1;
         // Parse filter life with proper fallback handling and logging
         let filterLife = 0;
@@ -159,7 +154,11 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
             light_detection_switch: Boolean((_g = devDict.lightDetectionSwitch) !== null && _g !== void 0 ? _g : 0),
             environment_light_state: Boolean((_h = devDict.environmentLightState) !== null && _h !== void 0 ? _h : 0),
             screen_switch: Boolean((_j = devDict.screenSwitch) !== null && _j !== void 0 ? _j : 0),
-            screenStatus: Boolean((_k = devDict.screenSwitch) !== null && _k !== void 0 ? _k : 0) ? 'on' : 'off'
+            screenStatus: Boolean((_k = devDict.screenSwitch) !== null && _k !== void 0 ? _k : 0) ? 'on' : 'off',
+            manualSpeedLevel: this.setSpeedLevel,
+            mode: this.mode,
+            speed: this.speed,
+            isAutoSentinel
         };
         if (this.hasFeature('air_quality')) {
             this.details.air_quality_value = (_l = devDict.PM25) !== null && _l !== void 0 ? _l : 0;
@@ -186,29 +185,28 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         }
     }
     /**
-     * Check if the current device is a Vital series model
-     * @returns true if this is a LAP-V102S or LAP-V201S device
+     * Determine whether this purifier requires the powerSwitch payload and nested response handling.
      */
-    isVitalSeries() {
-        return this.deviceType.includes('LAP-V102S') || this.deviceType.includes('LAP-V201S');
+    requiresPowerSwitchPayload() {
+        const type = (this.deviceType || '').toUpperCase();
+        return type.startsWith('LAP-V') || type.startsWith('LAP-EL');
     }
     /**
-     * Override turn on method to handle Vital series special cases
+     * Override turn on to use the powerSwitch payload required by bypassV2 purifiers.
      */
     async turnOn() {
         logger_1.logger.info(`Turning on device: ${this.deviceName}`);
         const [head, body] = this.buildApiDict('setSwitch');
-        // For Vital series, use powerSwitch per YAML spec
-        // For other models, use the parent class implementation
-        if (this.isVitalSeries()) {
-            logger_1.logger.debug(`Using Vital series specific payload for ${this.deviceName}`);
+        // BypassV2 purifiers require powerSwitch toggles; others fall back to the base implementation
+        if (this.requiresPowerSwitchPayload()) {
+            logger_1.logger.debug(`Using bypassV2 power payload for ${this.deviceName}`);
             body.payload.data = {
                 powerSwitch: 1,
                 switchIdx: 0
             };
             const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
-            // Use Vital-specific response checking
-            const success = this.checkVitalResponse(response, status, 'turnOn');
+            // Use bypassV2 response checking
+            const success = this.checkV2Response(response, status, 'turnOn');
             if (success) {
                 this.deviceStatus = 'on';
                 // Force a details update to sync state
@@ -221,27 +219,26 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
             return success;
         }
         else {
-            // Use parent implementation for non-Vital models
+            // Use parent implementation for non-bypassV2 models
             return super.turnOn();
         }
     }
     /**
-     * Override turn off method to handle Vital series special cases
+     * Override turn off to use the powerSwitch payload required by bypassV2 purifiers.
      */
     async turnOff() {
         logger_1.logger.info(`Turning off device: ${this.deviceName}`);
         const [head, body] = this.buildApiDict('setSwitch');
-        // For Vital series, use powerSwitch per YAML spec
-        // For other models, use the parent class implementation
-        if (this.isVitalSeries()) {
-            logger_1.logger.debug(`Using Vital series specific payload for ${this.deviceName}`);
+        // BypassV2 purifiers require powerSwitch toggles; others fall back to the base implementation
+        if (this.requiresPowerSwitchPayload()) {
+            logger_1.logger.debug(`Using bypassV2 power payload for ${this.deviceName}`);
             body.payload.data = {
                 powerSwitch: 0,
                 switchIdx: 0
             };
             const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
-            // Use Vital-specific response checking
-            const success = this.checkVitalResponse(response, status, 'turnOff');
+            // Use bypassV2 response checking
+            const success = this.checkV2Response(response, status, 'turnOff');
             if (success) {
                 this.deviceStatus = 'off';
                 // Force a details update to sync state
@@ -254,12 +251,12 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
             return success;
         }
         else {
-            // Use parent implementation for non-Vital models
+            // Use parent implementation for non-bypassV2 models
             return super.turnOff();
         }
     }
     /**
-     * Override setMode method to handle Vital series special cases
+     * Override setMode to send workMode payloads for bypassV2 purifiers.
      */
     async setMode(mode) {
         if (!this.modes.includes(mode)) {
@@ -272,16 +269,15 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
             logger_1.logger.warn(`Auto mode not supported for ${this.deviceType}, using manual mode instead`);
             return this.setMode('manual');
         }
-        // For Vital series, use special response handling
-        // For other models, use the parent implementation
-        if (this.isVitalSeries()) {
-            logger_1.logger.debug(`Using Vital series specific response handling for ${this.deviceName}`);
+        // BypassV2 purifiers need the workMode payload; other models use the base implementation
+        if (this.requiresPowerSwitchPayload()) {
+            logger_1.logger.debug(`Using bypassV2 mode payload for ${this.deviceName}`);
             const [head, body] = this.buildApiDict('setPurifierMode');
             body.payload.data = {
                 workMode: mode
             };
             const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
-            const success = this.checkVitalResponse(response, status, 'setMode');
+            const success = this.checkV2Response(response, status, 'setMode');
             if (success) {
                 this.details.mode = mode;
                 this._mode = mode;
@@ -299,12 +295,12 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
             }
         }
         else {
-            // Use parent implementation for non-Vital models
+            // Use parent implementation for non-bypassV2 models
             return super.setMode(mode);
         }
     }
     /**
-     * Override changeFanSpeed method to handle Vital series special cases
+     * Override changeFanSpeed to use manualSpeedLevel for bypassV2 purifiers.
      */
     async changeFanSpeed(speed) {
         var _a;
@@ -315,17 +311,17 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         }
         logger_1.logger.info(`Changing fan speed to ${speed} for device: ${this.deviceName}`);
         const [head, body] = this.buildApiDict('setLevel');
-        // Specific handling for Vital series devices
-        if (this.isVitalSeries()) {
-            logger_1.logger.debug(`Using Vital series specific payload for ${this.deviceName}`);
-            // For Vital series, use levelIdx, levelType, and manualSpeedLevel per YAML spec
+        // Specific handling for bypassV2 devices
+        if (this.requiresPowerSwitchPayload()) {
+            logger_1.logger.debug(`Using bypassV2 speed payload for ${this.deviceName}`);
+            // For these devices, use levelIdx, levelType, and manualSpeedLevel per YAML spec
             body.payload.data = {
                 levelIdx: 0,
                 levelType: 'wind',
                 manualSpeedLevel: speed
             };
             const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
-            const success = this.checkVitalResponse(response, status, 'changeFanSpeed');
+            const success = this.checkV2Response(response, status, 'changeFanSpeed');
             if (success) {
                 this.speed = speed;
                 this.details.manualSpeedLevel = speed;
@@ -343,7 +339,7 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
             }
         }
         else {
-            // For non-Vital models, use id, level, mode, and type
+            // For non-bypassV2 models, use id, level, mode, and type
             body.payload.data = {
                 id: 0,
                 level: speed,
@@ -378,14 +374,14 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         };
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
         // Use the appropriate response checking method based on device type
-        const success = this.isVitalSeries()
-            ? this.checkVitalResponse(response, status, 'setAutoPreference')
+        const success = this.requiresPowerSwitchPayload()
+            ? this.checkV2Response(response, status, 'setAutoPreference')
             : this.checkResponse([response, status], 'setAutoPreference');
         if (success) {
             this.details.auto_preference = preference;
             this.details.auto_preference_type = preference;
-            // Force a details update to sync state for Vital series
-            if (this.isVitalSeries()) {
+            // Force a details update to sync state for bypassV2 purifiers
+            if (this.requiresPowerSwitchPayload()) {
                 setTimeout(() => {
                     this.getDetails().catch(e => {
                         logger_1.logger.debug(`Background state refresh failed: ${e}`);
@@ -405,13 +401,13 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         };
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
         // Use the appropriate response checking method based on device type
-        const success = this.isVitalSeries()
-            ? this.checkVitalResponse(response, status, 'setLightDetection')
+        const success = this.requiresPowerSwitchPayload()
+            ? this.checkV2Response(response, status, 'setLightDetection')
             : this.checkResponse([response, status], 'setLightDetection');
         if (success) {
             this.details.light_detection_switch = enabled;
-            // Force a details update to sync state for Vital series
-            if (this.isVitalSeries()) {
+            // Force a details update to sync state for bypassV2 purifiers
+            if (this.requiresPowerSwitchPayload()) {
                 setTimeout(() => {
                     this.getDetails().catch(e => {
                         logger_1.logger.debug(`Background state refresh failed: ${e}`);
@@ -486,8 +482,8 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         };
         const [response, status] = await this.callApi('/cloud/v2/deviceManaged/bypassV2', 'post', body, head);
         // Use the appropriate response checking method based on device type
-        const success = this.isVitalSeries()
-            ? this.checkVitalResponse(response, status, 'setOscillation')
+        const success = this.requiresPowerSwitchPayload()
+            ? this.checkV2Response(response, status, 'setOscillation')
             : this.checkResponse([response, status], 'setOscillation');
         if (success) {
             this.details.oscillationState = toggle;

package/dist/lib/vesyncSwitchImpl.js

@@ -22,7 +22,7 @@ class VeSyncWallSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Getting details for device: ${this.deviceName}`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicedetail'),
-            uuid: this.cid,
+            uuid: this.uuid,
             method: 'devicedetail'
         };
         const [response, statusCode] = await this.callApi('/inwallswitch/v1/device/devicedetail', 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
@@ -44,7 +44,7 @@ class VeSyncWallSwitch extends vesyncSwitch_1.VeSyncSwitch {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicedetail'),
             method: 'configurations',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/inwallswitch/v1/device/configurations', 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -63,7 +63,7 @@ class VeSyncWallSwitch extends vesyncSwitch_1.VeSyncSwitch {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'off',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/inwallswitch/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -82,7 +82,7 @@ class VeSyncWallSwitch extends vesyncSwitch_1.VeSyncSwitch {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'on',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/inwallswitch/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -114,7 +114,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Getting details for device: ${this.deviceName}`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicedetail'),
-            uuid: this.cid,
+            uuid: this.uuid,
             method: 'devicedetail'
         };
         const [response, statusCode] = await this.callApi('/dimmer/v1/device/devicedetail', 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
@@ -146,7 +146,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicedetail'),
             method: 'configurations',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/dimmer/v1/device/configurations', 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -165,7 +165,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'off',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/dimmer/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -184,7 +184,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'on',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/dimmer/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -206,8 +206,8 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Setting brightness to ${brightness} for device: ${this.deviceName}`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
-            brightness: brightness.toString(),
-            uuid: this.cid
+            brightness,
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/dimmer/v1/device/updatebrightness', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -231,7 +231,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
                 blue: Math.round(blue)
             },
             status: 'on',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/dimmer/v1/device/devicergbstatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -251,7 +251,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'off',
-            uuid: this.cid
+            uuid: this.uuid
         };
         const [response] = await this.callApi('/dimmer/v1/device/devicergbstatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -269,7 +269,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Turning on RGB color for device: ${this.deviceName}`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
+            uuid: this.uuid,
             status: 'on'
         };
         const [response] = await this.callApi('/dimmer/v1/device/devicergbstatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
@@ -288,7 +288,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Turning on indicator light for device: ${this.deviceName}`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
+            uuid: this.uuid,
             status: 'on'
         };
         const [response] = await this.callApi('/dimmer/v1/device/indicatorlightstatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
@@ -307,7 +307,7 @@ class VeSyncDimmerSwitch extends vesyncSwitch_1.VeSyncSwitch {
         logger_1.logger.debug(`Turning off indicator light for device: ${this.deviceName}`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
+            uuid: this.uuid,
             status: 'off'
         };
         const [response] = await this.callApi('/dimmer/v1/device/indicatorlightstatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));

package/package.json

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

package/src/index.ts

@@ -5,7 +5,7 @@ export { VeSync } from './lib/vesync';
 export { VeSyncAirBypass } from './lib/vesyncFanImpl';
 export { VeSyncOutlet7A, VeSyncOutlet10A, VeSyncOutlet15A, VeSyncOutdoorPlug } from './lib/vesyncOutletImpl';
 export { VeSyncBulb } from './lib/vesyncBulb';
-export { VeSyncWallSwitch } from './lib/vesyncSwitchImpl';
+export { VeSyncWallSwitch, VeSyncDimmerSwitch } from './lib/vesyncSwitchImpl';
 
 // Export base device class
 export { VeSyncBaseDevice } from './lib/vesyncBaseDevice';

package/src/lib/fans/airBaseV2.ts

@@ -1,6 +1,5 @@
 import { VeSyncAirBypass } from './airBypass';
 import { VeSync } from '../vesync';
-import { Helpers } from '../helpers';
 import { logger } from '../logger';
 
 /**
@@ -55,29 +54,23 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
     }
 
     /**
-     * Check response for Vital series devices
-     * These devices return success at API level but may have inner errors
+     * Check response for bypassV2 purifiers that surface nested result codes.
      */
-    protected checkVitalResponse(response: any, status: number, method: string): boolean {
-        // First check basic response
+    protected checkV2Response(response: any, status: number, method: string): boolean {
+        // First check basic response structure
         if (!this.checkResponse([response, status], method)) {
             return false;
         }
 
-        // Check if this is a Vital series device
-        const isVitalSeries = this.deviceType.includes('LAP-V102S') || this.deviceType.includes('LAP-V201S');
-        if (!isVitalSeries) {
-            return true; // Not a Vital series device, standard check is enough
+        // Only apply extended handling to bypassV2 purifiers (Vital/Everest)
+        if (!this.requiresPowerSwitchPayload()) {
+            return true;
         }
 
-        // For Vital series, we need to check the inner result code
+        // These devices frequently succeed with a nested non-zero code
         if (response.result && response.result.code !== undefined && response.result.code !== 0) {
-            // Vital series often returns code -1 but still succeeds
-            // Let's update the state optimistically
-            logger.debug(`Vital series device ${this.deviceName} returned inner code ${response.result.code} for ${method}`);
-            logger.debug('This is normal for Vital series devices - proceeding with operation');
-            
-            // Keep the device online despite inner error
+            logger.debug(`${this.deviceName} returned inner code ${response.result.code} for ${method}`);
+            logger.debug('BypassV2 purifier reports non-zero inner code but request still succeeded');
             this.connectionStatus = 'online';
             return true;
         }
@@ -99,8 +92,7 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
             head
         );
 
-        // Check if this is a Vital series device (LAP-V102S or LAP-V201S)
-        const isVitalSeries = this.deviceType.includes('LAP-V102S') || this.deviceType.includes('LAP-V201S');
+        const needsV2Handling = this.requiresPowerSwitchPayload();
         
         // First check the outer response
         if (!response || status !== 200) {
@@ -109,15 +101,14 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
             return false;
         }
 
-        // For Vital series, we need special handling as they return inner code -1 for details
-        // but still provide valid status information
-        if (isVitalSeries && response.result) {
+        // For bypassV2 purifier families the API nests the result and may surface non-zero codes
+        if (needsV2Handling && response.result) {
             // Check if we have a valid getPurifierStatus response
             if (response.code === 0 && response.result?.result) {
                 const statusResponse = response.result.result;
                 
                 // If we have valid status data, use it regardless of inner result code
-                logger.debug(`Using status data for Vital series device: ${this.deviceName}`);
+                logger.debug(`Using nested status data for bypassV2 purifier: ${this.deviceName}`);
                 this.buildPurifierDict(statusResponse);
                 if (statusResponse.configuration) {
                     this.buildConfigDict(statusResponse.configuration);
@@ -128,7 +119,7 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
             }
         }
         
-        // Standard processing for non-Vital devices or when no status data is available
+        // Standard processing for non-bypassV2 devices or when no status data is available
         if (!this.checkResponse([response, status], 'getDetails') || !response?.result) {
             logger.debug('Error getting purifier details');
             this.connectionStatus = 'offline';
@@ -159,10 +150,12 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         this.enabled = powerSwitch;
         this.deviceStatus = powerSwitch ? 'on' : 'off';
         this.mode = devDict.workMode ?? 'manual';
-        
-        this.speed = devDict.fanSpeedLevel ?? 0;
+
+        const reportedFanSpeed = devDict.fanSpeedLevel ?? 0;
+        const isAutoSentinel = reportedFanSpeed === 255;
+        this.speed = isAutoSentinel ? 0 : reportedFanSpeed;
         this.setSpeedLevel = devDict.manualSpeedLevel ?? 1;
-        
+
         // Parse filter life with proper fallback handling and logging
         let filterLife = 0;
         if (devDict.filterLifePercent !== undefined) {
@@ -186,7 +179,11 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
             light_detection_switch: Boolean(devDict.lightDetectionSwitch ?? 0),
             environment_light_state: Boolean(devDict.environmentLightState ?? 0),
             screen_switch: Boolean(devDict.screenSwitch ?? 0),
-            screenStatus: Boolean(devDict.screenSwitch ?? 0) ? 'on' : 'off'
+            screenStatus: Boolean(devDict.screenSwitch ?? 0) ? 'on' : 'off',
+            manualSpeedLevel: this.setSpeedLevel,
+            mode: this.mode,
+            speed: this.speed,
+            isAutoSentinel
         };
 
         if (this.hasFeature('air_quality')) {
@@ -212,25 +209,24 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
     }
 
     /**
-     * Check if the current device is a Vital series model
-     * @returns true if this is a LAP-V102S or LAP-V201S device
+     * Determine whether this purifier requires the powerSwitch payload and nested response handling.
      */
-    private isVitalSeries(): boolean {
-        return this.deviceType.includes('LAP-V102S') || this.deviceType.includes('LAP-V201S');
+    private requiresPowerSwitchPayload(): boolean {
+        const type = (this.deviceType || '').toUpperCase();
+        return type.startsWith('LAP-V') || type.startsWith('LAP-EL');
     }
 
     /**
-     * Override turn on method to handle Vital series special cases
+     * Override turn on to use the powerSwitch payload required by bypassV2 purifiers.
      */
     override async turnOn(): Promise<boolean> {
         logger.info(`Turning on device: ${this.deviceName}`);
         
         const [head, body] = this.buildApiDict('setSwitch');
         
-        // For Vital series, use powerSwitch per YAML spec
-        // For other models, use the parent class implementation
-        if (this.isVitalSeries()) {
-            logger.debug(`Using Vital series specific payload for ${this.deviceName}`);
+        // BypassV2 purifiers require powerSwitch toggles; others fall back to the base implementation
+        if (this.requiresPowerSwitchPayload()) {
+            logger.debug(`Using bypassV2 power payload for ${this.deviceName}`);
             body.payload.data = {
                 powerSwitch: 1,
                 switchIdx: 0
@@ -243,8 +239,8 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
                 head
             );
 
-            // Use Vital-specific response checking
-            const success = this.checkVitalResponse(response, status, 'turnOn');
+            // Use bypassV2 response checking
+            const success = this.checkV2Response(response, status, 'turnOn');
             if (success) {
                 this.deviceStatus = 'on';
                 
@@ -257,23 +253,22 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
             }
             return success;
         } else {
-            // Use parent implementation for non-Vital models
+            // Use parent implementation for non-bypassV2 models
             return super.turnOn();
         }
     }
 
     /**
-     * Override turn off method to handle Vital series special cases
+     * Override turn off to use the powerSwitch payload required by bypassV2 purifiers.
      */
     override async turnOff(): Promise<boolean> {
         logger.info(`Turning off device: ${this.deviceName}`);
         
         const [head, body] = this.buildApiDict('setSwitch');
         
-        // For Vital series, use powerSwitch per YAML spec
-        // For other models, use the parent class implementation
-        if (this.isVitalSeries()) {
-            logger.debug(`Using Vital series specific payload for ${this.deviceName}`);
+        // BypassV2 purifiers require powerSwitch toggles; others fall back to the base implementation
+        if (this.requiresPowerSwitchPayload()) {
+            logger.debug(`Using bypassV2 power payload for ${this.deviceName}`);
             body.payload.data = {
                 powerSwitch: 0,
                 switchIdx: 0
@@ -286,8 +281,8 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
                 head
             );
 
-            // Use Vital-specific response checking
-            const success = this.checkVitalResponse(response, status, 'turnOff');
+            // Use bypassV2 response checking
+            const success = this.checkV2Response(response, status, 'turnOff');
             if (success) {
                 this.deviceStatus = 'off';
                 
@@ -300,13 +295,13 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
             }
             return success;
         } else {
-            // Use parent implementation for non-Vital models
+            // Use parent implementation for non-bypassV2 models
             return super.turnOff();
         }
     }
 
     /**
-     * Override setMode method to handle Vital series special cases
+     * Override setMode to send workMode payloads for bypassV2 purifiers.
      */
     override async setMode(mode: string): Promise<boolean> {
         if (!this.modes.includes(mode as any)) {
@@ -321,10 +316,9 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
             return this.setMode('manual');
         }
 
-        // For Vital series, use special response handling
-        // For other models, use the parent implementation
-        if (this.isVitalSeries()) {
-            logger.debug(`Using Vital series specific response handling for ${this.deviceName}`);
+        // BypassV2 purifiers need the workMode payload; other models use the base implementation
+        if (this.requiresPowerSwitchPayload()) {
+            logger.debug(`Using bypassV2 mode payload for ${this.deviceName}`);
             const [head, body] = this.buildApiDict('setPurifierMode');
             body.payload.data = {
                 workMode: mode
@@ -337,7 +331,7 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
                 head
             );
 
-            const success = this.checkVitalResponse(response, status, 'setMode');
+            const success = this.checkV2Response(response, status, 'setMode');
             if (success) {
                 this.details.mode = mode;
                 this._mode = mode;
@@ -355,13 +349,13 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
                 return false;
             }
         } else {
-            // Use parent implementation for non-Vital models
+            // Use parent implementation for non-bypassV2 models
             return super.setMode(mode);
         }
     }
 
     /**
-     * Override changeFanSpeed method to handle Vital series special cases
+     * Override changeFanSpeed to use manualSpeedLevel for bypassV2 purifiers.
      */
     override async changeFanSpeed(speed: number): Promise<boolean> {
         const speeds = this.config.levels ?? [];
@@ -374,10 +368,10 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         
         const [head, body] = this.buildApiDict('setLevel');
         
-        // Specific handling for Vital series devices
-        if (this.isVitalSeries()) {
-            logger.debug(`Using Vital series specific payload for ${this.deviceName}`);
-            // For Vital series, use levelIdx, levelType, and manualSpeedLevel per YAML spec
+        // Specific handling for bypassV2 devices
+        if (this.requiresPowerSwitchPayload()) {
+            logger.debug(`Using bypassV2 speed payload for ${this.deviceName}`);
+            // For these devices, use levelIdx, levelType, and manualSpeedLevel per YAML spec
             body.payload.data = {
                 levelIdx: 0,
                 levelType: 'wind',
@@ -391,7 +385,7 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
                 head
             );
 
-            const success = this.checkVitalResponse(response, status, 'changeFanSpeed');
+            const success = this.checkV2Response(response, status, 'changeFanSpeed');
             if (success) {
                 this.speed = speed;
                 this.details.manualSpeedLevel = speed;
@@ -409,7 +403,7 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
                 return false;
             }
         } else {
-            // For non-Vital models, use id, level, mode, and type
+            // For non-bypassV2 models, use id, level, mode, and type
             body.payload.data = {
                 id: 0,
                 level: speed,
@@ -459,16 +453,16 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         );
 
         // Use the appropriate response checking method based on device type
-        const success = this.isVitalSeries() 
-            ? this.checkVitalResponse(response, status, 'setAutoPreference')
+        const success = this.requiresPowerSwitchPayload() 
+            ? this.checkV2Response(response, status, 'setAutoPreference')
             : this.checkResponse([response, status], 'setAutoPreference');
             
         if (success) {
             this.details.auto_preference = preference;
             this.details.auto_preference_type = preference;
             
-            // Force a details update to sync state for Vital series
-            if (this.isVitalSeries()) {
+            // Force a details update to sync state for bypassV2 purifiers
+            if (this.requiresPowerSwitchPayload()) {
                 setTimeout(() => {
                     this.getDetails().catch(e => {
                         logger.debug(`Background state refresh failed: ${e}`);
@@ -496,15 +490,15 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         );
 
         // Use the appropriate response checking method based on device type
-        const success = this.isVitalSeries()
-            ? this.checkVitalResponse(response, status, 'setLightDetection')
+        const success = this.requiresPowerSwitchPayload()
+            ? this.checkV2Response(response, status, 'setLightDetection')
             : this.checkResponse([response, status], 'setLightDetection');
             
         if (success) {
             this.details.light_detection_switch = enabled;
             
-            // Force a details update to sync state for Vital series
-            if (this.isVitalSeries()) {
+            // Force a details update to sync state for bypassV2 purifiers
+            if (this.requiresPowerSwitchPayload()) {
                 setTimeout(() => {
                     this.getDetails().catch(e => {
                         logger.debug(`Background state refresh failed: ${e}`);
@@ -595,8 +589,8 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         );
 
         // Use the appropriate response checking method based on device type
-        const success = this.isVitalSeries()
-            ? this.checkVitalResponse(response, status, 'setOscillation')
+        const success = this.requiresPowerSwitchPayload()
+            ? this.checkV2Response(response, status, 'setOscillation')
             : this.checkResponse([response, status], 'setOscillation');
             
         if (success) {

package/src/lib/vesyncSwitchImpl.ts

@@ -23,7 +23,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
         logger.debug(`Getting details for device: ${this.deviceName}`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicedetail'),
-            uuid: this.cid,
+            uuid: this.uuid,
             method: 'devicedetail'
         };
 
@@ -53,7 +53,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
         const body = {
             ...Helpers.reqBody(this.manager, 'devicedetail'),
             method: 'configurations',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -79,7 +79,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'off',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -106,7 +106,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'on',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -147,7 +147,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Getting details for device: ${this.deviceName}`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicedetail'),
-            uuid: this.cid,
+            uuid: this.uuid,
             method: 'devicedetail'
         };
 
@@ -187,7 +187,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         const body = {
             ...Helpers.reqBody(this.manager, 'devicedetail'),
             method: 'configurations',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -213,7 +213,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'off',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -240,7 +240,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'on',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -271,8 +271,8 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Setting brightness to ${brightness} for device: ${this.deviceName}`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
-            brightness: brightness.toString(),
-            uuid: this.cid
+            brightness,
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -304,7 +304,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
                 blue: Math.round(blue)
             },
             status: 'on',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -332,7 +332,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             status: 'off',
-            uuid: this.cid
+            uuid: this.uuid
         };
 
         const [response] = await this.callApi(
@@ -358,7 +358,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Turning on RGB color for device: ${this.deviceName}`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
+            uuid: this.uuid,
             status: 'on'
         };
 
@@ -385,7 +385,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Turning on indicator light for device: ${this.deviceName}`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
+            uuid: this.uuid,
             status: 'on'
         };
 
@@ -412,7 +412,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
         logger.debug(`Turning off indicator light for device: ${this.deviceName}`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
-            uuid: this.cid,
+            uuid: this.uuid,
             status: 'off'
         };
 
@@ -455,4 +455,4 @@ export const switchModules: Record<string, new (details: Record<string, any>, ma
     'ESWL01': VeSyncWallSwitch,
     'ESWL03': VeSyncWallSwitch,
     'ESWD16': VeSyncDimmerSwitch
-}; 
+};