Run a virtual iPhone on an Apple Silicon Mac.
Swift
Say when a CFW install did not finish, and give Core Bundle installs their own sheet
Lakrf3cac9db1725
diff --git a/VPhoneExecutable/VPhoneCommand/FirmwarePatcherTests/DyldSharedCache/DyldSharedCacheMISTrustAuthPatcherTests.swift b/VPhoneExecutable/VPhoneCommand/FirmwarePatcherTests/DyldSharedCache/DyldSharedCacheMISTrustAuthPatcherTests.swiftindex 00fbb24c..1467383b 100644--- a/VPhoneExecutable/VPhoneCommand/FirmwarePatcherTests/DyldSharedCache/DyldSharedCacheMISTrustAuthPatcherTests.swift+++ b/VPhoneExecutable/VPhoneCommand/FirmwarePatcherTests/DyldSharedCache/DyldSharedCacheMISTrustAuthPatcherTests.swift@@ -49,9 +49,17 @@ private enum MISFixture {static let functionOffset = 0x2000static let literalOffset = 0x3000- static var machHeaderVMA: UInt64 { base + UInt64(machHeaderOffset) }- static var functionVMA: UInt64 { base + UInt64(functionOffset) }- static var literalVMA: UInt64 { base + UInt64(literalOffset) }+ static var machHeaderVMA: UInt64 {+ base + UInt64(machHeaderOffset)+ }++ static var functionVMA: UInt64 {+ base + UInt64(functionOffset)+ }++ static var literalVMA: UInt64 {+ base + UInt64(literalOffset)+ }static let chunkName = "dyld_shared_cache_arm64e"@@ -168,7 +176,9 @@ private enum MISFixture {// accepts it.var name = Data(installName.utf8)name.append(0)- while name.count % 8 != 0 { name.append(0) }+ while name.count % 8 != 0 {+ name.append(0)+ }let commandSize = 24 + name.countput32(0xFEED_FACF, at: machHeaderOffset)put32(0x0100_000C, at: machHeaderOffset + 4) // CPU_TYPE_ARM64@@ -485,7 +495,6 @@ struct DyldSharedCacheMISTrustAuthIdempotenceTests {// MARK: - The shape detector on its own-@Suitestruct DyldSharedCacheMISTrustAuthShapeDetectorTests {private func decode(_ words: [Data]) -> [ARM64Instruction] {ARM64Disassembler().disassemble(words.reduce(Data(), +), at: MISFixture.functionVMA)diff --git a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneCustomFirmwareInstaller.swift b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneCustomFirmwareInstaller.swiftindex 7273916d..cc6c0ee5 100644--- a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneCustomFirmwareInstaller.swift+++ b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneCustomFirmwareInstaller.swift@@ -125,6 +125,9 @@ struct VPhoneCustomFirmwareInstaller {throw ValidationError("The VM disk image changed during the install. Try again.")}image = try URL(fileURLWithPath: bundleDirectory.path).appendingPathComponent("Disk.img")+ // From here a failure leaves a half-written guest, so it must not+ // keep reading as installed. `cfw install` records it again on success.+ clearRecordedInstall(invokingUser: invokingUser)}let attached = try tool(@@ -244,6 +247,25 @@ struct VPhoneCustomFirmwareInstaller {print("[+] CFW system install complete; vphoned is installed, no package bootstrap was staged")}+ /// Host bookkeeping in the caller's folder, written with the caller's+ /// credentials as `cfw install` records the variant, never as root.+ private func clearRecordedInstall(invokingUser: VPhoneInvokingUser?) {+ let bundle = bundle+ let clear: () throws -> Void = {+ guard let vm = try? VPhoneBundle.load(at: bundle) else { return }+ try VPhoneRestoreInfo.clearVariant(inBundle: vm)+ }+ do {+ if let invokingUser {+ try invokingUser.withUserCredentials(clear)+ } else {+ try clear()+ }+ } catch {+ fputs("warning: could not mark the install as in progress: \(error)\n", stderr)+ }+ }+// MARK: - Host inputs/// Resolve the bundle once, then hold it by descriptor. Every laterdiff --git a/VPhoneKit/VPhoneCoreKit/Bundle/VPhoneBundleReport.swift b/VPhoneKit/VPhoneCoreKit/Bundle/VPhoneBundleReport.swiftindex c0890c35..da606e94 100644--- a/VPhoneKit/VPhoneCoreKit/Bundle/VPhoneBundleReport.swift+++ b/VPhoneKit/VPhoneCoreKit/Bundle/VPhoneBundleReport.swift@@ -7,6 +7,8 @@ public struct VPhoneBundleReport: Codable, Equatable, Sendable {public let diskSizeBytes: Int64public let network: VPhoneVirtualMachineManifest.NetworkConfigpublic let restoreInfo: VPhoneRestoreInfo?+ /// `false` when the last `cfw install` did not finish; `nil` when unknown.+ public let customFirmwareInstalled: Bool?public let udid: String?public init(bundle: VPhoneBundle) {@@ -16,6 +18,7 @@ public struct VPhoneBundleReport: Codable, Equatable, Sendable {diskSizeBytes = bundle.diskSizeBytesnetwork = bundle.manifest.networkConfigrestoreInfo = VPhoneRestoreInfo.load(fromBundle: bundle)+ customFirmwareInstalled = VPhoneRestoreInfo.customFirmwareInstalled(inBundle: bundle)udid = VPhoneRestoreOperations.resolveUDID(bundle: bundle)}}diff --git a/VPhoneKit/VPhoneCoreKit/Restore/VPhoneRestoreInfo.swift b/VPhoneKit/VPhoneCoreKit/Restore/VPhoneRestoreInfo.swiftindex 92bf255a..92b654c0 100644--- a/VPhoneKit/VPhoneCoreKit/Restore/VPhoneRestoreInfo.swift+++ b/VPhoneKit/VPhoneCoreKit/Restore/VPhoneRestoreInfo.swift@@ -98,6 +98,29 @@ public struct VPhoneRestoreInfo: Codable, Equatable, Sendable {return merged}+ /// Whether `cfw install` finished on this bundle. `restore` writes+ /// restore-info.json without a variant and only a completed install records+ /// one, so a snapshot with no variant is a guest that cannot boot yet. `nil`+ /// when there is no snapshot to tell: a bundle restored before it existed.+ public static func customFirmwareInstalled(inBundle bundle: VPhoneBundle) -> Bool? {+ guard let directory = readableDirectory(of: bundle),+ let data = try? directory.readData(fileName),+ let info = try? JSONDecoder().decode(VPhoneRestoreInfo.self, from: data)+ else { return nil }+ return info.variant != nil+ }++ /// Drop the recorded variant before an install that writes Disk.img in+ /// place, so an install that stops halfway is not reported as complete.+ public static func clearVariant(inBundle bundle: VPhoneBundle) throws {+ guard let directory = readableDirectory(of: bundle),+ let data = try? directory.readData(fileName),+ let info = try? JSONDecoder().decode(VPhoneRestoreInfo.self, from: data),+ info.variant != nil+ else { return }+ try VPhoneRestoreInfo(ios: info.ios, cloudOS: info.cloudOS).write(toBundle: bundle)+ }+/// Remove the `iPhone*_Restore/` tree from the bundle; returns its name, or/// nil if absent. Record versions (`derive`) first — it reads this directory./// Only a real folder is removed, without following any link inside it:diff --git a/VPhoneKit/VPhoneCoreKit/VirtualMachine/VPhoneBootCommand.swift b/VPhoneKit/VPhoneCoreKit/VirtualMachine/VPhoneBootCommand.swiftindex 7a7eb1b2..986c4eae 100644--- a/VPhoneKit/VPhoneCoreKit/VirtualMachine/VPhoneBootCommand.swift+++ b/VPhoneKit/VPhoneCoreKit/VirtualMachine/VPhoneBootCommand.swift@@ -114,6 +114,13 @@ public struct VPhoneBootCommand: ParsableCommand {"This VM was created as '\(existingVariant)', which this build does not support. Create a new VM and try again.",)}+ // A restored guest without CFW panics at pid 1 and shows only a black+ // screen, so say so before booting it.+ if !dfu, VPhoneRestoreInfo.customFirmwareInstalled(inBundle: bundle) == false {+ throw ValidationError(+ "CFW installation on this VM did not complete, so it cannot boot. Stop the VM, run `sudo vphone-cli cfw install \(bundle.name)` again, then launch.",+ )+ }if dfu, let packageURL = installPackageURL {throw ValidationError(diff --git a/VPhoneKit/VPhoneCoreKitTests/Restore/RestoreInfoTests.swift b/VPhoneKit/VPhoneCoreKitTests/Restore/RestoreInfoTests.swiftindex c189caf9..fb86c4f4 100644--- a/VPhoneKit/VPhoneCoreKitTests/Restore/RestoreInfoTests.swift+++ b/VPhoneKit/VPhoneCoreKitTests/Restore/RestoreInfoTests.swift@@ -161,11 +161,53 @@ struct RestoreInfoTests {_ = try VPhoneBootCommand.parseAsRoot(["--config", b.configURL.path])Issue.record("Boot accepted an explicitly unsupported VM variant")} catch {- #expect(String(describing: error).contains("Only JB VMs are supported"))+ #expect(String(describing: error).contains("which this build does not support"))}_ = try VPhoneBootCommand.parseAsRoot(["--config", b.configURL.path, "--dfu"])}+ @Test func `a restore without a recorded variant reads as an unfinished CFW install`() throws {+ let b = try makeBundle()+ defer { try? FileManager.default.removeItem(at: b.url) }+ // No snapshot: a bundle from before restore-info.json, not known either way.+ #expect(VPhoneRestoreInfo.customFirmwareInstalled(inBundle: b) == nil)++ try VPhoneRestoreInfo(+ ios: .init(version: "27.0", build: "24A435"),+ cloudOS: .init(version: "26.4", build: "23E5207q"),+ ).write(toBundle: b)+ #expect(VPhoneRestoreInfo.customFirmwareInstalled(inBundle: b) == false)+ #expect(VPhoneBundleReport(bundle: b).customFirmwareInstalled == false)++ try VPhoneRestoreInfo.recordVariant("jb", toBundle: b)+ #expect(VPhoneRestoreInfo.customFirmwareInstalled(inBundle: b) == true)++ try VPhoneRestoreInfo.clearVariant(inBundle: b)+ #expect(VPhoneRestoreInfo.customFirmwareInstalled(inBundle: b) == false)+ #expect(VPhoneRestoreInfo.load(fromBundle: b)?.ios.build == "24A435")+ }++ @Test func `normal boot refuses an unfinished CFW install but DFU still parses`() throws {+ let b = try makeBundle()+ defer { try? FileManager.default.removeItem(at: b.url) }+ try b.manifest.write(to: b.configURL)+ try VPhoneRestoreInfo(+ ios: .init(version: "27.0", build: "24A435"),+ cloudOS: .init(version: "26.4", build: "23E5207q"),+ ).write(toBundle: b)++ do {+ _ = try VPhoneBootCommand.parseAsRoot(["--config", b.configURL.path])+ Issue.record("Boot accepted a VM whose CFW install did not finish")+ } catch {+ #expect(String(describing: error).contains("cfw install"))+ }+ _ = try VPhoneBootCommand.parseAsRoot(["--config", b.configURL.path, "--dfu"])++ try VPhoneRestoreInfo.recordVariant("jb", toBundle: b)+ _ = try VPhoneBootCommand.parseAsRoot(["--config", b.configURL.path])+ }+@Test func `bundle report carries UDID`() throws {let b = try makeBundle()defer { try? FileManager.default.removeItem(at: b.url) }diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadModel.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadModel.swiftindex 19eef205..e7f824c0 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadModel.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadModel.swift@@ -11,6 +11,7 @@ final class VPhoneLaunchpadModel {enum Panel: String, Identifiable {case hostSetupcase coreBundle+ case bundleInstallvar id: Self {self@@ -20,6 +21,7 @@ final class VPhoneLaunchpadModel {switch self {case .hostSetup: String(localized: "Host Setup")case .coreBundle: String(localized: "Core Bundle")+ case .bundleInstall: String(localized: "Core Bundle Install")}}}@@ -112,9 +114,13 @@ final class VPhoneLaunchpadModel {await bundles.checkActive()}await listed- // An unfinished install is picked up in the inspector instead.- if panel == nil, bundles.progress == nil || bundles.progress?.isFinished == true {- panel = !host.requiredPassed ? .hostSetup : !bundles.isReady ? .coreBundle : nil+ // An unfinished install reopens its own sheet instead.+ if panel == nil {+ if bundles.progress == nil || bundles.progress?.isFinished == true {+ panel = !host.requiredPassed ? .hostSetup : !bundles.isReady ? .coreBundle : nil+ } else {+ panel = .bundleInstall+ }}await bundles.fetchReleases()await bundles.fetchArtifacts()@@ -145,8 +151,8 @@ final class VPhoneLaunchpadModel {// MARK: - Bundle install- /// An install runs in the inspector, not in the sheet it started from,- /// so the sheet closes and the inspector opens on its progress.+ /// An install shows its progress in a sheet of its own, which replaces+ /// the Core Bundle sheet it started from.func installBundle(_ release: VPhoneLaunchpadRelease) async {revealInstall()await bundles.install(release)@@ -171,15 +177,12 @@ final class VPhoneLaunchpadModel {}private func revealInstall() {- panel = nil- showsInspector = true- isInstallExpanded = true+ present(.bundleInstall)}// MARK: - Inspectorvar showsInspector = true- var isInstallExpanded = truefunc removeBundle(_ version: String) async {await bundles.remove(version)diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadRootView.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadRootView.swiftindex fd21d8ba..55b9c8e0 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadRootView.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadRootView.swift@@ -24,6 +24,8 @@ struct VPhoneLaunchpadRootView: View {VPhoneLaunchpadHostSetupView()case .coreBundle:VPhoneLaunchpadCoreBundleView()+ case .bundleInstall:+ VPhoneLaunchpadInstallView()}}.environment(model)diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadCoreBundleView.swift b/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadCoreBundleView.swiftindex a096af36..c641e9e9 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadCoreBundleView.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadCoreBundleView.swift@@ -27,8 +27,9 @@ struct VPhoneLaunchpadCoreBundleView: View {Form {if bundles.isInstalling {Section {- Text("An install is in progress. Follow it in the inspector.")- .foregroundStyle(.secondary)+ LabeledContent("An install is in progress.") {+ Button("Show Progress") { model.present(.bundleInstall) }+ }}}if !bundles.installed.isEmpty {diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadInstallSection.swift b/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadInstallView.swiftsimilarity index 53%rename from VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadInstallSection.swiftrename to VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadInstallView.swiftindex 5eb6f9d4..0a3a0f71 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadInstallSection.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/CoreBundle/VPhoneLaunchpadInstallView.swift@@ -1,48 +1,70 @@import SwiftUI-/// The last Core Bundle install, as a section at the top of the inspector.-/// Its header collapses it to one summary row. It stays until dismissed,-/// across relaunches, and offers Retry and Skip when a step fails.-struct VPhoneLaunchpadInstallSection: View {+/// The last Core Bundle install, as a sheet of its own. It opens when an+/// install starts and again on launch if the last one did not finish. Hiding+/// it leaves the install running; Core Bundle offers it again until then.+struct VPhoneLaunchpadInstallView: View {@Environment(VPhoneLaunchpadModel.self) private var model+ @Environment(\.dismiss) private var dismissprivate var bundles: VPhoneLaunchpadCoreBundle {model.bundles}var body: some View {- if let progress = bundles.progress {- Section {- summary(progress)- // Under the summary, so the download moves while collapsed too.- if progress.status(.download) == .running {- ProgressView(value: Double(progress.received), total: Double(max(progress.size, 1)))- .labelsHidden()+ @Bindable var bundles = bundles+ VPhoneLaunchpadSheet(Text("Core Bundle Install")) {+ Form {+ if let progress = bundles.progress {+ Section {+ summary(progress)+ if progress.status(.download) == .running {+ ProgressView(value: Double(progress.received), total: Double(max(progress.size, 1)))+ .labelsHidden()+ }+ }+ Section("Steps") {+ steps(progress)+ }+ if let error = progress.error {+ Section("Error") {+ errorDetail(error)+ }+ }+ } else {+ Text("No install to show.")+ .foregroundStyle(.secondary)+ }+ }+ .formStyle(.grouped)+ } accessory: {+ if let progress = bundles.progress, !bundles.isInstalling {+ if progress.canSkip {+ Button("Skip") { bundles.skipFailedChecks() }+ .help("Use this version without the failed checks.")}- if model.isInstallExpanded {- details(progress)+ if progress.error != nil {+ Button("Retry") {+ Task { await model.retryInstall() }+ }+ .disabled(!model.canInstallBundles && progress.status(.install) != .passed)}- } header: {- header}- }- }-- private var header: some View {- Button {- withAnimation(.snappy(duration: 0.2)) { model.isInstallExpanded.toggle() }- } label: {- HStack(spacing: 4) {- Text("Core Bundle Install")- Spacer()- Image(systemName: "chevron.right")- .rotationEffect(.degrees(model.isInstallExpanded ? 90 : 0))- .foregroundStyle(.secondary)+ } actions: {+ if bundles.isInstalling {+ Button("Hide") { dismiss() }+ .help("The install keeps running. Core Bundle shows it again.")+ .keyboardShortcut(.cancelAction)+ } else {+ Button("Done") {+ bundles.dismissProgress()+ dismiss()+ }+ .keyboardShortcut(.defaultAction)}- .contentShape(Rectangle())}- .buttonStyle(.plain)- .help(model.isInstallExpanded ? "Hide the install steps" : "Show the install steps")+ .frame(width: 480, height: 420)+ .interactiveDismissDisabled(bundles.isInstalling)}// MARK: - Summary@@ -72,8 +94,7 @@ struct VPhoneLaunchpadInstallSection: View {// MARK: - Details- @ViewBuilder- private func details(_ progress: VPhoneLaunchpadCoreBundle.InstallProgress) -> some View {+ private func steps(_ progress: VPhoneLaunchpadCoreBundle.InstallProgress) -> some View {ForEach(progress.plan) { step inHStack(spacing: 8) {VPhoneLaunchpadStatusIcon(status: progress.status(step))@@ -89,34 +110,19 @@ struct VPhoneLaunchpadInstallSection: View {}}}- if let error = progress.error {- VStack(alignment: .leading, spacing: 4) {- Text(error.message)- if let detail = error.detail {- Text(detail)- .font(.callout.monospaced())- .foregroundStyle(.secondary)- .lineLimit(6)- }- }- .textSelection(.enabled)- .frame(maxWidth: .infinity, alignment: .leading)- }- if !bundles.isInstalling {- HStack {- Spacer()- Button("Dismiss") { bundles.dismissProgress() }- if progress.canSkip {- Button("Skip") { bundles.skipFailedChecks() }- .help("Use this version without the failed checks.")- }- if progress.error != nil {- Button("Retry") {- Task { await model.retryInstall() }- }- .disabled(!model.canInstallBundles && progress.status(.install) != .passed)- }+ }++ private func errorDetail(_ error: VPhoneLaunchpadError) -> some View {+ VStack(alignment: .leading, spacing: 4) {+ Text(error.message)+ if let detail = error.detail {+ Text(detail)+ .font(.callout.monospaced())+ .foregroundStyle(.secondary)+ .lineLimit(8)}}+ .textSelection(.enabled)+ .frame(maxWidth: .infinity, alignment: .leading)}}diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstrings b/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstringsindex e6aeb685..fa799a5b 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstrings+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstrings@@ -4909,39 +4909,140 @@}}},- "Extended" : {+ "Experimental" : {"comment" : "The built-in patch preset","localizations" : {- "en" : {- "stringUnit" : {- "state" : "translated",- "value" : "Extended"- }- },- "ja" : {- "stringUnit" : {- "state" : "translated",- "value" : "拡張"- }- },- "ko" : {- "stringUnit" : {- "state" : "translated",- "value" : "확장"- }- },- "vi" : {- "stringUnit" : {- "state" : "translated",- "value" : "Mở rộng"- }- },- "zh-Hans" : {- "stringUnit" : {- "state" : "translated",- "value" : "扩展"- }- }+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Experimental" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "実験的" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "실험적" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Thử nghiệm" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "实验性" } }+ }+ },+ "Experimental Custom Firmware" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Experimental Custom Firmware" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "実験的カスタムファームウェア" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "실험적 커스텀 펌웨어" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Firmware tùy chỉnh thử nghiệm" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "实验性自定义固件" } }+ }+ },+ "Standard Custom Firmware" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Standard Custom Firmware" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "標準カスタムファームウェア" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "표준 커스텀 펌웨어" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Firmware tùy chỉnh tiêu chuẩn" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "标准自定义固件" } }+ }+ },+ "Unknown Firmware" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Unknown Firmware" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "不明なファームウェア" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "알 수 없는 펌웨어" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Firmware không xác định" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "未知固件" } }+ }+ },+ "Custom Firmware Not Installed" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Custom Firmware Not Installed" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "カスタムファームウェア未インストール" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "커스텀 펌웨어 미설치" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Chưa cài firmware tùy chỉnh" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "自定义固件未安装" } }+ }+ },+ "Custom firmware installation on this machine did not complete, so it cannot boot. Choose Install Custom Firmware from the machine's menu, then start it again." : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Custom firmware installation on this machine did not complete, so it cannot boot. Choose Install Custom Firmware from the machine's menu, then start it again." } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "このマシンのカスタムファームウェアのインストールが完了していないため、起動できません。マシンのメニューから「カスタムファームウェアをインストール」を選択してから、もう一度起動してください。" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "이 머신의 커스텀 펌웨어 설치가 완료되지 않아 부팅할 수 없습니다. 머신 메뉴에서 '커스텀 펌웨어 설치'를 선택한 다음 다시 시작하십시오." } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Việc cài firmware tùy chỉnh trên máy này chưa hoàn tất nên máy không thể khởi động. Chọn Cài firmware tùy chỉnh trong menu của máy, rồi khởi động lại." } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "这台机器的自定义固件没有安装完成,无法启动。请在机器菜单中选择“安装自定义固件”,然后再启动。" } }+ }+ },+ "Install Custom Firmware" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Install Custom Firmware" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "カスタムファームウェアをインストール" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "커스텀 펌웨어 설치" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Cài firmware tùy chỉnh" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "安装自定义固件" } }+ }+ },+ "Installing custom firmware…" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Installing custom firmware…" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "カスタムファームウェアをインストール中…" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "커스텀 펌웨어 설치 중…" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Đang cài firmware tùy chỉnh…" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "正在安装自定义固件…" } }+ }+ },+ "Choose Show Console Log for the full output." : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Choose Show Console Log for the full output." } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "完全な出力は「コンソールログを表示」で確認できます。" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "전체 출력은 '콘솔 로그 보기'에서 확인하십시오." } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Chọn Hiển thị nhật ký bảng điều khiển để xem toàn bộ đầu ra." } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "选择“显示控制台日志”查看完整输出。" } }+ }+ },+ "An install is in progress." : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "An install is in progress." } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "インストール中です。" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "설치가 진행 중입니다." } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Đang cài đặt." } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "正在安装。" } }+ }+ },+ "Hide" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Hide" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "隠す" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "숨기기" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Ẩn" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "隐藏" } }+ }+ },+ "The install keeps running. Core Bundle shows it again." : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "The install keeps running. Core Bundle shows it again." } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "インストールは続行されます。コアバンドルから再度表示できます。" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "설치는 계속 진행됩니다. 코어 번들에서 다시 볼 수 있습니다." } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Việc cài đặt vẫn tiếp tục. Bundle lõi sẽ hiển thị lại." } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "安装会继续进行,可在核心 Bundle 中再次查看。" } }+ }+ },+ "No install to show." : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "No install to show." } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "表示するインストールはありません。" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "표시할 설치가 없습니다." } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Không có bản cài đặt nào để hiển thị." } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "没有可显示的安装。" } }+ }+ },+ "Steps" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Steps" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "手順" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "단계" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Các bước" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "步骤" } }+ }+ },+ "Error" : {+ "localizations" : {+ "en" : { "stringUnit" : { "state" : "translated", "value" : "Error" } },+ "ja" : { "stringUnit" : { "state" : "translated", "value" : "エラー" } },+ "ko" : { "stringUnit" : { "state" : "translated", "value" : "오류" } },+ "vi" : { "stringUnit" : { "state" : "translated", "value" : "Lỗi" } },+ "zh-Hans" : { "stringUnit" : { "state" : "translated", "value" : "错误" } }}},"Filter patches" : {diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swiftindex 7ed7c312..4aad74f7 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swift@@ -59,12 +59,35 @@ nonisolated struct VPhoneLaunchpadMachine: Decodable, Hashable, Identifiable, Selet diskSizeBytes: Int64let network: Networklet restoreInfo: RestoreInfo?+ /// `false` when the last CFW install did not finish, `nil` when unknown.+ let customFirmwareInstalled: Bool?let udid: String?/// The library `vm list` was run on. Not part of the JSON.var libraryRoot = ""private enum CodingKeys: String, CodingKey {- case name, cpuCount, memoryMB, diskSizeBytes, network, restoreInfo, udid+ case name, cpuCount, memoryMB, diskSizeBytes, network, restoreInfo, customFirmwareInstalled, udid+ }++ /// The inspector's firmware line. A restore whose CFW install never+ /// finished cannot boot, which matters more than which set it was meant for.+ var firmwareName: String? {+ guard let restoreInfo else { return nil }+ if customFirmwareInstalled == false {+ return String(localized: "Custom Firmware Not Installed")+ }+ return restoreInfo.firmwareName+ }++ /// Read from disk at launch time rather than from the last `vm list`, so a+ /// machine that was just installed is not refused on stale data. Mirrors+ /// `vm launch`: restore-info.json with no variant is an unfinished install.+ static func customFirmwareIncomplete(at path: VPhoneLaunchpadMachinePath) -> Bool {+ let file = path.url.appendingPathComponent("restore-info.json")+ guard let data = try? Data(contentsOf: file),+ let info = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any]+ else { return false }+ return info["variant"] == nil}var path: VPhoneLaunchpadMachinePath {diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineInspector.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineInspector.swiftindex b7bfa582..e55a7ac7 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineInspector.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineInspector.swift@@ -52,8 +52,6 @@ struct VPhoneLaunchpadMachineInspector: View {var body: some View {Form {- VPhoneLaunchpadInstallSection()-Section {if let creation = library.creations[machine.path] {creationSummary(creation)@@ -67,8 +65,8 @@ struct VPhoneLaunchpadMachineInspector: View {if let started = library.startedAt[machine.path] {LabeledContent("Started", value: started.formatted(date: .omitted, time: .shortened))}- if let restoreInfo = machine.restoreInfo {- LabeledContent("Firmware", value: restoreInfo.firmwareName)+ if let firmwareName = machine.firmwareName {+ LabeledContent("Firmware", value: firmwareName)}} header: {Text(machine.name)diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineLibrary.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineLibrary.swiftindex 612e7e91..a693ba24 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineLibrary.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachineLibrary.swift@@ -274,12 +274,35 @@ final class VPhoneLaunchpadMachineLibrary {try? handle.write(contentsOf: Data("\n\(line)\n".utf8))}+ /// One line of helper output, from the XPC queue. Creates the log if the+ /// machine has never been started from Launchpad.+ private nonisolated static func append(_ line: String, to log: URL) {+ if !FileManager.default.fileExists(atPath: log.path) {+ try? FileManager.default.createDirectory(at: log.deletingLastPathComponent(), withIntermediateDirectories: true)+ FileManager.default.createFile(atPath: log.path, contents: nil)+ }+ guard let handle = try? FileHandle(forWritingTo: log) else {+ return+ }+ defer { try? handle.close() }+ _ = try? handle.seekToEnd()+ try? handle.write(contentsOf: Data("\(line)\n".utf8))+ }+// MARK: - Start and stopfunc start(_ machine: Path, headless: Bool = false) {guard let commandLine = bundles.commandLine() else {return}+ // `vm launch` refuses these too, but only into the console log.+ guard !VPhoneLaunchpadMachine.customFirmwareIncomplete(at: machine) else {+ actionError = VPhoneLaunchpadError(+ String(localized: "Unable to Start \(machine.name)"),+ detail: String(localized: "Custom firmware installation on this machine did not complete, so it cannot boot. Choose Install Custom Firmware from the machine's menu, then start it again."),+ )+ return+ }var arguments = ["vm", "launch", machine.name] + machine.libraryArgumentsif headless {arguments.append("--headless")@@ -307,6 +330,40 @@ final class VPhoneLaunchpadMachineLibrary {}}+ /// Runs `cfw install` again through the helper, for a machine whose last+ /// install did not finish. Output goes to the machine's console log.+ func installCustomFirmware(_ machine: Path) async {+ guard let version = bundles.activeVersion else {+ actionError = VPhoneLaunchpadError(String(localized: "No Core Bundle version is in use. Choose a version in Core Bundle."))+ return+ }+ activities[machine] = String(localized: "Installing custom firmware…")+ defer { activities[machine] = nil }+ appendConsoleLog(machine, "$ vphone-cli cfw install \(machine.name)")+ let log = Self.consoleLog(machine)+ do {+ let status = try await helper.installCustomFirmware(+ bundleVersion: version,+ machineName: machine.name,+ libraryRoot: machine.libraryRoot,+ keepArtifacts: true,+ onLine: { line in Self.append(line, to: log) },+ )+ if status != 0 {+ actionError = VPhoneLaunchpadError(+ String(localized: "Unable to install custom firmware. Check the log for details."),+ detail: String(localized: "Choose Show Console Log for the full output."),+ )+ }+ } catch {+ if !(error is CancellationError) {+ actionError = error as? VPhoneLaunchpadError+ ?? VPhoneLaunchpadError(String(localized: "Unable to install custom firmware. Check the log for details."), detail: error.localizedDescription)+ }+ }+ await refresh()+ }+func stop(_ machine: Path) async {await perform(String(localized: "Stopping…"), on: machine, ["vm", "stop", machine.name] + machine.libraryArguments)launched[machine]?.interrupt()diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swiftindex daaa5d96..8e068a8f 100644--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swift+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachinesView.swift@@ -74,11 +74,6 @@ struct VPhoneLaunchpadMachinesView: View {)} else if library.selection.count > 1 {ContentUnavailableView("\(library.selection.count) Machines Selected", systemImage: "iphone")- } else if model.bundles.progress != nil {- Form {- VPhoneLaunchpadInstallSection()- }- .formStyle(.grouped)} else {ContentUnavailableView("No Selection", systemImage: "iphone")}@@ -289,6 +284,12 @@ struct VPhoneLaunchpadMachinesView: View {.disabled(!isStopped)Button("Export…") { sheet = .export([machine.path]) }.disabled(!isStopped)+ Button("Install Custom Firmware") {+ Task { await library.installCustomFirmware(machine.path) }+ }+ // Only for an unfinished install: that is when the restore tree it+ // reads is still there. A finished one removes it.+ .disabled(!isStopped || machine.customFirmwareInstalled != false)Divider()Button("Show in Finder") {NSWorkspace.shared.activateFileViewerSelecting([machine.path.url])