Fix zephyr integration (part 2)

paulober · paulober · commit 9effa2fd8b66 · 2025-09-17T15:34:34.000+01:00
Signed-off-by: paulober &lt;44974737+paulober@users.noreply.github.com&gt;
diff --git a/src/commands/newProject.mts b/src/commands/newProject.mts
@@ -4,6 +4,7 @@ import { window, type Uri } from "vscode";
 import { NewProjectPanel } from "../webview/newProjectPanel.mjs";
 // eslint-disable-next-line max-len
 import { NewMicroPythonProjectPanel } from "../webview/newMicroPythonProjectPanel.mjs";
+import { NewRustProjectPanel } from "../webview/newRustProjectPanel.mjs";
 import { NewZephyrProjectPanel } from "../webview/newZephyrProjectPanel.mjs";
 
 /**
diff --git a/src/utils/download.mts b/src/utils/download.mts
@@ -23,7 +23,7 @@ import { cloneRepository, initSubmodules, ensureGit } from "./gitUtil.mjs";
 import { HOME_VAR, SettingsKey } from "../settings.mjs";
 import Settings from "../settings.mjs";
 import which from "which";
-import { ProgressLocation, type Uri, window, workspace } from "vscode";
+import { ProgressLocation, Uri, window, workspace } from "vscode";
 import { fileURLToPath } from "url";
 import {
   type GithubReleaseAssetData,
diff --git a/src/utils/setupZephyr.mts b/src/utils/setupZephyr.mts
@@ -18,10 +18,10 @@ import {
   downloadFileGot,
 } from "../utils/download.mjs";
 import Settings, { HOME_VAR } from "../settings.mjs";
-import { openOCDVersion } from "../webview/newProjectPanel.mjs";
 import findPython, { showPythonNotFoundError } from "../utils/pythonHelper.mjs";
 import { ensureGit } from "../utils/gitUtil.mjs";
-import { type VersionBundle } from "../utils/versionBundles.mjs";
+import VersionBundlesLoader from "./versionBundles.mjs";
+import { OPENOCD_VERSION } from "./sharedConstants.mjs";
 
 const _logger = new Logger("zephyrSetup");
 
@@ -48,10 +48,10 @@ manifest:
 `;
 
 interface ZephyrSetupValue {
-  versionBundle: VersionBundle | undefined;
   cmakeMode: number;
   cmakePath: string;
   cmakeVersion: string;
+  extUri: Uri;
 }
 
 interface ZephyrSetupOutputs {
@@ -90,7 +90,17 @@ export async function setupZephyr(
 
     return;
   }
+  _logger.info("Setting up Zephyr...");
 
+  const latestVb = await new VersionBundlesLoader(data.extUri).getLatest();
+  if (latestVb === undefined) {
+    _logger.error("Failed to get latest version bundles.");
+    void window.showErrorMessage(
+      "Failed to get latest version bundles. Cannot continue Zephyr setup."
+    );
+
+    return;
+  }
   const output: ZephyrSetupOutputs = { cmakeExecutable: "" };
 
   let python3Path: string | undefined = "";
@@ -131,11 +141,7 @@ export async function setupZephyr(
 
       // Handle CMake install
       switch (data.cmakeMode) {
-        case 0:
-          if (data.versionBundle !== undefined) {
-            data.cmakeVersion = data.versionBundle.cmake;
-          }
-        // eslint-disable-next-line no-fallthrough
+        case 4:
         case 2:
           installedSuccessfully = false;
           prog2LastState = 0;
@@ -215,7 +221,7 @@ export async function setupZephyr(
             message: "Failed",
             increment: 100,
           });
-          void window.showErrorMessage("Unknown cmake selection.");
+          void window.showErrorMessage("Unknown CMake version selected.");
 
           return;
       }
@@ -227,13 +233,16 @@ export async function setupZephyr(
         },
         async progress2 => {
           if (
-            await downloadAndInstallNinja("v1.12.1", (prog: GotProgress) => {
-              const per = prog.percent * 100;
-              progress2.report({
-                increment: per - prog2LastState,
-              });
-              prog2LastState = per;
-            })
+            await downloadAndInstallNinja(
+              latestVb[1].ninja,
+              (prog: GotProgress) => {
+                const per = prog.percent * 100;
+                progress2.report({
+                  increment: per - prog2LastState,
+                });
+                prog2LastState = per;
+              }
+            )
           ) {
             progress2.report({
               message: "Successfully downloaded and installed Ninja.",
@@ -259,13 +268,16 @@ export async function setupZephyr(
         },
         async progress2 => {
           if (
-            await downloadAndInstallPicotool("2.1.1", (prog: GotProgress) => {
-              const per = prog.percent * 100;
-              progress2.report({
-                increment: per - prog2LastState,
-              });
-              prog2LastState = per;
-            })
+            await downloadAndInstallPicotool(
+              latestVb[1].picotool,
+              (prog: GotProgress) => {
+                const per = prog.percent * 100;
+                progress2.report({
+                  increment: per - prog2LastState,
+                });
+                prog2LastState = per;
+              }
+            )
           ) {
             progress2.report({
               message: "Successfully downloaded and installed Picotool.",
@@ -322,6 +334,7 @@ export async function setupZephyr(
           },
           async progress2 => {
             if (
+              // TODO: integrate into extension system for github api caching
               await downloadAndInstallArchive(
                 "https://github.com/oss-winget/oss-winget-storage/raw/" +
                   "96ea1b934342f45628a488d3b50d0c37cf06012c/packages/dtc/" +
@@ -355,6 +368,7 @@ export async function setupZephyr(
           },
           async progress2 => {
             if (
+              // TODO: integrate into extension system for github api caching
               await downloadAndInstallArchive(
                 "https://sourceforge.net/projects/gnuwin32/files/gperf/3.0.1/" +
                   "gperf-3.0.1-bin.zip/download",
@@ -391,6 +405,7 @@ export async function setupZephyr(
           },
           async progress2 => {
             if (
+              // TODO: integrate into extension system for github api caching
               await downloadAndInstallArchive(
                 "https:///eternallybored.org/misc/wget/releases/" +
                   "wget-1.21.4-win64.zip",
@@ -498,7 +513,7 @@ export async function setupZephyr(
         async progress2 => {
           if (
             await downloadAndInstallOpenOCD(
-              openOCDVersion,
+              OPENOCD_VERSION,
               (prog: GotProgress) => {
                 const per = prog.percent * 100;
                 progress2.report({
@@ -844,12 +859,13 @@ export async function setupZephyr(
               windowsHide: true,
               env: customEnv,
             });
-            _logger.info("stdout: ", child.stdout.toString());
-            _logger.info("stderr: ", child.stderr.toString());
+            _logger.debug("stdout: ", child.stdout.toString());
+            _logger.debug("stderr: ", child.stderr.toString());
+
             if (child.status) {
-              _logger.info("exit code: ", child.status);
+              _logger.debug("exit code: ", child.status);
               if (child.status !== 0) {
-                window.showErrorMessage(
+                void window.showErrorMessage(
                   "Error installing Zephyr SDK." + "Exiting Zephyr Setup."
                 );
               }
@@ -873,7 +889,8 @@ export async function setupZephyr(
       );
 
       if (installedSuccessfully) {
-        window.showInformationMessage("Zephyr setup complete");
+        // TODO: duplicate signaling
+        void window.showInformationMessage("Zephyr setup complete");
         progress.report({
           message: "Zephyr setup complete.",
           increment: 100,
diff --git a/src/utils/versionBundles.mts b/src/utils/versionBundles.mts
@@ -16,7 +16,7 @@ export interface VersionBundle {
   picotool: string;
   toolchain: string;
   riscvToolchain: string;
-  modifiers: { [triple: string] : {[tool: string]: string}};
+  modifiers: { [triple: string]: { [tool: string]: string } };
 }
 
 export interface VersionBundles {
@@ -108,20 +108,20 @@ export default class VersionBundlesLoader {
         const platformDouble = `${process.platform}_${process.arch}`;
         if (modifiers[platformDouble] !== undefined) {
           chosenBundle.cmake =
-            modifiers[platformDouble]["cmake"] ?? chosenBundle.cmake
+            modifiers[platformDouble]["cmake"] ?? chosenBundle.cmake;
 
           chosenBundle.ninja =
-            modifiers[platformDouble]["ninja"] ?? chosenBundle.ninja
+            modifiers[platformDouble]["ninja"] ?? chosenBundle.ninja;
 
           chosenBundle.picotool =
-            modifiers[platformDouble]["picotool"] ?? chosenBundle.picotool
+            modifiers[platformDouble]["picotool"] ?? chosenBundle.picotool;
 
           chosenBundle.toolchain =
-            modifiers[platformDouble]["toolchain"] ?? chosenBundle.toolchain
+            modifiers[platformDouble]["toolchain"] ?? chosenBundle.toolchain;
 
           chosenBundle.riscvToolchain =
             modifiers[platformDouble]["riscvToolchain"] ??
-              chosenBundle.riscvToolchain
+            chosenBundle.riscvToolchain;
         }
       }
     }
diff --git a/src/webview/newZephyrProjectPanel.mts b/src/webview/newZephyrProjectPanel.mts
@@ -27,8 +27,6 @@ import { PythonExtension } from "@vscode/python-extension";
 import { unknownErrorToString } from "../utils/errorHelper.mjs";
 import { buildZephyrWorkspacePath } from "../utils/download.mjs";
 import { setupZephyr } from "../utils/setupZephyr.mjs";
-import type { VersionBundle } from "../utils/versionBundles.mjs";
-import type VersionBundlesLoader from "../utils/versionBundles.mjs";
 import { getCmakeReleases } from "../utils/githubREST.mjs";
 import { getSystemCmakeVersion } from "../utils/cmakeUtil.mjs";
 
@@ -142,8 +140,6 @@ export class NewZephyrProjectPanel {
 
   private _projectRoot?: Uri;
   private _pythonExtensionApi?: PythonExtension;
-  private _versionBundlesLoader?: VersionBundlesLoader;
-  private _versionBundle: VersionBundle | undefined;
   private _systemCmakeVersion: string | undefined;
 
   // Create settings.json file with correct subsitution for tools such as
@@ -254,7 +250,7 @@ export class NewZephyrProjectPanel {
         )
         .then(selected => {
           if (selected === "Reload Window") {
-            commands.executeCommand("workbench.action.reloadWindow");
+            void commands.executeCommand("workbench.action.reloadWindow");
           }
         });
 
@@ -280,7 +276,6 @@ export class NewZephyrProjectPanel {
       return;
     }
 
-    // TODO: reload if it was import panel maybe in state
     NewZephyrProjectPanel.currentPanel = new NewZephyrProjectPanel(
       panel,
       settings,
@@ -345,23 +340,6 @@ export class NewZephyrProjectPanel {
               }
             }
             break;
-          case "versionBundleAvailableTest":
-            {
-              // test if versionBundle for sdk version is available
-              const versionBundle =
-                await this._versionBundlesLoader?.getModuleVersion(
-                  message.value as string
-                );
-              // return result in message of command versionBundleAvailableTest
-              await this._panel.webview.postMessage({
-                command: "versionBundleAvailableTest",
-                value: {
-                  result: versionBundle !== undefined,
-                  picotoolVersion: versionBundle?.picotool,
-                },
-              });
-            }
-            break;
           case "cancel":
             this.dispose();
             break;
@@ -445,6 +423,13 @@ export class NewZephyrProjectPanel {
     }
   }
 
+  /**
+   * Convert the enum to the Zephyr board name
+   *
+   * @param e BoardType enum
+   * @returns string Zephyr board name
+   * @throws Error if unknown board type
+   */
   private enumToBoard(e: BoardType): string {
     switch (e) {
       case BoardType.pico:
@@ -456,7 +441,6 @@ export class NewZephyrProjectPanel {
       case BoardType.pico2W:
         return "rpi_pico2/rp2350a/m33/w";
       default:
-        // TODO: maybe just return an empty string
         throw new Error(`Unknown Board Type: ${e as string}`);
     }
   }
@@ -501,7 +485,7 @@ export class NewZephyrProjectPanel {
       return;
     }
 
-    if (this._versionBundle === undefined && data.cmakeMode === 0) {
+    if (data.cmakeMode === 0) {
       progress.report({
         message: "Failed",
         increment: 100,
@@ -513,10 +497,10 @@ export class NewZephyrProjectPanel {
 
     // Setup Zephyr before doing anything else
     const zephyrSetupOutputs = await setupZephyr({
-      versionBundle: this._versionBundle,
       cmakeMode: data.cmakeMode,
       cmakePath: data.cmakePath,
       cmakeVersion: data.cmakeVersion,
+      extUri: this._extensionUri,
     });
 
     if (zephyrSetupOutputs === null) {
@@ -992,11 +976,6 @@ export class NewZephyrProjectPanel {
                           class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg
                                 focus:ring-blue-500 focus:border-blue-500 p-2.5
                                 dark:bg-gray-700 dark:border-gray-600 dark:text-white">
-                    ${
-                      this._versionBundle !== undefined
-                        ? `<option value="default">Default bundle</option>`
-                        : ""
-                    }
                     ${
                       this._systemCmakeVersion !== undefined
                         ? `<option value="system">Use system version</option>`
diff --git a/web/zephyr/main.js b/web/zephyr/main.js
@@ -128,7 +128,7 @@ var submitted = false;
   window.submitBtnClick = () => {
     // get all values of inputs
     const projectNameElement = document.getElementById("inp-project-name");
-    // if is project import then the project name element will not be rendered and does not exist in the DOM
+
     const projectName = projectNameElement.value;
     if (
       projectName !== undefined &&
@@ -235,17 +235,18 @@ var submitted = false;
     let cmakeVersion = null;   // string | null
 
     const cmakeModeSel = document.getElementById('cmake-mode');
-    const selCmake = document.getElementById('sel-cmake');                  // shown in "select" mode
-    const cmakeFileInp = document.getElementById('cmake-path-executable');  // shown in "custom" mode
+    const selCmake = document.getElementById('sel-cmake');                    // shown in "select" mode
+    const cmakeFileInp = document.getElementById('cmake-path-executable');    // shown in "custom" mode
+    const latestCmakeVersion = document.getElementById('cmake-latest-label'); // get latest version
 
     // Fallback to "latest" if the select isn't there for some reason
     const cmakeModeStr = (cmakeModeSel?.value || 'latest');
 
     // Map string modes -> numeric API
     // 0 = default bundle, 1 = system, 2 = select version, 3 = custom path, 4 = latest
     switch (cmakeModeStr) {
-      // should never happen, but just in case let the backend handle it
-      case 'default': cmakeMode = 0; break;
+      // default to latest
+      case 'default': cmakeMode = 4; break;
       case 'system': cmakeMode = 1; break;
       case 'select': cmakeMode = 2; break;
       case 'custom': cmakeMode = 3; break;
@@ -261,7 +262,12 @@ var submitted = false;
     }
 
     // Validate + collect per-mode extras
-    if (cmakeMode === 2) {
+    if (cmakeMode === 4) {
+      if (!latestCmakeVersion) {
+
+      }
+      cmakeVersion = latestCmakeVersion.textContent.trim();
+    } else if (cmakeMode === 2) {
       // specific version chosen from dropdown
       if (!selCmake || !selCmake.value) {
         vscode.postMessage({
@@ -288,8 +294,8 @@ var submitted = false;
       cmakePath = files[0].name;
     }
 
-    // Final sanity check: numeric range 0..4
-    if (cmakeMode === null || isNaN(cmakeMode) || cmakeMode < 0 || cmakeMode > 4) {
+    // Final sanity check: numeric range 1..4
+    if (cmakeMode === null || isNaN(cmakeMode) || cmakeMode < 1 || cmakeMode > 4) {
       console.debug('Invalid cmake version value: ' + cmakeMode);
       vscode.postMessage({
         command: CMD_ERROR,
