@microbit/microbit-connection 0.0.0-alpha.3 → 0.0.0-alpha.31

package/build/accelerometer-service.d.ts

@@ -1,19 +1,18 @@
 import { AccelerometerData } from "./accelerometer.js";
-import { GattOperation } from "./bluetooth-device-wrapper.js";
-import { TypedServiceEventDispatcher } from "./service-events.js";
-export declare class AccelerometerService {
+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 dispatchTypedEvent;
-    private isNotifying;
     private queueGattOperation;
-    constructor(accelerometerDataCharacteristic: BluetoothRemoteGATTCharacteristic, accelerometerPeriodCharacteristic: BluetoothRemoteGATTCharacteristic, dispatchTypedEvent: TypedServiceEventDispatcher, isNotifying: boolean, queueGattOperation: (gattOperation: GattOperation) => void);
-    static createService(gattServer: BluetoothRemoteGATTServer, dispatcher: TypedServiceEventDispatcher, isNotifying: boolean, queueGattOperation: (gattOperation: GattOperation) => void, listenerInit: boolean): Promise<AccelerometerService | undefined>;
+    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>;
     private dataViewToData;
     getData(): Promise<AccelerometerData>;
     getPeriod(): Promise<number>;
     setPeriod(value: number): Promise<void>;
-    private addDataEventListener;
-    startNotifications(): void;
-    stopNotifications(): void;
+    startNotifications(type: TypedServiceEvent): Promise<void>;
+    stopNotifications(type: TypedServiceEvent): Promise<void>;
+    private characteristicForEvent;
 }

package/build/accelerometer-service.js

@@ -1,9 +1,8 @@
 import { AccelerometerDataEvent } from "./accelerometer.js";
 import { profile } from "./bluetooth-profile.js";
