Fetch flash manifest.json from backend (#91)

Co-authored-by: Paulus Schoutsen <[email protected]>
esphome · Oct 14, 2021 · f18072b · f18072b
1 parent 347f0f1
commit f18072b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/src/api/configuration.ts b/src/api/configuration.ts
@@ -16,13 +16,15 @@ export interface Configuration {
   src_version: number;
   arduino_version: string;
   address: string;
-  esp_platform: "ESP8266" | "ESP32";
+  esp_platform: "esp8266" | "esp32";
   board: string;
   build_path: string;
   firmware_bin_path: string;
   loaded_integrations: string[];
 }
 
+export type Manifest = { path: string; offset: number }[];
+
 export const createConfiguration = (params: CreateConfigParams) =>
   fetchApiText("./wizard", {
     method: "post",
@@ -39,3 +41,6 @@ export const deleteConfiguration = (configuration: string) =>
 
 export const compileConfiguration = (configuration: string) =>
   streamLogs("compile", { configuration });
+
+export const getConfigurationManifest = (configuration: string) =>
+  fetchApiJson<Manifest>(`./manifest.json?configuration=${configuration}`);
diff --git a/src/flash.ts b/src/flash.ts
@@ -1,5 +1,9 @@
 import { ESPLoader } from "esp-web-flasher";
-import { getConfiguration } from "./api/configuration";
+import {
+  getConfiguration,
+  getConfigurationManifest,
+  Manifest,
+} from "./api/configuration";
 import { chipFamilyToPlatform } from "./const";
 
 export const flashConfiguration = async (
@@ -10,23 +14,21 @@ export const flashConfiguration = async (
 ) => {
   const config = await getConfiguration(filename);
 
-  if (chipFamilyToPlatform[esploader.chipFamily] !== config.esp_platform) {
+  if (
+    chipFamilyToPlatform[esploader.chipFamily] !==
+    config.esp_platform.toUpperCase()
+  ) {
     throw new Error(
-      `Configuration does not match the platform of the connected device. Expected a ${config.esp_platform} device.`
+      `Configuration does not match the platform of the connected device. Expected a ${config.esp_platform.toUpperCase()} device.`
     );
   }
 
-  let toFlash: { path: string; offset: number }[];
+  let toFlash: Manifest;
 
-  if (config.esp_platform === "ESP32") {
-    toFlash = [
-      { path: "./static/firmware/bootloader.bin", offset: 4096 },
-      { path: "./static/firmware/partitions.bin", offset: 32768 },
-      { path: "./static/firmware/ota.bin", offset: 57344 },
-      { path: `./download.bin?configuration=${filename}`, offset: 65536 },
-    ];
-  } else {
-    toFlash = [{ path: `./download.bin?configuration=${filename}`, offset: 0 }];
+  try {
+    toFlash = await getConfigurationManifest(filename);
+  } catch (err) {
+    throw new Error(`Error fetching manifest.json for ${filename}: ${err}`);
   }
 
   const filePromises = toFlash.map(async (part) => {

diff --git a/src/install-update/install-dialog.ts b/src/install-update/install-dialog.ts
@@ -154,7 +154,7 @@ class ESPHomeInstallDialog extends LitElement {
         html`
           Installing<br /><br />
           This will take
-          ${this._configuration!.esp_platform === "ESP8266"
+          ${this._configuration!.esp_platform === "esp8266"
             ? "a minute"
             : "2 minutes"}.<br />
           Keep this page visible to prevent slow down
@@ -347,7 +347,7 @@ class ESPHomeInstallDialog extends LitElement {
           }
         );
       } catch (err) {
-        this._error = "Installation failed";
+        this._error = `Installation failed: ${err}`;
         this._state = "done";
         return;
       }