update

Signed-off-by: Charlie Drage <[email protected]>

packages/backend/src/api-impl.ts

@@ -47,8 +47,8 @@ export class BootcApiImpl implements BootcApi {
     return checkPrereqs(await getContainerEngine());
   }
 
-  async checkVMLaunchPrereqs(folder: string, architecture: string): Promise<string | undefined> {
-    return new VMManager(folder, architecture).checkVMLaunchPrereqs();
+  async checkVMLaunchPrereqs(build: BootcBuildInfo): Promise<string | undefined> {
+    return new VMManager(build.folder, build.arch).checkVMLaunchPrereqs();
   }
 
   async buildExists(folder: string, types: BuildType[]): Promise<boolean> {
@@ -59,9 +59,9 @@ export class BootcApiImpl implements BootcApi {
     return buildDiskImage(build, this.history, overwrite);
   }
 
-  async launchVM(folder: string, architecture: string): Promise<void> {
+  async launchVM(build: BootcBuildInfo): Promise<void> {
     try {
-      await new VMManager(folder, architecture).launchVM();
+      await new VMManager(build.folder, build.arch).launchVM();
       // Notify it has successfully launched
       await this.notify(Messages.MSG_VM_LAUNCH_ERROR, { success: 'Launched!', error: '' });
     } catch (e) {

packages/frontend/src/App.svelte

@@ -9,7 +9,6 @@ import { getRouterState } from './api/client';
 import Homepage from './Homepage.svelte';
 import { rpcBrowser } from '/@/api/client';
 import { Messages } from '/@shared/src/messages/Messages';
-import VM from './lib/disk-image/DiskImageDetailsVirtualMachine.svelte';
 import DiskImageDetails from './lib/disk-image/DiskImageDetails.svelte';
 
 router.mode.hash();

packages/frontend/src/lib/disk-image/DiskImageDetails.svelte

@@ -84,7 +84,7 @@ export function goToHomePage(): void {
     <Route path="/vm" breadcrumb="Virtual Machine">
       <!-- Load after information is available since we have to wait for onMount to load the folder, image, arch. -->
       {#if diskImage?.folder && diskImage?.arch}
-        <DiskImageDetailsVirtualMachine folderLocation={diskImage?.folder} architecture={diskImage?.arch} />
+        <DiskImageDetailsVirtualMachine build={diskImage} />
       {/if}
     </Route>
   </svelte:fragment>

packages/frontend/src/lib/disk-image/DiskImageDetailsVirtualMachine.svelte

@@ -12,9 +12,9 @@ import VMConnectionStatus from '../../VMConnectionStatus.svelte';
 import Link from '../Link.svelte';
 import { Messages } from '/@shared/src/messages/Messages';
 import type { Subscriber } from '/@shared/src/messages/MessageProxy';
+import type { BootcBuildInfo } from '/@shared/src/models/bootc';
 
-export let folderLocation: string;
-export let architecture: string = '';
+export let build: BootcBuildInfo;
 
 // Terminal and WebSocket connection variables
 let logsXtermDiv: HTMLDivElement;
@@ -174,12 +174,12 @@ async function initTerminal() {
 }
 
 // Launch the VM with the folder location and architecture required.
-async function launchVM(folderLocation: string, architecture: string): Promise<void> {
+async function launchVM(build: BootcBuildInfo): Promise<void> {
   launchInProgress = true;
 
   // This is launched IN THE BACKGROUND. We do not wait for the VM to boot before showing the terminal.
   // we instead are notified by subscribing to Messages.MSG_VM_LAUNCH_ERROR messages from RPC
-  bootcClient.launchVM(folderLocation, architecture);
+  bootcClient.launchVM(build);
 
   // Initialize the terminal so it awaits the websocket connection.
   await initTerminal();
@@ -193,7 +193,7 @@ async function launchVM(folderLocation: string, architecture: string): Promise<v
 
   // Reset the terminal if we are booting an arm64 VM on macOS
   // see function for more information why this is necessary.
-  if (architecture === 'arm64' && (await bootcClient.isMac())) {
+  if (build.arch === 'arm64' && (await bootcClient.isMac())) {
     await resetTerminalTheme();
   }
 }
@@ -245,10 +245,10 @@ onMount(async () => {
   resizeObserver.observe(logsXtermDiv);
 
   // Launch the VM if we pass all the prerequisites, otherwise we will show the empty screen with content / information checks.
-  vmLaunchPrereqs = await bootcClient.checkVMLaunchPrereqs(folderLocation, architecture);
+  vmLaunchPrereqs = await bootcClient.checkVMLaunchPrereqs(build);
 
   if (!vmLaunchPrereqs) {
-    await launchVM(folderLocation, architecture);
+    await launchVM(build);
   }
 });
 

packages/shared/src/BootcAPI.ts

@@ -21,7 +21,8 @@ import type { ImageInfo, ImageInspectInfo, ManifestInspectInfo } from '@podman-d
 
 export abstract class BootcApi {
   abstract checkPrereqs(): Promise<string | undefined>;
-  abstract checkVMLaunchPrereqs(folder: string, architecture: string): Promise<string | undefined>;
+  abstract checkVMLaunchPrereqs(build: BootcBuildInfo): Promise<string | undefined>;
+  abstract launchVM(build: BootcBuildInfo): Promise<void>;
   abstract buildExists(folder: string, types: BuildType[]): Promise<boolean>;
   abstract buildImage(build: BootcBuildInfo, overwrite?: boolean): Promise<void>;
   abstract pullImage(image: string): Promise<void>;
@@ -41,7 +42,6 @@ export abstract class BootcApi {
   abstract getUidGid(): Promise<string>;
   abstract loadLogsFromFolder(folder: string): Promise<string>;
   abstract getConfigurationValue(config: string, section: string): Promise<unknown>;
-  abstract launchVM(folder: string, architecture: string): Promise<void>;
   abstract readFromClipboard(): Promise<string>;
   abstract stopCurrentVM(): Promise<void>;
   abstract telemetryLogUsage(eventName: string, data?: Record<string, unknown> | undefined): Promise<void>;