esp32tool 1.6.6 → 1.6.7

package/js/util/console-color.js

@@ -86,8 +86,6 @@ export class ColoredConsole {
         const lineSpan = document.createElement("span");
         lineSpan.classList.add("line");
         const addSpan = (content) => {
-            if (content === "")
-                return;
             const span = document.createElement("span");
             if (this.state.bold)
                 span.classList.add("log-bold");
@@ -175,7 +173,8 @@ export class ColoredConsole {
             }
             if (invalidSgr)
                 continue;
-            for (let ci = 0; ci < codes.length; ci++) {
+            let ci = 0;
+            while (ci < codes.length) {
                 const code = codes[ci];
                 switch (code) {
                     case 0:
@@ -454,6 +453,7 @@ export class ColoredConsole {
                         this.state.bgRgb = ANSI_256[15];
                         break;
                 }
+                ci++;
             }
         }
         addSpan(line.substring(i));

package/js/util/timestamp-transformer.js

@@ -7,6 +7,10 @@
 //   [HH:MM:SS.mmm]    wall-clock bracket with millis
 //   HH:MM:SS.mmm      plain wall-clock
 const DEVICE_TIMESTAMP_RE = /^\s*(?:\[\d{2}:\d{2}:\d{2}(?:\.\d+)?\]|(?:\d{2}:){2}\d{2}\.\d)/;
+// Matches leading ANSI SGR (color/style) codes at the start of a string
+// biome-ignore lint/suspicious/noControlCharactersInRegex: ANSI escape sequences
+// eslint-disable-next-line no-control-regex
+const LEADING_ANSI_RE = /^(\x1b\[(?:\d+;)*\d*m)+/;
 export class TimestampTransformer {
     constructor() {
         this.deviceHasTimestamps = false;
@@ -25,11 +29,30 @@ export class TimestampTransformer {
             controller.enqueue(chunk);
             return;
         }
+        // Extract leading ANSI codes to preserve them across line splits
+        const ansiMatch = chunk.match(LEADING_ANSI_RE);
+        const leadingAnsi = ansiMatch ? ansiMatch[0] : "";
+        const contentWithoutAnsi = leadingAnsi
+            ? chunk.slice(leadingAnsi.length)
+            : chunk;
         const date = new Date();
         const h = date.getHours().toString().padStart(2, "0");
         const m = date.getMinutes().toString().padStart(2, "0");
         const s = date.getSeconds().toString().padStart(2, "0");
-        controller.enqueue(`[${h}:${m}:${s}] ${chunk}`);
+        const timestamp = `[${h}:${m}:${s}]`;
+        // For multi-line chunks, we need to preserve ANSI codes on each line
+        // Split on newlines, but keep the newline characters
+        const lines = contentWithoutAnsi.split(/(\r?\n)/);
+        let result = "";
+        for (const part of lines) {
+            if (part === "\n" || part === "\r\n") {
+                result += part;
+            }
+            else if (part !== "") {
+                result += leadingAnsi + timestamp + " " + part;
+            }
+        }
+        controller.enqueue(result);
     }
     reset() {
         this.deviceHasTimestamps = false;