@switchbot/homebridge-switchbot 1.15.1-beta.8 → 2.0.0-beta.0

package/src/irdevice/fan.ts

@@ -3,7 +3,7 @@ import crypto from 'crypto';
 import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
-import { irdevice, irDevicesConfig, payload, HostDomain, DevicePath } from '../settings';
+import { irdevice, irDevicesConfig, HostDomain, DevicePath } from '../settings';
 
 /**
  * Platform Accessory
@@ -188,94 +188,89 @@ export class Fan {
    */
   async pushFanOnChanges(): Promise<void> {
     if (this.Active !== 1) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      } as payload;
-      await this.pushTVChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOn',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushTVChanges(body);
     }
   }
 
   async pushFanOffChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'turnOff',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'turnOff',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushFanSpeedUpChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'highSpeed',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'highSpeed',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushFanSpeedDownChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'lowSpeed',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'lowSpeed',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushFanSwingChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'swing',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'swing',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
-  async pushTVChanges(payload: payload): Promise<void> {
+  async pushTVChanges(body): Promise<void> {
     try {
-      this.infoLog(
-        `Fan: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-          ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-      );
-
-      // Make the API request
+      // Make Push On request to the API
       const t = Date.now();
       const nonce = 'requestID';
       const data = this.platform.config.credentials?.token + t + nonce;
-      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+        .update(Buffer.from(data, 'utf-8'))
+        .digest();
       const sign = signTerm.toString('base64');
       this.debugLog(`Fan: ${this.accessory.displayName} sign: ${sign}`);
+      this.infoLog(`Fan: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
       const options = {
         hostname: HostDomain,
         port: 443,
         path: `${DevicePath}/${this.device.deviceId}/commands`,
         method: 'POST',
         headers: {
-          Authorization: this.platform.config.credentials?.token,
-          sign: sign,
-          nonce: nonce,
-          t: t,
+          'Authorization': this.platform.config.credentials?.token,
+          'sign': sign,
+          'nonce': nonce,
+          't': t,
           'Content-Type': 'application/json',
+          'Content-Length': body.length,
         },
       };
-
-      const req = https.request(options, (res) => {
+      const req = https.request(options, res => {
         this.debugLog(`Fan: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
         this.statusCode({ res });
-        res.on('data', (d) => {
-          this.debugLog(`an: ${this.accessory.displayName} d: ${d}`);
+        res.on('data', d => {
+          this.debugLog(`Fan: ${this.accessory.displayName} d: ${d}`);
         });
       });
-
-      req.on('error', (error) => {
-        this.errorLog(`Fan: ${this.accessory.displayName} error: ${error}`);
+      req.on('error', (e: any) => {
+        this.errorLog(`Fan: ${this.accessory.displayName} error message: ${e.message}`);
       });
-
-      req.write(payload);
+      req.write(body);
       req.end();
-
       this.debugLog(`Fan: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {

package/src/irdevice/light.ts

@@ -2,7 +2,7 @@ import https from 'https';
 import crypto from 'crypto';
 import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
-import { irDevicesConfig, irdevice, payload, HostDomain, DevicePath } from '../settings';
+import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
@@ -101,87 +101,82 @@ export class Light {
    */
   async pushLightOnChanges(): Promise<void> {
     if (this.On) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      } as payload;
-      await this.pushChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOn',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushChanges(body);
     }
   }
 
   async pushLightOffChanges(): Promise<void> {
     if (!this.On) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOff',
-      } as payload;
-      await this.pushChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOff',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushChanges(body);
     }
   }
 
   async pushLightBrightnessUpChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'brightnessUp',
-    } as payload;
-    await this.pushChanges(payload);
+    const body = JSON.stringify({
+      'command': 'brightnessUp',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushChanges(body);
   }
 
   async pushLightBrightnessDownChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'brightnessDown',
-    } as payload;
-    await this.pushChanges(payload);
+    const body = JSON.stringify({
+      'command': 'brightnessDown',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushChanges(body);
   }
 
-  async pushChanges(payload: payload): Promise<void> {
+  async pushChanges(body): Promise<void> {
     try {
-      this.infoLog(
-        `Light: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-          ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-      );
-
-      // Make the API request
+      // Make Push On request to the API
       const t = Date.now();
       const nonce = 'requestID';
       const data = this.platform.config.credentials?.token + t + nonce;
-      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+        .update(Buffer.from(data, 'utf-8'))
+        .digest();
       const sign = signTerm.toString('base64');
       this.debugLog(`Light: ${this.accessory.displayName} sign: ${sign}`);
+      this.infoLog(`Light: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
       const options = {
         hostname: HostDomain,
         port: 443,
         path: `${DevicePath}/${this.device.deviceId}/commands`,
         method: 'POST',
         headers: {
-          Authorization: this.platform.config.credentials?.token,
-          sign: sign,
-          nonce: nonce,
-          t: t,
+          'Authorization': this.platform.config.credentials?.token,
+          'sign': sign,
+          'nonce': nonce,
+          't': t,
           'Content-Type': 'application/json',
+          'Content-Length': body.length,
         },
       };
-
-      const req = https.request(options, (res) => {
+      const req = https.request(options, res => {
         this.debugLog(`Light: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
         this.statusCode({ res });
-        res.on('data', (d) => {
+        res.on('data', d => {
           this.debugLog(`Light: ${this.accessory.displayName} d: ${d}`);
         });
       });
-
-      req.on('error', (error) => {
-        this.errorLog(`Light: ${this.accessory.displayName} error: ${error}`);
+      req.on('error', (e: any) => {
+        this.errorLog(`Light: ${this.accessory.displayName} error message: ${e.message}`);
       });
-
-      req.write(payload);
+      req.write(body);
       req.end();
-
       this.debugLog(`Light: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.OnCached = this.On;
       this.accessory.context.On = this.OnCached;

package/src/irdevice/other.ts

@@ -2,7 +2,7 @@ import https from 'https';
 import crypto from 'crypto';
 import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
-import { irDevicesConfig, irdevice, payload, HostDomain, DevicePath } from '../settings';
+import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
@@ -99,12 +99,12 @@ export class Others {
       if (this.device.other) {
         if (this.device.other.commandOn) {
           if (!this.Active) {
-            const payload = {
-              commandType: 'customize',
-              parameter: 'default',
-              command: `${this.device.other.commandOn}`,
-            } as payload;
-            await this.pushChanges(payload);
+            const body = JSON.stringify({
+              'command': `${this.device.other.commandOn}`,
+              'parameter': 'default',
+              'commandType': 'customize',
+            });
+            await this.pushChanges(body);
           }
         } else {
           this.errorLog(`Other: ${this.accessory.displayName} On Command not set, commandOn: ${this.device.other.commandOn}`);
@@ -122,12 +122,12 @@ export class Others {
       if (this.device.other) {
         if (this.device.other.commandOff) {
           if (this.Active) {
-            const payload = {
-              commandType: 'customize',
-              parameter: 'default',
-              command: `${this.device.other.commandOff}`,
-            } as payload;
-            await this.pushChanges(payload);
+            const body = JSON.stringify({
+              'command': `${this.device.other.commandOff}`,
+              'parameter': 'default',
+              'commandType': 'customize',
+            });
+            await this.pushChanges(body);
           }
         } else {
           this.errorLog(`Other: ${this.accessory.displayName} Off Command not set, commandOff: ${this.device.other.commandOff}`);
@@ -140,49 +140,44 @@ export class Others {
     }
   }
 
-  async pushChanges(payload: payload): Promise<void> {
+  async pushChanges(body): Promise<void> {
     try {
-      this.infoLog(
-        `Other: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-          ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-      );
-
-      // Make the API request
+      // Make Push On request to the API
       const t = Date.now();
       const nonce = 'requestID';
       const data = this.platform.config.credentials?.token + t + nonce;
-      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+        .update(Buffer.from(data, 'utf-8'))
+        .digest();
       const sign = signTerm.toString('base64');
       this.debugLog(`Other: ${this.accessory.displayName} sign: ${sign}`);
+      this.infoLog(`Other: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
       const options = {
         hostname: HostDomain,
         port: 443,
         path: `${DevicePath}/${this.device.deviceId}/commands`,
         method: 'POST',
         headers: {
-          Authorization: this.platform.config.credentials?.token,
-          sign: sign,
-          nonce: nonce,
-          t: t,
+          'Authorization': this.platform.config.credentials?.token,
+          'sign': sign,
+          'nonce': nonce,
+          't': t,
           'Content-Type': 'application/json',
+          'Content-Length': body.length,
         },
       };
-
-      const req = https.request(options, (res) => {
+      const req = https.request(options, res => {
         this.debugLog(`Other: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
         this.statusCode({ res });
-        res.on('data', (d) => {
+        res.on('data', d => {
           this.debugLog(`Other: ${this.accessory.displayName} d: ${d}`);
         });
       });
-
-      req.on('error', (error) => {
-        this.errorLog(`Other: ${this.accessory.displayName} error: ${error}`);
+      req.on('error', (e: any) => {
+        this.errorLog(`Other: ${this.accessory.displayName} error message: ${e.message}`);
       });
-
-      req.write(payload);
+      req.write(body);
       req.end();
-
       this.debugLog(`Other: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {

package/src/irdevice/tv.ts

@@ -3,7 +3,7 @@ import crypto from 'crypto';
 import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
-import { irdevice, irDevicesConfig, payload, HostDomain, DevicePath } from '../settings';
+import { irdevice, irDevicesConfig, HostDomain, DevicePath } from '../settings';
 
 /**
  * Platform Accessory
@@ -237,148 +237,143 @@ export class TV {
    */
   async pushTvOnChanges(): Promise<void> {
     if (this.Active !== 1) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      } as payload;
-      await this.pushTVChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOn',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushTVChanges(body);
     }
   }
 
   async pushTvOffChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'turnOff',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'turnOff',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushOkChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'Ok',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'Ok',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushBackChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'Back',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'Back',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushMenuChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'Menu',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'Menu',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushUpChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'Up',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'Up',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushDownChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'Down',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'Down',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushRightChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'Right',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'Right',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushLeftChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'Left',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'Left',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushVolumeUpChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'volumeAdd',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'volumeAdd',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushVolumeDownChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'volumeSub',
-    } as payload;
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'volumeSub',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
-  async pushTVChanges(payload: payload): Promise<void> {
+  async pushTVChanges(body): Promise<void> {
     try {
-      this.infoLog(
-        `${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-          ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-      );
-
-      // Make the API request
+      // Make Push On request to the API
       const t = Date.now();
       const nonce = 'requestID';
       const data = this.platform.config.credentials?.token + t + nonce;
-      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+      const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+        .update(Buffer.from(data, 'utf-8'))
+        .digest();
       const sign = signTerm.toString('base64');
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} sign: ${sign}`);
+      this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
       const options = {
         hostname: HostDomain,
         port: 443,
         path: `${DevicePath}/${this.device.deviceId}/commands`,
         method: 'POST',
         headers: {
-          Authorization: this.platform.config.credentials?.token,
-          sign: sign,
-          nonce: nonce,
-          t: t,
+          'Authorization': this.platform.config.credentials?.token,
+          'sign': sign,
+          'nonce': nonce,
+          't': t,
           'Content-Type': 'application/json',
+          'Content-Length': body.length,
         },
       };
-
-      const req = https.request(options, (res) => {
+      const req = https.request(options, res => {
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
         this.statusCode({ res });
-        res.on('data', (d) => {
+        res.on('data', d => {
           this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} d: ${d}`);
         });
       });
-
-      req.on('error', (error) => {
-        this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} error: ${error}`);
+      req.on('error', (e: any) => {
+        this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} error message: ${e.message}`);
       });
-
-      req.write(payload);
+      req.write(body);
       req.end();
-
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {