Merge pull request #8 from StoppedwummPython:gui-preview

Implement UI for console and mod dashboard with testing enhancements

Author: StoppedwummPython

.gitignore

@@ -8,4 +8,7 @@ config.json
 java-runtime
 .DS_Store
 dist
-build
+build
+__pycache__
+test.txt
+coverage

1.21.1.json

@@ -49,62 +49,6 @@
                     "--height",
                     "${resolution_height}"
                 ]
-            },
-            {
-                "rules": [
-                    {
-                        "action": "allow",
-                        "features": {
-                            "has_quick_plays_support": true
-                        }
-                    }
-                ],
-                "value": [
-                    "--quickPlayPath",
-                    "${quickPlayPath}"
-                ]
-            },
-            {
-                "rules": [
-                    {
-                        "action": "allow",
-                        "features": {
-                            "is_quick_play_singleplayer": true
-                        }
-                    }
-                ],
-                "value": [
-                    "--quickPlaySingleplayer",
-                    "${quickPlaySingleplayer}"
-                ]
-            },
-            {
-                "rules": [
-                    {
-                        "action": "allow",
-                        "features": {
-                            "is_quick_play_multiplayer": true
-                        }
-                    }
-                ],
-                "value": [
-                    "--quickPlayMultiplayer",
-                    "${quickPlayMultiplayer}"
-                ]
-            },
-            {
-                "rules": [
-                    {
-                        "action": "allow",
-                        "features": {
-                            "is_quick_play_realms": true
-                        }
-                    }
-                ],
-                "value": [
-                    "--quickPlayRealms",
-                    "${quickPlayRealms}"
-                ]
             }
         ],
         "jvm": [

api.test.js

@@ -0,0 +1,68 @@
+// windows only test
+import index from "./index.js"
+import * as java from "./java.js"
+import { describe, it, expect } from "vitest"
+import fs from "fs/promises"
+
+describe("API exists", () => {
+    it("Should be defined", () => {
+        expect(index).toBeDefined()
+    })
+})
+
+describe("API methods", () => {
+    it("Can get OS name", () => {
+        expect(index.getOSName()).toBeDefined()
+        expect(index.getOSName()).eq("windows")
+    })
+    it("Can check rules", () => {
+        expect(index.checkRule({
+            "action": "allow",
+            "os": {
+                "name": "osx"
+            }
+        })).eq(false)
+        expect(index.checkRule({
+            "action": "allow",
+            "os": {
+                "name": "linux"
+            }
+        })).eq(false)
+        expect(index.checkRule({
+            "action": "allow",
+            "os": {
+                "name": "windows"
+            }
+        })).eq(true)
+    })
+})
+
+describe("Java API", () => {
+    it("Should be defined", () => {
+        expect(java.downloadJava).toBeDefined()
+        expect(java.downloadJava).toBeTypeOf("function")
+    })
+})
+
+describe("Can handle manifest", () => {
+    it("Should be defined", async () => {
+        expect(await index.loadManifest("neoforge-21.1.162.json")).toBeDefined()
+    })
+    it("Should merge Manifests", async () => {
+        expect(await index.mergeManifests(await index.loadManifest("neoforge-21.1.162.json"), await index.loadManifest("1.21.1.json"))).toBeDefined()
+        expect(await index.mergeManifests(await index.loadManifest("neoforge-21.1.162.json"), await index.loadManifest("1.21.1.json"))).toBeTypeOf("object")
+    })
+})
+
+describe("Misc functions", () => {
+    it("Should be defined", async () => {
+        expect(index.downloadFile).toBeDefined()
+    })
+    it("Should download file", async () => {
+        await fs.rm("test.txt", { force: true })
+        const download = await index.downloadFile("https://sample-files.com/downloads/documents/txt/simple.txt", "test.txt")
+        expect(download).toBeDefined()
+        expect(download).toBeTypeOf("boolean")
+        expect(download).eq(true)
+    })
+})

index.js

@@ -812,7 +812,7 @@ async function main() {
                 });
             })
             // removing old backup
-            await fs.rmdir(BACKUP_PATH, { recursive: true, force: true });
+            await fs.rm(BACKUP_PATH, { recursive: true, force: true });
 
         } catch (error) {
             console.error(`Failed to create backup: ${error}`);
@@ -822,9 +822,25 @@ async function main() {
 
 
 } // End of main function
+// --ui adds fix to the launcher (when the ui launches, it returns ui_index.cjs as the entry point script, which will trigger module logic, which is now fixed)
+const entryPointScript = process.argv[1].split(path.sep).pop();
+if (entryPointScript === __filename || entryPointScript === __dirname.split(path.sep).pop() || (process.argv.length == 3 && process.argv[2] == "--ui")) {
+    main().catch(error => {
+        console.error("\n--- An error occurred during setup or launch ---");
+        console.error(error);
+        process.exit(1);
+    });
+}
 
-main().catch(error => {
-    console.error("\n--- An error occurred during setup or launch ---");
-    console.error(error);
-    process.exit(1);
-});
+export default {
+    downloadFile,
+    extractNatives,
+    getOSName,
+    getArchName,
+    checkRule,
+    checkItemRules,
+    ensureLauncherProfiles,
+    loadManifest,
+    mergeManifests,
+    main
+}