Merge pull request #32 from simplecloudapp/fix/screen-executor

fix: ScreenExecutor

Author: dayyeeet

serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/runner/DefaultServerEnvironment.kt

@@ -7,7 +7,7 @@ import app.simplecloud.droplet.serverhost.runtime.config.environment.Environment
 import app.simplecloud.droplet.serverhost.runtime.config.environment.EnvironmentConfigRepository
 import app.simplecloud.droplet.serverhost.runtime.host.ServerVersionLoader
 import app.simplecloud.droplet.serverhost.runtime.launcher.ServerHostStartCommand
-import app.simplecloud.droplet.serverhost.runtime.process.ProcessFinder
+import app.simplecloud.droplet.serverhost.shared.process.ProcessFinder
 import app.simplecloud.droplet.serverhost.runtime.template.TemplateProvider
 import app.simplecloud.droplet.serverhost.runtime.util.JarMainClass
 import app.simplecloud.droplet.serverhost.runtime.util.ScreenCapabilities
@@ -341,6 +341,7 @@ class DefaultServerEnvironment(
         val process = getProcess(server.uniqueId)
             ?: return false
         val streamer = ScreenCommandExecutor(process.pid())
+        if(!streamer.isScreen()) return false
         streamer.sendCommand(command)
         return true
     }

serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/runner/MetricsTracker.kt

@@ -3,7 +3,7 @@ package app.simplecloud.droplet.serverhost.runtime.runner
 import app.simplecloud.controller.shared.server.Server
 import app.simplecloud.droplet.api.metrics.MetricsEventNames
 import app.simplecloud.droplet.api.time.ProtobufTimestamp
-import app.simplecloud.droplet.serverhost.runtime.process.ProcessInfo
+import app.simplecloud.droplet.serverhost.shared.process.ProcessInfo
 import app.simplecloud.pubsub.PubSubClient
 import build.buf.gen.simplecloud.metrics.v1.Metric
 import build.buf.gen.simplecloud.metrics.v1.MetricMeta

serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/hack/ScreenExecutor.kt

@@ -1,15 +1,15 @@
 package app.simplecloud.droplet.serverhost.shared.hack
 
+import app.simplecloud.droplet.serverhost.shared.process.ProcessInfo
+
 class ScreenExecutor(private var pid: Long) {
+
     private var isScreen = false
 
     init {
         var handle = ProcessHandle.of(pid)
         while (handle.isPresent) {
-            if (handle.get().info().commandLine().orElseGet { "" }.lowercase().startsWith("screen") || handle.get()
-                    .info().command().orElseGet { "" }.lowercase().startsWith("screen") || handle.get().info()
-                    .arguments().orElseGet { arrayOf("none") }.firstOrNull()?.lowercase()?.startsWith("screen") == true
-            ) {
+            if (ProcessInfo.of(handle.get()).getCommand().lowercase().startsWith("screen")) {
                 pid = handle.get().pid()
                 isScreen = true
                 break

…erhost/runtime/process/MacProcessInfo.kt …verhost/shared/process/MacProcessInfo.ktserverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/MacProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/MacProcessInfo.kt serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/MacProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/MacProcessInfo.kt

@@ -1,4 +1,4 @@
-package app.simplecloud.droplet.serverhost.runtime.process
+package app.simplecloud.droplet.serverhost.shared.process
 
 class MacProcessInfo(private val pid: Long) : ProcessInfo {
     override fun getCommand(): String {

serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/ProcessDirectory.kt

@@ -0,0 +1,32 @@
+package app.simplecloud.droplet.serverhost.shared.process
+
+import app.simplecloud.droplet.serverhost.shared.hack.OS
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.util.*
+
+object ProcessDirectory {
+
+    fun of(handle: ProcessHandle): Optional<Path> {
+        val os = OS.get() ?: return Optional.empty()
+        return when (os) {
+            OS.LINUX, OS.MAC -> {
+                ofUnix(handle.pid())
+            }
+            OS.WINDOWS -> {
+                //TODO: Add native code (or leave as is, will still work on windows)
+                Optional.empty()
+            }
+        }
+    }
+
+    private fun ofUnix(pid: Long): Optional<Path> {
+        val path = Paths.get("/proc", pid.toString(), "cwd")
+        return try {
+            Optional.of(Files.readSymbolicLink(path))
+        }catch (e: Exception) {
+            Optional.empty()
+        }
+    }
+}

…verhost/runtime/process/ProcessFinder.kt …rverhost/shared/process/ProcessFinder.ktserverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/ProcessFinder.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/ProcessFinder.kt serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/ProcessFinder.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/ProcessFinder.kt

@@ -1,6 +1,5 @@
-package app.simplecloud.droplet.serverhost.runtime.process
+package app.simplecloud.droplet.serverhost.shared.process
 
-import app.simplecloud.droplet.serverhost.runtime.util.ProcessDirectory
 import java.nio.file.Path
 import java.util.*
 import kotlin.io.path.absolutePathString

…erverhost/runtime/process/ProcessInfo.kt …serverhost/shared/process/ProcessInfo.ktserverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/ProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/ProcessInfo.kt serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/ProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/ProcessInfo.kt

@@ -1,4 +1,4 @@
-package app.simplecloud.droplet.serverhost.runtime.process
+package app.simplecloud.droplet.serverhost.shared.process
 
 import app.simplecloud.droplet.serverhost.shared.hack.OS
 import app.simplecloud.droplet.serverhost.shared.hack.PortProcessHandle

…rhost/runtime/process/UnixProcessInfo.kt …erhost/shared/process/UnixProcessInfo.ktserverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/UnixProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/UnixProcessInfo.kt serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/UnixProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/UnixProcessInfo.kt

@@ -1,4 +1,4 @@
-package app.simplecloud.droplet.serverhost.runtime.process
+package app.simplecloud.droplet.serverhost.shared.process
 
 class UnixProcessInfo(private val pid: Long) : ProcessInfo {
     override fun getCommand(): String {

…st/runtime/process/WindowsProcessInfo.kt …ost/shared/process/WindowsProcessInfo.ktserverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/WindowsProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/WindowsProcessInfo.kt serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/WindowsProcessInfo.kt renamed to serverhost-shared/src/main/kotlin/app/simplecloud/droplet/serverhost/shared/process/WindowsProcessInfo.kt

@@ -1,4 +1,4 @@
-package app.simplecloud.droplet.serverhost.runtime.process
+package app.simplecloud.droplet.serverhost.shared.process
 
 class WindowsProcessInfo(private val pid: Long) : ProcessInfo {
     override fun getCommand(): String {