@switchbot/homebridge-switchbot 0.1.2-beta.0 → 0.1.2-beta.4

package/src/devices/plugs.ts

@@ -1,4 +1,4 @@
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { Service, PlatformAccessory, CharacteristicValue, MacAddress } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
 import { interval, Subject } from 'rxjs';
 import { debounceTime, skipWhile, tap } from 'rxjs/operators';
@@ -6,12 +6,31 @@ import { DeviceURL, device, deviceStatusResponse } from '../settings';
 import { AxiosResponse } from 'axios';
 
 export class Plug {
+  // Services
   private service: Service;
 
+  // Characteristic Values
   On!: CharacteristicValue;
   OutletInUse!: CharacteristicValue;
+
+  // Others
   deviceStatus!: deviceStatusResponse;
+  switchbot!: {
+    discover: (
+      arg0:
+        {
+          duration: any;
+          model: string;
+          quick: boolean;
+          id: MacAddress;
+        }
+    ) => Promise<any>;
+    wait: (
+      arg0: number
+    ) => any;
+  };
 
+  // Updates
   plugUpdateInProgress!: boolean;
   doPlugUpdate;
 
@@ -24,6 +43,19 @@ export class Plug {
     this.On = false;
     this.OutletInUse = true;
 
+    // BLE Connections
+    if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const SwitchBot = require('node-switchbot');
+      this.switchbot = new SwitchBot();
+      const colon = device.deviceId!.match(/.{1,2}/g);
+      const bleMac = colon!.join(':'); //returns 1A:23:B4:56:78:9A;
+      this.device.bleMac = bleMac.toLowerCase();
+      if (this.platform.config.options.debug) {
+        this.platform.log.warn(this.device.bleMac.toLowerCase());
+      }
+    }
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doPlugUpdate = new Subject();
     this.plugUpdateInProgress = false;
@@ -42,7 +74,7 @@ export class Plug {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Outlet) ||
-      accessory.addService(this.platform.Service.Outlet)), '%s %s', device.deviceName, device.deviceType;
+      accessory.addService(this.platform.Service.Outlet)), `${device.deviceName} ${device.deviceType}`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -103,6 +135,60 @@ export class Plug {
   }
 
   async refreshStatus() {
+    if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
+      this.platform.log.warn('BLE DEVICE-REFRESH');
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const Switchbot = require('node-switchbot');
+      const switchbot = new Switchbot();
+      const colon = this.device.deviceId!.match(/.{1,2}/g);
+      const bleMac = colon!.join(':'); //returns 1A:23:B4:56:78:9A;
+      this.device.bleMac = bleMac.toLowerCase();
+      if (this.platform.config.options.debug) {
+        this.platform.log.warn(this.device.bleMac!);
+      }
+      switchbot.onadvertisement = (ad: any) => {
+        this.platform.log.info(JSON.stringify(ad, null, '  '));
+        this.platform.log.warn('ad:', JSON.stringify(ad));
+      };
+      switchbot
+        .startScan({
+          id: this.device.bleMac,
+        })
+        .then(() => {
+          return switchbot.wait(this.platform.config.options!.refreshRate! * 1000);
+        })
+        .then(() => {
+          switchbot.stopScan();
+        })
+        .catch(async (error: any) => {
+          this.platform.log.error(error);
+          await this.openAPIRefreshStatus();
+        });
+      setInterval(() => {
+        this.platform.log.info('Start scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
+        switchbot
+          .startScan({
+            mode: 'T',
+            id: bleMac,
+          })
+          .then(() => {
+            return switchbot.wait(this.platform.config.options!.refreshRate! * 1000);
+          })
+          .then(() => {
+            switchbot.stopScan();
+            this.platform.log.info('Stop scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
+          })
+          .catch(async (error: any) => {
+            this.platform.log.error(error);
+            await this.openAPIRefreshStatus();
+          });
+      }, this.platform.config.options!.refreshRate! * 60000);
+    } else {
+      await this.openAPIRefreshStatus();
+    }
+  }
+
+  private async openAPIRefreshStatus() {
     try {
       this.platform.debug('Plug - Reading', `${DeviceURL}/${this.device.deviceId}/status`);
       const deviceStatus: deviceStatusResponse = (
@@ -118,8 +204,7 @@ export class Plug {
       this.platform.log.error(
         `Plug - Failed to refresh status of ${this.device.deviceName}`,
         JSON.stringify(e.message),
-        this.platform.debug(`Plug ${this.accessory.displayName} - ${JSON.stringify(e)}`),
-      );
+        this.platform.debug(`Plug ${this.accessory.displayName} - ${JSON.stringify(e)}`));
       this.apiError(e);
     }
   }

package/src/irdevices/airconditioners.ts

@@ -45,7 +45,7 @@ export class AirConditioner {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.HeaterCooler) ||
-      accessory.addService(this.platform.Service.HeaterCooler)), '%s %s', device.deviceName, device.remoteType;
+      accessory.addService(this.platform.Service.HeaterCooler)), `${device.deviceName} ${device.remoteType}`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -261,7 +261,7 @@ export class AirConditioner {
     this.CurrentARMode = this.CurrentMode || 1;
     this.CurrentARFanSpeed = this.CurrentFanSpeed || 1;
     this.ARActive = this.Active === 1 ? 'on' : 'off';
-    payload.parameter = '%s,%s,%s,%s', this.CurrentARTemp, this.CurrentARMode, this.CurrentARFanSpeed, this.ARActive;
+    payload.parameter = `${this.CurrentARTemp},${this.CurrentARMode},${this.CurrentARFanSpeed},${this.ARActive}`;
 
 
     if (this.Active === 1) {

package/src/irdevices/airpurifiers.ts

@@ -44,7 +44,7 @@ export class AirPurifier {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.AirPurifier) ||
-      accessory.addService(this.platform.Service.AirPurifier)), '%s %s', device.deviceName, device.remoteType;
+      accessory.addService(this.platform.Service.AirPurifier)), `${device.deviceName} ${device.remoteType}`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -159,7 +159,7 @@ export class AirPurifier {
     this.CurrentAPMode = this.CurrentMode || 1;
     this.CurrentAPFanSpeed = this.CurrentFanSpeed || 1;
     this.APActive = this.Active === 1 ? 'on' : 'off';
-    payload.parameter = '%s,%s,%s,%s', this.CurrentAPTemp, this.CurrentAPMode, this.CurrentAPFanSpeed, this.APActive;
+    payload.parameter = `${this.CurrentAPTemp},${this.CurrentAPMode},${this.CurrentAPFanSpeed},${this.APActive}`;
 
     if (this.Active === 1) {
       if ((this.CurrentTemperature || 24) < (this.LastTemperature || 30)) {

package/src/irdevices/cameras.ts

@@ -29,7 +29,7 @@ export class Camera {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Switch) ||
-      accessory.addService(this.platform.Service.Switch)), '%s %s', device.deviceName, device.remoteType;
+      accessory.addService(this.platform.Service.Switch)), `${device.deviceName} ${device.remoteType}`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:

package/src/irdevices/fans.ts

@@ -37,7 +37,7 @@ export class Fan {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Fanv2) ||
-      accessory.addService(this.platform.Service.Fanv2)), '%s %s', device.deviceName, device.remoteType;
+      accessory.addService(this.platform.Service.Fanv2)), `${device.deviceName} ${device.remoteType}`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:

