@switchbot/homebridge-switchbot 1.7.0 → 1.7.1-beta.11

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) {

package/src/irdevices/airconditioners.ts

@@ -50,6 +50,7 @@ export class AirConditioner {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -166,6 +167,12 @@ export class AirConditioner {
       .onSet(this.RotationSpeedSet.bind(this));
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.irair !== undefined) {
+      this.warnLog(`Air Conditioner: ${this.accessory.displayName} Config: ${JSON.stringify(device.irair)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/airpurifiers.ts

@@ -45,6 +45,7 @@ export class AirPurifier {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -87,6 +88,12 @@ export class AirPurifier {
     this.service.getCharacteristic(this.platform.Characteristic.TargetAirPurifierState).onSet(this.TargetAirPurifierStateSet.bind(this));
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.irpur !== undefined) {
+      this.warnLog(`Air Purifier: ${this.accessory.displayName} Config: ${JSON.stringify(device.irpur)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/cameras.ts

@@ -26,6 +26,7 @@ export class Camera {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.On === undefined) {
       this.On = false;
     } else {
@@ -57,6 +58,12 @@ export class Camera {
     this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.ircam !== undefined && (this.deviceLogging === 'debug' || this.deviceLogging === 'standard')) {
+      this.warnLog(`Camera: ${this.accessory.displayName} Config: ${JSON.stringify(device.ircam)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/fans.ts

@@ -36,6 +36,7 @@ export class Fan {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -116,6 +117,12 @@ export class Fan {
     }
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.irfan !== undefined && (this.deviceLogging === 'debug' || this.deviceLogging === 'standard')) {
+      this.warnLog(`Fan: ${this.accessory.displayName} Config: ${JSON.stringify(device.irfan)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/lights.ts

@@ -26,6 +26,7 @@ export class Light {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.On === undefined) {
       this.On = false;
     } else {
@@ -72,6 +73,12 @@ export class Light {
       });*/
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.irlight !== undefined) {
+      this.warnLog(`Light: ${this.accessory.displayName} Config: ${JSON.stringify(device.irlight)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/others.ts

@@ -28,6 +28,7 @@ export class Others {
     // default placeholders
     this.logs();
     this.deviceType();
+    this.config(device);
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -76,6 +77,12 @@ export class Others {
     }
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.other !== undefined) {
+      this.warnLog(`Other: ${this.accessory.displayName} Config: ${JSON.stringify(device.other)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/tvs.ts

@@ -31,6 +31,7 @@ export class TV {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -128,6 +129,12 @@ export class TV {
       .onSet(this.VolumeSelectorSet.bind(this));
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.irtv !== undefined) {
+      this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(device.irtv)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/vacuumcleaners.ts

@@ -26,6 +26,7 @@ export class VacuumCleaner {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.On === undefined) {
       this.On = false;
     } else {
@@ -57,6 +58,12 @@ export class VacuumCleaner {
     this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.irvc !== undefined) {
+      this.warnLog(`Vacuum Cleaner: ${this.accessory.displayName} Config: ${JSON.stringify(device.irvc)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/irdevices/waterheaters.ts

@@ -26,6 +26,7 @@ export class WaterHeater {
   ) {
     // default placeholders
     this.logs();
+    this.config(device);
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -66,6 +67,12 @@ export class WaterHeater {
     this.service.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
   }
 
+  config(device: irdevice & irDevicesConfig) {
+    if (device.irwh !== undefined) {
+      this.warnLog(`Water Heater: ${this.accessory.displayName} Config: ${JSON.stringify(device.irwh)}`);
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';

package/src/platform.ts

@@ -192,8 +192,21 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
+  connectBLE() {
+    let Switchbot: new () => any;
+    let switchbot: any;
+    try {
+      Switchbot = require('node-switchbot');
+      switchbot = new Switchbot();
+    } catch (e) {
+      switchbot = false;
+      this.errorLog(`Was 'node-switchbot' found: ${switchbot}`);
+    }
+    return switchbot;
+  }
+
   /**
- * this method discovers the Locations
+ * this method discovers devices
  */
   async discoverDevices() {
     try {

package/src/settings.ts

@@ -48,7 +48,9 @@ export interface devicesConfig extends device {
   humidifier?: humidifier;
   curtain?: curtain;
   contact?: contact;
+  motion?: motion;
   colorbulb?: colorbulb;
+  plug?: undefined;
   ble?: string;
   scanDuration?: number;
   hide_device?: boolean;
@@ -84,9 +86,17 @@ export type curtain = {
 
 export type contact = {
   hide_lightsensor?: boolean;
+  set_minLux?: number;
+  set_maxLux?: number;
   hide_motionsensor?: boolean;
 };
 
+export type motion = {
+  hide_lightsensor?: boolean;
+  set_minLux?: number;
+  set_maxLux?: number;
+};
+
 export type colorbulb = {
   set_minStep?: number;
   adaptiveLightingShift?: number;
@@ -98,6 +108,11 @@ export interface irDevicesConfig extends irdevice {
   logging?: string;
   irfan?: irfan;
   irair?: irair;
+  irpur?: undefined;
+  ircam?: undefined;
+  irlight?: undefined;
+  irvc?: undefined;
+  irwh?: undefined;
   irtv?: irtv;
   other?: other;
   hide_device?: boolean;