Dispatch afterrequestdevice in error cases too.

Author: microbit-matt-hillsdon

lib/usb.test.ts

@@ -30,6 +30,23 @@ describe("MicrobitWebUSBConnection (WebUSB unsupported)", () => {
     const microbit = createWebUSBConnection();
     expect(microbit.status).toBe(ConnectionStatus.NOT_SUPPORTED);
   });
+  it("still triggers afterrequestdevice if requestDevice throws", async () => {
+    (global as any).navigator = {
+      usb: {
+        requestDevice: () => {
+          throw new Error();
+        },
+      },
+    };
+    const microbit = createWebUSBConnection();
+    expect(microbit.status).toBe(ConnectionStatus.NO_AUTHORIZED_DEVICE);
+    const afterRequestDevice = vi.fn();
+    microbit.addEventListener("afterrequestdevice", afterRequestDevice);
+
+    await expect(() => microbit.connect()).rejects.toThrow();
+
+    expect(afterRequestDevice.mock.calls.length).toEqual(1);
+  });
 });
 
 describeDeviceOnly("MicrobitWebUSBConnection (WebUSB supported)", () => {

lib/usb.ts

@@ -562,11 +562,14 @@ class MicrobitWebUSBConnectionImpl
 
   private async chooseDevice(): Promise<USBDevice> {
     this.dispatchTypedEvent("beforerequestdevice", new BeforeRequestDevice());
-    this.device = await navigator.usb.requestDevice({
-      exclusionFilters: this.exclusionFilters,
-      filters: defaultFilters,
-    });
-    this.dispatchTypedEvent("afterrequestdevice", new AfterRequestDevice());
+    try {
+      this.device = await navigator.usb.requestDevice({
+        exclusionFilters: this.exclusionFilters,
+        filters: defaultFilters,
+      });
+    } finally {
+      this.dispatchTypedEvent("afterrequestdevice", new AfterRequestDevice());
+    }
     return this.device;
   }