@switchbot/homebridge-switchbot 2.2.2-beta.1 → 2.2.2-beta.11

package/src/device/striplight.ts

@@ -54,6 +54,7 @@ export class StripLight {
 
   // Others
   cacheKelvin!: number;
+  change!: string;
 
   // Updates
   stripLightUpdateInProgress!: boolean;
@@ -474,68 +475,117 @@ export class StripLight {
         + ` Connection, Error Message: ${superStringify(e.message)}`);
           await this.BLEPushConnection();
         });
+      // Push Brightness Update
+      if (this.On) {
+        await this.BLEpushBrightnessChanges();
+      }
+      // Push Hue & Saturation Update
+      if (this.On) {
+        await this.BLEpushRGBChanges();
+      }
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, `
         +`OnCached: ${this.accessory.context.On}`);
     }
   }
 
+  async BLEpushBrightnessChanges(): Promise<void> {
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushBrightnessChanges`);
+    if (this.Brightness !== this.accessory.context.Brightness) {
+      const switchbot = await this.platform.connectBLE();
+      // Convert to BLE Address
+      this.device.bleMac = this.device
+        .deviceId!.match(/.{1,2}/g)!
+        .join(':')
+        .toLowerCase();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+      switchbot
+        .discover({
+          model: 'u',
+          id: this.device.bleMac,
+        })
+        .then((device_list: any) => {
+          this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.Brightness}`);
+          return device_list[0].setBrightness(this.Brightness);
+        })
+        .then(() => {
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+          this.On = false;
+        })
+        .catch(async (e: any) => {
+          this.apiError(e);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushBrightnessChanges with ${this.device.connectionType}`
+        + ` Connection, Error Message: ${superStringify(e.message)}`);
+          await this.BLEPushConnection();
+        });
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.` + `Brightness: ${this.Brightness}, `
+       +`BrightnessCached: ${this.accessory.context.Brightness}`);
+    }
+  }
+
+  async BLEpushRGBChanges(): Promise<void> {
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushRGBChanges`);
+    if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${superStringify(this.Hue)}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${superStringify(this.Saturation)}`);
+
+      const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${superStringify([red, green, blue])}`);
+
+      const switchbot = await this.platform.connectBLE();
+      // Convert to BLE Address
+      this.device.bleMac = this.device
+        .deviceId!.match(/.{1,2}/g)!
+        .join(':')
+        .toLowerCase();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+      switchbot
+        .discover({
+          model: 'u',
+          id: this.device.bleMac,
+        })
+        .then((device_list: any) => {
+          this.infoLog(`${this.accessory.displayName} Target RGB: ${this.Brightness, red, green, blue}`);
+          return device_list[0].setRGB(this.Brightness, red, green, blue);
+        })
+        .then(() => {
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+          this.On = false;
+        })
+        .catch(async (e: any) => {
+          this.apiError(e);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushRGBChanges with ${this.device.connectionType}`
+        + ` Connection, Error Message: ${superStringify(e.message)}`);
+          await this.BLEPushConnection();
+        });
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushRGBChanges. Hue: ${this.Hue}, `
+        + `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
+    }
+  }
+
   async openAPIpushChanges() {
+    const change = 'openAPIpushChanges';
     try {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${change}`);
       if (this.On !== this.accessory.context.On) {
         // 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 sign = signTerm.toString('base64');
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
-
-        let command = '';
-        if (this.On) {
+        const command = this.On ? 'turnOn' : 'turnOff';
+        /*if (this.On) {
           command = 'turnOn';
         } else {
           command = 'turnOff';
-        }
+        }*/
         const body = superStringify({
           'command': `${command}`,
           'parameter': 'default',
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${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,
-            'Content-Type': 'application/json',
-            'Content-Length': body.length,
-          },
-        };
-        const req = https.request(options, res => {
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges statusCode: ${res.statusCode}`);
-          this.statusCode({ res });
-          res.on('data', d => {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
-          });
-        });
-        req.on('error', (e: any) => {
-          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
-        });
-        req.write(body);
-        req.end();
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges: ${superStringify(req)}`);
+        await this.request({ body, change });
       } else {
         this.debugLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` + `On: ${this.On}, `
+          `${this.device.deviceType}: ${this.accessory.displayName} No ${change}.` + `On: ${this.On}, `
           +`OnCached: ${this.accessory.context.On}`,
         );
       }
@@ -549,15 +599,16 @@ export class StripLight {
       }
     } catch (e: any) {
       this.apiError(e);
-      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed ${change} with ${this.device.connectionType}`
         + ` Connection, Error Message: ${superStringify(e.message)}`,
       );
     }
   }
 
   async pushHueSaturationChanges(): Promise<void> {
+    const change = 'pushHueSaturationChanges';
     try {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${change}`);
       if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${superStringify(this.Hue)}`);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${superStringify(this.Saturation)}`);
@@ -565,115 +616,85 @@ export class StripLight {
         const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${superStringify([red, green, blue])}`);
         // 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 sign = signTerm.toString('base64');
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
         const body = superStringify({
           'command': 'setColor',
           'parameter': `${red}:${green}:${blue}`,
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${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,
-            'Content-Type': 'application/json',
-            'Content-Length': body.length,
-          },
-        };
-        const req = https.request(options, res => {
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges statusCode: ${res.statusCode}`);
-          this.statusCode({ res });
-          res.on('data', d => {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
-          });
-        });
-        req.on('error', (e: any) => {
-          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
-        });
-        req.write(body);
-        req.end();
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges: ${superStringify(req)}`);
+        await this.request({ body, change });
       } else {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.Hue}, `
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No ${change}. Hue: ${this.Hue}, `
         + `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
       }
     } catch (e: any) {
       this.apiError(e);
-      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}`
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed ${change} with ${this.device.connectionType}`
           + ` Connection, Error Message: ${superStringify(e.message)}`);
     }
   }
 
   async pushBrightnessChanges(): Promise<void> {
+    const change = 'pushBrightnessChanges';
     try {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${change}`);
       if (this.Brightness !== this.accessory.context.Brightness) {
         // 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 sign = signTerm.toString('base64');
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
         const body = superStringify({
           'command': 'setBrightness',
           'parameter': `${this.Brightness}`,
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${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,
-            'Content-Type': 'application/json',
-            'Content-Length': body.length,
-          },
-        };
-        const req = https.request(options, res => {
-          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges statusCode: ${res.statusCode}`);
-          this.statusCode({ res });
-          res.on('data', d => {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
-          });
-        });
-        req.on('error', (e: any) => {
-          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
-        });
-        req.write(body);
-        req.end();
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges: ${superStringify(req)}`);
+        await this.request({ body, change });
       } else {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.` + `Brightness: ${this.Brightness}, `
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No ${change},` + `Brightness: ${this.Brightness}, `
           +`BrightnessCached: ${this.accessory.context.Brightness}`);
       }
     } catch (e: any) {
       this.apiError(e);
-      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed ${change} with ${this.device.connectionType}`
           + ` Connection, Error Message: ${superStringify(e.message)}`);
     }
   }
 
+  async request({ body, change }: { body: any; change: string; }): Promise<void> {
+    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.deviceType}: ${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',
+        'Content-Length': body.length,
+      },
+    };
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
+    const req = https.request(options, res => {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${change} statusCode: ${res.statusCode}`);
+      this.statusCode({ res });
+      res.on('data', d => {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
+      });
+    });
+    req.on('error', (e: any) => {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+    });
+    req.write(body);
+    req.end();
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${change} req: ${superStringify(req)}`);
+  }
+
   /**
    * Handle requests to set the value of the "On" characteristic
    */
@@ -1004,7 +1025,7 @@ export class StripLight {
     } else {
       this.Brightness = this.accessory.context.Brightness;
     }
-    if (this.Brightness === undefined) {
+    if (this.Saturation === undefined) {
       this.Saturation = 0;
     } else {
       this.Saturation = this.accessory.context.Saturation;

package/src/irdevice/airconditioner.ts

@@ -559,9 +559,9 @@ export class AirConditioner {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/airpurifier.ts

@@ -288,9 +288,9 @@ export class AirPurifier {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/camera.ts

@@ -185,9 +185,9 @@ export class Camera {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/fan.ts

@@ -316,9 +316,9 @@ export class Fan {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/light.ts

@@ -204,9 +204,9 @@ export class Light {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/other.ts

@@ -201,9 +201,9 @@ export class Others {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/tv.ts

@@ -419,9 +419,9 @@ export class TV {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/vacuumcleaner.ts

@@ -182,9 +182,9 @@ export class VacuumCleaner {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/irdevice/waterheater.ts

@@ -190,9 +190,9 @@ export class WaterHeater {
 
   async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
     if (device.allowPushOff) {
-      this.allowPushOn = true;
+      this.allowPushOff = true;
     } else {
-      this.allowPushOn = false;
+      this.allowPushOff = false;
     }
   }
 

package/src/platform.ts

@@ -289,11 +289,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
               const devicesAPI = JSON.parse(rawData);
               this.debugLog(`devicesAPI: ${superStringify(devicesAPI.body)}`);
               // SwitchBot Devices
-              if (devicesAPI.body.deviceList.length !== 0) {
-                this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-              } else {
-                this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-              }
               const deviceLists = devicesAPI.body.deviceList;
               if (!this.config.options?.devices) {
                 this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
@@ -332,13 +327,13 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
               } else {
                 this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
               }
-
-              // IR Devices
-              if (devicesAPI.body.infraredRemoteList.length !== 0) {
-                this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+              if (devicesAPI.body.deviceList.length !== 0) {
+                this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
               } else {
-                this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+                this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
               }
+
+              // IR Devices
               const irDeviceLists = devicesAPI.body.infraredRemoteList;
               if (!this.config.options?.irdevices) {
                 this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
@@ -367,6 +362,11 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
                   this.createIRDevice(device);
                 }
               }
+              if (devicesAPI.body.infraredRemoteList.length !== 0) {
+                this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+              } else {
+                this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+              }
             } catch (e:any) {
               this.errorLog(`API Request: ${e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
             }