tsvesync 1.0.12 → 1.0.13

package/src/lib/vesyncOutlet.ts

@@ -5,6 +5,38 @@
 import { VeSyncBaseDevice } from './vesyncBaseDevice';
 import { VeSync } from './vesync';
 import { Helpers } from './helpers';
+import { logger } from './logger';
+
+interface OutletConfig {
+    [key: string]: {
+        module: string;
+        features: string[];
+    };
+}
+
+// Outlet configuration
+export const outletConfig: OutletConfig = {
+    'wifi-switch-1.3': {
+        module: 'VeSyncOutlet7A',
+        features: ['energy']
+    },
+    'ESW03-USA': {
+        module: 'VeSyncOutlet10A',
+        features: ['energy']
+    },
+    'ESW01-EU': {
+        module: 'VeSyncOutlet10A',
+        features: ['energy']
+    },
+    'ESW15-USA': {
+        module: 'VeSyncOutlet15A',
+        features: ['energy', 'nightlight']
+    },
+    'ESO15-TB': {
+        module: 'VeSyncOutdoorPlug',
+        features: ['energy']
+    }
+};
 
 /**
  * VeSync Outlet Base Class
@@ -12,17 +44,20 @@ import { Helpers } from './helpers';
 export abstract class VeSyncOutlet extends VeSyncBaseDevice {
     protected energy: Record<string, any>;
     protected details: Record<string, any>;
+    protected features: string[];
 
     constructor(details: Record<string, any>, manager: VeSync) {
         super(details, manager);
         this.energy = {};
         this.details = details;
+        this.features = outletConfig[this.deviceType]?.features || [];
     }
 
     /**
      * Get outlet details
      */
     async getDetails(): Promise<void> {
+        logger.debug(`[${this.deviceName}] Getting outlet details`);
         const url = `/v1/${this.deviceType}/${this.deviceType}-${this.cid}/detail`;
         const [response] = await Helpers.callApi(
             url,
@@ -34,6 +69,9 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
         if (response?.code === 0) {
             this.details = response.result;
             this.deviceStatus = response.result.deviceStatus;
+            logger.debug(`[${this.deviceName}] Successfully retrieved outlet details`);
+        } else {
+            logger.error(`[${this.deviceName}] Failed to get outlet details: ${JSON.stringify(response)}`);
         }
     }
 
@@ -41,6 +79,12 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
      * Update outlet energy data
      */
     async updateEnergy(): Promise<void> {
+        if (!this.features.includes('energy')) {
+            logger.debug(`[${this.deviceName}] Energy monitoring not supported`);
+            return;
+        }
+
+        logger.debug(`[${this.deviceName}] Updating energy data`);
         const url = `/v1/${this.deviceType}/${this.deviceType}-${this.cid}/energy/detail`;
         const [response] = await Helpers.callApi(
             url,
@@ -51,6 +95,9 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
 
         if (response?.code === 0) {
             this.energy = response.result;
+            logger.debug(`[${this.deviceName}] Successfully updated energy data`);
+        } else {
+            logger.error(`[${this.deviceName}] Failed to update energy data: ${JSON.stringify(response)}`);
         }
     }
 
@@ -58,6 +105,18 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
      * Get outlet energy usage
      */
     async getEnergyUsage(): Promise<Record<string, any>> {
+        if (!this.features.includes('energy')) {
+            logger.debug(`[${this.deviceName}] Energy monitoring not supported`);
+            return {
+                power: 'Not supported',
+                voltage: 'Not supported',
+                energy_today: 'Not supported',
+                energy_week: 'Not supported',
+                energy_month: 'Not supported',
+                energy_year: 'Not supported'
+            };
+        }
+
         await this.updateEnergy();
         return {
             power: this.energy.power || 'Not available',
@@ -73,24 +132,53 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
      * Get outlet status
      */
     async getStatus(): Promise<string> {
+        logger.debug(`[${this.deviceName}] Getting outlet status`);
         await this.getDetails();
         return this.deviceStatus;
     }
 
+    /**
+     * Get API prefix based on device type
+     */
+    private getApiPrefix(): string {
+        if (this.deviceType === 'wifi-switch-1.3') {
+            return `v1/device/${this.deviceType}-${this.cid}`;
+        } else if (this.deviceType.startsWith('ESW15') || this.deviceType.startsWith('ESO15')) {
+            return '15a/v1/device';
+        } else if (this.deviceType.startsWith('ESW03') || this.deviceType.startsWith('ESW01')) {
+            return '10a/v1/device';
+        }
+        return 'v1/device';
+    }
+
     /**
      * Get weekly energy data
      */
     async getWeeklyEnergy(): Promise<void> {
-        const url = `/v1/${this.deviceType}/${this.deviceType}-${this.cid}/energy/week`;
+        if (!this.features.includes('energy')) {
+            logger.debug(`[${this.deviceName}] Energy monitoring not supported`);
+            return;
+        }
+
+        logger.debug(`[${this.deviceName}] Getting weekly energy data`);
+        const isLegacyDevice = this.deviceType === 'wifi-switch-1.3';
+        const body = isLegacyDevice ? null : {
+            ...Helpers.reqBody(this.manager, 'energyweek'),
+            uuid: this.uuid
+        };
+
         const [response] = await Helpers.callApi(
-            url,
-            'get',
-            null,
+            isLegacyDevice ? `/${this.getApiPrefix()}/energy/week` : `/${this.getApiPrefix()}/energyweek`,
+            isLegacyDevice ? 'get' : 'post',
+            body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.energy.week = response.result;
+            logger.debug(`[${this.deviceName}] Successfully retrieved weekly energy data`);
+        } else {
+            logger.error(`[${this.deviceName}] Failed to get weekly energy data: ${JSON.stringify(response)}`);
         }
     }
 
@@ -98,16 +186,30 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
      * Get monthly energy data
      */
     async getMonthlyEnergy(): Promise<void> {
-        const url = `/v1/${this.deviceType}/${this.deviceType}-${this.cid}/energy/month`;
+        if (!this.features.includes('energy')) {
+            logger.debug(`[${this.deviceName}] Energy monitoring not supported`);
+            return;
+        }
+
+        logger.debug(`[${this.deviceName}] Getting monthly energy data`);
+        const isLegacyDevice = this.deviceType === 'wifi-switch-1.3';
+        const body = isLegacyDevice ? null : {
+            ...Helpers.reqBody(this.manager, 'energymonth'),
+            uuid: this.uuid
+        };
+
         const [response] = await Helpers.callApi(
-            url,
-            'get',
-            null,
+            isLegacyDevice ? `/${this.getApiPrefix()}/energy/month` : `/${this.getApiPrefix()}/energymonth`,
+            isLegacyDevice ? 'get' : 'post',
+            body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.energy.month = response.result;
+            logger.debug(`[${this.deviceName}] Successfully retrieved monthly energy data`);
+        } else {
+            logger.error(`[${this.deviceName}] Failed to get monthly energy data: ${JSON.stringify(response)}`);
         }
     }
 
@@ -115,16 +217,30 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
      * Get yearly energy data
      */
     async getYearlyEnergy(): Promise<void> {
-        const url = `/v1/${this.deviceType}/${this.deviceType}-${this.cid}/energy/year`;
+        if (!this.features.includes('energy')) {
+            logger.debug(`[${this.deviceName}] Energy monitoring not supported`);
+            return;
+        }
+
+        logger.debug(`[${this.deviceName}] Getting yearly energy data`);
+        const isLegacyDevice = this.deviceType === 'wifi-switch-1.3';
+        const body = isLegacyDevice ? null : {
+            ...Helpers.reqBody(this.manager, 'energyyear'),
+            uuid: this.uuid
+        };
+
         const [response] = await Helpers.callApi(
-            url,
-            'get',
-            null,
+            isLegacyDevice ? `/${this.getApiPrefix()}/energy/year` : `/${this.getApiPrefix()}/energyyear`,
+            isLegacyDevice ? 'get' : 'post',
+            body,
             Helpers.reqHeaders(this.manager)
         );
 
         if (response?.code === 0) {
             this.energy.year = response.result;
+            logger.debug(`[${this.deviceName}] Successfully retrieved yearly energy data`);
+        } else {
+            logger.error(`[${this.deviceName}] Failed to get yearly energy data: ${JSON.stringify(response)}`);
         }
     }
 
@@ -132,8 +248,19 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
      * Update outlet details and energy info
      */
     async update(): Promise<void> {
+        logger.debug(`[${this.deviceName}] Updating outlet information`);
         await this.getDetails();
-        await this.updateEnergy();
+        if (this.features.includes('energy')) {
+            await this.updateEnergy();
+        }
+        logger.debug(`[${this.deviceName}] Successfully updated outlet information`);
+    }
+
+    /**
+     * Check if outlet has nightlight feature
+     */
+    hasNightlight(): boolean {
+        return this.features.includes('nightlight');
     }
 
     /**

package/src/lib/vesyncOutletImpl.ts

@@ -5,6 +5,7 @@
 import { VeSyncOutlet } from './vesyncOutlet';
 import { VeSync } from './vesync';
 import { Helpers } from './helpers';
+import { logger } from './logger';
 
 /**
  * VeSync 7A Outlet
@@ -18,6 +19,7 @@ export class VeSyncOutlet7A extends VeSyncOutlet {
      * Turn outlet on
      */
     async turnOn(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet on`);
         const url = `/v1/wifi-switch-1.3/wifi-switch-1.3-${this.cid}/status/on`;
         const [response] = await Helpers.callApi(
             url,
@@ -28,8 +30,10 @@ export class VeSyncOutlet7A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'on';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet on`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet on: ${JSON.stringify(response)}`);
         return false;
     }
 
@@ -37,6 +41,7 @@ export class VeSyncOutlet7A extends VeSyncOutlet {
      * Turn outlet off
      */
     async turnOff(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet off`);
         const url = `/v1/wifi-switch-1.3/wifi-switch-1.3-${this.cid}/status/off`;
         const [response] = await Helpers.callApi(
             url,
@@ -47,8 +52,10 @@ export class VeSyncOutlet7A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'off';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet off`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet off: ${JSON.stringify(response)}`);
         return false;
     }
 }
@@ -65,6 +72,7 @@ export class VeSyncOutlet10A extends VeSyncOutlet {
      * Turn outlet on
      */
     async turnOn(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet on`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -80,8 +88,10 @@ export class VeSyncOutlet10A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'on';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet on`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet on: ${JSON.stringify(response)}`);
         return false;
     }
 
@@ -89,6 +99,7 @@ export class VeSyncOutlet10A extends VeSyncOutlet {
      * Turn outlet off
      */
     async turnOff(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet off`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -104,8 +115,10 @@ export class VeSyncOutlet10A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'off';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet off`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet off: ${JSON.stringify(response)}`);
         return false;
     }
 }
@@ -122,6 +135,7 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
      * Turn outlet on
      */
     async turnOn(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet on`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -137,8 +151,10 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'on';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet on`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet on: ${JSON.stringify(response)}`);
         return false;
     }
 
@@ -146,6 +162,7 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
      * Turn outlet off
      */
     async turnOff(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet off`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -161,8 +178,10 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'off';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet off`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet off: ${JSON.stringify(response)}`);
         return false;
     }
 
