Build: split sandboxed & TrollStore JIT version

Sandboxed version installed using TrollStore will use URL Scheme to enable JIT. tipa build keeps self-JIT but is unsafe to use.
PojavLauncherTeam · Jan 29, 2024 · a722b4a · a722b4a
1 parent 7829917
commit a722b4a
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 20 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -116,19 +116,35 @@ jobs:
           export PATH=/opt/procursus/bin:/opt/homebrew/bin:$PATH
           export RUNNER=1 SLIMMED=1
           gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }}
-          
+          # Additionally build TrollStore (auto JIT) tipa for iOS
+          if [ "${{ matrix.platform_name }}" == "ios" ]; then
+            gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1
+          fi
+
       - name: Upload regular ipa
         uses: actions/upload-artifact@v3
         with:
           name: net.kdt.pojavlauncher-${{ matrix.platform_name }}.ipa
           path: artifacts/net.kdt.pojavlauncher-*-${{ matrix.platform_name }}.ipa
 
+      - name: Upload regular tipa
+        uses: actions/upload-artifact@v3
+        with:
+          name: net.kdt.pojavlauncher-${{ matrix.platform_name }}-trollstore.tipa
+          path: artifacts/net.kdt.pojavlauncher-*-${{ matrix.platform_name }}-trollstore.tipa
+
       - name: Upload slimmed ipa
         uses: actions/upload-artifact@v3
         with:
           name: net.kdt.pojavlauncher.slimmed-${{ matrix.platform_name }}.ipa
           path: artifacts/net.kdt.pojavlauncher.slimmed-*-${{ matrix.platform_name }}.ipa
 
+      - name: Upload slimmed tipa
+        uses: actions/upload-artifact@v3
+        with:
+          name: net.kdt.pojavlauncher.slimmed-${{ matrix.platform_name }}-trollstore.tipa
+          path: artifacts/net.kdt.pojavlauncher.slimmed-*-${{ matrix.platform_name }}-trollstore.tipa
+
       - name: Upload PojavLauncher.dSYM
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -109,13 +109,23 @@ jobs:
           export PATH=/opt/procursus/bin:/opt/homebrew/bin:$PATH
           export RUNNER=1
           gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }}
-          
+          # Additionally build TrollStore (auto JIT) tipa for iOS
+          if [ "${{ matrix.platform_name }}" == "ios" ]; then
+            gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1
+          fi
+
       - name: Upload regular ipa
         uses: actions/upload-artifact@v3
         with:
           name: net.kdt.pojavlauncher-${{ matrix.platform_name }}.ipa
           path: artifacts/net.kdt.pojavlauncher-*-${{ matrix.platform_name }}.ipa
 
+      - name: Upload regular tipa
+        uses: actions/upload-artifact@v3
+        with:
+          name: net.kdt.pojavlauncher-${{ matrix.platform_name }}.tipa
+          path: artifacts/net.kdt.pojavlauncher-*-${{ matrix.platform_name }}-trollstore.tipa
+
       - name: Upload PojavLauncher.dSYM
         uses: actions/upload-artifact@v3
         with:

diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
@@ -64,7 +64,6 @@ public static void updateMCGuiScale() {
         System.load(System.getenv("BUNDLE_PATH") + "/PojavLauncher");
     }
 
-    public static native void refreshAWTBuffer(int[] array);
 
     // public static native void runOnUIThread(UIKitCallback callback);
 

diff --git a/Makefile b/Makefile
@@ -135,11 +135,16 @@ METHOD_CHANGE_PLAT = \
 
 # Function to package the application
 METHOD_PACKAGE = \
+	if [ '$(TROLLSTORE_JIT_ENT)' == '1' ]; then \
+		IPA_SUFFIX="-trollstore.tipa"; \
+	else \
+		IPA_SUFFIX=".ipa"; \
+	fi; \
 	if [ '$(SLIMMED_ONLY)' = '0' ]; then \
-		zip --symlinks -r $(OUTPUTDIR)/net.kdt.pojavlauncher-$(VERSION)-$(PLATFORM_NAME).ipa Payload; \
+		zip --symlinks -r $(OUTPUTDIR)/net.kdt.pojavlauncher-$(VERSION)-$(PLATFORM_NAME)$$IPA_SUFFIX Payload; \
 	fi; \
 	if [ '$(SLIMMED)' = '1' ] || [ '$(SLIMMED_ONLY)' = '1' ]; then \
