@switchbot/homebridge-switchbot 3.6.1-beta.1 → 3.6.1-beta.3

package/src/platform.ts

@@ -330,9 +330,9 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           // Set an event handler to monitor advertisement packets
           switchbot.onadvertisement = async (ad: any) => {
             try {
-              this.bleEventHandler[ad.id]?.(ad);
+              this.bleEventHandler[ad.address]?.(ad.serviceData);
             } catch (e: any) {
-              this.errorLog(`Failed to handle BLE event. Error:${e}`);
+              await this.errorLog(`Failed to handle BLE event. Error:${e}`);
             }
           };
         })();

package/src/utils.ts

@@ -115,6 +115,7 @@ export enum BlindTiltMappingMode {
   UseTiltForDirection = 'use_tilt_for_direction',
 }
 
+import type { Nullable, CharacteristicValue } from 'homebridge';
 import type { devicesConfig } from './settings.js';
 import type { blindTilt, curtain, curtain3, device } from './types/devicelist.js';
 
@@ -130,6 +131,16 @@ export function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+export function checkName(displayName: string, name: string, value: Nullable<CharacteristicValue>): string {
+  if (typeof value === 'string' && !(new RegExp(/^[\p{L}\p{N}][\p{L}\p{N} ']*[\p{L}\p{N}]$/u)).test(value)) {
+    return `WARNING: The accessory '${displayName}' has an invalid '${name}' characteristic ('${value}'). Please use only alphanumeric, space, and`
+    + ' apostrophe characters. Ensure it starts and ends with an alphabetic or numeric character, and avoid emojis. This may prevent the accessory '
+    + 'from being added in the Home App or cause unresponsiveness.';
+  } else {
+    return 'false';
+  }
+}
+
 /**
  * Converts the value to celsius if the temperature units are in Fahrenheit
 **/