@switchbot/homebridge-switchbot 0.1.2-beta.11 → 0.1.2-beta.15

package/src/devices/bulb.ts

@@ -55,9 +55,7 @@ export class Bulb {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac.toLowerCase());
-      }
+      this.platform.device(this.device.bleMac.toLowerCase());
     }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -171,16 +169,13 @@ export class Bulb {
       ).data;
       if (deviceStatus.message === 'success') {
         this.deviceStatus = deviceStatus;
-        this.platform.log.warn(`Plug ${this.accessory.displayName} refreshStatus - ${JSON.stringify(this.deviceStatus)}`);
+        this.platform.device(`Plug ${this.accessory.displayName} refreshStatus - ${JSON.stringify(this.deviceStatus)}`);
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       }
     } catch (e: any) {
-      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.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.apiError(e);
     }
   }

package/src/devices/contact.ts

@@ -53,9 +53,7 @@ export class Contact {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac.toLowerCase());
-      }
+      this.platform.device(this.device.bleMac.toLowerCase());
     }
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doContactUpdate = new Subject();
@@ -109,11 +107,15 @@ export class Contact {
    * Parse the device status from the SwitchBot api
    */
   parseStatus() {
-    // Set Room Sensor State
-    if (this.deviceStatus.body.openState) {
+    // Conact Sensor
+    if (this.deviceStatus.body.openState === 'open') {
       this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED;
-    } else {
+      this.platform.log.info(`${this.accessory.displayName} ${this.deviceStatus.body.openState}`);
+    } else if (this.deviceStatus.body.openState === 'close') {
       this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
+      this.platform.device(`${this.accessory.displayName} ${this.deviceStatus.body.openState}`);
+    } else {
+      this.platform.device(`${this.accessory.displayName} ${this.deviceStatus.body.openState}`);
     }
     this.MotionDetected = Boolean(this.deviceStatus.body.moveDetected);
     this.platform.debug(`${this.accessory.displayName}
@@ -132,12 +134,10 @@ export class Contact {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac!);
-      }
+      this.platform.device(this.device.bleMac!);
       switchbot.onadvertisement = (ad: any) => {
         this.platform.log.info(JSON.stringify(ad, null, '  '));
-        this.platform.log.warn('ad:', JSON.stringify(ad));
+        this.platform.device('ad:', JSON.stringify(ad));
       };
       switchbot
         .startScan({
@@ -190,11 +190,8 @@ export class Contact {
         this.updateHomeKitCharacteristics();
       }
     } catch (e: any) {
-      this.platform.log.error(
-        'Contact - Failed to update status of',
-        this.device.deviceName,
-        JSON.stringify(e.message),
-        this.platform.debug(`Contact ${this.accessory.displayName} - ${JSON.stringify(e)}`));
+      this.platform.log.error(`Contact - Failed to refresh status of ${this.device.deviceName} - ${JSON.stringify(e.message)}`);
+      this.platform.debug(`Contact ${this.accessory.displayName} - ${JSON.stringify(e)}`);
       this.apiError(e);
     }
   }
@@ -203,11 +200,15 @@ export class Contact {
    * Updates the status for each of the HomeKit Characteristics
    */
   updateHomeKitCharacteristics() {
-    if (this.ContactSensorState !== undefined) {
+    if (this.ContactSensorState === undefined) {
+      this.platform.debug(`ContactSensorState: ${this.ContactSensorState}`);
+    } else {
       this.service.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.ContactSensorState);
     }
-    if (this.MotionDetected !== undefined) {
-      this.motionService.updateCharacteristic(this.platform.Characteristic.MotionDetected, this.MotionDetected);
+    if (this.MotionDetected === undefined) {
+      this.platform.debug(`ContactSensorState: ${this.ContactSensorState}`);
+    } else {
+      this.service.updateCharacteristic(this.platform.Characteristic.MotionDetected, this.MotionDetected);
     }
   }
 

package/src/devices/curtains.ts

@@ -71,9 +71,7 @@ export class Curtain {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac.toLowerCase());
-      }
+      this.platform.device(this.device.bleMac.toLowerCase());
     }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -191,7 +189,7 @@ export class Curtain {
 
   parseStatus() {
     if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
-      this.platform.log.warn('BLE DEVICE-3');
+      this.platform.device('Curtains BLE Device parseStatus');
     } else {
       // CurrentPosition
       this.setMinMax();
@@ -238,19 +236,17 @@ export class Curtain {
 
   async refreshStatus() {
     if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
-      this.platform.log.warn('BLE DEVICE-REFRESH-1');
+      this.platform.debug('Curtains BLE Device RefreshStatus');
       // 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 === 'device') {
-        this.platform.debug(this.device.bleMac!);
-      }
+      this.platform.debug(this.device.bleMac!);
       switchbot.onadvertisement = (ad: any) => {
-        this.platform.log.info(JSON.stringify(ad, null, '  '));
-        this.platform.log.warn('ad:', JSON.stringify(ad));
+        this.platform.debug(JSON.stringify(ad, null, '  '));
+        this.platform.device(`ad: ${JSON.stringify(ad)}`);
       };
       switchbot
         .startScan({
@@ -304,18 +300,15 @@ export class Curtain {
         this.updateHomeKitCharacteristics();
       }
     } catch (e: any) {
-      this.platform.log.error(
-        `Curtain - Failed to refresh status of ${this.device.deviceName}`,
-        JSON.stringify(e.message),
-        this.platform.debug(`Curtain ${this.accessory.displayName} - ${JSON.stringify(e)}`),
-      );
+      this.platform.log.error(`Curtain - Failed to refresh status of ${this.device.deviceName} - ${JSON.stringify(e.message)}`);
+      this.platform.debug(`Curtain ${this.accessory.displayName} - ${JSON.stringify(e)}`);
       this.apiError(e);
     }
   }
 
   async pushChanges() {
     if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
-      this.platform.log.warn('BLE DEVICE-2');
+      this.platform.device('Curtains BLE Device pushChanges');
     } else {
       if (this.TargetPosition !== this.CurrentPosition) {
         this.platform.debug(`Pushing ${this.TargetPosition}`);

package/src/devices/humidifiers.ts

@@ -107,15 +107,11 @@ export class Humidifier {
     // create a new Temperature Sensor service
     // Temperature Sensor Service
     if (this.platform.config.options?.humidifier?.hide_temperature) {
-      if (this.platform.config.options.debug === 'device') {
-        this.platform.log.error('Removing service');
-      }
+      this.platform.device('Removing Temerature Sensor Service');
       this.temperatureservice = this.accessory.getService(this.platform.Service.TemperatureSensor);
       accessory.removeService(this.temperatureservice!);
     } else if (!this.temperatureservice) {
-      if (this.platform.config.options?.debug === 'device') {
-        this.platform.log.warn('Adding service');
-      }
+      this.platform.device('Adding Temerature Sensor Service');
       (this.temperatureservice =
         this.accessory.getService(this.platform.Service.TemperatureSensor) ||
         this.accessory.addService(this.platform.Service.TemperatureSensor)), `${device.deviceName} ${device.deviceType} TemperatureSensor`;
@@ -133,7 +129,7 @@ export class Humidifier {
         });
     } else {
       if (this.platform.config.options?.debug) {
-        this.platform.log.warn('TemperatureSensor not added.');
+        this.platform.device('Temperature Sensor Not Added');
       }
     }
 
@@ -175,9 +171,7 @@ export class Humidifier {
     // Current Relative Humidity
     this.CurrentRelativeHumidity = this.deviceStatus.body.humidity!;
     this.platform.debug(`Humidifier ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
-    if (this.platform.config.options?.debug) {
-      this.platform.log.warn(JSON.stringify(this.deviceStatus.body));
-    }
+    this.platform.device(JSON.stringify(this.deviceStatus.body));
     // Water Level
     if (this.deviceStatus.body.lackWater) {
       this.WaterLevel = 0;

package/src/devices/indoorcam.ts

@@ -51,9 +51,7 @@ export class IndoorCam {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac.toLowerCase());
-      }
+      this.platform.device(this.device.bleMac.toLowerCase());
     }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -136,19 +134,17 @@ export class IndoorCam {
 
   async refreshStatus() {
     if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
-      this.platform.log.warn('BLE DEVICE-REFRESH');
+      this.platform.debug('IndoorCam BLE Device RefreshStatus');
       // 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 === 'device') {
-        this.platform.debug(this.device.bleMac!);
-      }
+      this.platform.device(this.device.bleMac!);
       switchbot.onadvertisement = (ad: any) => {
-        this.platform.log.info(JSON.stringify(ad, null, '  '));
-        this.platform.log.warn('ad:', JSON.stringify(ad));
+        this.platform.debug(JSON.stringify(ad, null, '  '));
+        this.platform.device(`ad: ${JSON.stringify(ad)}`);
       };
       switchbot
         .startScan({
@@ -196,15 +192,13 @@ export class IndoorCam {
       ).data;
       if (deviceStatus.message === 'success') {
         this.deviceStatus = deviceStatus;
-        this.platform.log.warn(`Camera ${this.accessory.displayName} refreshStatus - ${JSON.stringify(this.deviceStatus)}`);
+        this.platform.device(`Camera ${this.accessory.displayName} refreshStatus - ${JSON.stringify(this.deviceStatus)}`);
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       }
     } catch (e: any) {
-      this.platform.log.error(
-        `Camera - Failed to refresh status of ${this.device.deviceName}`,
-        JSON.stringify(e.message),
-        this.platform.debug(`Camera ${this.accessory.displayName} - ${JSON.stringify(e)}`));
+      this.platform.log.error(`IndoorCam - Failed to refresh status of ${this.device.deviceName} - ${JSON.stringify(e.message)}`);
+      this.platform.debug(`IndoorCam ${this.accessory.displayName} - ${JSON.stringify(e)}`);
       this.apiError(e);
     }
   }

package/src/devices/meters.ts

@@ -65,9 +65,7 @@ export class Meter {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac.toLowerCase());
-      }
+      this.platform.device(this.device.bleMac.toLowerCase());
     }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -106,15 +104,11 @@ export class Meter {
 
     // Temperature Sensor Service
     if (this.platform.config.options?.meter?.hide_temperature) {
-      if (this.platform.config.options.debug === 'device') {
-        this.platform.log.error('Removing service');
-      }
+      this.platform.device('Removing Temperature Sensor Service');
       this.temperatureservice = this.accessory.getService(this.platform.Service.TemperatureSensor);
       accessory.removeService(this.temperatureservice!);
     } else if (!this.temperatureservice) {
-      if (this.platform.config.options?.debug === 'device') {
-        this.platform.log.warn('Adding service');
-      }
+      this.platform.device('Adding Temperature Sensor Service');
       (this.temperatureservice =
         this.accessory.getService(this.platform.Service.TemperatureSensor) ||
         this.accessory.addService(this.platform.Service.TemperatureSensor)), `${device.deviceName} ${device.deviceType} TemperatureSensor`;
@@ -131,21 +125,17 @@ export class Meter {
         .onGet(() => {
           return this.CurrentTemperature;
         });
-      //this.platform.log.info(this.device.deviceName + ' current temperature: ' + this.CurrentTemperature + '\u2103');
     } else {
-      if (this.platform.config.options?.debug === 'device') {
-        this.platform.log.warn('TemperatureSensor not added.');
-      }
+      this.platform.device('Temperature Sensor Not Added');
     }
 
     // Humidity Sensor Service
     if (this.platform.config.options?.meter?.hide_humidity) {
-      if (this.platform.config.options.debug === 'device') {
-        this.platform.log.error('Removing service');
-      }
+      this.platform.device('Removing Humidity Sensor Service');
       this.humidityservice = this.accessory.getService(this.platform.Service.HumiditySensor);
       accessory.removeService(this.humidityservice!);
     } else if (!this.humidityservice) {
+      this.platform.device('Adding Humidity Sensor Service');
       (this.humidityservice =
         this.accessory.getService(this.platform.Service.HumiditySensor) ||
         this.accessory.addService(this.platform.Service.HumiditySensor)), `${device.deviceName} ${device.deviceType} HumiditySensor`;
@@ -158,11 +148,8 @@ export class Meter {
         .onGet(() => {
           return this.CurrentRelativeHumidity;
         });
-      //this.platform.log.info(this.device.deviceName + ' current humidity: ' + this.CurrentRelativeHumidity + '%');
     } else {
-      if (this.platform.config.options?.debug) {
-        this.platform.log.warn('HumiditySensor not added.');
-      }
+      this.platform.device('Adding Humidity Sensor Not Added');
     }
 
     // Retrieve initial values and updateHomekit
@@ -230,14 +217,12 @@ export class Meter {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac!);
-      }
+      this.platform.device(this.device.bleMac!);
       switchbot.onadvertisement = (ad: any) => {
-        this.platform.log.info(JSON.stringify(ad, null, '  '));
-        this.platform.log.warn('ad:', JSON.stringify(ad));
-        this.platform.log.info('Temperature:', ad.serviceData.temperature.c);
-        this.platform.log.info('Humidity:', ad.serviceData.humidity);
+        this.platform.debug(JSON.stringify(ad, null, '  '));
+        this.platform.device('ad:', JSON.stringify(ad));
+        this.platform.device(`Temperature: ${ad.serviceData.temperature.c}`);
+        this.platform.device(`Humidity: ${ad.serviceData.humidity}`);
         this.BLEtemperature = ad.serviceData.temperature.c;
         this.BLEHumidity = ad.serviceData.humidity;
       };
@@ -291,12 +276,8 @@ export class Meter {
         this.updateHomeKitCharacteristics();
       }
     } catch (e: any) {
-      this.platform.log.error(
-        'Meter - Failed to update status of',
-        this.device.deviceName,
-        JSON.stringify(e.message),
-        this.platform.debug(`Meter ${this.accessory.displayName} - ${JSON.stringify(e)}`),
-      );
+      this.platform.log.error(`Meter - Failed to refresh status of ${this.device.deviceName} - ${JSON.stringify(e.message)}`);
+      this.platform.debug(`Meter ${this.accessory.displayName} - ${JSON.stringify(e)}`);
       this.apiError(e);
     }
   }

package/src/devices/motion.ts

@@ -53,9 +53,7 @@ export class Motion {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac.toLowerCase());
-      }
+      this.platform.device(this.device.bleMac.toLowerCase());
     }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -124,12 +122,10 @@ export class Motion {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac!);
