Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Group the menu bar by what each item acts on

Lakr4be9972aac34
diff --git a/Research/vphoned_http_api.md b/Research/vphoned_http_api.md
index 69f8b7fe..88418b9e 100644
--- a/Research/vphoned_http_api.md
+++ b/Research/vphoned_http_api.md
@@ -95,7 +95,7 @@ An optional `package_path` selects a guest-uploaded Irisin `.deb` instead.
The path must be `/var/root/Library/Caches/vphoned-irisin-<UUID>.deb`; vphoned
opens it without following symlinks, requires a regular file of at most 64 MiB,
and validates the Debian package name, architecture, app version, executables,
-and launchd plist before installing. The Guest menu's Option alternate opens
+and launchd plist before installing. The Apps menu's Option alternate opens
a file picker, uploads the selected package, and chooses the layout. The default
menu item retains the verified latest-release download.
Rootless uses `/var/jb`. RootHide reuses the sole valid `.jbroot-<16 hex>` under
@@ -165,9 +165,9 @@ are both removed. The daemon rejects a changed path and symlinked child
directories. It unloads each bootstrap's launch daemons, unregisters its apps,
deletes both rootless and RootHide roots, marks the completion record uninstalled,
then schedules a full guest reboot. `"reboot":false` skips the reboot; holding
-Option on the Guest menu's uninstall item selects this mode. If cleanup fails, the
+Option on the Apps menu's uninstall item selects this mode. If cleanup fails, the
installed record remains so the operation can be retried. Irisin's mobile
-Documents data outside the bootstrap is retained. Guest > Uninstall Bootstrap…
+Documents data outside the bootstrap is retained. Apps > Uninstall Bootstrap…
shows every path in a destructive confirmation alert before sending the request.
## HTTP and WebSocket contract
diff --git a/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings b/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings
index bdd97fa1..cb319899 100644
--- a/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings
+++ b/VPhoneExecutable/VPhoneVirtualization/Resources/Localizable.xcstrings
@@ -9215,6 +9215,40 @@
}
}
},
+ "Features" : {
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Features"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "機能"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "기능"
+ }
+ },
+ "vi" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Tính năng"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "功能"
+ }
+ }
+ }
+ },
"File Browser" : {
"localizations" : {
"en" : {
@@ -9735,6 +9769,40 @@
}
}
},
+ "Guest Agent" : {
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Guest Agent"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "ゲストエージェント"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "게스트 에이전트"
+ }
+ },
+ "vi" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Tác nhân máy khách"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "客体代理"
+ }
+ }
+ }
+ },
"Guest Agent Hash" : {
"localizations" : {
"en" : {
@@ -9769,6 +9837,40 @@
}
}
},
+ "Guest Clipboard" : {
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Guest Clipboard"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "ゲストのクリップボード"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "게스트 클립보드"
+ }
+ },
+ "vi" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bảng nhớ tạm máy khách"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "客户机剪贴板"
+ }
+ }
+ }
+ },
"Guest Not Connected" : {
"localizations" : {
"ja" : {
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/GuestTools/VPhoneGuestToolsWindowController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/GuestTools/VPhoneGuestToolsWindowController.swift
index e1f2d912..3c3891dc 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/GuestTools/VPhoneGuestToolsWindowController.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/GuestTools/VPhoneGuestToolsWindowController.swift
@@ -3,7 +3,7 @@ import SwiftUI
// MARK: - Entry Points
-/// The Guest menu items that open a guest tool window.
+/// The Data menu items that open a guest tool window.
enum VPhoneGuestToolAction {
case getClipboard
case setClipboard
@@ -14,7 +14,7 @@ enum VPhoneGuestToolAction {
// MARK: - Window Controller
/// Owns the Clipboard and Preferences windows. They are separate windows
-/// with their own models; this type only routes the Guest menu to them.
+/// with their own models; this type only routes the Data menu to them.
@MainActor
final class VPhoneGuestToolsWindowController {
let clipboardModel: VPhoneGuestClipboardModel
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swift
index 2f4a7c4d..57d373f5 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuApps.swift
@@ -39,6 +39,9 @@ extension VPhoneMenuController {
installPackageItem = install
menu.addItem(install)
+ menu.addItem(NSMenuItem.separator())
+ addBootstrapItems(to: menu)
+
item.submenu = menu
return item
}
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBootstrap.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBootstrap.swift
index b1dd041c..af44d81b 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBootstrap.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuBootstrap.swift
@@ -3,9 +3,50 @@ import UniformTypeIdentifiers
// MARK: - Bootstrap Installation and Removal
-/// Installs the Irisin bootstrap in the guest from the Guest menu and shows
+/// Installs the Irisin bootstrap in the guest from the Apps menu and shows
/// vphoned's progress while it downloads, extracts and registers it.
extension VPhoneMenuController {
+ /// Install and Uninstall, each with an Option alternate.
+ func addBootstrapItems(to menu: NSMenu) {
+ let install = makeItem(
+ "Install Bootstrap…",
+ action: #selector(installBootstrap),
+ symbol: "arrow.down.circle",
+ )
+ install.isEnabled = false
+ installBootstrapItem = install
+ menu.addItem(install)
+ let installFromFile = makeItem(
+ "Install Bootstrap from File…",
+ action: #selector(installBootstrapFromFile),
+ modifiers: [.option],
+ symbol: "doc",
+ )
+ installFromFile.isAlternate = true
+ installFromFile.isEnabled = false
+ installBootstrapFromFileItem = installFromFile
+ menu.addItem(installFromFile)
+
+ let uninstall = makeItem(
+ "Uninstall Bootstrap…",
+ action: #selector(uninstallBootstrap),
+ symbol: "trash",
+ )
+ uninstall.isEnabled = false
+ uninstallBootstrapItem = uninstall
+ menu.addItem(uninstall)
+ let uninstallNoRestart = makeItem(
+ "Uninstall Bootstrap Without Restarting…",
+ action: #selector(uninstallBootstrapWithoutRestart),
+ modifiers: [.option],
+ symbol: "trash",
+ )
+ uninstallNoRestart.isAlternate = true
+ uninstallNoRestart.isEnabled = false
+ uninstallBootstrapNoRestartItem = uninstallNoRestart
+ menu.addItem(uninstallNoRestart)
+ }
+
func updateBootstrapAvailability(available: Bool) {
let enabled = available && !isInstallingBootstrap && !isUninstallingBootstrap
installBootstrapItem?.isEnabled = enabled
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
index 2b2c935f..40432c3e 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuController.swift
@@ -113,10 +113,12 @@ class VPhoneMenuController {
editMenuItem.submenu = editMenu
mainMenu.addItem(editMenuItem)
- // Device hardware, then the guest data windows, then inspection.
+ // The phone, its simulated sensors, the guest's data and apps, then
+ // inspection and capture.
mainMenu.addItem(buildDeviceMenu())
+ mainMenu.addItem(buildFeaturesMenu())
+ mainMenu.addItem(buildDataMenu())
mainMenu.addItem(buildAppsMenu())
- mainMenu.addItem(buildGuestMenu())
mainMenu.addItem(buildDiagnosticsMenu())
mainMenu.addItem(buildRecordMenu())
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuData.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuData.swift
index df50aa01..b8c6c2b9 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuData.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuData.swift
@@ -1,13 +1,13 @@
import AppKit
-// MARK: - Guest Menu
+// MARK: - Data Menu
-/// Guest data the Mac reads and writes: files, Keychain, clipboard and
-/// preference domains.
+/// Guest data the Mac reads and writes: files, Keychain, preference domains
+/// and the clipboard.
extension VPhoneMenuController {
- func buildGuestMenu() -> NSMenuItem {
- let item = NSMenuItem(title: "Guest", action: nil, keyEquivalent: "")
- let menu = NSMenu(title: "Guest")
+ func buildDataMenu() -> NSMenuItem {
+ let item = NSMenuItem(title: "Data", action: nil, keyEquivalent: "")
+ let menu = NSMenu(title: "Data")
menu.autoenablesItems = false
let fileBrowser = makeItem(
@@ -34,48 +34,26 @@ extension VPhoneMenuController {
menu.addItem(NSMenuItem.separator())
- let installBootstrap = makeItem(
- "Install Bootstrap…",
- action: #selector(installBootstrap),
- symbol: "arrow.down.circle",
- )
- installBootstrap.isEnabled = false
- installBootstrapItem = installBootstrap
- menu.addItem(installBootstrap)
- let installFromFile = makeItem(
- "Install Bootstrap from File…",
- action: #selector(installBootstrapFromFile),
- modifiers: [.option],
- symbol: "doc",
- )
- installFromFile.isAlternate = true
- installFromFile.isEnabled = false
- installBootstrapFromFileItem = installFromFile
- menu.addItem(installFromFile)
-
- let uninstallBootstrap = makeItem(
- "Uninstall Bootstrap…",
- action: #selector(uninstallBootstrap),
- symbol: "trash",
- )
- uninstallBootstrap.isEnabled = false
- uninstallBootstrapItem = uninstallBootstrap
- menu.addItem(uninstallBootstrap)
- let uninstallNoRestart = makeItem(
- "Uninstall Bootstrap Without Restarting…",
- action: #selector(uninstallBootstrapWithoutRestart),
- modifiers: [.option],
- symbol: "trash",
+ let settingsGet = makeItem(
+ "Preferences",
+ action: #selector(readSetting),
+ keyEquivalent: "p",
+ modifiers: [.command, .shift],
+ symbol: "gearshape",
)
- uninstallNoRestart.isAlternate = true
- uninstallNoRestart.isEnabled = false
- uninstallBootstrapNoRestartItem = uninstallNoRestart
- menu.addItem(uninstallNoRestart)
+ settingsGet.isEnabled = false
+ settingsGetItem = settingsGet
+ menu.addItem(settingsGet)
+
+ let settingsSet = makeItem("Write Preference…", action: #selector(writeSetting), symbol: "pencil")
+ settingsSet.isEnabled = false
+ settingsSetItem = settingsSet
+ menu.addItem(settingsSet)
menu.addItem(NSMenuItem.separator())
let clipGet = makeItem(
- "Clipboard",
+ "Guest Clipboard",
action: #selector(getClipboard),
keyEquivalent: "c",
modifiers: [.command, .shift],
@@ -94,23 +72,11 @@ extension VPhoneMenuController {
clipboardSetItem = clipSet
menu.addItem(clipSet)
- menu.addItem(NSMenuItem.separator())
-
- let settingsGet = makeItem(
- "Preferences",
- action: #selector(readSetting),
- keyEquivalent: "p",
- modifiers: [.command, .shift],
- symbol: "gearshape",
- )
- settingsGet.isEnabled = false
- settingsGetItem = settingsGet
- menu.addItem(settingsGet)
-
- let settingsSet = makeItem("Write Preference…", action: #selector(writeSetting), symbol: "pencil")
- settingsSet.isEnabled = false
- settingsSetItem = settingsSet
- menu.addItem(settingsSet)
+ menu.addItem(makeItem(
+ "Type ASCII from Mac Clipboard",
+ action: #selector(typeFromClipboard),
+ symbol: "keyboard",
+ ))
item.submenu = menu
return item
@@ -152,6 +118,10 @@ extension VPhoneMenuController {
guestToolsWindowController.show(.setClipboard)
}
+ @objc func typeFromClipboard() {
+ keySender.typeFromClipboard()
+ }
+
@objc func readSetting() {
guestToolsWindowController.show(.readSetting)
}
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swift
index 710b097a..35535b2a 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDevice.swift
@@ -3,13 +3,15 @@ import LocalAuthentication
// MARK: - Device Menu
-/// Hardware the guest thinks it has: buttons, keyboard, sensors and the
-/// host-side overrides that feed them.
+/// The phone's buttons and input, and restarting it. Sensor overrides live
+/// in the Features menu.
extension VPhoneMenuController {
func buildDeviceMenu() -> NSMenuItem {
let item = NSMenuItem(title: "Device", action: nil, keyEquivalent: "")
let menu = NSMenu(title: "Device")
menu.autoenablesItems = false
+ menu.addItem(makePanelItem(.controls, "Controls", keyEquivalent: "k", symbol: "slider.horizontal.3"))
+ menu.addItem(NSMenuItem.separator())
menu.addItem(makeItem(
"Home Screen",
action: #selector(sendHome),
@@ -21,24 +23,7 @@ extension VPhoneMenuController {
menu.addItem(makeItem("Volume Up", action: #selector(sendVolumeUp), symbol: "speaker.plus"))
menu.addItem(makeItem("Volume Down", action: #selector(sendVolumeDown), symbol: "speaker.minus"))
menu.addItem(NSMenuItem.separator())
- let restart = makeItem("Restart Guest…", action: #selector(restartGuest), symbol: "arrow.clockwise")
- restart.isEnabled = false
- restartGuestItem = restart
- menu.addItem(restart)
- menu.addItem(NSMenuItem.separator())
menu.addItem(makeItem("Open Guest Spotlight", action: #selector(sendSpotlight), symbol: "magnifyingglass"))
- menu.addItem(makeItem(
- "Type ASCII from Mac Clipboard",
- action: #selector(typeFromClipboard),
- symbol: "keyboard",
- ))
- menu.addItem(NSMenuItem.separator())
- menu.addItem(makePanelItem(.controls, "Controls", keyEquivalent: "k", symbol: "slider.horizontal.3"))
- menu.addItem(NSMenuItem.separator())
- menu.addItem(buildLocationSubmenu())
- menu.addItem(buildBatterySubmenu())
- menu.addItem(buildCameraSubmenu())
- menu.addItem(NSMenuItem.separator())
let tidItem = makeItem("Touch ID Home Forwarding", action: #selector(toggleTouchIDForwarding))
if hasTouchID {
let tidEnabled = !UserDefaults.standard.bool(forKey: "touchIDForwardingDisabled")
@@ -49,6 +34,11 @@ extension VPhoneMenuController {
}
touchIDMenuItem = tidItem
menu.addItem(tidItem)
+ menu.addItem(NSMenuItem.separator())
+ let restart = makeItem("Restart Guest…", action: #selector(restartGuest), symbol: "arrow.clockwise")
+ restart.isEnabled = false
+ restartGuestItem = restart
+ menu.addItem(restart)
item.submenu = menu
return item
}
@@ -73,10 +63,6 @@ extension VPhoneMenuController {
keySender.sendSpotlight()
}
- @objc func typeFromClipboard() {
- keySender.typeFromClipboard()
- }
-
// MARK: - Restart
func updateRestartAvailability(available: Bool) {
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swift
index f3415ecc..7c7e63a9 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuDiagnostics.swift
@@ -27,15 +27,23 @@ extension VPhoneMenuController {
connectDevModeStatusItem = devModeStatus
menu.addItem(devModeStatus)
+ let agentItem = NSMenuItem(title: "Guest Agent", action: nil, keyEquivalent: "")
+ agentItem.image = menuSymbol("antenna.radiowaves.left.and.right")
+ let agentMenu = NSMenu(title: "Guest Agent")
+ agentMenu.autoenablesItems = false
+
let ping = makeItem("Ping", action: #selector(sendPing), symbol: "dot.radiowaves.left.and.right")
ping.isEnabled = false
connectPingItem = ping
- menu.addItem(ping)
+ agentMenu.addItem(ping)
let guestHash = makeItem("Guest Agent Hash", action: #selector(queryGuestHash), symbol: "number")
guestHash.isEnabled = false
connectGuestHashItem = guestHash
- menu.addItem(guestHash)
+ agentMenu.addItem(guestHash)
+
+ agentItem.submenu = agentMenu
+ menu.addItem(agentItem)
item.submenu = menu
return item
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuFeatures.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuFeatures.swift
new file mode 100644
index 00000000..800028c1
--- /dev/null
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Menu/VPhoneMenuFeatures.swift
@@ -0,0 +1,17 @@
+import AppKit
+
+// MARK: - Features Menu
+
+/// Sensors the host simulates for the guest: location, battery and camera.
+extension VPhoneMenuController {
+ func buildFeaturesMenu() -> NSMenuItem {
+ let item = NSMenuItem(title: "Features", action: nil, keyEquivalent: "")
+ let menu = NSMenu(title: "Features")
+ menu.autoenablesItems = false
+ menu.addItem(buildLocationSubmenu())
+ menu.addItem(buildBatterySubmenu())
+ menu.addItem(buildCameraSubmenu())
+ item.submenu = menu
+ return item
+ }
+}
diff --git a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Panels/VPhoneGuestPanelsWindowController.swift b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Panels/VPhoneGuestPanelsWindowController.swift
index 171eb218..ca96c4c6 100644
--- a/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Panels/VPhoneGuestPanelsWindowController.swift
+++ b/VPhoneExecutable/VPhoneVirtualization/UI/UserInterface/Panels/VPhoneGuestPanelsWindowController.swift
@@ -3,7 +3,7 @@ import SwiftUI
// MARK: - Panels
-/// The guest inspection windows, in the order the Diagnostics and Guest menus
+/// The guest inspection windows, in the order the Diagnostics and Device menus
/// list them.
enum VPhoneGuestPanel: CaseIterable {
case deviceInfo