@switchbot/homebridge-switchbot 4.1.1-beta.3 → 4.1.1-beta.4

package/src/device/device.ts

@@ -129,8 +129,8 @@ export abstract class deviceBase {
     })
   }
 
-  maxRetryBLE(): number {
-    return this.device.maxRetry ? this.device.maxRetry : 5
+  async maxRetryBLE(): Promise<number> {
+    return this.device.maxRetry !== undefined ? this.device.maxRetry : 5
   }
 
   async getDeviceScanDuration(accessory: PlatformAccessory, device: device & devicesConfig): Promise<void> {
@@ -253,7 +253,7 @@ export abstract class deviceBase {
    * @param spaceBetweenLevels number
    * @returns CurrentAmbientLightLevel
    */
-  async getLightLevel(lightLevel: number, set_minLux: number, set_maxLux: number, spaceBetweenLevels: number): Promise<number> {
+  getLightLevel(lightLevel: number, set_minLux: number, set_maxLux: number, spaceBetweenLevels: number): number {
     const numberOfLevels = spaceBetweenLevels + 1
     this.debugLog(`LightLevel: ${lightLevel}, set_minLux: ${set_minLux}, set_maxLux: ${set_maxLux}, spaceBetweenLevels: ${spaceBetweenLevels}, numberOfLevels: ${numberOfLevels}`)
     const CurrentAmbientLightLevel = lightLevel === 1

package/src/device/fan.ts

@@ -462,7 +462,7 @@ export class Fan extends deviceBase {
             .then(async (device_list: SwitchbotDevice[]) => {
               const deviceList = device_list as unknown as SwitchbotDevice[]
               return await this.retryBLE({
-                max: this.maxRetryBLE(),
+                max: await this.maxRetryBLE(),
                 fn: async () => {
                   if (this.Fan.Active) {
                     return await deviceList[0].turnOn()

package/src/device/hub.ts

@@ -194,7 +194,7 @@ export class Hub extends deviceBase {
       const set_minLux = (this.device as hubConfig).set_minLux ?? 1
       const set_maxLux = (this.device as hubConfig).set_maxLux ?? 6001
       const lightLevel = this.serviceData.lightLevel
-      this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 19)
+      this.LightSensor.CurrentAmbientLightLevel = this.getLightLevel(lightLevel, set_minLux, set_maxLux, 19)
       this.debugLog(`LightLevel: ${this.serviceData.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`)
     }
   }
@@ -220,7 +220,7 @@ export class Hub extends deviceBase {
       const set_minLux = (this.device as hubConfig).set_minLux ?? 1
       const set_maxLux = (this.device as hubConfig).set_maxLux ?? 6001
       const lightLevel = this.deviceStatus.lightLevel
-      this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 19)
+      this.LightSensor.CurrentAmbientLightLevel = this.getLightLevel(lightLevel, set_minLux, set_maxLux, 19)
       this.debugLog(`LightLevel: ${this.deviceStatus.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`)
     }
 
@@ -264,7 +264,7 @@ export class Hub extends deviceBase {
     if (!(this.device as hubConfig).hide_lightsensor && this.LightSensor?.Service) {
       const set_minLux = (this.device as hubConfig).set_minLux ?? 1
       const set_maxLux = (this.device as hubConfig).set_maxLux ?? 6001
-      this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(this.webhookContext.lightLevel, set_minLux, set_maxLux, 19)
+      this.LightSensor.CurrentAmbientLightLevel = this.getLightLevel(this.webhookContext.lightLevel, set_minLux, set_maxLux, 19)
       this.debugLog(`CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`)
     }
   }

package/src/device/lightstrip.ts

@@ -468,7 +468,7 @@ export class StripLight extends deviceBase {
               const deviceList = device_list as unknown as WoStrip[]
               this.infoLog(`On: ${this.LightBulb.On}`)
               return await this.retryBLE({
-                max: this.maxRetryBLE(),
+                max: await this.maxRetryBLE(),
                 fn: async () => {
                   if (this.LightBulb.On) {
                     return await deviceList[0].turnOn()

package/src/device/lock.ts

@@ -447,7 +447,7 @@ export class Lock extends deviceBase {
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
               return await this.retryBLE({
-                max: this.maxRetryBLE(),
+                max: await this.maxRetryBLE(),
                 fn: async () => {
                   if (this.LockMechanism.LockTargetState === this.hap.Characteristic.LockTargetState.SECURED) {
                     return await device_list[0].lock({ id: this.device.bleMac })

package/src/device/motion.ts

@@ -168,7 +168,7 @@ export class Motion extends deviceBase {
       const set_minLux = (this.device as motionConfig).set_minLux ?? 1
       const set_maxLux = (this.device as motionConfig).set_maxLux ?? 6001
       const lightLevel = this.serviceData.lightLevel === 'bright' ? set_maxLux : set_minLux
-      this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2)
+      this.LightSensor.CurrentAmbientLightLevel = this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2)
       this.debugLog(`LightLevel: ${this.serviceData.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`)
     }
 
@@ -196,7 +196,7 @@ export class Motion extends deviceBase {
       const set_minLux = (this.device as motionConfig).set_minLux ?? 1
       const set_maxLux = (this.device as motionConfig).set_maxLux ?? 6001
       const lightLevel = this.deviceStatus.brightness === 'bright' ? set_maxLux : set_minLux
-      this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2)
+      this.LightSensor.CurrentAmbientLightLevel = this.getLightLevel(lightLevel, set_minLux, set_maxLux, 2)
       this.debugLog(`LightLevel: ${this.deviceStatus.brightness}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`)
     }
     // BatteryLevel

package/src/device/plug.ts

@@ -3,7 +3,7 @@
  * plug.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
-import type { bodyChange, device, plugMiniJPServiceData, plugMiniJPWebhookContext, plugMiniStatus, plugMiniUSServiceData, plugMiniUSWebhookContext, plugStatus, plugWebhookContext, SwitchbotDevice, WoPlugMini } from 'node-switchbot'
+import type { bodyChange, device, plugMiniJPServiceData, plugMiniJPWebhookContext, plugMiniStatus, plugMiniUSServiceData, plugMiniUSWebhookContext, plugStatus, plugWebhookContext, SwitchbotDevice, WoPlugMiniUS } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
@@ -307,10 +307,10 @@ export class Plug extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
-              const deviceList = device_list as unknown as WoPlugMini[]
+              const deviceList = device_list as unknown as WoPlugMiniUS[]
               this.infoLog(`On: ${this.Outlet.On}`)
               return await this.retryBLE({
-                max: this.maxRetryBLE(),
+                max: await this.maxRetryBLE(),
                 fn: async () => {
                   if (this.Outlet.On) {
                     return await deviceList[0].turnOn()

package/src/device/robotvacuumcleaner.ts

@@ -393,7 +393,7 @@ export class RobotVacuumCleaner extends deviceBase {
               const deviceList = device_list as unknown as SwitchbotDevice[]
               this.infoLog(`On: ${this.LightBulb.On}`)
               return await this.retryBLE({
-                max: this.maxRetryBLE(),
+                max: await this.maxRetryBLE(),
                 fn: async () => {
                   if (this.LightBulb.On) {
                     return await deviceList[0].turnOn()