@switchbot/homebridge-switchbot 2.9.1-beta.4 → 2.9.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge SwitchBot",
   "name": "@switchbot/homebridge-switchbot",
-  "version": "2.9.1-beta.4",
+  "version": "2.9.1",
   "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",
@@ -14,7 +14,7 @@
   },
   "engines": {
     "homebridge": "^1.6.1",
-    "node": "^16.20.2 || ^18.17.1 || ^20.5.1"
+    "node": "^18.18.2 || ^20.8.1"
   },
   "main": "dist/index.js",
   "scripts": {
@@ -57,7 +57,6 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.1.0",
     "async-mqtt": "^2.6.3",
-    "crypto-js": "^4.1.1",
     "fakegato-history": "^0.6.4",
     "homebridge-lib": "^6.6.1",
     "rxjs": "^7.8.1",
@@ -69,19 +68,15 @@
     "node-switchbot": "^1.9.0"
   },
   "devDependencies": {
-    "@types/crypto-js": "^4.1.2",
     "@types/node": "^20.8.6",
     "@typescript-eslint/eslint-plugin": "^6.7.5",
     "@typescript-eslint/parser": "^6.7.5",
     "eslint": "^8.51.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-prettier": "5.0.1",
     "homebridge": "^1.6.1",
     "nodemon": "^3.0.1",
     "npm-check-updates": "^16.14.6",
-    "prettier": "3.0.3",
     "rimraf": "^5.0.5",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   }
-}
+}

package/src/device/blindtilt.ts

@@ -118,9 +118,10 @@ export class BlindTilt {
 
     // get the WindowCovering service if it exists, otherwise create a new WindowCovering service
     // you can create multiple services for each accessory
+    const windowCoveringService = `${device.deviceName} ${device.deviceType}`;
     (this.windowCoveringService =
-      accessory.getService(this.platform.Service.WindowCovering) || accessory.addService(this.platform.Service.WindowCovering)),
-    `${device.deviceName} ${device.deviceType}`;
+      accessory.getService(this.platform.Service.WindowCovering)
+      || accessory.addService(this.platform.Service.WindowCovering)), windowCoveringService;
 
     this.windowCoveringService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
     if (!this.windowCoveringService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -178,8 +179,9 @@ export class BlindTilt {
       .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
 
     // Battery Service
-    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
-    `${accessory.displayName} Battery`;
+    const batteryService = `${accessory.displayName} Battery`;
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery)
+      || accessory.addService(this.platform.Service.Battery)), batteryService;
 
     this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
     if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -438,7 +440,7 @@ export class BlindTilt {
       this.BatteryLevel = 100;
     }
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-    + ` StatusLowBattery: ${this.StatusLowBattery}`);
+      + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
     this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;

package/src/device/bot.ts

