finish modding support for now

Author: ComputerElite

Assets/html/index.html

@@ -28,8 +28,24 @@ <h3>Currently selected game: <div class="inline packageName">some game</div></h3
                 <div class="textbox" id="patchingTextBox"></div>
             </div>
             <div class="contentItem hidden" id="mods">
-                <b>Please note that mod installation is in VERY early access, there are issues. e. g. no blocking of user actions while an operation is ongoing, no indication wether a mod install/disable was successful</b>
+                <b>Please note that mod installation is in early access, there may be issues. Feel free to give feedback on the OculusDB Discord Server at <code>discord.gg/zwRfHQN2UY</code></b>
                 <div class="button" onclick="UploadMod()">Install a Mod</div>
+                <div id="operations">
+                    <h2 id="ongoingCount">Ongoing operations:</h2>
+                    <div class="loaderContainer" style="margin-bottom: 10px;">
+                        <div class="loaderBarRight"></div>
+                        <div class="loaderBarLeft"></div>
+                        <div class="loaderBarTop"></div>
+                        <div class="loaderBarBottom"></div>
+                        <div class="loaderSpinningCircle"></div>
+                        <div class="loaderMiddleCircle"></div>
+                        <div class="loaderCircleHole"></div>
+                        <div class="loaderSquare"></div>
+                    </div>
+                    <div class="infiniteList" id="operationsList">
+                        ${operations}
+                    </div>
+                </div>
                 <h2>Mods</h2>
                 <div class="infiniteList" id="modsList">
 

Assets/html/script.js

