esp32tool 1.3.1 → 1.3.3

package/js/util/console-color.js

@@ -199,10 +199,11 @@ export const coloredConsoleStyles = `
     padding: 16px;
     overflow: auto;
     line-height: 1.45;
-    border-radius: 3px;
+    border-radius: 0;
     white-space: pre-wrap;
     overflow-wrap: break-word;
     color: #ddd;
+    min-height: 0;
   }
 
   .log-bold {

package/js/webusb-serial.js

@@ -2,10 +2,10 @@
  * WebUSBSerial - Web Serial API-like wrapper for WebUSB
  * Provides a familiar interface for serial communication over USB on Android
  * 
- * This enables ESP32Tool to work on Android devices where Web Serial API
+ * This enables to work on Android devices where Web Serial API
  * is not available but WebUSB is supported.
  * 
- * IMPORTANT: For Android/Xiaomi compatibility, this class uses smaller transfer sizes
+ * IMPORTANT: For Android compatibility, this class uses smaller transfer sizes
  * to prevent SLIP synchronization errors. The maxTransferSize is set to 64 bytes
  * (or endpoint packetSize if smaller) to ensure SLIP frames don't get split.
  */
@@ -24,7 +24,7 @@ class WebUSBSerial {
             'close': [],
             'disconnect': []
         };
-        // Transfer size optimized for WebUSB on Android/Xiaomi
+        // Transfer size optimized for WebUSB on Android
         // CRITICAL: blockSize = (maxTransferSize - 2) / 2
         // Set to 64 bytes for maximum compatibility with all USB-Serial adapters
         // With 64 bytes: blockSize = (64-2)/2 = 31 bytes per SLIP packet
@@ -587,7 +587,7 @@ class WebUSBSerial {
      */
     async setSignals(signals) {
         // Serialize all control transfers through a queue
-        // This is CRITICAL for CP2102 on Android - parallel commands cause hangs
+        // This is CRITICAL for CP2102 - parallel commands cause hangs
         this._commandQueue = this._commandQueue.then(async () => {
             if (!this.device) {
                 throw new Error('Device not open');
@@ -803,8 +803,6 @@ class WebUSBSerial {
         // CH340 (WCH VID: 0x1a86, but not CH343 PID: 0x55d3)
         else if (vid === 0x1a86 && pid !== 0x55d3) {
             // CH340 baudrate calculation (from Linux kernel driver)
-            // CH341_BAUDBASE_FACTOR = 1532620800
-            // CH341_BAUDBASE_DIVMAX = 3
             const CH341_BAUDBASE_FACTOR = 1532620800;
             const CH341_BAUDBASE_DIVMAX = 3;
             
@@ -875,11 +873,22 @@ class WebUSBSerial {
                 try {
                     while (this._readLoopRunning && this.device) {
                         try {
+                            // CRITICAL: Check backpressure before reading more data
+                            // If desiredSize is 0 or negative, the consumer can't keep up
+                            // Wait for the consumer to drain the buffer before reading more
+                            if (controller.desiredSize !== null && controller.desiredSize <= 0) {
+                                // Consumer is backlogged - wait before reading more
+                                await new Promise(r => setTimeout(r, 10));
+                                continue;
+                            }
+
                             const result = await this.device.transferIn(this.endpointIn, this.maxTransferSize);
 
                             if (result.status === 'ok') {
                                 controller.enqueue(new Uint8Array(result.data.buffer, result.data.byteOffset, result.data.byteLength));
-                                // No delay - immediately read next packet
+                                // Small delay to allow consumer to process data
+                                // This prevents overwhelming the TextDecoderStream on Android
+                                await new Promise(r => setTimeout(r, 1));
                                 continue;
                             } else if (result.status === 'stall') {
                                 await this.device.clearHalt('in', this.endpointIn);
@@ -933,6 +942,26 @@ class WebUSBSerial {
         });
     }
 
+    /**
+     * Recreate streams without closing the port
+     * Useful after hardware reset or when switching to console mode
+     * This stops the current read loop and creates fresh streams
+     */
+    recreateStreams() {
+        // Stop the current read loop
+        this._readLoopRunning = false;
+        
+        // Wait a bit for the read loop to finish
+        // The ReadableStream will close itself when _readLoopRunning becomes false
+        return new Promise((resolve) => {
+            setTimeout(() => {
+                // Create new streams
+                this._createStreams();
+                resolve();
+            }, 100);
+        });
+    }
+
     _cleanup() {
         this._readLoopRunning = false;
         if (this._usbDisconnectHandler) {
@@ -1013,5 +1042,11 @@ async function requestSerialPort(forceNew = false) {
     throw new Error('Neither Web Serial API nor WebUSB is supported in this browser');
 }
 
+// Also set on globalThis for non-module usage (e.g., dynamic script loading)
+if (typeof globalThis !== 'undefined') {
+    globalThis.WebUSBSerial = WebUSBSerial;
+    globalThis.requestSerialPort = requestSerialPort;
+}
+
 // Export as ES modules
 export { WebUSBSerial, requestSerialPort };

package/package.cli.json

@@ -1,6 +1,6 @@
 {
   "name": "esp32tool",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "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.3.1",
+  "version": "1.3.3",
   "type": "module",
   "description": "Flash & Read ESP devices using WebSerial, Electron, and also Android mobile via WebUSB",
   "main": "electron/main.cjs",
@@ -25,12 +25,17 @@
     "build:binary": "node build-single-binary.cjs",
     "build:cli-electron": "node build-electron-cli.cjs",
     "format": "npm exec -- prettier --write src",
-    "develop": "script/develop",
+    "dev:clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true});\"",
+    "dev:tsc-once": "tsc",
+    "dev:tsc": "tsc --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",
     "lint": "eslint src/",
     "lintAndFix": "eslint src/ --fix",
     "start": "electron-forge start",
     "package": "electron-forge package",
-    "make": "electron-forge make",
+    "make": "node -e \"const fs=require('fs'); fs.rmSync('out',{recursive:true,force:true});\" && electron-forge make",
     "publish": "electron-forge publish",
     "generate-icons": "./generate-icons.sh",
     "test-pwa": "npx serve . -p 5004"
@@ -59,11 +64,12 @@
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
+    "npm-run-all": "^4.1.5",
     "prettier": "^3.8.1",
-    "rollup": "^4.56.0",
+    "rollup": "^4.57.0",
     "serve": "^14.2.4",
     "typescript": "^5.7.3",
-    "typescript-eslint": "^8.53.1"
+    "typescript-eslint": "^8.54.0"
   },
   "dependencies": {
     "pako": "^2.1.0",

package/src/const.ts

@@ -155,7 +155,7 @@ export const ESP32S3_UARTDEV_BUF_NO_USB_JTAG_SERIAL = 4; // The above var when U
 
 export const ESP32C2_SPI_REG_BASE = 0x60002000;
 export const ESP32C2_BASEFUSEADDR = 0x60008800;
-export const ESP32C2_MACFUSEADDR = 0x60008800 + 0x044;
+export const ESP32C2_MACFUSEADDR = ESP32C2_BASEFUSEADDR + 0x040;
 export const ESP32C2_SPI_USR_OFFS = 0x18;
 export const ESP32C2_SPI_USR1_OFFS = 0x1c;
 export const ESP32C2_SPI_USR2_OFFS = 0x20;