@@ -109,8 +109,9 @@ export class Bot {
       this.removeStatefulProgrammableSwitchService(accessory);
 
       // Add switchService
-      (this.switchService = accessory.getService(this.platform.Service.Switch) || accessory.addService(this.platform.Service.Switch)),
-      `${accessory.displayName} Switch`;
+      const switchService = `${accessory.displayName} Switch`;
+      (this.switchService = accessory.getService(this.platform.Service.Switch)
+        || accessory.addService(this.platform.Service.Switch)), switchService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Switch`);
 
       this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -129,10 +130,10 @@ export class Bot {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
 
-      // Add switchService
-      (this.garageDoorService =
-        accessory.getService(this.platform.Service.GarageDoorOpener) || accessory.addService(this.platform.Service.GarageDoorOpener)),
-      `${accessory.displayName} Garage Door Opener`;
+      // Add garageDoorService
+      const garageDoorService = `${accessory.displayName} Garage Door Opener`;
+      (this.garageDoorService = accessory.getService(this.platform.Service.GarageDoorOpener)
+        || accessory.addService(this.platform.Service.GarageDoorOpener)), garageDoorService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Garage Door Opener`);
 
       this.garageDoorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -152,9 +153,10 @@ export class Bot {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
 
-      // Add switchService
-      (this.doorService = accessory.getService(this.platform.Service.Door) || accessory.addService(this.platform.Service.Door)),
-      `${accessory.displayName} Door`;
+      // Add doorService
+      const doorService = `${accessory.displayName} Door`;
+      (this.doorService = accessory.getService(this.platform.Service.Door)
+        || accessory.addService(this.platform.Service.Door)), doorService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Door`);
 
       this.doorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -182,9 +184,10 @@ export class Bot {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
 
-      // Add switchService
-      (this.windowService = accessory.getService(this.platform.Service.Window) || accessory.addService(this.platform.Service.Window)),
-      `${accessory.displayName} Window`;
+      // Add windowService
+      const windowService = `${accessory.displayName} Window`;
+      (this.windowService = accessory.getService(this.platform.Service.Window)
+        || accessory.addService(this.platform.Service.Window)), windowService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window`);
 
       this.windowService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -212,10 +215,10 @@ export class Bot {
       this.removeGarageDoorService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
 
-      // Add switchService
-      (this.windowCoveringService =
-        accessory.getService(this.platform.Service.WindowCovering) || accessory.addService(this.platform.Service.WindowCovering)),
-      `${accessory.displayName} Window Covering`;
+      // Add windowCoveringService
+      const windowCoveringService = `${accessory.displayName} Window Covering`;
+      (this.windowCoveringService = accessory.getService(this.platform.Service.WindowCovering)
+        || accessory.addService(this.platform.Service.WindowCovering)), windowCoveringService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window Covering`);
 
       this.windowCoveringService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -243,9 +246,10 @@ export class Bot {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
 
-      // Add switchService
-      (this.lockService = accessory.getService(this.platform.Service.LockMechanism) || accessory.addService(this.platform.Service.LockMechanism)),
-      `${accessory.displayName} Lock`;
+      // Add lockService
+      const lockService = `${accessory.displayName} Lock`;
+      (this.lockService = accessory.getService(this.platform.Service.LockMechanism)
+        || accessory.addService(this.platform.Service.LockMechanism)), lockService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Lock`);
 
       this.lockService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -264,9 +268,10 @@ export class Bot {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
 
-      // Add switchService
-      (this.faucetService = accessory.getService(this.platform.Service.Faucet) || accessory.addService(this.platform.Service.Faucet)),
-      `${accessory.displayName} Faucet`;
+      // Add faucetService
+      const faucetService = `${accessory.displayName} Faucet`;
+      (this.faucetService = accessory.getService(this.platform.Service.Faucet)
+        || accessory.addService(this.platform.Service.Faucet)), faucetService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Faucet`);
 
       this.faucetService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -285,9 +290,10 @@ export class Bot {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
 
-      // Add switchService
-      (this.fanService = accessory.getService(this.platform.Service.Fan) || accessory.addService(this.platform.Service.Fan)),
-      `${accessory.displayName} Fan`;
+      // Add fanService
+      const fanService = `${accessory.displayName} Fan`;
+      (this.fanService = accessory.getService(this.platform.Service.Fan)
+        || accessory.addService(this.platform.Service.Fan)), fanService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Fan`);
 
       this.fanService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -306,11 +312,10 @@ export class Bot {
       this.removeGarageDoorService(accessory);
       this.removeWindowCoveringService(accessory);
 
-      // Add switchService
-      (this.statefulProgrammableSwitchService =
-        accessory.getService(this.platform.Service.StatefulProgrammableSwitch) ||
-        accessory.addService(this.platform.Service.StatefulProgrammableSwitch)),
-      `${accessory.displayName} Stateful Programmable Switch`;
+      // Add statefulProgrammableSwitchService
+      const statefulProgrammableSwitchService = `${accessory.displayName} Stateful Programmable Switch`;
+      (this.statefulProgrammableSwitchService = accessory.getService(this.platform.Service.StatefulProgrammableSwitch) ||
+        accessory.addService(this.platform.Service.StatefulProgrammableSwitch)), statefulProgrammableSwitchService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
 
       this.statefulProgrammableSwitchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -332,8 +337,9 @@ export class Bot {
       this.removeStatefulProgrammableSwitchService(accessory);
 
       // Add outletService
-      (this.outletService = accessory.getService(this.platform.Service.Outlet) || accessory.addService(this.platform.Service.Outlet)),
-      `${accessory.displayName} Outlet`;
+      const outletService = `${accessory.displayName} Outlet`;
+      (this.outletService = accessory.getService(this.platform.Service.Outlet)
+        || accessory.addService(this.platform.Service.Outlet)), outletService;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Outlet`);
 
       this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
@@ -343,9 +349,10 @@ export class Bot {
       this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
     }
 
-    // Battery Service
-    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
-    `${accessory.displayName} Battery`;
+    // batteryService
+    const batteryService = `${accessory.displayName} Battery`;
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery)
+      || accessory.addService(this.platform.Service.Battery)), batteryService;
 
     this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
     if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -437,7 +444,7 @@ export class Bot {
       this.BatteryLevel = 100;
     }
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-    + ` StatusLowBattery: ${this.StatusLowBattery}`);
+      + ` StatusLowBattery: ${this.StatusLowBattery}`);
   }
 
   async openAPIparseStatus(): Promise<void> {
@@ -464,7 +471,7 @@ export class Bot {
       this.BatteryLevel = 100;
     }
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-    + ` StatusLowBattery: ${this.StatusLowBattery}`);
+      + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
     this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;

package/src/device/ceilinglight.ts

@@ -91,8 +91,9 @@ export class CeilingLight {
 
     // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
     // you can create multiple services for each accessory
-    (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
-    `${accessory.displayName} ${device.deviceType}`;
+    const lightBulbService = `${accessory.displayName} ${device.deviceType}`;
+    (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb)
+      || accessory.addService(this.platform.Service.Lightbulb)), lightBulbService;
 
     if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
       this.accessory.removeService(this.lightBulbService);
@@ -310,8 +311,8 @@ export class CeilingLight {
   async refreshStatus(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
-    /*} else if (this.BLE) {
-      await this.BLERefreshStatus();*/
+      /*} else if (this.BLE) {
+        await this.BLERefreshStatus();*/
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
@@ -441,8 +442,8 @@ export class CeilingLight {
   async pushChanges(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
-    /*} else if (this.BLE) {
-      await this.BLEpushChanges();*/
+      /*} else if (this.BLE) {
+        await this.BLEpushChanges();*/
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {

package/src/device/colorbulb.ts

@@ -97,8 +97,9 @@ export class ColorBulb {
 
     // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
     // you can create multiple services for each accessory
-    (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
-    `${accessory.displayName} ${device.deviceType}`;
+    const lightBulbService = `${accessory.displayName} ${device.deviceType}`;
+    (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb)
+      || accessory.addService(this.platform.Service.Lightbulb)), lightBulbService;
 
     if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
       this.accessory.removeService(this.lightBulbService);
@@ -468,8 +469,8 @@ export class ColorBulb {
   async pushChanges(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
-    /*} else if (this.BLE) {
-      await this.BLEpushChanges();*/
+      /*} else if (this.BLE) {
+        await this.BLEpushChanges();*/
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {

package/src/device/contact.ts

@@ -87,9 +87,9 @@ export class Contact {
 
     // get the Contact service if it exists, otherwise create a new Contact service
     // you can create multiple services for each accessory
-    (this.contactSensorservice =
-      accessory.getService(this.platform.Service.ContactSensor) || accessory.addService(this.platform.Service.ContactSensor)),
-    `${accessory.displayName} Contact Sensor`;
+    const contactSensorservice = `${accessory.displayName} Contact Sensor`;
+    (this.contactSensorservice = accessory.getService(this.platform.Service.ContactSensor)
+      || accessory.addService(this.platform.Service.ContactSensor)), contactSensorservice;
 
     this.contactSensorservice.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
     if (!this.contactSensorservice.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -103,9 +103,9 @@ export class Contact {
       accessory.removeService(this.motionService!);
     } else if (!this.motionService) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Motion Sensor Service`);
-      (this.motionService =
-        this.accessory.getService(this.platform.Service.MotionSensor) || this.accessory.addService(this.platform.Service.MotionSensor)),
-      `${accessory.displayName} Motion Sensor`;
+      const motionService = `${accessory.displayName} Motion Sensor`;
+      (this.motionService = this.accessory.getService(this.platform.Service.MotionSensor)
+        || this.accessory.addService(this.platform.Service.MotionSensor)), motionService;
 
       this.motionService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Motion Sensor`);
       this.motionService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Motion Sensor`);