@@ -32,14 +32,12 @@ function UpdatePatchingStatus() {
     patchStatus.innerHTML = `Loading<br><br>${squareLoader}`
     fetch("/patching/getmodstatus").then(res => {
         res.json().then(res => {
-            /*
-            if(!IsOnQuest()) {
-                patchStatus.innerHTML = "<h2>To mod your game open QuestAppVersionSwitcher on your Quest</h2>"
-            }
-            */
             if(res.isPatched) {
                 document.getElementById("modsButton").style.visibility = "visible"
                 patchStatus.innerHTML = "<h2>Game is already patched. You can install mods</h2>"
+            } else if(!res.isInstalled) {
+                patchStatus.innerHTML = `<h2>Game is not installed. Please restore a backup or install the app so the game can get patched</h2>`
+                document.getElementById("modsButton").style.visibility = "hidden"
             } else if(res.canBePatched) {
                 patchStatus.innerHTML = `<h2>Game is not patched.</h2>
                                         <div class="button" onclick="PatchGame()">Patch it now</div>`
@@ -48,6 +46,11 @@ function UpdatePatchingStatus() {
                 patchStatus.innerHTML = "<h2>Game can not be modded</h2>"
                 document.getElementById("modsButton").style.visibility = "hidden"
             }
+
+            if(!IsOnQuest() && !res.isPatched) {
+                patchStatus.innerHTML = "<h2>To mod your game open QuestAppVersionSwitcher on your Quest</h2>"
+                return;
+            }
         })
     })
 }
@@ -56,17 +59,37 @@ setInterval(() => {
     UpdateModsAndLibs()
 }, 2000);
 
+var operationsOngoing = false
+const operationsElement = document.getElementById("operations")
+const ongoingCount = document.getElementById("ongoingCount")
+const operationsList = document.getElementById("operationsList")
 function UpdateModsAndLibs() {
     fetch(`/mods/mods`).then(res => {
         res.json().then(res => {
+            operationsOngoing = res.operations.length > 0
             var mods = ``
+            if(!operationsOngoing) {
+                operationsElement.style.display = "none"
+            } else {
+                operationsElement.style.display = "block"
+                var operations = ""
+                for(const operation of res.operations){
+                    operations += `
+                    <div class="mod" style="padding: 10px">
+                        ${operation.name}
+                    </div>
+                    `
+                }
+                operationsList.innerHTML = operations
+                ongoingCount.innerHTML = `Ongoing operations: ${res.operations.length}`
+            }
             for(const mod of res.mods){
-                mods += FormatMod(mod)
+                mods += FormatMod(mod, !operationsOngoing)
             }
             document.getElementById("modsList").innerHTML = mods
             var libs = ``
             for(const mod of res.libs){
-                libs += FormatMod(mod)
+                libs += FormatMod(mod, !operationsOngoing)
             }
             document.getElementById("libsList").innerHTML = libs
         })
@@ -99,7 +122,7 @@ function UpdateModState(id, enable) {
     })
 }
 
-function FormatMod(mod) {
+function FormatMod(mod, active = true) {
     return `
     <div class="mod">
         <div class="leftRightSplit">
@@ -112,17 +135,20 @@ function FormatMod(mod) {
                     </div>
                     <div class="smallText">${mod.Description}</div>
                 </div>
-                <div class="button" onclick="DeleteMod('${mod.Id}')">Delete</div>
+                ${active ? `
+                <div class="button" onclick="DeleteMod('${mod.Id}')">Delete</div>` : ``}
             </div>
         </div>
         <div class="upDownSplit spaceBetween relative">
             <div class="smallText margin20">
                 (by ${mod.Author})
             </div>
+            ${active ? `
             <label class="switch">
                 <input onchange="UpdateModState('${mod.Id}', ${!mod.IsInstalled})" type="checkbox" ${mod.IsInstalled ? `checked` : ``}>
                 <span class="slider round"></span>
-            </label>
+            </label>` : ``}
+            
         </div>
     </div>
     `

ClientModels.cs

@@ -5,6 +5,7 @@ namespace QuestAppVersionSwitcher.ClientModels
     public class PatchingStatus
     {
         public bool isPatched { get; set; } = false;
+        public bool isInstalled { get; set; } = true;
         public bool canBePatched { get; set; } = true; // Not implemented yet.
         public string version { get; set; } = "";
         public string versionCode { get; set; } = "";

CoreService.cs

@@ -34,7 +34,7 @@ public async void Start()
             {
                 if (await Permissions.RequestAsync<Permissions.StorageRead>() != PermissionStatus.Granted) return;
             }
-            
+
             //Set webbrowser settings
             browser.SetWebChromeClient(new WebChromeClient());
             browser.Settings.JavaScriptEnabled = true;

Mods/QAVSModManager.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using ComputerUtils.Android.Logging;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.Json;
 
 namespace QuestAppVersionSwitcher.Mods
@@ -8,13 +10,32 @@ public class ModsAndLibs
     {
         public List<IMod> mods { get; set; } = new List<IMod>();
         public List<IMod> libs { get; set; } = new List<IMod>();
+        public List<QAVSOperation> operations { get; set; } = new List<QAVSOperation>();
     }
+
+    public enum QAVSOperationType
+    {
+        ModInstall,
+        ModUninstall,
+        ModDisable,
+        ModDelete,
+        DependencyDownload,
+        Other
+    }
+
+    public class QAVSOperation
+    {
+        public QAVSOperationType type { get; set; } = QAVSOperationType.ModInstall;
+        public string name { get; set; } = "";
+    }
+
     public class QAVSModManager
     {
         public static ModManager modManager;
         public static OtherFilesManager otherFilesManager;
-        public static bool operationOngoing = false;
         public static JsonSerializerOptions options;
+        public static int operations = 0;
+        public static Dictionary<int, QAVSOperation> runningOperations = new Dictionary<int, QAVSOperation>();
 
         public static void Init()
         {
@@ -36,16 +57,25 @@ public static void Update()
 
         public static void InstallMod(byte[] modBytes, string fileName)
         {
+            int operationId = operations;
+            operations++;
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModInstall, name = "Installing " + fileName });
+
             TempFile f = new TempFile(Path.GetExtension(fileName));
             File.WriteAllBytes(f.Path, modBytes);
             IMod mod = modManager.TryParseMod(f.Path).Result;
-            mod.Install();
+            mod.Install().Wait();
+            runningOperations.Remove(operationId);
             modManager.ForceSave();
         }
 
         public static void UninstallMod(string id)
         {
-            foreach(IMod m in modManager.AllMods)
+            int operationId = operations;
+            operations++;
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModUninstall, name = "Unnstalling " + id });
+
+            foreach (IMod m in modManager.AllMods)
             {
                 if(m.Id == id)
                 {
@@ -54,10 +84,15 @@ public static void UninstallMod(string id)
                     break;
                 }
             }
+
+            runningOperations.Remove(operationId);
         }
 
         public static void DeleteMod(string id)
         {
+            int operationId = operations;
+            operations++;
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModDelete, name = "Deleting " + id });
             foreach (IMod m in modManager.AllMods)
             {
                 if (m.Id == id)
@@ -67,27 +102,34 @@ public static void DeleteMod(string id)
                     break;
                 }
             }
+            runningOperations.Remove(operationId);
         }
 
         public static void EnableMod(string id)
         {
+            int operationId = operations;
+            operations++;
+            runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.ModInstall, name = "Installing " + id });
+
             foreach (IMod m in modManager.AllMods)
             {
                 if (m.Id == id)
                 {
-                    m.Install();
+                    m.Install().Wait();
                     modManager.ForceSave();
                     break;
                 }
             }
+            runningOperations.Remove(operationId);
         }
 
         public static string GetMods()
         {
             return JsonSerializer.Serialize(new ModsAndLibs
             {
                 mods = modManager.Mods,
-                libs = modManager.Libraries
+                libs = modManager.Libraries,
+                operations = runningOperations.Values.ToList()
             });
         }
 

Mods/QPMod.cs

@@ -117,10 +117,20 @@ private async Task Install(List<string> installedInBranch)
             }
             foreach(KeyValuePair<string, string> k in copyPaths)
             {
-                File.Copy(k.Key, k.Value, true);
+                try
+                {
+                    string dir = Directory.GetParent(k.Value).FullName;
+                    if (!Directory.Exists(dir)) Directory.CreateDirectory(dir);
+                    File.Copy(k.Key, k.Value, true);
+                } catch(Exception e)
+                {
+                    Logger.Log(e.ToString(), LoggingType.Error);
+                }
             }
             IsInstalled = true;
             installedInBranch.Remove(Id);
