tasmota-esp-web-tools 12.2.1 → 12.2.2

package/dist/flash.d.ts

@@ -1,4 +1,32 @@
 import { Logger } from "tasmota-webserial-esptool";
-import { FlashState } from "./const";
+import { Build, FlashState, Manifest } from "./const";
+/**
+ * Parse flash size string (e.g., "4MB", "8MB", "16MB") to megabytes number
+ */
+export declare function parseFlashSizeToMB(flashSize: string): number | undefined;
+/**
+ * Extract the most relevant firmware filename from a build's parts.
+ * Prefers parts with "factory" in the name.
+ * Ignores parts with "bootloader" or "partition" in the name.
+ * Returns just the basename (no path prefix).
+ */
+export declare function getFirmwareFileName(build: Build): string | undefined;
+/**
+ * Find the best matching build for a given chip configuration.
+ * This is the single source of truth for build selection used by both
+ * the flash routine and the install dialog UI.
+ */
+export declare function findMatchingBuild(manifest: Manifest, chipFamily: string, chipVariant: string | null, flashSizeMB: number | undefined, usbInterface: "UART" | "CDC" | undefined): Build | undefined;
+/**
+ * Detect the matching build for the currently connected device.
+ * Extracts chip info directly from the esploader instance.
+ *
+ * @param manifest - The loaded firmware manifest
+ * @param esploader - ESPLoader instance (or stub) with chip info
+ * @param flashSize - Detected flash size string (e.g. "4MB"), or undefined
+ * @param isUsbJtagOrOtg - Whether the device uses native USB (CDC) instead of external serial
+ * @param improvChipFamily - Optional chipFamily from Improv Serial info (takes precedence)
+ */
+export declare function detectMatchingBuild(manifest: Manifest, esploader: any, flashSize: string | undefined, isUsbJtagOrOtg: boolean, improvChipFamily?: string): Build | undefined;
 export declare const flash: (onEvent: (state: FlashState) => void, esploader: any, // ESPLoader instance from tasmota-webserial-esptool
 logger: Logger, manifestPath: string, eraseFirst: boolean, firmwareBuffer: Uint8Array, _baudRate?: number) => Promise<void>;

package/dist/flash.js

@@ -4,7 +4,7 @@ import { corsProxyFetch } from "./util/cors-proxy";
 /**
  * Parse flash size string (e.g., "4MB", "8MB", "16MB") to megabytes number
  */