@@ -120,9 +120,10 @@ export class Contact {
       accessory.removeService(this.lightSensorService!);
     } else if (!this.lightSensorService) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Light Sensor Service`);
-      (this.lightSensorService =
-        this.accessory.getService(this.platform.Service.LightSensor) || this.accessory.addService(this.platform.Service.LightSensor)),
-      `${accessory.displayName} Light Sensor`;
+
+      const lightSensorService = `${accessory.displayName} Light Sensor`;
+      (this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor)
+        || this.accessory.addService(this.platform.Service.LightSensor)), lightSensorService;
 
       this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
       this.lightSensorService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Light Sensor`);
@@ -131,8 +132,9 @@ export class Contact {
     }
 
     // Battery Service
-    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
-    `${accessory.displayName} Battery`;
+    const batteryService = `${accessory.displayName} Battery`;
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery)
+      || accessory.addService(this.platform.Service.Battery)), batteryService;
 
     this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
     if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {

package/src/device/curtain.ts

@@ -106,9 +106,9 @@ export class Curtain {
 
     // get the WindowCovering service if it exists, otherwise create a new WindowCovering service
     // you can create multiple services for each accessory
-    (this.windowCoveringService =
-      accessory.getService(this.platform.Service.WindowCovering) || accessory.addService(this.platform.Service.WindowCovering)),
-    `${device.deviceName} ${device.deviceType}`;
+    const windowCoveringService = `${accessory.displayName} ${device.deviceType}`;
+    (this.windowCoveringService = accessory.getService(this.platform.Service.WindowCovering)
+      || accessory.addService(this.platform.Service.WindowCovering)), windowCoveringService;
 
     this.windowCoveringService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
     if (!this.windowCoveringService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -150,9 +150,9 @@ export class Curtain {
       accessory.removeService(this.lightSensorService!);
     } else if (!this.lightSensorService) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Light Sensor Service`);
-      (this.lightSensorService =
-        this.accessory.getService(this.platform.Service.LightSensor) || this.accessory.addService(this.platform.Service.LightSensor)),
-      `${accessory.displayName} Light Sensor`;
+      const lightSensorService = `${accessory.displayName} Light Sensor`;
+      (this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor)
+        || this.accessory.addService(this.platform.Service.LightSensor)), lightSensorService;
 
       this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
       if (!this.lightSensorService?.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -163,8 +163,9 @@ export class Curtain {
     }
 
     // Battery Service
-    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
-    `${accessory.displayName} Battery`;
+    const batteryService = `${accessory.displayName} Battery`;
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery)
+      || accessory.addService(this.platform.Service.Battery)), batteryService;
 
     this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
     if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -465,7 +466,7 @@ export class Curtain {
       this.BatteryLevel = 100;
     }
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-    + ` StatusLowBattery: ${this.StatusLowBattery}`);
+      + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
     this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;

package/src/device/hub.ts

@@ -81,9 +81,9 @@ export class Hub {
       accessory.removeService(this.temperatureService!);
     } else if (!this.temperatureService) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
-      (this.temperatureService =
-        this.accessory.getService(this.platform.Service.TemperatureSensor) || this.accessory.addService(this.platform.Service.TemperatureSensor)),
-      `${accessory.displayName} Temperature Sensor`;
+      const temperatureService = `${accessory.displayName} Temperature Sensor`;
+      (this.temperatureService = this.accessory.getService(this.platform.Service.TemperatureSensor)
+        || this.accessory.addService(this.platform.Service.TemperatureSensor)), temperatureService;
 
       this.temperatureService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
       if (!this.temperatureService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -112,9 +112,9 @@ export class Hub {
       accessory.removeService(this.humidityService!);
     } else if (!this.humidityService) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
-      (this.humidityService =
-        this.accessory.getService(this.platform.Service.HumiditySensor) || this.accessory.addService(this.platform.Service.HumiditySensor)),
-      `${accessory.displayName} Humidity Sensor`;
+      const humidityService = `${accessory.displayName} Humidity Sensor`;
+      (this.humidityService = this.accessory.getService(this.platform.Service.HumiditySensor)
+        || this.accessory.addService(this.platform.Service.HumiditySensor)), humidityService;
 
       this.humidityService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
       if (!this.humidityService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -139,9 +139,9 @@ export class Hub {
       accessory.removeService(this.lightSensorService!);
     } else if (!this.lightSensorService) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Light Sensor Service`);
-      (this.lightSensorService =
-        this.accessory.getService(this.platform.Service.LightSensor) || this.accessory.addService(this.platform.Service.LightSensor)),
-      `${accessory.displayName} Light Sensor`;
+      const lightSensorService = `${accessory.displayName} Light Sensor`;
+      (this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor)
+        || this.accessory.addService(this.platform.Service.LightSensor)), lightSensorService;
 
       this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
       this.lightSensorService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Light Sensor`);

package/src/device/humidifier.ts

@@ -84,9 +84,9 @@ export class Humidifier {
 
     // get the service if it exists, otherwise create a new service
     // you can create multiple services for each accessory
-    (this.humidifierService =
-      accessory.getService(this.platform.Service.HumidifierDehumidifier) || accessory.addService(this.platform.Service.HumidifierDehumidifier)),
-    `${accessory.displayName} Humidifier`;
+    const humidifierService = `${accessory.displayName} Humidifier`;
+    (this.humidifierService = accessory.getService(this.platform.Service.HumidifierDehumidifier)
+      || accessory.addService(this.platform.Service.HumidifierDehumidifier)), humidifierService;
 
     this.humidifierService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
     if (!this.humidifierService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -131,9 +131,9 @@ export class Humidifier {
       accessory.removeService(this.temperatureservice!);
     } else if (!this.temperatureservice && !this.BLE) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
-      (this.temperatureservice =
-        this.accessory.getService(this.platform.Service.TemperatureSensor) || this.accessory.addService(this.platform.Service.TemperatureSensor)),
-      `${accessory.displayName} Temperature Sensor`;
+      const temperatureservice = `${accessory.displayName} Temperature Sensor`;
+      (this.temperatureservice = this.accessory.getService(this.platform.Service.TemperatureSensor)
+        || this.accessory.addService(this.platform.Service.TemperatureSensor)), temperatureservice;
 
       this.temperatureservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
       if (!this.temperatureservice.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -408,8 +408,8 @@ export class Humidifier {
   async pushChanges(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
-    /*} else if (this.BLE) {
-      await this.BLEpushChanges();*/
+      /*} else if (this.BLE) {
+        await this.BLEpushChanges();*/
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {

package/src/device/iosensor.ts

@@ -98,9 +98,9 @@ export class IOSensor {
       accessory.removeService(this.temperatureservice!);
     } else if (!this.temperatureservice) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
-      (this.temperatureservice =
-        this.accessory.getService(this.platform.Service.TemperatureSensor) || this.accessory.addService(this.platform.Service.TemperatureSensor)),
-      `${accessory.displayName} Temperature Sensor`;
+      const temperatureservice = `${accessory.displayName} Temperature Sensor`;
+      (this.temperatureservice = this.accessory.getService(this.platform.Service.TemperatureSensor)
+      || this.accessory.addService(this.platform.Service.TemperatureSensor)), temperatureservice;
 
       this.temperatureservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
       if (!this.temperatureservice.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -129,9 +129,9 @@ export class IOSensor {
       accessory.removeService(this.humidityservice!);
     } else if (!this.humidityservice) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
-      (this.humidityservice =
-        this.accessory.getService(this.platform.Service.HumiditySensor) || this.accessory.addService(this.platform.Service.HumiditySensor)),
-      `${accessory.displayName} Humidity Sensor`;
+      const humidityservice = `${accessory.displayName} Humidity Sensor`;
+      (this.humidityservice = this.accessory.getService(this.platform.Service.HumiditySensor)
+      || this.accessory.addService(this.platform.Service.HumiditySensor)), humidityservice;
 
       this.humidityservice.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
       if (!this.humidityservice.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -150,8 +150,9 @@ export class IOSensor {
     }
 
     // Battery Service
-    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
-    `${accessory.displayName} Battery`;
+    const batteryService = `${accessory.displayName} Battery`;
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery)
+    || accessory.addService(this.platform.Service.Battery)), batteryService;
 
     this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
     if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -248,7 +249,7 @@ export class IOSensor {
       this.BatteryLevel = 100;
     }
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-    + ` StatusLowBattery: ${this.StatusLowBattery}`);
+      + ` StatusLowBattery: ${this.StatusLowBattery}`);
 
     // FirmwareRevision
     this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;

package/src/device/lightstrip.ts

@@ -89,8 +89,9 @@ export class StripLight {
 
     // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
     // you can create multiple services for each accessory
-    (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
-    `${accessory.displayName} ${device.deviceType}`;
+    const lightBulbService = `${accessory.displayName} ${device.deviceType}`;
+    (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb)
+      || accessory.addService(this.platform.Service.Lightbulb)), lightBulbService;
 
     if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
       this.accessory.removeService(this.lightBulbService);
@@ -406,8 +407,8 @@ export class StripLight {
   async pushChanges(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
-    /* }else if (this.BLE) {
-      await this.BLEpushChanges();*/
+      /* }else if (this.BLE) {
+        await this.BLEpushChanges();*/
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {

package/src/device/lock.ts

@@ -77,8 +77,9 @@ export class Lock {
 
     // get the LockMechanism service if it exists, otherwise create a new LockMechanism service
     // you can create multiple services for each accessory
-    (this.lockService = accessory.getService(this.platform.Service.LockMechanism) || accessory.addService(this.platform.Service.LockMechanism)),
-    `${device.deviceName} ${device.deviceType}`;
+    const lockService = `${accessory.displayName} ${device.deviceType}`;
+    (this.lockService = accessory.getService(this.platform.Service.LockMechanism)
+      || accessory.addService(this.platform.Service.LockMechanism)), lockService;
 
     this.lockService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
     if (!this.lockService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -98,9 +99,9 @@ export class Lock {
       accessory.removeService(this.contactSensorService!);
     } else if (!this.contactSensorService) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Contact Sensor Service`);
