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

package/build/{esm/bluetooth.d.ts → cjs/bluetooth/connection.d.ts}

@@ -1,15 +1,12 @@
-import { AccelerometerData } from "./accelerometer.js";
-import { DeviceConnection, FlashDataSource, FlashOptions } from "./device.js";
-import { LedMatrix } from "./led.js";
-import { Logging } from "./logging.js";
-import { MagnetometerData } from "./magnetometer.js";
-import { ServiceConnectionEventMap } from "./service-events.js";
+import { DeviceConnection, FlashDataSource, FlashOptions } from "../device.js";
+import { Logging } from "../logging.js";
+import { AccelerometerData, LedMatrix, MagnetometerData, ServiceConnectionEventMap } from "../service-events.js";
 import { DeviceBondState } from "./device-bond-state.js";
-export interface MicrobitWebBluetoothConnectionOptions {
+export interface MicrobitBluetoothConnectionOptions {
     logging?: Logging;
     deviceBondState?: DeviceBondState;
 }
-export interface MicrobitWebBluetoothConnection extends DeviceConnection<ServiceConnectionEventMap> {
+export interface MicrobitBluetoothConnection extends DeviceConnection<ServiceConnectionEventMap> {
     /**
      * Sets micro:bit name filter for device requesting.
      *
@@ -19,96 +16,103 @@ export interface MicrobitWebBluetoothConnection extends DeviceConnection<Service
     /**
      * Gets micro:bit accelerometer data.
      *
-     * @returns accelerometer data or undefined if there is no connection.
+     * @returns accelerometer data.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
-    getAccelerometerData(): Promise<AccelerometerData | undefined>;
+    getAccelerometerData(): Promise<AccelerometerData>;
     /**
      * Gets micro:bit accelerometer period.
      *
-     * @returns accelerometer period or undefined if there is no connection.
+     * @returns accelerometer period.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
-    getAccelerometerPeriod(): Promise<number | undefined>;
+    getAccelerometerPeriod(): Promise<number>;
     /**
      * Sets micro:bit accelerometer period.
      *
      * @param value The accelerometer period.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
     setAccelerometerPeriod(value: number): Promise<void>;
     /**
      * Sets micro:bit LED text.
      *
      * @param text The text displayed on micro:bit LED.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
     setLedText(text: string): Promise<void>;
     /**
      * Gets micro:bit LED scrolling delay.
      *
      * @returns LED scrolling delay in milliseconds.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
-    getLedScrollingDelay(): Promise<number | undefined>;
+    getLedScrollingDelay(): Promise<number>;
     /**
      * Sets micro:bit LED scrolling delay.
      *
      * @param delayInMillis LED scrolling delay in milliseconds.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
     setLedScrollingDelay(delayInMillis: number): Promise<void>;
     /**
      * Gets micro:bit LED matrix.
      *
      * @returns a boolean matrix representing the micro:bit LED display.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
-    getLedMatrix(): Promise<LedMatrix | undefined>;
+    getLedMatrix(): Promise<LedMatrix>;
     /**
      * Sets micro:bit LED matrix.
      *
      * @param matrix an boolean matrix representing the micro:bit LED display.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
     setLedMatrix(matrix: LedMatrix): Promise<void>;
     /**
      * Gets micro:bit magnetometer data.
      *
      * @returns magnetometer data.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
-    getMagnetometerData(): Promise<MagnetometerData | undefined>;
+    getMagnetometerData(): Promise<MagnetometerData>;
     /**
      * Gets micro:bit magnetometer bearing.
      *
      * @returns magnetometer bearing.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
-    getMagnetometerBearing(): Promise<number | undefined>;
+    getMagnetometerBearing(): Promise<number>;
     /**
      * Gets micro:bit magnetometer period.
      *
      * @returns magnetometer period.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
-    getMagnetometerPeriod(): Promise<number | undefined>;
+    getMagnetometerPeriod(): Promise<number>;
     /**
      * Sets micro:bit magnetometer period.
      *
      * @param value magnetometer period.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
     setMagnetometerPeriod(value: number): Promise<void>;
     /**
      * Triggers micro:bit magnetometer calibration.
+     *
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
     triggerMagnetometerCalibration(): Promise<void>;
     /**
      * Write UART messages.
      *
      * @param data UART message.
+     * @throws {DeviceError} with code `not-connected` if there is no connection.
      */
     uartWrite(data: Uint8Array): Promise<void>;
-    /**
-     * Flash the micro:bit.
-     *
-     * @param dataSource The data to use.
-     * @param options Flash options and progress callback.
-     * @throws {DeviceError} On flash failure. The error.code property indicates the failure type.
-     * @throws {FlashDataError} If data preparation fails.
-     */
     flash(dataSource: FlashDataSource, options: FlashOptions): Promise<void>;
 }
 /**
  * A Bluetooth connection factory.
  */
-export declare const createWebBluetoothConnection: (options?: MicrobitWebBluetoothConnectionOptions) => MicrobitWebBluetoothConnection;
+export declare const createBluetoothConnection: (options?: MicrobitBluetoothConnectionOptions) => MicrobitBluetoothConnection;

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWebBluetoothConnection = void 0;
+exports.createBluetoothConnection = void 0;
 /**
  * (c) 2021, Micro:bit Educational Foundation and contributors
  *
@@ -35,40 +35,40 @@ exports.createWebBluetoothConnection = void 0;
 const bluetooth_le_1 = require("@capacitor-community/bluetooth-le");
 const core_1 = require("@capacitor/core");
 const nrf_intel_hex_1 = __importDefault(require("nrf-intel-hex"));
-const bluetooth_device_wrapper_js_1 = require("./bluetooth-device-wrapper.js");
-const bluetooth_profile_js_1 = require("./bluetooth-profile.js");
-const device_js_1 = require("./device.js");
-const events_js_1 = require("./events.js");
-const logging_js_1 = require("./logging.js");
+const device_wrapper_js_1 = require("./device-wrapper.js");
+const profile_js_1 = require("./profile.js");
+const device_js_1 = require("../device.js");
+const events_js_1 = require("../events.js");
+const logging_js_1 = require("../logging.js");
 const flashing_full_js_1 = require("./flashing/flashing-full.js");
 const flashing_partial_js_1 = __importStar(require("./flashing/flashing-partial.js"));
-const availability_js_1 = require("./availability.js");
-const hex_flash_data_source_js_1 = require("./hex-flash-data-source.js");
+const availability_js_1 = require("../availability.js");
+const hex_util_js_1 = require("../hex-util.js");
 const device_bond_state_js_1 = require("./device-bond-state.js");
-const async_util_js_1 = require("./async-util.js");
+const async_util_js_1 = require("../async-util.js");
 let bleClientInitialized = false;
 /**
  * A Bluetooth connection factory.
  */
-const createWebBluetoothConnection = (options) => new MicrobitWebBluetoothConnectionImpl(options);
-exports.createWebBluetoothConnection = createWebBluetoothConnection;
+const createBluetoothConnection = (options) => new MicrobitBluetoothConnectionImpl(options);
+exports.createBluetoothConnection = createBluetoothConnection;
 /**
  * A Bluetooth connection to a micro:bit device.
  */
-class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
+class MicrobitBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
     constructor(options = {}) {
         super();
         Object.defineProperty(this, "status", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: device_js_1.ConnectionStatus.NO_AUTHORIZED_DEVICE
+            value: device_js_1.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,
@@ -86,7 +86,19 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.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,
@@ -115,10 +127,10 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
             options.deviceBondState || new device_bond_state_js_1.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);
@@ -151,7 +163,7 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
             // On Android, check if location services are enabled. This is only
             // required on Android < 12 (API < 31), but isLocationEnabled() returns
             // true on newer Android, so we can always check it.
-            if ((0, bluetooth_device_wrapper_js_1.isAndroid)()) {
+            if ((0, device_wrapper_js_1.isAndroid)()) {
                 const isLocationEnabled = await bluetooth_le_1.BleClient.isLocationEnabled();
                 if (!isLocationEnabled) {
                     return "location-disabled";
@@ -186,7 +198,8 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
         }
     }
     getBoardVersion() {
-        return this.connection?.boardVersion;
+        (0, device_js_1.assertConnected)(this.cachedBoardVersion);
+        return this.cachedBoardVersion;
     }
     async connect(options) {
         const progress = options?.progress ?? (() => { });
@@ -198,21 +211,22 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
         // disconnect before attempting to connect.
         this.waitForPostFlashDisconnectPromise &&
             (await this.waitForPostFlashDisconnectPromise);
-        if (!this.device || !this.connection) {
+        if (!this.bleDevice || !this.device) {
             progress(device_js_1.ProgressStage.FindingDevice);
             const device = await this.requestDevice(options?.signal);
-            this.connection = new bluetooth_device_wrapper_js_1.BluetoothDeviceWrapper(device, this.logging, this.deviceBondState, this.dispatchTypedEvent.bind(this), () => this.getActiveEvents(), {
-                onConnecting: () => this.setStatus(device_js_1.ConnectionStatus.CONNECTING),
-                onSuccess: () => this.setStatus(device_js_1.ConnectionStatus.CONNECTED),
-                onDisconnect: () => this.setStatus(device_js_1.ConnectionStatus.DISCONNECTED),
+            this.device = new device_wrapper_js_1.BluetoothDeviceWrapper(device, this.logging, this.deviceBondState, this.dispatchEvent.bind(this), () => this.getActiveEvents(), {
+                onConnecting: () => this.setStatus(device_js_1.ConnectionStatus.Connecting),
+                onSuccess: () => this.setStatus(device_js_1.ConnectionStatus.Connected),
+                onDisconnect: () => this.setStatus(device_js_1.ConnectionStatus.Disconnected),
             });
         }
-        await this.connection.connect(options);
+        await this.device.connect(options);
+        this.cachedBoardVersion = this.device.boardVersion;
     }
     async disconnect() {
         try {
-            if (this.connection) {
-                await this.connection.disconnect();
+            if (this.device) {
+                await this.device.disconnect();
             }
         }
         catch (e) {
@@ -222,7 +236,7 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
             });
         }
         finally {
-            this.setStatus(device_js_1.ConnectionStatus.DISCONNECTED);
+            this.setStatus(device_js_1.ConnectionStatus.Disconnected);
             this.logging.event({
                 type: "Bluetooth-info",
                 message: "disconnected",
@@ -234,105 +248,118 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
         this.status = newStatus;
         this.log("Bluetooth connection status " + newStatus);
         if (this.deferredUpdatesPreviousStatus === undefined) {
-            this.dispatchTypedEvent("status", new device_js_1.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(device_js_1.ConnectionStatus.NO_AUTHORIZED_DEVICE);
+        this.bleDevice = undefined;
+        this.cachedBoardVersion = undefined;
+        this.setStatus(device_js_1.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 device_js_1.BeforeRequestDevice());
+        this.dispatchEvent("beforerequestdevice");
         try {
-            this.device = core_1.Capacitor.isNativePlatform()
-                ? await this.requestDeviceNative(namePrefix, signal)
-                : await this.requestDeviceWeb(namePrefix);
-            if (!this.device) {
-                this.setStatus(device_js_1.ConnectionStatus.NO_AUTHORIZED_DEVICE);
+            this.bleDevice = core_1.Capacitor.isNativePlatform()
+                ? await this.requestDeviceNative(namePrefixes, signal)
+                : await this.requestDeviceWeb(namePrefixes);
+            if (!this.bleDevice) {
+                this.setStatus(device_js_1.ConnectionStatus.NoAuthorizedDevice);
                 throw new device_js_1.DeviceError({
                     code: "no-device-selected",
                     message: "No device selected",
                 });
             }
-            return this.device;
+            return this.bleDevice;
         }
         finally {
-            this.dispatchTypedEvent("afterrequestdevice", new device_js_1.AfterRequestDevice());
+            this.dispatchEvent("afterrequestdevice");
         }
     }
     async getAccelerometerData() {
-        return this.connection?.accelerometer.getData();
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.accelerometer.getData();
     }
     async getAccelerometerPeriod() {
-        return this.connection?.accelerometer.getPeriod();
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.accelerometer.getPeriod();
     }
     async setAccelerometerPeriod(value) {
-        return this.connection?.accelerometer.setPeriod(value);
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.accelerometer.setPeriod(value);
     }
     async setLedText(text) {
-        return this.connection?.led.setText(text);
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.led.setText(text);
     }
     async getLedScrollingDelay() {
-        return this.connection?.led.getScrollingDelay();
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.led.getScrollingDelay();
     }
     async setLedScrollingDelay(delayInMillis) {
-        await this.connection?.led.setScrollingDelay(delayInMillis);
+        (0, device_js_1.assertConnected)(this.device);
+        await this.device.led.setScrollingDelay(delayInMillis);
     }
     async getLedMatrix() {
-        return await this.connection?.led.getLedMatrix();
+        (0, device_js_1.assertConnected)(this.device);
+        return await this.device.led.getLedMatrix();
     }
     async setLedMatrix(matrix) {
-        await this.connection?.led.setLedMatrix(matrix);
+        (0, device_js_1.assertConnected)(this.device);
+        await this.device.led.setLedMatrix(matrix);
     }
     async getMagnetometerData() {
-        return this.connection?.magnetometer.getData();
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.magnetometer.getData();
     }
     async getMagnetometerPeriod() {
-        return this.connection?.magnetometer.getPeriod();
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.magnetometer.getPeriod();
     }
     async setMagnetometerPeriod(value) {
-        return this.connection?.magnetometer.setPeriod(value);
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.magnetometer.setPeriod(value);
     }
     async getMagnetometerBearing() {
-        return this.connection?.magnetometer.getBearing();
+        (0, device_js_1.assertConnected)(this.device);
+        return this.device.magnetometer.getBearing();
     }
     async triggerMagnetometerCalibration() {
-        await this.connection?.magnetometer.triggerCalibration();
+        (0, device_js_1.assertConnected)(this.device);
+        await this.device.magnetometer.triggerCalibration();
     }
     async uartWrite(data) {
-        await this.connection?.uart.writeData(data);
+        (0, device_js_1.assertConnected)(this.device);
+        await 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.
@@ -342,10 +369,10 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
         try {
             // We'll disconnect/reconnect multiple times due to device resets, but reporting this is unhelpful.
             this.deferredUpdatesPreviousStatus = this.status;
-            if (this.status !== device_js_1.ConnectionStatus.CONNECTED) {
+            if (this.status !== device_js_1.ConnectionStatus.Connected) {
                 await this.connect({ progress, signal: options.signal });
             }
-            const connection = this.connection;
+            const connection = this.device;
             try {
                 const boardVersion = connection.boardVersion;
                 if (!boardVersion) {
@@ -358,7 +385,7 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
                 if (!memoryMap) {
                     throw new device_js_1.FlashDataError("Could not convert hex to memory map");
                 }
-                if (!this.device) {
+                if (!this.bleDevice) {
                     throw new device_js_1.DeviceError({
                         code: "device-disconnected",
                         message: "No device",
@@ -369,7 +396,8 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
                 if (partialFlashResult === flashing_partial_js_1.PartialFlashResult.AttemptFullFlash) {
                     await (0, flashing_full_js_1.fullFlash)(connection, boardVersion, memoryMap, progress);
                 }
-                else if (partialFlashResult === flashing_partial_js_1.PartialFlashResult.AlreadyUpToDate ||
+                this.dispatchEvent("flash");
+                if (partialFlashResult === flashing_partial_js_1.PartialFlashResult.AlreadyUpToDate ||
                     partialFlashResult === flashing_partial_js_1.PartialFlashResult.Success) {
                     this.waitForPostFlashDisconnectPromise = (async () => {
                         try {
@@ -393,7 +421,7 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
                             }
                         }
                     })();
-                    this.setStatus(device_js_1.ConnectionStatus.DISCONNECTED);
+                    this.setStatus(device_js_1.ConnectionStatus.Disconnected);
                 }
             }
             catch (e) {
@@ -409,7 +437,10 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
         finally {
             const previousStatus = this.deferredUpdatesPreviousStatus;
             this.deferredUpdatesPreviousStatus = undefined;
-            this.dispatchTypedEvent("status", new device_js_1.ConnectionStatusEvent(this.status, previousStatus));
+            this.dispatchEvent("status", {
+                status: this.status,
+                previousStatus,
+            });
         }
     }
     /**
@@ -417,22 +448,33 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
      *
      * @returns device or undefined if user cancels.
      */
-    async requestDeviceWeb(namePrefix) {
+    async requestDeviceWeb(namePrefixes) {
+        const optionalServices = [
+            profile_js_1.profile.accelerometer.id,
+            profile_js_1.profile.button.id,
+            profile_js_1.profile.deviceInformation.id,
+            profile_js_1.profile.dfuControl.id,
+            profile_js_1.profile.event.id,
+            profile_js_1.profile.ioPin.id,
+            profile_js_1.profile.led.id,
+            profile_js_1.profile.magnetometer.id,
+            profile_js_1.profile.temperature.id,
+            profile_js_1.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 bluetooth_le_1.BleClient.requestDevice({
-                namePrefix,
-                optionalServices: [
-                    bluetooth_profile_js_1.profile.accelerometer.id,
-                    bluetooth_profile_js_1.profile.button.id,
-                    bluetooth_profile_js_1.profile.deviceInformation.id,
-                    bluetooth_profile_js_1.profile.dfuControl.id,
-                    bluetooth_profile_js_1.profile.event.id,
-                    bluetooth_profile_js_1.profile.ioPin.id,
-                    bluetooth_profile_js_1.profile.led.id,
-                    bluetooth_profile_js_1.profile.magnetometer.id,
-                    bluetooth_profile_js_1.profile.temperature.id,
-                    bluetooth_profile_js_1.profile.uart.id,
-                ],
+                namePrefix: namePrefixes[0],
+                optionalServices,
             });
         }
         catch (e) {
@@ -441,6 +483,9 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
             }
             throw e;
         }
+        finally {
+            navigator.bluetooth.requestDevice = orig;
+        }
     }
     /**
      * Finds device with specified name prefix.
@@ -448,19 +493,17 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.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 device_js_1.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) => 
@@ -470,8 +513,8 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.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 bluetooth_le_1.BleClient.stopLEScan();
                 resolve(result.device);
@@ -491,11 +534,11 @@ class MicrobitWebBluetoothConnectionImpl extends events_js_1.TypedEventTarget {
                 this.log("Timeout scanning for device");
                 resolve(undefined);
             }
-        }, bluetooth_device_wrapper_js_1.scanningTimeoutInMs));
+        }, device_wrapper_js_1.scanningTimeoutInMs));
         return await Promise.race([scanPromise, scanTimeoutPromise, abortPromise]);
     }
     async checkBondedDevices(predicate) {
-        if (!(0, bluetooth_device_wrapper_js_1.isAndroid)()) {
+        if (!(0, device_wrapper_js_1.isAndroid)()) {
             // Not supported.
             return undefined;
         }
@@ -514,6 +557,6 @@ const convertDataToMemoryMap = (data) => {
     if (data instanceof Uint8Array) {
         return nrf_intel_hex_1.default.fromPaddedUint8Array(data);
     }
-    return nrf_intel_hex_1.default.fromHex((0, hex_flash_data_source_js_1.truncateHexAfterEof)(data));
+    return nrf_intel_hex_1.default.fromHex((0, hex_util_js_1.truncateHexAfterEof)(data));
 };
-//# sourceMappingURL=bluetooth.js.map
+//# sourceMappingURL=connection.js.map

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

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