+            Logger.Log("Install method finished");
+            return;
         }
 
         public async Task Uninstall()
@@ -203,6 +213,9 @@ public byte[] OpenCover()
         /// <param name="installedInBranch">The number of mods that are currently downloading down this branch of the install "tree", used to check for cyclic dependencies</param>
         private async Task PrepareDependency(Dependency dependency, List<string> installedInBranch)
         {
+            int operationId = QAVSModManager.operations;
+            QAVSModManager.operations++;
+            QAVSModManager.runningOperations.Add(operationId, new QAVSOperation { type = QAVSOperationType.DependencyDownload, name = "Downloading Dependency " + dependency.Id });
             Logger.Log($"Preparing dependency of {dependency.Id} version {dependency.VersionRange}");
             int existingIndex = installedInBranch.FindIndex(downloadedDep => downloadedDep == dependency.Id);
             if (existingIndex != -1)
@@ -213,7 +226,7 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
                     dependMessage += $"{installedInBranch[i]} depends on ";
                 }
                 dependMessage += dependency.Id;
-
+                QAVSModManager.runningOperations.Remove(operationId);
                 throw new InstallationException($"Recursive dependency detected: {dependMessage}");
             }
 
@@ -229,6 +242,7 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
                         Logger.Log($"Installing dependency {dependency.Id} . . .");
                         await existing.Install(installedInBranch);
                     }
+                    QAVSModManager.runningOperations.Remove(operationId);
                     return;
                 }
 
@@ -238,11 +252,13 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
                 }
                 else
                 {
+                    QAVSModManager.runningOperations.Remove(operationId);
                     throw new InstallationException($"Dependency with ID {dependency.Id} is already installed but with an incorrect version ({existing.Version} does not intersect {dependency.VersionRange}). Upgrading was not possible as there was no download link provided");
                 }
             }
             else if (dependency.DownloadUrlString == null)
             {
+                QAVSModManager.runningOperations.Remove(operationId);
                 throw new InstallationException($"Dependency {dependency.Id} is not installed, and the mod depending on it does not specify a download path if missing");
             }
 
@@ -256,25 +272,31 @@ private async Task PrepareDependency(Dependency dependency, List<string> install
             catch (WebException ex)
             {
                 // Print a nicer error message
+                QAVSModManager.runningOperations.Remove(operationId);
                 throw new InstallationException($"Failed to download dependency from URL {dependency.DownloadIfMissing}: {ex.Message}", ex);
             }
 
             installedDependency = (QPMod)await _provider.LoadFromFile(downloadFile.Path);
 
             await installedDependency.Install(installedInBranch);
 
+            Logger.Log("Installed Dependency");
+
             // Sanity checks that the download link actually pointed to the right mod
             if (dependency.Id != installedDependency.Id)
             {
                 await _provider.DeleteMod(installedDependency);
+                QAVSModManager.runningOperations.Remove(operationId);
                 throw new InstallationException($"Downloaded dependency had ID {installedDependency.Id}, whereas the dependency stated ID {dependency.Id}");
             }
 
             if (!dependency.VersionRange.IsSatisfied(installedDependency.Version))
             {
                 await _provider.DeleteMod(installedDependency);
+                QAVSModManager.runningOperations.Remove(operationId);
                 throw new InstallationException($"Downloaded dependency {installedDependency.Id} v{installedDependency.Version} was not within the version range stated in the dependency info ({dependency.VersionRange})");
             }
+            QAVSModManager.runningOperations.Remove(operationId);
         }
     }
 }

PatchingManager.cs

@@ -117,7 +117,7 @@ public static void PatchAPK(ZipArchive apkArchive, string appLocation)
             QAVSWebserver.patchText = JsonSerializer.Serialize(new MessageAndValue<String>("Almost done. Hang tight", ""));
             WebClient c = new WebClient();
             PatchingStatus status = JsonSerializer.Deserialize<PatchingStatus>(c.DownloadString("http://127.0.0.1:" + CoreService.coreVars.serverPort + "/patching/getmodstatus")); // seems to be the easiest way
-            string backupName = status.version + "_patched";
+            string backupName = QAVSWebserver.MakeFileNameSafe(status.version) + "_patched";
             string backupDir = CoreService.coreVars.QAVSBackupDir + CoreService.coreVars.currentApp + "/" + backupName + "/";
             FileManager.RecreateDirectoryIfExisting(backupDir);
             File.Move(appLocation, backupDir + "app.apk");

QuestAppVersionSwitcher.csproj.user

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SelectedDevice>Google Pixel 6</SelectedDevice>
-    <ActiveDebugProfile>Google Pixel 6</ActiveDebugProfile>
+    <SelectedDevice>Oculus Quest</SelectedDevice>
+    <ActiveDebugProfile>Oculus Quest</ActiveDebugProfile>
     <DefaultDevice>Pixel_5_API_30</DefaultDevice>
     <AndroidDesignerPreferredTheme>AppTheme</AndroidDesignerPreferredTheme>
     <AndroidDesignerPreferredDevice>Nexus 4</AndroidDesignerPreferredDevice>