tsvesync 1.0.92 → 1.0.94

package/dist/lib/fans/air131.js

@@ -53,10 +53,35 @@ class VeSyncAir131 extends vesyncFan_1.VeSyncFan {
             // Check if data is in response.result or directly in response
             const data = response.result || response;
             this.deviceStatus = data.deviceStatus === 'on' ? 'on' : 'off';
+            // Parse filter life with proper object/value handling
+            let filterLife = 0;
+            if (data.filterLife !== undefined) {
+                if (typeof data.filterLife === 'object' && data.filterLife !== null) {
+                    // API returns object like {percent: 85}
+                    filterLife = data.filterLife;
+                    logger_1.logger.debug(`${this.deviceName}: Parsed filter life from filterLife object: ${JSON.stringify(data.filterLife)}`);
+                }
+                else if (typeof data.filterLife === 'number') {
+                    // API returns direct number
+                    filterLife = data.filterLife;
+                    logger_1.logger.debug(`${this.deviceName}: Parsed filter life from filterLife number: ${data.filterLife}%`);
+                }
+            }
+            else if (data.filter_life !== undefined) {
+                // Fallback to filter_life field
+                filterLife = data.filter_life;
+                logger_1.logger.debug(`${this.deviceName}: Parsed filter life from filter_life fallback: ${data.filter_life}%`);
+            }
+            else {
+                logger_1.logger.debug(`${this.deviceName}: No filter life data found in API response`);
+                if (logger_1.logger.getLevel && logger_1.logger.getLevel() !== undefined && logger_1.logger.getLevel() <= 0) {
+                    logger_1.logger.debug(`${this.deviceName}: API response structure:`, JSON.stringify(data, null, 2));
+                }
+            }
             this.details = {
                 mode: data.mode || 'manual', // Default to manual if not specified
                 speed: data.level || 0,
-                filter_life: data.filterLife || data.filter_life || 0,
+                filter_life: filterLife,
                 screen_status: data.screenStatus || 'off',
                 child_lock: data.childLock || false,
                 air_quality: data.airQuality || 'unknown',

package/dist/lib/fans/airBaseV2.js

@@ -127,7 +127,7 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
      * Build purifier dictionary
      */
     buildPurifierDict(devDict) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.connectionStatus = 'online';
         const powerSwitch = Boolean((_a = devDict.powerSwitch) !== null && _a !== void 0 ? _a : 0);
         this.enabled = powerSwitch;
@@ -135,19 +135,35 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
         this.mode = (_b = devDict.workMode) !== null && _b !== void 0 ? _b : 'manual';
         this.speed = (_c = devDict.fanSpeedLevel) !== null && _c !== void 0 ? _c : 0;
         this.setSpeedLevel = (_d = devDict.manualSpeedLevel) !== null && _d !== void 0 ? _d : 1;
+        // Parse filter life with proper fallback handling and logging
+        let filterLife = 0;
+        if (devDict.filterLifePercent !== undefined) {
+            filterLife = devDict.filterLifePercent;
+            logger_1.logger.debug(`${this.deviceName}: Parsed filter life from filterLifePercent: ${filterLife}%`);
+        }
+        else if (devDict.filter_life !== undefined) {
+            filterLife = devDict.filter_life;
+            logger_1.logger.debug(`${this.deviceName}: Parsed filter life from filter_life fallback: ${filterLife}%`);
+        }
+        else {
+            logger_1.logger.debug(`${this.deviceName}: No filter life data found in API response`);
+            if (logger_1.logger.getLevel && logger_1.logger.getLevel() !== undefined && logger_1.logger.getLevel() <= 0) {
+                logger_1.logger.debug(`${this.deviceName}: Device dict structure:`, JSON.stringify(devDict, null, 2));
+            }
+        }
         this.details = {
             ...this.details,
-            filter_life: (_e = devDict.filterLifePercent) !== null && _e !== void 0 ? _e : 0,
-            child_lock: Boolean((_f = devDict.childLockSwitch) !== null && _f !== void 0 ? _f : 0),
-            display: Boolean((_g = devDict.screenState) !== null && _g !== void 0 ? _g : 0),
-            light_detection_switch: Boolean((_h = devDict.lightDetectionSwitch) !== null && _h !== void 0 ? _h : 0),
-            environment_light_state: Boolean((_j = devDict.environmentLightState) !== null && _j !== void 0 ? _j : 0),
-            screen_switch: Boolean((_k = devDict.screenSwitch) !== null && _k !== void 0 ? _k : 0),
-            screenStatus: Boolean((_l = devDict.screenSwitch) !== null && _l !== void 0 ? _l : 0) ? 'on' : 'off'
+            filter_life: filterLife,
+            child_lock: Boolean((_e = devDict.childLockSwitch) !== null && _e !== void 0 ? _e : 0),
+            display: Boolean((_f = devDict.screenState) !== null && _f !== void 0 ? _f : 0),
+            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'
         };
         if (this.hasFeature('air_quality')) {
-            this.details.air_quality_value = (_m = devDict.PM25) !== null && _m !== void 0 ? _m : 0;
-            this.details.air_quality = (_o = devDict.AQLevel) !== null && _o !== void 0 ? _o : 0;
+            this.details.air_quality_value = (_l = devDict.PM25) !== null && _l !== void 0 ? _l : 0;
+            this.details.air_quality = (_m = devDict.AQLevel) !== null && _m !== void 0 ? _m : 0;
         }
         if ('PM1' in devDict)
             this.details.pm1 = devDict.PM1;
@@ -159,11 +175,11 @@ class VeSyncAirBaseV2 extends airBypass_1.VeSyncAirBypass {
             this.details.fan_rotate_angle = devDict.fanRotateAngle;
         if ('filterOpenState' in devDict)
             this.details.filter_open_state = Boolean(devDict.filterOpenState);
-        if (((_p = devDict.timerRemain) !== null && _p !== void 0 ? _p : 0) > 0) {
+        if (((_o = devDict.timerRemain) !== null && _o !== void 0 ? _o : 0) > 0) {
             this.timer = { duration: devDict.timerRemain, action: 'off' };
         }
         if (typeof devDict.autoPreference === 'object' && devDict.autoPreference) {
-            this.details.auto_preference_type = (_r = (_q = devDict.autoPreference) === null || _q === void 0 ? void 0 : _q.autoPreferenceType) !== null && _r !== void 0 ? _r : 'default';
+            this.details.auto_preference_type = (_q = (_p = devDict.autoPreference) === null || _p === void 0 ? void 0 : _p.autoPreferenceType) !== null && _q !== void 0 ? _q : 'default';
         }
         else {
             this.details.auto_preference_type = null;

package/dist/lib/fans/airBypass.js

@@ -53,10 +53,26 @@ class VeSyncAirBypass extends vesyncFan_1.VeSyncFan {
             const result = (_a = response === null || response === void 0 ? void 0 : response.result) === null || _a === void 0 ? void 0 : _a.result;
             if (result) {
                 this.deviceStatus = result.enabled ? 'on' : 'off';
+                // Parse filter life with fallback handling
+                let filterLife = 0;
+                if (result.filterLifePercent !== undefined) {
+                    filterLife = result.filterLifePercent;
+                    logger_1.logger.debug(`${this.deviceName}: Parsed filter life from filterLifePercent: ${filterLife}%`);
+                }
+                else if (result.filter_life !== undefined) {
+                    filterLife = result.filter_life;
+                    logger_1.logger.debug(`${this.deviceName}: Parsed filter life from filter_life: ${filterLife}%`);
+                }
+                else {
+                    logger_1.logger.debug(`${this.deviceName}: No filter life data found in API response`);
+                    if (logger_1.logger.getLevel && logger_1.logger.getLevel() !== undefined && logger_1.logger.getLevel() <= 0) {
+                        logger_1.logger.debug(`${this.deviceName}: API response structure:`, JSON.stringify(result, null, 2));
+                    }
+                }
                 this.details = {
                     mode: result.mode || '',
                     speed: result.level || 0,
-                    filter_life: result.filter_life || 0,
+                    filter_life: filterLife,
                     screen_status: result.display ? 'on' : 'off',
                     child_lock: result.child_lock || false,
                     air_quality: result.air_quality || 0,

package/package.json

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

package/src/lib/fans/air131.ts

@@ -64,10 +64,34 @@ export class VeSyncAir131 extends VeSyncFan {
             const data = response.result || response;
             
             this.deviceStatus = data.deviceStatus === 'on' ? 'on' : 'off';
+            
+            // Parse filter life with proper object/value handling
+            let filterLife: number | { percent: number } = 0;
+            if (data.filterLife !== undefined) {
+                if (typeof data.filterLife === 'object' && data.filterLife !== null) {
+                    // API returns object like {percent: 85}
+                    filterLife = data.filterLife;
+                    logger.debug(`${this.deviceName}: Parsed filter life from filterLife object: ${JSON.stringify(data.filterLife)}`);
+                } else if (typeof data.filterLife === 'number') {
+                    // API returns direct number
+                    filterLife = data.filterLife;
+                    logger.debug(`${this.deviceName}: Parsed filter life from filterLife number: ${data.filterLife}%`);
+                }
+            } else if (data.filter_life !== undefined) {
+                // Fallback to filter_life field
+                filterLife = data.filter_life;
+                logger.debug(`${this.deviceName}: Parsed filter life from filter_life fallback: ${data.filter_life}%`);
+            } else {
+                logger.debug(`${this.deviceName}: No filter life data found in API response`);
+                if (logger.getLevel && logger.getLevel() !== undefined && logger.getLevel()! <= 0) {
+                    logger.debug(`${this.deviceName}: API response structure:`, JSON.stringify(data, null, 2));
+                }
+            }
+
             this.details = {
                 mode: data.mode || 'manual',  // Default to manual if not specified
                 speed: data.level || 0,
-                filter_life: data.filterLife || data.filter_life || 0,
+                filter_life: filterLife,
                 screen_status: data.screenStatus || 'off',
                 child_lock: data.childLock || false,
                 air_quality: data.airQuality || 'unknown',

package/src/lib/fans/airBaseV2.ts

@@ -163,9 +163,24 @@ export class VeSyncAirBaseV2 extends VeSyncAirBypass {
         this.speed = devDict.fanSpeedLevel ?? 0;
         this.setSpeedLevel = devDict.manualSpeedLevel ?? 1;
         
+        // Parse filter life with proper fallback handling and logging
+        let filterLife = 0;
+        if (devDict.filterLifePercent !== undefined) {
+            filterLife = devDict.filterLifePercent;
+            logger.debug(`${this.deviceName}: Parsed filter life from filterLifePercent: ${filterLife}%`);
+        } else if (devDict.filter_life !== undefined) {
+            filterLife = devDict.filter_life;
+            logger.debug(`${this.deviceName}: Parsed filter life from filter_life fallback: ${filterLife}%`);
+        } else {
+            logger.debug(`${this.deviceName}: No filter life data found in API response`);
+            if (logger.getLevel && logger.getLevel() !== undefined && logger.getLevel()! <= 0) {
+                logger.debug(`${this.deviceName}: Device dict structure:`, JSON.stringify(devDict, null, 2));
+            }
+        }
+        
         this.details = {
             ...this.details,
-            filter_life: devDict.filterLifePercent ?? 0,
+            filter_life: filterLife,
             child_lock: Boolean(devDict.childLockSwitch ?? 0),
             display: Boolean(devDict.screenState ?? 0),
             light_detection_switch: Boolean(devDict.lightDetectionSwitch ?? 0),

package/src/lib/fans/airBypass.ts

@@ -61,10 +61,26 @@ export class VeSyncAirBypass extends VeSyncFan {
             const result = response?.result?.result;
             if (result) {
                 this.deviceStatus = result.enabled ? 'on' : 'off';
+                
+                // Parse filter life with fallback handling
+                let filterLife = 0;
+                if (result.filterLifePercent !== undefined) {
+                    filterLife = result.filterLifePercent;
+                    logger.debug(`${this.deviceName}: Parsed filter life from filterLifePercent: ${filterLife}%`);
+                } else if (result.filter_life !== undefined) {
+                    filterLife = result.filter_life;
+                    logger.debug(`${this.deviceName}: Parsed filter life from filter_life: ${filterLife}%`);
+                } else {
+                    logger.debug(`${this.deviceName}: No filter life data found in API response`);
+                    if (logger.getLevel && logger.getLevel() !== undefined && logger.getLevel()! <= 0) {
+                        logger.debug(`${this.deviceName}: API response structure:`, JSON.stringify(result, null, 2));
+                    }
+                }
+
                 this.details = {
                     mode: result.mode || '',
                     speed: result.level || 0,
-                    filter_life: result.filter_life || 0,
+                    filter_life: filterLife,
                     screen_status: result.display ? 'on' : 'off',
                     child_lock: result.child_lock || false,
                     air_quality: result.air_quality || 0,