esp32tool 1.6.4 → 1.6.6

package/js/util/line-break-transformer.js

@@ -1,19 +1,31 @@
 export class LineBreakTransformer {
-  constructor() {
-    this.chunks = "";
-  }
-
-  transform(chunk, controller) {
-    // Append new chunks to existing chunks.
-    this.chunks += chunk;
-    // For each line breaks in chunks, send the parsed lines out.
-    const lines = this.chunks.split("\r\n");
-    this.chunks = lines.pop();
-    lines.forEach((line) => controller.enqueue(line + "\r\n"));
-  }
-
-  flush(controller) {
-    // When the stream is closed, flush any remaining chunks out.
-    controller.enqueue(this.chunks);
-  }
+    constructor() {
+        this.chunks = "";
+    }
+    transform(chunk, controller) {
+        // Append new chunks to existing chunks.
+        this.chunks += chunk;
+        // Split on \r\n, lone \r, or lone \n — capturing the separator so we can
+        // distinguish a lone \r (overwrite intent) from a normal newline.
+        const re = /\r\n|\r|\n/g;
+        let lastIndex = 0;
+        let match;
+        while ((match = re.exec(this.chunks)) !== null) {
+            // If this is a lone \r at the very end of the buffer, leave it so it can
+            // be combined with a possible following \n in the next chunk.
+            if (match[0] === "\r" && match.index === this.chunks.length - 1) {
+                break;
+            }
+            const line = this.chunks.substring(lastIndex, match.index);
+            // Emit with \r suffix only for lone \r (overwrite), \n for everything else.
+            const suffix = match[0] === "\r" ? "\r" : "\n";
+            controller.enqueue(line + suffix);
+            lastIndex = re.lastIndex;
+        }
+        this.chunks = this.chunks.substring(lastIndex);
+    }
+    flush(controller) {
+        // When the stream is closed, flush any remaining chunks out.
+        controller.enqueue(this.chunks);
+    }
 }

package/js/util/timestamp-transformer.js

