@switchbot/homebridge-switchbot 2.0.0-beta.33 → 2.0.0-beta.35

package/src/device/curtain.ts

@@ -661,7 +661,9 @@ export class Curtain {
     }
 
     this.TargetPosition = value;
-    this.mqttPublish('TargetPosition', this.TargetPosition);
+    if (this.device.mqttURL) {
+      this.mqttPublish('TargetPosition', this.TargetPosition);
+    }
 
     await this.setMinMax();
     if (value > this.CurrentPosition) {
@@ -700,54 +702,66 @@ export class Curtain {
     if (this.CurrentPosition === undefined || Number.isNaN(this.CurrentPosition)) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
     } else {
+      if (this.device.mqttURL) {
+        this.mqttPublish('CurrentPosition', this.CurrentPosition);
+      }
       this.accessory.context.CurrentPosition = this.CurrentPosition;
       this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.CurrentPosition, Number(this.CurrentPosition));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentPosition: ${this.CurrentPosition}`);
-      this.mqttPublish('CurrentPosition', this.CurrentPosition);
     }
     if (this.PositionState === undefined) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} PositionState: ${this.PositionState}`);
     } else {
+      if (this.device.mqttURL) {
+        this.mqttPublish('PositionState', this.PositionState);
+      }
       this.accessory.context.PositionState = this.PositionState;
       this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.PositionState, Number(this.PositionState));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic PositionState: ${this.PositionState}`);
-      this.mqttPublish('PositionState', this.PositionState);
     }
     if (this.TargetPosition === undefined || Number.isNaN(this.TargetPosition)) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${this.TargetPosition}`);
     } else {
+      if (this.device.mqttURL) {
+        this.mqttPublish('TargetPosition', this.TargetPosition);
+      }
       this.accessory.context.TargetPosition = this.TargetPosition;
       this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetPosition, Number(this.TargetPosition));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
-      this.mqttPublish('TargetPosition', this.TargetPosition);
     }
     if (!this.device.curtain?.hide_lightsensor) {
       if (this.CurrentAmbientLightLevel === undefined || Number.isNaN(this.CurrentAmbientLightLevel)) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
       } else {
+        if (this.device.mqttURL) {
+          this.mqttPublish('CurrentAmbientLightLevel', this.CurrentAmbientLightLevel);
+        }
         this.accessory.context.CurrentAmbientLightLevel = this.CurrentAmbientLightLevel;
         this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
         + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
-        this.mqttPublish('CurrentAmbientLightLevel', this.CurrentAmbientLightLevel);
       }
     }
     if (this.BLE) {
       if (this.BatteryLevel === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
       } else {
+        if (this.device.mqttURL) {
+          this.mqttPublish('BatteryLevel', this.BatteryLevel);
+        }
         this.accessory.context.BatteryLevel = this.BatteryLevel;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
-        this.mqttPublish('BatteryLevel', this.BatteryLevel);
       }
       if (this.StatusLowBattery === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
       } else {
+        if (this.device.mqttURL) {
+          this.mqttPublish('StatusLowBattery', this.StatusLowBattery);
+        }
         this.accessory.context.StatusLowBattery = this.StatusLowBattery;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
-        this.mqttPublish('StatusLowBattery', this.StatusLowBattery);
       }
     }
   }
@@ -1021,6 +1035,9 @@ export class Curtain {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/device/humidifier.ts

@@ -945,6 +945,9 @@ export class Humidifier {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/device/lock.ts

@@ -536,6 +536,9 @@ export class Lock {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/device/meter.ts

@@ -377,16 +377,20 @@ export class Meter {
         this.humidityservice?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
         + ` CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
-        mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
-        entry['humidity'] = this.CurrentRelativeHumidity;
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
+          entry['humidity'] = this.CurrentRelativeHumidity;
+        }
       }
     }
     if (!this.device.meter?.hide_temperature) {
       if (this.CurrentTemperature === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
       } else {
-        mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
-        entry['temp'] = this.CurrentTemperature;
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
+          entry['temp'] = this.CurrentTemperature;
+        }
         this.accessory.context.CurrentTemperature = this.CurrentTemperature;
         this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
@@ -397,7 +401,9 @@ export class Meter {
       if (this.BatteryLevel === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
       } else {
-        mqttmessage.push(`"battery": ${this.BatteryLevel}`);
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"battery": ${this.BatteryLevel}`);
+        }
         this.accessory.context.BatteryLevel = this.BatteryLevel;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
@@ -405,16 +411,22 @@ export class Meter {
       if (this.StatusLowBattery === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
       } else {
-        mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
+        }
         this.accessory.context.StatusLowBattery = this.StatusLowBattery;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
       }
     }
-    this.mqttPublish(`{${mqttmessage.join(',')}}`);
+    if (this.device.mqttURL) {
+      this.mqttPublish(`{${mqttmessage.join(',')}}`);
+    }
     if (this.CurrentRelativeHumidity > 0) {
       // reject unreliable data
-      this.historyService?.addEntry(entry);
+      if (this.device.mqttURL) {
+        this.historyService?.addEntry(entry);
+      }
     }
   }
 
