Refactor: Use serial path (#4548)

* Use serial path

* Remove debug

* Remove unused import

* Options are ignored for virtual

* All together now

Author: haslinghuis

src/js/protocols/VirtualSerial.js

@@ -18,7 +18,7 @@ class VirtualSerial {
         this.transmitting = false;
         this.outputBuffer = [];
     }
-    connect(callback) {
+    connect(port, options, callback) {
         if (!this.openCanceled) {
             this.connected = true;
             this.connectionId = VIRTUAL;

src/js/serial.js

@@ -1,4 +1,3 @@
-import CONFIGURATOR from "./data_storage";
 import WebSerial from "./protocols/WebSerial.js";
 import WebBluetooth from "./protocols/WebBluetooth.js";
 import Websocket from "./protocols/WebSocket.js";
@@ -160,21 +159,15 @@ class Serial extends EventTarget {
      * @param {string|function} path - Port path or callback for virtual mode
      * @param {object} options - Connection options (baudRate, etc.)
      */
-    async connect(path, options) {
+    async connect(path, options, callback) {
+        // Select the appropriate protocol based directly on the port path
+        this.selectProtocol(path);
+
         if (!this._protocol) {
-            console.error(`${this.logHead} No protocol selected, cannot connect`);
+            console.error(`${this.logHead} No valid protocol selected for connection`);
             return false;
         }
 
-        // If path is a function, it's a callback for virtual mode
-        const isCallback = typeof path === "function";
-
-        // In virtual mode, a callback is passed as the first parameter
-        if (isCallback && CONFIGURATOR.virtualMode) {
-            console.log(`${this.logHead} Connecting in virtual mode`);
-            return this._protocol.connect(path);
-        }
-
         // Check if already connected
         if (this._protocol.connected) {
             console.warn(`${this.logHead} Protocol already connected, not connecting again`);
@@ -195,11 +188,11 @@ class Serial extends EventTarget {
             }
 
             console.log(`${this.logHead} Reconnecting to new port:`, path);
-            return this._protocol.connect(path, options);
+            return this._protocol.connect(path, options, callback);
         }
 
         console.log(`${this.logHead} Connecting to port:`, path, "with options:", options);
-        return this._protocol.connect(path, options);
+        return this._protocol.connect(path, options, callback);
     }
 
     /**

src/js/serial_backend.js

@@ -82,15 +82,12 @@ export function initializeSerialBackend() {
 
 function connectDisconnect() {
     const selectedPort = PortHandler.portPicker.selectedPort;
-    const portName = selectedPort === "manual" ? PortHandler.portPicker.portOverride : selectedPort;
 
-    if (!GUI.connect_lock && selectedPort !== "noselection" && !selectedPort.path?.startsWith("usb_")) {
+    if (!GUI.connect_lock && selectedPort !== "noselection" && !selectedPort.path?.startsWith("usb")) {
         // GUI control overrides the user control
 
         GUI.configuration_loaded = false;
 
-        const baudRate = PortHandler.portPicker.selectedBauds;
-
         if (!isConnected) {
             // prevent connection when we do not have permission
             if (selectedPort.startsWith("requestpermission")) {
@@ -103,34 +100,29 @@ function connectDisconnect() {
                 return;
             }
 
+            const portName = selectedPort === "manual" ? PortHandler.portPicker.portOverride : selectedPort;
+
             console.log(`${logHead} Connecting to: ${portName}`);
             GUI.connecting_to = portName;
 
             // lock port select & baud while we are connecting / connected
             PortHandler.portPickerDisabled = true;
             $("div.connection_button__label").text(i18n.getMessage("connecting"));
 
-            // Set configuration flags for consistency with other code
-            CONFIGURATOR.virtualMode = selectedPort === "virtual";
-
-            // Select the appropriate protocol based directly on the port path
-            serial.selectProtocol(selectedPort);
-
-            if (CONFIGURATOR.virtualMode) {
-                CONFIGURATOR.virtualApiVersion = PortHandler.portPicker.virtualMspVersion;
-                // Virtual mode uses a callback instead of port path
-                serial.connect(onOpenVirtual);
-            } else {
-                // Set up event listeners for all non-virtual connections
+            // Set up event listeners for non-virtual connections
+            if (selectedPort !== "virtual") {
                 serial.removeEventListener("connect", connectHandler);
                 serial.addEventListener("connect", connectHandler);
 
                 serial.removeEventListener("disconnect", disconnectHandler);
                 serial.addEventListener("disconnect", disconnectHandler);
-
-                // All non-virtual modes pass the port path and options
-                serial.connect(portName, { baudRate });
             }
+
+            serial.connect(
+                portName,
+                { baudRate: PortHandler.portPicker.selectedBauds },
+                selectedPort === "virtual" ? onOpenVirtual : undefined,
+            );
         } else {
             // If connected, start disconnection sequence
             GUI.timeout_kill_all();
@@ -348,6 +340,9 @@ function onOpenVirtual() {
     GUI.connecting_to = false;
 
     CONFIGURATOR.connectionValid = true;
+    CONFIGURATOR.virtualMode = true;
+    CONFIGURATOR.virtualApiVersion = PortHandler.portPicker.virtualMspVersion;
+
     isConnected = true;
 
     mspHelper = new MspHelper();

src/js/utils/AutoDetect.js

@@ -56,12 +56,13 @@ class AutoDetect {
 
         gui_log(i18n.getMessage("firmwareFlasherDetectBoardQuery"));
 
-        if (port.startsWith("serial")) {
+        if (!port.startsWith("virtual")) {
             serial.addEventListener("connect", this.boundHandleConnect, { once: true });
             serial.addEventListener("disconnect", this.boundHandleDisconnect, { once: true });
 
-            serial.selectProtocol("serial");
-            serial.connect(port, { baudRate: 115200 });
+            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"));
         }