@microbit/microbit-connection 0.1.0 → 0.9.0-apps.alpha.1

package/README.md

@@ -38,8 +38,8 @@ import { createUniversalHexFlashDataSource } from "@microbit/microbit-connection
 
 await usb.flash(createUniversalHexFlashDataSource(universalHexString), {
   partial: true,
-  progress: (percentage: number | undefined) => {
-    console.log(percentage);
+  progress: (stage, percentage) => {
+    console.log(stage, percentage);
   },
 });
 ```
@@ -67,8 +67,8 @@ await usb.flash(
   },
   {
     partial: true,
-    progress: (percentage: number | undefined) => {
-      console.log(percentage);
+    progress: (stage, percentage) => {
+      console.log(stage, percentage);
     },
   },
 );

package/build/cjs/accelerometer-service.d.ts

@@ -2,12 +2,12 @@ import { AccelerometerData } from "./accelerometer.js";
 import { Service } from "./bluetooth-device-wrapper.js";
 import { TypedServiceEvent, TypedServiceEventDispatcher } from "./service-events.js";
 export declare class AccelerometerService implements Service {
-    private accelerometerDataCharacteristic;
-    private accelerometerPeriodCharacteristic;
+    private deviceId;
     private dispatchTypedEvent;
-    private queueGattOperation;
-    constructor(accelerometerDataCharacteristic: BluetoothRemoteGATTCharacteristic, accelerometerPeriodCharacteristic: BluetoothRemoteGATTCharacteristic, dispatchTypedEvent: TypedServiceEventDispatcher, queueGattOperation: <R>(action: () => Promise<R>) => Promise<R>);
-    static createService(gattServer: BluetoothRemoteGATTServer, dispatcher: TypedServiceEventDispatcher, queueGattOperation: <R>(action: () => Promise<R>) => Promise<R>, listenerInit: boolean): Promise<AccelerometerService | undefined>;
+    uuid: string;
+    static createService(deviceId: string, dispatchTypedEvent: TypedServiceEventDispatcher): AccelerometerService;
+    constructor(deviceId: string, dispatchTypedEvent: TypedServiceEventDispatcher);
+    getRelevantEvents(): TypedServiceEvent[];
     private dataViewToData;
     getData(): Promise<AccelerometerData>;
     getPeriod(): Promise<number>;

package/build/cjs/accelerometer-service.js

@@ -1,22 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccelerometerService = void 0;
+const bluetooth_le_1 = require("@capacitor-community/bluetooth-le");
 const accelerometer_js_1 = require("./accelerometer.js");
 const bluetooth_profile_js_1 = require("./bluetooth-profile.js");
 const device_js_1 = require("./device.js");
 class AccelerometerService {
-    constructor(accelerometerDataCharacteristic, accelerometerPeriodCharacteristic, dispatchTypedEvent, queueGattOperation) {
-        Object.defineProperty(this, "accelerometerDataCharacteristic", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: accelerometerDataCharacteristic
-        });
-        Object.defineProperty(this, "accelerometerPeriodCharacteristic", {
+    static createService(deviceId, dispatchTypedEvent) {
+        return new AccelerometerService(deviceId, dispatchTypedEvent);
+    }
+    constructor(deviceId, dispatchTypedEvent) {
+        Object.defineProperty(this, "deviceId", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: accelerometerPeriodCharacteristic
+            value: deviceId
         });
         Object.defineProperty(this, "dispatchTypedEvent", {
             enumerable: true,
@@ -24,38 +22,15 @@ class AccelerometerService {
             writable: true,
             value: dispatchTypedEvent
         });
-        Object.defineProperty(this, "queueGattOperation", {
+        Object.defineProperty(this, "uuid", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: queueGattOperation
-        });
-        this.accelerometerDataCharacteristic.addEventListener("characteristicvaluechanged", (event) => {
-            const target = event.target;
-            const data = this.dataViewToData(target.value);
-            this.dispatchTypedEvent("accelerometerdatachanged", new accelerometer_js_1.AccelerometerDataEvent(data));
+            value: bluetooth_profile_js_1.profile.accelerometer.id
         });
     }
-    static async createService(gattServer, dispatcher, queueGattOperation, listenerInit) {
-        let accelerometerService;
-        try {
-            accelerometerService = await gattServer.getPrimaryService(bluetooth_profile_js_1.profile.accelerometer.id);
-        }
-        catch (err) {
-            if (listenerInit) {
-                dispatcher("backgrounderror", new device_js_1.BackgroundErrorEvent(err));
-                return;
-            }
-            else {
-                throw new device_js_1.DeviceError({
-                    code: "service-missing",
-                    message: err,
-                });
-            }
-        }
-        const accelerometerDataCharacteristic = await accelerometerService.getCharacteristic(bluetooth_profile_js_1.profile.accelerometer.characteristics.data.id);
-        const accelerometerPeriodCharacteristic = await accelerometerService.getCharacteristic(bluetooth_profile_js_1.profile.accelerometer.characteristics.period.id);
-        return new AccelerometerService(accelerometerDataCharacteristic, accelerometerPeriodCharacteristic, dispatcher, queueGattOperation);
+    getRelevantEvents() {
+        return ["accelerometerdatachanged"];
     }
     dataViewToData(dataView) {
         return {
@@ -65,11 +40,11 @@ class AccelerometerService {
         };
     }
     async getData() {
-        const dataView = await this.queueGattOperation(() => this.accelerometerDataCharacteristic.readValue());
+        const dataView = await bluetooth_le_1.BleClient.read(this.deviceId, bluetooth_profile_js_1.profile.accelerometer.id, bluetooth_profile_js_1.profile.accelerometer.characteristics.data.id);
         return this.dataViewToData(dataView);
     }
     async getPeriod() {
-        const dataView = await this.queueGattOperation(() => this.accelerometerPeriodCharacteristic.readValue());
+        const dataView = await bluetooth_le_1.BleClient.read(this.deviceId, bluetooth_profile_js_1.profile.accelerometer.id, bluetooth_profile_js_1.profile.accelerometer.characteristics.period.id);
         return dataView.getUint16(0, true);
     }
     async setPeriod(value) {
@@ -83,18 +58,42 @@ class AccelerometerService {
         // https://lancaster-university.github.io/microbit-docs/ble/profile/#about-the-accelerometer-service
         const dataView = new DataView(new ArrayBuffer(2));
         dataView.setUint16(0, value, true);
-        return this.queueGattOperation(() => this.accelerometerPeriodCharacteristic.writeValue(dataView));
+        await bluetooth_le_1.BleClient.write(this.deviceId, bluetooth_profile_js_1.profile.accelerometer.id, bluetooth_profile_js_1.profile.accelerometer.characteristics.period.id, dataView);
     }
     async startNotifications(type) {
-        await this.characteristicForEvent(type)?.startNotifications();
+        const result = this.characteristicForEvent(type);
+        if (result) {
+            const { service, characteristic } = result;
+            try {
+                await bluetooth_le_1.BleClient.startNotifications(this.deviceId, service, characteristic, (value) => {
+                    const data = this.dataViewToData(value);
+                    this.dispatchTypedEvent("accelerometerdatachanged", new accelerometer_js_1.AccelerometerDataEvent(data));
+                });
+            }
+            catch (e) {
+                this.dispatchTypedEvent("backgrounderror", new device_js_1.BackgroundErrorEvent("Failed to start notifications", e));
+            }
+        }
     }
     async stopNotifications(type) {
-        await this.characteristicForEvent(type)?.stopNotifications();
+        const result = this.characteristicForEvent(type);
+        if (result) {
+            const { service, characteristic } = result;
+            try {
+                await bluetooth_le_1.BleClient.stopNotifications(this.deviceId, service, characteristic);
+            }
+            catch (e) {
+                this.dispatchTypedEvent("backgrounderror", new device_js_1.BackgroundErrorEvent("Failed to stop notifications", e));
+            }
+        }
     }
     characteristicForEvent(type) {
         switch (type) {
             case "accelerometerdatachanged": {
-                return this.accelerometerDataCharacteristic;
+                return {
+                    service: bluetooth_profile_js_1.profile.accelerometer.id,
+                    characteristic: bluetooth_profile_js_1.profile.accelerometer.characteristics.data.id,
+                };
             }
             default: {
                 return undefined;

package/build/cjs/accelerometer-service.js.map

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

package/build/cjs/async-util.d.ts

@@ -5,9 +5,18 @@
  */
 export declare class TimeoutError extends Error {
 }
+export declare class DisconnectError extends Error {
+    constructor(message?: string);
+}
 /**
  * Utility to time out an action after a delay.
  *
  * The action cannot be cancelled; it may still proceed after the timeout.
  */
 export declare function withTimeout<T>(actionPromise: Promise<T>, timeout: number): Promise<T>;
+export declare function delay(millis: number): Promise<unknown>;
+export declare function timeoutErrorAfter<T>(millis: number, message?: string): Promise<T>;
+export declare function disconnectErrorCallback<T>(message?: string): {
+    promise: Promise<T>;
+    callback: () => void | undefined;
+};

package/build/cjs/async-util.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeoutError = void 0;
+exports.DisconnectError = exports.TimeoutError = void 0;
 exports.withTimeout = withTimeout;
+exports.delay = delay;
+exports.timeoutErrorAfter = timeoutErrorAfter;
+exports.disconnectErrorCallback = disconnectErrorCallback;
 /**
  * (c) 2021, Micro:bit Educational Foundation and contributors
  *
@@ -10,18 +13,35 @@ exports.withTimeout = withTimeout;
 class TimeoutError extends Error {
 }
 exports.TimeoutError = TimeoutError;
+class DisconnectError extends Error {
+    constructor(message = "Disconnect") {
+        super(message);
+    }
+}
+exports.DisconnectError = DisconnectError;
 /**
  * Utility to time out an action after a delay.
  *
  * The action cannot be cancelled; it may still proceed after the timeout.
  */
 async function withTimeout(actionPromise, timeout) {
-    const timeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => {
-            reject(new TimeoutError());
-        }, timeout);
+    return Promise.race([
+        actionPromise,
+        timeoutErrorAfter(timeout),
+    ]);
+}
+async function delay(millis) {
+    return new Promise((resolve) => setTimeout(resolve, millis));
+}
+async function timeoutErrorAfter(millis, message = "Timeout") {
+    await delay(millis);
+    throw new TimeoutError(message);
+}
+function disconnectErrorCallback(message = "Disconnect") {
+    let callback;
+    const promise = new Promise((_, reject) => {
+        callback = () => reject(new DisconnectError(message));
     });
-    // timeoutPromise never resolves so result must be from action
-    return Promise.race([actionPromise, timeoutPromise]);
+    return { promise, callback: callback };
 }
 //# sourceMappingURL=async-util.js.map

package/build/cjs/async-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"async-util.js","sourceRoot":"","sources":["../../lib/async-util.ts"],"names":[],"mappings":";;;AAYA,kCAWC;AAvBD;;;;GAIG;AACH,MAAa,YAAa,SAAQ,KAAK;CAAG;AAA1C,oCAA0C;AAE1C;;;;GAIG;AACI,KAAK,UAAU,WAAW,CAC/B,aAAyB,EACzB,OAAe;IAEf,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QAC/C,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAC7B,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC,CAAC,CAAC;IACH,8DAA8D;IAC9D,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAe,CAAC;AACrE,CAAC"}
+{"version":3,"file":"async-util.js","sourceRoot":"","sources":["../../lib/async-util.ts"],"names":[],"mappings":";;;AAkBA,kCAQC;AAED,sBAEC;AAED,8CAMC;AAED,0DAMC;AA9CD;;;;GAIG;AACH,MAAa,YAAa,SAAQ,KAAK;CAAG;AAA1C,oCAA0C;AAE1C,MAAa,eAAgB,SAAQ,KAAK;IACxC,YAAY,UAAkB,YAAY;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;CACF;AAJD,0CAIC;AAED;;;;GAIG;AACI,KAAK,UAAU,WAAW,CAC/B,aAAyB,EACzB,OAAe;IAEf,OAAO,OAAO,CAAC,IAAI,CAAC;QAClB,aAAa;QACb,iBAAiB,CAAC,OAAO,CAAC;KAC3B,CAAe,CAAC;AACnB,CAAC;AAEM,KAAK,UAAU,KAAK,CAAC,MAAc;IACxC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;AAC/D,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,MAAc,EACd,UAAkB,SAAS;IAE3B,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,uBAAuB,CAAI,UAAkB,YAAY;IACvE,IAAI,QAAgC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QAC3C,QAAQ,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAS,EAAE,CAAC;AAC1C,CAAC"}

package/build/cjs/bluetooth-device-wrapper.d.ts

@@ -3,14 +3,23 @@
  *
  * 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 } from "./logging.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";
+export declare const bondingTimeoutInMs = 40000;
+export declare const connectTimeoutInMs = 10000;
+export declare const scanningTimeoutInMs = 10000;
+export declare const isAndroid: () => boolean;
 export interface Service {
+    readonly uuid: string;
+    getRelevantEvents(): TypedServiceEvent[];
     startNotifications(type: TypedServiceEvent): Promise<void>;
     stopNotifications(type: TypedServiceEvent): Promise<void>;
 }
@@ -20,44 +29,69 @@ interface ConnectCallbacks {
     onFail: () => void;
     onSuccess: () => void;
 }
-export declare class BluetoothDeviceWrapper {
-    readonly device: BluetoothDevice;
+export declare class BluetoothDeviceWrapper implements Logging {
+    readonly device: BleDevice;
     private logging;
-    private dispatchTypedEvent;
     private currentEvents;
     private callbacks;
     private duringExplicitConnectDisconnect;
-    private gattConnectPromise;
-    private disconnectPromise;
-    private connecting;
+    private connected;
     private isReconnect;
-    private connectReadyPromise;
-    private accelerometer;
-    private buttons;
-    private led;
-    private magnetometer;
-    private uart;
-    private serviceInfo;
+    private serviceIds;
+    accelerometer: AccelerometerService;
+    buttons: ButtonService;
+    deviceInformation: DeviceInformationService;
+    led: LedService;
+    magnetometer: MagnetometerService;
+    uart: UARTService;
+    /**
+     * Only defined after connection.
+     */
     boardVersion: BoardVersion | undefined;
-    private disconnectedRejectionErrorFactory;
-    private gattOperations;
-    constructor(device: BluetoothDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks);
+    private services;
+    private waitingForDisconnectEventCallbacks;
+    private internalNotificationListeners;
+    constructor(device: BleDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks);
     connect(): Promise<void>;
+    private connectInternal;
     disconnect(): Promise<void>;
     private disconnectInternal;
     reconnect(): Promise<void>;
     handleDisconnectEvent: () => Promise<void>;
-    private assertGattServer;
-    private getBoardVersion;
-    private queueGattOperation;
-    private createIfNeeded;
-    getAccelerometerService(): Promise<AccelerometerService | undefined>;
-    getLedService(): Promise<LedService | undefined>;
-    getMagnetometerService(): Promise<MagnetometerService | undefined>;
-    getUARTService(): Promise<UARTService | undefined>;
+    getBoardVersion(): Promise<BoardVersion>;
     startNotifications(type: TypedServiceEvent): Promise<void>;
     stopNotifications(type: TypedServiceEvent): Promise<void>;
-    private disposeServices;
+    private getServicesForEvent;
+    startInternalNotifications(serviceId: string, characteristicId: string, options?: TimeoutOptions): Promise<void>;
+    subscribe(serviceId: string, characteristicId: string, callback: (data: Uint8Array) => void): void;
+    unsubscribe(serviceId: string, characteristicId: string, callback: (data: Uint8Array) => void): void;
+    stopInternalNotifications(serviceId: string, characteristicId: string): Promise<void>;
+    /**
+     * Write to characteristic and wait for a notification response.
+     *
+     * It is the responsibility of the caller to have started notifications
+     * for the characteristic.
+     */
+    writeForNotification(serviceId: string, characteristicId: string, value: DataView, notificationId: number, isFinalNotification?: (p: Uint8Array) => boolean): Promise<Uint8Array>;
+    waitForDisconnect(timeout: number): Promise<void>;
+    /**
+     * Suitable for running a series of BLE interactions with an overall timeout
+     * and general disconnection
+     */
+    raceDisconnectAndTimeout<T>(promise: Promise<T>, options?: {
+        actionName?: string;
+        timeout?: number;
+    }): Promise<T>;
+    private disconnectErrorPromise;
+    event(event: LoggingEvent): void;
+    log(message: string): void;
+    error(message: string, e?: unknown): void;
+    private getNotificationKey;
+    /**
+     * Bonds with device and handles the post-bond device state only returning
+     * when we can reattempt a connection with the device.
+     */
+    private connectHandlingBond;
+    private bondConnectDeviceInternal;
 }
-export declare const createBluetoothDeviceWrapper: (device: BluetoothDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks) => Promise<BluetoothDeviceWrapper | undefined>;
 export {};