@microbit/microbit-connection 0.9.0-apps.alpha.2 → 0.9.0-apps.alpha.20

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

@@ -5,16 +5,26 @@
  */
 import { BleClient, } from "@capacitor-community/bluetooth-le";
 import { Capacitor } from "@capacitor/core";
-import { AccelerometerService } from "./accelerometer-service.js";
-import { delay, DisconnectError, disconnectErrorCallback, TimeoutError, timeoutErrorAfter, } from "./async-util.js";
-import { ButtonService } from "./button-service.js";
-import { DeviceInformationService } from "./device-information-service.js";
-import { DeviceError } from "./device.js";
-import { LedService } from "./led-service.js";
-import { ConsoleLogging } from "./logging.js";
-import { MagnetometerService } from "./magnetometer-service.js";
-import { MicroBitMode, PartialFlashingService, } from "./partial-flashing-service.js";
-import { UARTService } from "./uart-service.js";
+import { AccelerometerService } from "./services/accelerometer-service.js";
+import { DisconnectError, disconnectErrorCallback, TimeoutError, timeoutErrorAfter, } from "../async-util.js";
+import { ButtonService } from "./services/button-service.js";
+import { DeviceInformationService } from "./services/device-information-service.js";
+import { DeviceError, ProgressStage, } from "../device.js";
+import { LedService } from "./services/led-service.js";
+import { ConsoleLogging } from "../logging.js";
+import { MagnetometerService } from "./services/magnetometer-service.js";
+import { MicroBitMode, PartialFlashingService, } from "./services/partial-flashing-service.js";
+import { EventService } from "./services/event-service.js";
+import { TemperatureService } from "./services/temperature-service.js";
+import { IoPinService } from "./services/io-pin-service.js";
+import { UARTService } from "./services/uart-service.js";
+import { DefaultDeviceBondState, } from "./device-bond-state.js";
+import { profile } from "./profile.js";
+/**
+ * The @capacitor-community/bluetooth-le plugin throws this message when
+ * a characteristic UUID is not found in the device's GATT table.
+ */
+export const isCharacteristicNotFoundError = (e) => e instanceof Error && e.message === "Characteristic not found.";
 export const bondingTimeoutInMs = 40_000;
 export const connectTimeoutInMs = 10_000;
 export const scanningTimeoutInMs = 10_000;