-		zip --symlinks -r $(OUTPUTDIR)/net.kdt.pojavlauncher.slimmed-$(VERSION)-$(PLATFORM_NAME).ipa Payload --exclude='Payload/PojavLauncher.app/java_runtimes/*'; \
+		zip --symlinks -r $(OUTPUTDIR)/net.kdt.pojavlauncher.slimmed-$(VERSION)-$(PLATFORM_NAME)$$IPA_SUFFIX Payload --exclude='Payload/PojavLauncher.app/java_runtimes/*'; \
 	fi
 
 # Function to download and unpack Java runtimes.
@@ -325,8 +330,11 @@ payload: native java jre assets
 	if [ '$(SLIMMED_ONLY)' != '1' ]; then \
 		cp -R $(OUTPUTDIR)/java_runtimes $(OUTPUTDIR)/Payload/PojavLauncher.app; \
 	fi
-	ldid -S $(OUTPUTDIR)/Payload/PojavLauncher.app; \
-	ldid -S$(SOURCEDIR)/entitlements.xml $(OUTPUTDIR)/Payload/PojavLauncher.app/PojavLauncher; \
+	if [ '$(TROLLSTORE_JIT_ENT)' == '1' ]; then \
+		ldid -S$(SOURCEDIR)/entitlements.trollstore.xml $(OUTPUTDIR)/Payload/PojavLauncher.app; \
+	else \
+		ldid -S$(SOURCEDIR)/entitlements.sideload.xml $(OUTPUTDIR)/Payload/PojavLauncher.app; \
+	fi
 	chmod -R 755 $(OUTPUTDIR)/Payload
 	if [ '$(PLATFORM)' != '2' ]; then \
 		$(call METHOD_MACHO,$(OUTPUTDIR)/Payload/PojavLauncher.app,$(call METHOD_CHANGE_PLAT,$(PLATFORM),$$file)); \
@@ -339,7 +347,7 @@ deploy:
 	cd $(OUTPUTDIR); \
 	if [ '$(IOS)' = '1' ]; then \
 		ldid -S $(WORKINGDIR)/PojavLauncher.app || exit 1; \
