Server rewrite

.gitignore

@@ -35,3 +35,4 @@ node_modules/
 
 # direnv has been claimed for Nix usage
 .direnv/
+.kotlin

build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    base
+}

flake.nix

@@ -1,19 +1,29 @@
 {
   description = "A hardware-agnostic serialization protocol for full body tracking (FBT) in VR";
 
-  inputs.nixpkgs.url = "nixpkgs/nixos-22.11";
+  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
+  inputs.nixpkgs-jdk24.url = "github:NixOS/nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1";
+  inputs.nixpkgs-flatbuffers.url = "nixpkgs/nixos-22.11";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, nixpkgs-jdk24, nixpkgs-flatbuffers, flake-utils }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
+        jdkPkgs = import nixpkgs-jdk24 { inherit system; };
+        java = jdkPkgs.javaPackages.compiler.temurin-bin.jdk-24;
+        pkgsFlatbuffers = nixpkgs-flatbuffers.legacyPackages.${system};
       in {
         devShells.default = pkgs.mkShell {
           nativeBuildInputs = [
-            pkgs.flatbuffers
+            pkgsFlatbuffers.flatbuffers
             pkgs.direnv
+            java
           ];
+          shellHook = ''
+            export JAVA_HOME=${java}
+            export PATH="${java}/bin:$PATH"
+          '';
         };
       }
     );

generate-flatbuffer.ps1

@@ -6,11 +6,11 @@ Remove-Item -ErrorAction Ignore -Recurse  protocol/java/src
 Remove-Item -ErrorAction Ignore -Recurse  protocol/cpp/include/solarxr_protocol/generated
 Remove-Item -ErrorAction Ignore -Recurse  protocol/typescript/src
 Remove-Item -ErrorAction Ignore -Recurse  protocol/rust/src/generated
-Remove-Item -ErrorAction Ignore -Recurse  protocol/kotlin/src
+Remove-Item -ErrorAction Ignore -Recurse  protocol/kotlin/src/generated/kotlin
 
 
 ./flatc.exe --java --gen-object-api --gen-all -o protocol/java/src -I ./schema/ ./schema/all.fbs
 ./flatc.exe --cpp --scoped-enums --gen-all -o protocol/cpp/include/solarxr_protocol/generated -I ./schema/ ./schema/all.fbs
 ./flatc.exe --ts --gen-object-api --gen-all -o protocol/typescript/src -I ./schema/ ./schema/all.fbs
 ./flatc.exe --rust --rust-module-root-file --gen-all -o protocol/rust/src/generated ./schema/all.fbs
-./flatc.exe --kotlin --gen-jvmstatic --gen-all -o ./protocol/kotlin/src -I ./schema/ ./schema/all.fbs
+./gradlew.bat :codegen:run --args="-o ./protocol/kotlin/src/generated/kotlin -I ./schema/ ./schema/all.fbs"

generate-flatbuffer.sh

@@ -15,10 +15,10 @@ rm -rf protocol/java/src
 rm -rf protocol/cpp/include/solarxr_protocol/generated
 rm -rf protocol/typescript/src
 rm -rf protocol/rust/src/generated
-rm -rf protocol/kotlin/src
+rm -rf protocol/kotlin/src/generated/kotlin
 
 flatc --java --gen-object-api --gen-all -o ./protocol/java/src -I ./schema/ ./schema/all.fbs && \
 flatc --cpp --scoped-enums --gen-all -o ./protocol/cpp/include/solarxr_protocol/generated -I ./schema/ ./schema/all.fbs && \
 flatc --ts --gen-object-api --gen-all -o ./protocol/typescript/src -I ./schema/ ./schema/all.fbs && \
 flatc --rust --rust-module-root-file --gen-all -o ./protocol/rust/src/generated ./schema/all.fbs && \
-flatc --kotlin --gen-jvmstatic --gen-all -o ./protocol/kotlin/src -I ./schema/ ./schema/all.fbs
+./gradlew :codegen:run --args="-o ./protocol/kotlin/src/generated/kotlin -I ./schema/ ./schema/all.fbs"

protocol/kotlin/gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kotlin-codegen/.gitignore

@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+.kotlin
+# Ignore Gradle build output directory
+build

kotlin-codegen/build.gradle.kts

@@ -0,0 +1,71 @@
+plugins {
+    kotlin("jvm")
+    application
+}
+
+repositories {
+    mavenCentral()
+}
+
+val generatedTestSourcesDir = layout.buildDirectory.dir("generated/test-schemas")
+
+kotlin {
+    jvmToolchain(24)
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_24
+    }
+    sourceSets {
+        test {
+            kotlin.srcDir(generatedTestSourcesDir)
+        }
+    }
+}
+
+application {
+    mainClass = "dev.slimevr.fbscodegen.MainKt"
+}
+
+tasks.named<JavaExec>("run") {
+    dependsOn(tasks.named("classes"))
+    workingDir = projectDir.parentFile
+}
+
+val generateTestSchemas by tasks.registering(JavaExec::class) {
+    dependsOn(tasks.named("classes"))
+    group = "verification"
+    description = "Generates Kotlin fixtures from test FlatBuffers schemas."
+    classpath = sourceSets.main.get().runtimeClasspath
+    mainClass = application.mainClass
+    workingDir = projectDir
+    outputs.dir(generatedTestSourcesDir)
+    doFirst {
+        delete(generatedTestSourcesDir)
+    }
+    args(
+        "-o",
+        generatedTestSourcesDir.get().asFile.absolutePath,
+        "-I",
+        projectDir.resolve("src/test/resources/schemas").absolutePath,
+        projectDir.resolve("src/test/resources/schemas/all.fbs").absolutePath,
+    )
+}
+
+tasks.named("compileTestKotlin") {
+    dependsOn(generateTestSchemas)
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+
+dependencies {
+    implementation("com.squareup:kotlinpoet:2.2.0")
+    val generatedProjectPath = sequenceOf(":solarxr-protocol:generated", ":generated")
+        .firstOrNull { rootProject.findProject(it) != null }
+        ?: error("Cannot find the generated SolarXR protocol project")
+
+    testImplementation(project(generatedProjectPath))
+    testImplementation(gradleTestKit())
+    testImplementation("com.google.flatbuffers:flatbuffers-java:22.10.26")
+    testImplementation(kotlin("test"))
+}