@@ -634,6 +646,9 @@ export class Meter {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/device/meterplus.ts

@@ -377,16 +377,20 @@ export class MeterPlus {
         this.humidityservice?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
         + ` updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
-        mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
-        entry['humidity'] = this.CurrentRelativeHumidity;
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
+          entry['humidity'] = this.CurrentRelativeHumidity;
+        }
       }
     }
     if (!this.device.meter?.hide_temperature) {
       if (this.CurrentTemperature === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
       } else {
-        mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
-        entry['temp'] = this.CurrentTemperature;
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
+          entry['temp'] = this.CurrentTemperature;
+        }
         this.accessory.context.CurrentTemperature = this.CurrentTemperature;
         this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
@@ -396,7 +400,9 @@ export class MeterPlus {
       if (this.BatteryLevel === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
       } else {
-        mqttmessage.push(`"battery": ${this.BatteryLevel}`);
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"battery": ${this.BatteryLevel}`);
+        }
         this.accessory.context.BatteryLevel = this.BatteryLevel;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
@@ -404,16 +410,22 @@ export class MeterPlus {
       if (this.StatusLowBattery === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
       } else {
-        mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
+        if (this.device.mqttURL) {
+          mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
+        }
         this.accessory.context.StatusLowBattery = this.StatusLowBattery;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
       }
     }
-    this.mqttPublish(`{${mqttmessage.join(',')}}`);
+    if (this.device.mqttURL) {
+      this.mqttPublish(`{${mqttmessage.join(',')}}`);
+    }
     if (this.CurrentRelativeHumidity > 0) {
       // reject unreliable data
-      this.historyService?.addEntry(entry);
+      if (this.device.mqttURL) {
+        this.historyService?.addEntry(entry);
+      }
     }
   }
 
@@ -643,6 +655,9 @@ export class MeterPlus {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/device/motion.ts

@@ -537,6 +537,9 @@ export class Motion {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/device/plug.ts

@@ -641,6 +641,9 @@ export class Plug {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/device/striplight.ts

@@ -1028,6 +1028,9 @@ export class StripLight {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }

package/src/irdevice/airconditioner.ts

@@ -641,6 +641,9 @@ export class AirConditioner {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
@@ -700,7 +703,7 @@ export class AirConditioner {
     }
   }
 
-debugErrorLog(...log: any[]): void {
+  debugErrorLog(...log: any[]): void {
     if (this.enablingDeviceLogging()) {
       if (this.deviceLogging?.includes('debug')) {
         this.platform.log.error('[DEBUG]', String(...log));

package/src/irdevice/airpurifier.ts

@@ -341,6 +341,9 @@ export class AirPurifier {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/camera.ts

@@ -230,6 +230,9 @@ export class Camera {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/fan.ts

@@ -362,6 +362,9 @@ export class Fan {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/light.ts

@@ -249,6 +249,9 @@ export class Light {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/other.ts

@@ -273,6 +273,9 @@ export class Others {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/tv.ts

@@ -464,6 +464,9 @@ export class TV {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/vacuumcleaner.ts

@@ -227,6 +227,9 @@ export class VacuumCleaner {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/waterheater.ts

@@ -230,6 +230,9 @@ export class WaterHeater {
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
     }
+    if (device.external !== undefined) {
+      config['external'] = device.external;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/platform.ts

@@ -1729,11 +1729,11 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   public async externalOrPlatform(device: device & devicesConfig, accessory: PlatformAccessory) {
-    this.debugLog(`${accessory.displayName} External Accessory Mode: ${device.external}`);
     if (device.external) {
-      this.warnLog(`${accessory.displayName} External Accessory Mode`);
+      this.debugWarnLog(`${accessory.displayName} External Accessory Mode`);
       this.externalAccessory(accessory);
     } else {
+      this.debugLog(`${accessory.displayName} External Accessory Mode: ${device.external}`);
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
     }
   }