@@ -170,6 +189,12 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
      * Turn on nightlight
      */
     async turnOnNightlight(): Promise<boolean> {
+        if (!this.hasNightlight()) {
+            logger.error(`[${this.deviceName}] Nightlight feature not supported`);
+            return false;
+        }
+
+        logger.debug(`[${this.deviceName}] Turning nightlight on`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -185,8 +210,10 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.details.nightLightStatus = 'on';
+            logger.debug(`[${this.deviceName}] Successfully turned nightlight on`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn nightlight on: ${JSON.stringify(response)}`);
         return false;
     }
 
@@ -194,6 +221,12 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
      * Turn off nightlight
      */
     async turnOffNightlight(): Promise<boolean> {
+        if (!this.hasNightlight()) {
+            logger.error(`[${this.deviceName}] Nightlight feature not supported`);
+            return false;
+        }
+
+        logger.debug(`[${this.deviceName}] Turning nightlight off`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -209,8 +242,10 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.details.nightLightStatus = 'off';
+            logger.debug(`[${this.deviceName}] Successfully turned nightlight off`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn nightlight off: ${JSON.stringify(response)}`);
         return false;
     }
 }
@@ -227,6 +262,7 @@ export class VeSyncOutdoorPlug extends VeSyncOutlet {
      * Turn outlet on
      */
     async turnOn(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet on`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -243,8 +279,10 @@ export class VeSyncOutdoorPlug extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'on';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet on`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet on: ${JSON.stringify(response)}`);
         return false;
     }
 
@@ -252,6 +290,7 @@ export class VeSyncOutdoorPlug extends VeSyncOutlet {
      * Turn outlet off
      */
     async turnOff(): Promise<boolean> {
+        logger.debug(`[${this.deviceName}] Turning outlet off`);
         const body = {
             ...Helpers.reqBody(this.manager, 'devicestatus'),
             uuid: this.uuid,
@@ -268,8 +307,10 @@ export class VeSyncOutdoorPlug extends VeSyncOutlet {
 
         if (response?.code === 0) {
             this.deviceStatus = 'off';
+            logger.debug(`[${this.deviceName}] Successfully turned outlet off`);
             return true;
         }
+        logger.error(`[${this.deviceName}] Failed to turn outlet off: ${JSON.stringify(response)}`);
         return false;
     }
 }