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

package/src/irdevice/airconditioner.ts

@@ -183,22 +183,22 @@ export class AirConditioner {
    */
   async pushAirConditionerOnChanges(): Promise<void> {
     if (this.Active !== this.platform.Characteristic.Active.ACTIVE || this.pushOn) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      } as any;
-      await this.pushChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOn',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushChanges(body);
     }
   }
 
   async pushAirConditionerOffChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-      command: 'turnOff',
-    } as any;
-    await this.pushChanges(payload);
+    const body = JSON.stringify({
+      'command': 'turnOff',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushChanges(body);
   }
 
   async pushAirConditionerStatusChanges(): Promise<void> {
@@ -213,11 +213,6 @@ export class AirConditioner {
   }
 
   async pushAirConditionerDetailsChanges(): Promise<void> {
-    const payload = {
-      commandType: 'command',
-      command: 'setAll',
-    } as any;
-
     this.CurrentTemperatureUndefined();
     if (this.CurrentMode === undefined) {
       this.CurrentMode = 1;
@@ -236,7 +231,7 @@ export class AirConditioner {
         `Air Conditioner: ${this.accessory.displayName} CurrentMode: ${this.CurrentMode},` + ` CurrentTemperature: ${this.CurrentTemperature}`,
       );
     }
-    payload.parameter = `${this.CurrentTemperature},${this.CurrentMode},${this.CurrentFanSpeed},${this.state}`;
+    const parameter = `${this.CurrentTemperature},${this.CurrentMode},${this.CurrentFanSpeed},${this.state}`;
 
     if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
       this.CurrentTemperatureUndefined();
@@ -248,53 +243,53 @@ export class AirConditioner {
     } else {
       this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.INACTIVE;
     }
+    const body = JSON.stringify({
+      'command': 'setAll',
+      'parameter': `${parameter}`,
+      'commandType': 'command',
+    });
 
-    await this.pushChanges(payload);
+    await this.pushChanges(body);
   }
 
-  async pushChanges(payload): Promise<void> {
+  async pushChanges(body): Promise<void> {
     try {
-      this.infoLog(
-        `Air Conditioner: ${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(`Air Conditioner: ${this.accessory.displayName} sign: ${sign}`);
+      this.infoLog(`Air Conditioner: ${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(`Air Conditioner: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
         this.statusCode({ res });
-        res.on('data', (d) => {
+        res.on('data', d => {
           this.debugLog(`Air Conditioner: ${this.accessory.displayName} d: ${d}`);
         });
       });
-
-      req.on('error', (error) => {
-        this.errorLog(`Air Conditioner: ${this.accessory.displayName} error: ${error}`);
+      req.on('error', (e: any) => {
+        this.errorLog(`Air Conditioner: ${this.accessory.displayName} error message: ${e.message}`);
       });
-
-      req.write(payload);
+      req.write(body);
       req.end();
-
       this.debugLog(`Air Conditioner: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.CurrentTemperatureCached = this.CurrentTemperature;
       this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;

package/src/irdevice/airpurifier.ts

@@ -158,23 +158,23 @@ export class AirPurifier {
    */
   async pushAirPurifierOnChanges(): Promise<void> {
     if (this.Active !== 1) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      };
-      await this.pushChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOn',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushChanges(body);
     }
   }
 
   async pushAirPurifierOffChanges(): Promise<void> {
     if (this.Active !== 0) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOff',
-      };
-      await this.pushChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOff',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushChanges(body);
     }
   }
 
@@ -195,12 +195,11 @@ export class AirPurifier {
     this.CurrentAPFanSpeed = this.CurrentFanSpeed || 1;
     this.APActive = this.Active === 1 ? 'on' : 'off';
     const parameter = `${this.CurrentAPTemp},${this.CurrentAPMode},${this.CurrentAPFanSpeed},${this.APActive}`;
-    const payload = JSON.stringify({
+    const body = JSON.stringify({
       'command': 'setAll',
       'parameter': `${parameter}`,
       'commandType': 'command',
     });
-
     if (this.Active === 1) {
       if ((this.CurrentTemperature || 24) < (this.LastTemperature || 30)) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
@@ -210,53 +209,47 @@ export class AirPurifier {
     } else {
       this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.INACTIVE;
     }
-
-    await this.pushChanges(payload);
+    await this.pushChanges(body);
   }
 
-  async pushChanges(payload): Promise<void> {
+  async pushChanges(body): Promise<void> {
     try {
-      this.infoLog(
-        `Air Purifier: ${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(`Air Purifier: ${this.accessory.displayName} sign: ${sign}`);
+      this.infoLog(`Air Purifier: ${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(`Air Purifier: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
         this.statusCode({ res });
-        res.on('data', (d) => {
+        res.on('data', d => {
           this.debugLog(`Air Purifier: ${this.accessory.displayName} d: ${d}`);
         });
       });
-
-      req.on('error', (error) => {
-        this.errorLog(`Air Purifier: ${this.accessory.displayName} error: ${error}`);
+      req.on('error', (e: any) => {
+        this.errorLog(`Air Purifier: ${this.accessory.displayName} error message: ${e.message}`);
       });
-
-      req.write(payload);
+      req.write(body);
       req.end();
-
       this.debugLog(`Air Purifier: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
       this.CurrentTemperatureCached = this.CurrentTemperature;

package/src/irdevice/camera.ts

@@ -86,69 +86,64 @@ export class Camera {
    */
   async pushOnChanges(): Promise<void> {
     if (this.On) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      };
-      await this.pushChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOn',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushChanges(body);
     }
   }
 
   async pushOffChanges(): Promise<void> {
     if (!this.On) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOff',
-      };
-      await this.pushChanges(payload);
+      const body = JSON.stringify({
+        'command': 'turnOff',
+        'parameter': 'default',
+        'commandType': 'command',
+      });
+      await this.pushChanges(body);
     }
   }
 
-  async pushChanges(payload): Promise<void> {
+  async pushChanges(body): Promise<void> {
     try {
-      this.infoLog(
-        `Camera: ${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(`Camera: ${this.accessory.displayName} sign: ${sign}`);
+      this.infoLog(`Camera: ${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(`Camera: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
         this.statusCode({ res });
-        res.on('data', (d) => {
+        res.on('data', d => {
           this.debugLog(`Camera: ${this.accessory.displayName} d: ${d}`);
         });
       });
-
-      req.on('error', (error) => {
-        this.errorLog(`Camera: ${this.accessory.displayName} error: ${error}`);
+      req.on('error', (e: any) => {
+        this.errorLog(`Camera: ${this.accessory.displayName} error message: ${e.message}`);
       });
-
-      req.write(payload);
+      req.write(body);
       req.end();
-
       this.debugLog(`Camera: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
       this.OnCached = this.On;

package/src/irdevice/fan.ts

@@ -188,94 +188,89 @@ export class Fan {
    */
   async pushFanOnChanges(): Promise<void> {
     if (this.Active !== 1) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      };
-      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',
-    };
-    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',
-    };
-    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',
-    };
-    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',
-    };
-    await this.pushTVChanges(payload);
+    const body = JSON.stringify({
+      'command': 'swing',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushTVChanges(body);
   }
 
-  async pushTVChanges(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

@@ -101,87 +101,82 @@ export class Light {
    */
   async pushLightOnChanges(): Promise<void> {
     if (this.On) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-        command: 'turnOn',
-      };
-      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',
-      };
-      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',
-    };
-    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',
-    };
-    await this.pushChanges(payload);
+    const body = JSON.stringify({
+      'command': 'brightnessDown',
+      'parameter': 'default',
+      'commandType': 'command',
+    });
+    await this.pushChanges(body);
   }
 
-  async pushChanges(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;