Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions lib/usb.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)", () => {
Expand Down
13 changes: 8 additions & 5 deletions lib/usb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down