@switchbot/homebridge-switchbot 3.5.0-beta.26 → 3.5.0-beta.28

package/src/device/lock.ts

@@ -44,19 +44,16 @@ export class Lock extends deviceBase {
     this.doLockUpdate = new Subject();
     this.lockUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize LockMechanism property
     this.LockMechanism = {
-      Service: accessory.addService(this.hap.Service.LockMechanism),
+      Service: accessory.getService(this.hap.Service.LockMechanism)!,
       LockTargetState: accessory.context.LockTargetState || this.hap.Characteristic.LockTargetState.SECURED,
       LockCurrentState: accessory.context.LockCurrentState || this.hap.Characteristic.LockCurrentState.SECURED,
     };
 
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
@@ -64,7 +61,7 @@ export class Lock extends deviceBase {
     // Initialize ContactSensor property
     if (!this.device.lock?.hide_contactsensor) {
       this.ContactSensor = {
-        Service: accessory.addService(this.hap.Service.ContactSensor),
+        Service: accessory.getService(this.hap.Service.ContactSensor)!,
         ContactSensorState: accessory.context.ContactSensorState || this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
       };
     }
@@ -72,11 +69,14 @@ export class Lock extends deviceBase {
     // Initialize Latch Button Service
     if (device.lock?.activate_latchbutton) {
       this.Switch = {
-        Service: accessory.addService(this.hap.Service.Switch),
+        Service: accessory.getService(this.hap.Service.Switch)!,
         On: accessory.context.On || false,
       };
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the LockMechanism service if it exists, otherwise create a new LockMechanism service
     // you can create multiple services for each accessory
     const LockMechanismService = `${accessory.displayName} ${device.deviceType}`;
@@ -325,7 +325,7 @@ export class Lock 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();

package/src/device/meter.ts

@@ -40,13 +40,10 @@ export class Meter extends deviceBase {
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Temperature Sensor property
     if (!device.meter?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: this.accessory.addService(this.hap.Service.TemperatureSensor),
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
@@ -54,18 +51,21 @@ export class Meter extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.meter?.hide_humidity) {
       this.HumiditySensor = {
-        Service: this.accessory.addService(this.hap.Service.HumiditySensor),
+        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
       };
     }
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Temperature Sensor Service
     if (device.meter?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
@@ -290,7 +290,7 @@ export class Meter 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();

package/src/device/meterplus.ts

@@ -45,13 +45,10 @@ export class MeterPlus extends deviceBase {
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Temperature Sensor property
     if (!device.meter?.hide_temperature) {
       this.TemperatureSensor = {
-        Service: this.accessory.addService(this.hap.Service.TemperatureSensor),
+        Service: accessory.getService(this.hap.Service.TemperatureSensor)!,
         CurrentTemperature: accessory.context.CurrentTemperature || 30,
       };
     }
@@ -59,18 +56,21 @@ export class MeterPlus extends deviceBase {
     // Initialize Humidity Sensor property
     if (!device.meter?.hide_humidity) {
       this.HumiditySensor = {
-        Service: this.accessory.addService(this.hap.Service.HumiditySensor),
+        Service: accessory.getService(this.hap.Service.HumiditySensor)!,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
       };
     }
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Temperature Sensor Service
     if (device.meter?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
@@ -294,7 +294,7 @@ export class MeterPlus 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();

package/src/device/motion.ts

@@ -46,15 +46,15 @@ export class Motion extends deviceBase {
     this.doMotionUpdate = new Subject();
     this.motionUbpdateInProgress = false;
 
+    // Initialize Motion Sensor property
+    this.MotionSensor = {
+      Service: accessory.getService(this.hap.Service.MotionSensor)!,
+      MotionDetected:accessory.context.MotionDetected || false,
+    };
+
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
 
-    if (this.MotionSensor.MotionDetected === undefined) {
-      this.MotionSensor.MotionDetected = false;
-    } else {
-      this.MotionSensor.MotionDetected = this.accessory.context.MotionDetected;
-    }
-
     // get the Battery service if it exists, otherwise create a new Motion service
     // you can create multiple services for each accessory
     const MotionSensorService = `${accessory.displayName} Motion Sensor`;
@@ -269,7 +269,7 @@ export class Motion 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();

package/src/device/plug.ts

@@ -29,15 +29,15 @@ export class Plug extends deviceBase {
     this.doPlugUpdate = new Subject();
     this.plugUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Outlet property
     this.Outlet = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Outlet)!,
       On: accessory.context.On || false,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the Outlet service if it exists, otherwise create a new Outlet service
     // you can create multiple services for each accessory
     const OutletService = `${accessory.displayName} ${device.deviceType}`;
@@ -199,7 +199,7 @@ export class Plug 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();

package/src/device/robotvacuumcleaner.ts

@@ -38,23 +38,23 @@ export class RobotVacuumCleaner extends deviceBase {
     this.doRobotVacuumCleanerUpdate = new Subject();
     this.robotVacuumCleanerUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Lightbulb property
     this.LightBulb = {
-      Service: this.accessory.addService(this.hap.Service.Lightbulb),
+      Service: accessory.getService(this.hap.Service.Lightbulb)!,
       On: accessory.context.On || false,
       Brightness: accessory.context.Brightness || 0,
     };
 
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.addService(this.hap.Service.Battery),
+      Service: accessory.getService(this.hap.Service.Battery)!,
       BatteryLevel: accessory.context.BatteryLevel || 100,
       StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
     // you can create multiple services for each accessory
     const LightBulbService = `${accessory.displayName} ${device.deviceType}`;
@@ -317,7 +317,7 @@ export class RobotVacuumCleaner 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();
@@ -471,7 +471,7 @@ export class RobotVacuumCleaner 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.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `request to SwitchBot API, body: ${deviceStatus} sent successfully`);

package/src/device/waterdetector.ts

@@ -46,33 +46,25 @@ export class WaterDetector extends deviceBase {
     this.doWaterDetectorUpdate = new Subject();
     this.WaterDetectorUpdateInProgress = false;
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
     // Initialize Battery property
     this.Battery = {
-      Service: this.accessory.getService(this.hap.Service.Battery) || this.accessory.addService(this.hap.Service.Battery),
-      BatteryLevel: this.accessory.context.BatteryLevel || 100,
-      StatusLowBattery: this.accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
-      ChargingState: this.accessory.context.ChargingState || this.hap.Characteristic.ChargingState.NOT_CHARGEABLE,
+      Service: accessory.getService(this.hap.Service.Battery)!,
+      BatteryLevel: accessory.context.BatteryLevel || 100,
+      StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+      ChargingState: accessory.context.ChargingState || this.hap.Characteristic.ChargingState.NOT_CHARGEABLE,
     };
 
     // Initialize Leak Sensor property
     if (!this.device.waterdetector?.hide_leak) {
       this.LeakSensor = {
-        Service: this.accessory.getService(this.hap.Service.LeakSensor) || this.accessory.addService(this.hap.Service.LeakSensor),
-        StatusActive: this.accessory.context.StatusActive || false,
-        LeakDetected: this.accessory.context.LeakDetected || this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
+        Service: accessory.getService(this.hap.Service.LeakSensor)!,
+        StatusActive: accessory.context.StatusActive || false,
+        LeakDetected: accessory.context.LeakDetected || this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
       };
     }
 
-    // set accessory information
-    accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-      .setCharacteristic(this.hap.Characteristic.Model, 'WoWaterDetector')
-      .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
 
     // Leak Sensor Service
     if (device.waterdetector?.hide_leak) {
@@ -238,7 +230,7 @@ export class WaterDetector 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();