@switchbot/homebridge-switchbot 2.0.0-beta.24 → 2.0.0-beta.26

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge SwitchBot",
   "name": "@switchbot/homebridge-switchbot",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.26",
   "description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
   "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
   "license": "ISC",

package/src/device/colorbulb.ts

@@ -771,7 +771,11 @@ export class ColorBulb {
    * Handle requests to set the value of the "Brightness" characteristic
    */
   async BrightnessSet(value: CharacteristicValue): Promise<void> {
-    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
+    }
 
     this.Brightness = value;
     this.doColorBulbUpdate.next();
@@ -781,7 +785,11 @@ export class ColorBulb {
    * Handle requests to set the value of the "ColorTemperature" characteristic
    */
   async ColorTemperatureSet(value: CharacteristicValue): Promise<void> {
-    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
+    }
 
     // Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
     const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
@@ -806,7 +814,11 @@ export class ColorBulb {
    * Handle requests to set the value of the "Hue" characteristic
    */
   async HueSet(value: CharacteristicValue): Promise<void> {
-    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+    }
 
     this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
 
@@ -818,7 +830,11 @@ export class ColorBulb {
    * Handle requests to set the value of the "Saturation" characteristic
    */
   async SaturationSet(value: CharacteristicValue): Promise<void> {
-    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+    }
 
     this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
 

package/src/device/striplight.ts

@@ -693,7 +693,11 @@ export class StripLight {
    * Handle requests to set the value of the "Brightness" characteristic
    */
   async BrightnessSet(value: CharacteristicValue): Promise<void> {
-    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
+    }
 
     this.Brightness = value;
     this.doStripLightUpdate.next();
@@ -703,7 +707,11 @@ export class StripLight {
    * Handle requests to set the value of the "ColorTemperature" characteristic
    */
   async ColorTemperatureSet(value: CharacteristicValue): Promise<void> {
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${value}`);
+    }
 
     // Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
     const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
@@ -728,9 +736,13 @@ export class StripLight {
    * Handle requests to set the value of the "Hue" characteristic
    */
   async HueSet(value: CharacteristicValue): Promise<void> {
-    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+    }
 
-    //this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+    this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
 
     this.Hue = value;
     this.doStripLightUpdate.next();
@@ -740,9 +752,13 @@ export class StripLight {
    * Handle requests to set the value of the "Saturation" characteristic
    */
   async SaturationSet(value: CharacteristicValue): Promise<void> {
-    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+    if (this.On) {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+    }
 
-    //this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+    this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
 
     this.Saturation = value;
     this.doStripLightUpdate.next();

package/src/platform.ts

@@ -88,7 +88,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       try {
         if (this.config.credentials?.openToken && !this.config.credentials.token) {
           await this.updateToken();
-        } else if (!this.config.credentials?.secret) {
+        } else if (this.config.credentials?.token && !this.config.credentials?.secret) {
           // eslint-disable-next-line no-useless-escape
           this.errorLog('\"secret\" config is not populated, you must populate then please restart Homebridge.');
         } else {
@@ -393,7 +393,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
               }*/
               const irDeviceBodyList = devicesAPI.body.infraredRemoteList;
               let irDeviceLists: any[];
-
               if (irDeviceBodyList) {
                 if (irDeviceBodyList.length > 1) {
                   irDeviceLists = irDeviceBodyList;
@@ -1763,26 +1762,28 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     device.connectionType = await this.connectionType(device);
     if (!device.hide_device && device.enableCloudService && device.connectionType === 'BLE/OpenAPI') {
       this.registeringDevice = true;
-      this.debugLog(`Device: ${device.deviceName} Both OpenAPI and BLE Connections Enabled`);
+      this.debugLog(`Device: ${device.deviceName} Both OpenAPI and BLE Connections Enabled, Connection Type: ${device.connectionType}`);
     } else if (!device.hide_device && device.deviceId && device.configDeviceType && device.configDeviceName
       && device.connectionType === 'BLE') {
       this.registeringDevice = true;
-      this.debugLog(`Device: ${device.deviceName} BLE Connection Enabled`);
+      this.debugLog(`Device: ${device.deviceName} BLE Connection Enabled, Connection Type: ${device.connectionType}`);
     } else if (!device.hide_device && device.enableCloudService && device.connectionType === 'OpenAPI') {
       this.registeringDevice = true;
-      this.debugLog(`Device: ${device.deviceName} OpenAPI Connection Enabled`);
+      this.debugLog(`Device: ${device.deviceName} OpenAPI Connection Enabled, Connection Type: ${device.connectionType}`);
     } else if (!device.hide_device && device.enableCloudService && device.connectionType === 'Disable') {
       this.registeringDevice = true;
-      this.debugLog(`Device: ${device.deviceName} Device connection Disabled, will continue to display in HomeKit`);
+      this.debugLog(`Device: ${device.deviceName} Device connection Disabled, will continue to display in HomeKit,`
+      + ` Connection Type: ${device.connectionType}`);
     } else if (!device.connectionType){
       this.registeringDevice = false;
-      this.errorLog(`Device: ${device.deviceName} Connection Type not Set, will not display in HomeKit`);
+      this.errorLog(`Device: ${device.deviceName} Connection Type not Set, will not display in HomeKit, Connection Type: ${device.connectionType}`);
     } else if (device.hide_device){
       this.registeringDevice = false;
-      this.errorLog(`Device: ${device.deviceName} Device Set to Hidden, will not display in HomeKit`);
+      this.errorLog(`Device: ${device.deviceName} Device Set to Hidden, will not display in HomeKit, hide_device: ${device.hide_device}`);
     } else {
       this.registeringDevice = false;
-      this.errorLog(`Device: ${device.deviceName} OpenAPI or BLE Are Not Enabled`);
+      this.errorLog(`Device: ${device.deviceName} OpenAPI or BLE Are Not Enabled, Connection Type: ${device.connectionType},`
+      + ` hide_device: ${device.hide_device}`);
     }
     return this.registeringDevice;
   }