-      }
+      this.platform.device(this.device.bleMac!);
       switchbot.onadvertisement = (ad: any) => {
-        this.platform.log.info(JSON.stringify(ad, null, '  '));
-        this.platform.log.warn('ad:', JSON.stringify(ad));
+        this.platform.debug(JSON.stringify(ad, null, '  '));
+        this.platform.device('ad:', JSON.stringify(ad));
       };
       switchbot
         .startScan({
@@ -182,11 +178,8 @@ export class Motion {
         this.updateHomeKitCharacteristics();
       }
     } catch (e: any) {
-      this.platform.log.error(
-        'Motion - Failed to update status of',
-        this.device.deviceName,
-        JSON.stringify(e.message),
-        this.platform.debug(`Motion ${this.accessory.displayName} - ${JSON.stringify(e)}`));
+      this.platform.log.error(`Motion - Failed to refresh status of ${this.device.deviceName} - ${JSON.stringify(e.message)}`);
+      this.platform.debug(`Motion ${this.accessory.displayName} - ${JSON.stringify(e)}`);
       this.apiError(e);
     }
   }

package/src/devices/plugs.ts

@@ -51,9 +51,7 @@ export class Plug {
       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 === 'device') {
-        this.platform.debug(this.device.bleMac.toLowerCase());
-      }
+      this.platform.device(this.device.bleMac.toLowerCase());
     }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -136,19 +134,17 @@ export class Plug {
 
   async refreshStatus() {
     if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
-      this.platform.log.warn('BLE DEVICE-REFRESH');
+      this.platform.debug('Plug BLE Device RefreshStatus');
       // 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 === 'device') {
-        this.platform.debug(this.device.bleMac!);
-      }
+      this.platform.device(this.device.bleMac!);
       switchbot.onadvertisement = (ad: any) => {
-        this.platform.log.info(JSON.stringify(ad, null, '  '));
-        this.platform.log.warn('ad:', JSON.stringify(ad));
+        this.platform.debug(JSON.stringify(ad, null, '  '));
+        this.platform.device('ad:', JSON.stringify(ad));
       };
       switchbot
         .startScan({
@@ -196,15 +192,13 @@ export class Plug {
       ).data;
       if (deviceStatus.message === 'success') {
         this.deviceStatus = deviceStatus;
-        this.platform.log.warn(`Plug ${this.accessory.displayName} refreshStatus - ${JSON.stringify(this.deviceStatus)}`);
+        this.platform.device(`Plug ${this.accessory.displayName} refreshStatus - ${JSON.stringify(this.deviceStatus)}`);
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       }
     } catch (e: any) {
-      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.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.apiError(e);
     }
   }