Pleasing sonar

Author: haslinghuis

src/js/port_handler.js

@@ -122,9 +122,8 @@ PortHandler.removedSerialDevice = function (device) {
 PortHandler.addedUsbDevice = function (device) {
     this.updateDeviceList("usb").then(() => {
         const selectedPort = this.selectActivePort(device);
-        console.log(`${this.logHead} Added USB device:`, device, selectedPort);
-        if (selectedPort === device.path) {
-            // Emit an event with the proper type for backward compatibility
+        if (selectedPort === device?.path) {
+            // Send event when the port handler auto selects a new USB device
             EventBus.$emit("port-handler:auto-select-usb-device", selectedPort);
         }
     });

src/js/protocols/__tests__/WebBluetooth.test.js

@@ -224,16 +224,11 @@ class Serial extends EventTarget {
 
             // If we're connected to a different port, disconnect first
             console.log(`${this.logHead} Connected to a different port, disconnecting first`);
-            this.disconnect((success) => {
-                if (success) {
-                    // Now connect to the new port
-                    console.log(`${this.logHead} Reconnecting to new port:`, path);
-                    this._protocol.connect(path, options);
-                } else {
-                    console.error(`${this.logHead} Failed to disconnect before reconnecting`);
-                    return false;
-                }
-            });
+            const success = await this.disconnect();
+            if (!success) {
+                console.error(`${this.logHead} Failed to disconnect before reconnecting`);
+                return false;
+            }
 
             console.log(`${this.logHead} Reconnecting to new port:`, path);
             return this._protocol.connect(path, options);
@@ -269,30 +264,16 @@ class Serial extends EventTarget {
             }
 
             // Create a promise that will resolve/reject based on the protocol's disconnect result
-            return new Promise((resolve) => {
-                // Call the protocol's disconnect with a callback that will resolve our promise
-                this._protocol.disconnect((success) => {
-                    if (success) {
-                        console.log(`${this.logHead} Disconnection successful`);
-                    } else {
-                        console.error(`${this.logHead} Disconnection failed`);
-                    }
-
-                    // Call original callback
-                    if (callback) {
-                        callback(success);
-                    }
-
-                    // Resolve our promise with the success value
-                    resolve(success);
-                });
-            });
+            const success = await this._protocol.disconnect();
+
+            if (callback) callback(success);
+            return success;
         } catch (error) {
             console.error(`${this.logHead} Error during disconnect:`, error);
             if (callback) {
                 callback(false);
             }
-            return false;
+            return Promise.resolve(false);
         }
     }
 

src/js/serial.js

@@ -61,7 +61,7 @@ export function initializeSerialBackend() {
             !GUI.connecting_to &&
             GUI.active_tab !== "firmware_flasher" &&
             ((PortHandler.portPicker.autoConnect && !["manual", "virtual"].includes(device)) ||
-                Date.now() - rebootTimestamp > REBOOT_CONNECT_MAX_TIME_MS)
+                Date.now() - rebootTimestamp < REBOOT_CONNECT_MAX_TIME_MS)
         ) {
             connectDisconnect();
         }
@@ -73,7 +73,7 @@ export function initializeSerialBackend() {
             !GUI.connecting_to &&
             GUI.active_tab !== "firmware_flasher" &&
             ((PortHandler.portPicker.autoConnect && !["manual", "virtual"].includes(device)) ||
-                Date.now() - rebootTimestamp > REBOOT_CONNECT_MAX_TIME_MS)
+                Date.now() - rebootTimestamp < REBOOT_CONNECT_MAX_TIME_MS)
         ) {
             connectDisconnect();
         }