@switchbot/homebridge-switchbot 2.1.2-beta.4 → 2.1.2-beta.6

package/src/device/curtain.ts

@@ -221,6 +221,7 @@ export class Curtain {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -395,6 +396,7 @@ export class Curtain {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -528,6 +530,7 @@ export class Curtain {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, pushChanges will not happen.`);
     }
@@ -960,9 +963,12 @@ export class Curtain {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      this.CurrentPosition = 100;
-      this.windowCoveringService.getCharacteristic(this.platform.Characteristic.On).updateValue(this.CurrentPosition);
+      await this.context();
       await this.updateHomeKitCharacteristics();
+      /* this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState)
+        .getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
+      this.windowCoveringService.setCharacteristic(this.platform.Characteristic.CurrentPosition, this.CurrentPosition)
+        .getCharacteristic(this.platform.Characteristic.CurrentPosition).updateValue(this.CurrentPosition);*/
     }
   }
 

package/src/device/humidifier.ts

@@ -199,7 +199,7 @@ export class Humidifier {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
-      this.offlineOff();
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -289,7 +289,7 @@ export class Humidifier {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
-      this.offlineOff();
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -428,7 +428,7 @@ export class Humidifier {
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {
-      this.offlineOff();
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, pushChanges will not happen.`);
     }
@@ -840,11 +840,11 @@ export class Humidifier {
         break;
       case 161:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 171:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 190:
         this.errorLog(
@@ -862,9 +862,10 @@ export class Humidifier {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      this.Active = this.platform.Characteristic.Active.INACTIVE;
-      this.humidifierService.getCharacteristic(this.platform.Characteristic.Active).updateValue(this.Active);
-      //await this.updateHomeKitCharacteristics();
+      await this.context();
+      await this.updateHomeKitCharacteristics();
+      /*this.humidifierService.setCharacteristic(this.platform.Characteristic.Active, this.Active)
+        .getCharacteristic(this.platform.Characteristic.Active).updateValue(this.Active);*/
     }
   }
 

package/src/device/lock.ts

@@ -139,6 +139,7 @@ export class Lock {
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -199,6 +200,7 @@ export class Lock {
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -271,6 +273,7 @@ export class Lock {
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, pushChanges will not happen.`);
     }
@@ -466,11 +469,11 @@ export class Lock {
         break;
       case 161:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 171:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 190:
         this.errorLog(
@@ -488,9 +491,10 @@ export class Lock {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      this.LockCurrentState = this.platform.Characteristic.LockCurrentState.SECURED;
-      this.lockService.getCharacteristic(this.platform.Characteristic.LockCurrentState).updateValue(this.LockCurrentState);
+      await this.conext();
       await this.updateHomeKitCharacteristics();
+      /*this.lockService.setCharacteristic(this.platform.Characteristic.LockCurrentState, this.LockCurrentState)
+        .getCharacteristic(this.platform.Characteristic.LockCurrentState).updateValue(this.LockCurrentState);*/
     }
   }
 
@@ -518,7 +522,7 @@ export class Lock {
     return FirmwareRevision;
   }
 
-  private conext() {
+  async conext() {
     if (this.LockTargetState === undefined) {
       this.LockTargetState = false;
     } else {

package/src/device/meter.ts

@@ -183,6 +183,7 @@ export class Meter {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -240,6 +241,7 @@ export class Meter {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -540,11 +542,11 @@ export class Meter {
         break;
       case 161:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 171:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 190:
         this.errorLog(
@@ -566,18 +568,22 @@ export class Meter {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      if (!this.device.meter?.hide_humidity) {
-        this.humidityservice?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity,
-          this.accessory.context.CurrentRelativeHumidity);
+      await this.context();
+      await this.updateHomeKitCharacteristics();
+      /*if (!this.device.meter?.hide_humidity) {
+        this.humidityservice!.setCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity)
+          .getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity).updateValue(this.CurrentRelativeHumidity);
       }
       if (!this.device.meter?.hide_temperature) {
-        this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.accessory.context.CurrentTemperature);
+        this.temperatureservice!.setCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature!)
+          .getCharacteristic(this.platform.Characteristic.CurrentTemperature).updateValue(this.CurrentTemperature!);
       }
       if (this.BLE) {
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.accessory.context.BatteryLevel);
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.accessory.context.StatusLowBattery);
-      }
-      await this.updateHomeKitCharacteristics();
+        this.batteryService!.setCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel!)
+          .getCharacteristic(this.platform.Characteristic.BatteryLevel).updateValue(this.BatteryLevel!);
+        this.batteryService!.setCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery!)
+          .getCharacteristic(this.platform.Characteristic.StatusLowBattery).updateValue(this.StatusLowBattery!);
+      }*/
     }
   }
 

package/src/device/meterplus.ts

@@ -183,6 +183,7 @@ export class MeterPlus {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -240,6 +241,7 @@ export class MeterPlus {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -549,11 +551,11 @@ export class MeterPlus {
         break;
       case 161:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 171:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 190:
         this.errorLog(
@@ -575,18 +577,22 @@ export class MeterPlus {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      if (!this.device.meter?.hide_humidity) {
-        this.humidityservice?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity,
-          this.accessory.context.CurrentRelativeHumidity);
+      await this.context();
+      await this.updateHomeKitCharacteristics();
+      /*if (!this.device.meter?.hide_humidity) {
+        this.humidityservice!.setCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity)
+          .getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity).updateValue(this.CurrentRelativeHumidity);
       }
       if (!this.device.meter?.hide_temperature) {
-        this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.accessory.context.CurrentTemperature);
+        this.temperatureservice!.setCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature!)
+          .getCharacteristic(this.platform.Characteristic.CurrentTemperature).updateValue(this.CurrentTemperature!);
       }
       if (this.BLE) {
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.accessory.context.BatteryLevel);
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.accessory.context.StatusLowBattery);
-      }
-      await this.updateHomeKitCharacteristics();
+        this.batteryService!.setCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel!)
+          .getCharacteristic(this.platform.Characteristic.BatteryLevel).updateValue(this.BatteryLevel!);
+        this.batteryService!.setCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery!)
+          .getCharacteristic(this.platform.Characteristic.StatusLowBattery).updateValue(this.StatusLowBattery!);
+      }*/
     }
   }
 
@@ -619,7 +625,7 @@ export class MeterPlus {
     return FirmwareRevision;
   }
 
-  private context() {
+  async context() {
     if (this.CurrentRelativeHumidity === undefined) {
       this.CurrentRelativeHumidity = 0;
     } else {

package/src/device/motion.ts

@@ -149,6 +149,7 @@ export class Motion {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -222,6 +223,7 @@ export class Motion {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -458,11 +460,11 @@ export class Motion {
         break;
       case 161:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 171:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 190:
         this.errorLog(
@@ -484,9 +486,10 @@ export class Motion {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      this.MotionDetected = false;
-      this.motionSensorService.getCharacteristic(this.platform.Characteristic.MotionDetected).updateValue(this.MotionDetected);
+      await this.context();
       await this.updateHomeKitCharacteristics();
+      /*this.motionSensorService.setCharacteristic(this.platform.Characteristic.MotionDetected, this.MotionDetected)
+        .getCharacteristic(this.platform.Characteristic.MotionDetected).updateValue(this.MotionDetected);*/
     }
   }
 

package/src/device/plug.ts

@@ -132,6 +132,7 @@ export class Plug {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -173,6 +174,7 @@ export class Plug {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -319,6 +321,7 @@ export class Plug {
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, pushChanges will not happen.`);
     }
@@ -575,11 +578,11 @@ export class Plug {
         break;
       case 161:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 171:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 190:
         this.errorLog(
@@ -597,9 +600,10 @@ export class Plug {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      this.On = false;
-      this.outletService.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+      await this.context();
       await this.updateHomeKitCharacteristics();
+      /*this.outletService.setCharacteristic(this.platform.Characteristic.On, this.On)
+        .getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);*/
     }
   }
 

package/src/device/striplight.ts

@@ -219,6 +219,7 @@ export class StripLight {
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, parseStatus will not happen.`);
     }
@@ -285,6 +286,7 @@ export class StripLight {
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, refreshStatus will not happen.`);
     }
@@ -434,6 +436,7 @@ export class StripLight {
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {
+      await this.offlineOff();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
       + ` ${this.device.connectionType}, pushChanges will not happen.`);
     }
@@ -926,11 +929,11 @@ export class StripLight {
         break;
       case 161:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 171:
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
-        this.offlineOff();
+        await this.offlineOff();
         break;
       case 190:
         this.errorLog(
@@ -952,9 +955,10 @@ export class StripLight {
 
   async offlineOff(): Promise<void> {
     if (this.device.offline) {
-      this.On = false;
-      this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+      await this.context();
       await this.updateHomeKitCharacteristics();
+      /*this.lightBulbService.setCharacteristic(this.platform.Characteristic.On, this.On)
+        .getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);*/
     }
   }
 

package/src/platform.ts

@@ -42,7 +42,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   // this is used to track restored cached accessories
   public readonly accessories: PlatformAccessory[] = [];
 
-  version = process.env.npm_package_version || '0.0.0';
+  version = process.env.npm_package_version || '2.1.1';
   debugMode!: boolean;
   platformLogging?: string;
 
@@ -1888,12 +1888,10 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     let Switchbot: new () => any;
     let switchbot: any;
     try {
-      Switchbot = require('node-switchbot'),
-      queueScheduler.schedule(() => {
-        queueScheduler.schedule(() =>
-          switchbot = new Switchbot(),
-        );
-      });
+      Switchbot = require('node-switchbot');
+      queueScheduler.schedule(() =>
+        switchbot = new Switchbot(),
+      );
     } catch (e: any) {
       switchbot = false;
       this.errorLog(`Was 'node-switchbot' found: ${switchbot}`);