Skip to content

Fix cleanup of autodetect event handlers #4664

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 6 commits into from
Oct 18, 2025
+54 −44
Merged

Fix cleanup of autodetect event handlers #4664

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d604c80
Fix cleanup of autodetect handlers
haslinghuis Oct 14, 2025
f9c2fde
Keep onClosed firing by delaying listener removal
haslinghuis Oct 14, 2025
12c37fa
Wrap serial.disconnect in try/catch/finally to guarantee cleanup on e…
haslinghuis Oct 14, 2025
b607a1d
Guard against undefined TABS.firmware_flasher (runtime TypeError)
haslinghuis Oct 14, 2025
59a980a
Avoid disconnecting existing sessions and stale listeners; only clean…
haslinghuis Oct 14, 2025
e0039c9
Fix the undefined this.logHead reference
haslinghuis Oct 14, 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
82 changes: 41 additions & 41 deletions src/js/utils/AutoDetect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,42 +33,38 @@ class AutoDetect {
MSP.read(event.detail);
}

verifyBoard() {
async verifyBoard() {
const port = PortHandler.portPicker.selectedPort;
const isLoaded = TABS.firmware_flasher.targets ? Object.keys(TABS.firmware_flasher.targets).length > 0 : false;

if (!PortHandler.portAvailable) {
gui_log(i18n.getMessage("firmwareFlasherNoValidPort"));
return;
}

if (!isLoaded) {
gui_log(i18n.getMessage("firmwareFlasherNoTargetsLoaded"));
return;
}

if (serial.connected || serial.connectionId) {
console.warn(
"Attempting to connect while there still is a connection",
serial.connected,
serial.connectionId,
serial.openCanceled,
);
serial.disconnect();
return;
}

gui_log(i18n.getMessage("firmwareFlasherDetectBoardQuery"));

if (!port.startsWith("virtual")) {
serial.addEventListener("connect", this.boundHandleConnect, { once: true });
serial.addEventListener("disconnect", this.boundHandleDisconnect, { once: true });

console.log("Connecting to serial port", port, serial.connected, serial.connectionId);

serial.connect(port, { baudRate: PortHandler.portPicker.selectedBauds || 115200 });
} else {
gui_log(i18n.getMessage("serialPortOpenFail"));
const isLoaded = TABS.firmware_flasher.targets
? Object.keys(TABS.firmware_flasher.targets).length > 0
: false;
let result = false;

try {
if (!PortHandler.portAvailable) {
gui_log(i18n.getMessage("firmwareFlasherNoValidPort"));
} else if (!isLoaded) {
gui_log(i18n.getMessage("firmwareFlasherNoTargetsLoaded"));
} else if (serial.connected || serial.connectionId) {
console.warn("Attempting to connect while there still is a connection", serial.connected);
gui_log(i18n.getMessage("serialPortOpenFail"));
} else {
console.log("Connecting to serial port", port);
gui_log(i18n.getMessage("firmwareFlasherDetectBoardQuery"));
result = await serial.connect(port, { baudRate: PortHandler.portPicker.selectedBauds || 115200 });
}
} catch (error) {
console.error("Failed to connect:", error);
} finally {
if (!result) {
this.cleanup();
}
}
}
}

Expand Down Expand Up @@ -116,17 +112,7 @@ class AutoDetect {
);
}

// Remove event listeners using stored references
serial.removeEventListener("receive", this.boundHandleSerialReceive);
serial.removeEventListener("connect", this.boundHandleConnect);
serial.removeEventListener("disconnect", this.boundHandleDisconnect);

// Clean up MSP listeners
MSP.clearListeners();
MSP.disconnect_cleanup();

// Disconnect without passing onClosed as a callback
serial.disconnect();
this.cleanup();
}

async getBoardInfo() {
Expand Down Expand Up @@ -195,6 +181,20 @@ class AutoDetect {
gui_log(i18n.getMessage("serialPortOpenFail"));
}
}

cleanup() {
// Remove event listeners using stored references
serial.removeEventListener("receive", this.boundHandleSerialReceive);
serial.removeEventListener("connect", this.boundHandleConnect);
serial.removeEventListener("disconnect", this.boundHandleDisconnect);

// Clean up MSP listeners
MSP.clearListeners();
MSP.disconnect_cleanup();

// Disconnect without passing onClosed as a callback
serial.disconnect();
}
}

export default new AutoDetect();