-		ldid -S$(SOURCEDIR)/entitlements.xml $(WORKINGDIR)/PojavLauncher.app/PojavLauncher || exit 1; \
+		ldid -S$(SOURCEDIR)/entitlements.trollstore.xml $(WORKINGDIR)/PojavLauncher.app/PojavLauncher || exit 1; \
 		sudo mv $(WORKINGDIR)/*.dylib $(PREFIX)Applications/PojavLauncher.app/Frameworks/ || exit 1; \
 		sudo mv $(WORKINGDIR)/PojavLauncher.app/PojavLauncher $(PREFIX)Applications/PojavLauncher.app/PojavLauncher || exit 1; \
 		sudo mv $(SOURCEDIR)/JavaApp/local_out/*.jar $(PREFIX)Applications/PojavLauncher.app/libs/ || exit 1; \

diff --git a/Natives/JavaGUIViewController.m b/Natives/JavaGUIViewController.m
@@ -298,16 +298,17 @@ - (void)viewDidLoad {
     setenv("POJAV_SKIP_JNI_GLFW", "1", 1);
 
     // Register the display loop
-    CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:surfaceView selector:@selector(refreshBuffer)];
-    if (@available(iOS 15.0, tvOS 15.0, *)) {
-        if(getPrefBool(@"video.max_framerate")) {
-            displayLink.preferredFrameRateRange = CAFrameRateRangeMake(30, 120, 120);
-        } else {
-            displayLink.preferredFrameRateRange = CAFrameRateRangeMake(30, 60, 60);
-        }
-    }
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:surfaceView selector:@selector(refreshBuffer)];
+        if (@available(iOS 15.0, tvOS 15.0, *)) {
+            if(getPrefBool(@"video.max_framerate")) {
+                displayLink.preferredFrameRateRange = CAFrameRateRangeMake(30, 120, 120);
+            } else {
+                displayLink.preferredFrameRateRange = CAFrameRateRangeMake(30, 60, 60);
+            }
+        }
         [displayLink addToRunLoop:NSRunLoop.currentRunLoop forMode:NSRunLoopCommonModes];
+        [NSRunLoop.currentRunLoop run];
     });
 
 

diff --git a/Natives/LauncherMenuViewController.m b/Natives/LauncherMenuViewController.m
@@ -88,7 +88,7 @@ - (void)viewDidLoad {
         UIActivityViewController *activityVC;
         if (realUIIdiom != UIUserInterfaceIdiomTV) {
             activityVC = [[UIActivityViewController alloc]
-                          initWithActivityItems:@[@"latestlog.txt", [NSURL URLWithString:latestlogPath]]
+                          initWithActivityItems:@[[NSURL URLWithString:latestlogPath]]
                           applicationActivities:nil];
         } else {
             dlopen("/System/Library/PrivateFrameworks/SharingUI.framework/SharingUI", RTLD_GLOBAL);

diff --git a/Natives/LauncherNavigationController.m b/Natives/LauncherNavigationController.m
@@ -281,6 +281,10 @@ - (void)invokeAfterJITEnabled:(void(^)(void))handler {
             handler();
         });
         return;
+    } else if (getEntitlementValue(@"local.sandboxed-jit")) {
+        NSURL *jitURL = [NSURL URLWithString:[NSString stringWithFormat:@"apple-magnifier://enable-jit?bundle-id=%@", NSBundle.mainBundle.bundleIdentifier]];
+        [UIApplication.sharedApplication openURL:jitURL options:@{} completionHandler:nil];
+        // Do not return, wait for TrollStore to enable JIT and jump back
     } else if (getPrefBool(@"debug.debug_skip_wait_jit")) {
         NSLog(@"Debug option skipped waiting for JIT. Java might not work.");
         handler();
@@ -302,8 +306,8 @@ - (void)invokeAfterJITEnabled:(void(^)(void))handler {
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         while (!isJITEnabled(false)) {
-            // Perform check for every second
-            sleep(1);
+            // Perform check for every 200ms
+            usleep(1000*200);
         }
         dispatch_async(dispatch_get_main_queue(), ^{
             [alert dismissViewControllerAnimated:YES completion:handler];

diff --git a/Natives/main.m b/Natives/main.m
@@ -108,7 +108,7 @@ void init_logDeviceAndVer(char *argument) {
 
     NSString *tsPath = [NSString stringWithFormat:@"%@/../_TrollStore", NSBundle.mainBundle.bundlePath];
     const char *type;
-    if ([fm fileExistsAtPath:tsPath]) {
+    if (!access(tsPath.UTF8String, F_OK)) {
         type = "TrollStore";
     } else if (isJailbroken) {
         type = "Jailbroken";

diff --git a/entitlements.sideload.xml b/entitlements.sideload.xml
@@ -0,0 +1,24 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>application-identifier</key>
+	<string>net.kdt.pojavlauncher</string>
+<key>com.apple.private.security.container-required</key>
+	<string>net.kdt.pojavlauncher</string>
+    <key>get-task-allow</key>
+    <true/>
+
+    <key>com.apple.developer.kernel.extended-virtual-addressing</key>
+    <true/>
+    <key>com.apple.developer.kernel.increased-memory-limit</key>
+    <true/>
+
+    <!-- Give ability to change Jetsam task limit by itself -->
+    <key>com.apple.private.memorystatus</key>
+    <true/>
+
+    <!-- Custom entitlement to indicate this was installed with TrollStore, still sandboxed -->
+    <key>local.sandboxed-jit</key>
+    <true/>
+</dict>
+</plist>
diff --git a/entitlements.xml → entitlements.trollstore.xml b/entitlements.xml → entitlements.trollstore.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,6 @@ public static void updateMCGuiScale() { @@
             System.load(System.getenv("BUNDLE_PATH") + "/PojavLauncher");
         }
-        public static native void refreshAWTBuffer(int[] array);
         // public static native void runOnUIThread(UIKitCallback callback);
@@ Expand Down @@