Merge branch 'feature/altkit' into master

osy · osy · commit 32205149606f · 2021-11-06T11:45:27.000-07:00
diff --git a/Platform/Shared/ContentView.swift b/Platform/Shared/ContentView.swift
@@ -115,7 +115,11 @@ struct ContentView: View {
             #if !WITH_QEMU_TCI
             if !Main.jitAvailable {
                 data.busyWork {
+                    #if canImport(AltKit)
+                    try data.startAltJIT()
+                    #else
                     throw NSLocalizedString("Your version of iOS does not support running VMs while unmodified. You must either run UTM while jailbroken or with a remote debugger attached.", comment: "ContentView")
+                    #endif
                 }
             }
             #endif
diff --git a/Platform/UTMData.swift b/Platform/UTMData.swift
@@ -20,6 +20,9 @@ import AppKit
 #else
 import UIKit
 #endif
+#if canImport(AltKit)
+import AltKit
+#endif
 
 @available(iOS 14, macOS 11, *)
 struct AlertMessage: Identifiable {
@@ -69,8 +72,11 @@ class UTMData: ObservableObject {
         fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
     }
     
+    private var busyQueue: DispatchQueue
+    
     init() {
         let defaults = UserDefaults.standard
+        self.busyQueue = DispatchQueue(label: "UTM Busy Queue", qos: .userInitiated)
         self.showSettingsModal = false
         self.showNewVMSheet = false
         self.busy = false
@@ -525,10 +531,10 @@ class UTMData: ObservableObject {
     }
     
     func busyWork(_ work: @escaping () throws -> Void) {
-        DispatchQueue.main.async {
-            self.busy = true
-        }
-        DispatchQueue.global(qos: .userInitiated).async {
+        busyQueue.async {
+            DispatchQueue.main.async {
+                self.busy = true
+            }
             defer {
                 DispatchQueue.main.async {
                     self.busy = false
@@ -602,4 +608,47 @@ class UTMData: ObservableObject {
         tryClickAtPoint(point: point, button: button)
         #endif
     }
+
+    // MARK: - AltKit
+    
+#if canImport(AltKit)
+    func startAltJIT() throws {
+        let event = DispatchSemaphore(value: 0)
+        var connectError: Error?
+        DispatchQueue.main.async {
+            ServerManager.shared.autoconnect { result in
+                switch result
+                {
+                case .failure(let error):
+                    logger.error("Could not auto-connect to server. \(error.localizedDescription)")
+                    connectError = error
+                    event.signal()
+                case .success(let connection):
+                    connection.enableUnsignedCodeExecution { result in
+                        switch result
+                        {
+                        case .failure(let error):
+                            logger.error("Could not enable JIT compilation. \(error.localizedDescription)")
+                            connectError = error
+                        case .success:
+                            logger.debug("Successfully enabled JIT compilation!")
+                        }
+                        
+                        connection.disconnect()
+                        event.signal()
+                    }
+                }
+            }
+            ServerManager.shared.startDiscovering()
+        }
+        defer {
+            ServerManager.shared.stopDiscovering()
+        }
+        if event.wait(timeout: .now() + 10) == .timedOut {
+            throw NSLocalizedString("Cannot find AltServer for JIT enable. You cannot run VMs until JIT is enabled.", comment: "UTMData")
+        } else if let error = connectError {
+            throw NSLocalizedString("AltJIT error: \(error.localizedDescription)", comment: "UTMData")
+        }
+    }
+#endif
 }
diff --git a/Platform/iOS/Info.plist b/Platform/iOS/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ALTDeviceID</key>
+	<string>None</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDocumentTypes</key>
@@ -57,6 +59,12 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_altserver._tcp</string>
+	</array>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>UTM uses the local network to find and communicate with AltServer.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>VM background access requires location services. Location data will never leave the device.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
diff --git a/UTM.xcodeproj/project.pbxproj b/UTM.xcodeproj/project.pbxproj
@@ -46,6 +46,8 @@
 		8401FD71269BEB2B00265F0D /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = CE6B240A25F1F3CE0020D43E /* main.c */; };
 		8401FD72269BEB3000265F0D /* Bootstrap.c in Sources */ = {isa = PBXBuildFile; fileRef = CE0DF17125A80B6300A51894 /* Bootstrap.c */; };
 		8401FD7A269BECE200265F0D /* QEMULauncher.app in Embed Launcher */ = {isa = PBXBuildFile; fileRef = 8401FD62269BE9C500265F0D /* QEMULauncher.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		B329049C270FE136002707AC /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = B329049B270FE136002707AC /* AltKit */; };
+		B3DDF57226E9BBA300CE47F0 /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = B3DDF57126E9BBA300CE47F0 /* AltKit */; };
 		CE020BA324AEDC7C00B44AB6 /* UTMData.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE020BA224AEDC7C00B44AB6 /* UTMData.swift */; };
 		CE020BA424AEDC7C00B44AB6 /* UTMData.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE020BA224AEDC7C00B44AB6 /* UTMData.swift */; };
 		CE020BA724AEDEF000B44AB6 /* Logging in Frameworks */ = {isa = PBXBuildFile; productRef = CE020BA624AEDEF000B44AB6 /* Logging */; };
@@ -2116,6 +2118,7 @@
 				CE2D933724AD46670059923A /* libgstplayback.a in Frameworks */,
 				CE2D933824AD46670059923A /* libgstadder.a in Frameworks */,
 				CE2D933A24AD46670059923A /* libgstaudiorate.a in Frameworks */,
+				B3DDF57226E9BBA300CE47F0 /* AltKit in Frameworks */,
 				CE2D933B24AD46670059923A /* libgstvideofilter.a in Frameworks */,
 				CE2D933C24AD46670059923A /* libgstapp.a in Frameworks */,
 				CE2D933D24AD46670059923A /* libgstgio.a in Frameworks */,
@@ -2130,6 +2133,7 @@
 				CE2D934524AD46670059923A /* gthread-2.0.0.framework in Frameworks */,
 				CE2D934624AD46670059923A /* gstrtp-1.0.0.framework in Frameworks */,
 				CE2D934724AD46670059923A /* gstriff-1.0.0.framework in Frameworks */,
+				B329049C270FE136002707AC /* AltKit in Frameworks */,
 				CEA9058F25FC6A1400801E7C /* usbredirhost.1.framework in Frameworks */,
 				CE2D934924AD46670059923A /* gstreamer-1.0.0.framework in Frameworks */,
 				CE2D934B24AD46670059923A /* json-glib-1.0.0.framework in Frameworks */,
@@ -3193,6 +3197,7 @@
 				CE020BA624AEDEF000B44AB6 /* Logging */,
 				CE93759824BB821F0074066F /* IQKeyboardManagerSwift */,
 				83993291272F68550059355F /* ZIPFoundation */,
+				B329049B270FE136002707AC /* AltKit */,
 			);
 			productName = UTM;
 			productReference = CE2D93BE24AD46670059923A /* UTM.app */;
@@ -3328,6 +3333,7 @@
 				CE020BA524AEDEF000B44AB6 /* XCRemoteSwiftPackageReference "swift-log" */,
 				CE93759724BB821F0074066F /* XCRemoteSwiftPackageReference "IQKeyboardManager" */,
 				8399328E272F4A400059355F /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
+				B329049A270FE136002707AC /* XCRemoteSwiftPackageReference "AltKit" */,
 			);
 			productRefGroup = CE550BCA225947990063E575 /* Products */;
 			projectDirPath = "";
@@ -4914,6 +4920,14 @@
 				minimumVersion = 0.9.9;
 			};
 		};
