esp32tool 1.5.0 → 1.6.1

package/js/script.js

@@ -2,6 +2,7 @@
 import { WebUSBSerial, requestSerialPort } from './webusb-serial.js';
 import { ESP32ToolConsole } from './console.js';
 import { HexEditor } from './hex-editor.js';
+import { NVSEditor } from './nvs-editor.js';
 
 // Make requestSerialPort available globally for esptool.js
 // Use defensive assignment to avoid accidental overwrites
@@ -34,6 +35,7 @@ let currentMacAddr = null; // Store MAC address globally
 let isConnected = false; // Track connection state
 let consoleInstance = null; // ESP32ToolConsole instance
 let hexEditorInstance = null; // HexEditor instance
+let nvsEditorInstance = null; // NVSEditor instance
 let baudRateBeforeConsole = null; // Store baudrate before opening console
 let espLoaderBeforeConsole = null; // Store original ESPLoader before console
 let chipFamilyBeforeConsole = null; // Store chipFamily before opening console
@@ -90,6 +92,14 @@ function clearAllCachedData() {
   // Show the Read Partition Table button again
   butReadPartitions.classList.remove('hidden');
   
+  // Close NVS editor if open
+  if (nvsEditorInstance) {
+    try { nvsEditorInstance.close(); } catch (_) {}
+    nvsEditorInstance = null;
+  }
+  nvseditorContainer.classList.add('hidden');
+  document.body.classList.remove('nvseditor-active');
+  
   // Hide Detect FS button
   butDetectFS.classList.add('hidden');
   
@@ -232,6 +242,12 @@ const tabText = document.getElementById("tabText");
 const tabHex = document.getElementById("tabHex");
 const butHexEditor = document.getElementById("butHexEditor");
 const hexeditorContainer = document.getElementById("hexeditor-container");
+const butNVSEditor = document.getElementById("butNVSEditor");
+const nvseditorContainer = document.getElementById("nvseditor-container");
+
+// NVS and partition table layout constants
+const PARTITION_TABLE_OFFSET = 0x8000;
+const PARTITION_TABLE_SIZE   = 0x1000;
 
 let currentViewedFile = null;
 let currentViewedFileData = null;
@@ -348,6 +364,7 @@ document.addEventListener("DOMContentLoaded", () => {
   butProgram.addEventListener("click", clickProgram);
   butReadFlash.addEventListener("click", clickReadFlash);
   butHexEditor.addEventListener("click", clickHexEditor);
+  butNVSEditor.addEventListener("click", clickNVSEditor);
   butReadPartitions.addEventListener("click", clickReadPartitions);
   butDetectFS.addEventListener("click", clickDetectFS);
   butOpenFSManager.addEventListener("click", clickOpenFSManager);
@@ -800,12 +817,14 @@ async function clickConnect() {
   if (isESP8266) {
     // Hide partition table button for ESP8266
     butReadPartitions.classList.add('hidden');
+    butNVSEditor.classList.add('hidden');
     
     // Show ESP8266 filesystem detection button
     butDetectFS.classList.remove('hidden');
   } else {
     // Show partition table button for ESP32
     butReadPartitions.classList.remove('hidden');
+    butNVSEditor.classList.remove('hidden');
     
     // Hide ESP8266 filesystem detection button
     if (butDetectFS) {
@@ -1935,6 +1954,120 @@ async function clickHexEditor() {
   }
 }
 
+/**
+ * @name clickNVSEditor
+ * Click handler for the NVS Parser button.
+ * Reads partition table, locates the NVS partition, reads it and opens the NVS editor.
+ */
+async function clickNVSEditor() {
+  butNVSEditor.disabled = true;
+
+  // Guard against losing unsaved changes
+  if (nvsEditorInstance && nvsEditorInstance.modified === true) {
+    if (!confirm('You have unsaved changes in the NVS editor. Discard changes and reload?')) {
+      butNVSEditor.disabled = false;
+      return;
+    }
+    // User confirmed - close existing editor
+    nvseditorContainer.classList.add('hidden');
+    document.body.classList.remove('nvseditor-active');
+    try { nvsEditorInstance.close(); } catch (_) {}
+    nvsEditorInstance = null;
+  }
+
+  try {
+    // Step 1: Read partition table
+    // Create and show NVS editor container with progress
+    if (!nvsEditorInstance) {
+      nvsEditorInstance = new NVSEditor(nvseditorContainer);
+    }
+    nvseditorContainer.classList.remove('hidden');
+    document.body.classList.add('nvseditor-active');
+    nvsEditorInstance.initProgressUI();
+    nvsEditorInstance.showProgress('Reading partition table...', 0);
+
+    const ptData = await espStub.readFlash(PARTITION_TABLE_OFFSET, PARTITION_TABLE_SIZE);
+    const partitions = parsePartitionTable(ptData);
+
+    // Step 2: Find NVS partition (type=0x01 data, subtype=0x02 nvs)
+    const nvsPartition = partitions.find(p => p.type === 0x01 && p.subtype === 0x02);
+    if (!nvsPartition) {
+      throw new Error('No NVS partition found in partition table');
+    }
+
+    logMsg(`Found NVS partition "${nvsPartition.name}" at 0x${nvsPartition.offset.toString(16)}, size ${nvsPartition.size} bytes`);
+
+    // Step 3: Read the NVS partition
+    nvsEditorInstance.showProgress('Reading NVS partition...', 10);
+    const options = buildAdvancedOptions();
+    const nvsData = await espStub.readFlash(
+      nvsPartition.offset,
+      nvsPartition.size,
+      (packet, progress, totalSize) => {
+        const pct = 10 + Math.floor((progress / totalSize) * 85);
+        nvsEditorInstance.showProgress(
+          `Reading NVS... ${Math.floor((progress / totalSize) * 100)}% (${(progress / 1024).toFixed(0)} / ${(totalSize / 1024).toFixed(0)} KB)`,
+          pct
+        );
+      },
+      options
+    );
+
+    logMsg(`Successfully read ${nvsData.length} bytes from NVS partition`);
+
+    // Step 4: Open NVS editor
+    nvsEditorInstance.showProgress('Parsing NVS data...', 95);
+    nvsEditorInstance.open(nvsData, nvsPartition.offset, nvsPartition.name);
+
+    // Step 5: Set up write handler
+    nvsEditorInstance.onWriteFlash = async (editedData) => {
+      const editor = nvsEditorInstance;
+      if (!editor) return;
+
+      editor.showProgress('Writing NVS partition...', 0);
+
+      try {
+        const nvsBuffer = editedData.buffer.slice(
+          editedData.byteOffset,
+          editedData.byteOffset + editedData.byteLength
+      );
+      await espStub.flashData(
+        nvsBuffer,
+        (bytesWritten, totalBytes) => {
+          const pct = Math.floor((bytesWritten / totalBytes) * 100);
+          editor.showProgress(`Writing NVS... ${pct}%`, pct);
+        },
+        nvsPartition.offset
+      );
+
+      editor.showProgress('Write complete!', 100);
+      logMsg('NVS partition written successfully');
+      await sleep(500);
+      } finally {
+        editor.hideProgress();
+      }
+    };
+
+    // Step 6: Set up close handler
+    nvsEditorInstance.onClose = () => {
+      nvseditorContainer.classList.add('hidden');
+      document.body.classList.remove('nvseditor-active');
+      nvsEditorInstance = null;
+    };
+
+  } catch (e) {
+    errorMsg('Failed to open NVS editor: ' + e);
+    nvseditorContainer.classList.add('hidden');
+    document.body.classList.remove('nvseditor-active');
+    if (nvsEditorInstance) {
+      try { nvsEditorInstance.close(); } catch (_) {}
+      nvsEditorInstance = null;
+    }
+  } finally {
+    butNVSEditor.disabled = false;
+  }
+}
+
 /**
  * @name clickOpenFSManager
  * Click handler for the Open FS Manager button (ESP8266)
@@ -1967,8 +2100,6 @@ async function clickOpenFSManager() {
  * Click handler for the read partitions button.
  */
 async function clickReadPartitions() {
-  const PARTITION_TABLE_OFFSET = 0x8000;
-  const PARTITION_TABLE_SIZE = 0x1000; // Read 4KB to get all partitions
 
   butReadPartitions.disabled = true;
   butErase.disabled = true;
@@ -1976,8 +2107,7 @@ async function clickReadPartitions() {
   butReadFlash.disabled = true;
 
   try {
-    logMsg("Reading partition table from 0x8000...");
-    
+    logMsg(`Reading partition table from 0x${PARTITION_TABLE_OFFSET.toString(16)}...`);
     const data = await espStub.readFlash(PARTITION_TABLE_OFFSET, PARTITION_TABLE_SIZE);
     
     const partitions = parsePartitionTable(data);
@@ -2240,6 +2370,7 @@ function toggleUIToolbar(show) {
   butErase.disabled = !show;
   butReadFlash.disabled = !show;
   butHexEditor.disabled = !show;
+  butNVSEditor.disabled = !show;
   butReadPartitions.disabled = !show;
 }
 
@@ -2276,6 +2407,13 @@ function toggleUIConnected(connected) {
       hexEditorInstance.close();
       hexEditorInstance = null;
     }
+    // Close NVS editor if open (disconnect or unexpected port loss)
+    if (nvsEditorInstance) {
+      try { nvsEditorInstance.close(); } catch (_) {}
+      nvsEditorInstance = null;
+    }
+    nvseditorContainer.classList.add('hidden');
+    document.body.classList.remove('nvseditor-active');
   }
   butConnect.textContent = lbl;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esp32tool",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "type": "module",
   "description": "Flash & Read ESP devices using WebSerial, Electron, and also Android mobile via WebUSB",
   "main": "electron/main.cjs",
@@ -41,7 +41,7 @@
     "test-pwa": "npx serve . -p 5004"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.6.1",
+    "@electron-forge/cli": "^7.11.1",
     "@electron-forge/maker-deb": "^7.11.1",
     "@electron-forge/maker-dmg": "^7.11.1",
     "@electron-forge/maker-rpm": "^7.11.1",
@@ -62,8 +62,8 @@
     "electron": "^40.4.1",
     "electron-squirrel-startup": "^1.0.1",
     "eslint": "^9.39.2",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.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.57.0",
@@ -78,6 +78,9 @@
   },
   "overrides": {
     "tmp": "^0.2.4",
-    "tar": "^7.5.6"
+    "tar": "^7.5.6",
+    "ajv": "^8.18.0",
+    "minimatch": "^10.2.1",
+    "@electron/asar": "^4.0.1"
   }
 }

package/src/esp_loader.ts

@@ -4468,7 +4468,7 @@ export class ESPLoader extends EventTarget {
             } catch (err) {
               if (err instanceof SlipReadError) {
                 this.logger.debug(
-                  `SLIP read error at ${resp.length} bytes: ${err.message}`,
+                  `${err.message} at byte 0x${resp.length.toString(16)}`,
                 );
 
                 // Send empty SLIP frame to abort the stub's read operation
@@ -4622,22 +4622,9 @@ export class ESPLoader extends EventTarget {
           if (err instanceof SlipReadError) {
             if (retryCount <= MAX_RETRIES) {
               this.logger.debug(
-                `${err.message} at 0x${currentAddr.toString(16)}. Draining buffer and retrying (attempt ${retryCount}/${MAX_RETRIES})...`,
+                `Cleared buffer and retrying (attempt ${retryCount}/${MAX_RETRIES})...`,
               );
-
-              try {
-                await this.drainInputBuffer(200);
-
-                // Clear application buffer
-                await this.flushSerialBuffers();
-
-                // Wait before retry to let hardware settle
-                await sleep(SYNC_TIMEOUT);
-
-                // Continue to retry the same chunk (will send NEW read command)
-              } catch (drainErr) {
-                this.logger.debug(`Buffer drain error: ${drainErr}`);
-              }
+              // Continue to retry the same chunk (will send NEW read command)
             } else {
               // All retries exhausted - attempt recovery by reloading stub
               // IMPORTANT: Do NOT close port to keep ESP32 in bootloader mode

package/sw.js

@@ -1,5 +1,5 @@
 // Service Worker for ESP32Tool PWA
-const CACHE_NAME = 'esp32tool-v1.5.0';
+const CACHE_NAME = 'esp32tool-v1.6.1';
 const RUNTIME_CACHE = 'esp32tool-runtime';
 
 // Core files to cache on install (relative paths work for any deployment path)
@@ -18,6 +18,7 @@ const CORE_ASSETS = [
   // JavaScript
   './js/script.js',
   './js/hex-editor.js',
+  './js/nvs-editor.js',
   './js/utilities.js',
   './js/webusb-serial.js',
   './js/modules/esptool.js',