esp32tool 1.6.6 → 1.6.7

package/package.cli.json

@@ -1,6 +1,6 @@
 {
   "name": "esp32tool",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "private": true,
   "type": "module",
   "description": "ESP32Tool - Standalone command-line tool (build-time config only)",
@@ -23,7 +23,7 @@
     "usb": "^2.17.0"
   },
   "devDependencies": {
-    "electron": "^39.2.5"
+    "electron": "^42.0.1"
   },
   "_comment": "This file is ONLY used during CLI builds. It is temporarily swapped with package.json by build-electron-cli.cjs, then restored. Never publish this file to npm. Keep version in sync with main package.json when releasing."
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esp32tool",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "type": "module",
   "description": "Flash & Read ESP devices using WebSerial, Electron, and also Android mobile via WebUSB",
   "main": "electron/main.cjs",
@@ -24,7 +24,7 @@
     "build": "npm run prebuild && node update-sw-version.cjs && tsc --skipLibCheck && tsc -p tsconfig.util.json && rollup -c && node -e \"const fs=require('fs'); fs.readdirSync('dist/web').filter(f=>f.endsWith('.js')).forEach(f=>fs.copyFileSync('dist/web/'+f,'js/modules/'+f)); fs.renameSync('js/modules/index.js','js/modules/esptool.js');\" && node fix-cli-imports.cjs",
     "build:binary": "node build-single-binary.cjs",
     "build:cli-electron": "node build-electron-cli.cjs",
-    "format": "npm exec -- prettier --write src",
+    "format": "npm exec -- prettier --write src \"js/*.js\" electron css",
     "dev:clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true});\"",
     "dev:tsc-once": "tsc",
     "dev:tsc": "tsc --watch",
@@ -55,22 +55,21 @@
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^25.5.2",
+    "@types/node": "^25.7.0",
     "@types/pako": "^2.0.4",
-    "@types/serialport": "^10.2.0",
     "@types/w3c-web-serial": "^1.0.8",
     "archiver": "^7.0.1",
-    "electron": "^41.3.0",
+    "electron": "^42.0.1",
     "electron-squirrel-startup": "^1.0.1",
-    "eslint": "^10.2.1",
+    "eslint": "^10.3.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.8.3",
-    "rollup": "^4.60.2",
+    "rollup": "^4.60.3",
     "serve": "^14.2.6",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.59.0"
+    "typescript-eslint": "^8.59.1"
   },
   "dependencies": {
     "pako": "^2.1.0",
@@ -78,11 +77,11 @@
     "usb": "^2.17.0"
   },
   "overrides": {
-    "tmp": "^0.2.4",
-    "tar": "^7.5.6",
-    "minimatch": "^10.2.1",
+    "tmp": "^0.2.5",
+    "tar": "^7.5.13",
+    "minimatch": "^10.2.5",
     "serve": {
-      "ajv": "^8.18.0"
+      "ajv": "^8.20.0"
     },
     "@electron/asar": "^4.0.1",
     "serialize-javascript": "^7.0.3",

package/src/util/console-color.ts

@@ -109,8 +109,6 @@ export class ColoredConsole {
     lineSpan.classList.add("line");
 
     const addSpan = (content: string) => {
-      if (content === "") return;
-
       const span = document.createElement("span");
       if (this.state.bold) span.classList.add("log-bold");
       if (this.state.dim) span.classList.add("log-dim");
@@ -193,7 +191,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:
@@ -464,6 +463,7 @@ export class ColoredConsole {
             this.state.bgRgb = ANSI_256[15];
             break;
         }
+        ci++;
       }
     }
     addSpan(line.substring(i));

package/src/util/timestamp-transformer.ts

@@ -9,6 +9,11 @@
 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 implements Transformer<string, string> {
   private deviceHasTimestamps = false;
 
@@ -32,11 +37,32 @@ export class TimestampTransformer implements Transformer<string, string> {
       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() {

package/sw.js

@@ -1,5 +1,5 @@
 // Service Worker for ESP32Tool PWA
-const CACHE_NAME = 'esp32tool-v1.6.6';
+const CACHE_NAME = 'esp32tool-v1.6.7';
 const RUNTIME_CACHE = 'esp32tool-runtime';
 
 // Core files to cache on install (relative paths work for any deployment path)