esp32tool 1.6.0 → 1.6.1

package/js/nvs-editor.js

@@ -387,83 +387,6 @@ export class NVSEditor {
     this.modified = true;
   }
 
-  static _parseIntStrict(s, label, min, max) {
-    const n = Number(s);
-    if (!Number.isFinite(n) || !Number.isInteger(n) || n < min || n > max)
-      throw new Error(`${label} must be an integer in [${min}, ${max}], got: ${s}`);
-    return n;
-  }
-
-  /** Write a primitive value back to an existing entry at item.offset */
-  _writeValue(item, newValue) {
-    const off = item.offset;
-    switch (item.datatype) {
-      case 0x01: { const v = NVSEditor._parseIntStrict(newValue, 'U8', 0, 255); this.data[off + 24] = v; break; }
-      case 0x02: { const v = parseInt(newValue, 10); if (!Number.isFinite(v) || v < 0 || v > 65535) throw new Error('U16 must be 0-65535'); this.data[off + 24] = v & 0xFF; this.data[off + 25] = (v >> 8) & 0xFF; break; }
-      case 0x04: { const v = parseInt(newValue, 10); if (!Number.isFinite(v) || v < 0 || v > 4294967295) throw new Error('U32 must be 0-4294967295'); const dv = new DataView(this.data.buffer, off + 24, 4); dv.setUint32(0, v >>> 0, true); break; }
-      case 0x08: { let v; try { v = BigInt(newValue); } catch(e) { throw new Error('U64 must be valid BigInt'); } if (v < 0n || v > 0xFFFFFFFFFFFFFFFFn) throw new Error('U64 out of range'); const dv = new DataView(this.data.buffer, off + 24, 8); dv.setBigUint64(0, v, true); break; }
-      case 0x11: { const v = parseInt(newValue, 10); if (!Number.isFinite(v) || v < -128 || v > 127) throw new Error('I8 must be -128 to 127'); this.data[off + 24] = v < 0 ? v + 256 : v; break; }
-      case 0x12: { const v = parseInt(newValue, 10); if (!Number.isFinite(v) || v < -32768 || v > 32767) throw new Error('I16 must be -32768 to 32767'); const dv = new DataView(this.data.buffer, off + 24, 2); dv.setInt16(0, v, true); break; }
-      case 0x14: { const v = parseInt(newValue, 10); if (!Number.isFinite(v) || v < -2147483648 || v > 2147483647) throw new Error('I32 must be -2147483648 to 2147483647'); const dv = new DataView(this.data.buffer, off + 24, 4); dv.setInt32(0, v, true); break; }
-      case 0x18: { let v; try { v = BigInt(newValue); } catch(e) { throw new Error('I64 must be valid BigInt'); } if (v < -0x8000000000000000n || v > 0x7FFFFFFFFFFFFFFFn) throw new Error('I64 out of range'); const dv = new DataView(this.data.buffer, off + 24, 8); dv.setBigInt64(0, v, true); break; }
-      case 0x21: { // String – rewrite in-place with trailing NUL
-        const enc = new TextEncoder().encode(newValue);
-        const maxPayload = (item.span - 1) * 32;
-        // Create NUL-terminated buffer
-        const encWithNul = new Uint8Array(enc.length + 1);
-        encWithNul.set(enc, 0);
-        encWithNul[enc.length] = 0;
-        if (encWithNul.length > maxPayload) { alert('String too long for existing slot (max ' + maxPayload + ' bytes)'); return; }
-        // Update size (includes NUL)
-        this.data[off + 24] = encWithNul.length & 0xFF;
-        this.data[off + 25] = (encWithNul.length >> 8) & 0xFF;
-        // Clear old data
-        this.data.fill(0xFF, off + 32, off + 32 + maxPayload);
-        // Write new data with NUL
-        this.data.set(encWithNul, off + 32);
-        // Update data CRC over NUL-terminated buffer
-        const crc = NVSEditor.crc32(encWithNul);
-        const dv = new DataView(this.data.buffer, off + 28, 4);
-        dv.setUint32(0, crc, true);
-        break;
-      }
-      case 0x42: { // Blob – rewrite hex bytes in-place
-        const hexBytes = newValue.split(/[\s,]+/).filter(b => b).map(b => parseInt(b, 16));
-        if (hexBytes.some(b => isNaN(b) || b < 0 || b > 255)) { alert('Invalid hex bytes'); return; }
-        const blobData = new Uint8Array(hexBytes);
-        const maxPayload = (item.span - 1) * 32;
-        if (blobData.length > maxPayload) { alert('Blob too long for existing slot (max ' + maxPayload + ' bytes)'); return; }
-        // Update size
-        this.data[off + 24] = blobData.length & 0xFF;
-        this.data[off + 25] = (blobData.length >> 8) & 0xFF;
-        // Clear old data
-        this.data.fill(0xFF, off + 32, off + 32 + maxPayload);
-        // Write new data
-        this.data.set(blobData, off + 32);
-        // Update data CRC
-        const crc = NVSEditor.crc32(blobData);
-        const dv = new DataView(this.data.buffer, off + 28, 4);
-        dv.setUint32(0, crc, true);
-        break;
-      }
-      case 0x48: { // Blob Index – edit totalSize
-        const v = parseInt(newValue, 10);
-        if (!Number.isFinite(v) || v < 0 || v > 0xFFFFFFFF) { alert('Invalid total size (must be 0-4294967295)'); return; }
-        const dv = new DataView(this.data.buffer, off + 24, 4);
-        dv.setUint32(0, v, true);
-        break;
-      }
-      default:
-        alert('Editing this type is not supported');
-        return;
-    }
-    // Recalculate header CRC
-    const hcrc = NVSEditor.crc32Header(this.data, off);
-    const dv = new DataView(this.data.buffer, off + 4, 4);
-    dv.setUint32(0, hcrc, true);
-    this.modified = true;
-  }
-
   // ─────── UI ───────
 
   _buildUI() {
@@ -614,7 +537,7 @@ export class NVSEditor {
           <span class="nvs-page-state">${page.state}</span>
           <span>Page @ 0x${page.offset.toString(16).toUpperCase()}</span>
           <span>Seq: ${page.seq}</span>
-          <span>Version: ${page.version}</span>
+          <span>Version: ${page.version === 0xFF ? 'v1' : page.version === 0xFE ? 'v2' : page.version}</span>
           <span>${page.items.length} entries</span>
         </div>`;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esp32tool",
-  "version": "1.6.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",
@@ -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.6.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)