GraalVM native image build of psoserv.

.gitignore

@@ -12,4 +12,4 @@ build
 karma.config.generated.js
 
 # Config
-/psoserv/*.conf
+/psoserv/psoserv.conf

psoserv/README.md

@@ -1,5 +1,8 @@
 # Phantasmal PSO Server
 
+This server is far from complete, the only functionality that works at the moment is the proxy
+server.
+
 ## Configuration
 
 Put a psoserv.conf file in the directory where psoserv will run or pass
@@ -71,3 +74,22 @@ proxy: {
   ]
 }
 ```
+
+## Developers
+
+## Building and Running
+
+Build with `./gradlew :psoserv:build` or run with `./gradlew :psoserv:run`.
+
+## Native Builds with GraalVM
+
+You can create a native build using [GraalVM](https://www.graalvm.org/) by
+running `./gradlew :psoserv:nativeBuild`.
+
+Prerequisites:
+
+- Make sure the JAVA_HOME environment variable points to a GraalVM JDK
+- Install native-image with `gu` (the GraalVM updater tool)
+- Install necessary libraries on Linux
+- Install MSVC and use a x64 Native Tools Command Prompt for running gradle on Windows
+- See the [manual](https://www.graalvm.org/reference-manual/native-image/) for details

psoserv/build.gradle.kts

@@ -1,11 +1,47 @@
+import org.graalvm.buildtools.gradle.tasks.BuildNativeImageTask
+
 plugins {
     id("world.phantasmal.jvm")
     kotlin("plugin.serialization")
     application
+    id("org.graalvm.buildtools.native") version "0.9.2"
 }
 
+val mainClassFqn = "world.phantasmal.psoserv.MainKt"
+val agentOutputDir = File(buildDir, "agent-output")
+
 application {
-    mainClass.set("world.phantasmal.psoserv.MainKt")
+    mainClass.set(mainClassFqn)
+}
+
+val nativeAgentRun by tasks.registering(JavaExec::class) {
+    description = "Run with the GraalVM native-image-agent to produce reflection info etc. for the nativeBuild task."
+    group = "application"
+
+    dependsOn(tasks.build)
+    outputs.dir(agentOutputDir)
+
+    mainClass.set(mainClassFqn)
+    classpath = sourceSets.main.get().runtimeClasspath
+    jvmArgs = listOf("-agentlib:native-image-agent=config-output-dir=$agentOutputDir")
+    args = listOf(
+        "--nostart",
+        "--config=graalvm-agent.conf",
+    )
+}
+
+nativeBuild {
+    imageName.set("psoserv")
+    mainClass.set(mainClassFqn)
+    buildArgs.addAll(
+        "--allow-incomplete-classpath",
+        "-H:ConfigurationFileDirectories=$agentOutputDir",
+    )
+}
+
+tasks.withType<BuildNativeImageTask>().configureEach {
+    dependsOn(nativeAgentRun)
+    inputs.dir(agentOutputDir)
 }
 
 val serializationVersion: String by project.extra

psoserv/graalvm-agent.conf

@@ -0,0 +1,30 @@
+patch: {}
+auth: {}
+account: {}
+ships: [
+  {
+    blocks: [block_1]
+  },
+]
+blocks: [
+  {
+    name: block_1
+  },
+]
+proxy: {
+  remoteAddress: localhost
+  servers: [
+    {
+      name: pc_proxy
+      version: PC
+      bindPort: 11000
+      remotePort: 21000
+    }
+    {
+      name: bb_proxy
+      version: BB
+      bindPort: 11001
+      remotePort: 21001
+    }
+  ]
+}

psoserv/src/main/kotlin/world/phantasmal/psoserv/Main.kt

@@ -32,18 +32,20 @@ fun main(args: Array<String>) {
 
         // Try to get config file location from arguments first.
         var configFile: File? = null
+        var start = true
 
         // Parse arguments.
         for (arg in args) {
             val split = arg.split('=')
+            val param = split[0]
+            val value = split.getOrNull(1)
 
-            if (split.size == 2) {
+            when (param) {
-                val (param, value) = split
+                "--config" -> {
-
+                    configFile = value?.let(::File)
-                when (param) {
+                }
-                    "--config" -> {
+                "--nostart" -> {
-                        configFile = File(value)
+                    start = false
-                    }
                 }
             }
         }
@@ -75,12 +77,16 @@ fun main(args: Array<String>) {
         val accountStore = AccountStore(LOGGER)
         val servers = initialize(config, accountStore)
 
-        if (servers.isEmpty()) {
+        if (start) {
-            LOGGER.info { "No servers configured, stopping." }
+            if (servers.isEmpty()) {
-        } else {
+                LOGGER.info { "No servers configured, stopping." }
-            LOGGER.info { "Starting up." }
+            } else {
+                LOGGER.info { "Starting up." }
 
-            servers.forEach(Server::start)
+                servers.forEach(Server::start)
+            }
+        } else {
+            LOGGER.info { "Not starting, configuration OK." }
         }
     } catch (e: Throwable) {
         LOGGER.error(e) { "Failed to start up." }

web/build.gradle.kts

@@ -53,7 +53,7 @@ val copyAssemblyWorkerJsTask = tasks.register<Copy>("copyAssemblyWorkerJs") {
 }
 
 // TODO: Figure out how to make this work with --continuous.
-tasks.getByName("processResources").dependsOn(copyAssemblyWorkerJsTask)
+tasks.named("processResources").configure { dependsOn(copyAssemblyWorkerJsTask) }
 
 tasks.register<Copy>("generateAssets") {
     dependsOn(":web:assets-generation:generateAssets")