@microbit/microbit-connection 0.9.0-apps.alpha.16 → 0.9.0-apps.alpha.18

package/build/esm/{bluetooth.js → bluetooth/connection.js}

@@ -6,39 +6,46 @@
 import { BleClient } from "@capacitor-community/bluetooth-le";
 import { Capacitor } from "@capacitor/core";
 import MemoryMap from "nrf-intel-hex";
-import { BluetoothDeviceWrapper, isAndroid, scanningTimeoutInMs, } from "./bluetooth-device-wrapper.js";
-import { profile } from "./bluetooth-profile.js";
-import { AfterRequestDevice, BeforeRequestDevice, ConnectionStatus, ConnectionStatusEvent, DeviceError, FlashDataError, ProgressStage, } from "./device.js";
-import { TypedEventTarget } from "./events.js";
-import { ConsoleLogging } from "./logging.js";
+import { BluetoothDeviceWrapper, isAndroid, scanningTimeoutInMs, } from "./device-wrapper.js";
+import { profile } from "./profile.js";
+import { ConnectionStatus, DeviceError, FlashDataError, assertConnected, ProgressStage, } from "../device.js";
+import { TypedEventTarget } from "../events.js";
+import { ConsoleLogging } from "../logging.js";
 import { fullFlash } from "./flashing/flashing-full.js";
 import partialFlash, { PartialFlashResult, } from "./flashing/flashing-partial.js";
-import { throwIfUnavailable } from "./availability.js";
-import { truncateHexAfterEof } from "./hex-flash-data-source.js";
+import { throwIfUnavailable } from "../availability.js";
+import { truncateHexAfterEof } from "../hex-util.js";
 import { DefaultDeviceBondState, } from "./device-bond-state.js";
-import { TimeoutError } from "./async-util.js";
+import { TimeoutError } from "../async-util.js";
+import { withBleErrorMapping } from "./ble-error.js";
 let bleClientInitialized = false;
 /**
  * A Bluetooth connection factory.
  */
-export const createWebBluetoothConnection = (options) => new MicrobitWebBluetoothConnectionImpl(options);
+export const createBluetoothConnection = (options) => new MicrobitBluetoothConnectionImpl(options);
 /**
  * A Bluetooth connection to a micro:bit device.
  */
-class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
+class MicrobitBluetoothConnectionImpl extends TypedEventTarget {
     constructor(options = {}) {
         super();
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "bluetooth"
+        });
         Object.defineProperty(this, "status", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ConnectionStatus.NO_AUTHORIZED_DEVICE
+            value: ConnectionStatus.NoAuthorizedDevice
         });
         /**
-         * The USB device we last connected to.
+         * The BLE device we last connected to.
          * Cleared if it is disconnected.
          */
