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

package/build/esm/magnetometer-service.d.ts

@@ -1,15 +1,12 @@
-import { MagnetometerData } from "./magnetometer.js";
 import { Service } from "./bluetooth-device-wrapper.js";
+import { MagnetometerData } from "./magnetometer.js";
 import { TypedServiceEvent, TypedServiceEventDispatcher } from "./service-events.js";
 export declare class MagnetometerService implements Service {
-    private magnetometerDataCharacteristic;
-    private magnetometerPeriodCharacteristic;
-    private magnetometerBearingCharacteristic;
-    private magnetometerCalibrationCharacteristic;
+    private deviceId;
     private dispatchTypedEvent;
-    private queueGattOperation;
-    constructor(magnetometerDataCharacteristic: BluetoothRemoteGATTCharacteristic, magnetometerPeriodCharacteristic: BluetoothRemoteGATTCharacteristic, magnetometerBearingCharacteristic: BluetoothRemoteGATTCharacteristic, magnetometerCalibrationCharacteristic: 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<MagnetometerService | undefined>;
+    uuid: string;
+    constructor(deviceId: string, dispatchTypedEvent: TypedServiceEventDispatcher);
+    getRelevantEvents(): TypedServiceEvent[];
     private dataViewToData;
     getData(): Promise<MagnetometerData>;
     getPeriod(): Promise<number>;
@@ -18,5 +15,4 @@ export declare class MagnetometerService implements Service {
     triggerCalibration(): Promise<void>;
     startNotifications(type: TypedServiceEvent): Promise<void>;
     stopNotifications(type: TypedServiceEvent): Promise<void>;
-    private characteristicForEvent;
 }

package/build/esm/magnetometer-service.js

@@ -1,31 +1,14 @@
-import { MagnetometerDataEvent } from "./magnetometer.js";
+import { BleClient } from "@capacitor-community/bluetooth-le";
 import { profile } from "./bluetooth-profile.js";
-import { BackgroundErrorEvent, DeviceError } from "./device.js";
+import { MagnetometerDataEvent } from "./magnetometer.js";
+import { BackgroundErrorEvent } from "./device.js";
 export class MagnetometerService {
-    constructor(magnetometerDataCharacteristic, magnetometerPeriodCharacteristic, magnetometerBearingCharacteristic, magnetometerCalibrationCharacteristic, dispatchTypedEvent, queueGattOperation) {
-        Object.defineProperty(this, "magnetometerDataCharacteristic", {
+    constructor(deviceId, dispatchTypedEvent) {
+        Object.defineProperty(this, "deviceId", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: magnetometerDataCharacteristic
-        });
-        Object.defineProperty(this, "magnetometerPeriodCharacteristic", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: magnetometerPeriodCharacteristic
-        });
-        Object.defineProperty(this, "magnetometerBearingCharacteristic", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: magnetometerBearingCharacteristic
-        });
-        Object.defineProperty(this, "magnetometerCalibrationCharacteristic", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: magnetometerCalibrationCharacteristic
+            value: deviceId
         });
         Object.defineProperty(this, "dispatchTypedEvent", {
             enumerable: true,
@@ -33,40 +16,15 @@ export class MagnetometerService {
             writable: true,
             value: dispatchTypedEvent
         });
-        Object.defineProperty(this, "queueGattOperation", {
+        Object.defineProperty(this, "uuid", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: queueGattOperation
-        });
-        this.magnetometerDataCharacteristic.addEventListener("characteristicvaluechanged", (event) => {
-            const target = event.target;
-            const data = this.dataViewToData(target.value);
-            this.dispatchTypedEvent("magnetometerdatachanged", new MagnetometerDataEvent(data));
+            value: profile.magnetometer.id
         });
     }
-    static async createService(gattServer, dispatcher, queueGattOperation, listenerInit) {
-        let magnetometerService;
-        try {
-            magnetometerService = await gattServer.getPrimaryService(profile.magnetometer.id);
-        }
-        catch (err) {
-            if (listenerInit) {
-                dispatcher("backgrounderror", new BackgroundErrorEvent(err));
-                return;
-            }
-            else {
-                throw new DeviceError({
-                    code: "service-missing",
-                    message: err,
-                });
-            }
-        }
-        const magnetometerDataCharacteristic = await magnetometerService.getCharacteristic(profile.magnetometer.characteristics.data.id);
-        const magnetometerPeriodCharacteristic = await magnetometerService.getCharacteristic(profile.magnetometer.characteristics.period.id);
-        const magnetometerBearingCharacteristic = await magnetometerService.getCharacteristic(profile.magnetometer.characteristics.bearing.id);
-        const magnetometerCalibrationCharacteristic = await magnetometerService.getCharacteristic(profile.magnetometer.characteristics.calibration.id);
-        return new MagnetometerService(magnetometerDataCharacteristic, magnetometerPeriodCharacteristic, magnetometerBearingCharacteristic, magnetometerCalibrationCharacteristic, dispatcher, queueGattOperation);
+    getRelevantEvents() {
+        return ["magnetometerdatachanged"];
     }
     dataViewToData(dataView) {
         return {
@@ -76,11 +34,11 @@ export class MagnetometerService {
         };
     }
     async getData() {
-        const dataView = await this.queueGattOperation(() => this.magnetometerDataCharacteristic.readValue());
+        const dataView = await BleClient.read(this.deviceId, profile.magnetometer.id, profile.magnetometer.characteristics.data.id);
         return this.dataViewToData(dataView);
     }
     async getPeriod() {
-        const dataView = await this.queueGattOperation(() => this.magnetometerPeriodCharacteristic.readValue());
+        const dataView = await BleClient.read(this.deviceId, profile.magnetometer.id, profile.magnetometer.characteristics.period.id);
         return dataView.getUint16(0, true);
     }
     async setPeriod(value) {
@@ -94,30 +52,37 @@ export class MagnetometerService {
         // https://lancaster-university.github.io/microbit-docs/ble/profile/#about-the-magnetometer-service
         const dataView = new DataView(new ArrayBuffer(2));
         dataView.setUint16(0, value, true);
-        return this.queueGattOperation(() => this.magnetometerPeriodCharacteristic.writeValue(dataView));
+        await BleClient.write(this.deviceId, profile.magnetometer.id, profile.magnetometer.characteristics.period.id, dataView);
     }
     async getBearing() {
-        const dataView = await this.queueGattOperation(() => this.magnetometerBearingCharacteristic.readValue());
+        const dataView = await BleClient.read(this.deviceId, profile.magnetometer.id, profile.magnetometer.characteristics.bearing.id);
         return dataView.getUint16(0, true);
     }
     async triggerCalibration() {
         const dataView = new DataView(new ArrayBuffer(1));
         dataView.setUint8(0, 1);
-        return this.queueGattOperation(() => this.magnetometerCalibrationCharacteristic.writeValue(dataView));
+        await BleClient.write(this.deviceId, profile.magnetometer.id, profile.magnetometer.characteristics.calibration.id, dataView);
     }
     async startNotifications(type) {
-        await this.characteristicForEvent(type)?.startNotifications();
+        if (type === "magnetometerdatachanged") {
+            try {
+                await BleClient.startNotifications(this.deviceId, profile.magnetometer.id, profile.magnetometer.characteristics.data.id, (value) => {
+                    const data = this.dataViewToData(value);
+                    this.dispatchTypedEvent("magnetometerdatachanged", new MagnetometerDataEvent(data));
+                });
+            }
+            catch (e) {
+                this.dispatchTypedEvent("backgrounderror", new BackgroundErrorEvent("Failed to start notifications", e));
+            }
+        }
     }
     async stopNotifications(type) {
-        await this.characteristicForEvent(type)?.stopNotifications();
-    }
-    characteristicForEvent(type) {
-        switch (type) {
-            case "magnetometerdatachanged": {
-                return this.magnetometerDataCharacteristic;
+        if (type === "magnetometerdatachanged") {
+            try {
+                await BleClient.stopNotifications(this.deviceId, profile.magnetometer.id, profile.magnetometer.characteristics.data.id);
             }
-            default: {
-                return undefined;
+            catch (e) {
+                this.dispatchTypedEvent("backgrounderror", new BackgroundErrorEvent("Failed to stop notifications", e));
             }
         }
     }

package/build/esm/magnetometer-service.js.map

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

package/build/esm/partial-flashing-service.d.ts

@@ -0,0 +1,45 @@
+import { TimeoutOptions } from "@capacitor-community/bluetooth-le";
+import MemoryMap from "nrf-intel-hex";
+import { BluetoothDeviceWrapper } from "./bluetooth-device-wrapper";
+export declare const enum MicroBitMode {
+    Pairing = 0,
+    Application = 1
+}
+export declare const enum RegionId {
+    SoftDevice = 0,
+    Dal = 1,
+    MakeCode = 2
+}
+export interface RegionInfo {
+    start: number;
+    end: number;
+    hash: string;
+}
+export declare const enum PacketState {
+    Retransmit = 170,
+    Success = 255
+}
+/**
+ * Doesn't actually implement service as we don't expose this other than via
+ * the flash method.
+ */
+export declare class PartialFlashingService {
+    private connection;
+    constructor(connection: BluetoothDeviceWrapper);
+    startNotifications(options?: TimeoutOptions): Promise<void>;
+    stopNotifications(): Promise<void>;
+    resetToMode(mode: MicroBitMode): Promise<void>;
+    getRegionInfo(region: RegionId): Promise<RegionInfo | null>;
+    /**
+     * Writes a flash chunk.
+     * Use writeFlashForNotification for every 4th chunk.
+     */
+    writeFlash(source: MemoryMap, batchAddress: number, dataOffset: number, packetNumber: number, packetInBatch: number): Promise<void>;
+    /**
+     * Write a chunk and wait for a success/retransmit response.
+     * The micro:bit notifies on every 4th chunk.
+     */
+    writeFlashForNotification(source: MemoryMap, batchAddress: number, dataOffset: number, packetNumber: number, packetInBatch: number): Promise<PacketState>;
+    writeEndOfFlashPacket(): Promise<void>;
+    private createWriteDataCommand;
+}

package/build/esm/partial-flashing-service.js

@@ -0,0 +1,106 @@
+/* eslint-disable @typescript-eslint/no-unsafe-enum-comparison */
+import { BleClient, numbersToDataView, } from "@capacitor-community/bluetooth-le";
+import { profile } from "./bluetooth-profile";
+const MICROBIT_RESET_COMMAND = 0xff;
+const REGION_INFO_COMMAND = 0x0;
+const FLASH_COMMAND = 0x1;
+export var MicroBitMode;
+(function (MicroBitMode) {
+    MicroBitMode[MicroBitMode["Pairing"] = 0] = "Pairing";
+    MicroBitMode[MicroBitMode["Application"] = 1] = "Application";
+})(MicroBitMode || (MicroBitMode = {}));
+export var RegionId;
+(function (RegionId) {
+    RegionId[RegionId["SoftDevice"] = 0] = "SoftDevice";
+    RegionId[RegionId["Dal"] = 1] = "Dal";
+    RegionId[RegionId["MakeCode"] = 2] = "MakeCode";
+})(RegionId || (RegionId = {}));
+export var PacketState;
+(function (PacketState) {
+    PacketState[PacketState["Retransmit"] = 170] = "Retransmit";
+    PacketState[PacketState["Success"] = 255] = "Success";
+})(PacketState || (PacketState = {}));
+/**
+ * Doesn't actually implement service as we don't expose this other than via
+ * the flash method.
+ */
+export class PartialFlashingService {
+    constructor(connection) {
+        Object.defineProperty(this, "connection", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: connection
+        });
+    }
+    async startNotifications(options) {
+        await this.connection.startInternalNotifications(profile.partialFlashing.id, profile.partialFlashing.characteristics.partialFlash.id, options);
+    }
+    async stopNotifications() {
+        await this.connection.stopInternalNotifications(profile.partialFlashing.id, profile.partialFlashing.characteristics.partialFlash.id);
+    }
+    async resetToMode(mode) {
+        await BleClient.writeWithoutResponse(this.connection.device.deviceId, profile.partialFlashing.id, profile.partialFlashing.characteristics.partialFlash.id, numbersToDataView([MICROBIT_RESET_COMMAND, mode]));
+    }
+    async getRegionInfo(region) {
+        return parseRegionResponse(await this.connection.writeForNotification(profile.partialFlashing.id, profile.partialFlashing.characteristics.partialFlash.id, numbersToDataView([REGION_INFO_COMMAND, region]), REGION_INFO_COMMAND));
+    }
+    /**
+     * Writes a flash chunk.
+     * Use writeFlashForNotification for every 4th chunk.
+     */
+    async writeFlash(source, batchAddress, dataOffset, packetNumber, packetInBatch) {
+        return await BleClient.writeWithoutResponse(this.connection.device.deviceId, profile.partialFlashing.id, profile.partialFlashing.characteristics.partialFlash.id, this.createWriteDataCommand(source, batchAddress, dataOffset, packetNumber, packetInBatch));
+    }
+    /**
+     * Write a chunk and wait for a success/retransmit response.
+     * The micro:bit notifies on every 4th chunk.
+     */
+    async writeFlashForNotification(source, batchAddress, dataOffset, packetNumber, packetInBatch) {
+        const result = await this.connection.writeForNotification(profile.partialFlashing.id, profile.partialFlashing.characteristics.partialFlash.id, this.createWriteDataCommand(source, batchAddress, dataOffset, packetNumber, packetInBatch), FLASH_COMMAND, (notificationValue) => notificationValue[1] === PacketState.Success ||
+            notificationValue[1] === PacketState.Retransmit);
+        return result[1];
+    }
+    async writeEndOfFlashPacket() {
+        return await BleClient.writeWithoutResponse(this.connection.device.deviceId, profile.partialFlashing.id, profile.partialFlashing.characteristics.partialFlash.id, numbersToDataView([0x02]));
+    }
+    createWriteDataCommand(source, batchAddress, dataOffset, packetNumber, packetInBatch) {
+        const data = new DataView(new ArrayBuffer(20));
+        data.setUint8(0, 0x01);
+        // Bytes 1-2: offset encoding
+        // Packet 0: low 16 bits of flash address
+        // Packet 1: high 16 bits of flash address
+        // Packets 2-3: offset within the 64-byte batch being written
+        let offsetValue;
+        if (packetInBatch === 0) {
+            offsetValue = batchAddress & 0xffff;
+        }
+        else {
+            // Note: for packets 2 and 3 the offset is unused.
+            offsetValue = (batchAddress >> 16) & 0xffff;
+        }
+        data.setUint16(1, offsetValue);
+        data.setUint8(3, packetNumber);
+        const bytes = source.slicePad(dataOffset, 16);
+        for (let i = 0; i < 16; ++i) {
+            data.setUint8(4 + i, bytes[i]);
+        }
+        return data;
+    }
+}
+const parseRegionResponse = (value) => {
+    const dataView = new DataView(value.buffer, value.byteOffset, value.byteLength);
+    const start = dataView.getUint32(2, false);
+    const end = dataView.getUint32(6, false);
+    if (start === 0 || start >= end) {
+        return null;
+    }
+    const hash = value.slice(10, 18);
+    return { start, end, hash: bytesToHex(hash) };
+};
+const bytesToHex = (bytes) => {
+    return Array.from(bytes)
+        .map((byte) => byte.toString(16).padStart(2, "0").toUpperCase())
+        .join("");
+};
+//# sourceMappingURL=partial-flashing-service.js.map

package/build/esm/partial-flashing-service.js.map

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

package/build/esm/uart-service.d.ts

@@ -1,12 +1,11 @@
 import { Service } from "./bluetooth-device-wrapper.js";
 import { TypedServiceEvent, TypedServiceEventDispatcher } from "./service-events.js";
 export declare class UARTService implements Service {
-    private txCharacteristic;
-    private rxCharacteristic;
+    private deviceId;
     private dispatchTypedEvent;
-    private queueGattOperation;
-    constructor(txCharacteristic: BluetoothRemoteGATTCharacteristic, rxCharacteristic: 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<UARTService | undefined>;
+    uuid: string;
+    constructor(deviceId: string, dispatchTypedEvent: TypedServiceEventDispatcher);
+    getRelevantEvents(): TypedServiceEvent[];
     startNotifications(type: TypedServiceEvent): Promise<void>;
     stopNotifications(type: TypedServiceEvent): Promise<void>;
     writeData(value: Uint8Array): Promise<void>;

package/build/esm/uart-service.js

@@ -1,19 +1,14 @@
+import { BleClient } from "@capacitor-community/bluetooth-le";
 import { profile } from "./bluetooth-profile.js";
-import { BackgroundErrorEvent, DeviceError } from "./device.js";
 import { UARTDataEvent } from "./uart.js";
+import { BackgroundErrorEvent } from "./device.js";
 export class UARTService {
-    constructor(txCharacteristic, rxCharacteristic, dispatchTypedEvent, queueGattOperation) {
-        Object.defineProperty(this, "txCharacteristic", {
+    constructor(deviceId, dispatchTypedEvent) {
+        Object.defineProperty(this, "deviceId", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: txCharacteristic
-        });
-        Object.defineProperty(this, "rxCharacteristic", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: rxCharacteristic
+            value: deviceId
         });
         Object.defineProperty(this, "dispatchTypedEvent", {
             enumerable: true,
@@ -21,52 +16,36 @@ export class UARTService {
             writable: true,
             value: dispatchTypedEvent
         });
-        Object.defineProperty(this, "queueGattOperation", {
+        Object.defineProperty(this, "uuid", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: queueGattOperation
-        });
-        this.txCharacteristic.addEventListener("characteristicvaluechanged", (event) => {
-            const target = event.target;
-            const value = new Uint8Array(target.value.buffer);
-            this.dispatchTypedEvent("uartdata", new UARTDataEvent(value));
+            value: profile.uart.id
         });
     }
-    static async createService(gattServer, dispatcher, queueGattOperation, listenerInit) {
-        let uartService;
-        try {
-            uartService = await gattServer.getPrimaryService(profile.uart.id);
-        }
-        catch (err) {
-            if (listenerInit) {
-                dispatcher("backgrounderror", new BackgroundErrorEvent(err));
-                return;
-            }
-            else {
-                throw new DeviceError({
-                    code: "service-missing",
-                    message: err,
-                });
-            }
-        }
-        const rxCharacteristic = await uartService.getCharacteristic(profile.uart.characteristics.rx.id);
-        const txCharacteristic = await uartService.getCharacteristic(profile.uart.characteristics.tx.id);
-        return new UARTService(txCharacteristic, rxCharacteristic, dispatcher, queueGattOperation);
+    getRelevantEvents() {
+        return ["uartdata"];
     }
     async startNotifications(type) {
         if (type === "uartdata") {
-            await this.txCharacteristic.startNotifications();
+            try {
+                await BleClient.startNotifications(this.deviceId, profile.uart.id, profile.uart.characteristics.tx.id, (value) => {
+                    this.dispatchTypedEvent("uartdata", new UARTDataEvent(new Uint8Array(value.buffer)));
+                });
+            }
+            catch (e) {
+                this.dispatchTypedEvent("backgrounderror", new BackgroundErrorEvent("Failed to start notifications", e));
+            }
         }
     }
     async stopNotifications(type) {
         if (type === "uartdata") {
-            await this.txCharacteristic.stopNotifications();
+            await BleClient.stopNotifications(this.deviceId, profile.uart.id, profile.uart.characteristics.tx.id);
         }
     }
     async writeData(value) {
         const dataView = new DataView(value.buffer);
-        return this.queueGattOperation(() => this.rxCharacteristic.writeValueWithoutResponse(dataView));
+        await BleClient.writeWithoutResponse(this.deviceId, profile.uart.id, profile.uart.characteristics.rx.id, dataView);
     }
 }
 //# sourceMappingURL=uart-service.js.map

package/build/esm/uart-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"uart-service.js","sourceRoot":"","sources":["../../lib/uart-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAMhE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,OAAO,WAAW;IACtB,YACU,gBAAmD,EACnD,gBAAmD,EACnD,kBAA+C,EAC/C,kBAA+D;QAHvE;;;;mBAAQ,gBAAgB;WAAmC;QAC3D;;;;mBAAQ,gBAAgB;WAAmC;QAC3D;;;;mBAAQ,kBAAkB;WAA6B;QACvD;;;;mBAAQ,kBAAkB;WAA6C;QAEvE,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CACpC,4BAA4B,EAC5B,CAAC,KAAY,EAAE,EAAE;YACf,MAAM,MAAM,GAAG,KAAK,CAAC,MAAkC,CAAC;YACxD,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAClD,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAChE,CAAC,CACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CACxB,UAAqC,EACrC,UAAuC,EACvC,kBAA+D,EAC/D,YAAqB;QAErB,IAAI,WAAuC,CAAC;QAC5C,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,YAAY,EAAE,CAAC;gBACjB,UAAU,CAAC,iBAAiB,EAAE,IAAI,oBAAoB,CAAC,GAAa,CAAC,CAAC,CAAC;gBACvE,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,WAAW,CAAC;oBACpB,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,GAAa;iBACvB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,iBAAiB,CAC1D,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,CACnC,CAAC;QACF,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,iBAAiB,CAC1D,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,CACnC,CAAC;QACF,OAAO,IAAI,WAAW,CACpB,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EACV,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAuB;QAC9C,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC;QACnD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAuB;QAC7C,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;QAClD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAiB;QAC/B,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAClC,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAC1D,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"uart-service.js","sourceRoot":"","sources":["../../lib/uart-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAKjD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,OAAO,WAAW;IAGtB,YACU,QAAgB,EAChB,kBAA+C;QADvD;;;;mBAAQ,QAAQ;WAAQ;QACxB;;;;mBAAQ,kBAAkB;WAA6B;QAJzD;;;;mBAAO,OAAO,CAAC,IAAI,CAAC,EAAE;WAAC;IAKpB,CAAC;IAEJ,iBAAiB;QACf,OAAO,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAuB;QAC9C,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,kBAAkB,CAChC,IAAI,CAAC,QAAQ,EACb,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,EAClC,CAAC,KAAe,EAAE,EAAE;oBAClB,IAAI,CAAC,kBAAkB,CACrB,UAAU,EACV,IAAI,aAAa,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAChD,CAAC;gBACJ,CAAC,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,kBAAkB,CACrB,iBAAiB,EACjB,IAAI,oBAAoB,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAC7D,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAuB;QAC7C,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,MAAM,SAAS,CAAC,iBAAiB,CAC/B,IAAI,CAAC,QAAQ,EACb,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,CACnC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAiB;QAC/B,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,SAAS,CAAC,oBAAoB,CAClC,IAAI,CAAC,QAAQ,EACb,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,EAClC,QAAQ,CACT,CAAC;IACJ,CAAC;CACF"}

package/build/esm/usb-device-wrapper.js

@@ -8,6 +8,7 @@ const { CortexM: CortexMValue, DAPLink: DAPLinkValue, WebUSB: WebUSBValue, } = d
 import { ApReg, CortexSpecialReg, Csw, DapCmd, DapVal, FICR, } from "./constants.js";
 import { apReg, bufferConcat, CoreRegister, regRequest, } from "./usb-partial-flashing-utils.js";
 import { BoardSerialInfo } from "./board-serial-info.js";
+import { DeviceError } from "./device.js";
 export class DAPWrapper {
     constructor(device, logging) {
         Object.defineProperty(this, "device", {
@@ -79,7 +80,10 @@ export class DAPWrapper {
      */
     get pageSize() {
         if (this._pageSize === undefined) {
-            throw new Error("pageSize not defined until connected");
+            throw new DeviceError({
+                code: "reconnect-microbit",
+                message: "pageSize not defined until connected",
+            });
         }
         return this._pageSize;
     }
@@ -88,7 +92,10 @@ export class DAPWrapper {
      */
     get numPages() {
         if (this._numPages === undefined) {
-            throw new Error("numPages not defined until connected");
+            throw new DeviceError({
+                code: "reconnect-microbit",
+                message: "numPages not defined until connected",
+            });
         }
         return this._numPages;
     }
@@ -195,7 +202,10 @@ export class DAPWrapper {
         data.unshift(op);
         const buf = await this.send(data);
         if (buf[0] !== op) {
-            throw new Error(`Bad response for ${op} -> ${buf[0]}`);
+            throw new DeviceError({
+                code: "reconnect-microbit",
+                message: `Bad response for ${op} -> ${buf[0]}`,
+            });
         }
         switch (op) {
             case DapCmd.DAP_CONNECT:
@@ -205,7 +215,10 @@ export class DAPWrapper {
                 break;
             default:
                 if (buf[1] !== 0) {
-                    throw new Error(`Bad status for ${op} -> ${buf[1]}`);
+                    throw new DeviceError({
+                        code: "reconnect-microbit",
+                        message: `Bad status for ${op} -> ${buf[1]}`,
+                    });
                 }
         }
         return buf;
@@ -221,10 +234,16 @@ export class DAPWrapper {
         // Transfer the read requests to the micro:bit and retrieve the data read.
         const buf = await this.cmdNums(DapCmd.DAP_TRANSFER, sendargs);
         if (buf[1] !== cnt) {
-            throw new Error("(many) Bad #trans " + buf[1]);
+            throw new DeviceError({
+                code: "reconnect-microbit",
+                message: "(many) Bad #trans " + buf[1],
+            });
         }
         else if (buf[2] !== 1) {
-            throw new Error("(many) Bad transfer status " + buf[2]);
+            throw new DeviceError({
+                code: "reconnect-microbit",
+                message: "(many) Bad transfer status " + buf[2],
+            });
         }
         return buf.subarray(3, 3 + cnt * 4);
     }
@@ -240,7 +259,10 @@ export class DAPWrapper {
         // Transfer the write requests to the micro:bit and retrieve the response status.
         const buf = await this.cmdNums(DapCmd.DAP_TRANSFER_BLOCK, sendargs);
         if (buf[3] !== 1) {
-            throw new Error("(many-wr) Bad transfer status " + buf[2]);
+            throw new DeviceError({
+                code: "reconnect-microbit",
+                message: "(many-wr) Bad transfer status " + buf[2],
+            });
         }
     }
     // Core functionality reading a block of data from micro:bit RAM at a specified address.
@@ -340,7 +362,10 @@ export class DAPWrapper {
     // Recurses otherwise.
     async waitForHaltCore(halted, deadline) {
         if (new Date().getTime() > deadline) {
-            throw new Error("timeout");
+            throw new DeviceError({
+                code: "timeout-error",
+                message: "timeout",
+            });
         }
         if (!halted) {
             const isHalted = await this.cortexM.isHalted();