Remove unneeded Noble code (#297)

Author: dnicolson

src/device.ts

@@ -2,8 +2,7 @@
  *
  * device.ts: Switchbot BLE API registration.
  */
-import type Noble from '@stoprocent/noble'
-import type { Characteristic, Peripheral, Service } from '@stoprocent/noble'
+import type { Characteristic, Noble, Peripheral, Service } from '@stoprocent/noble'
 
 import type { airPurifierServiceData, airPurifierTableServiceData, batteryCirculatorFanServiceData, blindTiltServiceData, botServiceData, ceilingLightProServiceData, ceilingLightServiceData, colorBulbServiceData, contactSensorServiceData, curtain3ServiceData, curtainServiceData, hub2ServiceData, humidifier2ServiceData, humidifierServiceData, keypadDetectorServiceData, lockProServiceData, lockServiceData, meterPlusServiceData, meterProCO2ServiceData, meterProServiceData, meterServiceData, motionSensorServiceData, outdoorMeterServiceData, plugMiniJPServiceData, plugMiniUSServiceData, relaySwitch1PMServiceData, relaySwitch1ServiceData, remoteServiceData, robotVacuumCleanerServiceData, stripLightServiceData, waterLeakDetectorServiceData } from './types/ble.js'
 
@@ -295,7 +294,7 @@ export interface Params {
   model?: string
   id?: string
   quick?: boolean
-  noble?: typeof Noble
+  noble?: Noble
 }
 
 export interface ErrorObject {
@@ -310,10 +309,7 @@ export interface Chars {
 }
 
 export interface NobleTypes {
-  noble: typeof Noble & {
-    state: 'unknown' | 'resetting' | 'unsupported' | 'unauthorized' | 'poweredOff' | 'poweredOn'
-  }
-  state: 'unknown' | 'resetting' | 'unsupported' | 'unauthorized' | 'poweredOff' | 'poweredOn'
+  noble: Noble
   peripheral: Peripheral
 }
 
@@ -553,7 +549,7 @@ export class ErrorUtils {
  * Represents a Switchbot Device.
  */
 export class SwitchbotDevice extends EventEmitter {
-  private noble: typeof Noble
+  private noble: Noble
   private peripheral: NobleTypes['peripheral']
   private characteristics: Chars | null = null
   private deviceId!: string
@@ -572,7 +568,7 @@ export class SwitchbotDevice extends EventEmitter {
    * @param peripheral The peripheral object from noble.
    * @param noble The Noble object.
    */
-  constructor(peripheral: NobleTypes['peripheral'], noble: typeof Noble) {
+  constructor(peripheral: NobleTypes['peripheral'], noble: Noble) {
     super()
     this.peripheral = peripheral
     this.noble = noble

src/switchbot-ble.ts

@@ -76,39 +76,6 @@ export class SwitchBotBLE extends EventEmitter {
     }
   }
 
-  /**
-   * Waits for the noble object to be powered on.
-   *
-   * @returns {Promise<void>} - Resolves when the noble object is powered on.
-   */
-  private async waitForPowerOn(): Promise<void> {
-    await this.ready
-    if (this.noble && this.noble.state === 'poweredOn') {
-      return
-    }
-
-    return new Promise<void>((resolve, reject) => {
-      this.noble?.once('stateChange', (state: NobleTypes['state']) => {
-        switch (state) {
-          case 'unsupported':
-          case 'unauthorized':
-          case 'poweredOff':
-            reject(new Error(`Failed to initialize the Noble object: ${state}`))
-            break
-          case 'resetting':
-          case 'unknown':
-            reject(new Error(`Adapter is not ready: ${state}`))
-            break
-          case 'poweredOn':
-            resolve()
-            break
-          default:
-            reject(new Error(`Unknown state: ${state}`))
-        }
-      })
-    })
-  }
-
   /**
    * Discovers Switchbot devices with enhanced error handling and logging.
    * @param params The discovery parameters.
@@ -123,7 +90,7 @@ export class SwitchBotBLE extends EventEmitter {
       quick: { required: false, type: 'boolean' },
     })
 
-    await this.waitForPowerOn()
+    await this.noble.waitForPoweredOnAsync()
 
     if (!this.noble) {
       throw new Error('Noble BLE library failed to initialize properly')
@@ -303,7 +270,7 @@ export class SwitchBotBLE extends EventEmitter {
       id: { required: false, type: 'string', min: 12, max: 17 },
     })
 
-    await this.waitForPowerOn()
+    await this.noble.waitForPoweredOnAsync()
 
     if (!this.noble) {
       throw new Error('noble object failed to initialize')