tasmota-webserial-esptool 7.1.0 → 7.2.1

package/src/esp_loader.ts

@@ -83,6 +83,8 @@ export class ESPLoader extends EventTarget {
   private _currentBaudRate: number = ESP_ROM_BAUD;
   private _maxUSBSerialBaudrate?: number;
   private _reader?: ReadableStreamDefaultReader<Uint8Array>;
+  private _isESP32S2NativeUSB: boolean = false;
+  private _initializationSucceeded: boolean = false;
 
   constructor(
     public port: SerialPort,
@@ -121,8 +123,13 @@ export class ESPLoader extends EventTarget {
     > = {
       0x1a86: {
         // QinHeng Electronics
+        0x7522: { name: "CH340", maxBaudrate: 460800 },
         0x7523: { name: "CH340", maxBaudrate: 460800 },
+        0x7584: { name: "CH340", maxBaudrate: 460800 },
+        0x5523: { name: "CH341", maxBaudrate: 2000000 },
+        0x55d3: { name: "CH343", maxBaudrate: 6000000 },
         0x55d4: { name: "CH9102", maxBaudrate: 6000000 },
+        0x55d8: { name: "CH9101", maxBaudrate: 3000000 },
       },
       0x10c4: {
         // Silicon Labs
@@ -179,6 +186,15 @@ export class ESPLoader extends EventTarget {
           this._maxUSBSerialBaudrate = chipInfo.maxBaudrate;
           this.logger.log(`Max baudrate: ${chipInfo.maxBaudrate}`);
         }
+        // Detect ESP32-S2 Native USB
+        // PID 0x0002 = TinyUSB CDC (after flash)
+        // PID 0x1001 = ROM Bootloader (before flash)
+        if (
+          portInfo.usbVendorId === 0x303a &&
+          (portInfo.usbProductId === 0x2 || portInfo.usbProductId === 0x1001)
+        ) {
+          this._isESP32S2NativeUSB = true;
+        }
       }
 
       // Don't await this promise so it doesn't block rest of method.
@@ -202,6 +218,9 @@ export class ESPLoader extends EventTarget {
     this.logger.debug(
       `Bootloader flash offset: 0x${FlAddr.flashOffs.toString(16)}`,
     );
+
+    // Mark initialization as successful
+    this._initializationSucceeded = true;
   }
 
   /**
@@ -261,7 +280,7 @@ export class ESPLoader extends EventTarget {
       }
     }
 
-    // Fallback: Use magic value detection for ESP8266, ESP32, ESP32-S2, and ESP32-P4 RC versions
+    // Fallback: Use magic value detection for ESP8266, ESP32, ESP32-S2
     const chipMagicValue = await this.readRegister(CHIP_DETECT_MAGIC_REG_ADDR);
     const chip = CHIP_DETECT_MAGIC_VALUES[chipMagicValue >>> 0];
     if (chip === undefined) {
@@ -275,7 +294,6 @@ export class ESPLoader extends EventTarget {
     this.chipName = chip.name;
     this.chipFamily = chip.family;
 
-    // For ESP32-P4 detected via magic value (old revisions), set variant
     if (this.chipFamily === CHIP_FAMILY_ESP32P4) {
       this.chipRevision = await this.getChipRevision();
       this.logger.debug(`ESP32-P4 revision: ${this.chipRevision}`);
@@ -402,6 +420,20 @@ export class ESPLoader extends EventTarget {
     }
     // Disconnected!
     this.connected = false;
+
+    // Check if this is ESP32-S2 Native USB that needs port reselection
+    // Only trigger reconnect if initialization did NOT succeed (wrong port)
+    if (this._isESP32S2NativeUSB && !this._initializationSucceeded) {
+      this.logger.log(
+        "ESP32-S2 Native USB detected - requesting port reselection",
+      );
+      this.dispatchEvent(
+        new CustomEvent("esp32s2-usb-reconnect", {
+          detail: { message: "ESP32-S2 Native USB requires port reselection" },
+        }),
+      );
+    }
+
     this.dispatchEvent(new Event("disconnect"));
     this.logger.debug("Finished read loop");
   }
@@ -1190,7 +1222,7 @@ export class ESPLoader extends EventTarget {
     misoBits: number,
   ) {
     if (spiAddresses.mosiDlenOffs != -1) {
-      // ESP32/32S2/32S3/32C3 has a more sophisticated way to set up "user" commands
+      // Actual MCUs have a more sophisticated way to set up "user" commands
       const SPI_MOSI_DLEN_REG =
         spiAddresses.regBase + spiAddresses.mosiDlenOffs;
       const SPI_MISO_DLEN_REG =
@@ -1242,7 +1274,7 @@ export class ESPLoader extends EventTarget {
     const SPI_USR_MISO = 1 << 28;
     const SPI_USR_MOSI = 1 << 27;
 
-    // SPI registers, base address differs ESP32* vs 8266
+    // SPI registers, base address differs
     const spiAddresses = getSpiFlashAddresses(this.getChipFamily());
     const base = spiAddresses.regBase;
     const SPI_CMD_REG = base;
@@ -1451,7 +1483,11 @@ export class ESPLoader extends EventTarget {
   }
 
   async writeToStream(data: number[]) {
-    const writer = this.port.writable!.getWriter();
+    if (!this.port.writable) {
+      this.logger.debug("Port writable stream not available, skipping write");
+      return;
+    }
+    const writer = this.port.writable.getWriter();
     await writer.write(new Uint8Array(data));
     try {
       writer.releaseLock();
@@ -1465,7 +1501,11 @@ export class ESPLoader extends EventTarget {
       await this._parent.disconnect();
       return;
     }
-    await this.port.writable!.getWriter().close();
+    if (!this.port.writable) {
+      this.logger.debug("Port already closed, skipping disconnect");
+      return;
+    }
+    await this.port.writable.getWriter().close();
     await new Promise((resolve) => {
       if (!this._reader) {
         resolve(undefined);
@@ -1501,8 +1541,6 @@ export class ESPLoader extends EventTarget {
       this._reader = undefined;
     }
 
-    await sleep(SYNC_TIMEOUT);
-
     // Close port
     try {
       await this.port.close();
@@ -1511,9 +1549,6 @@ export class ESPLoader extends EventTarget {
       this.logger.debug(`Port close error: ${err}`);
     }
 
-    // Wait for port to fully close
-    await sleep(SYNC_TIMEOUT);
-
     // Open the port
     this.logger.debug("Opening port...");
     try {
@@ -1523,9 +1558,6 @@ export class ESPLoader extends EventTarget {
       throw new Error(`Failed to open port: ${err}`);
     }
 
-    // Wait for port to be fully ready
-    await sleep(SYNC_TIMEOUT);
-
     // Verify port streams are available
     if (!this.port.readable || !this.port.writable) {
       throw new Error(
@@ -1540,7 +1572,7 @@ export class ESPLoader extends EventTarget {
     const savedChipVariant = this.chipVariant;
     const savedFlashSize = this.flashSize;
 
-    // Reinitialize without chip detection
+    // Reinitialize
     await this.hardReset(true);
 
     if (!this._parent) {
@@ -1552,7 +1584,7 @@ export class ESPLoader extends EventTarget {
     await this.flushSerialBuffers();
     await this.sync();
 
-    // Restore chip info (skip detection)
+    // Restore chip info
     this.chipFamily = savedChipFamily;
     this.chipName = savedChipName;
     this.chipRevision = savedChipRevision;
@@ -1566,7 +1598,7 @@ export class ESPLoader extends EventTarget {
       throw new Error("Port not ready after reconnect");
     }
 
-    // Load stub (skip flash detection)
+    // Load stub
     const stubLoader = await this.runStub(true);
     this.logger.debug("Stub loaded");
 
@@ -1574,9 +1606,6 @@ export class ESPLoader extends EventTarget {
     if (this._currentBaudRate !== ESP_ROM_BAUD) {
       await stubLoader.setBaudrate(this._currentBaudRate);
 
-      // Wait for port to be ready after baudrate change
-      await sleep(SYNC_TIMEOUT);
-
       // Verify port is still ready after baudrate change
       if (!this.port.writable || !this.port.readable) {
         throw new Error(
@@ -1598,22 +1627,14 @@ export class ESPLoader extends EventTarget {
    * This clears both the application RX buffer and waits for hardware buffers to drain
    */
   private async flushSerialBuffers(): Promise<void> {
-    // Clear application RX buffer
+    // Clear application buffer
     if (!this._parent) {
       this.__inputBuffer = [];
     }
 
-    // Wait for any pending TX operations and in-flight RX data
+    // Wait for any pending data
     await sleep(SYNC_TIMEOUT);
 
-    // Clear RX buffer again
-    if (!this._parent) {
-      this.__inputBuffer = [];
-    }
-
-    // Wait longer to ensure all stale data has been received and discarded
-    await sleep(SYNC_TIMEOUT * 2);
-
     // Final clear
     if (!this._parent) {
       this.__inputBuffer = [];
@@ -1645,22 +1666,6 @@ export class ESPLoader extends EventTarget {
       );
     }
 
-    // Check if we should reconnect BEFORE starting the read
-    // Reconnect if total bytes read >= 4MB to ensure clean state
-    if (this._totalBytesRead >= 4 * 1024 * 1024) {
-      this.logger.log(
-        // `Total bytes read: ${this._totalBytesRead}. Reconnecting before new read...`,
-        `Reconnecting before new read...`,
-      );
-
-      try {
-        await this.reconnect();
-      } catch (err) {
-        // If reconnect fails, throw error - don't continue with potentially broken state
-        throw new Error(`Reconnect failed: ${err}`);
-      }
-    }
-
     // Flush serial buffers before flash read operation
     await this.flushSerialBuffers();
 
@@ -1675,18 +1680,6 @@ export class ESPLoader extends EventTarget {
     let remainingSize = size;
 
     while (remainingSize > 0) {
-      // Reconnect every 4MB to prevent browser buffer issues
-      if (allData.length > 0 && allData.length % (4 * 1024 * 1024) === 0) {
-        this.logger.debug(
-          `Read ${allData.length} bytes. Reconnecting to clear buffers...`,
-        );
-        try {
-          await this.reconnect();
-        } catch (err) {
-          throw new Error(`Reconnect failed during read: ${err}`);
-        }
-      }
-
       const chunkSize = Math.min(CHUNK_SIZE, remainingSize);
       let chunkSuccess = false;
       let retryCount = 0;

package/.prettierignore

@@ -1 +0,0 @@
-src/stubs

package/rollup.config.js

@@ -1,27 +0,0 @@
-import { nodeResolve } from "@rollup/plugin-node-resolve";
-import json from "@rollup/plugin-json";
-import terser from "@rollup/plugin-terser";
-
-const config = {
-  input: "dist/index.js",
-  output: {
-    dir: "dist/web",
-    format: "module",
-  },
-  // preserveEntrySignatures: false,
-  plugins: [nodeResolve(), json()],
-};
-
-if (process.env.NODE_ENV === "production") {
-  config.plugins.push(
-    terser({
-      ecma: 2019,
-      toplevel: true,
-      output: {
-        comments: false,
-      },
-    }),
-  );
-}
-
-export default config;

package/tsconfig.json

@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": ["es2019", "dom"],
-    "target": "es2019",
-    "module": "es2020",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "outDir": "dist",
-    "declaration": true,
-    "experimentalDecorators": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "importHelpers": true,
-    "skipLibCheck": false
-  },
-  "include": ["src/*"]
-}