+		B329049A270FE136002707AC /* XCRemoteSwiftPackageReference "AltKit" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/utmapp/AltKit.git";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
 		CE020BA524AEDEF000B44AB6 /* XCRemoteSwiftPackageReference "swift-log" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/apple/swift-log";
@@ -4943,7 +4957,7 @@
 			repositoryURL = "https://github.com/hackiftekhar/IQKeyboardManager.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 6.5.5;
+				minimumVersion = 6.5.6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -4964,6 +4978,16 @@
 			package = 8399328E272F4A400059355F /* XCRemoteSwiftPackageReference "ZIPFoundation" */;
 			productName = ZIPFoundation;
 		};
+		B329049B270FE136002707AC /* AltKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B329049A270FE136002707AC /* XCRemoteSwiftPackageReference "AltKit" */;
+			productName = AltKit;
+		};
+		B3DDF57126E9BBA300CE47F0 /* AltKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B3DDF57026E9BBA300CE47F0 /* XCRemoteSwiftPackageReference "AltKit" */;
+			productName = AltKit;
+		};
 		CE020BA624AEDEF000B44AB6 /* Logging */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = CE020BA524AEDEF000B44AB6 /* XCRemoteSwiftPackageReference "swift-log" */;
diff --git a/UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,43 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "AltKit",
+        "repositoryURL": "https://github.com/utmapp/AltKit.git",
+        "state": {
+          "branch": "main",
+          "revision": "71ec1d505cbb7cb53dc16c7c98cb94c93953f3ff",
+          "version": null
+        }
+      },
+      {
+        "package": "IQKeyboardManagerSwift",
+        "repositoryURL": "https://github.com/hackiftekhar/IQKeyboardManager.git",
+        "state": {
+          "branch": null,
+          "revision": "4dc6bc7d1c9747bd0c261c8c055903f9fdef91f7",
+          "version": "6.5.6"
+        }
+      },
+      {
+        "package": "swift-log",
+        "repositoryURL": "https://github.com/apple/swift-log",
+        "state": {
+          "branch": null,
+          "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
+          "version": "1.4.2"
+        }
+      },
+      {
+        "package": "ZIPFoundation",
+        "repositoryURL": "https://github.com/weichsel/ZIPFoundation.git",
+        "state": {
+          "branch": null,
+          "revision": "cf10bbff6ac3b873e97b36b9784c79866a051a8e",
+          "version": "0.9.12"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,11 @@ struct ContentView: View {`
`115`	`115`	`#if !WITH_QEMU_TCI`
`116`	`116`	`if !Main.jitAvailable {`
`117`	`117`	`data.busyWork {`
	`118`	`+ #if canImport(AltKit)`
	`119`	`+ try data.startAltJIT()`
	`120`	`+ #else`
`118`	`121`	`throw NSLocalizedString("Your version of iOS does not support running VMs while unmodified. You must either run UTM while jailbroken or with a remote debugger attached.", comment: "ContentView")`
	`122`	`+ #endif`
`119`	`123`	`}`
`120`	`124`	`}`
`121`	`125`	`#endif`