Merge remote-tracking branch 'upstream/main' into adb-websocket

Author: DanTheMan827

mbf-agent/build.rs

@@ -3,6 +3,7 @@ use std::{fs::OpenOptions, path::Path};
 const LIBMAIN_URL: &str =
     "https://github.com/sc2ad/LibMainLoader/releases/download/v0.1.0-alpha/libmain.so";
 const SL2_URL: &str = "https://github.com/sc2ad/Scotland2/releases/latest/download/libsl2.so";
+const OVR_URL: &str = "https://github.com/kodenamekrak/JusticeForQuest/raw/refs/heads/master/third_party/libovrplatformloader.so";
 
 fn download_if_not_exist(url: &str, to: &str) {
     if Path::new(to).exists() {
@@ -27,4 +28,5 @@ fn main() {
     std::fs::create_dir_all("./libs").expect("Failed to create ./libs");
     download_if_not_exist(LIBMAIN_URL, "./libs/libmain.so");
     download_if_not_exist(SL2_URL, "./libs/libsl2.so");
+    download_if_not_exist(OVR_URL, "./libs/libovrplatformloader.so");
 }

mbf-agent/src/handlers/mod.rs

@@ -37,12 +37,14 @@ pub fn handle_request(request: Request) -> Result<Response> {
             remodding,
             manifest_mod,
             allow_no_core_mods,
+            device_pre_v51,
             override_core_mod_url,
             vr_splash_path,
         } => patching::handle_patch(
             downgrade_to,
             remodding,
             manifest_mod,
+            device_pre_v51,
             allow_no_core_mods,
             override_core_mod_url,
             vr_splash_path,

mbf-agent/src/handlers/patching.rs

@@ -32,6 +32,7 @@ pub(super) fn handle_patch(
     downgrade_to: Option<String>,
     repatch: bool,
     manifest_mod: String,
+    device_pre_v51: bool,
     allow_no_core_mods: bool,
     override_core_mod_url: Option<String>,
     vr_splash_path: Option<String>,
@@ -61,6 +62,7 @@ pub(super) fn handle_patch(
             &app_info,
             version_diffs,
             manifest_mod,
+            device_pre_v51,
             vr_splash_path.as_deref(),
             &res_cache,
         )
@@ -71,6 +73,7 @@ pub(super) fn handle_patch(
             &app_info,
             manifest_mod,
             repatch,
+            device_pre_v51,
             vr_splash_path.as_deref(),
             &res_cache,
         )

mbf-agent/src/models/request.rs

@@ -69,6 +69,8 @@ pub enum Request {
         remodding: bool,
         // If this is true, patching will not be failed if core mods cannot be found for the version.
         allow_no_core_mods: bool,
+        // If this is true, libovrplatformloader.so will be replaced with the old version to make the game work on quest 1
+        device_pre_v51: bool,
         // If not null, this specifies a core mod JSON to use instead of the default core mods source.
         // This is useful for developers testing a core mod update.
         override_core_mod_url: Option<String>,

mbf-agent/src/patching.rs

@@ -24,12 +24,14 @@ use mbf_zip::{signing, FileCompression, ZipFile, ZIP_CRC};
 const DEBUG_CERT_PEM: &[u8] = include_bytes!("debug_cert.pem");
 const LIB_MAIN: &[u8] = include_bytes!("../libs/libmain.so");
 const MODLOADER: &[u8] = include_bytes!("../libs/libsl2.so");
+const LEGACY_OVRPLATFORMLOADER: &[u8] = include_bytes!("../libs/libovrplatformloader.so");
 
 const MODLOADER_NAME: &str = "libsl2.so";
 const MOD_TAG_PATH: &str = "modded.json";
 
 const LIB_MAIN_PATH: &str = "lib/arm64-v8a/libmain.so";
 const LIB_UNITY_PATH: &str = "lib/arm64-v8a/libunity.so";
+const LIB_OVR_PATH: &str = "lib/arm64-v8a/libovrplatformloader.so";
 
 // Aligment to use for ZIP entries with the STORE compression method, in bytes.
 // 4 is the standard value.
@@ -42,6 +44,7 @@ pub fn mod_current_apk(
     app_info: &AppInfo,
     manifest_mod: String,
     manifest_only: bool,
+    device_pre_v51: bool,
     vr_splash_path: Option<&str>,
     res_cache: &ResCache,
 ) -> Result<()> {
@@ -78,6 +81,7 @@ pub fn mod_current_apk(
         obb_backups,
         manifest_mod,
         manifest_only,
+        device_pre_v51,
         vr_splash_path,
     )
     .context("Patching and reinstalling APK")?;
@@ -91,6 +95,7 @@ pub fn downgrade_and_mod_apk(
     app_info: &AppInfo,
     diffs: VersionDiffs,
     manifest_mod: String,
+    device_pre_v51: bool,
     vr_splash_path: Option<&str>,
     res_cache: &ResCache,
 ) -> Result<bool> {
@@ -149,6 +154,7 @@ pub fn downgrade_and_mod_apk(
         obb_backup_paths,
         manifest_mod,
         false,
+        device_pre_v51,
         vr_splash_path,
     )
     .context("Patching and reinstall APK")?;
@@ -182,6 +188,7 @@ fn patch_and_reinstall(
     obb_paths: Vec<PathBuf>,
     manifest_mod: String,
     manifest_only: bool,
+    device_pre_v51: bool,
     vr_splash_path: Option<&str>,
 ) -> Result<()> {
     info!("Patching APK");
@@ -190,6 +197,7 @@ fn patch_and_reinstall(
         libunity_path,
         manifest_mod,
         manifest_only,
+        device_pre_v51,
         vr_splash_path,
     )
     .context("Patching APK")?;
@@ -209,7 +217,7 @@ fn patch_and_reinstall(
         }
     }
 
-    reinstall_modded_app(&temp_apk_path).context("Reinstalling modded APK")?;
+    reinstall_modded_app(&temp_apk_path, device_pre_v51).context("Reinstalling modded APK")?;
     std::fs::remove_file(temp_apk_path)?;
 
     info!("Restoring OBB files");
@@ -239,7 +247,10 @@ pub fn backup_player_data() -> Result<()> {
     Ok(())
 }
 
-fn reinstall_modded_app(temp_apk_path: &Path) -> Result<()> {
+fn reinstall_modded_app(
+    temp_apk_path: &Path,
+    device_pre_v51: bool,
+) -> Result<()> {
     info!("Reinstalling modded app");
     Command::new("pm")
         .args(["uninstall", APK_ID])
@@ -256,6 +267,17 @@ fn reinstall_modded_app(temp_apk_path: &Path) -> Result<()> {
         .args(["set", "--uid", APK_ID, "MANAGE_EXTERNAL_STORAGE", "allow"])
         .output()?;
 
+    // Quest 1 specific permissions
+    if device_pre_v51 {
+        info!("Granting WRITE_EXTERNAL_STORAGE and READ_EXTERNAL_STORAGE (Quest 1)");
+        Command::new("pm")
+            .args(["grant", APK_ID, "android.permission.WRITE_EXTERNAL_STORAGE"])
+            .output()?;
+        Command::new("pm")
+            .args(["grant", APK_ID, "android.permission.READ_EXTERNAL_STORAGE"])
+            .output()?;    
+    }
+
     Ok(())
 }
 
@@ -431,6 +453,7 @@ fn patch_apk_in_place(
     libunity_path: Option<PathBuf>,
     manifest_mod: String,
     manifest_only: bool,
+    device_pre_v51: bool,
     vr_splash_path: Option<&str>,
 ) -> Result<()> {
     let file = OpenOptions::new()
@@ -474,6 +497,15 @@ fn patch_apk_in_place(
             }
             None => warn!("No unstripped unity added to the APK! This might cause issues later"),
         }
+
+        if device_pre_v51 {
+            info!("Replacing ovrplatformloader");
+            zip.write_file(
+                LIB_OVR_PATH, 
+                &mut Cursor::new(LEGACY_OVRPLATFORMLOADER), 
+                FileCompression::Deflate
+            )?;
+        }
     }
 
     if let Some(splash_path) = vr_splash_path {

mbf-site/src/Agent.ts

@@ -366,6 +366,7 @@ export async function patchApp(device: Adb,
   manifestMod: string,
   remodding: boolean,
   allow_no_core_mods: boolean,
+  device_pre_v51: boolean,
   splashScreen: File | null): Promise<ModStatus> {
   Log.debug("Patching with manifest: " + manifestMod);
 
@@ -390,6 +391,7 @@ export async function patchApp(device: Adb,
       manifest_mod: manifestMod,
       allow_no_core_mods: allow_no_core_mods,
       override_core_mod_url: CORE_MOD_OVERRIDE_URL,
+      device_pre_v51: device_pre_v51,
       remodding,
       vr_splash_path: splashPath
   }) as Patched;

mbf-site/src/AndroidManifest.ts

@@ -111,12 +111,21 @@ export class AndroidManifest {
     // - Enable MANAGE_EXTERNAL_STORAGE permission.
     // - Make app debuggable
     // - Enable hardware acceleration. (useful for any mods that make use of the WebView API)
-    public applyPatchingManifestMod() {
+    public applyPatchingManifestMod(devicePreV51: boolean = false) {
         const application = this.document.getElementsByTagName("application")[0];
         application.setAttributeNS(ANDROID_NS_URI, `${this.androidNsPrefix}:debuggable`, "true");
         application.setAttributeNS(ANDROID_NS_URI, `${this.androidNsPrefix}:hardwareAccelerated`, "true");
-
+        
         this.addPermission("android.permission.MANAGE_EXTERNAL_STORAGE");
+        this.setMetadata("com.oculus.supportedDevices", "quest|quest2");
+        
+        // Quest 1 specific
+        if (devicePreV51) {
+            application.setAttributeNS(ANDROID_NS_URI, `${this.androidNsPrefix}:requestLegacyExternalStorage`, "true");
+
+            this.addPermission("android.permission.WRITE_EXTERNAL_STORAGE");
+            this.addPermission("android.permission.READ_EXTERNAL_STORAGE");    
+        }
     }
 
     // Adds a <uses-permission> element for the specified permission underneath the manifest tag.

mbf-site/src/App.tsx

@@ -20,10 +20,11 @@ import { waitForDisconnect } from "./waitForDisconnect";
 import { BridgeManager } from './BridgeManager';
 import { AllowAuth, DeviceInUse, NoCompatibleDevices, OculusBrowserMessage, OldOsVersion, QuestOneNotSupported, Title, UnsupportedMessage } from './AppMessages';
 import { PagePinger } from './PagePinger';
+import { useDeviceStore } from './DeviceStore';
 
 type NoDeviceCause = "NoDeviceSelected" | "DeviceInUse";
 
-const MIN_SUPPORTED_ANDROID_VERSION: number = 11;
+const NON_LEGACY_ANDROID_VERSION: number = 11;
 
 /**
  * Connects to the ADB server using the given client and device.
@@ -121,17 +122,17 @@ enum ConnectedState {
  */
 async function connectDevice(device: Adb, { setDevicePreV51, setAuthing, setChosenDevice }: {
   /** State setter for indicating if the device is pre-v51 (unsupported). */
-  setDevicePreV51: SetStateAction<boolean>
+  setDevicePreV51: (isPreV51: boolean) => void
 
-  /** State setter for authentication status (false when done). */
+  /** State setter for authentication status. */
   setAuthing: SetStateAction<boolean>
 
   /** State setter for the currently selected device. */
-  setChosenDevice: SetStateAction<Adb | null>
+  setChosenDevice: (adb: Adb | null) => void
 }) {
   const androidVersion = await getAndroidVersion(device);
   Log.debug("Device android version: " + androidVersion);
-  setDevicePreV51(androidVersion < MIN_SUPPORTED_ANDROID_VERSION);
+  setDevicePreV51(androidVersion < NON_LEGACY_ANDROID_VERSION);
   setAuthing(false);
   setChosenDevice(device);
 
@@ -153,13 +154,13 @@ async function connectDevice(device: Adb, { setDevicePreV51, setAuthing, setChos
  */
 async function connectBridgeDevice(bridgeClient: AdbServerClient, device: AdbServerClient.Device, { setDevicePreV51, setAuthing, setChosenDevice, setConnectError }: {
   /** State setter for indicating if the device is pre-v51 (unsupported). */
-  setDevicePreV51: SetStateAction<boolean>
+  setDevicePreV51: (isPreV51: boolean) => void
 
   /** State setter for authentication status. */
   setAuthing: SetStateAction<boolean>
 
   /** State setter for the currently selected device. */
-  setChosenDevice: SetStateAction<Adb | null>
+  setChosenDevice: (adb: Adb | null) => void
 
   /** State setter for connection error messages. */
   setConnectError: SetStateAction<string | null>
@@ -196,7 +197,7 @@ async function connectWebUsb({ setAuthing, setDeviceInUse, setChosenDevice, setC
   setDeviceInUse: SetStateAction<boolean>
 
   /** State setter for the currently selected device. */
-  setChosenDevice: SetStateAction<Adb | null>
+  setChosenDevice: (adb: Adb | null) => void
 
   /** State setter for connection error messages. */
   setConnectError: SetStateAction<string | null>
@@ -243,10 +244,13 @@ async function connectWebUsb({ setAuthing, setDeviceInUse, setChosenDevice, setC
  */
 function ChooseDevice() {
   const [authing, setAuthing] = useState(false);
-  const [chosenDevice, setChosenDevice] = useState(null as Adb | null);
   const [connectError, setConnectError] = useState(null as string | null);
-  const [devicePreV51, setDevicePreV51] = useState(false);
   const [deviceInUse, setDeviceInUse] = useState(false);
+  const {
+    devicePreV51, setDevicePreV51,
+    device: chosenDevice, setDevice: setChosenDevice, usingBridge, setUsingBridge,
+    androidVersion, setAndroidVersion
+  } = useDeviceStore();
   const [bridgeClient, setBridgeClient] = useState<AdbServerClient | null>(null);
   const [adbDevices, setAdbDevices] = useState<AdbServerClient.Device[]>([]);
   const stateSetters = {
@@ -258,33 +262,28 @@ function ChooseDevice() {
     setBridgeClient,
     setAdbDevices
   }
-
+  
   useEffect(() => {
     // If the user is using a bridge and there is only one device, connect to it automatically.
     if (chosenDevice == null && bridgeClient != null && adbDevices.length == 1) {
       connectBridgeDevice(bridgeClient, adbDevices[0],  stateSetters).catch(err => Log.error("Failed to connect to device: " + err, err));
     }
-
   });
 
   if(chosenDevice !== null) {
     Log.debug("Device model: " + chosenDevice.banner.model);
-    if(chosenDevice.banner.model === "Quest") { // "Quest" not "Quest 2/3"
-      return <QuestOneNotSupported />
-    } else if(devicePreV51 && chosenDevice.banner.model?.includes("Quest")) {
-      return <OldOsVersion />
-    } else  {
-      return <>
-        { bridgeClient && <PagePinger url={bridgeData.pingAddress} interval={5000} /> }
-        <DeviceModder device={chosenDevice} usingBridge={bridgeClient != null} quit={(err) => {
-          if(err != null) {
-            setConnectError(String(err));
-          }
-          chosenDevice.close().catch(err => Log.error("Failed to close device " + err, err));
-          setChosenDevice(null);
-        }} />
-      </>
-    }
+    setUsingBridge(bridgeClient != null);
+    return <>
+      { bridgeClient && <PagePinger url={bridgeData.pingAddress} interval={5000} /> }
+      <DeviceModder quit={(err) => {
+        if(err != null) {
+          setConnectError(String(err));
+        }
+        chosenDevice.close().catch(err => Log.error("Failed to close device " + err, err));
+        setChosenDevice(null);
+        setUsingBridge(false);
+      }} />
+    </>
   } else if(authing) {
     return <AllowAuth />
   } else  {