@switchbot/homebridge-switchbot 1.7.1-beta.1 → 1.7.1-beta.10

package/src/devices/meters.ts

@@ -2,7 +2,7 @@ import { interval, Subject } from 'rxjs';
 import { skipWhile } from 'rxjs/operators';
 import { SwitchBotPlatform } from '../platform';
 import { Service, PlatformAccessory, Units, CharacteristicValue } from 'homebridge';
-import { DeviceURL, device, devicesConfig, serviceData, ad, switchbot, deviceStatusResponse, temperature } from '../settings';
+import { DeviceURL, device, devicesConfig, serviceData, ad, switchbot, deviceStatusResponse, temperature, deviceStatus } from '../settings';
 
 /**
  * Platform Accessory
@@ -11,28 +11,30 @@ import { DeviceURL, device, devicesConfig, serviceData, ad, switchbot, deviceSta
  */
 export class Meter {
   // Services
-  private service: Service;
-  temperatureservice?: Service;
-  humidityservice?: Service;
+  private batteryService?: Service;
+  private temperatureservice?: Service;
+  private humidityservice?: Service;
 
   // Characteristic Values
   CurrentRelativeHumidity!: CharacteristicValue;
   CurrentRelativeHumidityCached!: CharacteristicValue;
-  CurrentTemperature!: CharacteristicValue;
-  CurrentTemperatureCached!: CharacteristicValue;
-  BatteryLevel!: CharacteristicValue;
-  BatteryLevelCached!: CharacteristicValue;
-  ChargingState!: CharacteristicValue;
-  StatusLowBattery!: CharacteristicValue;
+  CurrentTemperature?: CharacteristicValue;
+  CurrentTemperatureCached?: CharacteristicValue;
+  BatteryLevel?: CharacteristicValue;
+  ChargingState?: CharacteristicValue;
+  StatusLowBattery?: CharacteristicValue;
   Active!: CharacteristicValue;
   WaterLevel!: CharacteristicValue;
 
   // OpenAPI Others
+  Temperature: deviceStatus['temperature'];
+  Humidity: deviceStatus['humidity'];
   deviceStatus!: deviceStatusResponse;
 
   // BLE Others
   connected?: boolean;
   switchbot!: switchbot;
+  SwitchToOpenAPI?: boolean;
   serviceData!: serviceData;
   temperature!: temperature['c'];
   battery!: serviceData['battery'];
@@ -56,17 +58,7 @@ export class Meter {
     this.logs();
     this.scan();
     this.refreshRate();
-    if (this.BatteryLevel === undefined) {
-      this.BatteryLevel = 100;
-    } else {
-      this.BatteryLevel = this.accessory.context.BatteryLevel;
-    }
-    if (this.BatteryLevel < 15) {
-      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
-    } else {
-      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-    }
-    this.ChargingState = this.platform.Characteristic.ChargingState.NOT_CHARGEABLE;
+    this.config(device);
     if (this.CurrentRelativeHumidity === undefined) {
       this.CurrentRelativeHumidity = 0;
     } else {
@@ -96,26 +88,6 @@ export class Meter {
       .setCharacteristic(this.platform.Characteristic.Model, 'SWITCHBOT-METERTH-S1')
       .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId!);
 
-    // get the Battery service if it exists, otherwise create a new Battery service
-    // you can create multiple services for each accessory
-    (this.service =
-      accessory.getService(this.platform.Service.Battery) ||
-      accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
-
-    // 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:
-    // accessory.getService('NAME') ?? accessory.addService(this.platform.Service.Battery, 'NAME', 'USER_DEFINED_SUBTYPE');
-
-    // set the service name, this is what is displayed as the default name on the Home app
-    // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-
-    // each service must implement at-minimum the "required characteristics" for the given service type
-    // see https://developers.homebridge.io/#/service/Battery
-
-    // create handlers for required characteristics
-    this.service.setCharacteristic(this.platform.Characteristic.ChargingState, 2);
-
     // Temperature Sensor Service
     if (device.meter?.hide_temperature) {
       this.debugLog(`Meter: ${accessory.displayName} Removing Temperature Sensor Service`);
@@ -127,7 +99,7 @@ export class Meter {
         this.accessory.getService(this.platform.Service.TemperatureSensor) ||
         this.accessory.addService(this.platform.Service.TemperatureSensor)), `${accessory.displayName} Temperature Sensor`;
 
-      this.service.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
+      this.temperatureservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
 
       this.temperatureservice
         .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
@@ -139,7 +111,7 @@ export class Meter {
           minStep: 0.1,
         })
         .onGet(() => {
-          return this.CurrentTemperature;
+          return this.CurrentTemperature!;
         });
     } else {
       this.debugLog(`Meter: ${accessory.displayName} Temperature Sensor Service Not Added`);
@@ -156,7 +128,7 @@ export class Meter {
         this.accessory.getService(this.platform.Service.HumiditySensor) ||
         this.accessory.addService(this.platform.Service.HumiditySensor)), `${accessory.displayName} Humidity Sensor`;
 
-      this.service.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
+      this.humidityservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
 
       this.humidityservice
         .getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity)
@@ -170,6 +142,27 @@ export class Meter {
       this.debugLog(`Meter: ${accessory.displayName} Humidity Sensor Service Not Added`);
     }
 
+    // Battery Service
+    if (!device.ble) {
+      this.debugLog(`Meter: ${accessory.displayName} Removing Battery Service`);
+      this.batteryService = this.accessory.getService(this.platform.Service.Battery);
+      accessory.removeService(this.batteryService!);
+    } else if (device.ble && !this.batteryService) {
+      this.debugLog(`Meter: ${accessory.displayName} Add Battery Service`);
+      (this.batteryService =
+        this.accessory.getService(this.platform.Service.Battery) ||
+        this.accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
+
+      this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
+
+      this.batteryService.setCharacteristic(this.platform.Characteristic.ChargingState, this.platform.Characteristic.ChargingState.NOT_CHARGEABLE);
+
+    } else {
+      this.debugLog(`Meter: ${accessory.displayName} Battery Service Not Added`);
+    }
+
+
+
     // Retrieve initial values and updateHomekit
     this.updateHomeKitCharacteristics();
 
@@ -181,6 +174,12 @@ export class Meter {
       });
   }
 
+  config(device: device & devicesConfig) {
+    if (device.meter !== undefined || device.ble !== undefined) {
+      this.warnLog(`Meter: ${this.accessory.displayName} Config: ${JSON.stringify(device.meter)}, BLE: ${device.ble}`);
+    }
+  }
+
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
@@ -232,10 +231,10 @@ export class Meter {
    * Parse the device status from the SwitchBot api
    */
   async parseStatus() {
-    if (this.device.ble) {
-      await this.BLEparseStatus();
-    } else {
+    if (this.SwitchToOpenAPI || !this.device.ble) {
       await this.openAPIparseStatus();
+    } else {
+      await this.BLEparseStatus();
     }
   }
 
@@ -251,9 +250,9 @@ export class Meter {
     }
     this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
 
+    // Humidity
     if (!this.device.meter?.hide_humidity) {
-      // Humidity
-      this.CurrentRelativeHumidity = Number(this.humidity);
+      this.CurrentRelativeHumidity = this.humidity!;
       this.debugLog(`Meter: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
     }
 
@@ -266,27 +265,20 @@ export class Meter {
   }
 
   private async openAPIparseStatus() {
+    if (this.device.ble) {
+      this.SwitchToOpenAPI = false;
+    }
     if (this.platform.config.credentials?.openToken) {
       this.debugLog(`Meter: ${this.accessory.displayName} OpenAPI parseStatus`);
-      if (this.deviceStatus.body) {
-        this.BatteryLevel = 100;
-      } else {
-        this.BatteryLevel = 10;
-      }
-      if (this.BatteryLevel < 15) {
-        this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
-      } else {
-        this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-      }
       // Current Relative Humidity
       if (!this.device.meter?.hide_humidity) {
-        this.CurrentRelativeHumidity = this.deviceStatus.body.humidity!;
+        this.CurrentRelativeHumidity = this.Humidity!;
         this.debugLog(`Meter: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
       }
 
       // Current Temperature
       if (!this.device.meter?.hide_temperature) {
-        this.CurrentTemperature = Number(this.deviceStatus.body.temperature);
+        this.CurrentTemperature = this.Temperature!;
         this.debugLog(`Meter: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
       }
     }
@@ -303,34 +295,12 @@ export class Meter {
     }
   }
 
-  private async connectBLE() {
-    let switchbot: any;
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const Switchbot = require('node-switchbot');
-      switchbot = new Switchbot();
-      // Convert to BLE Address
-      this.device.bleMac = ((this.device.deviceId!.match(/.{1,2}/g))!.join(':')).toLowerCase();
-      this.debugLog(`Meter: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-    } catch (e: any) {
-      switchbot = false;
-      this.errorLog(`Meter: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot}`);
-      if (this.deviceLogging === 'debug') {
-        this.errorLog(`Meter: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-          + ` Error Message: ${JSON.stringify(e.message)}`);
-      }
-      if (this.platform.debugMode) {
-        this.errorLog(`Meter: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-          + ` Error: ${JSON.stringify(e)}`);
-      }
-    }
-    return switchbot;
-  }
-
   private async BLErefreshStatus() {
     this.debugLog(`Meter: ${this.accessory.displayName} BLE RefreshStatus`);
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const switchbot = await this.connectBLE();
+    const switchbot = await this.platform.connectBLE();
+    // Convert to BLE Address
+    this.device.bleMac = ((this.device.deviceId!.match(/.{1,2}/g))!.join(':')).toLowerCase();
+    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     // Start to monitor advertisement packets
     if (switchbot !== false) {
       switchbot.startScan({
@@ -362,12 +332,6 @@ export class Meter {
         // Stop to monitor
         switchbot.stopScan();
         if (this.connected) {
-          this.CurrentTemperatureCached = this.temperature;
-          this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
-          this.CurrentRelativeHumidityCached = this.humidity!;
-          this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidityCached;
-          this.BatteryLevelCached = this.battery!;
-          this.accessory.context.BatteryLevel = this.BatteryLevelCached;
           this.parseStatus();
           this.updateHomeKitCharacteristics();
         } else {
@@ -385,6 +349,7 @@ export class Meter {
         }
         if (this.platform.config.credentials?.openToken) {
           this.warnLog(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
+          this.SwitchToOpenAPI = true;
           this.openAPIRefreshStatus();
         }
         this.apiError(e);
@@ -398,6 +363,7 @@ export class Meter {
     this.errorLog(`Meter: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
     if (this.platform.config.credentials?.openToken) {
       this.warnLog(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
+      this.SwitchToOpenAPI = true;
       await this.openAPIRefreshStatus();
     }
   }
@@ -408,12 +374,8 @@ export class Meter {
       try {
         this.deviceStatus = (await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)).data;
         this.debugLog(`Meter: ${this.accessory.displayName} openAPIRefreshStatus: ${JSON.stringify(this.deviceStatus)}`);
-        this.CurrentTemperatureCached = this.deviceStatus.body.humidity!;
-        this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
-        this.CurrentRelativeHumidityCached = this.deviceStatus.body.humidity!;
-        this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidityCached;
-        this.BatteryLevelCached = 100;
-        this.accessory.context.BatteryLevel = this.BatteryLevelCached;
+        this.Humidity = this.deviceStatus.body.humidity!;
+        this.Temperature = this.deviceStatus.body.temperature!;
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
@@ -435,18 +397,6 @@ export class Meter {
    * Updates the status for each of the HomeKit Characteristics
    */
   updateHomeKitCharacteristics() {
-    if (this.StatusLowBattery === undefined) {
-      this.debugLog(`Meter: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
-    } else {
-      this.service.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-      this.debugLog(`Meter: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
-    }
-    if (this.BatteryLevel === undefined) {
-      this.debugLog(`Meter: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
-    } else {
-      this.service.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-      this.debugLog(`Meter: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
-    }
     if (!this.device.meter?.hide_humidity) {
       if (this.CurrentRelativeHumidity === undefined) {
         this.debugLog(`Meter: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
@@ -463,17 +413,33 @@ export class Meter {
         this.debugLog(`Meter: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
       }
     }
+    if (this.device.ble) {
+      if (this.BatteryLevel === undefined) {
+        this.debugLog(`Bot: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+      } else {
+        this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
+        this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+      }
+      if (this.StatusLowBattery === undefined) {
+        this.debugLog(`Bot: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+      } else {
+        this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
+        this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+      }
+    }
   }
 
   public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
     if (!this.device.meter?.hide_humidity) {
       this.humidityservice?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, e);
     }
     if (!this.device.meter?.hide_temperature) {
       this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
     }
+    if (this.device.ble) {
+      this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
+      this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
+    }
     //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 

package/src/devices/motion.ts

@@ -2,7 +2,7 @@ import { interval, Subject } from 'rxjs';
 import { skipWhile } from 'rxjs/operators';
 import { SwitchBotPlatform } from '../platform';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { DeviceURL, device, devicesConfig, serviceData, switchbot, deviceStatusResponse } from '../settings';
+import { DeviceURL, device, devicesConfig, serviceData, switchbot, deviceStatusResponse, deviceStatus } from '../settings';
 
 /**
  * Platform Accessory
@@ -23,10 +23,13 @@ export class Motion {
 
   // OpenAPI Others
   deviceStatus!: deviceStatusResponse;
+  moveDetected: deviceStatus['moveDetected'];
+  brightness: deviceStatus['brightness'];
 
   // BLE Others
   connected?: boolean;
   switchbot!: switchbot;
+  SwitchToOpenAPI?: boolean;
   serviceData!: serviceData;
   battery!: serviceData['battery'];
   movement!: serviceData['movement'];
@@ -52,6 +55,7 @@ export class Motion {
     this.logs();
     this.scan();
     this.refreshRate();
+    this.config(device);
     this.MotionDetected = false;
 
     // Motion Config
@@ -108,12 +112,20 @@ export class Motion {
     }
 
     // Battery Service
-    if (device.ble) {
+    if (!device.ble) {
+      this.debugLog(`Motion Sensor: ${accessory.displayName} Removing Battery Service`);
+      this.batteryService = this.accessory.getService(this.platform.Service.Battery);
+      accessory.removeService(this.batteryService!);
+    } else if (device.ble && !this.batteryService) {
+      this.debugLog(`Motion Sensor: ${accessory.displayName} Add Battery Service`);
       (this.batteryService =
-        accessory.getService(this.platform.Service.Battery) ||
-        accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
+        this.accessory.getService(this.platform.Service.Battery) ||
+        this.accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
 
       this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
+
+    } else {
+      this.debugLog(`Motion Sensor: ${accessory.displayName} Battery Service Not Added`);
     }
 
     // Retrieve initial values and updateHomekit
@@ -127,6 +139,12 @@ export class Motion {
       });
   }
 
+  config(device: device & devicesConfig) {
+    if (device.motion !== undefined) {
+      this.warnLog(`Motion Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(device.motion)}`);
+    }
+  }
+
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
@@ -196,42 +214,38 @@ export class Motion {
    * Parse the device status from the SwitchBot api
    */
   async parseStatus() {
-    if (this.device.ble) {
-      await this.BLEparseStatus();
-    } else {
+    if (this.SwitchToOpenAPI || !this.device.ble) {
       await this.openAPIparseStatus();
+    } else {
+      await this.BLEparseStatus();
     }
   }
 
   private async BLEparseStatus() {
     this.debugLog(`Motion Sensor: ${this.accessory.displayName} BLE parseStatus`);
     // Movement
-    if (this.movement === undefined && this.platform.config.credentials?.openToken) {
-      this.openAPImotion();
-    } else if (this.movement === undefined) {
-      this.movement = false;
-      this.BLEmotion();
-    } else {
-      this.BLEmotion();
-    }
+    this.MotionDetected = this.movement!;
+    this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
     // Light Level
     if (!this.device.motion?.hide_lightsensor) {
       this.set_minLux = this.minLux();
       this.set_maxLux = this.maxLux();
-      if (this.lightLevel === undefined && this.platform.config.credentials?.openToken) {
-        this.openAPIlux();
-      } else if (this.lightLevel === undefined) {
-        this.lightLevel = 100;
-        this.BLElux();
-      } else {
-        this.BLElux();
+      switch (this.lightLevel) {
+        case 'dark':
+        case 1:
+          this.CurrentAmbientLightLevel = this.set_minLux;
+          break;
+        default:
+          this.CurrentAmbientLightLevel = this.set_maxLux;
       }
+      this.debugLog(`Motion Sensor: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
+        + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
     }
     // Battery
     if (this.battery === undefined) {
       this.battery = 100;
     }
-    this.BatteryLevel = Number(this.battery);
+    this.BatteryLevel = this.battery!;
     if (this.BatteryLevel < 10) {
       this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
@@ -240,55 +254,31 @@ export class Motion {
     this.debugLog(`Motion Sensor: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
   }
 
-  private BLEmotion() {
-    this.MotionDetected = Boolean(this.movement);
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
-  }
-
-  private BLElux() {
-    switch (this.lightLevel) {
-      case 'dark':
-      case 1:
-        this.CurrentAmbientLightLevel = this.set_minLux;
-        break;
-      default:
-        this.CurrentAmbientLightLevel = this.set_maxLux;
-    }
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
-      + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
-  }
-
   private async openAPIparseStatus() {
+    if (this.device.ble) {
+      this.SwitchToOpenAPI = false;
+    }
     if (this.platform.config.credentials?.openToken) {
       this.debugLog(`Motion Sensor: ${this.accessory.displayName} OpenAPI parseStatus`);
       // Motion State
-      this.openAPImotion();
+      this.MotionDetected = this.moveDetected!;
+      this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
       // Light Level
       if (!this.device.motion?.hide_lightsensor) {
-        this.openAPIlux();
-      }
-    }
-  }
-
-  private openAPImotion() {
-    if (typeof this.deviceStatus.body.moveDetected === 'boolean') {
-      this.MotionDetected = this.deviceStatus.body.moveDetected;
-    }
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
-  }
+        this.set_minLux = this.minLux();
+        this.set_maxLux = this.maxLux();
+        switch (this.brightness) {
+          case 'dim':
+            this.CurrentAmbientLightLevel = this.set_minLux;
+            break;
+          case 'bright':
+          default:
+            this.CurrentAmbientLightLevel = this.set_maxLux;
+        }
+        this.debugLog(`Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
 
-  private openAPIlux() {
-    this.set_minLux = this.minLux();
-    this.set_maxLux = this.maxLux();
-    switch (this.deviceStatus.body.brightness) {
-      case 'dim':
-        this.CurrentAmbientLightLevel = this.set_minLux;
-        break;
-      case 'bright':
-      default:
-        this.CurrentAmbientLightLevel = this.set_maxLux;
+      }
     }
-    this.debugLog(`Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
   }
 
   /**
@@ -302,38 +292,16 @@ export class Motion {
     }
   }
 
-  public async connectBLE() {
-    let switchbot: any;
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const Switchbot = require('node-switchbot');
-      switchbot = new Switchbot();
-      // Convert to BLE Address
-      this.device.bleMac = ((this.device.deviceId!.match(/.{1,2}/g))!.join(':')).toLowerCase();
-      this.debugLog(`Motion Sensor: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-    } catch (e: any) {
-      switchbot = false;
-      this.errorLog(`Motion Sensor: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot}`);
-      if (this.deviceLogging === 'debug') {
-        this.errorLog(`Motion Sensor: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-          + ` Error Message: ${JSON.stringify(e.message)}`);
-      }
-      if (this.platform.debugMode) {
-        this.errorLog(`Motion Sensor: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-          + ` Error: ${JSON.stringify(e)}`);
-      }
-    }
-    return switchbot;
-  }
-
   private async BLERefreshStatus() {
     this.debugLog(`Motion Sensor: ${this.accessory.displayName} BLE RefreshStatus`);
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const switchbot = await this.connectBLE();
+    const switchbot = await this.platform.connectBLE();
+    // Convert to BLE Address
+    this.device.bleMac = ((this.device.deviceId!.match(/.{1,2}/g))!.join(':')).toLowerCase();
+    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     // Start to monitor advertisement packets
     if (switchbot !== false) {
       switchbot.startScan({
-        //model: 's',
+        model: 's',
         id: this.device.bleMac,
       }).then(() => {
         // Set an event hander
@@ -377,6 +345,7 @@ export class Motion {
         }
         if (this.platform.config.credentials?.openToken) {
           this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
+          this.SwitchToOpenAPI = true;
           await this.openAPIRefreshStatus();
         }
         this.apiError(e);
@@ -390,6 +359,7 @@ export class Motion {
     this.errorLog(`Motion Sensor: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
     if (this.platform.config.credentials?.openToken) {
       this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
+      this.SwitchToOpenAPI = true;
       await this.openAPIRefreshStatus();
     }
   }
@@ -400,6 +370,11 @@ export class Motion {
       try {
         this.deviceStatus = (await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)).data;
         this.debugLog(`Motion Sensor: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+        if (this.deviceStatus.body.moveDetected === undefined) {
+          this.errorLog(`Motion Sensor: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+        }
+        this.moveDetected = this.deviceStatus.body.moveDetected;
+        this.brightness = this.deviceStatus.body.brightness;
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       } catch (e: any) {

package/src/devices/plugs.ts

@@ -4,7 +4,7 @@ import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { DeviceURL, device, devicesConfig, deviceStatusResponse, payload } from '../settings';
+import { DeviceURL, device, devicesConfig, deviceStatusResponse, payload, deviceStatus } from '../settings';
 
 export class Plug {
   // Services
@@ -15,6 +15,7 @@ export class Plug {
   OnCached!: CharacteristicValue;
 
   // OpenAPI Others
+  power: deviceStatus['power'];
   deviceStatus!: deviceStatusResponse;
 
   // Config
@@ -35,6 +36,7 @@ export class Plug {
     this.logs();
     this.scan();
     this.refreshRate();
+    this.config(device);
     if (this.On === undefined) {
       this.On = false;
     } else {
@@ -116,6 +118,12 @@ export class Plug {
       });
   }
 
+  config(device: device & devicesConfig) {
+    if (device.plug !== undefined) {
+      this.warnLog(`Plug: ${this.accessory.displayName} Config: ${JSON.stringify(device.plug)}`);
+    }
+  }
+
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
@@ -164,7 +172,7 @@ export class Plug {
   }
 
   parseStatus() {
-    switch (this.deviceStatus.body.power) {
+    switch (this.power) {
       case 'on':
         this.On = true;
         break;
@@ -178,6 +186,7 @@ export class Plug {
     try {
       this.deviceStatus = (await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)).data;
       this.debugLog(`Plug: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+      this.power = this.deviceStatus.body.power;
       this.parseStatus();
       this.updateHomeKitCharacteristics();
     } catch (e: any) {