@switchbot/homebridge-switchbot 3.8.1 → 3.8.2-beta.1

package/src/device/colorbulb.ts

@@ -18,7 +18,7 @@ import type { colorBulbWebhookContext } from '../types/devicewebhookstatus.js'
 import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot'
 import { debounceTime, interval, skipWhile, Subject, take, tap } from 'rxjs'
 
-import { hs2rgb, m2hs, rgb2hs } from '../utils.js'
+import { formatDeviceIdAsMac, hs2rgb, m2hs, rgb2hs } from '../utils.js'
 import { deviceBase } from './device.js'
 
 /**
@@ -333,17 +333,22 @@ export class ColorBulb extends deviceBase {
     await this.debugLog('registerPlatformBLE')
     if (this.config.options?.BLE) {
       await this.debugLog('is listening to Platform BLE.')
-      this.device.bleMac = this.device.deviceId!.match(/.{1,2}/g)!.join(':').toLowerCase()
-      await this.debugLog(`bleMac: ${this.device.bleMac}`)
-      this.platform.bleEventHandler[this.device.bleMac] = async (context: colorBulbServiceData) => {
-        try {
-          await this.debugLog(`received BLE: ${JSON.stringify(context)}`)
-          this.serviceData = context
-          await this.BLEparseStatus()
-          await this.updateHomeKitCharacteristics()
-        } catch (e: any) {
-          await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`)
+      try {
+        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: colorBulbServiceData) => {
+          try {
+            await this.debugLog(`received BLE: ${JSON.stringify(context)}`)
+            this.serviceData = context
+            await this.BLEparseStatus()
+            await this.updateHomeKitCharacteristics()
+          } catch (e: any) {
+            await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`)
+          }
         }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog('is not listening to Platform BLE')
@@ -451,35 +456,41 @@ export class ColorBulb extends deviceBase {
     if (this.LightBulb.On !== this.accessory.context.On) {
       await this.debugLog(`BLEpushChanges On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`)
       const switchbot = await this.platform.connectBLE(this.accessory, this.device)
-      await this.convertBLEAddress()
-      if (switchbot !== false) {
-        switchbot
-          .discover({ model: this.device.bleModel, id: this.device.bleMac })
-          .then(async (device_list: any) => {
-            await this.infoLog(`On: ${this.LightBulb.On}`)
-            return await this.retryBLE({
-              max: await this.maxRetryBLE(),
-              fn: async () => {
-                if (this.LightBulb.On) {
-                  return await device_list[0].turnOn({ id: this.device.bleMac })
-                } else {
-                  return await device_list[0].turnOff({ id: this.device.bleMac })
-                }
-              },
+      try {
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+        this.device.bleMac = formattedDeviceId
+        await this.debugLog(`bleMac: ${this.device.bleMac}`)
+        if (switchbot !== false) {
+          switchbot
+            .discover({ model: this.device.bleModel, id: this.device.bleMac })
+            .then(async (device_list: any) => {
+              await this.infoLog(`On: ${this.LightBulb.On}`)
+              return await this.retryBLE({
+                max: await this.maxRetryBLE(),
+                fn: async () => {
+                  if (this.LightBulb.On) {
+                    return await device_list[0].turnOn({ id: this.device.bleMac })
+                  } else {
+                    return await device_list[0].turnOff({ id: this.device.bleMac })
+                  }
+                },
+              })
             })
-          })
-          .then(async () => {
-            await this.successLog(`On: ${this.LightBulb.On} sent over SwitchBot BLE,  sent successfully`)
-            await this.updateHomeKitCharacteristics()
-          })
-          .catch(async (e: any) => {
-            await this.apiError(e)
-            await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
-            await this.BLEPushConnection()
-          })
-      } else {
-        await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
-        await this.BLEPushConnection()
+            .then(async () => {
+              await this.successLog(`On: ${this.LightBulb.On} sent over SwitchBot BLE,  sent successfully`)
+              await this.updateHomeKitCharacteristics()
+            })
+            .catch(async (e: any) => {
+              await this.apiError(e)
+              await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+              await this.BLEPushConnection()
+            })
+        } else {
+          await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
+          await this.BLEPushConnection()
+        }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog(`No changes (BLEpushChanges), On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`)
@@ -490,26 +501,32 @@ export class ColorBulb extends deviceBase {
     await this.debugLog('BLEpushBrightnessChanges')
     if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
       const switchbot = await this.platform.connectBLE(this.accessory, this.device)
-      await this.convertBLEAddress()
-      if (switchbot !== false) {
-        switchbot
-          .discover({ model: this.device.bleModel, id: this.device.bleMac })
-          .then(async (device_list: any) => {
-            await this.infoLog(`Target Brightness: ${this.LightBulb.Brightness}`)
-            return await device_list[0].setBrightness(this.LightBulb.Brightness)
-          })
-          .then(async () => {
-            await this.successLog(`Brightness: ${this.LightBulb.Brightness} sent over SwitchBot BLE,  sent successfully`)
-            await this.updateHomeKitCharacteristics()
-          })
-          .catch(async (e: any) => {
-            await this.apiError(e)
-            await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
-            await this.BLEPushConnection()
-          })
-      } else {
-        await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
-        await this.BLEPushConnection()
+      try {
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+        this.device.bleMac = formattedDeviceId
+        await this.debugLog(`bleMac: ${this.device.bleMac}`)
+        if (switchbot !== false) {
+          switchbot
+            .discover({ model: this.device.bleModel, id: this.device.bleMac })
+            .then(async (device_list: any) => {
+              await this.infoLog(`Target Brightness: ${this.LightBulb.Brightness}`)
+              return await device_list[0].setBrightness(this.LightBulb.Brightness)
+            })
+            .then(async () => {
+              await this.successLog(`Brightness: ${this.LightBulb.Brightness} sent over SwitchBot BLE,  sent successfully`)
+              await this.updateHomeKitCharacteristics()
+            })
+            .catch(async (e: any) => {
+              await this.apiError(e)
+              await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+              await this.BLEPushConnection()
+            })
+        } else {
+          await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
+          await this.BLEPushConnection()
+        }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog(`No changes (BLEpushBrightnessChanges), Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`)
@@ -522,26 +539,32 @@ export class ColorBulb extends deviceBase {
       const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature))
       this.accessory.context.kelvin = kelvin
       const switchbot = await this.platform.connectBLE(this.accessory, this.device)
-      await this.convertBLEAddress()
-      if (switchbot !== false) {
-        switchbot
-          .discover({ model: this.device.bleModel, id: this.device.bleMac })
-          .then(async (device_list: any) => {
-            await this.infoLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`)
-            return await device_list[0].setColorTemperature(kelvin)
-          })
-          .then(async () => {
-            await this.successLog(`ColorTemperature: ${this.LightBulb.ColorTemperature} sent over SwitchBot BLE,  sent successfully`)
-            await this.updateHomeKitCharacteristics()
-          })
-          .catch(async (e: any) => {
-            await this.apiError(e)
-            await this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
-            await this.BLEPushConnection()
-          })
-      } else {
-        await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
-        await this.BLEPushConnection()
+      try {
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+        this.device.bleMac = formattedDeviceId
+        await this.debugLog(`bleMac: ${this.device.bleMac}`)
+        if (switchbot !== false) {
+          switchbot
+            .discover({ model: this.device.bleModel, id: this.device.bleMac })
+            .then(async (device_list: any) => {
+              await this.infoLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`)
+              return await device_list[0].setColorTemperature(kelvin)
+            })
+            .then(async () => {
+              await this.successLog(`ColorTemperature: ${this.LightBulb.ColorTemperature} sent over SwitchBot BLE,  sent successfully`)
+              await this.updateHomeKitCharacteristics()
+            })
+            .catch(async (e: any) => {
+              await this.apiError(e)
+              await this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+              await this.BLEPushConnection()
+            })
+        } else {
+          await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
+          await this.BLEPushConnection()
+        }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog(`No changes (BLEpushColorTemperatureChanges), ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`)
@@ -555,26 +578,32 @@ export class ColorBulb extends deviceBase {
       const [red, green, blue] = hs2rgb(this.LightBulb.Hue, this.LightBulb.Saturation)
       await this.debugLog(`rgb: ${JSON.stringify([red, green, blue])}`)
       const switchbot = await this.platform.connectBLE(this.accessory, this.device)
-      await this.convertBLEAddress()
-      if (switchbot !== false) {
-        switchbot
-          .discover({ model: this.device.bleModel, id: this.device.bleMac })
-          .then(async (device_list: any) => {
-            await this.infoLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)}`)
-            return await device_list[0].setRGB(this.LightBulb.Brightness, red, green, blue)
-          })
-          .then(async () => {
-            await this.successLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)} sent over SwitchBot BLE,  sent successfully`)
-            await this.updateHomeKitCharacteristics()
-          })
-          .catch(async (e: any) => {
-            await this.apiError(e)
-            await this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
-            await this.BLEPushConnection()
-          })
-      } else {
-        await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
-        await this.BLEPushConnection()
+      try {
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+        this.device.bleMac = formattedDeviceId
+        await this.debugLog(`bleMac: ${this.device.bleMac}`)
+        if (switchbot !== false) {
+          switchbot
+            .discover({ model: this.device.bleModel, id: this.device.bleMac })
+            .then(async (device_list: any) => {
+              await this.infoLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)}`)
+              return await device_list[0].setRGB(this.LightBulb.Brightness, red, green, blue)
+            })
+            .then(async () => {
+              await this.successLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)} sent over SwitchBot BLE,  sent successfully`)
+              await this.updateHomeKitCharacteristics()
+            })
+            .catch(async (e: any) => {
+              await this.apiError(e)
+              await this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+              await this.BLEPushConnection()
+            })
+        } else {
+          await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
+          await this.BLEPushConnection()
+        }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog(`No changes (BLEpushRGBChanges), Hue: ${this.LightBulb.Hue}, HueCached: ${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`)

package/src/device/contact.ts

@@ -18,6 +18,7 @@ import type { contactSensorWebhookContext } from '../types/devicewebhookstatus.j
 import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot'
 import { interval, skipWhile, Subject } from 'rxjs'
 
+import { formatDeviceIdAsMac } from '../utils.js'
 import { deviceBase } from './device.js'
 
 /**
@@ -326,17 +327,22 @@ export class Contact extends deviceBase {
     await this.debugLog('registerPlatformBLE')
     if (this.config.options?.BLE) {
       await this.debugLog('is listening to Platform BLE.')
-      this.device.bleMac = this.device.deviceId!.match(/.{1,2}/g)!.join(':').toLowerCase()
-      await this.debugLog(`bleMac: ${this.device.bleMac}`)
-      this.platform.bleEventHandler[this.device.bleMac] = async (context: contactSensorServiceData) => {
-        try {
-          await this.debugLog(`received BLE: ${JSON.stringify(context)}`)
-          this.serviceData = context
-          await this.BLEparseStatus()
-          await this.updateHomeKitCharacteristics()
-        } catch (e: any) {
-          await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`)
+      try {
+        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: contactSensorServiceData) => {
+          try {
+            await this.debugLog(`received BLE: ${JSON.stringify(context)}`)
+            this.serviceData = context
+            await this.BLEparseStatus()
+            await this.updateHomeKitCharacteristics()
+          } catch (e: any) {
+            await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`)
+          }
         }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog('is not listening to Platform BLE')

package/src/device/curtain.ts

@@ -20,6 +20,7 @@ import { hostname } from 'node:os'
 import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot'
 import { debounceTime, interval, skipWhile, Subject, take, tap } from 'rxjs'
 
+import { formatDeviceIdAsMac } from '../utils.js'
 import { deviceBase } from './device.js'
 
 export class Curtain extends deviceBase {
@@ -324,42 +325,45 @@ export class Curtain extends deviceBase {
       return
     }
 
-    const mac = this.device
-      .deviceId!.match(/.{1,2}/g)!
-      .join(':')
-      .toLowerCase()
-    this.historyService = new this.platform.fakegatoAPI('custom', this.accessory, {
-      log: this.platform.log,
-      storage: 'fs',
-      filename: `${hostname().split('.')[0]}_${mac}_persist.json`,
-    })
-    const motion: Service
+    try {
+      const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+      this.device.bleMac = formattedDeviceId
+      await this.debugLog(`bleMac: ${this.device.bleMac}`)
+      this.historyService = new this.platform.fakegatoAPI('custom', this.accessory, {
+        log: this.platform.log,
+        storage: 'fs',
+        filename: `${hostname().split('.')[0]}_${this.device.bleMac}_persist.json`,
+      })
+      const motion: Service
       = this.accessory.getService(this.hap.Service.MotionSensor)
       || this.accessory.addService(this.hap.Service.MotionSensor, 'Motion')
-    motion.addOptionalCharacteristic(this.platform.eve.Characteristics.LastActivation)
-    motion.getCharacteristic(this.platform.eve.Characteristics.LastActivation).onGet(() => {
-      const lastActivation = this.accessory.context.lastActivation
-        ? Math.max(0, this.accessory.context.lastActivation - this.historyService.getInitialTime())
-        : 0
-      return lastActivation
-    })
-    await this.setMinMax()
-    motion.getCharacteristic(this.hap.Characteristic.MotionDetected).on('change', (event: CharacteristicChange) => {
-      if (event.newValue !== event.oldValue) {
-        const sensor = this.accessory.getService(this.hap.Service.MotionSensor)
-        const entry = {
-          time: Math.round(new Date().valueOf() / 1000),
-          motion: event.newValue,
+      motion.addOptionalCharacteristic(this.platform.eve.Characteristics.LastActivation)
+      motion.getCharacteristic(this.platform.eve.Characteristics.LastActivation).onGet(() => {
+        const lastActivation = this.accessory.context.lastActivation
+          ? Math.max(0, this.accessory.context.lastActivation - this.historyService.getInitialTime())
+          : 0
+        return lastActivation
+      })
+      await this.setMinMax()
+      motion.getCharacteristic(this.hap.Characteristic.MotionDetected).on('change', (event: CharacteristicChange) => {
+        if (event.newValue !== event.oldValue) {
+          const sensor = this.accessory.getService(this.hap.Service.MotionSensor)
+          const entry = {
+            time: Math.round(new Date().valueOf() / 1000),
+            motion: event.newValue,
+          }
+          this.accessory.context.lastActivation = entry.time
+          sensor?.updateCharacteristic(
+            this.platform.eve.Characteristics.LastActivation,
+            Math.max(0, this.accessory.context.lastActivation - this.historyService.getInitialTime()),
+          )
+          this.historyService.addEntry(entry)
         }
-        this.accessory.context.lastActivation = entry.time
-        sensor?.updateCharacteristic(
-          this.platform.eve.Characteristics.LastActivation,
-          Math.max(0, this.accessory.context.lastActivation - this.historyService.getInitialTime()),
-        )
-        this.historyService.addEntry(entry)
-      }
-    })
-    this.updateHistory()
+      })
+      this.updateHistory()
+    } catch (error) {
+      await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
+    }
   }
 
   async updateHistory(): Promise<void> {
@@ -541,17 +545,22 @@ export class Curtain extends deviceBase {
     await this.debugLog('registerPlatformBLE')
     if (this.config.options?.BLE) {
       await this.debugLog('is listening to Platform BLE.')
-      this.device.bleMac = this.device.deviceId!.match(/.{1,2}/g)!.join(':').toLowerCase()
-      await this.debugLog(`bleMac: ${this.device.bleMac}`)
-      this.platform.bleEventHandler[this.device.bleMac] = async (context: curtainServiceData | curtain3ServiceData) => {
-        try {
-          await this.debugLog(`received BLE: ${JSON.stringify(context)}`)
-          this.serviceData = context
-          await this.BLEparseStatus()
-          await this.updateHomeKitCharacteristics()
-        } catch (e: any) {
-          await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`)
+      try {
+        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: curtainServiceData | curtain3ServiceData) => {
+          try {
+            await this.debugLog(`received BLE: ${JSON.stringify(context)}`)
+            this.serviceData = context
+            await this.BLEparseStatus()
+            await this.updateHomeKitCharacteristics()
+          } catch (e: any) {
+            await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`)
+          }
         }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog('is not listening to Platform BLE')
@@ -585,33 +594,39 @@ export class Curtain extends deviceBase {
     await this.debugLog('BLEpushChanges')
     if (this.WindowCovering.TargetPosition !== this.WindowCovering.CurrentPosition) {
       const switchbot = await this.platform.connectBLE(this.accessory, this.device)
-      await this.convertBLEAddress()
-      const { setPositionMode, Mode }: { setPositionMode: number, Mode: string } = await this.setPerformance()
-      const adjustedMode = setPositionMode === 1 ? 0x01 : 0xFF
-      await this.debugLog(`Mode: ${Mode}, setPositionMode: ${setPositionMode}`)
-      if (switchbot !== false) {
-        switchbot
-          .discover({ model: this.device.bleModel, quick: true, id: this.device.bleMac })
-          .then(async (device_list: any) => {
-            return await this.retryBLE({
-              max: await this.maxRetryBLE(),
-              fn: async () => {
-                return await device_list[0].runToPos(100 - Number(this.WindowCovering.TargetPosition), adjustedMode)
-              },
+      try {
+        const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+        this.device.bleMac = formattedDeviceId
+        await this.debugLog(`bleMac: ${this.device.bleMac}`)
+        const { setPositionMode, Mode }: { setPositionMode: number, Mode: string } = await this.setPerformance()
+        const adjustedMode = setPositionMode === 1 ? 0x01 : 0xFF
+        await this.debugLog(`Mode: ${Mode}, setPositionMode: ${setPositionMode}`)
+        if (switchbot !== false) {
+          switchbot
+            .discover({ model: this.device.bleModel, quick: true, id: this.device.bleMac })
+            .then(async (device_list: any) => {
+              return await this.retryBLE({
+                max: await this.maxRetryBLE(),
+                fn: async () => {
+                  return await device_list[0].runToPos(100 - Number(this.WindowCovering.TargetPosition), adjustedMode)
+                },
+              })
             })
-          })
-          .then(async () => {
-            await this.successLog(`TargetPostion: ${this.WindowCovering.TargetPosition} sent over SwitchBot BLE,  sent successfully`)
-            await this.updateHomeKitCharacteristics()
-          })
-          .catch(async (e: any) => {
-            await this.apiError(e)
-            await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
-            await this.BLEPushConnection()
-          })
-      } else {
-        await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
-        await this.BLEPushConnection()
+            .then(async () => {
+              await this.successLog(`TargetPostion: ${this.WindowCovering.TargetPosition} sent over SwitchBot BLE,  sent successfully`)
+              await this.updateHomeKitCharacteristics()
+            })
+            .catch(async (e: any) => {
+              await this.apiError(e)
+              await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+              await this.BLEPushConnection()
+            })
+        } else {
+          await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`)
+          await this.BLEPushConnection()
+        }
+      } catch (error) {
+        await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
       }
     } else {
       await this.debugLog(`No changes (BLEpushChanges), TargetPosition: ${this.WindowCovering.TargetPosition}, CurrentPosition: ${this.WindowCovering.CurrentPosition}`)

package/src/device/device.ts

@@ -17,7 +17,7 @@ import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName
 import { request } from 'undici'
 
 import { Devices } from '../settings.js'
-import { BlindTiltMappingMode, sleep } from '../utils.js'
+import { BlindTiltMappingMode, formatDeviceIdAsMac, sleep } from '../utils.js'
 
 export abstract class deviceBase {
   public readonly api: API
@@ -261,33 +261,34 @@ export abstract class deviceBase {
    * Setup EVE history graph feature if enabled.
    */
   async setupHistoryService(accessory: PlatformAccessory, device: device & devicesConfig): Promise<void> {
-    const mac = this.device
-      .deviceId!.match(/.{1,2}/g)!
-      .join(':')
-      .toLowerCase()
-    this.historyService = device.history
-      ? new this.platform.fakegatoAPI('room', accessory, {
-        log: this.platform.log,
-        storage: 'fs',
-        filename: `${hostname().split('.')[0]}_${mac}_persist.json`,
-      })
-      : null
+    try {
+      const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+      this.device.bleMac = formattedDeviceId
+      await this.debugLog(`bleMac: ${this.device.bleMac}`)
+      this.historyService = device.history
+        ? new this.platform.fakegatoAPI('room', accessory, {
+          log: this.platform.log,
+          storage: 'fs',
+          filename: `${hostname().split('.')[0]}_${this.device.bleMac}_persist.json`,
+        })
+        : null
+    } catch (error) {
+      await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
+    }
   }
 
   async switchbotBLE(): Promise<any> {
     const switchbot = await this.platform.connectBLE(this.accessory, this.device)
     // Convert to BLE Address
-    await this.convertBLEAddress()
-    await this.getCustomBLEAddress(switchbot)
-    return switchbot
-  }
-
-  async convertBLEAddress() {
-    this.device.bleMac = this.device
-      .deviceId!.match(/.{1,2}/g)!
-      .join(':')
-      .toLowerCase()
-    await this.debugLog(`BLE Address: ${this.device.bleMac}`)
+    try {
+      const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)
+      this.device.bleMac = formattedDeviceId
+      await this.debugLog(`bleMac: ${this.device.bleMac}`)
+      await this.getCustomBLEAddress(switchbot)
+      return switchbot
+    } catch (error) {
+      await this.errorLog(`failed to format device ID as MAC, Error: ${error}`)
+    }
   }
 
   async monitorAdvertisementPackets(switchbot: any) {