@microbit/microbit-connection 0.9.0-apps.alpha.9 → 1.0.0-beta.0

package/build/cjs/bluetooth/device-bond-state.js

@@ -0,0 +1,26 @@
+"use strict";
+/**
+ * (c) 2026, Micro:bit Educational Foundation and contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultDeviceBondState = void 0;
+class DefaultDeviceBondState {
+    constructor() {
+        Object.defineProperty(this, "bondStates", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+    }
+    setBonded(id, isBonded) {
+        this.bondStates[id] = isBonded;
+    }
+    isBonded(id) {
+        return this.bondStates[id] ?? false;
+    }
+}
+exports.DefaultDeviceBondState = DefaultDeviceBondState;
+//# sourceMappingURL=device-bond-state.js.map

package/build/cjs/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,MAAa,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;AARD,wDAQC"}

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

@@ -4,17 +4,26 @@
  * 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 } 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 { BoardVersion, ConnectOptions } from "../device.js";
+import { Logging, LoggingEvent } from "../logging.js";
+import { ServiceConnectionEventMap, TypedServiceEvent, TypedServiceEventDispatcher } from "../service-events.js";
+import { DeviceBondState } from "./device-bond-state.js";
+import { AccelerometerService } from "./services/accelerometer-service.js";
+import { ButtonService } from "./services/button-service.js";
+import { DeviceInformationService } from "./services/device-information-service.js";
+import { EventService } from "./services/event-service.js";
+import { IoPinService } from "./services/io-pin-service.js";
+import { LedService } from "./services/led-service.js";
+import { MagnetometerService } from "./services/magnetometer-service.js";
+import { TemperatureService } from "./services/temperature-service.js";
+import { UARTService } from "./services/uart-service.js";
+/**
+ * The @capacitor-community/bluetooth-le plugin throws this message when
+ * a characteristic UUID is not found in the device's GATT table.
+ */
+export declare const isCharacteristicNotFoundError: (e: unknown) => boolean;
 export declare const bondingTimeoutInMs = 40000;