@@ -41,12 +51,12 @@ export const isAndroid = () => Capacitor.getPlatform() === "android";
 // > In some situations the Chrome device prompt simply doesn't appear so we time
 // > this out after 30 seconds and reload the page
 export class BluetoothDeviceWrapper {
-    constructor(device, logging = new ConsoleLogging(), dispatchTypedEvent, currentEvents, callbacks) {
-        Object.defineProperty(this, "device", {
+    constructor(bleDevice, logging = new ConsoleLogging(), deviceBondState = new DefaultDeviceBondState(), dispatchTypedEvent, currentEvents, callbacks) {
+        Object.defineProperty(this, "bleDevice", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: device
+            value: bleDevice
         });
         Object.defineProperty(this, "logging", {
             enumerable: true,
@@ -54,25 +64,23 @@ export 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,
@@ -80,12 +88,6 @@ export 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,
@@ -111,6 +113,18 @@ export 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,
@@ -123,6 +137,12 @@ export 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,
@@ -160,65 +180,64 @@ export 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 AccelerometerService(device.deviceId, dispatchTypedEvent);
-        this.buttons = new ButtonService(device.deviceId, dispatchTypedEvent);
-        this.deviceInformation = new DeviceInformationService(device.deviceId);
-        this.led = new LedService(device.deviceId);
-        this.magnetometer = new MagnetometerService(device.deviceId, dispatchTypedEvent);
-        this.uart = new UARTService(device.deviceId, dispatchTypedEvent);
+        this.accelerometer = new AccelerometerService(bleDevice.deviceId, dispatchTypedEvent);
+        this.buttons = new ButtonService(bleDevice.deviceId, dispatchTypedEvent);
+        this.deviceInformation = new DeviceInformationService(bleDevice.deviceId);
+        this.events = new EventService(bleDevice.deviceId, dispatchTypedEvent, () => this.boardVersion);
+        this.ioPin = new IoPinService(bleDevice.deviceId, dispatchTypedEvent);
+        this.led = new LedService(bleDevice.deviceId);
+        this.magnetometer = new MagnetometerService(bleDevice.deviceId, dispatchTypedEvent);
+        this.temperature = new TemperatureService(bleDevice.deviceId, dispatchTypedEvent);
+        this.uart = new 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 (Capacitor.isNativePlatform()) {
-                await this.connectHandlingBond();
+            if (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 BleClient.discoverServices(this.bleDevice.deviceId);
             }
             else {
+                progress(ProgressStage.Connecting);
                 await this.connectInternal();
             }
             await this.getBoardVersion();
             const events = this.currentEvents();
-            const services = await BleClient.getServices(this.device.deviceId);
+            const services = await 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();
@@ -226,34 +245,35 @@ export 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 DeviceError) {
                 throw e;
             }
-            if (e instanceof TimeoutError) {
+            this.setBonded(false);
+            if (
+            // Error thrown in iOS only.
+            e instanceof Error &&
+                e.message === "Peer removed pairing information") {
                 throw new DeviceError({
-                    code: "timeout-error",
-                    message: e instanceof Error ? e.message : String(e),
+                    code: "pairing-information-lost",
+                    message: e.message,
+                    cause: e,
                 });
             }
             throw new 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;
-        await BleClient.connect(this.device.deviceId, this.handleDisconnectEvent, {
+        await BleClient.connect(this.bleDevice.deviceId, this.handleDisconnectEvent, {
             timeout: connectTimeoutInMs,
         });
         this.connected = true;
@@ -263,24 +283,15 @@ export class BluetoothDeviceWrapper {
     }
     async disconnectInternal(userTriggered) {
         this.logging.log(`Bluetooth disconnect ${userTriggered ? "(user triggered)" : "(programmatic)"}`);
-        this.duringExplicitConnectDisconnect++;
         try {
             if (this.connected) {
-                await BleClient.disconnect(this.device.deviceId);
+                await 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.
@@ -301,7 +312,7 @@ export class BluetoothDeviceWrapper {
     }
     async startInternalNotifications(serviceId, characteristicId, options) {
         const key = this.getNotificationKey(serviceId, characteristicId);
-        await this.raceDisconnectAndTimeout(BleClient.startNotifications(this.device.deviceId, serviceId, characteristicId, (value) => {
+        await this.raceDisconnectAndTimeout(BleClient.startNotifications(this.bleDevice.deviceId, serviceId, characteristicId, (value) => {
             const bytes = new Uint8Array(value.buffer);
             // Notify all registered callbacks.
             this.internalNotificationListeners
@@ -321,7 +332,7 @@ export class BluetoothDeviceWrapper {
         this.internalNotificationListeners.get(key)?.delete(callback);
     }
     async stopInternalNotifications(serviceId, characteristicId) {
-        await BleClient.stopNotifications(this.device.deviceId, serviceId, characteristicId);
+        await BleClient.stopNotifications(this.bleDevice.deviceId, serviceId, characteristicId);
         const key = this.getNotificationKey(serviceId, characteristicId);
         this.internalNotificationListeners.delete(key);
     }
@@ -342,7 +353,7 @@ export class BluetoothDeviceWrapper {
             this.subscribe(serviceId, characteristicId, notificationListener);
         });
         try {
-            await BleClient.writeWithoutResponse(this.device.deviceId, serviceId, characteristicId, value);
+            await BleClient.writeWithoutResponse(this.bleDevice.deviceId, serviceId, characteristicId, value);
             return await this.raceDisconnectAndTimeout(notificationPromise, {
                 timeout: 3_000,
                 actionName: "flash notification wait",
@@ -412,9 +423,10 @@ export 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(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
@@ -441,18 +453,31 @@ export class BluetoothDeviceWrapper {
                 }
             }
             await this.connectInternal();
-            // TODO: check this is needed, potentially inline into connect if always needed
-            await delay(500);
-            this.log("Resetting to pairing mode");
-            const pf = new PartialFlashingService(this);
-            await pf.resetToMode(MicroBitMode.Pairing);
-            await this.waitForDisconnect(10_000);
-            await this.connectInternal();
-            this.log(`Connection ready; took ${Date.now() - startTime}`);
+            try {
+                const targetMode = bondMode === "pairing"
+                    ? MicroBitMode.Pairing
+                    : MicroBitMode.Application;
+                progress(ProgressStage.ResettingDevice);
+                this.log(`Resetting to ${bondMode} mode`);
+                const pf = new PartialFlashingService(this);
+                await pf.resetToMode(targetMode);
+                await this.waitForDisconnect(10_000);
+                progress(ProgressStage.Connecting);
+                await this.connectInternal();
+            }
+            catch (e) {
+                if (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 (isAndroid()) {
             let justBonded = false;
             // This gets us a nicer pairing dialog than just going straight for the characteristic.
@@ -470,12 +495,54 @@ export class BluetoothDeviceWrapper {
             // need to call startNotifications again. We need to be connected to
             // startNotifications.
             await this.connectInternal();
+            if (!isAlreadyIosBonded) {
+                await this.triggerIosPairing({ timeout: 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 PartialFlashingService(this);
-            await pf.startNotifications({ timeout: 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 (!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 BleClient.startNotifications(deviceId, profile.nordicSecureDfu.id, profile.nordicSecureDfu.characteristics.buttonless.id, () => { }, options);
+            await BleClient.stopNotifications(deviceId, profile.nordicSecureDfu.id, profile.nordicSecureDfu.characteristics.buttonless.id);
+            return;
+        }
+        catch (e) {
+            if (!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 BleClient.read(deviceId, profile.dfuControl.id, profile.dfuControl.characteristics.control.id, options);
+        }
+        catch (e) {
+            if (!isCharacteristicNotFoundError(e)) {
+                throw e;
+            }
+            this.log("No suitable characteristic found to trigger pairing");
         }
     }
 }
-//# sourceMappingURL=bluetooth-device-wrapper.js.map
+//# sourceMappingURL=device-wrapper.js.map

package/build/esm/bluetooth/device-wrapper.js.map

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

package/build/{cjs → esm/bluetooth}/flashing/flashing-full.d.ts

@@ -1,6 +1,6 @@
 import MemoryMap from "nrf-intel-hex";
-import { BoardVersion, ProgressCallback } from "../device.js";
-import { BluetoothDeviceWrapper } from "../bluetooth-device-wrapper.js";
+import { BoardVersion, ProgressCallback } from "../../device.js";
+import { BluetoothDeviceWrapper } from "../device-wrapper.js";
 /**
  * Perform a full flash via Nordic's DFU service.
  *

package/build/esm/{flashing → bluetooth/flashing}/flashing-full.js

@@ -1,8 +1,8 @@
-import { DeviceError, FlashDataError, ProgressStage, } from "../device.js";
-import { DfuService, NORDIC_DFU_SERVICE } from "../dfu-service.js";
+import { DeviceError, FlashDataError, ProgressStage, } from "../../device.js";
+import { DfuService, NORDIC_DFU_SERVICE } from "../services/dfu-service.js";
 import { refreshServicesForV1IfDesiredServiceMissing } from "./flashing-v1.js";
 import { flashDfu } from "./nordic-dfu.js";
-import { delay } from "../async-util.js";
+import { delay } from "../../async-util.js";
 /**
  * Perform a full flash via Nordic's DFU service.
  *
@@ -16,7 +16,7 @@ import { delay } from "../async-util.js";
 export async function fullFlash(connection, boardVersion, memoryMap, progress) {
     connection.log("Full flash");
     progress(ProgressStage.FullFlashing);
-    const { deviceId } = connection.device;
+    const { deviceId } = connection.bleDevice;
     try {
         if (boardVersion === "V1") {
             connection.log("Rebooting V1 to bootloader");
@@ -27,8 +27,9 @@ export async function fullFlash(connection, boardVersion, memoryMap, progress) {
             catch (e) {
                 connection.error("Failed to request reboot to bootloader", e);
                 throw new DeviceError({
-                    code: "flash-full-failed",
+                    code: "connection-error",
                     message: e instanceof Error ? e.message : "Failed to reboot to bootloader",
+                    cause: e,
                 });
             }
             // Wait for device to automatically disconnect as it reboots into bootloader

package/build/esm/bluetooth/flashing/flashing-full.js.map

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

package/build/esm/bluetooth/flashing/flashing-makecode.d.ts

@@ -0,0 +1,10 @@
+import MemoryMap from "nrf-intel-hex";
+import { RegionInfo } from "../services/partial-flashing-service.js";
+export interface MakeCodeRegionInfo extends RegionInfo {
+    /** SHA-256 (truncated to 8 bytes) of the compiled program binary. */
+    appHash: string;
+}
+/**
+ * Find the MakeCode code region in a MemoryMap (typically from a hex file).
+ */
+export declare const findMakeCodeRegionInMemoryMap: (memoryMap: MemoryMap, deviceCodeRegion: RegionInfo) => MakeCodeRegionInfo | null;

package/build/esm/{flashing → bluetooth/flashing}/flashing-makecode.js

@@ -1,4 +1,5 @@
 const PXT_MAGIC_HEX = "708E3B92C615A841C49866C975EE5197";
+const PXT_MAGIC_BYTES = PXT_MAGIC_HEX.length / 2; // 16
 /**
  * Find the MakeCode code region in a MemoryMap (typically from a hex file).
  */
@@ -7,9 +8,11 @@ export const findMakeCodeRegionInMemoryMap = (memoryMap, deviceCodeRegion) => {
         const offset = findByteSequence(block, PXT_MAGIC_HEX);
         if (offset >= 0) {
             const start = blockAddr + offset;
-            const hashOffset = start + PXT_MAGIC_HEX.length / 2;
+            const hashOffset = start + PXT_MAGIC_BYTES;
             const hashBytes = memoryMap.slicePad(hashOffset, 8);
             const hash = bytesToHex(hashBytes);
+            const appHashBytes = memoryMap.slicePad(hashOffset + 8, 8);
+            const appHash = bytesToHex(appHashBytes);
             // Find the highest address with data in the memory map within the code region
             let end = start;
             for (const [blockAddr, block] of memoryMap) {
@@ -20,7 +23,7 @@ export const findMakeCodeRegionInMemoryMap = (memoryMap, deviceCodeRegion) => {
             }
             // Round up to next 64-byte boundary
             end = Math.ceil(end / 64) * 64;
-            return { start, end, hash };
+            return { start, end, hash, appHash };
         }
     }
     return null;

package/build/esm/bluetooth/flashing/flashing-makecode.js.map

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

package/build/esm/bluetooth/flashing/flashing-makecode.test.d.ts

@@ -0,0 +1 @@
+export {};