@switchbot/homebridge-switchbot 2.6.0 → 2.6.2-beta.0

package/src/irdevice/fan.ts

@@ -175,12 +175,12 @@ export class Fan {
     if (this.Active === this.platform.Characteristic.Active.ACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
@@ -190,48 +190,49 @@ export class Fan {
     if (this.Active === this.platform.Characteristic.Active.INACTIVE && !this.disablePushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
   async pushFanSpeedUpChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const bodyChange = JSON.stringify({
       'command': 'highSpeed',
       'parameter': 'default',
       'commandType': 'command',
     });
-    await this.pushChanges(body);
+    await this.pushChanges(bodyChange);
   }
 
   async pushFanSpeedDownChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const bodyChange = JSON.stringify({
       'command': 'lowSpeed',
       'parameter': 'default',
       'commandType': 'command',
     });
-    await this.pushChanges(body);
+    await this.pushChanges(bodyChange);
   }
 
   async pushFanSwingChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const bodyChange = JSON.stringify({
       'command': 'swing',
       'parameter': 'default',
       'commandType': 'command',
     });
-    await this.pushChanges(body);
+    await this.pushChanges(bodyChange);
   }
 
-  async pushChanges(body: any): Promise<void> {
+  async pushChanges(bodyChange: any): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
     if (this.device.connectionType === 'OpenAPI') {
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
         const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+          body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });

package/src/irdevice/light.ts

@@ -89,12 +89,12 @@ export class Light {
     if (this.On && !this.disablePushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
@@ -104,39 +104,40 @@ export class Light {
     if (!this.On && !this.disablePushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
   async pushLightBrightnessUpChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const bodyChange = JSON.stringify({
       'command': 'brightnessUp',
       'parameter': 'default',
       'commandType': 'command',
     });
-    await this.pushChanges(body);
+    await this.pushChanges(bodyChange);
   }
 
   async pushLightBrightnessDownChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const bodyChange = JSON.stringify({
       'command': 'brightnessDown',
       'parameter': 'default',
       'commandType': 'command',
     });
-    await this.pushChanges(body);
+    await this.pushChanges(bodyChange);
   }
 
-  async pushChanges(body: any): Promise<void> {
+  async pushChanges(bodyChange: any): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
     if (this.device.connectionType === 'OpenAPI') {
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
         const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+          body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });

package/src/irdevice/other.ts

@@ -93,12 +93,12 @@ export class Others {
       if (this.Active === this.platform.Characteristic.Active.ACTIVE && !this.disablePushOn) {
         const commandType: string = await this.commandType();
         const command: string = await this.commandOn();
-        const body = JSON.stringify({
+        const bodyChange = JSON.stringify({
           'command': command,
           'parameter': 'default',
           'commandType': commandType,
         });
-        await this.pushChanges(body);
+        await this.pushChanges(bodyChange);
       }
     } else {
       this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} On Command not set`);
@@ -112,24 +112,25 @@ export class Others {
       if (this.Active === this.platform.Characteristic.Active.INACTIVE && !this.disablePushOff) {
         const commandType: string = await this.commandType();
         const command: string = await this.commandOff();
-        const body = JSON.stringify({
+        const bodyChange = JSON.stringify({
           'command': command,
           'parameter': 'default',
           'commandType': commandType,
         });
-        await this.pushChanges(body);
+        await this.pushChanges(bodyChange);
       }
     } else {
       this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Off Command not set.`);
     }
   }
 
-  async pushChanges(body: any): Promise<void> {
+  async pushChanges(bodyChange: any): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
     if (this.device.connectionType === 'OpenAPI') {
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
         const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+          body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });

package/src/irdevice/tv.ts

@@ -227,12 +227,12 @@ export class TV {
     if (this.Active === this.platform.Characteristic.Active.ACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
@@ -242,129 +242,130 @@ export class TV {
     if (this.Active === this.platform.Characteristic.Active.INACTIVE && !this.disablePushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushOkChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushOkChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'Ok',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushBackChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushBackChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'Back',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushMenuChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushMenuChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'Menu',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushUpChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushUpChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'Up',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushDownChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushDownChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'Down',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushRightChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushRightChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'Right',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushLeftChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushLeftChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'Left',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushVolumeUpChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushVolumeUpChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'volumeAdd',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
   async pushVolumeDownChanges(): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushVolumeDownChanges disablePushDetail: ${this.disablePushDetail}`);
     if (!this.disablePushDetail) {
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': 'volumeSub',
         'parameter': 'default',
         'commandType': 'command',
       });
-      await this.pushTVChanges(body);
+      await this.pushTVChanges(bodyChange);
     }
   }
 
-  async pushTVChanges(body: any): Promise<void> {
+  async pushTVChanges(bodyChange: any): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushTVChanges`);
     if (this.device.connectionType === 'OpenAPI') {
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
         const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+          body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });

package/src/irdevice/vacuumcleaner.ts

@@ -81,12 +81,12 @@ export class VacuumCleaner {
     if (this.On && !this.disablePushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
@@ -96,21 +96,22 @@ export class VacuumCleaner {
     if (!this.On && !this.disablePushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
-  async pushChanges(body: any): Promise<void> {
+  async pushChanges(bodyChange: any): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
     if (this.device.connectionType === 'OpenAPI') {
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
         const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+          body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });

package/src/irdevice/waterheater.ts

@@ -86,12 +86,12 @@ export class WaterHeater {
     if (this.Active === this.platform.Characteristic.Active.ACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
@@ -101,21 +101,22 @@ export class WaterHeater {
     if (this.Active === this.platform.Characteristic.Active.INACTIVE && !this.disablePushOff) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
-      const body = JSON.stringify({
+      const bodyChange = JSON.stringify({
         'command': command,
         'parameter': 'default',
         'commandType': commandType,
       });
-      await this.pushChanges(body);
+      await this.pushChanges(bodyChange);
     }
   }
 
-  async pushChanges(body: any): Promise<void> {
+  async pushChanges(bodyChange: any): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
     if (this.device.connectionType === 'OpenAPI') {
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
         const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+          body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });

package/src/platform.ts

@@ -414,6 +414,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.createMeter(device);
         break;
       case 'MeterPlus':
+      case 'Meter Plus (JP)':
         this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createMeterPlus(device);
         break;

package/src/settings.ts

@@ -16,16 +16,6 @@ export const PLUGIN_NAME = '@switchbot/homebridge-switchbot';
  */
 export const Devices = 'https://api.switch-bot.com/v1.1/devices';
 
-/**
- * This is the main url used to access SwitchBot API
- */
-export const HostDomain = 'api.switch-bot.com';
-
-/**
- * This is the main url used to access SwitchBot API
- */
-export const DevicePath = '/v1.1/devices';
-
 //Config
 export interface SwitchBotPlatformConfig extends PlatformConfig {
   credentials?: credentials;