Ready for new beta

Author: jkmassel

Package.resolved

@@ -12,7 +12,7 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.1.4"),
         .package(url: "https://github.com/soto-project/soto.git", from: "6.0.0"),
-        .package(url: "https://github.com/jkmassel/prlctl.git", from: "1.20.0"),
+        .package(url: "https://github.com/jkmassel/prlctl.git", from: "1.21.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/jkmassel/kcpassword-swift.git", from: "1.0.0"),
         .package(url: "https://github.com/swiftpackages/DotEnv.git", from: "3.0.0"),

Package.swift

@@ -5,7 +5,7 @@ import libhostmgr
 @main
 struct Hostmgr: AsyncParsableCommand {
 
-    private static var appVersion = "0.15.0-beta.4"
+    private static var appVersion = "0.15.0-beta.5"
 
     static var configuration = CommandConfiguration(
         abstract: "A utility for managing VM hosts",

Sources/hostmgr/HostMgrCommand.swift

@@ -10,17 +10,6 @@ struct VMCleanCommand: ParsableCommand {
     )
 
     func run() throws {
-        let repository = LocalVMRepository(imageDirectory: FileManager.default.temporaryDirectory)
-        try repository.list().forEach { localVM in
-            Console.info("Removing temp VM file for \(localVM.filename)")
-            try repository.delete(image: localVM)
-        }
-
-        try ParallelsVMRepository().lookupVMs().forEach { parallelsVM in
-            Console.info("Removing Registered VM \(parallelsVM.name)")
-            try parallelsVM.unregister()
-        }
-
-        Console.success("Cleanup Complete")
+        try libhostmgr.resetVMStorage()
     }
 }

Sources/hostmgr/commands/vm/VMClean.swift

@@ -16,11 +16,17 @@ struct VMFetchCommand: AsyncParsableCommand {
 
     func run() async throws {
 
-        guard try LocalVMRepository().lookupVM(withName: name) == nil else {
-            Console.exit(
-                message: "VM is present locally",
-                style: .success
-            )
+        if let localVM = try LocalVMRepository().lookupVM(withName: name) {
+            if localVM.state == .packaged {
+                try await libhostmgr.unpackVM(name: localVM.basename)
+                return
+            } else {
+                Console.exit(
+                    message: "VM is present locally",
+                    style: .success
+                )
+            }
+
         }
 
         try await libhostmgr.fetchRemoteImage(name: self.name)

Sources/hostmgr/commands/vm/VMFetch.swift

@@ -16,39 +16,6 @@ struct VMStartCommand: AsyncParsableCommand {
     var wait: Bool = false
 
     func run() async throws {
-        let importedVM = try await libhostmgr.importVM(name: name)
-
-        Console.info("Applying VM Settings")
-
-        // Always leave 4GB available to the VM host – the VM can have the rest
-        let vmAvailableMemory = ProcessInfo().physicalMemory - (4096 * 1024 * 1024)
-        let cpuCoreCount = ProcessInfo().physicalProcessorCount
-
-        Console.printTable(data: [
-            ["Total System Memory", Format.memoryBytes(ProcessInfo().physicalMemory)],
-            ["VM System Memory", Format.memoryBytes(vmAvailableMemory)],
-            ["VM CPU Cores", "\(cpuCoreCount)"],
-            ["Hypervisor Type", "apple"],
-            ["Networking Type", "bridged"]
-        ])
-
-        try [
-            .memorySize(Int(vmAvailableMemory / 1024 / 1024)),
-            .cpuCount(ProcessInfo().physicalProcessorCount),
-            .hypervisorType(.apple),
-            .networkType(.bridged),
-            .isolateVM(.on),
-            .sharedCamera(.off)
-        ].forEach { try importedVM.set($0) }
-
-        // These are optional, and it's possible they've already been removed, so they may fail
-        do {
-            try importedVM.set(.withoutSoundDevice())
-            try importedVM.set(.withoutCDROMDevice())
-        } catch {
-            Console.warn("Unable to remove device: \(error.localizedDescription)")
-        }
-
-        try await libhostmgr.startVM(importedVM)
+        try await libhostmgr.startVM(name: self.name)
     }
 }

Sources/hostmgr/commands/vm/VMStart.swift

@@ -108,6 +108,14 @@ extension FileManager {
     public func createFile(at url: URL, contents: Data) throws {
         createFile(atPath: url.path, contents: contents)
     }
+
+    public func removeItemIfExists(at url: URL) throws {
+        guard fileExists(at: url) else {
+            return
+        }
+
+        try removeItem(at: url)
+    }
 }
 
 extension URL {

Sources/libhostmgr/Foundation+Extensions.swift

@@ -6,7 +6,6 @@ import prlctl
 /// This method is the preferred way to install a remote image on a VM Host.
 public func fetchRemoteImage(name: String) async throws {
     try await downloadRemoteImage(name: name)
-    try await importVM(name: name)
 
     Console.success("VM \(name) is ready")
 }
@@ -84,37 +83,36 @@ public func unpackVM(name: String) async throws {
     let unpackedVM = try package.unpack()
     Console.success("Unpacked \(package.name)")
 
-    Console.info("Cleaning up")
+    // If we simply rename the `.pvmp` file, the underlying `pvm` file may retain its original name. We should
+    // update the file on disk to reference this name
+    if name != unpackedVM.name {
+        Console.info("Fixing Parallels VM Label")
+        try unpackedVM.rename(to: name)
+        Console.success("Parallels VM Label Fixed")
+    }
+
+    Console.success("Finished Unpacking VM")
+
+    Console.info("Cleaning Up")
     try unpackedVM.unregister()
-    Console.info("Done")
+    Console.success("Done")
 }
 
-/// Prepares a local VM for use by the VM host. Automatically unpacks it first, if needed.
+/// Resets local VM storage by removing all registered Parallels VMs and temporary VM clones.
 ///
-@discardableResult
-public func importVM(name: String) async throws -> StoppedVM {
-
-    guard let sourceVM = try LocalVMRepository().lookupVM(withName: name) else {
-        Console.crash(message: "VM \(name) could not be found", reason: .fileNotFound)
+public func resetVMStorage() throws {
+    let repository = LocalVMRepository(imageDirectory: FileManager.default.temporaryDirectory)
+    try repository.list().forEach { localVM in
+        Console.info("Removing temp VM file for \(localVM.filename)")
+        try repository.delete(image: localVM)
     }
 
-    if sourceVM.state == .packaged {
-        try await unpackVM(name: name)
-        return try await importVM(name: name)
+    try ParallelsVMRepository().lookupVMs().forEach { parallelsVM in
+        Console.info("Removing Registered VM \(parallelsVM.name)")
+        try parallelsVM.unregister()
     }
 
-    let destination = FileManager.default.temporaryFilePath(named: name + ".tmp.pvm")
-
-    try FileManager.default.copyItem(at: sourceVM.path, to: destination)
-    Console.info("Created temporary VM at \(destination)")
-
-    guard let importedVirtualMachine = try Parallels().importVM(at: destination)?.asStoppedVM() else {
-        Console.crash(message: "Unable to import VM: \(destination)", reason: .unableToImportVM)
-    }
-
-    Console.success("Successfully Imported \(importedVirtualMachine.name) with UUID \(importedVirtualMachine.uuid)")
-
-    return importedVirtualMachine
+    Console.success("Cleanup Complete")
 }
 
 /// Deletes local VM image files from the disk
@@ -185,9 +183,63 @@ public func lookupParallelsVMOrExit(
     return parallelsVirtualMachine
 }
 
-public func startVM(_ parallelsVM: StoppedVM) async throws {
+public func startVM(name: String) async throws {
     let startDate = Date()
 
+    guard let sourceVM = try LocalVMRepository().lookupVM(withName: name) else {
+        Console.crash(message: "VM \(name) could not be found", reason: .fileNotFound)
+    }
+
+    try resetVMStorage()
+
+    if sourceVM.state == .packaged {
+        try await unpackVM(name: name)
+        return try await startVM(name: name)
+    }
+
+    let destination = FileManager.default.temporaryFilePath(named: name + ".tmp.pvm")
+
+    try FileManager.default.removeItemIfExists(at: destination)
+    try FileManager.default.copyItem(at: sourceVM.path, to: destination)
+    Console.info("Created temporary VM at \(destination)")
+
+    guard let parallelsVM = try Parallels().importVM(at: destination)?.asStoppedVM() else {
+        Console.crash(message: "Unable to import VM: \(destination)", reason: .unableToImportVM)
+    }
+
+    Console.success("Successfully Imported \(parallelsVM.name) with UUID \(parallelsVM.uuid)")
+
+    Console.info("Applying VM Settings")
+
+    // Always leave 4GB available to the VM host – the VM can have the rest
+    let vmAvailableMemory = ProcessInfo().physicalMemory - (4096 * 1024 * 1024)
+    let cpuCoreCount = ProcessInfo().physicalProcessorCount
+
+    Console.printTable(data: [
+        ["Total System Memory", Format.memoryBytes(ProcessInfo().physicalMemory)],
+        ["VM System Memory", Format.memoryBytes(vmAvailableMemory)],
+        ["VM CPU Cores", "\(cpuCoreCount)"],
+        ["Hypervisor Type", "apple"],
+        ["Networking Type", "bridged"]
+    ])
+
+    try [
+        .memorySize(Int(vmAvailableMemory / 1024 / 1024)),
+        .cpuCount(ProcessInfo().physicalProcessorCount),
+        .hypervisorType(.apple),
+        .networkType(.bridged),
+        .isolateVM(.on),
+        .sharedCamera(.off)
+    ].forEach { try parallelsVM.set($0) }
+
+    // These are optional, and it's possible they've already been removed, so they may fail
+    do {
+        try parallelsVM.set(.withoutSoundDevice())
+        try parallelsVM.set(.withoutCDROMDevice())
+    } catch {
+        Console.warn("Unable to remove device: \(error.localizedDescription)")
+    }
+
     try parallelsVM.start()
 
     let _: Void = try await withCheckedThrowingContinuation { continuation in