Skip to content

Throw connecting to allowed devices error #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2025
Merged

Throw connecting to allowed devices error #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 9 additions & 21 deletions lib/usb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,21 +526,14 @@ class MicrobitWebUSBConnectionImpl
// Based on: https://github.com/microsoft/pxt/blob/ab97a2422879824c730f009b15d4bf446b0e8547/pxtlib/webusb.ts#L530
private async getFilteredAllowedDevices(): Promise<USBDevice[]> {
this.log("Retrieving previously paired USB devices");
try {
const devices = await this.withEnrichedErrors(() =>
navigator.usb?.getDevices(),
);
if (devices === undefined) {
return [];
}
const filteredDevices = devices.filter((device) =>
applyDeviceFilters(device, defaultFilters, this.exclusionFilters ?? []),
);
return filteredDevices;
} catch (error: any) {
this.log(`Failed to retrieve paired devices: ${error.message}`);
const devices = await navigator.usb?.getDevices();
if (devices === undefined) {
return [];
}
const filteredDevices = devices.filter((device) =>
applyDeviceFilters(device, defaultFilters, this.exclusionFilters ?? []),
);
return filteredDevices;
}

private async attemptDeviceConnection(
Expand All @@ -550,14 +543,9 @@ class MicrobitWebUSBConnectionImpl
`Attempting connection to: ${device.manufacturerName} ${device.productName}`,
);
this.log(`Serial number: ${device.serialNumber}`);
try {
const connection = new DAPWrapper(device, this.logging);
await withTimeout(connection.reconnectAsync(), 10_000);
return connection;
} catch (error: any) {
this.log(`Connection attempt failed: ${error.message}`);
return;
}
const connection = new DAPWrapper(device, this.logging);
await withTimeout(connection.reconnectAsync(), 10_000);
return connection;
}

private async chooseDevice(): Promise<USBDevice> {
Expand Down