tasmota-webserial-esptool 7.3.4 → 9.1.0

package/src/index.ts

@@ -24,10 +24,49 @@ export {
 } from "./const";
 
 export const connect = async (logger: Logger) => {
-  // - Request a port and open a connection.
-  const port = await navigator.serial.requestPort();
+  let port: SerialPort;
+  
+  // Check if a custom requestSerialPort function is available (e.g., from WebUSB wrapper)
+  const customRequestPort = (
+    globalThis as { requestSerialPort?: () => Promise<SerialPort> }
+  ).requestSerialPort;
+  
+  if (typeof customRequestPort === "function") {
+    // Use custom port request function (handles Android/WebUSB automatically)
+    logger.log("Using custom port request function");
+    port = await customRequestPort();
+  } else {
+    // Fallback to standard Web Serial API
+    if (!navigator.serial) {
+      throw new Error(
+        "Web Serial API is not supported in this browser. " +
+        "Please use Chrome 89+, Edge 89+, or Opera on desktop, or Chrome 61+ on Android with USB OTG. " +
+        "Note: The page must be served over HTTPS or localhost."
+      );
+    }
+    port = await navigator.serial.requestPort();
+  }
 
-  await port.open({ baudRate: ESP_ROM_BAUD });
+  // Only open if not already open (WebUSB may return an opened port)
+  if (!port.readable || !port.writable) {
+    await port.open({ baudRate: ESP_ROM_BAUD });
+  }
+
+  logger.log("Connected successfully.");
+
+  return new ESPLoader(port, logger);
+};
+
+export const connectWithPort = async (port: SerialPort, logger: Logger) => {
+  // Connect using an already opened port (useful for WebUSB wrapper)
+  if (!port) {
+    throw new Error("Port is required");
+  }
+
+  // Only open if not already open
+  if (!port.readable || !port.writable) {
+    await port.open({ baudRate: ESP_ROM_BAUD });
+  }
 
   logger.log("Connected successfully.");
 

package/src/stubs/index.ts

@@ -25,7 +25,7 @@ interface LoadedStub {
   data_start: number;
 }
 
-interface Stub {
+export interface Stub {
   text: number[];
   data: number[];
   text_start: number;
@@ -75,6 +75,9 @@ export const getStubCode = async (
     } else {
       stubcode = await import("./esp32p4.json");
     }
+  } else {
+    // Unknown chip family - no stub available
+    return null;
   }
 
   // Base64 decode the text and data