@@ -0,0 +1,37 @@
+// Matches lines that already carry a wall-clock timestamp so we don't add a
+// redundant one.  Only real wall-clock formats are matched — tick-based
+// formats like FreeRTOS "(12345)" or ESP-IDF "I (15) boot:" are NOT matched
+// because they don't carry time-of-day information
+// Covered formats:
+//   [HH:MM:SS]        wall-clock bracket
+//   [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)/;
+export class TimestampTransformer {
+    constructor() {
+        this.deviceHasTimestamps = false;
+    }
+    transform(chunk, controller) {
+        // Pass through pure newline / empty sentinel unchanged so that
+        // carriage-return overwrite logic in console-color.ts still works.
+        if (chunk === "" || chunk === "\n" || chunk === "\r") {
+            controller.enqueue(chunk);
+            return;
+        }
+        if (!this.deviceHasTimestamps && DEVICE_TIMESTAMP_RE.test(chunk)) {
+            this.deviceHasTimestamps = true;
+        }
+        if (this.deviceHasTimestamps) {
+            controller.enqueue(chunk);
+            return;
+        }
+        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}`);
+    }
+    reset() {
+        this.deviceHasTimestamps = false;
+    }
+}

package/package.cli.json

@@ -1,6 +1,6 @@
 {
   "name": "esp32tool",
-  "version": "1.6.3",
+  "version": "1.6.6",
   "private": true,
   "type": "module",
   "description": "ESP32Tool - Standalone command-line tool (build-time config only)",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esp32tool",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "type": "module",
   "description": "Flash & Read ESP devices using WebSerial, Electron, and also Android mobile via WebUSB",
   "main": "electron/main.cjs",
@@ -20,14 +20,15 @@
     "node": ">=25.4.0"
   },
   "scripts": {
-    "prebuild": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true}); fs.rmSync('js/modules',{recursive:true,force:true}); fs.mkdirSync('js/modules',{recursive:true});\"",
-    "build": "npm run prebuild && node update-sw-version.cjs && tsc --skipLibCheck && 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",
+    "prebuild": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true}); fs.rmSync('js/modules',{recursive:true,force:true}); fs.rmSync('js/util',{recursive:true,force:true}); fs.mkdirSync('js/modules',{recursive:true}); fs.mkdirSync('js/util',{recursive:true});\"",
+    "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",
     "dev:clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true});\"",
     "dev:tsc-once": "tsc",
     "dev:tsc": "tsc --watch",
+    "dev:tsc-util": "tsc -p tsconfig.util.json --watch",
     "dev:rollup": "rollup -c --watch",
     "dev:serve": "serve -p 5004",
     "develop": "npm run dev:clean && npm run dev:tsc-once && npm-run-all --parallel dev:serve dev:tsc dev:rollup",
@@ -49,27 +50,27 @@
     "@electron-forge/maker-zip": "^7.11.1",
     "@electron-forge/plugin-auto-unpack-natives": "^7.11.1",
     "@electron/fuses": "^2.1.1",
-    "@eslint/js": "^9.39.3",
+    "@eslint/js": "^9.39.4",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^25.4.0",
+    "@types/node": "^25.5.2",
     "@types/pako": "^2.0.4",
     "@types/serialport": "^10.2.0",
-    "@types/w3c-web-serial": "^1.0.7",
+    "@types/w3c-web-serial": "^1.0.8",
     "archiver": "^7.0.1",
-    "electron": "^41.1.0",
+    "electron": "^41.3.0",
     "electron-squirrel-startup": "^1.0.1",
-    "eslint": "^10.0.2",
+    "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.8.1",
-    "rollup": "^4.60.1",
+    "prettier": "^3.8.3",
+    "rollup": "^4.60.2",
     "serve": "^14.2.6",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.2"
+    "typescript-eslint": "^8.59.0"
   },
   "dependencies": {
     "pako": "^2.1.0",

package/src/console.ts

@@ -1,5 +1,6 @@
 import { ColoredConsole, coloredConsoleStyles } from "./util/console-color.js";
 import { LineBreakTransformer } from "./util/line-break-transformer.js";
+import { TimestampTransformer } from "./util/timestamp-transformer.js";
 
 export class ESP32ToolConsole {
   private port: SerialPort;
@@ -8,6 +9,11 @@ export class ESP32ToolConsole {
   private containerElement: HTMLElement;
   private allowInput: boolean;
 
+  // Command history buffer
+  private commandHistory: string[] = [];
+  private historyIndex: number = -1;
+  private currentInput: string = "";
+
   constructor(
     port: SerialPort,
     containerElement: HTMLElement,
@@ -163,6 +169,17 @@ export class ESP32ToolConsole {
           ev.preventDefault();
           ev.stopPropagation();
           this._sendCommand();
+        } else if (ev.key === "ArrowUp") {
+          ev.preventDefault();
+          this._navigateHistory(1, input);
+        } else if (ev.key === "ArrowDown") {
+          ev.preventDefault();
+          this._navigateHistory(-1, input);
+        } else {
+          // User is editing — reset history navigation to live input
+          if (this.historyIndex !== -1) {
+            this.historyIndex = -1;
+          }
         }
       });
     }
@@ -218,11 +235,11 @@ export class ESP32ToolConsole {
           },
         )
         .pipeThrough(new TransformStream(new LineBreakTransformer()))
+        .pipeThrough(new TransformStream(new TimestampTransformer()))
         .pipeTo(
           new WritableStream({
             write: (chunk) => {
-              const cleaned = chunk.replace(/\r\n$/, "\n");
-              this.console!.addLine(cleaned);
+              this.console!.addLine(chunk);
             },
           }),
         );
@@ -241,11 +258,49 @@ export class ESP32ToolConsole {
     }
   }
 
+  private _navigateHistory(direction: 1 | -1, input: HTMLInputElement) {
+    if (this.commandHistory.length === 0) return;
+
+    // Save current unsent input before navigating away
+    if (this.historyIndex === -1) {
+      this.currentInput = input.value;
+    }
+
+    const nextIndex = this.historyIndex + direction;
+
+    if (nextIndex < 0) {
+      // Back to unsent draft
+      this.historyIndex = -1;
+      input.value = this.currentInput;
+    } else if (nextIndex < this.commandHistory.length) {
+      this.historyIndex = nextIndex;
+      input.value = this.commandHistory[this.historyIndex];
+    }
+
+    // Move cursor to end
+    const len = input.value.length;
+    input.setSelectionRange(len, len);
+  }
+
   private async _sendCommand() {
     const input = this.containerElement.querySelector<HTMLInputElement>(
       ".esp32tool-console-input",
     )!;
     const command = input.value;
+
+    if (command.trim() !== "") {
+      // Avoid consecutive duplicates, cap at 100
+      if (this.commandHistory[0] !== command) {
+        this.commandHistory.unshift(command);
+        if (this.commandHistory.length > 100) {
+          this.commandHistory.pop();
+        }
+      }
+    }
+    // Reset history navigation state
+    this.historyIndex = -1;
+    this.currentInput = "";
+
     if (!this.port.writable) {
       this.console!.addLine("Terminal disconnected: port not writable");
       return;