-        Object.defineProperty(this, "device", {
+        Object.defineProperty(this, "bleDevice", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -56,7 +63,19 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "connection", {
+        /**
+         * Device-specific state. Created on connect, cleared on disconnect.
+         */
+        Object.defineProperty(this, "device", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /**
+         * Cached device property that persists across reconnections until clearDevice.
+         */
+        Object.defineProperty(this, "cachedBoardVersion", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -85,10 +104,10 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
             options.deviceBondState || new DefaultDeviceBondState();
     }
     eventActivated(type) {
-        this.connection?.startNotifications(type);
+        this.device?.startNotifications(type);
     }
     eventDeactivated(type) {
-        this.connection?.stopNotifications(type);
+        this.device?.stopNotifications(type);
     }
     log(v) {
         this.logging.log(v);
@@ -156,7 +175,8 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
         }
     }
     getBoardVersion() {
-        return this.connection?.boardVersion;
+        assertConnected(this.cachedBoardVersion);
+        return this.cachedBoardVersion;
     }
     async connect(options) {
         const progress = options?.progress ?? (() => { });
@@ -168,21 +188,24 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
         // disconnect before attempting to connect.
         this.waitForPostFlashDisconnectPromise &&
             (await this.waitForPostFlashDisconnectPromise);
-        if (!this.device || !this.connection) {
+        if (!this.bleDevice || !this.device) {
             progress(ProgressStage.FindingDevice);
             const device = await this.requestDevice(options?.signal);
-            this.connection = new BluetoothDeviceWrapper(device, this.logging, this.deviceBondState, this.dispatchTypedEvent.bind(this), () => this.getActiveEvents(), {
-                onConnecting: () => this.setStatus(ConnectionStatus.CONNECTING),
-                onSuccess: () => this.setStatus(ConnectionStatus.CONNECTED),
-                onDisconnect: () => this.setStatus(ConnectionStatus.DISCONNECTED),
+            this.device = new BluetoothDeviceWrapper(device, this.logging, this.deviceBondState, this.dispatchEvent.bind(this), () => this.getActiveEvents(), {
+                onConnecting: () => this.setStatus(ConnectionStatus.Connecting),
+                onSuccess: () => {
+                    this.cachedBoardVersion = this.device.boardVersion;
+                    this.setStatus(ConnectionStatus.Connected);
+                },
+                onDisconnect: () => this.setStatus(ConnectionStatus.Disconnected),
             });
         }
-        await this.connection.connect(options);
+        await this.device.connect(options);
     }
     async disconnect() {
         try {
-            if (this.connection) {
-                await this.connection.disconnect();
+            if (this.device) {
+                await this.device.disconnect();
             }
         }
         catch (e) {
@@ -192,7 +215,7 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
             });
         }
         finally {
-            this.setStatus(ConnectionStatus.DISCONNECTED);
+            this.setStatus(ConnectionStatus.Disconnected);
             this.logging.event({
                 type: "Bluetooth-info",
                 message: "disconnected",
@@ -204,105 +227,118 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
         this.status = newStatus;
         this.log("Bluetooth connection status " + newStatus);
         if (this.deferredUpdatesPreviousStatus === undefined) {
-            this.dispatchTypedEvent("status", new ConnectionStatusEvent(newStatus, previousStatus));
-        }
-    }
-    serialWrite(data) {
-        if (this.connection) {
-            // TODO
+            this.dispatchEvent("status", {
+                status: newStatus,
+                previousStatus,
+            });
         }
-        return Promise.resolve();
     }
     async clearDevice() {
         await this.disconnect();
-        this.device = undefined;
-        this.setStatus(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+        this.bleDevice = undefined;
+        this.cachedBoardVersion = undefined;
+        this.setStatus(ConnectionStatus.NoAuthorizedDevice);
     }
     setNameFilter(name) {
         this.nameFilter = name;
     }
     async requestDevice(signal) {
-        // TODO: is this possible to reinstate?
+        // Support both the default "BBC micro:bit" name and the shorter "uBit"
+        // name used by some MakeCode extensions (e.g. bsiever/microbit-pxt-blehid).
         // See https://github.com/bsiever/microbit-pxt-blehid/issues/31
-        // namePrefix: this.nameFilter
-        //   ? `uBit [${this.nameFilter}]`
-        //   : "uBit",
-        const namePrefix = this.nameFilter
-            ? `BBC micro:bit [${this.nameFilter}]`
-            : "BBC micro:bit";
+        const namePrefixes = this.nameFilter
+            ? [`BBC micro:bit [${this.nameFilter}]`, `uBit [${this.nameFilter}]`]
+            : ["BBC micro:bit", "uBit"];
         // If we have a cached device, check if it still matches the current filter.
         // If not, clear it so we find a new device.
-        if (this.device) {
-            if (this.device.name?.startsWith(namePrefix)) {
-                return this.device;
+        if (this.bleDevice) {
+            if (namePrefixes.some((p) => this.bleDevice.name?.startsWith(p))) {
+                return this.bleDevice;
             }
-            this.log(`Cached device "${this.device.name}" doesn't match filter "${namePrefix}", clearing`);
+            this.log(`Cached device "${this.bleDevice.name}" doesn't match filters "${namePrefixes.join(", ")}", clearing`);
             await this.clearDevice();
         }
-        this.dispatchTypedEvent("beforerequestdevice", new BeforeRequestDevice());
+        this.dispatchEvent("beforerequestdevice");
         try {
-            this.device = Capacitor.isNativePlatform()
-                ? await this.requestDeviceNative(namePrefix, signal)
-                : await this.requestDeviceWeb(namePrefix);
-            if (!this.device) {
-                this.setStatus(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+            this.bleDevice = Capacitor.isNativePlatform()
+                ? await this.requestDeviceNative(namePrefixes, signal)
+                : await this.requestDeviceWeb(namePrefixes);
+            if (!this.bleDevice) {
+                this.setStatus(ConnectionStatus.NoAuthorizedDevice);
                 throw new DeviceError({
                     code: "no-device-selected",
                     message: "No device selected",
                 });
             }
-            return this.device;
+            return this.bleDevice;
         }
         finally {
-            this.dispatchTypedEvent("afterrequestdevice", new AfterRequestDevice());
+            this.dispatchEvent("afterrequestdevice");
         }
     }
     async getAccelerometerData() {
-        return this.connection?.accelerometer.getData();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.accelerometer.getData());
     }
     async getAccelerometerPeriod() {
-        return this.connection?.accelerometer.getPeriod();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.accelerometer.getPeriod());
     }
     async setAccelerometerPeriod(value) {
-        return this.connection?.accelerometer.setPeriod(value);
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.accelerometer.setPeriod(value));
     }
     async setLedText(text) {
-        return this.connection?.led.setText(text);
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.led.setText(text));
     }
     async getLedScrollingDelay() {
-        return this.connection?.led.getScrollingDelay();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.led.getScrollingDelay());
     }
     async setLedScrollingDelay(delayInMillis) {
-        await this.connection?.led.setScrollingDelay(delayInMillis);
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.led.setScrollingDelay(delayInMillis));
     }
     async getLedMatrix() {
-        return await this.connection?.led.getLedMatrix();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.led.getLedMatrix());
     }
     async setLedMatrix(matrix) {
-        await this.connection?.led.setLedMatrix(matrix);
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.led.setLedMatrix(matrix));
     }
     async getMagnetometerData() {
-        return this.connection?.magnetometer.getData();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.magnetometer.getData());
     }
     async getMagnetometerPeriod() {
-        return this.connection?.magnetometer.getPeriod();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.magnetometer.getPeriod());
     }
     async setMagnetometerPeriod(value) {
-        return this.connection?.magnetometer.setPeriod(value);
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.magnetometer.setPeriod(value));
     }
     async getMagnetometerBearing() {
-        return this.connection?.magnetometer.getBearing();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.magnetometer.getBearing());
     }
     async triggerMagnetometerCalibration() {
-        await this.connection?.magnetometer.triggerCalibration();
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.magnetometer.triggerCalibration());
     }
     async uartWrite(data) {
-        await this.connection?.uart.writeData(data);
+        assertConnected(this.device);
+        return withBleErrorMapping(() => this.device.uart.writeData(data));
     }
     /**
      * Flash the micro:bit.
      *
-     * Note that this will always leave the connection disconnected.
+     * Always leaves the connection in {@link ConnectionStatus.Disconnected} state.
+     * Bluetooth connects directly to the application processor, which reboots
+     * after flashing, so the connection is necessarily lost. Call {@link connect}
+     * again after flashing to reconnect.
      *
      * @param dataSource The data to use.
      * @param options Flash options and progress callback.
@@ -312,15 +348,15 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
         try {
             // We'll disconnect/reconnect multiple times due to device resets, but reporting this is unhelpful.
             this.deferredUpdatesPreviousStatus = this.status;
-            if (this.status !== ConnectionStatus.CONNECTED) {
+            if (this.status !== ConnectionStatus.Connected) {
                 await this.connect({ progress, signal: options.signal });
             }
-            const connection = this.connection;
+            const connection = this.device;
             try {
                 const boardVersion = connection.boardVersion;
                 if (!boardVersion) {
                     throw new DeviceError({
-                        code: "device-disconnected",
+                        code: "connection-error",
                         message: "No board version found",
                     });
                 }
@@ -328,9 +364,9 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
                 if (!memoryMap) {
                     throw new FlashDataError("Could not convert hex to memory map");
                 }
-                if (!this.device) {
+                if (!this.bleDevice) {
                     throw new DeviceError({
-                        code: "device-disconnected",
+                        code: "connection-error",
                         message: "No device",
                     });
                 }
@@ -339,7 +375,8 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
                 if (partialFlashResult === PartialFlashResult.AttemptFullFlash) {
                     await fullFlash(connection, boardVersion, memoryMap, progress);
                 }
-                else if (partialFlashResult === PartialFlashResult.AlreadyUpToDate ||
+                this.dispatchEvent("flash");
+                if (partialFlashResult === PartialFlashResult.AlreadyUpToDate ||
                     partialFlashResult === PartialFlashResult.Success) {
                     this.waitForPostFlashDisconnectPromise = (async () => {
                         try {
@@ -363,7 +400,7 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
                             }
                         }
                     })();
-                    this.setStatus(ConnectionStatus.DISCONNECTED);
+                    this.setStatus(ConnectionStatus.Disconnected);
                 }
             }
             catch (e) {
@@ -379,7 +416,10 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
         finally {
             const previousStatus = this.deferredUpdatesPreviousStatus;
             this.deferredUpdatesPreviousStatus = undefined;
-            this.dispatchTypedEvent("status", new ConnectionStatusEvent(this.status, previousStatus));
+            this.dispatchEvent("status", {
+                status: this.status,
+                previousStatus,
+            });
         }
     }
     /**
@@ -387,22 +427,33 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
      *
      * @returns device or undefined if user cancels.
      */
-    async requestDeviceWeb(namePrefix) {
+    async requestDeviceWeb(namePrefixes) {
+        const optionalServices = [
+            profile.accelerometer.id,
+            profile.button.id,
+            profile.deviceInformation.id,
+            profile.dfuControl.id,
+            profile.event.id,
+            profile.ioPin.id,
+            profile.led.id,
+            profile.magnetometer.id,
+            profile.temperature.id,
+            profile.uart.id,
+        ];
+        // Temporarily patch navigator.bluetooth.requestDevice to support multiple
+        // name prefix filters. The capacitor-ble plugin only supports a single
+        // namePrefix, but the Web Bluetooth API supports a filters array.
+        // By patching at this level the plugin's internal deviceMap is populated
+        // naturally when its own requestDevice completes.
+        const orig = navigator.bluetooth.requestDevice.bind(navigator.bluetooth);
         try {
+            navigator.bluetooth.requestDevice = (options) => orig({
+                ...options,
+                filters: namePrefixes.map((namePrefix) => ({ namePrefix })),
+            });
             return await BleClient.requestDevice({
-                namePrefix,
-                optionalServices: [
-                    profile.accelerometer.id,
-                    profile.button.id,
-                    profile.deviceInformation.id,
-                    profile.dfuControl.id,
-                    profile.event.id,
-                    profile.ioPin.id,
-                    profile.led.id,
-                    profile.magnetometer.id,
-                    profile.temperature.id,
-                    profile.uart.id,
-                ],
+                namePrefix: namePrefixes[0],
+                optionalServices,
             });
         }
         catch (e) {
@@ -411,6 +462,9 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
             }
             throw e;
         }
+        finally {
+            navigator.bluetooth.requestDevice = orig;
+        }
     }
     /**
      * Finds device with specified name prefix.
@@ -418,19 +472,17 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
      * @returns device or undefined if none can be found.
      * @throws DeviceError with code "aborted" if signal is aborted.
      */
-    async requestDeviceNative(namePrefix, signal) {
+    async requestDeviceNative(namePrefixes, signal) {
         if (signal?.aborted) {
             throw new DeviceError({ code: "aborted", message: "Connection aborted" });
         }
+        const matchesAnyPrefix = (name) => !!name && namePrefixes.some((p) => name.startsWith(p));
         // Check for existing bonded devices.
-        const bonded = await this.checkBondedDevices((device) => {
-            const name = device.name;
-            return !!name && name.startsWith(namePrefix);
-        });
+        const bonded = await this.checkBondedDevices((device) => matchesAnyPrefix(device.name));
         if (bonded) {
             return bonded;
         }
-        this.log(`Scanning for device - ${namePrefix}`);
+        this.log(`Scanning for device - ${namePrefixes.join(", ")}`);
         let found = false;
         let aborted = false;
         const scanPromise = new Promise((resolve) => 
@@ -440,8 +492,8 @@ class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
             // isn't matched by the name filter but the advertising name is in the
             // localName on the device. So we filter here instead.  This happens on
             // iOS if DFU fails / is interrupted.
-            if (result.device.name?.startsWith(namePrefix) ||
-                result.localName?.startsWith(namePrefix)) {
+            if (matchesAnyPrefix(result.device.name) ||
+                matchesAnyPrefix(result.localName)) {
                 found = true;
                 await BleClient.stopLEScan();
                 resolve(result.device);
@@ -486,4 +538,4 @@ const convertDataToMemoryMap = (data) => {
     }
     return MemoryMap.fromHex(truncateHexAfterEof(data));
 };
-//# sourceMappingURL=bluetooth.js.map
+//# sourceMappingURL=connection.js.map

package/build/esm/bluetooth/connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/bluetooth/connection.ts"],"names":[],"mappings":"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"}

package/build/esm/{bluetooth.test.js → bluetooth/connection.test.js}

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import { ConnectionStatus } from "./device.js";
-import { createWebBluetoothConnection } from "./bluetooth.js";
+import { ConnectionStatus } from "../device.js";
+import { createBluetoothConnection } from "./connection.js";
 import { expect, vi, describe, it } from "vitest";
 // Mock Capacitor
 vi.mock("@capacitor/core", () => ({
@@ -49,24 +49,24 @@ const setupNavigatorMock = () => {
 describe("Bluetooth connection status events", () => {
     it("emits status events with correct previousStatus", async () => {
         setupNavigatorMock();
-        const connection = createWebBluetoothConnection();
+        const connection = createBluetoothConnection();
         await connection.initialize();
-        expect(connection.status).toBe(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+        expect(connection.status).toBe(ConnectionStatus.NoAuthorizedDevice);
         const events = [];
         connection.addEventListener("status", (e) => {
             events.push(e);
         });
         await connection.disconnect();
         expect(events).toHaveLength(1);
-        expect(events[0].status).toBe(ConnectionStatus.DISCONNECTED);
-        expect(events[0].previousStatus).toBe(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+        expect(events[0].status).toBe(ConnectionStatus.Disconnected);
+        expect(events[0].previousStatus).toBe(ConnectionStatus.NoAuthorizedDevice);
     });
     it("defers status updates during flash, emitting single catch-up event", async () => {
         setupNavigatorMock();
-        const connection = createWebBluetoothConnection();
+        const connection = createBluetoothConnection();
         await connection.initialize();
         const statusBeforeFlash = connection.status;
-        expect(statusBeforeFlash).toBe(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+        expect(statusBeforeFlash).toBe(ConnectionStatus.NoAuthorizedDevice);
         const events = [];
         connection.addEventListener("status", (e) => {
             events.push(e);
@@ -83,4 +83,4 @@ describe("Bluetooth connection status events", () => {
         expect(events[0].previousStatus).toBe(statusBeforeFlash);
     });
 });
-//# sourceMappingURL=bluetooth.test.js.map
+//# sourceMappingURL=connection.test.js.map

package/build/esm/bluetooth/connection.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection.test.js","sourceRoot":"","sources":["../../../src/bluetooth/connection.test.ts"],"names":[],"mappings":"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"}

package/build/esm/bluetooth/device-bond-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-bond-state.js","sourceRoot":"","sources":["../../../src/bluetooth/device-bond-state.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,MAAM,OAAO,sBAAsB;IAAnC;QACU;;;;mBAAsC,EAAE;WAAC;IAOnD,CAAC;IANC,SAAS,CAAC,EAAU,EAAE,QAAiB;QACrC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;IACjC,CAAC;IACD,QAAQ,CAAC,EAAU;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC;IACtC,CAAC;CACF"}

package/build/esm/{bluetooth-device-wrapper.d.ts → bluetooth/device-wrapper.d.ts}

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: MIT
  */
 import { BleDevice, TimeoutOptions } from "@capacitor-community/bluetooth-le";
-import { AccelerometerService } from "./accelerometer-service.js";
-import { ButtonService } from "./button-service.js";
-import { DeviceInformationService } from "./device-information-service.js";
-import { BoardVersion, ConnectOptions } from "./device.js";
-import { LedService } from "./led-service.js";
-import { Logging, LoggingEvent } from "./logging.js";
-import { MagnetometerService } from "./magnetometer-service.js";
-import { ServiceConnectionEventMap, TypedServiceEvent, TypedServiceEventDispatcher } from "./service-events.js";
-import { UARTService } from "./uart-service.js";
+import { AccelerometerService } from "./services/accelerometer-service.js";
+import { ButtonService } from "./services/button-service.js";
+import { DeviceInformationService } from "./services/device-information-service.js";
+import { BoardVersion, ConnectOptions } from "../device.js";
+import { LedService } from "./services/led-service.js";
+import { Logging, LoggingEvent } from "../logging.js";
+import { MagnetometerService } from "./services/magnetometer-service.js";
+import { ServiceConnectionEventMap, TypedServiceEvent, TypedServiceEventDispatcher } from "../service-events.js";
+import { UARTService } from "./services/uart-service.js";
 import { DeviceBondState } from "./device-bond-state.js";
 /**
  * The @capacitor-community/bluetooth-le plugin throws this message when
@@ -35,7 +35,7 @@ interface ConnectCallbacks {
     onSuccess: () => void;
 }
 export declare class BluetoothDeviceWrapper implements Logging {
-    readonly device: BleDevice;
+    readonly bleDevice: BleDevice;
     private logging;
     private deviceBondState;
     private currentEvents;
@@ -55,7 +55,7 @@ export declare class BluetoothDeviceWrapper implements Logging {
     private services;
     private waitingForDisconnectEventCallbacks;
     private internalNotificationListeners;
-    constructor(device: BleDevice, logging: Logging | undefined, deviceBondState: DeviceBondState | undefined, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks);
+    constructor(bleDevice: BleDevice, logging: Logging | undefined, deviceBondState: DeviceBondState | undefined, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks);
     setBonded(isBonded: boolean): void;
     connect(options?: ConnectOptions): Promise<void>;
     private connectInternal;