Skip to content

fix(usb): disconnect handler can fail in various places #413

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
Nov 3, 2025
Merged

fix(usb): disconnect handler can fail in various places #413

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
24 changes: 20 additions & 4 deletions js/workflows/usb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,28 @@ class USBWorkflow extends Workflow {

async onDisconnected(e, reconnect = true) {
if (this.reader) {
await this.reader.cancel();
try {
await this.reader.cancel();
} catch (error) {
console.warn("Error calling reader.cancel:", error);
}
this.reader = null;
}
if (this.writer) {
await this.writer.releaseLock();
try {
await this.writer.releaseLock();
} catch (error) {
console.warn("Error calling writer.releaseLock:", error);
}
this.writer = null;
}

if (this._serialDevice) {
await this._serialDevice.close();
try {
await this._serialDevice.close();
} catch (error) {
console.warn("Error calling _serialDevice.close:", error);
}
this._serialDevice = null;
}

Expand Down Expand Up @@ -273,7 +285,11 @@ class USBWorkflow extends Workflow {
device.addEventListener("message", this._messageCallback);

let onDisconnect = async (e) => {
await this.onDisconnected(e, false);
try {
await this.onDisconnected(e, false);
} catch (error) {
console.warn("Error calling onDisconnected (maybe already disconnected):", error);
}
};
device.removeEventListener("disconnect", onDisconnect);
device.addEventListener("disconnect", onDisconnect);
Expand Down