-export declare const connectTimeoutInMs = 4000;
+export declare const connectTimeoutInMs = 10000;
 export declare const scanningTimeoutInMs = 10000;
 export declare const isAndroid: () => boolean;
 export interface Service {
@@ -25,24 +34,25 @@ export interface Service {
 }
 interface ConnectCallbacks {
     onConnecting: () => void;
-    onReconnecting: () => void;
-    onFail: () => void;
+    onDisconnect: () => void;
     onSuccess: () => void;
 }
 export declare class BluetoothDeviceWrapper implements Logging {
-    readonly device: BleDevice;
+    readonly bleDevice: BleDevice;
     private logging;
+    private deviceBondState;
     private currentEvents;
     private callbacks;
-    private duringExplicitConnectDisconnect;
-    private connected;
-    private isReconnect;
+    connected: boolean;
     private serviceIds;
     accelerometer: AccelerometerService;
     buttons: ButtonService;
     deviceInformation: DeviceInformationService;
+    events: EventService;
+    ioPin: IoPinService;
     led: LedService;
     magnetometer: MagnetometerService;
+    temperature: TemperatureService;
     uart: UARTService;
     /**
      * Only defined after connection.
@@ -51,13 +61,13 @@ export declare class BluetoothDeviceWrapper implements Logging {
     private services;
     private waitingForDisconnectEventCallbacks;
     private internalNotificationListeners;
-    constructor(device: BleDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks);
-    connect(): Promise<void>;
+    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;
     disconnect(): Promise<void>;
     private disconnectInternal;
-    reconnect(): Promise<void>;
-    handleDisconnectEvent: () => Promise<void>;
+    handleDisconnectEvent: () => void;
     getBoardVersion(): Promise<BoardVersion>;
     startNotifications(type: TypedServiceEvent): Promise<void>;
     stopNotifications(type: TypedServiceEvent): Promise<void>;
@@ -81,7 +91,6 @@ export declare class BluetoothDeviceWrapper implements Logging {
     raceDisconnectAndTimeout<T>(promise: Promise<T>, options?: {
         actionName?: string;
         timeout?: number;
-        initiallyDisconnected?: boolean;
     }): Promise<T>;
     private disconnectErrorPromise;
     event(event: LoggingEvent): void;
@@ -94,5 +103,11 @@ export declare class BluetoothDeviceWrapper implements Logging {
      */
     private connectHandlingBond;
     private bondConnectDeviceInternal;
+    /**
+     * On iOS, accessing an encrypted characteristic triggers the pairing dialog.
+     * Try each candidate characteristic in turn until one succeeds. The error is
+     * fast (local GATT cache lookup) so there's no meaningful delay from retries.
+     */
+    private triggerIosPairing;
 }
 export {};

package/build/cjs/{bluetooth-device-wrapper.js → bluetooth/device-wrapper.js}

@@ -5,53 +5,42 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BluetoothDeviceWrapper = exports.isAndroid = exports.scanningTimeoutInMs = exports.connectTimeoutInMs = exports.bondingTimeoutInMs = void 0;
+exports.BluetoothDeviceWrapper = exports.isAndroid = exports.scanningTimeoutInMs = exports.connectTimeoutInMs = exports.bondingTimeoutInMs = exports.isCharacteristicNotFoundError = void 0;
 const bluetooth_le_1 = require("@capacitor-community/bluetooth-le");
 const core_1 = require("@capacitor/core");
-const accelerometer_service_js_1 = require("./accelerometer-service.js");
-const async_util_js_1 = require("./async-util.js");
-const button_service_js_1 = require("./button-service.js");
-const device_information_service_js_1 = require("./device-information-service.js");
-const device_js_1 = require("./device.js");
-const led_service_js_1 = require("./led-service.js");
-const logging_js_1 = require("./logging.js");
-const magnetometer_service_js_1 = require("./magnetometer-service.js");
-const partial_flashing_service_js_1 = require("./partial-flashing-service.js");
-const uart_service_js_1 = require("./uart-service.js");
+const async_util_js_1 = require("../async-util.js");
+const device_js_1 = require("../device.js");
+const logging_js_1 = require("../logging.js");
+const device_bond_state_js_1 = require("./device-bond-state.js");
+const profile_js_1 = require("./profile.js");
+const accelerometer_service_js_1 = require("./services/accelerometer-service.js");
+const button_service_js_1 = require("./services/button-service.js");
+const device_information_service_js_1 = require("./services/device-information-service.js");
+const event_service_js_1 = require("./services/event-service.js");
+const io_pin_service_js_1 = require("./services/io-pin-service.js");
+const led_service_js_1 = require("./services/led-service.js");
+const magnetometer_service_js_1 = require("./services/magnetometer-service.js");
+const partial_flashing_service_js_1 = require("./services/partial-flashing-service.js");
+const temperature_service_js_1 = require("./services/temperature-service.js");
+const uart_service_js_1 = require("./services/uart-service.js");
+/**
+ * The @capacitor-community/bluetooth-le plugin throws this message when
+ * a characteristic UUID is not found in the device's GATT table.
+ */
+const isCharacteristicNotFoundError = (e) => e instanceof Error && e.message === "Characteristic not found.";
+exports.isCharacteristicNotFoundError = isCharacteristicNotFoundError;
 exports.bondingTimeoutInMs = 40_000;
-exports.connectTimeoutInMs = 4_000;
+exports.connectTimeoutInMs = 10_000;
 exports.scanningTimeoutInMs = 10_000;
-const connectionMaxAttempts = 4;
 const isAndroid = () => core_1.Capacitor.getPlatform() === "android";
 exports.isAndroid = isAndroid;
-// TODO: We've removed the support for these behaviours as we need to
-// re-evaluate how best to support then via capacitor-ble (or reinstate
-// the direct Web Bluetooth connection code.
-//
-// On ChromeOS and Mac there's no timeout and no clear way to abort
-// device.gatt.connect(), so we accept that sometimes we'll still
-// be trying to connect when we'd rather not be. If it succeeds when
-// we no longer intend to be connected then we disconnect at that
-// point. If we try to connect when a previous connection attempt is
-// still around then we wait for it for our timeout period.
-//
-// On Windows it times out after 7s.
-// https://bugs.chromium.org/p/chromium/issues/detail?id=684073
-//
-// Additionally we've remove the delay before trying to connect again
-// on Windows.
-//
-// We also used to have a timeout around requestDevice that reloaded the page.
-//
-// > In some situations the Chrome device prompt simply doesn't appear so we time
-// > this out after 30 seconds and reload the page
 class BluetoothDeviceWrapper {
-    constructor(device, logging = new logging_js_1.ConsoleLogging(), dispatchTypedEvent, currentEvents, callbacks) {
-        Object.defineProperty(this, "device", {
+    constructor(bleDevice, logging = new logging_js_1.ConsoleLogging(), deviceBondState = new device_bond_state_js_1.DefaultDeviceBondState(), dispatchTypedEvent, currentEvents, callbacks) {
+        Object.defineProperty(this, "bleDevice", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: device
+            value: bleDevice
         });
         Object.defineProperty(this, "logging", {
             enumerable: true,
@@ -59,25 +48,23 @@ class BluetoothDeviceWrapper {
             writable: true,
             value: logging
         });
-        Object.defineProperty(this, "currentEvents", {
+        Object.defineProperty(this, "deviceBondState", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: currentEvents
+            value: deviceBondState
         });
-        Object.defineProperty(this, "callbacks", {
+        Object.defineProperty(this, "currentEvents", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: callbacks
+            value: currentEvents
         });
-        // Used to avoid automatic reconnection during user triggered connect/disconnect
-        // or reconnection itself.
-        Object.defineProperty(this, "duringExplicitConnectDisconnect", {
+        Object.defineProperty(this, "callbacks", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 0
+            value: callbacks
         });
         Object.defineProperty(this, "connected", {
             enumerable: true,
@@ -85,12 +72,6 @@ class BluetoothDeviceWrapper {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "isReconnect", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
         // Only updated after the full connection flow completes not during bond handling.
         Object.defineProperty(this, "serviceIds", {
             enumerable: true,
@@ -116,6 +97,18 @@ class BluetoothDeviceWrapper {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "events", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "ioPin", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "led", {
             enumerable: true,
             configurable: true,
@@ -128,6 +121,12 @@ class BluetoothDeviceWrapper {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "temperature", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "uart", {
             enumerable: true,
             configurable: true,
@@ -165,66 +164,64 @@ class BluetoothDeviceWrapper {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: async () => {
+            value: () => {
                 this.waitingForDisconnectEventCallbacks.forEach((cb) => cb());
                 this.waitingForDisconnectEventCallbacks.length = 0;
                 this.connected = false;
-                try {
-                    if (!this.duringExplicitConnectDisconnect) {
-                        this.logging.log("Bluetooth disconnected... automatically trying reconnect");
-                        await this.reconnect();
-                    }
-                    else {
-                        this.logging.log("Bluetooth disconnect ignored during explicit disconnect");
-                    }
-                }
-                catch (e) {
-                    this.logging.error("Bluetooth connect triggered by disconnect listener failed", e);
-                }
+                this.callbacks.onDisconnect();
             }
         });
-        this.accelerometer = new accelerometer_service_js_1.AccelerometerService(device.deviceId, dispatchTypedEvent);
-        this.buttons = new button_service_js_1.ButtonService(device.deviceId, dispatchTypedEvent);
-        this.deviceInformation = new device_information_service_js_1.DeviceInformationService(device.deviceId);
-        this.led = new led_service_js_1.LedService(device.deviceId);
-        this.magnetometer = new magnetometer_service_js_1.MagnetometerService(device.deviceId, dispatchTypedEvent);
-        this.uart = new uart_service_js_1.UARTService(device.deviceId, dispatchTypedEvent);
+        this.accelerometer = new accelerometer_service_js_1.AccelerometerService(bleDevice.deviceId, dispatchTypedEvent);
+        this.buttons = new button_service_js_1.ButtonService(bleDevice.deviceId, dispatchTypedEvent);
+        this.deviceInformation = new device_information_service_js_1.DeviceInformationService(bleDevice.deviceId);
+        this.events = new event_service_js_1.EventService(bleDevice.deviceId, dispatchTypedEvent, () => this.boardVersion);
+        this.ioPin = new io_pin_service_js_1.IoPinService(bleDevice.deviceId, dispatchTypedEvent);
+        this.led = new led_service_js_1.LedService(bleDevice.deviceId);
+        this.magnetometer = new magnetometer_service_js_1.MagnetometerService(bleDevice.deviceId, dispatchTypedEvent);
+        this.temperature = new temperature_service_js_1.TemperatureService(bleDevice.deviceId, dispatchTypedEvent);
+        this.uart = new uart_service_js_1.UARTService(bleDevice.deviceId, dispatchTypedEvent);
         this.services = [
             this.accelerometer,
             this.buttons,
+            this.events,
+            this.ioPin,
             this.led,
             this.magnetometer,
+            this.temperature,
             this.uart,
         ];
     }
-    async connect() {
+    setBonded(isBonded) {
+        this.deviceBondState.setBonded(this.bleDevice.deviceId, isBonded);
+    }
+    async connect(options) {
+        const progress = options?.progress ?? (() => { });
         this.logging.event({
-            type: this.isReconnect ? "Reconnect" : "Connect",
+            type: "Connect",
             message: "Bluetooth connect start",
         });
-        if (this.isReconnect) {
-            this.callbacks.onReconnecting();
-        }
-        else {
-            this.callbacks.onConnecting();
-        }
-        this.duringExplicitConnectDisconnect++;
+        this.callbacks.onConnecting();
+        const bondMode = options?.bondMode ?? "pairing";
         try {
-            if (core_1.Capacitor.isNativePlatform()) {
-                await this.connectHandlingBond();
+            if (core_1.Capacitor.isNativePlatform() && bondMode !== "none") {
+                const isBonded = this.deviceBondState.isBonded(this.bleDevice.deviceId);
+                await this.connectHandlingBond(progress, isBonded ?? false, bondMode);
+                this.setBonded(true);
+                // We need this on Android for reconnecting after DFU.
+                await bluetooth_le_1.BleClient.discoverServices(this.bleDevice.deviceId);
             }
             else {
+                progress(device_js_1.ProgressStage.Connecting);
                 await this.connectInternal();
             }
             await this.getBoardVersion();
             const events = this.currentEvents();
-            await bluetooth_le_1.BleClient.discoverServices(this.device.deviceId);
-            const services = await bluetooth_le_1.BleClient.getServices(this.device.deviceId);
+            const services = await bluetooth_le_1.BleClient.getServices(this.bleDevice.deviceId);
             this.serviceIds = new Set(services.map((s) => s.uuid));
             this.logging.log(`Starting notifications for current events ${events}`);
             events.forEach((e) => this.startNotifications(e));
             this.logging.event({
-                type: this.isReconnect ? "Reconnect" : "Connect",
+                type: "Connect",
                 message: "Bluetooth connect success",
             });
             this.callbacks.onSuccess();
@@ -232,79 +229,53 @@ class BluetoothDeviceWrapper {
         catch (e) {
             this.logging.error("Bluetooth connect error", e);
             this.logging.event({
-                type: this.isReconnect ? "Reconnect" : "Connect",
+                type: "Connect",
                 message: "Bluetooth connect failed",
             });
             await this.disconnectInternal(false);
-            this.callbacks.onFail();
+            this.callbacks.onDisconnect();
             if (e instanceof device_js_1.DeviceError) {
                 throw e;
             }
-            if (e instanceof async_util_js_1.TimeoutError) {
+            this.setBonded(false);
+            if (
+            // Error thrown in iOS only.
+            e instanceof Error &&
+                e.message === "Peer removed pairing information") {
                 throw new device_js_1.DeviceError({
-                    code: "timeout-error",
-                    message: e instanceof Error ? e.message : String(e),
+                    code: "pairing-information-lost",
+                    message: e.message,
+                    cause: e,
                 });
             }
             throw new device_js_1.DeviceError({
-                code: "bluetooth-connection-failed",
+                code: "connection-error",
                 message: e instanceof Error ? e.message : String(e),
+                cause: e,
             });
         }
-        finally {
-            this.duringExplicitConnectDisconnect--;
-            // Reset isReconnect for next time
-            this.isReconnect = false;
-        }
     }
     async connectInternal() {
         this.waitingForDisconnectEventCallbacks.length = 0;
-        // Attempt multiple connection tries.
-        for (let i = 0; i < connectionMaxAttempts; i++) {
-            try {
-                // Fail immediately if disconnect occurs whilst connecting.
-                await this.raceDisconnectAndTimeout(bluetooth_le_1.BleClient.connect(this.device.deviceId, this.handleDisconnectEvent), {
-                    actionName: "connect internal",
-                    timeout: exports.connectTimeoutInMs,
-                    initiallyDisconnected: true,
-                });
-                this.connected = true;
-                return;
-            }
-            catch (error) {
-                const attempts = i + 1;
-                if (attempts === connectionMaxAttempts) {
-                    throw error;
-                }
-                const delayDuration = Math.pow(2, i) * 1000; // 1s, 2s, 4s
-                this.logging.log(`Attempt ${attempts} failed, retrying in ${delayDuration}ms...`);
-                await (0, async_util_js_1.delay)(delayDuration);
-            }
-        }
+        await bluetooth_le_1.BleClient.connect(this.bleDevice.deviceId, this.handleDisconnectEvent, {
+            timeout: exports.connectTimeoutInMs,
+        });
+        this.connected = true;
     }
     async disconnect() {
         return this.disconnectInternal(true);
     }
     async disconnectInternal(userTriggered) {
         this.logging.log(`Bluetooth disconnect ${userTriggered ? "(user triggered)" : "(programmatic)"}`);
-        this.duringExplicitConnectDisconnect++;
         try {
             if (this.connected) {
-                await bluetooth_le_1.BleClient.disconnect(this.device.deviceId);
+                await bluetooth_le_1.BleClient.disconnect(this.bleDevice.deviceId);
             }
         }
         catch (e) {
             this.logging.error("Bluetooth GATT disconnect error (ignored)", e);
             // We might have already lost the connection.
         }
-        finally {
-            this.duringExplicitConnectDisconnect--;
-        }
-    }
-    async reconnect() {
-        this.logging.log("Bluetooth reconnect");
-        this.isReconnect = true;
-        await this.connect();
     }
     async getBoardVersion() {
         // We read this when we connect and it won't change.
@@ -325,7 +296,7 @@ class BluetoothDeviceWrapper {
     }
     async startInternalNotifications(serviceId, characteristicId, options) {
         const key = this.getNotificationKey(serviceId, characteristicId);
-        await this.raceDisconnectAndTimeout(bluetooth_le_1.BleClient.startNotifications(this.device.deviceId, serviceId, characteristicId, (value) => {
+        await this.raceDisconnectAndTimeout(bluetooth_le_1.BleClient.startNotifications(this.bleDevice.deviceId, serviceId, characteristicId, (value) => {
             const bytes = new Uint8Array(value.buffer);
             // Notify all registered callbacks.
             this.internalNotificationListeners
@@ -345,7 +316,7 @@ class BluetoothDeviceWrapper {
         this.internalNotificationListeners.get(key)?.delete(callback);
     }
     async stopInternalNotifications(serviceId, characteristicId) {
-        await bluetooth_le_1.BleClient.stopNotifications(this.device.deviceId, serviceId, characteristicId);
+        await bluetooth_le_1.BleClient.stopNotifications(this.bleDevice.deviceId, serviceId, characteristicId);
         const key = this.getNotificationKey(serviceId, characteristicId);
         this.internalNotificationListeners.delete(key);
     }
@@ -366,7 +337,7 @@ class BluetoothDeviceWrapper {
             this.subscribe(serviceId, characteristicId, notificationListener);
         });
         try {
-            await bluetooth_le_1.BleClient.writeWithoutResponse(this.device.deviceId, serviceId, characteristicId, value);
+            await bluetooth_le_1.BleClient.writeWithoutResponse(this.bleDevice.deviceId, serviceId, characteristicId, value);
             return await this.raceDisconnectAndTimeout(notificationPromise, {
                 timeout: 3_000,
                 actionName: "flash notification wait",
@@ -404,7 +375,7 @@ class BluetoothDeviceWrapper {
      * and general disconnection
      */
     async raceDisconnectAndTimeout(promise, options = {}) {
-        if (!this.connected && !options.initiallyDisconnected) {
+        if (!this.connected) {
             throw new async_util_js_1.DisconnectError();
         }
         const actionName = options.actionName ?? "action";
@@ -436,9 +407,10 @@ class BluetoothDeviceWrapper {
      * Bonds with device and handles the post-bond device state only returning
      * when we can reattempt a connection with the device.
      */
-    async connectHandlingBond() {
+    async connectHandlingBond(progress, isAlreadyIosBonded, bondMode) {
+        progress(device_js_1.ProgressStage.CheckingBond);
         const startTime = Date.now();
-        const maybeJustBonded = await this.bondConnectDeviceInternal();
+        const maybeJustBonded = await this.bondConnectDeviceInternal(isAlreadyIosBonded);
         if (maybeJustBonded) {
             // If we did just bond then the device disconnects after 2_000 and then
             // resets after a further 13_000 In future we'd like a firmware change
@@ -465,18 +437,31 @@ class BluetoothDeviceWrapper {
                 }
             }
             await this.connectInternal();
-            // TODO: check this is needed, potentially inline into connect if always needed
-            await (0, async_util_js_1.delay)(500);
-            this.log("Resetting to pairing mode");
-            const pf = new partial_flashing_service_js_1.PartialFlashingService(this);
-            await pf.resetToMode(partial_flashing_service_js_1.MicroBitMode.Pairing);
-            await this.waitForDisconnect(10_000);
-            await this.connectInternal();
-            this.log(`Connection ready; took ${Date.now() - startTime}`);
+            try {
+                const targetMode = bondMode === "pairing"
+                    ? partial_flashing_service_js_1.MicroBitMode.Pairing
+                    : partial_flashing_service_js_1.MicroBitMode.Application;
+                progress(device_js_1.ProgressStage.ResettingDevice);
+                this.log(`Resetting to ${bondMode} mode`);
+                const pf = new partial_flashing_service_js_1.PartialFlashingService(this);
+                await pf.resetToMode(targetMode);
+                await this.waitForDisconnect(10_000);
+                progress(device_js_1.ProgressStage.Connecting);
+                await this.connectInternal();
+            }
+            catch (e) {
+                if ((0, exports.isCharacteristicNotFoundError)(e)) {
+                    this.log("Partial flashing characteristic not found, skipping reset.");
+                }
+                else {
+                    throw e;
+                }
+            }
         }
+        this.log(`Connection ready; took ${Date.now() - startTime}`);
     }
-    async bondConnectDeviceInternal() {
-        const { deviceId } = this.device;
+    async bondConnectDeviceInternal(isAlreadyIosBonded) {
+        const { deviceId } = this.bleDevice;
         if ((0, exports.isAndroid)()) {
             let justBonded = false;
             // This gets us a nicer pairing dialog than just going straight for the characteristic.
@@ -494,13 +479,55 @@ class BluetoothDeviceWrapper {
             // need to call startNotifications again. We need to be connected to
             // startNotifications.
             await this.connectInternal();
+            if (!isAlreadyIosBonded) {
+                await this.triggerIosPairing({ timeout: exports.bondingTimeoutInMs });
+            }
+            return !isAlreadyIosBonded;
+        }
+    }
+    /**
+     * On iOS, accessing an encrypted characteristic triggers the pairing dialog.
+     * Try each candidate characteristic in turn until one succeeds. The error is
+     * fast (local GATT cache lookup) so there's no meaningful delay from retries.
+     */
+    async triggerIosPairing(options) {
+        const { deviceId } = this.bleDevice;
+        // 1. Partial flashing notifications (most common case)
+        try {
             const pf = new partial_flashing_service_js_1.PartialFlashingService(this);
-            await pf.startNotifications({ timeout: exports.bondingTimeoutInMs });
-            // We just did it now to trigger pairing at a well defined point.
+            await pf.startNotifications(options);
             await pf.stopNotifications();
-            return true;
+            return;
+        }
+        catch (e) {
+            if (!(0, exports.isCharacteristicNotFoundError)(e)) {
+                throw e;
+            }
+            this.log("PF characteristic not found for pairing trigger, trying Secure DFU");
+        }
+        // 2. Nordic Secure DFU buttonless notifications (V2 without PF)
+        try {
+            await bluetooth_le_1.BleClient.startNotifications(deviceId, profile_js_1.profile.nordicSecureDfu.id, profile_js_1.profile.nordicSecureDfu.characteristics.buttonless.id, () => { }, options);
+            await bluetooth_le_1.BleClient.stopNotifications(deviceId, profile_js_1.profile.nordicSecureDfu.id, profile_js_1.profile.nordicSecureDfu.characteristics.buttonless.id);
+            return;
+        }
+        catch (e) {
+            if (!(0, exports.isCharacteristicNotFoundError)(e)) {
+                throw e;
+            }
+            this.log("Secure DFU characteristic not found for pairing trigger, trying DFU control");
+        }
+        // 3. micro:bit DFU control read (V1 without PF)
+        try {
+            await bluetooth_le_1.BleClient.read(deviceId, profile_js_1.profile.dfuControl.id, profile_js_1.profile.dfuControl.characteristics.control.id, options);
+        }
+        catch (e) {
+            if (!(0, exports.isCharacteristicNotFoundError)(e)) {
+                throw e;
+            }
+            this.log("No suitable characteristic found to trigger pairing");
         }
     }
 }
 exports.BluetoothDeviceWrapper = BluetoothDeviceWrapper;
-//# sourceMappingURL=bluetooth-device-wrapper.js.map
+//# sourceMappingURL=device-wrapper.js.map