Skip to content

Disconnect quietly when failing to connect via WebUSB #59

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 2 commits into from
Jul 7, 2025
Merged

Disconnect quietly when failing to connect via WebUSB #59

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d710f75
Disconnect quietly when failing to connect via WebUSB
microbit-robert Jun 25, 2025
03f5855
Remove param from interface
microbit-robert Jul 2, 2025
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
2 changes: 1 addition & 1 deletion lib/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export interface DeviceConnection<M extends ValueIsEvent<M>>
/**
* Disconnect from the device.
*/
disconnect(): Promise<void>;
disconnect(quiet?: boolean): Promise<void>;

/**
* Write serial data to the device.
Expand Down
28 changes: 16 additions & 12 deletions lib/usb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,26 +354,30 @@ class MicrobitWebUSBConnectionImpl
});
}

async disconnect(): Promise<void> {
async disconnect(quiet?: boolean): Promise<void> {
try {
if (this.connection) {
await this.stopSerialInternal();
await this.connection.disconnectAsync();
}
} catch (e) {
this.log("Error during disconnection:\r\n" + e);
this.logging.event({
type: "WebUSB-error",
message: "error-disconnecting",
});
if (!quiet) {
this.log("Error during disconnection:\r\n" + e);
this.logging.event({
type: "WebUSB-error",
message: "error-disconnecting",
});
}
} finally {
this.connection = undefined;
this.setStatus(ConnectionStatus.DISCONNECTED);
this.logging.log("Disconnection complete");
this.logging.event({
type: "WebUSB-info",
message: "disconnected",
});
if (!quiet) {
this.logging.log("Disconnection complete");
this.logging.event({
type: "WebUSB-info",
message: "disconnected",
});
}
}
}

Expand Down Expand Up @@ -402,7 +406,7 @@ class MicrobitWebUSBConnectionImpl
// Disconnect from the microbit.
// Any new connection reallocates all the internals.
// Use the top-level API so any listeners reflect that we're disconnected.
await this.disconnect();
await this.disconnect(true);

const enriched = enrichedError(e);
// Sanitise error message, replace all special chars with '-', if last char is '-' remove it
Expand Down