-function parseFlashSizeToMB(flashSize) {
+export function parseFlashSizeToMB(flashSize) {
     if (!flashSize)
         return undefined;
     const match = flashSize.match(/^(\d+)(MB|GB)$/);
@@ -66,9 +66,71 @@ function selectBestBuild(builds, detectedFlashSizeMB, detectedUsbInterface) {
     }
     return bestScore >= 0 ? bestBuild : undefined;
 }
+/**
+ * Extract the most relevant firmware filename from a build's parts.
+ * Prefers parts with "factory" in the name.
+ * Ignores parts with "bootloader" or "partition" in the name.
+ * Returns just the basename (no path prefix).
+ */
+export function getFirmwareFileName(build) {
+    const candidates = build.parts
+        .map((p) => p.path)
+        .filter((path) => {
+        const lower = path.toLowerCase();
+        return !lower.includes("bootloader") && !lower.includes("partition");
+    });
+    if (candidates.length === 0)
+        return undefined;
+    const factory = candidates.find((p) => p.toLowerCase().includes("factory"));
+    const chosen = factory !== null && factory !== void 0 ? factory : candidates[0];
+    // Return only the basename
+    return chosen.split("/").pop().split("\\").pop();
+}
+/**
+ * Find the best matching build for a given chip configuration.
+ * This is the single source of truth for build selection used by both
+ * the flash routine and the install dialog UI.
+ */
+export function findMatchingBuild(manifest, chipFamily, chipVariant, flashSizeMB, usbInterface) {
+    const compatible = manifest.builds.filter((b) => {
+        if (b.chipFamily !== chipFamily)
+            return false;
+        if (b.chipVariant && b.chipVariant !== chipVariant)
+            return false;
+        return true;
+    });
+    const exactVariant = compatible.filter((b) => b.chipVariant !== undefined && b.chipVariant === chipVariant);
+    const variantAgnostic = compatible.filter((b) => b.chipVariant === undefined);
+    return (selectBestBuild(exactVariant, flashSizeMB, usbInterface) ||
+        selectBestBuild(variantAgnostic, flashSizeMB, usbInterface));
+}
+/**
+ * Detect the matching build for the currently connected device.
+ * Extracts chip info directly from the esploader instance.
+ *
+ * @param manifest - The loaded firmware manifest
+ * @param esploader - ESPLoader instance (or stub) with chip info
+ * @param flashSize - Detected flash size string (e.g. "4MB"), or undefined
+ * @param isUsbJtagOrOtg - Whether the device uses native USB (CDC) instead of external serial
+ * @param improvChipFamily - Optional chipFamily from Improv Serial info (takes precedence)
+ */
+export function detectMatchingBuild(manifest, esploader, flashSize, isUsbJtagOrOtg, improvChipFamily) {
+    var _a;
+    const chipFamily = improvChipFamily ||
+        (esploader.chipFamily ? getChipFamilyName(esploader) : null);
+    if (!chipFamily)
+        return undefined;
+    const chipVariant = (_a = esploader.chipVariant) !== null && _a !== void 0 ? _a : null;
+    const flashSizeMB = flashSize ? parseFlashSizeToMB(flashSize) : undefined;
+    const usbInterface = isUsbJtagOrOtg
+        ? "CDC"
+        : "UART";
+    return findMatchingBuild(manifest, chipFamily, chipVariant, flashSizeMB, usbInterface);
+}
 export const flash = async (onEvent, esploader, // ESPLoader instance from tasmota-webserial-esptool
 logger, manifestPath, eraseFirst, firmwareBuffer, _baudRate) => {
     let manifest;
+    // eslint-disable-next-line prefer-const
     let build;
     // eslint-disable-next-line prefer-const
     let chipFamily;
@@ -167,24 +229,7 @@ logger, manifestPath, eraseFirst, firmwareBuffer, _baudRate) => {
         await esploader.disconnect();
         return;
     }
-    // Filter builds by chipFamily and chipVariant
-    const compatibleBuilds = manifest.builds.filter((b) => {
-        if (b.chipFamily !== chipFamily) {
-            return false;
-        }
-        if (b.chipVariant && b.chipVariant !== chipVariant) {
-            return false;
-        }
-        return true;
-    });
-    // Select the best build using most-specific-matching algorithm
-    // Prefer builds with more matching qualifiers (flashSizeMB)
-    const exactVariantBuilds = compatibleBuilds.filter((b) => b.chipVariant !== undefined && b.chipVariant === chipVariant);
-    const variantAgnosticBuilds = compatibleBuilds.filter((b) => b.chipVariant === undefined);
-    build = selectBestBuild(exactVariantBuilds, flashSizeMB, detectedUsbInterface);
-    if (!build) {
-        build = selectBestBuild(variantAgnosticBuilds, flashSizeMB, detectedUsbInterface);
-    }
+    build = findMatchingBuild(manifest, chipFamily, chipVariant, flashSizeMB, detectedUsbInterface);
     if (!build) {
         fireStateEvent({
             state: "error" /* FlashStateType.ERROR */,

package/dist/install-dialog.d.ts

@@ -46,6 +46,7 @@ export declare class EwtInstallDialog extends LitElement {
     private _improvSupported;
     private _isUsbJtagOrOtgDevice;
     private _flashSize?;
+    private _detectedBuild?;
     private _openConsoleAfterReconnect;
     private _visitDeviceAfterReconnect;
     private _addToHAAfterReconnect;
@@ -100,6 +101,12 @@ export declare class EwtInstallDialog extends LitElement {
     private _preventDefault;
     private _closeDialog;
     private _handleClose;
+    /**
+     * Return a human-readable label for the differentiating properties of a build.
+     * Shows the firmware filename from parts (factory preferred, no bootloader/partition).
+     * Falls back to chipVariant/flashSizeMB/usbInterface if no filename found.
+     */
+    private _buildVariantLabel;
     /**
      * Return if the device runs same firmware as manifest.
      */

package/dist/install-dialog.js

@@ -18,7 +18,7 @@ import "./pages/ew-page-message";
 import { closeIcon, warningIcon, checkCircleIcon, listItemInstallIcon, listItemWifi, listItemConsole, listItemVisitDevice, listItemHomeAssistant, listItemEraseUserData, listItemFundDevelopment, firmwareIcon, downloadIcon, } from "./components/svg";
 import { ImprovSerial } from "improv-wifi-serial-sdk/dist/serial";
 import { ImprovSerialCurrentState, } from "improv-wifi-serial-sdk/dist/const";
-import { flash } from "./flash";
+import { flash, detectMatchingBuild, getFirmwareFileName } from "./flash";
 import { textDownload } from "./util/file-download";
 import { fireEvent } from "./util/fire-event";
 import { sleep } from "./util/sleep";
@@ -57,8 +57,9 @@ export class EwtInstallDialog extends LitElement {
         this._handleDisconnect = () => {
             this._state = "ERROR";
             this._error = "Disconnected";
-            // Reset flash size when device is actually disconnected
+            // Reset flash size and detected build when device is actually disconnected
             this._flashSize = undefined;
+            this._detectedBuild = undefined;
         };
     }
     // Ensure stub is initialized (called before any operation that needs it)
@@ -144,6 +145,7 @@ export class EwtInstallDialog extends LitElement {
     }
     // Helper to probe flash size from a running stub (only available after stub)
     async _probeFlashSize(espStub) {
+        var _a;
         if (espStub.detectFlashSize && !this._flashSize) {
             try {
                 await espStub.detectFlashSize();
@@ -154,6 +156,7 @@ export class EwtInstallDialog extends LitElement {
                 this.logger.debug("Failed to detect flash size:", err);
             }
         }
+        this._detectedBuild = detectMatchingBuild(this._manifest, espStub, this._flashSize, this._isUsbJtagOrOtgDevice, (_a = this._info) === null || _a === void 0 ? void 0 : _a.chipFamily);
     }
     // Helper to check if device is using USB-JTAG or USB-OTG (not external serial chip)
     async _isUsbJtagOrOtg() {
@@ -557,6 +560,14 @@ export class EwtInstallDialog extends LitElement {
                 ? `Install ${this._manifest.name}`
                 : `Update ${this._manifest.name}`}
                 </div>
+                ${(() => {
+                const label = this._detectedBuild
+                    ? this._buildVariantLabel(this._detectedBuild)
+                    : undefined;
+                return label
+                    ? html `<div slot="supporting-text">Variant: ${label}</div>`
+                    : "";
+            })()}
               </ew-list-item>
             `
             : ""}
@@ -879,6 +890,14 @@ export class EwtInstallDialog extends LitElement {
         >
           ${listItemInstallIcon}
           <div slot="headline">Install ${this._manifest.name}</div>
+          ${(() => {
+            const label = this._detectedBuild
+                ? this._buildVariantLabel(this._detectedBuild)
+                : undefined;
+            return label
+                ? html `<div slot="supporting-text">Variant: ${label}</div>`
+                : "";
+        })()}
         </ew-list-item>
 
         ${!this._isUsbJtagOrOtgDevice
@@ -1251,7 +1270,7 @@ export class EwtInstallDialog extends LitElement {
         return [heading, content];
     }
     _renderInstall() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         let heading;
         let content;
         let hideActions = false;
@@ -1286,6 +1305,10 @@ export class EwtInstallDialog extends LitElement {
                     ? `, ${this._flashSize}`
                     : this._flashSize})`
                 : "";
+            const variantBuild = (_d = (_c = this._installState) === null || _c === void 0 ? void 0 : _c.build) !== null && _d !== void 0 ? _d : this._detectedBuild;
+            const variantLabel = variantBuild
+                ? this._buildVariantLabel(variantBuild)
+                : undefined;
             content = html `
         ${isUpdate
                 ? html `Your device is running
@@ -1295,7 +1318,9 @@ export class EwtInstallDialog extends LitElement {
                     ? html `Device detected: ${deviceInfo}<br /><br />`
                     : ""}
         Do you want to ${action}
-        ${this._manifest.name}&nbsp;${this._manifest.version}?
+        ${this._manifest.name}&nbsp;${this._manifest.version}${variantLabel
+                ? html `&nbsp;<em>(${variantLabel})</em>`
+                : ""}?
         ${this._installErase
                 ? html `<br /><br />All data on the device will be erased.`
                 : ""}
@@ -1317,7 +1342,7 @@ export class EwtInstallDialog extends LitElement {
             this._installState.state === "preparing" /* FlashStateType.PREPARING */) {
             heading = "Installing";
             // Show flash size in preparing message if available
-            const preparingMsg = ((_c = this._installState) === null || _c === void 0 ? void 0 : _c.flashSize)
+            const preparingMsg = ((_e = this._installState) === null || _e === void 0 ? void 0 : _e.flashSize)
                 ? `Preparing installation (${this._installState.flashSize})`
                 : "Preparing installation";
             content = this._renderProgress(preparingMsg);
@@ -2562,11 +2587,31 @@ export class EwtInstallDialog extends LitElement {
             await this._closeClientWithoutEvents(this._client);
         }
         document.body.style.overflow = (_a = this._bodyOverflow) !== null && _a !== void 0 ? _a : "";
-        // Reset flash size when dialog is closed
+        // Reset flash size and detected build when dialog is closed
         this._flashSize = undefined;
+        this._detectedBuild = undefined;
         fireEvent(this, "closed");
         this.parentNode.removeChild(this);
     }
+    /**
+     * Return a human-readable label for the differentiating properties of a build.
+     * Shows the firmware filename from parts (factory preferred, no bootloader/partition).
+     * Falls back to chipVariant/flashSizeMB/usbInterface if no filename found.
+     */
+    _buildVariantLabel(build) {
+        const filename = getFirmwareFileName(build);
+        if (filename)
+            return filename;
+        // Fallback: structural qualifiers
+        const parts = [];
+        if (build.chipVariant)
+            parts.push(build.chipVariant);
+        if (build.flashSizeMB)
+            parts.push(`${build.flashSizeMB} MB`);
+        if (build.usbInterface)
+            parts.push(build.usbInterface);
+        return parts.length > 0 ? parts.join(", ") : undefined;
+    }
     /**
      * Return if the device runs same firmware as manifest.
      */
@@ -2756,4 +2801,7 @@ __decorate([
 __decorate([
     state()
 ], EwtInstallDialog.prototype, "_flashSize", void 0);
+__decorate([
+    state()
+], EwtInstallDialog.prototype, "_detectedBuild", void 0);
 customElements.define("ewt-install-dialog", EwtInstallDialog);