tsvesync 1.0.19 → 1.0.20

package/dist/lib/vesync.d.ts

@@ -71,9 +71,9 @@ export declare class VeSync {
      */
     static setDevId(devices: any[]): any[];
     /**
-     * Process device list and instantiate device objects
+     * Process devices from API response
      */
-    processDevices(devList: any[]): boolean;
+    private processDevices;
     /**
      * Get list of VeSync devices
      */

package/dist/lib/vesync.js

@@ -84,8 +84,31 @@ function objectFactory(details, manager) {
         try {
             // Add category to device details
             details.deviceCategory = category;
-            const device = new DeviceClass(details, manager);
-            return [category, device];
+            // Handle outdoor plug sub-devices
+            if (deviceType === 'ESO15-TB' && details.subDevices) {
+                const devices = [];
+                // Create a device instance for each sub-device
+                details.subDevices.forEach((subDevice) => {
+                    const subDeviceDetails = {
+                        ...details,
+                        deviceName: subDevice.subDeviceName,
+                        deviceStatus: subDevice.subDeviceStatus,
+                        subDeviceNo: subDevice.subDeviceNo,
+                        isSubDevice: true,
+                        parentCid: details.cid,
+                        // Generate a unique CID for the sub-device
+                        cid: `${details.cid}_${subDevice.subDeviceNo}`
+                    };
+                    const device = new DeviceClass(subDeviceDetails, manager);
+                    devices.push([category, device]);
+                });
+                // Return array of sub-devices
+                return devices[0]; // Return first device, manager will handle adding all devices
+            }
+            else {
+                const device = new DeviceClass(details, manager);
+                return [category, device];
+            }
         }
         catch (error) {
             logger_1.logger.error(`Error creating device instance for ${deviceType}:`, error);
@@ -265,57 +288,40 @@ class VeSync {
         return devices;
     }
     /**
-     * Process device list and instantiate device objects
+     * Process devices from API response
      */
-    processDevices(devList) {
-        // Ensure devices have proper IDs
-        const devices = VeSync.setDevId(devList);
-        // Count current devices
-        let numDevices = 0;
-        for (const deviceList of Object.values(this._devList)) {
-            numDevices += deviceList.length;
-        }
-        if (!devices || devices.length === 0) {
-            logger_1.logger.warn('No devices found in api return');
-            return false;
-        }
-        // Initialize new device list or remove old devices
-        if (numDevices === 0) {
-            logger_1.logger.debug('New device list initialized');
-        }
-        else {
-            this.removeOldDevices(devices);
+    processDevices(deviceList) {
+        // Clear existing devices
+        for (const category of Object.keys(this._devList)) {
+            this._devList[category].length = 0;
         }
-        // Filter out devices that already exist
-        const newDevices = devices.filter(dev => this.addDevTest(dev));
-        // Required keys for device instantiation
-        const requiredKeys = ['deviceType', 'deviceName', 'deviceStatus', 'cid'];
-        // Process each new device
-        for (const dev of newDevices) {
-            // Verify required device properties
-            if (!requiredKeys.every(key => key in dev)) {
-                logger_1.logger.debug(`Error adding device - missing required properties: ${dev.deviceName || 'Unknown'}`);
-                continue;
-            }
-            const devType = dev.deviceType;
-            try {
-                // Create device instance using factory
-                const [category, deviceObj] = objectFactory(dev, this);
-                // Add device to appropriate category if valid
-                if (deviceObj && category in this._devList) {
-                    this._devList[category].push(deviceObj);
-                    logger_1.logger.debug(`Added ${devType} device to ${category} category`);
-                }
-                else if (category === 'unknown') {
-                    logger_1.logger.debug(`Unknown device type: ${devType}`);
-                }
+        // Process each device
+        deviceList.forEach(dev => {
+            const [category, device] = objectFactory(dev, this);
+            // Handle outdoor plug sub-devices
+            if (dev.deviceType === 'ESO15-TB' && dev.subDevices) {
+                dev.subDevices.forEach((subDev) => {
+                    const subDeviceDetails = {
+                        ...dev,
+                        deviceName: subDev.subDeviceName,
+                        deviceStatus: subDev.subDeviceStatus,
+                        subDeviceNo: subDev.subDeviceNo,
+                        isSubDevice: true,
+                        parentCid: dev.cid,
+                        cid: `${dev.cid}_${subDev.subDeviceNo}`
+                    };
+                    const [subCategory, subDevice] = objectFactory(subDeviceDetails, this);
+                    if (subDevice && subCategory in this._devList) {
+                        this._devList[subCategory].push(subDevice);
+                    }
+                });
             }
-            catch (err) {
-                logger_1.logger.error(`Error creating device ${devType}:`, err);
-                continue;
+            else if (device && category in this._devList) {
+                this._devList[category].push(device);
             }
-        }
-        return true;
+        });
+        // Update device list reference
+        this.devices = Object.values(this._devList).flat();
     }
     /**
      * Get list of VeSync devices
@@ -332,9 +338,7 @@ class VeSync {
             const [response] = await helpers_1.Helpers.callApi('/cloud/v2/deviceManaged/devices', 'post', helpers_1.Helpers.reqBody(this, 'devicelist'), helpers_1.Helpers.reqHeaders(this));
             if ((_a = response === null || response === void 0 ? void 0 : response.result) === null || _a === void 0 ? void 0 : _a.list) {
                 const deviceList = response.result.list;
-                procReturn = this.processDevices(deviceList);
-                // Update the main devices array with all devices
-                this.devices = Object.values(this._devList).flat();
+                this.processDevices(deviceList);
                 // Log device discovery results
                 logger_1.logger.debug('\n=== Device Discovery Summary ===');
                 logger_1.logger.debug(`Total devices processed: ${deviceList.length}`);

package/dist/lib/vesyncOutlet.js

@@ -81,10 +81,27 @@ class VeSyncOutlet extends vesyncBaseDevice_1.VeSyncBaseDevice {
             this.details = response;
             // Handle outdoor plugs with subdevices
             if (response.subDevices) {
-                const subDevice = response.subDevices.find((dev) => dev.subDeviceName === this.deviceName);
+                const subDevice = response.subDevices.find((dev) => {
+                    // Match by name (primary identifier)
+                    if (dev.subDeviceName === this.deviceName) {
+                        return true;
+                    }
+                    // Match by subDeviceNo if available
+                    if ('subDeviceNo' in this && this.subDeviceNo === dev.subDeviceNo) {
+                        return true;
+                    }
+                    // Match by cid/uuid if available (cid might be in format parentCid_subDeviceNo)
+                    if (this.cid && this.cid.includes('_')) {
+                        const [_, subId] = this.cid.split('_');
+                        if (subId && dev.subDeviceNo === parseInt(subId)) {
+                            return true;
+                        }
+                    }
+                    return false;
+                });
                 if (subDevice) {
                     this.deviceStatus = subDevice.subDeviceStatus;
-                    logger_1.logger.info(`[${this.deviceName}] Successfully retrieved subdevice status: ${this.deviceStatus}`);
+                    logger_1.logger.info(`[${this.deviceName}] Successfully retrieved sub-device status: ${this.deviceStatus}`);
                     return;
                 }
             }

package/dist/lib/vesyncOutletImpl.d.ts

@@ -57,6 +57,9 @@ export declare class VeSyncOutlet15A extends VeSyncOutlet {
  * VeSync Outdoor Plug
  */
 export declare class VeSyncOutdoorPlug extends VeSyncOutlet {
+    protected subDeviceNo?: number;
+    protected isSubDevice: boolean;
+    protected parentCid?: string;
     constructor(details: Record<string, any>, manager: VeSync);
     /**
      * Turn outlet on

package/dist/lib/vesyncOutletImpl.js

@@ -192,17 +192,24 @@ exports.VeSyncOutlet15A = VeSyncOutlet15A;
 class VeSyncOutdoorPlug extends vesyncOutlet_1.VeSyncOutlet {
     constructor(details, manager) {
         super(details, manager);
+        this.isSubDevice = details.isSubDevice || false;
+        this.subDeviceNo = details.subDeviceNo;
+        this.parentCid = details.parentCid;
     }
     /**
      * Turn outlet on
      */
     async turnOn() {
+        if (!this.isSubDevice) {
+            logger_1.logger.error(`[${this.deviceName}] Cannot control parent device directly`);
+            return false;
+        }
         logger_1.logger.debug(`[${this.deviceName}] Turning outlet on`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
             status: 'on',
-            switchNo: 1
+            switchNo: this.subDeviceNo
         };
         const [response] = await helpers_1.Helpers.callApi('/outdoorsocket15a/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
@@ -217,12 +224,16 @@ class VeSyncOutdoorPlug extends vesyncOutlet_1.VeSyncOutlet {
      * Turn outlet off
      */
     async turnOff() {
+        if (!this.isSubDevice) {
+            logger_1.logger.error(`[${this.deviceName}] Cannot control parent device directly`);
+            return false;
+        }
         logger_1.logger.debug(`[${this.deviceName}] Turning outlet off`);
         const body = {
             ...helpers_1.Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
             status: 'off',
-            switchNo: 1
+            switchNo: this.subDeviceNo
         };
         const [response] = await helpers_1.Helpers.callApi('/outdoorsocket15a/v1/device/devicestatus', 'put', body, helpers_1.Helpers.reqHeaders(this.manager));
         if ((response === null || response === void 0 ? void 0 : response.code) === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsvesync",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "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

@@ -103,8 +103,33 @@ function objectFactory(details: Record<string, any>, manager: VeSync): [string,
         try {
             // Add category to device details
             details.deviceCategory = category;
-            const device = new DeviceClass(details, manager);
-            return [category, device];
+
+            // Handle outdoor plug sub-devices
+            if (deviceType === 'ESO15-TB' && details.subDevices) {
+                const devices: [string, VeSyncBaseDevice | null][] = [];
+                
+                // Create a device instance for each sub-device
+                details.subDevices.forEach((subDevice: any) => {
+                    const subDeviceDetails = {
+                        ...details,
+                        deviceName: subDevice.subDeviceName,
+                        deviceStatus: subDevice.subDeviceStatus,
+                        subDeviceNo: subDevice.subDeviceNo,
+                        isSubDevice: true,
+                        parentCid: details.cid,
+                        // Generate a unique CID for the sub-device
+                        cid: `${details.cid}_${subDevice.subDeviceNo}`
+                    };
+                    const device = new DeviceClass(subDeviceDetails, manager);
+                    devices.push([category, device]);
+                });
+                
+                // Return array of sub-devices
+                return devices[0]; // Return first device, manager will handle adding all devices
+            } else {
+                const device = new DeviceClass(details, manager);
+                return [category, device];
+            }
         } catch (error) {
             logger.error(`Error creating device instance for ${deviceType}:`, error);
             return [category, null];
@@ -331,63 +356,42 @@ export class VeSync {
     }
 
     /**
-     * Process device list and instantiate device objects
+     * Process devices from API response
      */
-    processDevices(devList: any[]): boolean {
-        // Ensure devices have proper IDs
-        const devices = VeSync.setDevId(devList);
-
-        // Count current devices
-        let numDevices = 0;
-        for (const deviceList of Object.values(this._devList)) {
-            numDevices += deviceList.length;
-        }
-
-        if (!devices || devices.length === 0) {
-            logger.warn('No devices found in api return');
-            return false;
-        }
-
-        // Initialize new device list or remove old devices
-        if (numDevices === 0) {
-            logger.debug('New device list initialized');
-        } else {
-            this.removeOldDevices(devices);
+    private processDevices(deviceList: any[]): void {
+        // Clear existing devices
+        for (const category of Object.keys(this._devList)) {
+            this._devList[category].length = 0;
         }
 
-        // Filter out devices that already exist
-        const newDevices = devices.filter(dev => this.addDevTest(dev));
-
-        // Required keys for device instantiation
-        const requiredKeys = ['deviceType', 'deviceName', 'deviceStatus', 'cid'];
-        
-        // Process each new device
-        for (const dev of newDevices) {
-            // Verify required device properties
-            if (!requiredKeys.every(key => key in dev)) {
-                logger.debug(`Error adding device - missing required properties: ${dev.deviceName || 'Unknown'}`);
-                continue;
-            }
-
-            const devType = dev.deviceType;
-            try {
-                // Create device instance using factory
-                const [category, deviceObj] = objectFactory(dev, this);
-                
-                // Add device to appropriate category if valid
-                if (deviceObj && category in this._devList) {
-                    this._devList[category].push(deviceObj);
-                    logger.debug(`Added ${devType} device to ${category} category`);
-                } else if (category === 'unknown') {
-                    logger.debug(`Unknown device type: ${devType}`);
-                }
-            } catch (err) {
-                logger.error(`Error creating device ${devType}:`, err);
-                continue;
+        // Process each device
+        deviceList.forEach(dev => {
+            const [category, device] = objectFactory(dev, this);
+            
+            // Handle outdoor plug sub-devices
+            if (dev.deviceType === 'ESO15-TB' && dev.subDevices) {
+                dev.subDevices.forEach((subDev: any) => {
+                    const subDeviceDetails = {
+                        ...dev,
+                        deviceName: subDev.subDeviceName,
+                        deviceStatus: subDev.subDeviceStatus,
+                        subDeviceNo: subDev.subDeviceNo,
+                        isSubDevice: true,
+                        parentCid: dev.cid,
+                        cid: `${dev.cid}_${subDev.subDeviceNo}`
+                    };
+                    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);
             }
-        }
+        });
 
-        return true;
+        // Update device list reference
+        this.devices = Object.values(this._devList).flat();
     }
 
     /**
@@ -412,10 +416,7 @@ export class VeSync {
 
             if (response?.result?.list) {
                 const deviceList = response.result.list;
-                procReturn = this.processDevices(deviceList);
-
-                // Update the main devices array with all devices
-                this.devices = Object.values(this._devList).flat();
+                this.processDevices(deviceList);
 
                 // Log device discovery results
                 logger.debug('\n=== Device Discovery Summary ===');

package/src/lib/vesyncOutlet.ts

@@ -101,12 +101,31 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
 
             // Handle outdoor plugs with subdevices
             if (response.subDevices) {
-                const subDevice = response.subDevices.find(
-                    (dev: any) => dev.subDeviceName === this.deviceName
-                );
+                const subDevice = response.subDevices.find((dev: any) => {
+                    // Match by name (primary identifier)
+                    if (dev.subDeviceName === this.deviceName) {
+                        return true;
+                    }
+
+                    // Match by subDeviceNo if available
+                    if ('subDeviceNo' in this && (this as any).subDeviceNo === dev.subDeviceNo) {
+                        return true;
+                    }
+
+                    // Match by cid/uuid if available (cid might be in format parentCid_subDeviceNo)
+                    if (this.cid && this.cid.includes('_')) {
+                        const [_, subId] = this.cid.split('_');
+                        if (subId && dev.subDeviceNo === parseInt(subId)) {
+                            return true;
+                        }
+                    }
+
+                    return false;
+                });
+
                 if (subDevice) {
                     this.deviceStatus = subDevice.subDeviceStatus;
-                    logger.info(`[${this.deviceName}] Successfully retrieved subdevice status: ${this.deviceStatus}`);
+                    logger.info(`[${this.deviceName}] Successfully retrieved sub-device status: ${this.deviceStatus}`);
                     return;
                 }
             }

package/src/lib/vesyncOutletImpl.ts

@@ -254,20 +254,32 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
  * VeSync Outdoor Plug
  */
 export class VeSyncOutdoorPlug extends VeSyncOutlet {
+    protected subDeviceNo?: number;
+    protected isSubDevice: boolean;
+    protected parentCid?: string;
+
     constructor(details: Record<string, any>, manager: VeSync) {
         super(details, manager);
+        this.isSubDevice = details.isSubDevice || false;
+        this.subDeviceNo = details.subDeviceNo;
+        this.parentCid = details.parentCid;
     }
 
     /**
      * Turn outlet on
      */
     async turnOn(): Promise<boolean> {
+        if (!this.isSubDevice) {
+            logger.error(`[${this.deviceName}] Cannot control parent device directly`);
+            return false;
+        }
+
         logger.debug(`[${this.deviceName}] Turning outlet on`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
             status: 'on',
-            switchNo: 1
+            switchNo: this.subDeviceNo
         };
 
         const [response] = await Helpers.callApi(
@@ -290,12 +302,17 @@ export class VeSyncOutdoorPlug extends VeSyncOutlet {
      * Turn outlet off
      */
     async turnOff(): Promise<boolean> {
+        if (!this.isSubDevice) {
+            logger.error(`[${this.deviceName}] Cannot control parent device directly`);
+            return false;
+        }
+
         logger.debug(`[${this.deviceName}] Turning outlet off`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
             status: 'off',
-            switchNo: 1
+            switchNo: this.subDeviceNo
         };
 
         const [response] = await Helpers.callApi(