tsvesync 1.0.22 → 1.0.24

package/src/lib/vesyncFanImpl.ts

@@ -26,7 +26,7 @@ export class VeSyncAirBypass extends VeSyncFan {
      */
     async getDetails(): Promise<void> {
         logger.debug(`Getting details for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -74,7 +74,7 @@ export class VeSyncAirBypass extends VeSyncFan {
      */
     async turnOn(): Promise<boolean> {
         logger.debug(`Turning on device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -105,7 +105,7 @@ export class VeSyncAirBypass extends VeSyncFan {
      */
     async turnOff(): Promise<boolean> {
         logger.debug(`Turning off device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -142,7 +142,7 @@ export class VeSyncAirBypass extends VeSyncFan {
         }
 
         logger.debug(`Changing fan speed to ${speed} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -181,7 +181,7 @@ export class VeSyncAirBypass extends VeSyncFan {
         }
 
         logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -217,7 +217,7 @@ export class VeSyncAirBypass extends VeSyncFan {
         }
 
         logger.debug(`Setting display to ${enabled ? 'on' : 'off'} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -253,7 +253,7 @@ export class VeSyncAirBypass extends VeSyncFan {
         }
 
         logger.debug(`Setting child lock to ${enabled ? 'on' : 'off'} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -289,7 +289,7 @@ export class VeSyncAirBypass extends VeSyncFan {
         }
 
         logger.debug(`Setting timer to ${hours} hours for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -326,7 +326,7 @@ export class VeSyncAirBypass extends VeSyncFan {
         }
 
         logger.debug(`Clearing timer for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -354,7 +354,7 @@ export class VeSyncAirBypass extends VeSyncFan {
      */
     async automaticStopOn(): Promise<boolean> {
         logger.debug(`Setting automatic stop on for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -384,7 +384,7 @@ export class VeSyncAirBypass extends VeSyncFan {
      */
     async automaticStopOff(): Promise<boolean> {
         logger.debug(`Setting automatic stop off for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -490,7 +490,7 @@ export class VeSyncHumidifier extends VeSyncFan {
      */
     async getDetails(): Promise<void> {
         logger.debug(`Getting details for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -520,7 +520,7 @@ export class VeSyncHumidifier extends VeSyncFan {
      */
     async turnOn(): Promise<boolean> {
         logger.debug(`Turning on device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -551,7 +551,7 @@ export class VeSyncHumidifier extends VeSyncFan {
      */
     async turnOff(): Promise<boolean> {
         logger.debug(`Turning off device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -588,7 +588,7 @@ export class VeSyncHumidifier extends VeSyncFan {
         }
 
         logger.debug(`Changing fan speed to ${speed} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -626,7 +626,7 @@ export class VeSyncHumidifier extends VeSyncFan {
         }
 
         logger.debug(`Setting mode to ${mode} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -668,7 +668,7 @@ export class VeSyncHumidifier extends VeSyncFan {
         }
 
         logger.debug(`Setting mist level to ${level} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -710,7 +710,7 @@ export class VeSyncHumidifier extends VeSyncFan {
         }
 
         logger.debug(`Setting target humidity to ${humidity}% for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -746,7 +746,7 @@ export class VeSyncHumidifier extends VeSyncFan {
         }
 
         logger.debug(`Setting display to ${enabled ? 'on' : 'off'} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -782,7 +782,7 @@ export class VeSyncHumidifier extends VeSyncFan {
         }
 
         logger.debug(`Setting timer to ${hours} hours for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -819,7 +819,7 @@ export class VeSyncHumidifier extends VeSyncFan {
         }
 
         logger.debug(`Clearing timer for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -847,7 +847,7 @@ export class VeSyncHumidifier extends VeSyncFan {
      */
     async automaticStopOn(): Promise<boolean> {
         logger.debug(`Setting automatic stop on for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -877,7 +877,7 @@ export class VeSyncHumidifier extends VeSyncFan {
      */
     async automaticStopOff(): Promise<boolean> {
         logger.debug(`Setting automatic stop off for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -979,7 +979,7 @@ export class VeSyncWarmHumidifier extends VeSyncHumidifier {
         }
 
         logger.debug(`Setting warm level to ${level} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {
@@ -1015,7 +1015,7 @@ export class VeSyncWarmHumidifier extends VeSyncHumidifier {
         }
 
         logger.debug(`Setting drying mode to ${enabled} for device: ${this.deviceName}`);
-        const [response, status] = await Helpers.callApi(
+        const [response, status] = await this.callApi(
             '/cloud/v2/deviceManaged/bypassV2',
             'post',
             {

package/src/lib/vesyncOutlet.ts

@@ -77,7 +77,7 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
             url = '/v1/device/devicedetail';
         }
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             url,
             this.deviceType === 'wifi-switch-1.3' ? 'get' : 'post',
             this.deviceType === 'wifi-switch-1.3' ? null : body,
@@ -177,7 +177,7 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
             uuid: this.uuid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             url,
             this.deviceType === 'wifi-switch-1.3' ? 'get' : 'post',
             body,
@@ -281,7 +281,7 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
             uuid: this.uuid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             isLegacyDevice ? `/${this.getApiPrefix()}/energy/week` : `/${this.getApiPrefix()}/energyweek`,
             isLegacyDevice ? 'get' : 'post',
             body,
@@ -313,7 +313,7 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
             uuid: this.uuid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             isLegacyDevice ? `/${this.getApiPrefix()}/energy/month` : `/${this.getApiPrefix()}/energymonth`,
             isLegacyDevice ? 'get' : 'post',
             body,
@@ -345,7 +345,7 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
             uuid: this.uuid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             isLegacyDevice ? `/${this.getApiPrefix()}/energy/year` : `/${this.getApiPrefix()}/energyyear`,
             isLegacyDevice ? 'get' : 'post',
             body,

package/src/lib/vesyncOutletImpl.ts

@@ -21,7 +21,7 @@ export class VeSyncOutlet7A extends VeSyncOutlet {
     async turnOn(): Promise<boolean> {
         logger.debug(`[${this.deviceName}] Turning outlet on`);
         const url = `/v1/wifi-switch-1.3/${this.cid}/status/on`;
-        const [response, statusCode] = await Helpers.callApi(
+        const [response, statusCode] = await this.callApi(
             url,
             'put',
             {},
@@ -43,7 +43,7 @@ export class VeSyncOutlet7A extends VeSyncOutlet {
     async turnOff(): Promise<boolean> {
         logger.debug(`[${this.deviceName}] Turning outlet off`);
         const url = `/v1/wifi-switch-1.3/${this.cid}/status/off`;
-        const [response, statusCode] = await Helpers.callApi(
+        const [response, statusCode] = await this.callApi(
             url,
             'put',
             {},
@@ -79,7 +79,7 @@ export class VeSyncOutlet10A extends VeSyncOutlet {
             status: 'on'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/10a/v1/device/devicestatus',
             'put',
             body,
@@ -106,7 +106,7 @@ export class VeSyncOutlet10A extends VeSyncOutlet {
             status: 'off'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/10a/v1/device/devicestatus',
             'put',
             body,
@@ -142,7 +142,7 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
             status: 'on'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/15a/v1/device/devicestatus',
             'put',
             body,
@@ -169,7 +169,7 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
             status: 'off'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/15a/v1/device/devicestatus',
             'put',
             body,
@@ -201,7 +201,7 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
             mode: 'auto'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/15a/v1/device/nightlightstatus',
             'put',
             body,
@@ -233,7 +233,7 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
             mode: 'manual'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/15a/v1/device/nightlightstatus',
             'put',
             body,
@@ -254,26 +254,19 @@ export class VeSyncOutlet15A extends VeSyncOutlet {
  * VeSync Outdoor Plug
  */
 export class VeSyncOutdoorPlug extends VeSyncOutlet {
-    protected subDeviceNo?: number;
-    protected isSubDevice: boolean;
-    protected parentCid?: string;
+    public subDeviceNo?: number;
+    public isSubDevice: boolean;
 
     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'),
@@ -282,7 +275,7 @@ export class VeSyncOutdoorPlug extends VeSyncOutlet {
             switchNo: this.subDeviceNo
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/outdoorsocket15a/v1/device/devicestatus',
             'put',
             body,
@@ -302,11 +295,6 @@ 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'),
@@ -315,7 +303,7 @@ export class VeSyncOutdoorPlug extends VeSyncOutlet {
             switchNo: this.subDeviceNo
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/outdoorsocket15a/v1/device/devicestatus',
             'put',
             body,

package/src/lib/vesyncSwitchImpl.ts

@@ -27,7 +27,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
             method: 'devicedetail'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/inwallswitch/v1/device/devicedetail',
             'post',
             body,
@@ -56,7 +56,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/inwallswitch/v1/device/configurations',
             'post',
             body,
@@ -82,7 +82,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/inwallswitch/v1/device/devicestatus',
             'put',
             body,
@@ -109,7 +109,7 @@ export class VeSyncWallSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/inwallswitch/v1/device/devicestatus',
             'put',
             body,
@@ -151,7 +151,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             method: 'devicedetail'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/devicedetail',
             'post',
             body,
@@ -190,7 +190,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/configurations',
             'post',
             body,
@@ -216,7 +216,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/devicestatus',
             'put',
             body,
@@ -243,7 +243,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/devicestatus',
             'put',
             body,
@@ -275,7 +275,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/updatebrightness',
             'put',
             body,
@@ -307,7 +307,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/devicergbstatus',
             'put',
             body,
@@ -335,7 +335,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             uuid: this.cid
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/devicergbstatus',
             'put',
             body,
@@ -362,7 +362,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             status: 'on'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/devicergbstatus',
             'put',
             body,
@@ -389,7 +389,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             status: 'on'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/indicatorlightstatus',
             'put',
             body,
@@ -416,7 +416,7 @@ export class VeSyncDimmerSwitch extends VeSyncSwitch {
             status: 'off'
         };
 
-        const [response] = await Helpers.callApi(
+        const [response] = await this.callApi(
             '/dimmer/v1/device/indicatorlightstatus',
             'put',
             body,