@switchbot/homebridge-switchbot 5.0.0-beta.42 → 5.0.0-beta.44

package/src/devices-hap/lock.ts

@@ -332,7 +332,7 @@ export class Lock extends deviceBase {
         if ((serviceData.model === SwitchBotBLEModel.Lock || SwitchBotBLEModel.LockPro)
           && (serviceData.modelName === SwitchBotBLEModelName.Lock || SwitchBotBLEModelName.LockPro)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -358,7 +358,7 @@ export class Lock extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: lockServiceData | lockProServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -403,7 +403,7 @@ export class Lock extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: lockWebhookContext | lockProWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()
@@ -455,13 +455,20 @@ export class Lock extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              const deviceList = device_list as WoSmartLock[]
+              this.infoLog(`LockTargetState: ${this.LockMechanism.LockTargetState}`)
+              this.warnLog(`device_list: ${JSON.stringify(device_list)}`)
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.LockMechanism.LockTargetState === this.hap.Characteristic.LockTargetState.SECURED) {
-                    return await (device_list[0] as WoSmartLock).lock()
+                  if (deviceList && Array.isArray(deviceList) && deviceList.length > 0) {
+                    if (this.LockMechanism.LockTargetState === this.hap.Characteristic.LockTargetState.SECURED) {
+                      return await deviceList[0].lock()
+                    } else {
+                      return await deviceList[0].unlock()
+                    }
                   } else {
-                    return await (device_list[0] as WoSmartLock).unlock()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })

package/src/devices-hap/meter.ts

@@ -209,8 +209,9 @@ export class Meter extends deviceBase {
 
     // CurrentTemperature
     if (!(this.device as meterConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      this.TemperatureSensor.CurrentTemperature = this.deviceStatus.temperature
-      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      // OpenAPI returns Celsius; convert if user configured a different unit
+      this.TemperatureSensor.CurrentTemperature = convertUnits(this.deviceStatus.temperature, 'CELSIUS', (this.device as meterConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // BatteryLevel
@@ -287,7 +288,7 @@ export class Meter extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Meter && serviceData.modelName === SwitchBotBLEModelName.Meter) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -313,7 +314,7 @@ export class Meter extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: meterServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -358,7 +359,7 @@ export class Meter extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/meterplus.ts

@@ -213,8 +213,9 @@ export class MeterPlus extends deviceBase {
 
     // CurrentTemperature
     if (!(this.device as meterConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      this.TemperatureSensor.CurrentTemperature = this.deviceStatus.temperature
-      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      // OpenAPI returns Celsius; convert if user configured a different unit
+      this.TemperatureSensor.CurrentTemperature = convertUnits(this.deviceStatus.temperature, 'CELSIUS', (this.device as meterConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // BatteryLevel
@@ -291,7 +292,7 @@ export class MeterPlus extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.MeterPlus && serviceData.modelName === SwitchBotBLEModelName.MeterPlus) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -317,7 +318,7 @@ export class MeterPlus extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: meterPlusServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -362,7 +363,7 @@ export class MeterPlus extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterPlusWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/meterpro.ts

@@ -263,8 +263,9 @@ export class MeterPro extends deviceBase {
 
     // CurrentTemperature
     if (!(this.device as meterProConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      this.TemperatureSensor.CurrentTemperature = this.deviceStatus.temperature
-      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      // OpenAPI returns Celsius; convert if user configured a different unit
+      this.TemperatureSensor.CurrentTemperature = convertUnits(this.deviceStatus.temperature as number, 'CELSIUS', (this.device as meterProConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // Carbon Dioxide Sensor
@@ -367,7 +368,7 @@ export class MeterPro extends deviceBase {
         if ((serviceData.model === SwitchBotBLEModel.MeterPro && serviceData.modelName === SwitchBotBLEModelName.MeterPro)
           || (serviceData.model === SwitchBotBLEModel.MeterProCO2 && serviceData.modelName === SwitchBotBLEModelName.MeterProCO2)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -393,7 +394,7 @@ export class MeterPro extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: meterProServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -428,7 +429,7 @@ export class MeterPro extends deviceBase {
       }
     } catch (e: any) {
       await this.apiError(e)
-      this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+      this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error: ${e.message ?? e}`)
     }
   }
 
@@ -438,7 +439,7 @@ export class MeterPro extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterProWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/motion.ts

@@ -262,7 +262,7 @@ export class Motion extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.MotionSensor && serviceData.modelName === SwitchBotBLEModelName.MotionSensor) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -288,7 +288,7 @@ export class Motion extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: motionSensorServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -333,7 +333,7 @@ export class Motion extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: motionSensorWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/plug.ts

@@ -187,7 +187,7 @@ export class Plug extends deviceBase {
         if ((serviceData.model === SwitchBotBLEModel.PlugMiniUS || SwitchBotBLEModel.PlugMiniJP)
           && serviceData.modelName === (SwitchBotBLEModelName.PlugMini || SwitchBotBLEModelName.PlugMini)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -213,7 +213,7 @@ export class Plug extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: plugMiniUSServiceData | plugMiniJPServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -258,7 +258,7 @@ export class Plug extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: plugWebhookContext | plugMiniUSWebhookContext | plugMiniJPWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()
@@ -320,10 +320,14 @@ export class Plug extends deviceBase {
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.Outlet.On) {
-                    return await deviceList[0].turnOn()
+                  if (deviceList.length > 0) {
+                    if (this.Outlet.On) {
+                      return await deviceList[0].turnOn()
+                    } else {
+                      return await deviceList[0].turnOff()
+                    }
                   } else {
-                    return await deviceList[0].turnOff()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })

package/src/devices-hap/relayswitch.ts

@@ -315,7 +315,7 @@ export class RelaySwitch extends deviceBase {
         // Update HomeKit
         if ((serviceData.model === SwitchBotBLEModel.RelaySwitch1PM && serviceData.modelName === SwitchBotBLEModelName.RelaySwitch1PM) ?? (serviceData.model === SwitchBotBLEModel.RelaySwitch1 && serviceData.modelName === SwitchBotBLEModelName.RelaySwitch1)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -341,7 +341,7 @@ export class RelaySwitch extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: relaySwitch1ServiceData | relaySwitch1PMServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -386,7 +386,7 @@ export class RelaySwitch extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: relaySwitch1Context | relaySwitch1PMContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/robotvacuumcleaner.ts

@@ -275,7 +275,7 @@ export class RobotVacuumCleaner extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Unknown && serviceData.modelName === SwitchBotBLEModelName.Unknown) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -301,7 +301,7 @@ export class RobotVacuumCleaner extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: robotVacuumCleanerServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -346,7 +346,7 @@ export class RobotVacuumCleaner extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: robotVacuumCleanerS1WebhookContext | robotVacuumCleanerS1PlusWebhookContext | floorCleaningRobotS10WebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()
@@ -400,14 +400,20 @@ export class RobotVacuumCleaner extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              const deviceList = device_list as any[]
               this.infoLog(`On: ${this.LightBulb.On}`)
+              this.warnLog(`device_list: ${JSON.stringify(device_list)}`)
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.LightBulb.On) {
-                    return await (device_list[0] as any).turnOn()
+                  if (deviceList && Array.isArray(deviceList) && deviceList.length > 0) {
+                    if (this.LightBulb.On) {
+                      return await (deviceList[0] as any).turnOn()
+                    } else {
+                      return await (deviceList[0] as any).turnOff()
+                    }
                   } else {
-                    return await (device_list[0] as any).turnOff()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })

package/src/devices-hap/waterdetector.ts

@@ -269,7 +269,7 @@ export class WaterDetector extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Leak && serviceData.modelName === SwitchBotBLEModelName.Leak) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -295,7 +295,7 @@ export class WaterDetector extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: waterLeakDetectorServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -340,7 +340,7 @@ export class WaterDetector extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: waterLeakDetectorWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/homebridge-ui/public/index.html

@@ -43,7 +43,7 @@
     </form>
     <table class="table w-100" id="deviceTable" style="display: none">
       <thead>
-        <tr class="table-active">
+        <tr>
           <th scope="col" style="width: 40%">Device Name</th>
           <th scope="col" style="width: 60%" id="displayName"></th>
         </tr>
@@ -69,6 +69,18 @@
           <th scope="row">Connection Type</th>
           <td id="connectionType"></td>
         </tr>
+        <tr>
+          <th scope="row">Refresh Rate</th>
+          <td id="refreshRate"></td>
+        </tr>
+        <tr>
+          <th scope="row">Update Rate</th>
+          <td id="updateRate"></td>
+        </tr>
+        <tr>
+          <th scope="row">Push Rate</th>
+          <td id="pushRate"></td>
+        </tr>
       </tbody>
     </table>
     <p class="text-center">External accessories will not be displayed here.</p>

package/src/platform-hap.ts

@@ -243,6 +243,7 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
           dailyLimit: dailyApiLimit,
           reserveForCommands: dailyApiReserveForCommands,
           pausePollingAtReserve: webhookOnlyOnReserve,
+          resetAtLocalMidnight: this.config.options?.dailyApiResetAtLocalMidnight ?? false,
         })
         this.apiTracker.startHourlyLogging()
       } catch (e: any) {
@@ -506,8 +507,12 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
         const { response, statusCode } = await this.switchBotAPI.getDevices()
         this.debugLog(`response: ${JSON.stringify(response)}`)
         if (this.isSuccessfulResponse(statusCode)) {
-          await this.handleDevices(Array.isArray(response.body.deviceList) ? response.body.deviceList : [])
-          await this.handleIRDevices(Array.isArray(response.body.infraredRemoteList) ? response.body.infraredRemoteList : [])
+          const deviceList = Array.isArray(response.body.deviceList) ? response.body.deviceList : []
+          const irDeviceList = Array.isArray(response.body.infraredRemoteList) ? response.body.infraredRemoteList : []
+          await this.handleDevices(deviceList)
+          await this.handleIRDevices(irDeviceList)
+          // Diagnostic: warn users if their device count + refresh rate may exceed daily limits
+          this.validateApiUsageConfig(deviceList.length, irDeviceList.length)
           break
         } else {
           // Check if rate limit exceeded (429)
@@ -601,6 +606,7 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
           'Plug Mini (JP)': Plug,
           'Smart Lock': Lock,
           'Smart Lock Pro': Lock,
+          'Smart Lock Ultra': Lock,
           'Color Bulb': ColorBulb,
           'K10+': RobotVacuumCleaner,
           'K10+ Pro': RobotVacuumCleaner,
@@ -723,12 +729,29 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
       const allowConfigOnly = Boolean(this.config.options?.allowConfigOnlyDevices)
       const devices = mergeByDeviceId(this.config.options.devices ?? [], devicesWithTemplates ?? [], allowConfigOnly)
 
+      // Apply global webhook option to devices that don't have their own webhook setting
+      if (this.config.options?.webhook === true) {
+        for (const device of devices) {
+          if (device.webhook === undefined) {
+            device.webhook = true
+            this.debugLog(`Applying global webhook option to device: ${device.deviceName ?? device.deviceId}`)
+          }
+        }
+      }
+
       this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`)
 
       for (const device of devices) {
         if (device.configDeviceName) {
           device.deviceName = device.configDeviceName
         }
+        // Log effective webhook setting for diagnostics
+        try {
+          const effectiveWebhook = device.webhook !== undefined ? device.webhook : (this.config.options?.webhook === true ? true : undefined)
+          this.debugLog(`Effective webhook for device ${device.deviceName ?? device.deviceId}: ${String(effectiveWebhook)}`)
+        } catch (e: any) {
+          this.debugLog(`Failed logging effective webhook for ${device.deviceName ?? device.deviceId}: ${e?.message ?? e}`)
+        }
         await this.createDevice(device)
       }
     }
@@ -768,11 +791,28 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
       const allowConfigOnly = Boolean(this.config.options?.allowConfigOnlyDevices)
       const devices = mergeByDeviceId(this.config.options.irdevices ?? [], devicesWithTemplates ?? [], allowConfigOnly)
 
+      // Apply global webhook option to IR devices that don't have their own webhook setting
+      if (this.config.options?.webhook === true) {
+        for (const device of devices) {
+          if (device.webhook === undefined) {
+            device.webhook = true
+            this.debugLog(`Applying global webhook option to IR device: ${device.deviceName ?? device.deviceId}`)
+          }
+        }
+      }
+
       this.debugLog(`IR Devices: ${JSON.stringify(devices)}`)
       for (const device of devices) {
         if (device.configDeviceName) {
           device.deviceName = device.configDeviceName
         }
+        // Log effective webhook setting for diagnostics (IR devices)
+        try {
+          const effectiveWebhook = device.webhook !== undefined ? device.webhook : (this.config.options?.webhook === true ? true : undefined)
+          this.debugLog(`Effective webhook for IR device ${device.deviceName ?? device.deviceId}: ${String(effectiveWebhook)}`)
+        } catch (e: any) {
+          this.debugLog(`Failed logging effective webhook for IR ${device.deviceName ?? device.deviceId}: ${e?.message ?? e}`)
+        }
         await this.createIRDevice(device)
       }
     }
@@ -814,6 +854,7 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
       'Plug Mini (JP)': this.createPlug.bind(this),
       'Smart Lock': this.createLock.bind(this),
       'Smart Lock Pro': this.createLock.bind(this),
+      'Smart Lock Ultra': this.createLock.bind(this),
       'Color Bulb': this.createColorBulb.bind(this),
       'K10+': this.createRobotVacuumCleaner.bind(this),
       'K10+ Pro': this.createRobotVacuumCleaner.bind(this),
@@ -1809,7 +1850,7 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.device = device
         existingAccessory.context.deviceId = device.deviceId
         existingAccessory.context.deviceType = device.deviceType
-        existingAccessory.context.model = device.deviceType === 'Smart Lock Pro' ? SwitchBotModel.LockPro : SwitchBotModel.Lock
+        existingAccessory.context.model = (device.deviceType === 'Smart Lock Pro' || device.deviceType === 'Smart Lock Ultra') ? SwitchBotModel.LockPro : SwitchBotModel.Lock
         existingAccessory.displayName = device.configDeviceName
           ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
           : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName)
@@ -1835,7 +1876,7 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
       accessory.context.device = device
       accessory.context.deviceId = device.deviceId
       accessory.context.deviceType = device.deviceType
-      accessory.context.model = device.deviceType === 'Smart Lock Pro' ? SwitchBotModel.LockPro : SwitchBotModel.Lock
+      accessory.context.model = (device.deviceType === 'Smart Lock Pro' || device.deviceType === 'Smart Lock Ultra') ? SwitchBotModel.LockPro : SwitchBotModel.Lock
       accessory.displayName = device.configDeviceName
         ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
         : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName)
@@ -2912,23 +2953,26 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
   }
 
   async retryRequest(device: (device & devicesConfig) | (irdevice & irDevicesConfig), deviceMaxRetries: number, deviceDelayBetweenRetries: number): Promise<{ response: any, statusCode: deviceStatusRequest['statusCode'] }> {
+    // Check API budget BEFORE attempting any retries - don't waste cycles on blocked requests
+    if (!this.apiTracker?.trySpend('poll')) {
+      // Don't log on every blocked request - the ApiRequestTracker handles periodic warnings
+      return {
+        response: {
+          deviceId: '',
+          deviceType: '',
+          hubDeviceId: '',
+          version: 0,
+          deviceName: '',
+        },
+        statusCode: 429,
+      }
+    }
+
     let retryCount = 0
     const maxRetries = deviceMaxRetries
     const delayBetweenRetries = deviceDelayBetweenRetries
     while (retryCount < maxRetries) {
       try {
-        if (!this.apiTracker?.trySpend('poll')) {
-          return {
-            response: {
-              deviceId: '',
-              deviceType: '',
-              hubDeviceId: '',
-              version: 0,
-              deviceName: '',
-            },
-            statusCode: 429,
-          }
-        }
         const { response, statusCode } = await this.switchBotAPI.getDeviceStatus(device.deviceId, this.config.credentials?.token, this.config.credentials?.secret)
         this.debugLog(`response: ${JSON.stringify(response)}`)
         return { response, statusCode }
@@ -3055,6 +3099,56 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
     this.version = version
   }
 
+  /**
+   * Validate that the user's configuration won't exceed API limits
+   * Warn if device count × polling frequency will hit daily limits
+   */
+  private validateApiUsageConfig(deviceCount: number, irDeviceCount: number): void {
+    try {
+      const totalDevices = deviceCount + irDeviceCount
+      if (totalDevices === 0) {
+        return
+      }
+
+      const refreshRate = this.platformRefreshRate ?? 300 // seconds
+      const dailyLimit = this.config.options?.dailyApiLimit ?? 10000
+      const reserveForCommands = this.config.options?.dailyApiReserveForCommands ?? 1000
+
+      // Calculate polls per day (86400 seconds in a day)
+      const pollsPerDevicePerDay = Math.floor(86400 / refreshRate)
+      const totalPollsPerDay = pollsPerDevicePerDay * totalDevices
+
+      // Add discovery calls (typically 1-2 per day)
+      const estimatedDiscoveryCalls = 2
+      const totalEstimatedCalls = totalPollsPerDay + estimatedDiscoveryCalls
+
+      const usableLimit = dailyLimit - reserveForCommands
+      const percentOfLimit = Math.round((totalEstimatedCalls / usableLimit) * 100)
+
+      this.debugLog(`[API Usage Diagnostic] ${totalDevices} devices × ${pollsPerDevicePerDay} polls/day = ${totalPollsPerDay} estimated daily polls`)
+      this.debugLog(`[API Usage Diagnostic] With ${reserveForCommands} reserved for commands, usable limit is ${usableLimit}`)
+
+      if (totalEstimatedCalls > dailyLimit) {
+        this.errorLog(`⚠️ API LIMIT WARNING: Your configuration will exceed the daily API limit!`)
+        this.errorLog(`   Devices: ${totalDevices} | Refresh rate: ${refreshRate}s | Estimated daily polls: ${totalEstimatedCalls}`)
+        this.errorLog(`   Daily limit: ${dailyLimit} | You will use ${percentOfLimit}% of available budget`)
+        this.errorLog(`   SOLUTION: Increase refreshRate to ${Math.ceil((totalDevices * 86400) / usableLimit)} seconds or higher`)
+        this.errorLog(`   OR: Enable webhooks and set 'webhookOnlyOnReserve: true' to reduce polling`)
+      } else if (totalEstimatedCalls > usableLimit) {
+        this.warnLog(`⚠️ API USAGE WARNING: Configuration may exceed usable daily API budget`)
+        this.warnLog(`   Devices: ${totalDevices} | Refresh rate: ${refreshRate}s | Estimated daily polls: ${totalEstimatedCalls}`)
+        this.warnLog(`   Usable limit (after reserve): ${usableLimit} | You will use ${percentOfLimit}% of budget`)
+        this.warnLog(`   Polling may pause when approaching limit. Consider increasing refreshRate to ${Math.ceil((totalDevices * 86400) / usableLimit)}s`)
+      } else if (percentOfLimit > 75) {
+        this.infoLog(`[API Usage] Using ${percentOfLimit}% of daily budget (${totalEstimatedCalls}/${usableLimit} calls). Monitor usage if adding more devices.`)
+      } else {
+        this.debugLog(`[API Usage] Configuration looks good: ${percentOfLimit}% of daily budget (${totalEstimatedCalls}/${usableLimit} calls)`)
+      }
+    } catch (e: any) {
+      this.debugErrorLog(`Failed to validate API usage config: ${e.message ?? e}`)
+    }
+  }
+
   /**
    * Validate and clean a string value for a Name Characteristic.
    * @param displayName - The display name of the accessory.