@microbit/microbit-connection 0.0.0-tab.change.177 → 0.9.0-apps.alpha.0

package/build/{bluetooth-profile.js → esm/bluetooth-profile.js}

@@ -1,12 +1,5 @@
-// Very incomplete BT profile
 export const profile = {
-    uart: {
-        id: "6e400001-b5a3-f393-e0a9-e50e24dcca9e",
-        characteristics: {
-            tx: { id: "6e400002-b5a3-f393-e0a9-e50e24dcca9e" },
-            rx: { id: "6e400003-b5a3-f393-e0a9-e50e24dcca9e" },
-        },
-    },
+    // Alphabetised
     accelerometer: {
         id: "e95d0753-251d-470a-a062-fa1922dfa9a8",
         characteristics: {
@@ -14,14 +7,21 @@ export const profile = {
             period: { id: "e95dfb24-251d-470a-a062-fa1922dfa9a8" },
         },
     },
+    button: {
+        id: "e95d9882-251d-470a-a062-fa1922dfa9a8",
+        characteristics: {
+            a: { id: "e95dda90-251d-470a-a062-fa1922dfa9a8" },
+            b: { id: "e95dda91-251d-470a-a062-fa1922dfa9a8" },
+        },
+    },
     deviceInformation: {
         id: "0000180a-0000-1000-8000-00805f9b34fb",
         characteristics: {
-            modelNumber: { id: "00002a24-0000-1000-8000-00805f9b34fb" },
-            serialNumber: { id: "00002a25-0000-1000-8000-00805f9b34fb" },
             firmwareRevision: { id: "00002a26-0000-1000-8000-00805f9b34fb" },
             hardwareRevision: { id: "00002a27-0000-1000-8000-00805f9b34fb" },
             manufacturer: { id: "00002a29-0000-1000-8000-00805f9b34fb" },
+            modelNumber: { id: "00002a24-0000-1000-8000-00805f9b34fb" },
+            serialNumber: { id: "00002a25-0000-1000-8000-00805f9b34fb" },
         },
     },
     dfuControl: {
@@ -30,37 +30,30 @@ export const profile = {
             control: { id: "e95d93b1-251d-470a-a062-fa1922dfa9a8" },
         },
     },
-    led: {
-        id: "e95dd91d-251d-470a-a062-fa1922dfa9a8",
+    event: {
+        id: "e95d93af-251d-470a-a062-fa1922dfa9a8",
         characteristics: {
-            matrixState: { id: "e95d7b77-251d-470a-a062-fa1922dfa9a8" },
-            text: { id: "e95d93ee-251d-470a-a062-fa1922dfa9a8" },
-            scrollingDelay: { id: "e95d0d2d-251d-470a-a062-fa1922dfa9a8" },
+            clientEvent: { id: "e95d5404-251d-470a-a062-fa1922dfa9a8" },
+            clientRequirements: { id: "e95d23c4-251d-470a-a062-fa1922dfa9a8" },
+            microBitEvent: { id: "e95d9775-251d-470a-a062-fa1922dfa9a8" },
+            microBitRequirements: { id: "e95db84c-251d-470a-a062-fa1922dfa9a8" },
         },
     },
     ioPin: {
         id: "e95d127b-251d-470a-a062-fa1922dfa9a8",
         characteristics: {
-            pinData: { id: "e95d8d00-251d-470a-a062-fa1922dfa9a8" },
             pinAdConfiguration: { id: "e95d5899-251d-470a-a062-fa1922dfa9a8" },
+            pinData: { id: "e95d8d00-251d-470a-a062-fa1922dfa9a8" },
             pinIoConfiguration: { id: "e95db9fe-251d-470a-a062-fa1922dfa9a8" },
             pwmControl: { id: "e95dd822-251d-470a-a062-fa1922dfa9a8" },
         },
     },
-    button: {
-        id: "e95d9882-251d-470a-a062-fa1922dfa9a8",
-        characteristics: {
-            a: { id: "e95dda90-251d-470a-a062-fa1922dfa9a8" },
-            b: { id: "e95dda91-251d-470a-a062-fa1922dfa9a8" },
-        },
-    },
-    event: {
-        id: "e95d93af-251d-470a-a062-fa1922dfa9a8",
+    led: {
+        id: "e95dd91d-251d-470a-a062-fa1922dfa9a8",
         characteristics: {
-            microBitRequirements: { id: "e95db84c-251d-470a-a062-fa1922dfa9a8" },
-            microBitEvent: { id: "e95d9775-251d-470a-a062-fa1922dfa9a8" },
-            clientRequirements: { id: "e95d23c4-251d-470a-a062-fa1922dfa9a8" },
-            clientEvent: { id: "e95d5404-251d-470a-a062-fa1922dfa9a8" },
+            matrixState: { id: "e95d7b77-251d-470a-a062-fa1922dfa9a8" },
+            scrollingDelay: { id: "e95d0d2d-251d-470a-a062-fa1922dfa9a8" },
+            text: { id: "e95d93ee-251d-470a-a062-fa1922dfa9a8" },
         },
     },
     magnetometer: {
@@ -72,6 +65,12 @@ export const profile = {
             calibration: { id: "e95db358-251d-470a-a062-fa1922dfa9a8" },
         },
     },
+    partialFlashing: {
+        id: "e97dd91d-251d-470a-a062-fa1922dfa9a8",
+        characteristics: {
+            partialFlash: { id: "e97d3b10-251d-470a-a062-fa1922dfa9a8" },
+        },
+    },
     temperature: {
         id: "e95d6100-251d-470a-a062-fa1922dfa9a8",
         characteristics: {
@@ -79,5 +78,12 @@ export const profile = {
             period: { id: "e95d1b25-251d-470a-a062-fa1922dfa9a8" },
         },
     },
+    uart: {
+        id: "6e400001-b5a3-f393-e0a9-e50e24dcca9e",
+        characteristics: {
+            rx: { id: "6e400003-b5a3-f393-e0a9-e50e24dcca9e" },
+            tx: { id: "6e400002-b5a3-f393-e0a9-e50e24dcca9e" },
+        },
+    },
 };
 //# sourceMappingURL=bluetooth-profile.js.map

package/build/esm/bluetooth-profile.js.map

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

package/build/esm/bluetooth.d.ts

@@ -0,0 +1,112 @@
+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";
+export interface MicrobitWebBluetoothConnectionOptions {
+    logging?: Logging;
+}
+export interface MicrobitWebBluetoothConnection extends DeviceConnection<ServiceConnectionEventMap> {
+    /**
+     * Sets micro:bit name filter for device requesting.
+     *
+     * @param name The name of the micro:bit.
+     */
+    setNameFilter(name: string): void;
+    /**
+     * Gets micro:bit accelerometer data.
+     *
+     * @returns accelerometer data or undefined if there is no connection.
+     */
+    getAccelerometerData(): Promise<AccelerometerData | undefined>;
+    /**
+     * Gets micro:bit accelerometer period.
+     *
+     * @returns accelerometer period or undefined if there is no connection.
+     */
+    getAccelerometerPeriod(): Promise<number | undefined>;
+    /**
+     * Sets micro:bit accelerometer period.
+     *
+     * @param value The accelerometer period.
+     */
+    setAccelerometerPeriod(value: number): Promise<void>;
+    /**
+     * Sets micro:bit LED text.
+     *
+     * @param text The text displayed on micro:bit LED.
+     */
+    setLedText(text: string): Promise<void>;
+    /**
+     * Gets micro:bit LED scrolling delay.
+     *
+     * @returns LED scrolling delay in milliseconds.
+     */
+    getLedScrollingDelay(): Promise<number | undefined>;
+    /**
+     * Sets micro:bit LED scrolling delay.
+     *
+     * @param delayInMillis LED scrolling delay in milliseconds.
+     */
+    setLedScrollingDelay(delayInMillis: number): Promise<void>;
+    /**
+     * Gets micro:bit LED matrix.
+     *
+     * @returns a boolean matrix representing the micro:bit LED display.
+     */
+    getLedMatrix(): Promise<LedMatrix | undefined>;
+    /**
+     * Sets micro:bit LED matrix.
+     *
+     * @param matrix an boolean matrix representing the micro:bit LED display.
+     */
+    setLedMatrix(matrix: LedMatrix): Promise<void>;
+    /**
+     * Gets micro:bit magnetometer data.
+     *
+     * @returns magnetometer data.
+     */
+    getMagnetometerData(): Promise<MagnetometerData | undefined>;
+    /**
+     * Gets micro:bit magnetometer bearing.
+     *
+     * @returns magnetometer bearing.
+     */
+    getMagnetometerBearing(): Promise<number | undefined>;
+    /**
+     * Gets micro:bit magnetometer period.
+     *
+     * @returns magnetometer period.
+     */
+    getMagnetometerPeriod(): Promise<number | undefined>;
+    /**
+     * Sets micro:bit magnetometer period.
+     *
+     * @param value magnetometer period.
+     */
+    setMagnetometerPeriod(value: number): Promise<void>;
+    /**
+     * Triggers micro:bit magnetometer calibration.
+     */
+    triggerMagnetometerCalibration(): Promise<void>;
+    /**
+     * Write UART messages.
+     *
+     * @param data UART message.
+     */
+    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;

package/build/esm/bluetooth.js

@@ -0,0 +1,428 @@
+/**
+ * (c) 2021, Micro:bit Educational Foundation and contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+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 { fullFlash } from "./flashing/flashing-full.js";
+import partialFlash, { PartialFlashResult, } from "./flashing/flashing-partial.js";
+let bleClientInitialized = false;
+/**
+ * A Bluetooth connection factory.
+ */
+export const createWebBluetoothConnection = (options) => new MicrobitWebBluetoothConnectionImpl(options);
+/**
+ * A Bluetooth connection to a micro:bit device.
+ */
+class MicrobitWebBluetoothConnectionImpl extends TypedEventTarget {
+    constructor(options = {}) {
+        super();
+        Object.defineProperty(this, "status", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ConnectionStatus.SUPPORT_NOT_KNOWN
+        });
+        /**
+         * The USB device we last connected to.
+         * Cleared if it is disconnected.
+         */
+        Object.defineProperty(this, "device", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "logging", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "connection", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "availabilityListener", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (e) => {
+                // TODO: is this called? is `value` correct?
+                const value = e.value;
+                this.availability = value;
+            }
+        });
+        Object.defineProperty(this, "availability", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "nameFilter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "deferStatusUpdates", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        this.logging = options.logging || new ConsoleLogging();
+    }
+    eventActivated(type) {
+        this.connection?.startNotifications(type);
+    }
+    eventDeactivated(type) {
+        this.connection?.stopNotifications(type);
+    }
+    log(v) {
+        this.logging.log(v);
+    }
+    error(message, e) {
+        this.logging.error(message, e);
+    }
+    async initialize() {
+        navigator.bluetooth?.addEventListener("availabilitychanged", this.availabilityListener);
+        this.availability = await navigator.bluetooth?.getAvailability();
+        this.setStatus(this.availability
+            ? ConnectionStatus.NO_AUTHORIZED_DEVICE
+            : ConnectionStatus.NOT_SUPPORTED);
+    }
+    dispose() {
+        navigator.bluetooth?.removeEventListener("availabilitychanged", this.availabilityListener);
+    }
+    getBoardVersion() {
+        return this.connection?.boardVersion;
+    }
+    async connect(options) {
+        const progress = options?.progress ?? (() => { });
+        progress(ProgressStage.Initializing);
+        await this.preConnectInitialization();
+        if (!this.connection) {
+            progress(ProgressStage.FindingDevice);
+            const device = await this.requestDevice();
+            this.connection = new BluetoothDeviceWrapper(device, this.logging, this.dispatchTypedEvent.bind(this), () => this.getActiveEvents(), {
+                onConnecting: () => this.setStatus(ConnectionStatus.CONNECTING),
+                onReconnecting: () => this.setStatus(ConnectionStatus.RECONNECTING),
+                onSuccess: () => this.setStatus(ConnectionStatus.CONNECTED),
+                onFail: () => {
+                    this.setStatus(ConnectionStatus.DISCONNECTED);
+                    this.connection = undefined;
+                },
+            });
+        }
+        progress(ProgressStage.Connecting);
+        await this.connection.connect();
+    }
+    /**
+     * Initializes BLE.
+     *
+     * This must happen before requesting a device or connecting.
+     *
+     * We do this just before use not at connection initialize because on Android/iOS
+     * that's the appropriate time to ask for permissions.
+     */
+    async preConnectInitialization() {
+        try {
+            if (isAndroid()) {
+                const isLocationEnabled = await BleClient.isLocationEnabled();
+                if (!isLocationEnabled) {
+                    throw new DeviceError({
+                        code: "bluetooth-missing-permissions",
+                        message: "Location services is disabled",
+                    });
+                }
+            }
+            if (!bleClientInitialized) {
+                await BleClient.initialize({ androidNeverForLocation: true });
+                bleClientInitialized = true;
+            }
+            const isBluetoothEnabled = await BleClient.isEnabled();
+            if (!isBluetoothEnabled) {
+                throw new DeviceError({
+                    code: "bluetooth-disabled",
+                    message: "Bluetooth is disabled",
+                });
+            }
+        }
+        catch (e) {
+            this.error("Error initializing Bluetooth", e);
+            const error = e;
+            if (error.message === "BLE permission denied") {
+                // Error thrown for iOS platform.
+                throw new DeviceError({
+                    code: "bluetooth-disabled",
+                    message: "Bluetooth is disabled",
+                });
+            }
+            throw new DeviceError({
+                code: "bluetooth-missing-permissions",
+                message: "Missing permissions",
+            });
+        }
+    }
+    async disconnect() {
+        try {
+            if (this.connection) {
+                await this.connection.disconnect();
+            }
+        }
+        catch (e) {
+            this.logging.event({
+                type: "Bluetooth-error",
+                message: "error-disconnecting",
+            });
+        }
+        finally {
+            this.connection = undefined;
+            this.setStatus(ConnectionStatus.DISCONNECTED);
+            this.logging.event({
+                type: "Bluetooth-info",
+                message: "disconnected",
+            });
+        }
+    }
+    setStatus(newStatus) {
+        this.status = newStatus;
+        this.log("Bluetooth connection status " + newStatus);
+        if (!this.deferStatusUpdates) {
+            this.dispatchTypedEvent("status", new ConnectionStatusEvent(newStatus));
+        }
+    }
+    serialWrite(data) {
+        if (this.connection) {
+            // TODO
+        }
+        return Promise.resolve();
+    }
+    async clearDevice() {
+        await this.disconnect();
+        this.device = undefined;
+        this.setStatus(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+    }
+    setNameFilter(name) {
+        this.nameFilter = name;
+    }
+    async requestDevice() {
+        if (this.device) {
+            return this.device;
+        }
+        this.dispatchTypedEvent("beforerequestdevice", new BeforeRequestDevice());
+        try {
+            const namePrefix = this.nameFilter
+                ? `BBC micro:bit [${this.nameFilter}]`
+                : "BBC micro:bit";
+            if (Capacitor.isNativePlatform()) {
+                this.device = await this.requestDeviceNative(namePrefix);
+            }
+            else {
+                this.device = await this.requestDeviceWeb(namePrefix);
+            }
+            if (!this.device) {
+                this.setStatus(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+                throw new DeviceError({
+                    code: "timeout-error",
+                    message: "Timeout scanning for device",
+                });
+            }
+            return this.device;
+        }
+        finally {
+            this.dispatchTypedEvent("afterrequestdevice", new AfterRequestDevice());
+        }
+    }
+    async getAccelerometerData() {
+        return this.connection?.accelerometer.getData();
+    }
+    async getAccelerometerPeriod() {
+        return this.connection?.accelerometer.getPeriod();
+    }
+    async setAccelerometerPeriod(value) {
+        return this.connection?.accelerometer.setPeriod(value);
+    }
+    async setLedText(text) {
+        return this.connection?.led.setText(text);
+    }
+    async getLedScrollingDelay() {
+        return this.connection?.led.getScrollingDelay();
+    }
+    async setLedScrollingDelay(delayInMillis) {
+        await this.connection?.led.setScrollingDelay(delayInMillis);
+    }
+    async getLedMatrix() {
+        return await this.connection?.led.getLedMatrix();
+    }
+    async setLedMatrix(matrix) {
+        await this.connection?.led.setLedMatrix(matrix);
+    }
+    async getMagnetometerData() {
+        return this.connection?.magnetometer.getData();
+    }
+    async getMagnetometerPeriod() {
+        return this.connection?.magnetometer.getPeriod();
+    }
+    async setMagnetometerPeriod(value) {
+        return this.connection?.magnetometer.setPeriod(value);
+    }
+    async getMagnetometerBearing() {
+        return this.connection?.magnetometer.getBearing();
+    }
+    async triggerMagnetometerCalibration() {
+        await this.connection?.magnetometer.triggerCalibration();
+    }
+    async uartWrite(data) {
+        await this.connection?.uart.writeData(data);
+    }
+    /**
+     * Flash the micro:bit.
+     *
+     * Note that this will always leave the connection disconnected.
+     *
+     * @param dataSource The data to use.
+     * @param options Flash options and progress callback.
+     */
+    async flash(dataSource, options = {}) {
+        const progress = options.progress ?? (() => { });
+        try {
+            // We'll disconnect/reconnect multiple times due to device resets, but reporting this is unhelpful.
+            this.deferStatusUpdates = true;
+            if (this.status !== ConnectionStatus.CONNECTED) {
+                await this.connect({ progress });
+            }
+            const connection = this.connection;
+            try {
+                const boardVersion = connection.boardVersion;
+                if (!boardVersion) {
+                    throw new DeviceError({
+                        code: "device-disconnected",
+                        message: "No board version found",
+                    });
+                }
+                const memoryMap = convertDataToMemoryMap(await dataSource(boardVersion));
+                if (!memoryMap) {
+                    throw new FlashDataError("Could not convert hex to memory map");
+                }
+                if (!this.device) {
+                    throw new DeviceError({
+                        code: "device-disconnected",
+                        message: "No device",
+                    });
+                }
+                this.log(`Got board version ${boardVersion}`);
+                const partialFlashResult = await partialFlash(connection, memoryMap, progress);
+                if (partialFlashResult === PartialFlashResult.AttemptFullFlash) {
+                    await fullFlash(connection, boardVersion, memoryMap, progress);
+                }
+            }
+            catch (e) {
+                this.error("Failed to flash", e);
+                throw e;
+            }
+            finally {
+                await this.disconnect();
+            }
+        }
+        finally {
+            this.deferStatusUpdates = false;
+            this.dispatchTypedEvent("status", new ConnectionStatusEvent(this.status));
+        }
+    }
+    async requestDeviceWeb(namePrefix) {
+        return await BleClient.requestDevice({
+            namePrefix: this.nameFilter
+                ? `BBC micro:bit [${namePrefix}]`
+                : "BBC micro:bit",
+            // TODO: is this possible to reinstate?
+            // See https://github.com/bsiever/microbit-pxt-blehid/issues/31
+            //namePrefix: this.nameFilter
+            //  ? `uBit [${this.nameFilter}]`
+            //  : "uBit",
+            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,
+            ],
+        });
+    }
+    /**
+     * Finds device with specified name prefix.
+     *
+     * @returns device or undefined if none can be found.
+     */
+    async requestDeviceNative(namePrefix) {
+        // Check for existing bonded devices.
+        const bonded = await this.checkBondedDevices((device) => {
+            const name = device.name;
+            return !!name && name.startsWith(namePrefix);
+        });
+        if (bonded) {
+            return bonded;
+        }
+        this.log(`Scanning for device - ${namePrefix}`);
+        let found = false;
+        const scanPromise = new Promise((resolve) => 
+        // This only resolves when we stop the scan.
+        void BleClient.requestLEScan({}, async (result) => {
+            // For a V1 in the Nordic bootloader, we see a name of "DfuTarg" that
+            // 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)) {
+                found = true;
+                await BleClient.stopLEScan();
+                resolve(result.device);
+            }
+        }));
+        const scanTimeoutPromise = new Promise((resolve) => setTimeout(async () => {
+            if (!found) {
+                await BleClient.stopLEScan();
+                this.log("Timeout scanning for device");
+                resolve(undefined);
+            }
+        }, scanningTimeoutInMs));
+        return await Promise.race([scanPromise, scanTimeoutPromise]);
+    }
+    async checkBondedDevices(predicate) {
+        if (!isAndroid()) {
+            // Not supported.
+            return undefined;
+        }
+        const bondedDevices = await BleClient.getBondedDevices();
+        const result = bondedDevices.find(predicate);
+        this.log(result === undefined
+            ? "No matching bonded device"
+            : "Found matching bonded device");
+        return result;
+    }
+}
+const convertDataToMemoryMap = (data) => {
+    if (data instanceof MemoryMap) {
+        return data;
+    }
+    if (data instanceof Uint8Array) {
+        return MemoryMap.fromPaddedUint8Array(data);
+    }
+    return MemoryMap.fromHex(data);
+};
+//# sourceMappingURL=bluetooth.js.map

package/build/esm/bluetooth.js.map

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