node-switchbot 3.0.2-beta.2 → 3.0.2-beta.4

package/dist/switchbot-ble.d.ts

@@ -3,10 +3,10 @@ import { EventEmitter } from 'node:events';
 import * as Noble from '@stoprocent/noble';
 import { SwitchbotDevice } from './device.js';
 /**
- * SwitchBot class to interact with SwitchBot devices.
+ * SwitchBotBLE class to interact with SwitchBot devices.
  */
 export declare class SwitchBotBLE extends EventEmitter {
-    private ready;
+    ready: Promise<void>;
     noble: typeof Noble;
     ondiscover?: (device: SwitchbotDevice) => Promise<void> | void;
     onadvertisement?: (ad: Ad) => Promise<void> | void;
@@ -22,45 +22,53 @@ export declare class SwitchBotBLE extends EventEmitter {
      * @param level - The severity level of the log (e.g., 'info', 'warn', 'error').
      * @param message - The log message to be emitted.
      */
-    emitLog(level: string, message: string): Promise<void>;
+    log(level: string, message: string): Promise<void>;
     /**
      * Initializes the noble object.
      *
      * @param {Params} [params] - Optional parameters
      * @returns {Promise<void>} - Resolves when initialization is complete
      */
-    init(params?: Params): Promise<void>;
+    private initialize;
     /**
-     * Discover SwitchBot devices based on the provided parameters.
+     * Validates the parameters.
      *
-     * @param {Params} params - The parameters for discovery.
-     * @returns {Promise<SwitchbotDevice[]>} - A promise that resolves with a list of discovered devices.
+     * @param {Params} params - The parameters to validate.
+     * @param {Record<string, unknown>} schema - The schema to validate against.
+     * @returns {Promise<void>} - Resolves if parameters are valid, otherwise throws an error.
      */
-    discover(params?: Params): Promise<SwitchbotDevice[]>;
+    validate(params: Params, schema: Record<string, unknown>): Promise<void>;
     /**
-     * Initializes the noble object and waits for it to be powered on.
+     * Waits for the noble object to be powered on.
      *
      * @returns {Promise<void>} - Resolves when the noble object is powered on.
      */
-    _init(): Promise<void>;
+    private waitForPowerOn;
+    /**
+     * Discover SwitchBot devices based on the provided parameters.
+     *
+     * @param {Params} params - The parameters for discovery.
+     * @returns {Promise<SwitchbotDevice[]>} - A promise that resolves with a list of discovered devices.
+     */
+    discover(params?: Params): Promise<SwitchbotDevice[]>;
     /**
-     * Gets the device object based on the peripheral, id, and model.
+     * Creates a device object based on the peripheral, id, and model.
      *
      * @param {Noble.Peripheral} peripheral - The peripheral object.
      * @param {string} id - The device id.
      * @param {string} model - The device model.
      * @returns {Promise<SwitchbotDevice | null>} - The device object or null.
      */
-    getDeviceObject(peripheral: Noble.Peripheral, id: string, model: string): Promise<SwitchbotDevice | null>;
+    private createDevice;
     /**
      * Filters advertising data based on id and model.
      *
      * @param {Ad} ad - The advertising data.
      * @param {string} id - The device id.
      * @param {string} model - The device model.
-     * @returns {boolean} - True if the advertising data matches the id and model, false otherwise.
+     * @returns {Promise<boolean>} - True if the advertising data matches the id and model, false otherwise.
      */
-    filterAdvertising(ad: Ad, id: string, model: string): Promise<boolean>;
+    private filterAd;
     /**
      * Starts scanning for SwitchBot devices.
      *

package/dist/switchbot-ble.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switchbot-ble.d.ts","sourceRoot":"","sources":["../src/switchbot-ble.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM1C,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAG1C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAmB7C;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAC5C,OAAO,CAAC,KAAK,CAAe;IACrB,KAAK,EAAG,OAAO,KAAK,CAAA;IAC3B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAC9D,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAElD;;;;OAIG;gBACS,MAAM,CAAC,EAAE,MAAM;IAK3B;;;;;OAKG;IACU,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE;;;;;OAKG;IACG,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,QAAQ,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAoH/D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B5B;;;;;;;OAOG;IACG,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAqE/G;;;;;;;OAOG;IACG,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB5E;;;;;OAKG;IACG,SAAS,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAsFnD;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAU/B;;;;;OAKG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBxC;AAED,OAAO,EAAE,eAAe,EAAE,CAAA"}
+{"version":3,"file":"switchbot-ble.d.ts","sourceRoot":"","sources":["../src/switchbot-ble.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAQ,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAG1C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAoB7C;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAY;IACrC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IACpB,KAAK,EAAG,OAAO,KAAK,CAAA;IAC3B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAC9D,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAElD;;;;OAIG;gBACS,MAAM,CAAC,EAAE,MAAM;IAK3B;;;;;OAKG;IACU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D;;;;;OAKG;YACW,UAAU;IAIxB;;;;;;OAMG;IACU,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrF;;;;OAIG;YACW,cAAc;IA4B5B;;;;;OAKG;IACU,QAAQ,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA+DtE;;;;;;;OAOG;YACW,YAAY;IA6B1B;;;;;;;OAOG;YACW,QAAQ;IAatB;;;;;OAKG;IACU,SAAS,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC1D;;;;OAIG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IActC;;;;;OAKG;IACU,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAO/C;AAED,OAAO,EAAE,eAAe,EAAE,CAAA"}

package/dist/switchbot-ble.js

@@ -1,8 +1,4 @@
 import { EventEmitter } from 'node:events';
-/* Copyright(C) 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * switchbot.ts: Switchbot BLE API registration.
- */
 import * as Noble from '@stoprocent/noble';
 import { Advertising } from './advertising.js';
 import { SwitchbotDevice } from './device.js';
@@ -25,7 +21,7 @@ import { parameterChecker } from './parameter-checker.js';
 import { DEFAULT_DISCOVERY_DURATION, PRIMARY_SERVICE_UUID_LIST } from './settings.js';
 import { SwitchBotBLEModel } from './types/types.js';
 /**
- * SwitchBot class to interact with SwitchBot devices.
+ * SwitchBotBLE class to interact with SwitchBot devices.
  */
 export class SwitchBotBLE extends EventEmitter {
     ready;
@@ -39,7 +35,7 @@ export class SwitchBotBLE extends EventEmitter {
      */
     constructor(params) {
         super();
-        this.ready = this.init(params);
+        this.ready = this.initialize(params);
     }
     /**
      * Emits a log event with the specified log level and message.
@@ -47,7 +43,7 @@ export class SwitchBotBLE extends EventEmitter {
      * @param level - The severity level of the log (e.g., 'info', 'warn', 'error').
      * @param message - The log message to be emitted.
      */
-    async emitLog(level, message) {
+    async log(level, message) {
         this.emit('log', { level, message });
     }
     /**
@@ -56,222 +52,150 @@ export class SwitchBotBLE extends EventEmitter {
      * @param {Params} [params] - Optional parameters
      * @returns {Promise<void>} - Resolves when initialization is complete
      */
-    async init(params) {
-        this.noble = params && params.noble ? params.noble : Noble.default;
+    async initialize(params) {
+        this.noble = params?.noble ?? Noble.default;
     }
     /**
-     * Discover SwitchBot devices based on the provided parameters.
+     * Validates the parameters.
      *
-     * @param {Params} params - The parameters for discovery.
-     * @returns {Promise<SwitchbotDevice[]>} - A promise that resolves with a list of discovered devices.
+     * @param {Params} params - The parameters to validate.
+     * @param {Record<string, unknown>} schema - The schema to validate against.
+     * @returns {Promise<void>} - Resolves if parameters are valid, otherwise throws an error.
      */
-    async discover(params = {}) {
-        const promise = new Promise((resolve, reject) => {
-            // Check the parameters
-            const valid = parameterChecker.check(params, {
-                duration: { required: false, type: 'integer', min: 1, max: 60000 },
-                model: {
-                    required: false,
-                    type: 'string',
-                    enum: [
-                        SwitchBotBLEModel.Bot,
-                        SwitchBotBLEModel.Curtain,
-                        SwitchBotBLEModel.Curtain3,
-                        SwitchBotBLEModel.Humidifier,
-                        SwitchBotBLEModel.Meter,
-                        SwitchBotBLEModel.MeterPlus,
-                        SwitchBotBLEModel.Hub2,
-                        SwitchBotBLEModel.OutdoorMeter,
-                        SwitchBotBLEModel.MotionSensor,
-                        SwitchBotBLEModel.ContactSensor,
-                        SwitchBotBLEModel.ColorBulb,
-                        SwitchBotBLEModel.CeilingLight,
-                        SwitchBotBLEModel.CeilingLightPro,
-                        SwitchBotBLEModel.StripLight,
-                        SwitchBotBLEModel.PlugMiniUS,
-                        SwitchBotBLEModel.PlugMiniJP,
-                        SwitchBotBLEModel.Lock,
-                        SwitchBotBLEModel.LockPro,
-                        SwitchBotBLEModel.BlindTilt,
-                    ],
-                },
-                id: { required: false, type: 'string', min: 12, max: 17 },
-                quick: { required: false, type: 'boolean' },
-            }, false);
-            if (!valid) {
-                this.emitLog('error', `parameterChecker: ${JSON.stringify(parameterChecker.error.message)}`);
-                reject(new Error(parameterChecker.error.message));
-                return;
-            }
-            if (!params) {
-                params = {};
-            }
-            // Determine the values of the parameters
-            const p = {
-                duration: params.duration ?? DEFAULT_DISCOVERY_DURATION,
-                model: params.model ?? '',
-                id: params.id ?? '',
-                quick: !!params.quick,
-            };
-            // Initialize the noble object
-            this._init()
-                .then(() => {
-                if (this.noble === null) {
-                    return reject(new Error('noble failed to initialize'));
-                }
-                const peripherals = {};
-                let timer = setTimeout(() => { }, 0);
-                const finishDiscovery = () => {
-                    if (timer) {
-                        clearTimeout(timer);
-                    }
-                    this.noble.removeAllListeners('discover');
-                    this.noble.stopScanningAsync();
-                    const device_list = [];
-                    for (const addr in peripherals) {
-                        device_list.push(peripherals[addr]);
-                    }
-                    resolve(device_list);
-                };
-                // Set a handler for the 'discover' event
-                this.noble.on('discover', async (peripheral) => {
-                    const device = await this.getDeviceObject(peripheral, p.id, p.model);
-                    if (!device) {
-                        return;
-                    }
-                    const id = device.id;
-                    peripherals[id] = device;
-                    if (this.ondiscover && typeof this.ondiscover === 'function') {
-                        this.ondiscover(device);
-                    }
-                    if (p.quick) {
-                        finishDiscovery();
-                    }
-                });
-                // Start scanning
-                this.noble.startScanningAsync(PRIMARY_SERVICE_UUID_LIST, false).then(() => {
-                    timer = setTimeout(() => {
-                        finishDiscovery();
-                    }, p.duration);
-                }).catch((error) => {
-                    reject(error);
-                });
-            })
-                .catch((error) => {
-                reject(error);
-            });
-        });
-        return promise;
+    async validate(params, schema) {
+        const valid = parameterChecker.check(params, schema, false);
+        if (!valid) {
+            this.log('error', `parameterChecker: ${JSON.stringify(parameterChecker.error.message)}`);
+            throw new Error(parameterChecker.error.message);
+        }
     }
     /**
-     * Initializes the noble object and waits for it to be powered on.
+     * Waits for the noble object to be powered on.
      *
      * @returns {Promise<void>} - Resolves when the noble object is powered on.
      */
-    async _init() {
+    async waitForPowerOn() {
         await this.ready;
-        const promise = new Promise((resolve, reject) => {
-            if (this.noble._state === 'poweredOn') {
-                resolve();
-                return;
-            }
+        if (this.noble._state === 'poweredOn') {
+            return;
+        }
+        return new Promise((resolve, reject) => {
             this.noble.once('stateChange', (state) => {
                 switch (state) {
                     case 'unsupported':
                     case 'unauthorized':
                     case 'poweredOff':
-                        reject(new Error(`Failed to initialize the Noble object: ${this.noble._state}`));
-                        return;
+                        reject(new Error(`Failed to initialize the Noble object: ${state}`));
+                        break;
                     case 'resetting':
                     case 'unknown':
-                        reject(new Error(`Adapter is not ready: ${this.noble._state}`));
-                        return;
+                        reject(new Error(`Adapter is not ready: ${state}`));
+                        break;
                     case 'poweredOn':
                         resolve();
-                        return;
+                        break;
                     default:
-                        reject(new Error(`Unknown state: ${this.noble._state}`));
+                        reject(new Error(`Unknown state: ${state}`));
                 }
             });
         });
-        return promise;
     }
     /**
-     * Gets the device object based on the peripheral, id, and model.
+     * Discover SwitchBot devices based on the provided parameters.
+     *
+     * @param {Params} params - The parameters for discovery.
+     * @returns {Promise<SwitchbotDevice[]>} - A promise that resolves with a list of discovered devices.
+     */
+    async discover(params = {}) {
+        await this.ready;
+        await this.validate(params, {
+            duration: { required: false, type: 'integer', min: 1, max: 60000 },
+            model: { required: false, type: 'string', enum: Object.values(SwitchBotBLEModel) },
+            id: { required: false, type: 'string', min: 12, max: 17 },
+            quick: { required: false, type: 'boolean' },
+        });
+        await this.waitForPowerOn();
+        if (!this.noble) {
+            throw new Error('noble failed to initialize');
+        }
+        const p = {
+            duration: params.duration ?? DEFAULT_DISCOVERY_DURATION,
+            model: params.model ?? '',
+            id: params.id ?? '',
+            quick: !!params.quick,
+        };
+        const peripherals = {};
+        let timer;
+        const finishDiscovery = async () => {
+            if (timer) {
+                clearTimeout(timer);
+            }
+            this.noble.removeAllListeners('discover');
+            try {
+                await this.noble.stopScanningAsync();
+                this.log('info', 'Stopped Scanning for SwitchBot BLE devices.');
+            }
+            catch (e) {
+                this.log('error', `discover stopScanningAsync error: ${JSON.stringify(e.message ?? e)}`);
+            }
+            return Object.values(peripherals);
+        };
+        return new Promise((resolve, reject) => {
+            this.noble.on('discover', async (peripheral) => {
+                const device = await this.createDevice(peripheral, p.id, p.model);
+                if (!device) {
+                    return;
+                }
+                peripherals[device.id] = device;
+                if (this.ondiscover) {
+                    this.ondiscover(device);
+                }
+                if (p.quick) {
+                    resolve(await finishDiscovery());
+                }
+            });
+            this.noble.startScanningAsync(PRIMARY_SERVICE_UUID_LIST, false)
+                .then(() => {
+                timer = setTimeout(async () => resolve(await finishDiscovery()), p.duration);
+            })
+                .catch(reject);
+        });
+    }
+    /**
+     * Creates a device object based on the peripheral, id, and model.
      *
      * @param {Noble.Peripheral} peripheral - The peripheral object.
      * @param {string} id - The device id.
      * @param {string} model - The device model.
      * @returns {Promise<SwitchbotDevice | null>} - The device object or null.
      */
-    async getDeviceObject(peripheral, id, model) {
-        const ad = await Advertising.parse(peripheral, this.emitLog.bind(this));
-        if (ad && await this.filterAdvertising(ad, id, model)) {
-            let device;
-            if (ad && ad.serviceData && ad.serviceData.model) {
-                switch (ad.serviceData.model) {
-                    case SwitchBotBLEModel.Bot:
-                        device = new WoHand(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.Curtain:
-                    case SwitchBotBLEModel.Curtain3:
-                        device = new WoCurtain(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.Humidifier:
-                        device = new WoHumi(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.Meter:
-                        device = new WoSensorTH(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.MeterPlus:
-                        device = new WoSensorTH(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.Hub2:
-                        device = new WoHub2(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.OutdoorMeter:
-                        device = new WoIOSensorTH(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.MotionSensor:
-                        device = new WoPresence(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.ContactSensor:
-                        device = new WoContact(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.ColorBulb:
-                        device = new WoBulb(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.CeilingLight:
-                        device = new WoCeilingLight(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.CeilingLightPro:
-                        device = new WoCeilingLight(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.StripLight:
-                        device = new WoStrip(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.PlugMiniUS:
-                    case SwitchBotBLEModel.PlugMiniJP:
-                        device = new WoPlugMini(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.Lock:
-                        device = new WoSmartLock(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.LockPro:
-                        device = new WoSmartLockPro(peripheral, this.noble);
-                        break;
-                    case SwitchBotBLEModel.BlindTilt:
-                        device = new WoBlindTilt(peripheral, this.noble);
-                        break;
-                    default: // 'resetting', 'unknown'
-                        device = new SwitchbotDevice(peripheral, this.noble);
-                }
+    async createDevice(peripheral, id, model) {
+        const ad = await Advertising.parse(peripheral, this.log.bind(this));
+        if (ad && await this.filterAd(ad, id, model)) {
+            switch (ad.serviceData.model) {
+                case SwitchBotBLEModel.Bot: return new WoHand(peripheral, this.noble);
+                case SwitchBotBLEModel.Curtain:
+                case SwitchBotBLEModel.Curtain3: return new WoCurtain(peripheral, this.noble);
+                case SwitchBotBLEModel.Humidifier: return new WoHumi(peripheral, this.noble);
+                case SwitchBotBLEModel.Meter:
+                case SwitchBotBLEModel.MeterPlus: return new WoSensorTH(peripheral, this.noble);
+                case SwitchBotBLEModel.Hub2: return new WoHub2(peripheral, this.noble);
+                case SwitchBotBLEModel.OutdoorMeter: return new WoIOSensorTH(peripheral, this.noble);
+                case SwitchBotBLEModel.MotionSensor: return new WoPresence(peripheral, this.noble);
+                case SwitchBotBLEModel.ContactSensor: return new WoContact(peripheral, this.noble);
+                case SwitchBotBLEModel.ColorBulb: return new WoBulb(peripheral, this.noble);
+                case SwitchBotBLEModel.CeilingLight:
+                case SwitchBotBLEModel.CeilingLightPro: return new WoCeilingLight(peripheral, this.noble);
+                case SwitchBotBLEModel.StripLight: return new WoStrip(peripheral, this.noble);
+                case SwitchBotBLEModel.PlugMiniUS:
+                case SwitchBotBLEModel.PlugMiniJP: return new WoPlugMini(peripheral, this.noble);
+                case SwitchBotBLEModel.Lock: return new WoSmartLock(peripheral, this.noble);
+                case SwitchBotBLEModel.LockPro: return new WoSmartLockPro(peripheral, this.noble);
+                case SwitchBotBLEModel.BlindTilt: return new WoBlindTilt(peripheral, this.noble);
+                default: return new SwitchbotDevice(peripheral, this.noble);
             }
-            return device || null;
-        }
-        else {
-            return null;
         }
+        return null;
     }
     /**
      * Filters advertising data based on id and model.
@@ -279,23 +203,17 @@ export class SwitchBotBLE extends EventEmitter {
      * @param {Ad} ad - The advertising data.
      * @param {string} id - The device id.
      * @param {string} model - The device model.
-     * @returns {boolean} - True if the advertising data matches the id and model, false otherwise.
+     * @returns {Promise<boolean>} - True if the advertising data matches the id and model, false otherwise.
      */
-    async filterAdvertising(ad, id, model) {
+    async filterAd(ad, id, model) {
         if (!ad) {
             return false;
         }
-        if (id) {
-            id = id.toLowerCase().replace(/:/g, '');
-            const ad_id = ad.address.toLowerCase().replace(/[^a-z0-9]/g, '');
-            if (ad_id !== id) {
-                return false;
-            }
+        if (id && ad.address.toLowerCase().replace(/[^a-z0-9]/g, '') !== id.toLowerCase().replace(/:/g, '')) {
+            return false;
         }
-        if (model) {
-            if (ad.serviceData.model !== model) {
-                return false;
-            }
+        if (model && ad.serviceData.model !== model) {
+            return false;
         }
         return true;
     }
@@ -306,77 +224,31 @@ export class SwitchBotBLE extends EventEmitter {
      * @returns {Promise<void>} - Resolves when scanning starts successfully.
      */
     async startScan(params = {}) {
-        const promise = new Promise((resolve, reject) => {
-            // Check the parameters
-            const valid = parameterChecker.check(params, {
-                model: {
-                    required: false,
-                    type: 'string',
-                    enum: [
-                        SwitchBotBLEModel.Bot,
-                        SwitchBotBLEModel.Curtain,
-                        SwitchBotBLEModel.Curtain3,
-                        SwitchBotBLEModel.Humidifier,
-                        SwitchBotBLEModel.Meter,
-                        SwitchBotBLEModel.MeterPlus,
-                        SwitchBotBLEModel.Hub2,
-                        SwitchBotBLEModel.OutdoorMeter,
-                        SwitchBotBLEModel.MotionSensor,
-                        SwitchBotBLEModel.ContactSensor,
-                        SwitchBotBLEModel.ColorBulb,
-                        SwitchBotBLEModel.CeilingLight,
-                        SwitchBotBLEModel.CeilingLightPro,
-                        SwitchBotBLEModel.StripLight,
-                        SwitchBotBLEModel.PlugMiniUS,
-                        SwitchBotBLEModel.PlugMiniJP,
-                        SwitchBotBLEModel.Lock,
-                        SwitchBotBLEModel.LockPro,
-                        SwitchBotBLEModel.BlindTilt,
-                    ],
-                },
-                id: { required: false, type: 'string', min: 12, max: 17 },
-            }, false);
-            if (!valid) {
-                this.emitLog('error', `parameterChecker: ${JSON.stringify(parameterChecker.error.message)}`);
-                reject(new Error(parameterChecker.error.message));
-                return;
-            }
-            // Initialize the noble object
-            this._init()
-                .then(() => {
-                if (this.noble === null) {
-                    return reject(new Error('noble object failed to initialize'));
+        await this.ready;
+        await this.validate(params, {
+            model: { required: false, type: 'string', enum: Object.values(SwitchBotBLEModel) },
+            id: { required: false, type: 'string', min: 12, max: 17 },
+        });
+        await this.waitForPowerOn();
+        if (!this.noble) {
+            throw new Error('noble object failed to initialize');
+        }
+        const p = { model: params.model || '', id: params.id || '' };
+        this.noble.on('discover', async (peripheral) => {
+            const ad = await Advertising.parse(peripheral, this.log.bind(this));
+            if (ad && await this.filterAd(ad, p.id, p.model)) {
+                if (this.onadvertisement) {
+                    this.onadvertisement(ad);
                 }
-                // Determine the values of the parameters
-                const p = {
-                    model: params.model || '',
-                    id: params.id || '',
-                };
-                // Set a handler for the 'discover' event
-                this.noble.on('discover', async (peripheral) => {
-                    const ad = await Advertising.parse(peripheral, this.emitLog.bind(this));
-                    if (ad && await this.filterAdvertising(ad, p.id, p.model)) {
-                        if (this.onadvertisement
-                            && typeof this.onadvertisement === 'function') {
-                            this.onadvertisement(ad);
-                        }
-                    }
-                });
-                // Start scanning
-                this.noble.startScanningAsync(PRIMARY_SERVICE_UUID_LIST, true).then(() => {
-                    this.emitLog('info', 'Started Scanning for SwitchBot BLE devices.');
-                    resolve();
-                }).catch((error) => {
-                    this.emitLog('error', `startScanning error: ${JSON.stringify(error.message)}`);
-                    reject(error);
-                });
-            })
-                .catch((error) => {
-                this.emitLog('error', `startScanning error: ${JSON.stringify(error.message)}`);
-                reject(error);
-            });
+            }
         });
-        return promise;
+        try {
+            await this.noble.startScanningAsync(PRIMARY_SERVICE_UUID_LIST, true);
+            this.log('info', 'Started Scanning for SwitchBot BLE devices.');
+        }
+        catch (e) {
+            this.log('error', `startScanningAsync error: ${JSON.stringify(e.message ?? e)}`);
+        }
     }
     /**
      * Stops scanning for SwitchBot devices.
@@ -384,12 +256,17 @@ export class SwitchBotBLE extends EventEmitter {
      * @returns {Promise<void>} - Resolves when scanning stops successfully.
      */
     async stopScan() {
-        if (this.noble === null) {
+        if (!this.noble) {
             return;
         }
         this.noble.removeAllListeners('discover');
-        this.noble.stopScanningAsync();
-        this.emitLog('info', 'Stopped Scanning for SwitchBot BLE devices.');
+        try {
+            await this.noble.stopScanningAsync();
+            this.log('info', 'Stopped Scanning for SwitchBot BLE devices.');
+        }
+        catch (e) {
+            this.log('error', `stopScanningAsync error: ${JSON.stringify(e.message ?? e)}`);
+        }
     }
     /**
      * Waits for the specified time.
@@ -398,21 +275,10 @@ export class SwitchBotBLE extends EventEmitter {
      * @returns {Promise<void>} - Resolves after the specified time.
      */
     async wait(msec) {
-        return new Promise((resolve, reject) => {
-            // Check the parameters
-            const valid = parameterChecker.check({
-                msec,
-            }, {
-                msec: { required: true, type: 'integer', min: 0 },
-            }, true);
-            if (!valid) {
-                this.emitLog('error', `parameterChecker: ${JSON.stringify(parameterChecker.error.message)}`);
-                reject(new Error(parameterChecker.error.message));
-                return;
-            }
-            // Set a timer
-            setTimeout(resolve, msec);
-        });
+        if (typeof msec !== 'number' || msec < 0) {
+            throw new Error('Invalid parameter: msec must be a non-negative integer.');
+        }
+        return new Promise(resolve => setTimeout(resolve, msec));
     }
 }
 export { SwitchbotDevice };