@switchbot/homebridge-switchbot 3.8.2-beta.0 → 3.8.2-beta.2

package/src/device/robotvacuumcleaner.ts

@@ -297,7 +297,7 @@ export class RobotVacuumCleaner extends deviceBase {
     if (this.config.options?.BLE) {
       await this.debugLog('is listening to Platform BLE.')
       try {
-        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId!)
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
         this.device.bleMac = formattedDeviceId
         await this.debugLog(`bleMac: ${this.device.bleMac}`)
         this.platform.bleEventHandler[this.device.bleMac] = async (context: robotVacuumCleanerServiceData) => {
@@ -390,7 +390,7 @@ export class RobotVacuumCleaner extends deviceBase {
     if (this.LightBulb.On !== this.accessory.context.On) {
       const switchbot = await this.platform.connectBLE(this.accessory, this.device)
       try {
-        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId!)
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
         this.device.bleMac = formattedDeviceId
         await this.debugLog(`bleMac: ${this.device.bleMac}`)
         if (switchbot !== false) {

package/src/device/waterdetector.ts

@@ -297,7 +297,7 @@ export class WaterDetector extends deviceBase {
     if (this.config.options?.BLE) {
       await this.debugLog('is listening to Platform BLE.')
       try {
-        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId!)
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
         this.device.bleMac = formattedDeviceId
         await this.debugLog(`bleMac: ${this.device.bleMac}`)
         this.platform.bleEventHandler[this.device.bleMac] = async (context: waterLeakDetectorServiceData) => {

package/src/platform.ts

@@ -58,7 +58,7 @@ import { TV } from './irdevice/tv.js'
 import { VacuumCleaner } from './irdevice/vacuumcleaner.js'
 import { WaterHeater } from './irdevice/waterheater.js'
 import { deleteWebhook, Devices, PLATFORM_NAME, PLUGIN_NAME, queryWebhook, setupWebhook, updateWebhook } from './settings.js'
-import { isBlindTiltDevice, isCurtainDevice, sleep } from './utils.js'
+import { formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, sleep } from './utils.js'
 
 /**
  * HomebridgePlatform
@@ -593,8 +593,14 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       for (const device of devices) {
         device.deviceType = device.configDeviceType
         device.deviceName = device.configDeviceName
-        if (device.deviceType) {
-          await this.createDevice(device)
+        try {
+          device.deviceId = formatDeviceIdAsMac(device.deviceId, true)
+          await this.debugLog(`deviceId: ${device.deviceId}`)
+          if (device.deviceType) {
+            await this.createDevice(device)
+          }
+        } catch (error) {
+          await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
         }
       }
     } else {

package/src/types/bledevicestatus.ts

@@ -140,7 +140,7 @@ export type meterServiceData = serviceData & {
   model: SwitchBotBLEModel.Meter
   modelName: SwitchBotBLEModelName.Meter
   modelFriendlyName: SwitchBotBLEModelFriendlyName.Meter
-  celcius: number
+  celsius: number
   fahrenheit: number
   fahrenheit_mode: boolean
   humidity: number
@@ -151,7 +151,7 @@ export type meterPlusServiceData = serviceData & {
   model: SwitchBotBLEModel.MeterPlus
   modelName: SwitchBotBLEModelName.MeterPlus
   modelFriendlyName: SwitchBotBLEModelFriendlyName.MeterPlus
-  celcius: number
+  celsius: number
   fahrenheit: number
   fahrenheit_mode: boolean
   humidity: number
@@ -162,7 +162,7 @@ export type outdoorMeterServiceData = serviceData & {
   model: SwitchBotBLEModel.OutdoorMeter
   modelName: SwitchBotBLEModelName.OutdoorMeter
   modelFriendlyName: SwitchBotBLEModelFriendlyName.OutdoorMeter
-  celcius: number
+  celsius: number
   fahrenheit: number
   fahrenheit_mode: boolean
   humidity: number
@@ -260,7 +260,7 @@ export type hub2ServiceData = serviceData & {
   model: SwitchBotBLEModel.Hub2
   modelName: SwitchBotBLEModelName.Hub2
   modelFriendlyName: SwitchBotBLEModelFriendlyName.Hub2
-  celcius: number
+  celsius: number
   fahrenheit: number
   fahrenheit_mode: boolean
   humidity: number

package/src/utils.ts

@@ -163,9 +163,11 @@ export function convertUnits(value: number, unit: string, convert?: string): num
  * Ensures the device ID does not already contain colons.
  *
  * @param deviceId - The device ID to format.
+ * @param cassSensative - If the MAC address should be case sensitive. Default is false, which will return the MAC address in lowercase.
  * @returns The formatted MAC address.
+ * @throws Will throw an error if the device ID is not a valid MAC address or a 12-character hexadecimal string.
  */
-export function formatDeviceIdAsMac(deviceId: string): string {
+export function formatDeviceIdAsMac(deviceId: string, cassSensative?: boolean): string {
   if (typeof deviceId !== 'string') {
     throw new TypeError('Invalid device ID format. Device ID must be a string.')
   }
@@ -175,13 +177,15 @@ export function formatDeviceIdAsMac(deviceId: string): string {
   const macAddressRegex = /^(?:[0-9a-f]{2}:){5}[0-9a-f]{2}$/i
   const hexRegex = /^[0-9a-f]{12}$/i
 
+  // Check if the deviceId is already in a valid MAC address format
   if (macAddressRegex.test(deviceId)) {
-    return deviceId.toLowerCase()
+    return cassSensative ? deviceId : deviceId.toLowerCase()
   }
 
   // Check if the deviceId is a valid 12-character hexadecimal string
   if (hexRegex.test(deviceId)) {
-    return deviceId.match(/.{1,2}/g)!.join(':').toLowerCase()
+    const formattedDeviceId = deviceId.match(/.{1,2}/g)!.join(':')
+    return cassSensative ? formattedDeviceId : formattedDeviceId.toLowerCase()
   }
 
   throw new Error('Invalid device ID format. Must be a valid MAC address or a 12-character hexadecimal string.')