tsvesync 1.0.47 → 1.0.48

package/dist/lib/vesync.d.ts

@@ -82,10 +82,6 @@ export declare class VeSync {
      * Correct devices without cid or uuid
      */
     static setDevId(devices: any[]): any[];
-    /**
-     * Check if a device should be excluded based on configuration
-     */
-    private shouldExcludeDevice;
     /**
      * Process devices from API response
      */
@@ -102,6 +98,10 @@ export declare class VeSync {
      * Test if update interval has been exceeded
      */
     deviceTimeCheck(): boolean;
+    /**
+     * Check if a device should be excluded based on configuration
+     */
+    private shouldExcludeDevice;
     /**
      * Update device list and details
      */

package/dist/lib/vesync.js

@@ -285,52 +285,6 @@ class VeSync {
         }
         return devices;
     }
-    /**
-     * Check if a device should be excluded based on configuration
-     */
-    shouldExcludeDevice(device) {
-        var _a, _b, _c, _d, _e;
-        if (!this._excludeConfig) {
-            return false;
-        }
-        const exclude = this._excludeConfig;
-        // Check device type
-        if ((_a = exclude.type) === null || _a === void 0 ? void 0 : _a.includes(device.deviceType.toLowerCase())) {
-            logger_1.logger.debug(`Excluding device ${device.deviceName} by type: ${device.deviceType}`);
-            return true;
-        }
-        // Check device model
-        if ((_b = exclude.model) === null || _b === void 0 ? void 0 : _b.some(model => device.deviceType.toUpperCase().includes(model.toUpperCase()))) {
-            logger_1.logger.debug(`Excluding device ${device.deviceName} by model: ${device.deviceType}`);
-            return true;
-        }
-        // Check exact name match
-        if ((_c = exclude.name) === null || _c === void 0 ? void 0 : _c.includes(device.deviceName.trim())) {
-            logger_1.logger.debug(`Excluding device ${device.deviceName} by exact name match`);
-            return true;
-        }
-        // Check name patterns
-        if (exclude.namePattern) {
-            for (const pattern of exclude.namePattern) {
-                try {
-                    const regex = new RegExp(pattern);
-                    if (regex.test(device.deviceName.trim())) {
-                        logger_1.logger.debug(`Excluding device ${device.deviceName} by name pattern: ${pattern}`);
-                        return true;
-                    }
-                }
-                catch (error) {
-                    logger_1.logger.warn(`Invalid regex pattern in exclude config: ${pattern}`);
-                }
-            }
-        }
-        // Check device ID (cid or uuid)
-        if (((_d = exclude.id) === null || _d === void 0 ? void 0 : _d.includes(device.cid)) || ((_e = exclude.id) === null || _e === void 0 ? void 0 : _e.includes(device.uuid))) {
-            logger_1.logger.debug(`Excluding device ${device.deviceName} by ID: ${device.cid}/${device.uuid}`);
-            return true;
-        }
-        return false;
-    }
     /**
      * Process devices from API response
      */
@@ -346,10 +300,6 @@ class VeSync {
             }
             // Process each device
             deviceList.forEach(dev => {
-                // Check if device should be excluded
-                if (this.shouldExcludeDevice(dev)) {
-                    return;
-                }
                 const [category, device] = objectFactory(dev, this);
                 // Handle outdoor plug sub-devices
                 if (dev.deviceType === 'ESO15-TB' && dev.subDeviceNo) {
@@ -360,12 +310,9 @@ class VeSync {
                         subDeviceNo: dev.subDeviceNo,
                         isSubDevice: true,
                     };
-                    // Check if sub-device should be excluded
-                    if (!this.shouldExcludeDevice(subDeviceDetails)) {
-                        const [subCategory, subDevice] = objectFactory(subDeviceDetails, this);
-                        if (subDevice && subCategory in this._devList) {
-                            this._devList[subCategory].push(subDevice);
-                        }
+                    const [subCategory, subDevice] = objectFactory(subDeviceDetails, this);
+                    if (subDevice && subCategory in this._devList) {
+                        this._devList[subCategory].push(subDevice);
                     }
                 }
                 else if (device && category in this._devList) {
@@ -501,6 +448,52 @@ class VeSync {
         return (this._lastUpdateTs === null ||
             (Date.now() - this._lastUpdateTs) / 1000 > this.updateInterval);
     }
+    /**
+     * Check if a device should be excluded based on configuration
+     */
+    shouldExcludeDevice(device) {
+        var _a, _b, _c, _d, _e;
+        if (!this._excludeConfig) {
+            return false;
+        }
+        const exclude = this._excludeConfig;
+        // Check device type
+        if ((_a = exclude.type) === null || _a === void 0 ? void 0 : _a.includes(device.deviceType.toLowerCase())) {
+            logger_1.logger.debug(`Excluding device ${device.deviceName} by type: ${device.deviceType}`);
+            return true;
+        }
+        // Check device model
+        if ((_b = exclude.model) === null || _b === void 0 ? void 0 : _b.some(model => device.deviceType.toUpperCase().includes(model.toUpperCase()))) {
+            logger_1.logger.debug(`Excluding device ${device.deviceName} by model: ${device.deviceType}`);
+            return true;
+        }
+        // Check exact name match
+        if ((_c = exclude.name) === null || _c === void 0 ? void 0 : _c.includes(device.deviceName.trim())) {
+            logger_1.logger.debug(`Excluding device ${device.deviceName} by exact name match`);
+            return true;
+        }
+        // Check name patterns
+        if (exclude.namePattern) {
+            for (const pattern of exclude.namePattern) {
+                try {
+                    const regex = new RegExp(pattern);
+                    if (regex.test(device.deviceName.trim())) {
+                        logger_1.logger.debug(`Excluding device ${device.deviceName} by name pattern: ${pattern}`);
+                        return true;
+                    }
+                }
+                catch (error) {
+                    logger_1.logger.warn(`Invalid regex pattern in exclude config: ${pattern}`);
+                }
+            }
+        }
+        // Check device ID (cid or uuid)
+        if (((_d = exclude.id) === null || _d === void 0 ? void 0 : _d.includes(device.cid)) || ((_e = exclude.id) === null || _e === void 0 ? void 0 : _e.includes(device.uuid))) {
+            logger_1.logger.debug(`Excluding device ${device.deviceName} by ID: ${device.cid}/${device.uuid}`);
+            return true;
+        }
+        return false;
+    }
     /**
      * Update device list and details
      */
@@ -515,7 +508,12 @@ class VeSync {
             for (const deviceList of Object.values(this._devList)) {
                 for (const device of deviceList) {
                     try {
-                        await device.getDetails();
+                        if (!this.shouldExcludeDevice(device)) {
+                            await device.getDetails();
+                        }
+                        else {
+                            logger_1.logger.debug(`Skipping details update for excluded device: ${device.deviceName}`);
+                        }
                     }
                     catch (error) {
                         logger_1.logger.error(`Error updating ${device.deviceName}:`, error);

package/package.json

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

package/src/lib/vesync.ts

@@ -12,17 +12,6 @@ import { logger, setLogger, Logger } from './logger';
 
 const DEFAULT_ENERGY_UPDATE_INTERVAL = 21600;
 
-// Device constructor type for concrete device classes only
-type DeviceConstructor = new (config: Record<string, any>, manager: VeSync) => VeSyncBaseDevice;
-
-// Module dictionary type
-interface DeviceModules {
-    [key: string]: DeviceConstructor;
-}
-
-// Device categories
-type DeviceCategory = 'fans' | 'outlets' | 'switches' | 'bulbs';
-
 /**
  * Device exclusion configuration
  */
@@ -34,6 +23,17 @@ export interface ExcludeConfig {
     id?: string[];
 }
 
+// Device constructor type for concrete device classes only
+type DeviceConstructor = new (config: Record<string, any>, manager: VeSync) => VeSyncBaseDevice;
+
+// Module dictionary type
+interface DeviceModules {
+    [key: string]: DeviceConstructor;
+}
+
+// Device categories
+type DeviceCategory = 'fans' | 'outlets' | 'switches' | 'bulbs';
+
 /**
  * Create device instance based on type
  */
@@ -366,58 +366,6 @@ export class VeSync {
         return devices;
     }
 
-    /**
-     * Check if a device should be excluded based on configuration
-     */
-    private shouldExcludeDevice(device: Record<string, any>): boolean {
-        if (!this._excludeConfig) {
-            return false;
-        }
-
-        const exclude = this._excludeConfig;
-
-        // Check device type
-        if (exclude.type?.includes(device.deviceType.toLowerCase())) {
-            logger.debug(`Excluding device ${device.deviceName} by type: ${device.deviceType}`);
-            return true;
-        }
-
-        // Check device model
-        if (exclude.model?.some(model => device.deviceType.toUpperCase().includes(model.toUpperCase()))) {
-            logger.debug(`Excluding device ${device.deviceName} by model: ${device.deviceType}`);
-            return true;
-        }
-
-        // Check exact name match
-        if (exclude.name?.includes(device.deviceName.trim())) {
-            logger.debug(`Excluding device ${device.deviceName} by exact name match`);
-            return true;
-        }
-
-        // Check name patterns
-        if (exclude.namePattern) {
-            for (const pattern of exclude.namePattern) {
-                try {
-                    const regex = new RegExp(pattern);
-                    if (regex.test(device.deviceName.trim())) {
-                        logger.debug(`Excluding device ${device.deviceName} by name pattern: ${pattern}`);
-                        return true;
-                    }
-                } catch (error) {
-                    logger.warn(`Invalid regex pattern in exclude config: ${pattern}`);
-                }
-            }
-        }
-
-        // Check device ID (cid or uuid)
-        if (exclude.id?.includes(device.cid) || exclude.id?.includes(device.uuid)) {
-            logger.debug(`Excluding device ${device.deviceName} by ID: ${device.cid}/${device.uuid}`);
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Process devices from API response
      */
@@ -435,11 +383,6 @@ export class VeSync {
 
             // Process each device
             deviceList.forEach(dev => {
-                // Check if device should be excluded
-                if (this.shouldExcludeDevice(dev)) {
-                    return;
-                }
-
                 const [category, device] = objectFactory(dev, this);
                 // Handle outdoor plug sub-devices
                 if (dev.deviceType === 'ESO15-TB' && dev.subDeviceNo) {
@@ -450,12 +393,9 @@ export class VeSync {
                         subDeviceNo: dev.subDeviceNo,
                         isSubDevice: true,
                     };
-                    // Check if sub-device should be excluded
-                    if (!this.shouldExcludeDevice(subDeviceDetails)) {
-                        const [subCategory, subDevice] = objectFactory(subDeviceDetails, this);
-                        if (subDevice && subCategory in this._devList) {
-                            this._devList[subCategory].push(subDevice);
-                        }
+                    const [subCategory, subDevice] = objectFactory(subDeviceDetails, this);
+                    if (subDevice && subCategory in this._devList) {
+                        this._devList[subCategory].push(subDevice);
                     }
                 } else if (device && category in this._devList) {
                     this._devList[category].push(device);
@@ -622,6 +562,58 @@ export class VeSync {
         );
     }
 
+    /**
+     * Check if a device should be excluded based on configuration
+     */
+    private shouldExcludeDevice(device: VeSyncBaseDevice): boolean {
+        if (!this._excludeConfig) {
+            return false;
+        }
+
+        const exclude = this._excludeConfig;
+
+        // Check device type
+        if (exclude.type?.includes(device.deviceType.toLowerCase())) {
+            logger.debug(`Excluding device ${device.deviceName} by type: ${device.deviceType}`);
+            return true;
+        }
+
+        // Check device model
+        if (exclude.model?.some(model => device.deviceType.toUpperCase().includes(model.toUpperCase()))) {
+            logger.debug(`Excluding device ${device.deviceName} by model: ${device.deviceType}`);
+            return true;
+        }
+
+        // Check exact name match
+        if (exclude.name?.includes(device.deviceName.trim())) {
+            logger.debug(`Excluding device ${device.deviceName} by exact name match`);
+            return true;
+        }
+
+        // Check name patterns
+        if (exclude.namePattern) {
+            for (const pattern of exclude.namePattern) {
+                try {
+                    const regex = new RegExp(pattern);
+                    if (regex.test(device.deviceName.trim())) {
+                        logger.debug(`Excluding device ${device.deviceName} by name pattern: ${pattern}`);
+                        return true;
+                    }
+                } catch (error) {
+                    logger.warn(`Invalid regex pattern in exclude config: ${pattern}`);
+                }
+            }
+        }
+
+        // Check device ID (cid or uuid)
+        if (exclude.id?.includes(device.cid) || exclude.id?.includes(device.uuid)) {
+            logger.debug(`Excluding device ${device.deviceName} by ID: ${device.cid}/${device.uuid}`);
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Update device list and details
      */
@@ -638,7 +630,11 @@ export class VeSync {
             for (const deviceList of Object.values(this._devList)) {
                 for (const device of deviceList) {
                     try {
-                        await device.getDetails();
+                        if (!this.shouldExcludeDevice(device)) {
+                            await device.getDetails();
+                        } else {
+                            logger.debug(`Skipping details update for excluded device: ${device.deviceName}`);
+                        }
                     } catch (error) {
                         logger.error(`Error updating ${device.deviceName}:`, error);
                     }