package/src/irdevices/lights.ts

@@ -29,7 +29,7 @@ export class Light {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Lightbulb) ||
-      accessory.addService(this.platform.Service.Lightbulb)), '${} ${}', device.deviceName, device.remoteType;
+      accessory.addService(this.platform.Service.Lightbulb)), `${device.deviceName} ${device.remoteType}`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -46,7 +46,7 @@ export class Light {
     /* this.service
       .getCharacteristic(this.platform.Characteristic.Brightness)
       .on(CharacteristicEventTypes.SET, (value: any, callback: CharacteristicGetCallback) => {
-        this.platform.debug('${} ${} Set Brightness: ${}', device.remoteType, accessory.displayName, value);
+        this.platform.debug(`${this.device.remoteType} ${this.accessory.displayName} Set Brightness: ${value}`);
         this.Brightness = value;
         if (value > this.Brightness) {
           this.pushLightBrightnessUpChanges();
@@ -59,7 +59,7 @@ export class Light {
   }
 
   private OnSet(value: CharacteristicValue) {
-    this.platform.debug('${} ${} Set On: ${}', this.device.remoteType, this.accessory.displayName, value);
+    this.platform.debug(`${this.device.remoteType} ${this.accessory.displayName} Set On: ${value}`);
     this.On = value;
     if (this.On) {
       this.pushLightOnChanges();

package/src/irdevices/others.ts

@@ -31,7 +31,7 @@ export class Others {
     if (!this.service && this.platform.config.options?.other?.deviceType === 'Fan') {
       this.service = accessory.addService(
         this.platform.Service.Fanv2,
-        `${device.deviceName} ${device.remoteType} Temperature Sensor`,
+        `${device.deviceName} ${device.remoteType} Fan`,
       );
       this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
 

package/src/irdevices/tvs.ts

@@ -53,7 +53,7 @@ export class TV {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Television) ||
-      accessory.addService(this.platform.Service.Television)), '%s %s', device.deviceName, device.remoteType;
+      accessory.addService(this.platform.Service.Television)), `${device.deviceName} ${device.remoteType}`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -63,8 +63,6 @@ export class TV {
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
     this.service.getCharacteristic(this.platform.Characteristic.ConfiguredName);
 
-    //this.service.setCharacteristic(this.platform.Characteristic.Name, `${device.deviceName} ${device.remoteType}`);
-
     // set sleep discovery characteristic
     this.service.setCharacteristic(
       this.platform.Characteristic.SleepDiscoveryMode,
@@ -88,7 +86,7 @@ export class TV {
     // create a new Television Speaker service
     (this.speakerService =
       accessory.getService(this.platform.Service.TelevisionSpeaker) ||
-      accessory.addService(this.platform.Service.TelevisionSpeaker)), '%s %s Speaker', device.deviceName, device.remoteType;
+      accessory.addService(this.platform.Service.TelevisionSpeaker)), `${device.deviceName} ${device.remoteType} Speaker`;
 
     this.speakerService
       .setCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.ACTIVE)

package/src/irdevices/vacuumcleaners.ts

@@ -48,7 +48,7 @@ export class VacuumCleaner {
   }
 
   private OnSet(value: CharacteristicValue) {
-    this.platform.debug('${} ${} Set On: ${}', this.device.remoteType, this.accessory.displayName, value);
+    this.platform.debug(`${this.device.remoteType} ${this.accessory.displayName} Set On: ${value}`);
     this.On = value;
     if (this.On) {
       this.pushOnChanges();