Fix server installations on windows systems

- retrieve process arguments using powershell on windows
- write the relative path to the flap jar to the launch args file

Author: moehreag

java/build.gradle.kts

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("net.ornithemc:flap:0.0.1")
+    compileOnly("net.ornithemc:flap:0.0.2")
     compileOnly("org.apache.logging.log4j:log4j-core:2.19.0")
 }
 

java/src/main/java/net/ornithemc/server_launcher/ServerLauncher.java

@@ -3,6 +3,8 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -35,18 +37,41 @@ private static LoggerContext getLoggerCtx() {
 	public static void main(String[] args) {
 		try (var loggerCtx = getLoggerCtx()) {
 			var log = loggerCtx.getLogger("ServerLauncher");
-			var processInfo = ProcessHandle.current().info();
+			var handle = ProcessHandle.current();
+			var processInfo = handle.info();
 			List<String> cmd = new ArrayList<>();
 			cmd.add(processInfo.command().orElseThrow());
 			var in = ServerLauncher.class.getResourceAsStream("/ornithe-args.json");
 			var gson = new GsonBuilder().create();
 			var arguments = new ArrayList<String>();
-			processInfo.arguments().ifPresent(a -> Collections.addAll(arguments, a));
+			if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win")) {
+				try {
+					var p = new ProcessBuilder("powershell.exe", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command",
+							"(Get-CimInstance Win32_Process -Filter 'ProcessId = \"" + handle.pid() + "\"').CommandLine")
+							.start();
+					try (var reader = p.inputReader(StandardCharsets.UTF_8)) {
+						var cmdLine = reader.readLine();
+						Collections.addAll(arguments, cmdLine.substring(cmdLine.indexOf(' ')).split(" "));
+						arguments.removeIf(String::isBlank);
+					}
+				} catch (IOException e) {
+					log.error("Failed to gather windows process arguments!", e);
+					return;
+				}
+			} else {
+				var processArgs = processInfo.arguments();
+				if (processArgs.isPresent()) {
+					Collections.addAll(arguments, processArgs.get());
+				} else {
+					log.error("Failed to find process arguments, does the jvm just give up on this platform as well?");
+					return;
+				}
+			}
 			arguments.removeAll(Arrays.asList(args));
 			var cp = new ArrayList<String>();
 			if (in != null) {
-				var self = ServerLauncher.class.getProtectionDomain().getCodeSource().getLocation().getPath();
 				try (in; var reader = new InputStreamReader(in)) {
+					var self = Path.of(ServerLauncher.class.getProtectionDomain().getCodeSource().getLocation().toURI()).toString();
 					var ornitheArgs = gson.fromJson(reader, OrnitheArgs.class);
 					if (arguments.contains("-jar")) {
 						int jarIndex = arguments.indexOf("-jar");
@@ -77,6 +102,9 @@ public static void main(String[] args) {
 				} catch (IOException e) {
 					log.error("Failed to read ornithe launch arguments:", e);
 					return;
+				} catch (URISyntaxException e) {
+					log.error("Failed to retrieve own location: ", e);
+					return;
 				}
 			}
 			try {
@@ -85,6 +113,7 @@ public static void main(String[] args) {
 				cmd.add("-Dloader.gameJarPath=" + serverJar);
 			} catch (IOException e) {
 				log.error("Failed to transform server jar:", e);
+				return;
 			}
 			cmd.addAll(arguments);
 			Collections.addAll(cmd, args);

src/actions/server.rs

@@ -75,7 +75,6 @@ async fn install_path(
     if !location.exists() {
         std::fs::create_dir_all(&location)?;
     }
-    let location = location.canonicalize()?;
 
     let _ = sender.send((
         0.1,
@@ -88,6 +87,7 @@ async fn install_path(
         )
         .into(),
     ));
+    let location = location.canonicalize()?;
 
     let clear_paths = [location.join(".fabric"), location.join(".quilt")];
     for path in clear_paths {
@@ -308,7 +308,6 @@ async fn create_launch_jar(
             wrap_manifest_line(&format!("Main-Class: {}", launch_main_class))
         )?;
     }
-    zip.start_file("META-INF/MANIFEST.MF", SimpleFileOptions::default())?;
 
     let mut class_path = String::from("Class-Path: ");
     for library in library_files {
@@ -318,23 +317,26 @@ async fn create_launch_jar(
         }
     }
 
+    if let Some(flap_path) = flap_jar_path {
+        if let Some(path) = flap_path.strip_prefix(install_location)?.to_str() {
+            zip.start_file("ornithe-args.json", SimpleFileOptions::default())?;
+            zip.write_all(&serde_json::to_vec(&json!({
+                "flap_jar": path.replace("\\", "/"),
+                "main_class": launch_main_class,
+                "jvm_args": jvm_args
+            }))?)?;
+        }
+    }
+
     writeln!(manifest, "{}\r", wrap_manifest_line(class_path.trim_end()))?;
     writeln!(
         manifest,
         "{}\r",
         wrap_manifest_line(&format!("Minecraft-Version: {}\r", version.id))
     )?;
+    zip.start_file("META-INF/MANIFEST.MF", SimpleFileOptions::default())?;
     zip.write_all(&manifest)?;
 
-    if let Some(flap_path) = flap_jar_path {
-        zip.start_file("ornithe-args.json", SimpleFileOptions::default())?;
-        zip.write_all(&serde_json::to_vec(&json!({
-            "flap_jar": flap_path,
-            "main_class": launch_main_class,
-            "jvm_args": jvm_args
-        }))?)?;
-    }
-
     if loader_type == &LoaderType::Fabric {
         zip.start_file(
             "fabric-server-launch.properties",
@@ -358,6 +360,10 @@ fn wrap_manifest_line(line: &str) -> String {
         if count == 72 {
             res += "\r\n ";
             count = 1;
+            if char == ' ' {
+                res += " ";
+                count += 1;
+            }
         }
     }
     res