Merge pull request #127 from Automattic/slot-racer2

Properly cancel VM start sequence to reduce race conditions

Author: twstokes

Sources/hostmgr-helper/VM List/States/RunningVMListItem.swift

@@ -29,7 +29,7 @@ struct RunningVMListItem: View {
 
     func shutdown() {
         Task {
-            try await slot.stopVirtualMachine()
+            try await slot.stop()
         }
     }
 

Sources/hostmgr-helper/VM List/VMListItem.swift

@@ -6,17 +6,17 @@ struct VMListItem: View {
     var slot: VirtualMachineSlot
 
     var body: some View {
-        switch slot.status {
+        switch slot.state {
         case .empty: EmptyVMListItem(slot: slot)
-        case .starting(let launchConfiguration):
+        case .starting(let launchConfiguration, _):
             PendingVMListItem(
                 launchConfiguration: launchConfiguration,
                 slot: slot
             )
-        case .running(let launchConfiguration, let ipAddress):
+        case .running(let virtualMachine):
             RunningVMListItem(
-                launchConfiguration: launchConfiguration,
-                ipAddress: ipAddress,
+                launchConfiguration: virtualMachine.config,
+                ipAddress: virtualMachine.ip,
                 slot: slot
             )
         case .stopping:

Sources/hostmgr-helper/VMHost.swift

@@ -50,11 +50,11 @@ extension VMHost: HostmgrServerDelegate {
         Logger.helper.log("Received stop request for \(handle)")
 
         if self.primaryVMSlot.isConfiguredForHandle(handle) {
-            try await primaryVMSlot.stopVirtualMachine()
+            try await primaryVMSlot.stop()
         }
 
         if self.secondaryVMSlot.isConfiguredForHandle(handle) {
-            try await secondaryVMSlot.stopVirtualMachine()
+            try await secondaryVMSlot.stop()
         }
     }
 
@@ -63,8 +63,8 @@ extension VMHost: HostmgrServerDelegate {
 
         repeat {
             do {
-                try await self.primaryVMSlot.stopVirtualMachine()
-                try await self.secondaryVMSlot.stopVirtualMachine()
+                try await self.primaryVMSlot.stop()
+                try await self.secondaryVMSlot.stop()
                 return
             } catch {
                 try await Task.sleep(for: .seconds(1))

Sources/hostmgr-helper/VMWindow.swift

@@ -10,10 +10,10 @@ struct VMWindowContent: View {
     }
 
     var body: some View {
-        switch vmSlot.status {
+        switch vmSlot.state {
         case .empty:  Text("VM not running")
         case .starting: ProgressView()
-        case .running: VirtualMachineDisplayView(virtualMachine: vmSlot.managedVirtualMachine?.machine)
+        case .running(let virtualMachine): VirtualMachineDisplayView(virtualMachine: virtualMachine.machine)
         .onAppear {
             NSApp.setActivationPolicy(.regular)
             NSApp.activate(ignoringOtherApps: true)