-      (this.contactSensorService =
-        this.accessory.getService(this.platform.Service.ContactSensor) || this.accessory.addService(this.platform.Service.ContactSensor)),
-      `${accessory.displayName} Contact Sensor`;
+      const contactSensorService = `${accessory.displayName} Contact Sensor`;
+      (this.contactSensorService = this.accessory.getService(this.platform.Service.ContactSensor)
+        || this.accessory.addService(this.platform.Service.ContactSensor)), contactSensorService;
 
       this.contactSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Contact Sensor`);
       if (!this.contactSensorService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -111,8 +112,9 @@ export class Lock {
     }
 
     // Battery Service
-    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
-    `${accessory.displayName} Battery`;
+    const batteryService = `${accessory.displayName} Battery`;
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery)
+      || accessory.addService(this.platform.Service.Battery)), batteryService;
 
     this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
     if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
@@ -159,8 +161,8 @@ export class Lock {
   async parseStatus(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
-    /* } else if (this.BLE) {
-      await this.BLEparseStatus();*/
+      /* } else if (this.BLE) {
+        await this.BLEparseStatus();*/
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
     } else {
@@ -367,8 +369,8 @@ export class Lock {
   async pushChanges(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
-    /*} else if (this.BLE) {
-      await this.BLEpushChanges();*/
+      /*} else if (this.BLE) {
+        await this.BLEpushChanges();*/
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();
     } else {