-import { createGattOperationPromise } from "./bluetooth-utils.js";
 import { BackgroundErrorEvent, DeviceError } from "./device.js";
 export class AccelerometerService {
-    constructor(accelerometerDataCharacteristic, accelerometerPeriodCharacteristic, dispatchTypedEvent, isNotifying, queueGattOperation) {
+    constructor(accelerometerDataCharacteristic, accelerometerPeriodCharacteristic, dispatchTypedEvent, queueGattOperation) {
         Object.defineProperty(this, "accelerometerDataCharacteristic", {
             enumerable: true,
             configurable: true,
@@ -22,24 +21,19 @@ export class AccelerometerService {
             writable: true,
             value: dispatchTypedEvent
         });
-        Object.defineProperty(this, "isNotifying", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: isNotifying
-        });
         Object.defineProperty(this, "queueGattOperation", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: queueGattOperation
         });
-        this.addDataEventListener();
-        if (this.isNotifying) {
-            this.startNotifications();
-        }
+        this.accelerometerDataCharacteristic.addEventListener("characteristicvaluechanged", (event) => {
+            const target = event.target;
+            const data = this.dataViewToData(target.value);
+            this.dispatchTypedEvent("accelerometerdatachanged", new AccelerometerDataEvent(data));
+        });
     }
-    static async createService(gattServer, dispatcher, isNotifying, queueGattOperation, listenerInit) {
+    static async createService(gattServer, dispatcher, queueGattOperation, listenerInit) {
         let accelerometerService;
         try {
             accelerometerService = await gattServer.getPrimaryService(profile.accelerometer.id);
@@ -58,7 +52,7 @@ export class AccelerometerService {
         }
         const accelerometerDataCharacteristic = await accelerometerService.getCharacteristic(profile.accelerometer.characteristics.data.id);
         const accelerometerPeriodCharacteristic = await accelerometerService.getCharacteristic(profile.accelerometer.characteristics.period.id);
-        return new AccelerometerService(accelerometerDataCharacteristic, accelerometerPeriodCharacteristic, dispatcher, isNotifying, queueGattOperation);
+        return new AccelerometerService(accelerometerDataCharacteristic, accelerometerPeriodCharacteristic, dispatcher, queueGattOperation);
     }
     dataViewToData(dataView) {
         return {
@@ -68,21 +62,11 @@ export class AccelerometerService {
         };
     }
     async getData() {
-        const { callback, gattOperationPromise } = createGattOperationPromise();
-        this.queueGattOperation({
-            callback,
-            operation: () => this.accelerometerDataCharacteristic.readValue(),
-        });
-        const dataView = (await gattOperationPromise);
+        const dataView = await this.queueGattOperation(() => this.accelerometerDataCharacteristic.readValue());
         return this.dataViewToData(dataView);
     }
     async getPeriod() {
-        const { callback, gattOperationPromise } = createGattOperationPromise();
-        this.queueGattOperation({
-            callback,
-            operation: () => this.accelerometerPeriodCharacteristic.readValue(),
-        });
-        const dataView = (await gattOperationPromise);
+        const dataView = await this.queueGattOperation(() => this.accelerometerPeriodCharacteristic.readValue());
         return dataView.getUint16(0, true);
     }
     async setPeriod(value) {
@@ -94,28 +78,25 @@ export class AccelerometerService {
         // Values passed are rounded up to the allowed values on device.
         // Documentation for allowed values looks wrong.
         // https://lancaster-university.github.io/microbit-docs/resources/bluetooth/bluetooth_profile.html
-        const { callback } = createGattOperationPromise();
         const dataView = new DataView(new ArrayBuffer(2));
         dataView.setUint16(0, value, true);
-        this.queueGattOperation({
-            callback,
-            operation: () => this.accelerometerPeriodCharacteristic.writeValueWithoutResponse(dataView),
-        });
+        return this.queueGattOperation(() => this.accelerometerPeriodCharacteristic.writeValue(dataView));
     }
-    addDataEventListener() {
-        this.accelerometerDataCharacteristic.addEventListener("characteristicvaluechanged", (event) => {
-            const target = event.target;
-            const data = this.dataViewToData(target.value);
-            this.dispatchTypedEvent("accelerometerdatachanged", new AccelerometerDataEvent(data));
-        });
+    async startNotifications(type) {
+        await this.characteristicForEvent(type)?.startNotifications();
     }
-    startNotifications() {
-        this.accelerometerDataCharacteristic.startNotifications();
-        this.isNotifying = true;
+    async stopNotifications(type) {
+        await this.characteristicForEvent(type)?.stopNotifications();
     }
-    stopNotifications() {
-        this.isNotifying = false;
-        this.accelerometerDataCharacteristic.stopNotifications();
+    characteristicForEvent(type) {
+        switch (type) {
+            case "accelerometerdatachanged": {
+                return this.accelerometerDataCharacteristic;
+            }
+            default: {
+                return undefined;
+            }
+        }
     }
 }
 //# sourceMappingURL=accelerometer-service.js.map

package/build/accelerometer-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"accelerometer-service.js","sourceRoot":"","sources":["../lib/accelerometer-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAMhE,MAAM,OAAO,oBAAoB;IAC/B,YACU,+BAAkE,EAClE,iCAAoE,EACpE,kBAA+C,EAC/C,WAAoB,EACpB,kBAA0D;QAJlE;;;;mBAAQ,+BAA+B;WAAmC;QAC1E;;;;mBAAQ,iCAAiC;WAAmC;QAC5E;;;;mBAAQ,kBAAkB;WAA6B;QACvD;;;;mBAAQ,WAAW;WAAS;QAC5B;;;;mBAAQ,kBAAkB;WAAwC;QAElE,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CACxB,UAAqC,EACrC,UAAuC,EACvC,WAAoB,EACpB,kBAA0D,EAC1D,YAAqB;QAErB,IAAI,oBAAgD,CAAC;QACrD,IAAI,CAAC;YACH,oBAAoB,GAAG,MAAM,UAAU,CAAC,iBAAiB,CACvD,OAAO,CAAC,aAAa,CAAC,EAAE,CACzB,CAAC;QACJ,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,+BAA+B,GACnC,MAAM,oBAAoB,CAAC,iBAAiB,CAC1C,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAC9C,CAAC;QACJ,MAAM,iCAAiC,GACrC,MAAM,oBAAoB,CAAC,iBAAiB,CAC1C,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAChD,CAAC;QACJ,OAAO,IAAI,oBAAoB,CAC7B,+BAA+B,EAC/B,iCAAiC,EACjC,UAAU,EACV,WAAW,EACX,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,QAAkB;QACvC,OAAO;YACL,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC;YAC7B,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC;YAC7B,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC;SAC9B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,0BAA0B,EAAE,CAAC;QACxE,IAAI,CAAC,kBAAkB,CAAC;YACtB,QAAQ;YACR,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,SAAS,EAAE;SAClE,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,CAAC,MAAM,oBAAoB,CAAa,CAAC;QAC1D,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,0BAA0B,EAAE,CAAC;QACxE,IAAI,CAAC,kBAAkB,CAAC;YACtB,QAAQ;YACR,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iCAAiC,CAAC,SAAS,EAAE;SACpE,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,CAAC,MAAM,oBAAoB,CAAa,CAAC;QAC1D,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAa;QAC3B,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,wCAAwC;YACxC,OAAO;QACT,CAAC;QACD,8CAA8C;QAC9C,gEAAgE;QAChE,gDAAgD;QAChD,kGAAkG;QAClG,MAAM,EAAE,QAAQ,EAAE,GAAG,0BAA0B,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,kBAAkB,CAAC;YACtB,QAAQ;YACR,SAAS,EAAE,GAAG,EAAE,CACd,IAAI,CAAC,iCAAiC,CAAC,yBAAyB,CAC9D,QAAQ,CACT;SACJ,CAAC,CAAC;IACL,CAAC;IAEO,oBAAoB;QAC1B,IAAI,CAAC,+BAA+B,CAAC,gBAAgB,CACnD,4BAA4B,EAC5B,CAAC,KAAY,EAAE,EAAE;YACf,MAAM,MAAM,GAAG,KAAK,CAAC,MAAkC,CAAC;YACxD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,kBAAkB,CACrB,0BAA0B,EAC1B,IAAI,sBAAsB,CAAC,IAAI,CAAC,CACjC,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,IAAI,CAAC,+BAA+B,CAAC,kBAAkB,EAAE,CAAC;QAC1D,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,+BAA+B,CAAC,iBAAiB,EAAE,CAAC;IAC3D,CAAC;CACF"}
+{"version":3,"file":"accelerometer-service.js","sourceRoot":"","sources":["../lib/accelerometer-service.ts"],"names":[],"mappings":"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"}

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

@@ -4,40 +4,42 @@
  * SPDX-License-Identifier: MIT
  */
 import { AccelerometerService } from "./accelerometer-service.js";
-import { BoardVersion, DeviceError } from "./device.js";
+import { BoardVersion } from "./device.js";
+import { LedService } from "./led-service.js";
 import { Logging } from "./logging.js";
-import { ServiceConnectionEventMap, TypedServiceEventDispatcher } from "./service-events.js";
-export interface GattOperationCallback {
-    resolve: (result: DataView | void) => void;
-    reject: (error: DeviceError) => void;
+import { ServiceConnectionEventMap, TypedServiceEvent, TypedServiceEventDispatcher } from "./service-events.js";
+import { UARTService } from "./uart-service.js";
+export interface Service {
+    startNotifications(type: TypedServiceEvent): Promise<void>;
+    stopNotifications(type: TypedServiceEvent): Promise<void>;
 }
-export interface GattOperation {
-    operation: () => Promise<DataView | void>;
-    callback: GattOperationCallback;
+interface ConnectCallbacks {
+    onConnecting: () => void;
+    onReconnecting: () => void;
+    onFail: () => void;
+    onSuccess: () => void;
 }
 export declare class BluetoothDeviceWrapper {
     readonly device: BluetoothDevice;
     private logging;
     private dispatchTypedEvent;
-    private addedServiceListeners;
+    private currentEvents;
+    private callbacks;
     private duringExplicitConnectDisconnect;
     private gattConnectPromise;
     private disconnectPromise;
     private connecting;
     private isReconnect;
-    private reconnectReadyPromise;
-    private accelerometerService;
+    private connectReadyPromise;
+    private accelerometer;
+    private buttons;
+    private led;
+    private uart;
+    private serviceInfo;
     boardVersion: BoardVersion | undefined;
-    serviceListenerState: {
-        accelerometerdatachanged: {
-            notifying: boolean;
-            service: (options?: {
-                listenerInit: boolean;
-            }) => Promise<AccelerometerService | undefined>;
-        };
-    };
+    private disconnectedRejectionErrorFactory;
     private gattOperations;
-    constructor(device: BluetoothDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, addedServiceListeners: Record<keyof ServiceConnectionEventMap, boolean>);
+    constructor(device: BluetoothDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks);
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     private disconnectInternal;
@@ -46,11 +48,13 @@ export declare class BluetoothDeviceWrapper {
     private assertGattServer;
     private getBoardVersion;
     private queueGattOperation;
-    private processGattOperationQueue;
-    private clearGattQueueOnDisconnect;
-    getAccelerometerService(options?: {
-        listenerInit: boolean;
-    }): Promise<AccelerometerService | undefined>;
+    private createIfNeeded;
+    getAccelerometerService(): Promise<AccelerometerService | undefined>;
+    getLedService(): Promise<LedService | undefined>;
+    getUARTService(): Promise<UARTService | undefined>;
+    startNotifications(type: TypedServiceEvent): Promise<void>;
+    stopNotifications(type: TypedServiceEvent): Promise<void>;
     private disposeServices;
 }
-export declare const createBluetoothDeviceWrapper: (device: BluetoothDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, addedServiceListeners: Record<keyof ServiceConnectionEventMap, boolean>) => Promise<BluetoothDeviceWrapper | undefined>;
+export declare const createBluetoothDeviceWrapper: (device: BluetoothDevice, logging: Logging, dispatchTypedEvent: TypedServiceEventDispatcher, currentEvents: () => Array<keyof ServiceConnectionEventMap>, callbacks: ConnectCallbacks) => Promise<BluetoothDeviceWrapper | undefined>;
+export {};

package/build/bluetooth-device-wrapper.js

@@ -5,8 +5,12 @@
  */
 import { AccelerometerService } from "./accelerometer-service.js";
 import { profile } from "./bluetooth-profile.js";
+import { ButtonService } from "./button-service.js";
 import { DeviceError } from "./device.js";
+import { LedService } from "./led-service.js";
 import { NullLogging } from "./logging.js";
+import { PromiseQueue } from "./promise-queue.js";
+import { UARTService } from "./uart-service.js";
 const deviceIdToWrapper = new Map();
 const connectTimeoutDuration = 10000;
 function findPlatform() {
@@ -23,8 +27,42 @@ function findPlatform() {
 }
 const platform = findPlatform();
 const isWindowsOS = platform && /^Win/.test(platform);
+class ServiceInfo {
+    constructor(serviceFactory, events) {
+        Object.defineProperty(this, "serviceFactory", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: serviceFactory
+        });
+        Object.defineProperty(this, "events", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: events
+        });
+        Object.defineProperty(this, "service", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+    }
+    get() {
+        return this.service;
+    }
+    async createIfNeeded(gattServer, dispatcher, queueGattOperation, listenerInit) {
+        this.service =
+            this.service ??
+                (await this.serviceFactory(gattServer, dispatcher, queueGattOperation, listenerInit));
+        return this.service;
+    }
+    dispose() {
+        this.service = undefined;
+    }
+}
 export class BluetoothDeviceWrapper {
-    constructor(device, logging = new NullLogging(), dispatchTypedEvent, addedServiceListeners) {
+    constructor(device, logging = new NullLogging(), dispatchTypedEvent, currentEvents, callbacks) {
         Object.defineProperty(this, "device", {
             enumerable: true,
             configurable: true,
@@ -43,11 +81,17 @@ export class BluetoothDeviceWrapper {
             writable: true,
             value: dispatchTypedEvent
         });
-        Object.defineProperty(this, "addedServiceListeners", {
+        Object.defineProperty(this, "currentEvents", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: addedServiceListeners
+            value: currentEvents
+        });
+        Object.defineProperty(this, "callbacks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: callbacks
         });
         // Used to avoid automatic reconnection during user triggered connect/disconnect
         // or reconnection itself.
@@ -90,17 +134,46 @@ export class BluetoothDeviceWrapper {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "reconnectReadyPromise", {
+        Object.defineProperty(this, "connectReadyPromise", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "accelerometerService", {
+        Object.defineProperty(this, "accelerometer", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: new ServiceInfo(AccelerometerService.createService, [
+                "accelerometerdatachanged",
+            ])
+        });
+        Object.defineProperty(this, "buttons", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new ServiceInfo(ButtonService.createService, [
+                "buttonachanged",
+                "buttonbchanged",
+            ])
+        });
+        Object.defineProperty(this, "led", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new ServiceInfo(LedService.createService, [])
+        });
+        Object.defineProperty(this, "uart", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new ServiceInfo(UARTService.createService, ["uartdata"])
+        });
+        Object.defineProperty(this, "serviceInfo", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: [this.accelerometer, this.buttons, this.led, this.uart]
         });
         Object.defineProperty(this, "boardVersion", {
             enumerable: true,
@@ -108,25 +181,29 @@ export class BluetoothDeviceWrapper {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "serviceListenerState", {
+        Object.defineProperty(this, "disconnectedRejectionErrorFactory", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: {
-                accelerometerdatachanged: {
-                    notifying: false,
-                    service: this.getAccelerometerService,
-                },
+            value: () => {
+                return new DeviceError({
+                    code: "device-disconnected",
+                    message: "Error processing gatt operations queue - device disconnected",
+                });
             }
         });
         Object.defineProperty(this, "gattOperations", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: {
-                busy: false,
-                queue: [],
-            }
+            value: new PromiseQueue({
+                abortCheck: () => {
+                    if (!this.device.gatt?.connected) {
+                        return this.disconnectedRejectionErrorFactory;
+                    }
+                    return undefined;
+                },
+            })
         });
         Object.defineProperty(this, "handleDisconnectEvent", {
             enumerable: true,
@@ -149,45 +226,7 @@ export class BluetoothDeviceWrapper {
                 }
             }
         });
-        Object.defineProperty(this, "processGattOperationQueue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: () => {
-                if (!this.device.gatt?.connected) {
-                    // No longer connected. Drop queue.
-                    this.clearGattQueueOnDisconnect();
-                    return;
-                }
-                if (this.gattOperations.busy) {
-                    // We will finish processing the current operation, then
-                    // pick up processing the queue in the finally block.
-                    return;
-                }
-                const gattOperation = this.gattOperations.queue.shift();
-                if (!gattOperation) {
-                    return;
-                }
-                this.gattOperations.busy = true;
-                gattOperation
-                    .operation()
-                    .then((result) => {
-                    gattOperation.callback.resolve(result);
-                })
-                    .catch((err) => {
-                    gattOperation.callback.reject(new DeviceError({ code: "background-comms-error", message: err }));
-                    this.logging.error("Error processing gatt operations queue", err);
-                })
-                    .finally(() => {
-                    this.gattOperations.busy = false;
-                    this.processGattOperationQueue();
-                });
-            }
-        });
         device.addEventListener("gattserverdisconnected", this.handleDisconnectEvent);
-        for (const [key, value] of Object.entries(this.addedServiceListeners)) {
-            this.serviceListenerState[key].notifying = value;
-        }
     }
     async connect() {
         this.logging.event({
@@ -202,10 +241,23 @@ export class BluetoothDeviceWrapper {
             await this.gattConnectPromise;
             return;
         }
+        if (this.isReconnect) {
+            this.callbacks.onReconnecting();
+        }
+        else {
+            this.callbacks.onConnecting();
+        }
         this.duringExplicitConnectDisconnect++;
         if (this.device.gatt === undefined) {
             throw new Error("BluetoothRemoteGATTServer for micro:bit device is undefined");
         }
+        if (isWindowsOS) {
+            // On Windows, the micro:bit can take around 3 seconds to respond to gatt.disconnect().
+            // Attempting to connect/reconnect before the micro:bit has responded results in another
+            // gattserverdisconnected event being fired. We then fail to get primaryService on a
+            // disconnected GATT server.
+            await this.connectReadyPromise;
+        }
         try {
             // A previous connect might have completed in the background as a device was replugged etc.
             await this.disconnectPromise;
@@ -259,17 +311,12 @@ export class BluetoothDeviceWrapper {
             finally {
                 this.connecting = false;
             }
-            // Restart notifications for services and characteristics
-            // the user has listened to.
-            for (const serviceListener of Object.values(this.serviceListenerState)) {
-                if (serviceListener.notifying) {
-                    serviceListener.service.call(this, { listenerInit: true });
-                }
-            }
+            this.currentEvents().forEach((e) => this.startNotifications(e));
             this.logging.event({
                 type: this.isReconnect ? "Reconnect" : "Connect",
                 message: "Bluetooth connect success",
             });
+            this.callbacks.onSuccess();
         }
         catch (e) {
             this.logging.error("Bluetooth connect error", e);
@@ -278,10 +325,13 @@ export class BluetoothDeviceWrapper {
                 message: "Bluetooth connect failed",
             });
             await this.disconnectInternal(false);
+            this.callbacks.onFail();
             throw new Error("Failed to establish a connection!");
         }
         finally {
             this.duringExplicitConnectDisconnect--;
+            // Reset isReconnect for next time
+            this.isReconnect = false;
         }
     }
     async disconnect() {
@@ -303,18 +353,11 @@ export class BluetoothDeviceWrapper {
             this.disposeServices();
             this.duringExplicitConnectDisconnect--;
         }
-        this.reconnectReadyPromise = new Promise((resolve) => setTimeout(resolve, 3_500));
+        this.connectReadyPromise = new Promise((resolve) => setTimeout(resolve, 3_500));
     }
     async reconnect() {
         this.logging.log("Bluetooth reconnect");
         this.isReconnect = true;
-        if (isWindowsOS) {
-            // On Windows, the micro:bit can take around 3 seconds to respond to gatt.disconnect().
-            // Attempting to reconnect before the micro:bit has responded results in another
-            // gattserverdisconnected event being fired. We then fail to get primaryService on a
-            // disconnected GATT server.
-            await this.reconnectReadyPromise;
-        }
         await this.connect();
     }
     assertGattServer() {
@@ -344,42 +387,57 @@ export class BluetoothDeviceWrapper {
             throw new Error("Could not read model number");
         }
     }
-    queueGattOperation(gattOperation) {
-        this.gattOperations.queue.push(gattOperation);
-        this.processGattOperationQueue();
+    queueGattOperation(action) {
+        // Previously we wrapped rejections with:
+        // new DeviceError({ code: "background-comms-error", message: err }),
+        return this.gattOperations.add(action);
     }
-    clearGattQueueOnDisconnect() {
-        this.gattOperations.queue.forEach((op) => {
-            op.callback.reject(new DeviceError({
-                code: "device-disconnected",
-                message: "Error processing gatt operations queue - device disconnected",
-            }));
-        });
-        this.gattOperations = { busy: false, queue: [] };
+    createIfNeeded(info, listenerInit) {
+        const gattServer = this.assertGattServer();
+        return info.createIfNeeded(gattServer, this.dispatchTypedEvent, this.queueGattOperation.bind(this), listenerInit);
+    }
+    async getAccelerometerService() {
+        return this.createIfNeeded(this.accelerometer, false);
+    }
+    async getLedService() {
+        return this.createIfNeeded(this.led, false);
     }
-    async getAccelerometerService(options = { listenerInit: false }) {
-        if (!this.accelerometerService) {
-            const gattServer = this.assertGattServer();
-            this.accelerometerService = await AccelerometerService.createService(gattServer, this.dispatchTypedEvent, this.serviceListenerState.accelerometerdatachanged.notifying, this.queueGattOperation.bind(this), options?.listenerInit);
+    async getUARTService() {
+        return this.createIfNeeded(this.uart, false);
+    }
+    async startNotifications(type) {
+        const serviceInfo = this.serviceInfo.find((s) => s.events.includes(type));
+        if (serviceInfo) {
+            this.queueGattOperation(async () => {
+                // TODO: type cheat! why?
+                const service = await this.createIfNeeded(serviceInfo, true);
+                await service?.startNotifications(type);
+            });
         }
-        return this.accelerometerService;
+    }
+    async stopNotifications(type) {
+        this.queueGattOperation(async () => {
+            const serviceInfo = this.serviceInfo.find((s) => s.events.includes(type));
+            await serviceInfo?.get()?.stopNotifications(type);
+        });
     }
     disposeServices() {
-        this.accelerometerService = undefined;
-        this.clearGattQueueOnDisconnect();
+        this.serviceInfo.forEach((s) => s.dispose());
+        this.gattOperations.clear(this.disconnectedRejectionErrorFactory);
     }
 }
-export const createBluetoothDeviceWrapper = async (device, logging, dispatchTypedEvent, addedServiceListeners) => {
+export const createBluetoothDeviceWrapper = async (device, logging, dispatchTypedEvent, currentEvents, callbacks) => {
     try {
         // Reuse our connection objects for the same device as they
         // track the GATT connect promise that never resolves.
         const bluetooth = deviceIdToWrapper.get(device.id) ??
-            new BluetoothDeviceWrapper(device, logging, dispatchTypedEvent, addedServiceListeners);
+            new BluetoothDeviceWrapper(device, logging, dispatchTypedEvent, currentEvents, callbacks);
         deviceIdToWrapper.set(device.id, bluetooth);
         await bluetooth.connect();
         return bluetooth;
     }
     catch (e) {
+        logging.error("Bluetooth connect error", e);
         return undefined;
     }
 };