esp32tool 1.6.6 → 1.6.7

package/css/style.css

@@ -69,7 +69,8 @@
 }
 
 @keyframes pulse {
-  0%, 100% {
+  0%,
+  100% {
     transform: scale(1);
     box-shadow: 0 0 0 0 rgba(255, 107, 0, 0.7);
   }
@@ -90,7 +91,9 @@ button,
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Arial, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu,
+    "Helvetica Neue", Arial, sans-serif;
   font-style: normal;
   font-weight: 400;
   margin: 0;
@@ -261,7 +264,9 @@ div.clear {
 
 #log {
   max-width: 100%;
-  font-family: "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace;
+  font-family:
+    "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New",
+    monospace;
   font-style: normal;
   font-weight: 400;
   font-size: 16px;
@@ -343,7 +348,9 @@ div.clear {
   line-height: 25px;
   font-size: 14px;
   color: white;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Arial, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu,
+    "Helvetica Neue", Arial, sans-serif;
   font-style: normal;
   font-weight: 600;
   box-sizing: border-box;
@@ -391,8 +398,6 @@ div.clear {
   border-color: #67ac38;
 }
 
-
-
 #commands {
   min-width: 600px;
   justify-content: center;
@@ -410,7 +415,7 @@ div.clear {
 }
 
 /* Hide upload rows 2-8 by default, show dynamically via JavaScript */
-#commands .upload:nth-child(n+2):nth-child(-n+8) {
+#commands .upload:nth-child(n + 2):nth-child(-n + 8) {
   display: none;
 }
 
@@ -486,8 +491,12 @@ div.clear {
 }
 
 @keyframes indeterminate-stripes {
-  0% { background-position: 0 0; }
-  100% { background-position: 28px 0; }
+  0% {
+    background-position: 0 0;
+  }
+  100% {
+    background-position: 28px 0;
+  }
 }
 
 #eraseProgress {
@@ -625,7 +634,9 @@ div.clear {
   border-style: solid;
   cursor: pointer;
   background-color: transparent;
-  transition: background-color 0.2s, color 0.2s;
+  transition:
+    background-color 0.2s,
+    color 0.2s;
 }
 
 .partition-download-btn:hover {
@@ -976,7 +987,10 @@ div.clear {
   border-radius: 25px;
   cursor: pointer;
   margin-top: 20px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s;
+  transition:
+    background-color 0.2s,
+    color 0.2s,
+    border-color 0.2s;
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -1089,7 +1103,9 @@ div.clear {
 
 .file-viewer-body pre {
   margin: 0;
-  font-family: "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace;
+  font-family:
+    "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New",
+    monospace;
   font-size: 13px;
   line-height: 1.5;
   white-space: pre;
@@ -1100,7 +1116,9 @@ div.clear {
 }
 
 .file-viewer-body .hex-view {
-  font-family: "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace;
+  font-family:
+    "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New",
+    monospace;
   font-size: 12px;
   line-height: 1.6;
 }
@@ -1134,6 +1152,262 @@ div.clear {
   gap: 10px;
 }
 
+/* NVS Editor Dialog Styles */
+.nvs-dialog-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.7);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10000;
+}
+
+.nvs-dialog {
+  background-color: #fff;
+  border-radius: 10px;
+  box-shadow: 0 5px 30px rgba(0, 0, 0, 0.3);
+  max-width: 600px;
+  max-height: 80vh;
+  width: 90%;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.nvs-dialog-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 25px;
+  border-bottom: 2px solid #e0e0e0;
+  background-color: #f8f8f8;
+}
+
+.nvs-dialog-header h3 {
+  margin: 0;
+  font-size: 18px;
+  color: #333;
+}
+
+.nvs-dialog-close {
+  background: none;
+  border: none;
+  font-size: 24px;
+  color: #999;
+  cursor: pointer;
+  padding: 0;
+  width: 30px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  transition: all 0.2s;
+}
+
+.nvs-dialog-close:hover {
+  background-color: #f0f0f0;
+  color: #333;
+}
+
+.nvs-dialog-close:focus,
+.nvs-dialog-close:focus-visible {
+  outline: 2px solid #0078d4;
+  outline-offset: 2px;
+  background-color: #f0f0f0;
+  color: #333;
+}
+
+.nvs-dialog-body {
+  padding: 25px;
+  overflow-y: auto;
+  flex: 1;
+  color: #333;
+}
+
+.nvs-dialog-body h4 {
+  margin: 0 0 12px 0;
+  font-size: 15px;
+  color: #333;
+  text-transform: uppercase;
+  font-weight: 700;
+  letter-spacing: 0.5px;
+}
+
+.nvs-dialog-body pre {
+  background-color: #f5f5f5;
+  padding: 12px 15px;
+  border-radius: 6px;
+  margin: 0 0 18px 0;
+  font-family:
+    "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
+  font-size: 14px;
+  line-height: 1.6;
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
+  border: 1px solid #e0e0e0;
+}
+
+.nvs-ok {
+  color: #71ae1e;
+  font-weight: 600;
+}
+
+.nvs-warn {
+  color: #ff6b00;
+  font-weight: 600;
+}
+
+.nvs-error {
+  color: #c64141;
+  font-weight: 600;
+}
+
+.nvs-blob-item {
+  background-color: #f8f8f8;
+  border: 1px solid #e0e0e0;
+  border-radius: 5px;
+  padding: 15px;
+  margin-bottom: 10px;
+}
+
+.nvs-blob-item div {
+  margin: 5px 0;
+  font-size: 13px;
+}
+
+.nvs-blob-item button {
+  margin-right: 10px;
+  margin-top: 10px;
+  padding: 5px 12px;
+  font-size: 12px;
+  border-style: solid;
+  cursor: pointer;
+  border-radius: 12px;
+}
+
+.nvs-blob-item button:focus,
+.nvs-blob-item button:focus-visible {
+  outline: 2px solid #0078d4;
+  outline-offset: 2px;
+}
+
+.nvs-issue-group {
+  margin: 6px 0 14px 0;
+  padding: 8px 10px;
+  background-color: #fff8f3;
+  border: 1px solid #ffd9b8;
+  border-radius: 6px;
+}
+
+.nvs-issue-title {
+  font-weight: 700;
+  font-size: 13px;
+  margin-bottom: 6px;
+}
+
+pre.nvs-issue {
+  background-color: #fff;
+  border: 1px solid #f0d3b8;
+  border-radius: 4px;
+  padding: 6px 8px;
+  margin: 4px 0;
+  font-family:
+    "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
+  color: #333;
+  flex: 1;
+}
+
+.nvs-issue-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+  margin: 4px 0;
+}
+
+.nvs-issue-actions {
+  display: inline-flex;
+  gap: 4px;
+  flex-shrink: 0;
+}
+
+.nvs-issue-btn {
+  padding: 4px 8px;
+  font-size: 12px;
+  border: 1px solid #c0c0c0;
+  border-radius: 4px;
+  background: #fafafa;
+  color: #333;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.nvs-issue-btn:hover {
+  background: #f0f0f0;
+  border-color: #888;
+}
+
+.nvs-issue-btn:focus,
+.nvs-issue-btn:focus-visible {
+  outline: 2px solid #0078d4;
+  outline-offset: 2px;
+  background: #f0f0f0;
+  border-color: #888;
+}
+
+.nvs-issue-delete:hover {
+  background: #ffe0e0;
+  border-color: #c64141;
+  color: #c64141;
+}
+
+.nvs-issue-delete:focus,
+.nvs-issue-delete:focus-visible {
+  outline: 2px solid #c64141;
+  outline-offset: 2px;
+  background: #ffe0e0;
+  border-color: #c64141;
+  color: #c64141;
+}
+
+/* Highlight effect when jumping to entry/page */
+.nvs-row-highlight {
+  animation: nvs-flash-row 2.2s ease-out;
+}
+
+.nvs-page-highlight {
+  animation: nvs-flash-page 2.2s ease-out;
+}
+
+@keyframes nvs-flash-row {
+  0% {
+    background-color: #fff3a8;
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+@keyframes nvs-flash-page {
+  0% {
+    box-shadow: 0 0 0 3px #ffb74d;
+  }
+  100% {
+    box-shadow: 0 0 0 0 transparent;
+  }
+}
+
 /* Mobile Optimizations */
 @media (max-width: 768px) {
   /* Larger touch targets and better readability */
@@ -2313,7 +2587,8 @@ body.console-active .main {
   background-color: #1c1c1c;
   display: flex;
   flex-direction: column;
-  font-family: SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-family:
+    SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
   color: #ddd;
 }
 
@@ -2638,8 +2913,11 @@ body.hexeditor-active .main {
 /* Progress overlay for loading */
 .hexeditor-progress-overlay {
   position: absolute;
-  top: 0; left: 0; right: 0; bottom: 0;
-  background-color: rgba(0,0,0,0.85);
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.85);
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -2776,7 +3054,9 @@ body.hexeditor-active .main {
   background-color: #1c1c1c;
   display: flex;
   flex-direction: column;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial,
+    sans-serif;
   color: #ddd;
 }
 
@@ -2952,10 +3232,18 @@ body.nvseditor-active .main {
   border-bottom: 1px solid #3a3a3a;
 }
 
-.nvs-page-header.state-active { border-left: 4px solid #43a047; }
-.nvs-page-header.state-full { border-left: 4px solid #ffa726; }
-.nvs-page-header.state-freeing { border-left: 4px solid #ef5350; }
-.nvs-page-header.state-other { border-left: 4px solid #666; }
+.nvs-page-header.state-active {
+  border-left: 4px solid #43a047;
+}
+.nvs-page-header.state-full {
+  border-left: 4px solid #ffa726;
+}
+.nvs-page-header.state-freeing {
+  border-left: 4px solid #ef5350;
+}
+.nvs-page-header.state-other {
+  border-left: 4px solid #666;
+}
 
 .nvs-page-state {
   font-weight: bold;
@@ -2965,10 +3253,22 @@ body.nvseditor-active .main {
   text-transform: uppercase;
 }
 
-.state-active .nvs-page-state { background: #1b5e20; color: #a5d6a7; }
-.state-full .nvs-page-state { background: #e65100; color: #ffcc80; }
-.state-freeing .nvs-page-state { background: #b71c1c; color: #ef9a9a; }
-.state-other .nvs-page-state { background: #424242; color: #999; }
+.state-active .nvs-page-state {
+  background: #1b5e20;
+  color: #a5d6a7;
+}
+.state-full .nvs-page-state {
+  background: #e65100;
+  color: #ffcc80;
+}
+.state-freeing .nvs-page-state {
+  background: #b71c1c;
+  color: #ef9a9a;
+}
+.state-other .nvs-page-state {
+  background: #424242;
+  color: #999;
+}
 
 /* NVS Namespace */
 .nvs-namespace {

package/dist/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/dist/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;

package/electron/cli-main.cjs

@@ -3,13 +3,13 @@
  * This provides a truly standalone CLI without requiring Node.js installation
  */
 
-const { app } = require('electron');
-const path = require('path');
+const { app } = require("electron");
+const path = require("path");
 
 // Prevent Electron from showing any windows
 app.dock?.hide(); // macOS
-app.commandLine.appendSwitch('disable-gpu');
-app.commandLine.appendSwitch('no-sandbox');
+app.commandLine.appendSwitch("disable-gpu");
+app.commandLine.appendSwitch("no-sandbox");
 
 // Get CLI arguments (skip electron executable and script path)
 const cliArgs = process.argv.slice(app.isPackaged ? 1 : 2);
@@ -19,27 +19,27 @@ app.whenReady().then(async () => {
   try {
     // Dynamically import the CLI module
     const cliPath = app.isPackaged
-      ? path.join(process.resourcesPath, 'app.asar', 'dist', 'cli.js')
-      : path.join(__dirname, '..', 'dist', 'cli.js');
-    
+      ? path.join(process.resourcesPath, "app.asar", "dist", "cli.js")
+      : path.join(__dirname, "..", "dist", "cli.js");
+
     // Set process.argv to match CLI expectations
     // In packaged app: argv[0] is the executable path
     // We want: ['node', 'esp32tool', ...actualArgs]
     const actualArgs = cliArgs;
-    process.argv = ['node', 'esp32tool', ...actualArgs];
-    
+    process.argv = ["node", "esp32tool", ...actualArgs];
+
     // Import CLI module
-    const cliModule = await import('file://' + cliPath);
-    
+    const cliModule = await import("file://" + cliPath);
+
     // Run the CLI
     await cliModule.runCLI();
-    
+
     // Give a small delay for cleanup
     setTimeout(() => {
       app.exit(0);
     }, 100);
   } catch (error) {
-    console.error('CLI Error:', error.message);
+    console.error("CLI Error:", error.message);
     if (process.env.DEBUG) {
       console.error(error.stack);
     }
@@ -50,25 +50,25 @@ app.whenReady().then(async () => {
 });
 
 // Handle app activation (macOS)
-app.on('activate', () => {
+app.on("activate", () => {
   // Do nothing - we're a CLI app
 });
 
 // Quit when all windows are closed
-app.on('window-all-closed', () => {
+app.on("window-all-closed", () => {
   // Do nothing - we don't have windows
 });
 
 // Handle errors
-process.on('uncaughtException', (error) => {
-  console.error('Uncaught Exception:', error.message);
+process.on("uncaughtException", (error) => {
+  console.error("Uncaught Exception:", error.message);
   if (process.env.DEBUG) {
     console.error(error.stack);
   }
   app.exit(1);
 });
 
-process.on('unhandledRejection', (reason) => {
-  console.error('Unhandled Rejection:', reason);
+process.on("unhandledRejection", (reason) => {
+  console.error("Unhandled Rejection:", reason);
   app.exit(1);
 });