Merge remote-tracking branch 'upstream/bugfix/console-reconnect' into bugfix-console-reconnect

Author: tyeth

examples/typescript/src/index.html

@@ -114,6 +114,10 @@ <h3>Console </h3>
                     <option value="115200">115200</option>
                     <option value="74880">74880</option>
                 </select>
+                <label for="reconnectDelay" id="lblReconnectDelay">Reconnect Delay (ms):</label>
+                <input type="number" id="reconnectDelay" name="reconnectDelay" value="1000" min="100" max="10000" step="100">
+                <label for="maxRetries" id="lblMaxRetries">Max Retries:</label>
+                <input type="number" id="maxRetries" name="maxRetries" value="5" min="1" max="20" step="1">
 
                 <br><br>
 

examples/typescript/src/index.ts

@@ -3,6 +3,8 @@
 // and ideally there would be an alternative format for short chip names, but including revision.
 const baudrates = document.getElementById("baudrates") as HTMLSelectElement;
 const consoleBaudrates = document.getElementById("consoleBaudrates") as HTMLSelectElement;
+const reconnectDelay = document.getElementById("reconnectDelay") as HTMLInputElement;
+const maxRetriesInput = document.getElementById("maxRetries") as HTMLInputElement;
 const connectButton = document.getElementById("connectButton") as HTMLButtonElement;
 const traceButton = document.getElementById("copyTraceButton") as HTMLButtonElement;
 const disconnectButton = document.getElementById("disconnectButton") as HTMLButtonElement;
@@ -479,31 +481,52 @@ consoleStartButton.onclick = async () => {
     // Set up device lost callback
     transport.setDeviceLostCallback(async () => {
       if (!isConsoleClosed && !isReconnecting) {
-        term.writeln("\n[DEVICE LOST] Device disconnected. Click 'Reconnect' to restore connection...");
-        await sleep(1000);
+        term.writeln("\n[DEVICE LOST] Device disconnected. Trying to reconnect...");
+        await sleep(parseInt(reconnectDelay.value));
         isReconnecting = true;
-        term.writeln("\n[RECONNECT] Attempting to reconnect...");
-        if (serialLib && serialLib.getPorts) {
-          const ports = await serialLib.getPorts();
-          if (ports.length > 0) {
-            const newDevice = ports.find(
-              (port) =>
-                port.getInfo().usbVendorId === deviceInfo.usbVendorId &&
-                port.getInfo().usbProductId === deviceInfo.usbProductId,
-            );
-            device = newDevice;
-            transport.updateDevice(device);
-            term.writeln("[RECONNECT] Found previously authorized device, connecting...");
-            await transport.connect(parseInt(consoleBaudrates.value));
-            term.writeln("[RECONNECT] Successfully reconnected!");
-            consoleStopButton.style.display = "initial";
-            resetButton.style.display = "initial";
-            isReconnecting = false;
-
-            startConsoleReading();
-            return;
+
+        const maxRetries = parseInt(maxRetriesInput.value);
+        let retryCount = 0;
+
+        while (retryCount < maxRetries && !isConsoleClosed) {
+          retryCount++;
+          term.writeln(`\n[RECONNECT] Attempt ${retryCount}/${maxRetries}...`);
+
+          if (serialLib && serialLib.getPorts) {
+            const ports = await serialLib.getPorts();
+            if (ports.length > 0) {
+              const newDevice = ports.find(
+                (port) =>
+                  port.getInfo().usbVendorId === deviceInfo.usbVendorId &&
+                  port.getInfo().usbProductId === deviceInfo.usbProductId,
+              );
+
+              if (newDevice) {
+                device = newDevice;
+                transport.updateDevice(device);
+                term.writeln("[RECONNECT] Found previously authorized device, connecting...");
+                await transport.connect(parseInt(consoleBaudrates.value));
+                term.writeln("[RECONNECT] Successfully reconnected!");
+                consoleStopButton.style.display = "initial";
+                resetButton.style.display = "initial";
+                isReconnecting = false;
+
+                startConsoleReading();
+                return;
+              }
+            }
+          }
+
+          if (retryCount < maxRetries) {
+            term.writeln(`[RECONNECT] Device not found, retrying in ${parseInt(reconnectDelay.value)}ms...`);
+            await sleep(parseInt(reconnectDelay.value));
           }
         }
+
+        if (retryCount >= maxRetries) {
+          term.writeln("\n[RECONNECT] Failed to reconnect after 5 attempts. Please manually reconnect.");
+          isReconnecting = false;
+        }
       }
     });
   }