Move serial communication to desktop subproject (#756)

Co-authored-by: Erimel <[email protected]>
SlimeVR · Jul 30, 2023 · f84efc4 · f84efc4
1 parent 414482c
commit f84efc4
Show file tree

Hide file tree

Showing 12 changed files with 355 additions and 346 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/server/core/build.gradle.kts b/server/core/build.gradle.kts
@@ -6,7 +6,6 @@
  * User Manual available at https://docs.gradle.org/6.3/userguide/java_library_plugin.html
  */
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.io.ByteArrayOutputStream
 
 plugins {
 	kotlin("jvm")
@@ -64,7 +63,6 @@ dependencies {
 	implementation("org.apache.commons:commons-collections4:4.4")
 
 	implementation("com.illposed.osc:javaosc-core:0.8")
-	implementation("com.fazecast:jSerialComm:2.+")
 	implementation("org.java-websocket:Java-WebSocket:1.+")
 	implementation("com.melloware:jintellitype:1.+")
 	implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
@@ -79,13 +77,3 @@ dependencies {
 tasks.test {
 	useJUnitPlatform()
 }
-
-fun String.runCommand(currentWorkingDir: File = file("./")): String {
-	val byteOut = ByteArrayOutputStream()
-	project.exec {
-		workingDir = currentWorkingDir
-		commandLine = this@runCommand.split("\\s".toRegex())
-		standardOutput = byteOut
-	}
-	return String(byteOut.toByteArray()).trim()
-}
diff --git a/server/core/src/main/java/dev/slimevr/VRServer.kt b/server/core/src/main/java/dev/slimevr/VRServer.kt
@@ -14,6 +14,7 @@ import dev.slimevr.protocol.ProtocolAPI
 import dev.slimevr.reset.ResetHandler
 import dev.slimevr.serial.ProvisioningHandler
 import dev.slimevr.serial.SerialHandler
+import dev.slimevr.serial.SerialHandlerStub
 import dev.slimevr.setup.TapSetupHandler
 import dev.slimevr.status.StatusSystem
 import dev.slimevr.tracking.processor.HumanPoseManager
@@ -44,8 +45,9 @@ typealias SteamBridgeProvider = (
 const val SLIMEVR_IDENTIFIER = "dev.slimevr.SlimeVR"
 
 class VRServer @JvmOverloads constructor(
-	driverBridgeProvider: SteamBridgeProvider = { _: VRServer, _: Tracker, _: List<Tracker> -> null },
-	feederBridgeProvider: (VRServer) -> ISteamVRBridge? = { _: VRServer -> null },
+	driverBridgeProvider: SteamBridgeProvider = { _, _, _ -> null },
+	feederBridgeProvider: (VRServer) -> ISteamVRBridge? = { _ -> null },
+	serialHandlerProvider: (VRServer) -> SerialHandler = { _ -> SerialHandlerStub() },
 	// configPath is used by VRWorkout, do not remove!
 	configPath: String,
 ) : Thread("VRServer") {
@@ -101,7 +103,7 @@ class VRServer @JvmOverloads constructor(
 		configManager = ConfigManager(configPath)
 		configManager.loadConfig()
 		deviceManager = DeviceManager(this)
-		serialHandler = SerialHandler()
+		serialHandler = serialHandlerProvider(this)
 		provisioningHandler = ProvisioningHandler(this)
 		resetHandler = ResetHandler()
 		tapSetupHandler = TapSetupHandler()

diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/serial/RPCSerialHandler.java b/server/core/src/main/java/dev/slimevr/protocol/rpc/serial/RPCSerialHandler.java
@@ -1,11 +1,11 @@
 package dev.slimevr.protocol.rpc.serial;
 
-import com.fazecast.jSerialComm.SerialPort;
 import com.google.flatbuffers.FlatBufferBuilder;
 import dev.slimevr.protocol.GenericConnection;
 import dev.slimevr.protocol.ProtocolAPI;
 import dev.slimevr.protocol.rpc.RPCHandler;
 import dev.slimevr.serial.SerialListener;
+import dev.slimevr.serial.SerialPort;
 import io.eiren.util.logging.LogManager;
 import solarxr_protocol.rpc.*;
 

diff --git a/server/core/src/main/java/dev/slimevr/serial/ProvisioningHandler.java b/server/core/src/main/java/dev/slimevr/serial/ProvisioningHandler.java
@@ -1,8 +1,8 @@
 package dev.slimevr.serial;
 
-import com.fazecast.jSerialComm.SerialPort;
 import dev.slimevr.VRServer;
 import io.eiren.util.logging.LogManager;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.Timer;
@@ -107,7 +107,7 @@ else if (this.provisioningStatus == ProvisioningStatus.LOOKING_FOR_SERVER)
 
 
 	@Override
-	public void onSerialConnected(SerialPort port) {
+	public void onSerialConnected(@NotNull SerialPort port) {
 		if (!isRunning)
 			return;
 		this.tryProvisioning();
@@ -121,7 +121,7 @@ public void onSerialDisconnected() {
 	}
 
 	@Override
-	public void onSerialLog(String str) {
+	public void onSerialLog(@NotNull String str) {
 		if (!isRunning)
 			return;