@switchbot/homebridge-switchbot 3.5.0-beta.27 → 3.5.0-beta.29

package/src/device/contact.ts

@@ -136,8 +136,8 @@ export class Contact extends deviceBase {
       });
 
     //regisiter webhook event handler
-    if (this.device.webhook) {
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
+    if (device.webhook) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
       this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
         try {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
@@ -280,6 +280,11 @@ export class Contact extends deviceBase {
 
     // FirmwareRevision
     this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+    this.accessory
+      .getService(this.hap.Service.AccessoryInformation)!
+      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+      .updateValue(this.accessory.context.FirmwareRevision);
   }
 
   /**
@@ -348,7 +353,7 @@ export class Contact extends deviceBase {
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-        this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+        this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
           + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
         this.openAPIparseStatus(deviceStatus);
         this.updateHomeKitCharacteristics();
@@ -454,10 +459,10 @@ export class Contact extends deviceBase {
       this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState,
         this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED);
       if (!this.device.contact?.hide_motionsensor) {
-      this.MotionSensor!.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
+        this.MotionSensor!.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
       }
       if (!this.device.contact?.hide_lightsensor) {
-      this.LightSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, 100);
+        this.LightSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, 100);
       }
     }
   }

package/src/device/curtain.ts

@@ -154,8 +154,8 @@ export class Curtain extends deviceBase {
       });
 
     //regisiter webhook event handler
-    if (this.device.webhook) {
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
+    if (device.webhook) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
       this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
         try {
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
@@ -408,20 +408,20 @@ export class Curtain extends deviceBase {
         this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.INCREASING;
         this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} INCREASING`
-        + ` PositionState: ${this.WindowCovering.PositionState}`);
+          + ` PositionState: ${this.WindowCovering.PositionState}`);
       } else if (Number(this.WindowCovering.TargetPosition) < this.WindowCovering.CurrentPosition) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.WindowCovering.CurrentPosition} `);
         this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.DECREASING;
         this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} DECREASING`
-        + ` PositionState: ${this.WindowCovering.PositionState}`);
+          + ` PositionState: ${this.WindowCovering.PositionState}`);
       } else {
         this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} Standby,`
-        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+          + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
         this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} STOPPED`
-        + ` PositionState: ${this.WindowCovering.PositionState}`);
+          + ` PositionState: ${this.WindowCovering.PositionState}`);
       }
     } else {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
@@ -447,7 +447,7 @@ export class Curtain extends deviceBase {
           this.LightSensor!.CurrentAmbientLightLevel = set_maxLux;
       }
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-      + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
+        + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
     }
 
     // BatteryLevel
@@ -465,6 +465,11 @@ export class Curtain extends deviceBase {
 
     // FirmwareRevision
     this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+    this.accessory
+      .getService(this.hap.Service.AccessoryInformation)!
+      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+      .updateValue(this.accessory.context.FirmwareRevision);
   }
 
   async refreshStatus(): Promise<void> {
@@ -530,7 +535,7 @@ export class Curtain extends deviceBase {
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-        this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+        this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
           + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
         this.openAPIparseStatus(deviceStatus);
         this.updateHomeKitCharacteristics();
@@ -704,17 +709,17 @@ export class Curtain extends deviceBase {
       this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.INCREASING;
       this.setNewTarget = true;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value},`
-      + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
     } else if (value < this.WindowCovering.CurrentPosition) {
       this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.DECREASING;
       this.setNewTarget = true;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value},`
-      + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
     } else {
       this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
       this.setNewTarget = false;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value},`
-      + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
     }
     this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.WindowCovering.PositionState);
     this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
@@ -751,7 +756,7 @@ export class Curtain extends deviceBase {
       this.accessory.context.CurrentPosition = this.WindowCovering.CurrentPosition;
       this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, Number(this.WindowCovering.CurrentPosition));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-      + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
       if (this.device.mqttURL) {
         this.mqttPublish('CurrentPosition', this.WindowCovering.CurrentPosition.toString()); // Convert to string
       }
@@ -765,7 +770,7 @@ export class Curtain extends deviceBase {
       this.accessory.context.PositionState = this.WindowCovering.PositionState;
       this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, Number(this.WindowCovering.PositionState));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-      + ` PositionState: ${this.WindowCovering.PositionState}`);
+        + ` PositionState: ${this.WindowCovering.PositionState}`);
     }
     if (this.WindowCovering.TargetPosition === undefined || Number.isNaN(this.WindowCovering.TargetPosition)) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${this.WindowCovering.TargetPosition}`);
@@ -776,7 +781,7 @@ export class Curtain extends deviceBase {
       this.accessory.context.TargetPosition = this.WindowCovering.TargetPosition;
       this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, Number(this.WindowCovering.TargetPosition));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-      + ` TargetPosition: ${this.WindowCovering.TargetPosition}`);
+        + ` TargetPosition: ${this.WindowCovering.TargetPosition}`);
     }
     if (this.WindowCovering.HoldPosition === undefined) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} HoldPosition: ${this.WindowCovering.HoldPosition}`);
@@ -787,12 +792,12 @@ export class Curtain extends deviceBase {
       this.accessory.context.HoldPosition = this.WindowCovering.HoldPosition;
       this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.HoldPosition, this.WindowCovering.HoldPosition);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-      + ` HoldPosition: ${this.WindowCovering.HoldPosition}`);
+        + ` HoldPosition: ${this.WindowCovering.HoldPosition}`);
     }
     if (!this.device.curtain?.hide_lightsensor) {
       if (this.LightSensor!.CurrentAmbientLightLevel === undefined || Number.isNaN(this.LightSensor!.CurrentAmbientLightLevel)) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-        + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
+          + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
       } else {
         if (this.device.mqttURL) {
           this.mqttPublish('CurrentAmbientLightLevel', this.LightSensor!.CurrentAmbientLightLevel.toString());
@@ -830,7 +835,7 @@ export class Curtain extends deviceBase {
       this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
       this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-      + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+        + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     }
   }
 

package/src/device/device.ts

@@ -195,13 +195,13 @@ export abstract class deviceBase {
     if (device.offline !== undefined) {
       config['offline'] = device.offline;
     }
-    if (device.maxRetry !== undefined) {
+    if (device.maxRetry !== 0 ) {
       config['maxRetry'] = device.maxRetry;
     }
-    if (device.webhook !== undefined) {
+    if (device.webhook === true) {
       config['webhook'] = device.webhook;
     }
-    if (device.connectionType !== undefined) {
+    if (device.connectionType) {
       config['connectionType'] = device.connectionType;
     }
     if (device.external !== undefined) {
@@ -479,6 +479,11 @@ export abstract class deviceBase {
         device.bleModel = SwitchBotBLEModel.Unknown;
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Model: ${device.model}, BLE Model: ${device.bleModel}`);
         break;
+      case 'Robot Vacuum Cleaner S10':
+        device.model = SwitchBotModel.RobotVacuumCleanerS10;
+        device.bleModel = SwitchBotBLEModel.Unknown;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Model: ${device.model}, BLE Model: ${device.bleModel}`);
+        break;
       case 'Ceiling Light':
         device.model = SwitchBotModel.CeilingLight;
         device.bleModel = SwitchBotBLEModel.CeilingLight;
@@ -509,6 +514,11 @@ export abstract class deviceBase {
         device.bleModel = SwitchBotBLEModel.Unknown;
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Model: ${device.model}, BLE Model: ${device.bleModel}`);
         break;
+      case 'Battery Circulator Fan':
+        device.model = SwitchBotModel.BatteryCirculatorFan;
+        device.bleModel = SwitchBotBLEModel.Unknown;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Model: ${device.model}, BLE Model: ${device.bleModel}`);
+        break;
       default:
         device.model = SwitchBotModel.Unknown;
         device.bleModel = SwitchBotBLEModel.Unknown;
@@ -599,15 +609,23 @@ export abstract class deviceBase {
   /**
    * Logging for Device
    */
+  infoLog(...log: any[]): void {
+    if (this.enablingDeviceLogging()) {
+      this.log.info(String(...log));
+    }
+  }
+
   successLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
-      this.platform.log.success(String(...log));
+      this.log.success(String(...log));
     }
   }
 
-  infoLog(...log: any[]): void {
+  debugSuccessLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
-      this.log.info(String(...log));
+      if (this.deviceLogging?.includes('debug')) {
+        this.log.success('[DEBUG]', String(...log));
+      }
     }
   }