@switchbot/homebridge-switchbot 1.15.1-beta.7 → 1.15.1-beta.9

package/src/irdevice/fan.ts

@@ -1,7 +1,9 @@
-import { AxiosResponse } from 'axios';
+import https from 'https';
+import crypto from 'crypto';
+import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
-import { DeviceURL, irdevice, deviceStatusResponse, irDevicesConfig, payload } from '../settings';
+import { irdevice, irDevicesConfig, HostDomain, DevicePath } from '../settings';
 
 /**
  * Platform Accessory
@@ -21,7 +23,7 @@ export class Fan {
   RotationDirection!: CharacteristicValue;
 
   // Others
-  deviceStatus!: deviceStatusResponse;
+  deviceStatus!: any;
 
   // Config
   minStep?: number;
@@ -190,7 +192,7 @@ export class Fan {
         commandType: 'command',
         parameter: 'default',
         command: 'turnOn',
-      } as payload;
+      };
       await this.pushTVChanges(payload);
     }
   }
@@ -200,7 +202,7 @@ export class Fan {
       commandType: 'command',
       parameter: 'default',
       command: 'turnOff',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -209,7 +211,7 @@ export class Fan {
       commandType: 'command',
       parameter: 'default',
       command: 'highSpeed',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -218,7 +220,7 @@ export class Fan {
       commandType: 'command',
       parameter: 'default',
       command: 'lowSpeed',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -227,11 +229,11 @@ export class Fan {
       commandType: 'command',
       parameter: 'default',
       command: 'swing',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
-  async pushTVChanges(payload: payload): Promise<void> {
+  async pushTVChanges(payload): Promise<void> {
     try {
       this.infoLog(
         `Fan: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -239,9 +241,42 @@ export class Fan {
       );
 
       // Make the API request
-      const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-      this.debugLog(`Fan: ${this.accessory.displayName} pushTVChanges: ${push.data}`);
-      this.statusCode(push);
+      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 sign = signTerm.toString('base64');
+      this.debugLog(`Fan: ${this.accessory.displayName} sign: ${sign}`);
+      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,
+          'Content-Type': 'application/json',
+        },
+      };
+
+      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}`);
+        });
+      });
+
+      req.on('error', (error) => {
+        this.errorLog(`Fan: ${this.accessory.displayName} error: ${error}`);
+      });
+
+      req.write(payload);
+      req.end();
+
+      this.debugLog(`Fan: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
@@ -254,8 +289,8 @@ export class Fan {
     }
   }
 
-  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void> {
-    switch (push.data.statusCode) {
+  async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
+    switch (res.statusCode) {
       case 151:
         this.errorLog(`Fan: ${this.accessory.displayName} Command not supported by this device type.`);
         break;
@@ -274,7 +309,7 @@ export class Fan {
       case 190:
         this.errorLog(
           `Fan: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`,
+            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
         );
         break;
       case 100:

package/src/irdevice/light.ts

@@ -1,6 +1,8 @@
-import { AxiosResponse } from 'axios';
+import https from 'https';
+import crypto from 'crypto';
+import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
-import { irDevicesConfig, DeviceURL, irdevice, payload } from '../settings';
+import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
@@ -103,7 +105,7 @@ export class Light {
         commandType: 'command',
         parameter: 'default',
         command: 'turnOn',
-      } as payload;
+      };
       await this.pushChanges(payload);
     }
   }
@@ -114,7 +116,7 @@ export class Light {
         commandType: 'command',
         parameter: 'default',
         command: 'turnOff',
-      } as payload;
+      };
       await this.pushChanges(payload);
     }
   }
@@ -124,7 +126,7 @@ export class Light {
       commandType: 'command',
       parameter: 'default',
       command: 'brightnessUp',
-    } as payload;
+    };
     await this.pushChanges(payload);
   }
 
@@ -133,11 +135,11 @@ export class Light {
       commandType: 'command',
       parameter: 'default',
       command: 'brightnessDown',
-    } as payload;
+    };
     await this.pushChanges(payload);
   }
 
-  async pushChanges(payload: payload): Promise<void> {
+  async pushChanges(payload): Promise<void> {
     try {
       this.infoLog(
         `Light: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -145,9 +147,42 @@ export class Light {
       );
 
       // Make the API request
-      const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-      this.debugLog(`Light: ${this.accessory.displayName} pushChanges: ${push.data}`);
-      this.statusCode(push);
+      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 sign = signTerm.toString('base64');
+      this.debugLog(`Light: ${this.accessory.displayName} sign: ${sign}`);
+      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,
+          'Content-Type': 'application/json',
+        },
+      };
+
+      const req = https.request(options, (res) => {
+        this.debugLog(`Light: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+        this.statusCode({ res });
+        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.write(payload);
+      req.end();
+
+      this.debugLog(`Light: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.OnCached = this.On;
       this.accessory.context.On = this.OnCached;
       this.updateHomeKitCharacteristics();
@@ -162,8 +197,8 @@ export class Light {
     }
   }
 
-  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void>{
-    switch (push.data.statusCode) {
+  async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
+    switch (res.statusCode) {
       case 151:
         this.errorLog(`Light: ${this.accessory.displayName} Command not supported by this device type.`);
         break;
@@ -182,7 +217,7 @@ export class Light {
       case 190:
         this.errorLog(
           `Light: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`,
+            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
         );
         break;
       case 100:

package/src/irdevice/other.ts

@@ -1,6 +1,8 @@
-import { AxiosResponse } from 'axios';
+import https from 'https';
+import crypto from 'crypto';
+import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
-import { irDevicesConfig, DeviceURL, irdevice, payload } from '../settings';
+import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
@@ -101,7 +103,7 @@ export class Others {
               commandType: 'customize',
               parameter: 'default',
               command: `${this.device.other.commandOn}`,
-            } as payload;
+            };
             await this.pushChanges(payload);
           }
         } else {
@@ -124,7 +126,7 @@ export class Others {
               commandType: 'customize',
               parameter: 'default',
               command: `${this.device.other.commandOff}`,
-            } as payload;
+            };
             await this.pushChanges(payload);
           }
         } else {
@@ -138,7 +140,7 @@ export class Others {
     }
   }
 
-  async pushChanges(payload: payload): Promise<void> {
+  async pushChanges(payload): Promise<void> {
     try {
       this.infoLog(
         `Other: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -146,9 +148,42 @@ export class Others {
       );
 
       // Make the API request
-      const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-      this.debugLog(`Other: ${this.accessory.displayName} pushChanges: ${push.data}`);
-      this.statusCode(push);
+      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 sign = signTerm.toString('base64');
+      this.debugLog(`Other: ${this.accessory.displayName} sign: ${sign}`);
+      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,
+          'Content-Type': 'application/json',
+        },
+      };
+
+      const req = https.request(options, (res) => {
+        this.debugLog(`Other: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+        this.statusCode({ res });
+        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.write(payload);
+      req.end();
+
+      this.debugLog(`Other: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
@@ -161,8 +196,8 @@ export class Others {
     }
   }
 
-  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void>{
-    switch (push.data.statusCode) {
+  async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
+    switch (res.statusCode) {
       case 151:
         this.errorLog(`Other: ${this.accessory.displayName} Command not supported by this device type.`);
         break;
@@ -181,7 +216,7 @@ export class Others {
       case 190:
         this.errorLog(
           `Other: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`,
+            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
         );
         break;
       case 100:

package/src/irdevice/tv.ts

@@ -1,7 +1,9 @@
-import { AxiosResponse } from 'axios';
+import https from 'https';
+import crypto from 'crypto';
+import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
-import { DeviceURL, irdevice, deviceStatusResponse, irDevicesConfig, payload } from '../settings';
+import { irdevice, irDevicesConfig, HostDomain, DevicePath } from '../settings';
 
 /**
  * Platform Accessory
@@ -19,7 +21,7 @@ export class TV {
   ActiveIdentifier!: CharacteristicValue;
 
   // Others
-  deviceStatus!: deviceStatusResponse;
+  deviceStatus!: any;
 
   // Config
   deviceLogging!: string;
@@ -239,7 +241,7 @@ export class TV {
         commandType: 'command',
         parameter: 'default',
         command: 'turnOn',
-      } as payload;
+      };
       await this.pushTVChanges(payload);
     }
   }
@@ -249,7 +251,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'turnOff',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -258,7 +260,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'Ok',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -267,7 +269,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'Back',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -276,7 +278,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'Menu',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -285,7 +287,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'Up',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -294,7 +296,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'Down',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -303,7 +305,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'Right',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -312,7 +314,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'Left',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -321,7 +323,7 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'volumeAdd',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
@@ -330,11 +332,11 @@ export class TV {
       commandType: 'command',
       parameter: 'default',
       command: 'volumeSub',
-    } as payload;
+    };
     await this.pushTVChanges(payload);
   }
 
-  async pushTVChanges(payload: payload): Promise<void> {
+  async pushTVChanges(payload): Promise<void> {
     try {
       this.infoLog(
         `${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -342,9 +344,42 @@ export class TV {
       );
 
       // Make the API request
-      const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges: ${push.data}`);
-      this.statusCode(push);
+      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 sign = signTerm.toString('base64');
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} sign: ${sign}`);
+      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,
+          'Content-Type': 'application/json',
+        },
+      };
+
+      const req = https.request(options, (res) => {
+        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+        this.statusCode({ res });
+        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.write(payload);
+      req.end();
+
+      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
@@ -358,8 +393,8 @@ export class TV {
     }
   }
 
-  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void>{
-    switch (push.data.statusCode) {
+  async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
+    switch (res.statusCode) {
       case 151:
         this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Command not supported by this device type.`);
         break;
@@ -379,7 +414,7 @@ export class TV {
         this.errorLog(
           `${this.device.remoteType}: ` +
             `${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-            ` Or command: ${JSON.stringify(push.data)} format is invalid`,
+            ` Or command: ${JSON.stringify(res)} format is invalid`,
         );
         break;
       case 100:

package/src/irdevice/vacuumcleaner.ts

@@ -1,6 +1,8 @@
-import { AxiosResponse } from 'axios';
+import https from 'https';
+import crypto from 'crypto';
+import { IncomingMessage } from 'http';
 import { SwitchBotPlatform } from '../platform';
-import { irDevicesConfig, DeviceURL, irdevice, payload } from '../settings';
+import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 /**
@@ -88,7 +90,7 @@ export class VacuumCleaner {
         commandType: 'command',
         parameter: 'default',
         command: 'turnOn',
-      } as payload;
+      };
       await this.pushChanges(payload);
     }
   }
@@ -99,12 +101,12 @@ export class VacuumCleaner {
         commandType: 'command',
         parameter: 'default',
         command: 'turnOff',
-      } as payload;
+      };
       await this.pushChanges(payload);
     }
   }
 
-  async pushChanges(payload: payload): Promise<void> {
+  async pushChanges(payload): Promise<void> {
     try {
       this.infoLog(
         `Vacuum Cleaner: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
@@ -112,9 +114,42 @@ export class VacuumCleaner {
       );
 
       // Make the API request
-      const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-      this.debugLog(`Vacuum Cleaner: ${this.accessory.displayName} pushChanges: ${push.data}`);
-      this.statusCode(push);
+      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 sign = signTerm.toString('base64');
+      this.debugLog(`Vacuum Cleaner: ${this.accessory.displayName} sign: ${sign}`);
+      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,
+          'Content-Type': 'application/json',
+        },
+      };
+
+      const req = https.request(options, (res) => {
+        this.debugLog(`Vacuum Cleaner: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+        this.statusCode({ res });
+        res.on('data', (d) => {
+          this.debugLog(`Vacuum Cleaner: ${this.accessory.displayName} d: ${d}`);
+        });
+      });
+
+      req.on('error', (error) => {
+        this.errorLog(`Vacuum Cleaner: ${this.accessory.displayName} error: ${error}`);
+      });
+
+      req.write(payload);
+      req.end();
+
+      this.debugLog(`Vacuum Cleaner: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
       this.OnCached = this.On;
       this.accessory.context.On = this.OnCached;
       this.updateHomeKitCharacteristics();
@@ -130,8 +165,8 @@ export class VacuumCleaner {
     }
   }
 
-  async statusCode(push: AxiosResponse<{ statusCode: number }>): Promise<void>{
-    switch (push.data.statusCode) {
+  async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
+    switch (res.statusCode) {
       case 151:
         this.errorLog(`Vacuum Cleaner: ${this.accessory.displayName} Command not supported by this device type.`);
         break;
@@ -150,7 +185,7 @@ export class VacuumCleaner {
       case 190:
         this.errorLog(
           `Vacuum Cleaner: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`,
+            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
         );
         break;
       case 100: