fix: better mac support

Author: FllipEis

serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/config/environment/generators/ScreenEnvironmentConfigGenerator.kt

@@ -5,6 +5,7 @@ import app.simplecloud.droplet.serverhost.runtime.config.environment.Environment
 import app.simplecloud.droplet.serverhost.runtime.config.environment.EnvironmentStartConfig
 import app.simplecloud.droplet.serverhost.runtime.launcher.ServerHostStartCommand
 import app.simplecloud.droplet.serverhost.runtime.util.ScreenCapabilities
+import app.simplecloud.droplet.serverhost.shared.hack.OS
 import java.nio.file.Paths
 import kotlin.io.path.absolutePathString
 
@@ -39,7 +40,7 @@ object ScreenEnvironmentConfigGenerator : EnvironmentConfigGenerator {
         return EnvironmentConfig(
             name = getName(),
             isScreen = true,
-            useScreenStop = true,
+            useScreenStop = OS.get() == OS.LINUX,
             start = EnvironmentStartConfig(
                 command = command
             )

serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/MacProcessInfo.kt

@@ -0,0 +1,30 @@
+package app.simplecloud.droplet.serverhost.runtime.process
+
+class MacProcessInfo(private val pid: Long) : ProcessInfo {
+    override fun getCommand(): String {
+        val cmd = Runtime.getRuntime().exec(arrayOf("ps", "-p", pid.toString(), "-o", "command="))
+        return cmd.inputReader(Charsets.UTF_8).readText().trim()
+    }
+
+    override fun getRamAndCpuPercent(): Pair<Double, Double> {
+        val cmd = Runtime.getRuntime()
+            .exec(arrayOf("ps", "-p", pid.toString(), "-o", "%cpu,%mem="))
+        var cpu = 0.0
+        var mem = 0.0
+        cmd.inputReader(Charsets.UTF_8).use { reader ->
+            reader.readLines().forEach { line ->
+                val resultString = line.trim()
+                val result = resultString.split("\\s+".toRegex())
+                if (result.size >= 2) {
+                    cpu = result[0].toDoubleOrNull() ?: 0.0
+                    mem = result[1].toDoubleOrNull() ?: 0.0
+                }
+            }
+        }
+        return Pair(mem, cpu)
+    }
+
+    override fun asHandle(): ProcessHandle {
+        return ProcessHandle.of(pid).get()
+    }
+}

serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/process/ProcessInfo.kt

@@ -26,14 +26,9 @@ interface ProcessInfo {
 
         fun of(pid: Long): ProcessInfo {
             return when(OS.get()) {
-                OS.WINDOWS -> {
-                    WindowsProcessInfo(pid)
-                }
-
-                OS.UNIX -> {
-                    UnixProcessInfo(pid)
-                }
-
+                OS.WINDOWS -> WindowsProcessInfo(pid)
+                OS.LINUX -> UnixProcessInfo(pid)
+                OS.MAC -> MacProcessInfo(pid)
                 null -> throw IllegalArgumentException("Unknown OS")
             }
         }

serverhost-runtime/src/main/kotlin/app/simplecloud/droplet/serverhost/runtime/util/ProcessDirectory.kt

@@ -11,7 +11,7 @@ object ProcessDirectory {
     fun of(handle: ProcessHandle): Optional<Path> {
         val os = OS.get() ?: return Optional.empty()
         return when (os) {
-            OS.UNIX -> {
+            OS.LINUX, OS.MAC -> {
                 ofUnix(handle.pid())
             }
             OS.WINDOWS -> {

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

@@ -2,7 +2,8 @@ package app.simplecloud.droplet.serverhost.shared.hack
 
 enum class OS(val names: List<String>) {
     WINDOWS(listOf("windows")),
-    UNIX(listOf("mac", "linux"));
+    LINUX(listOf("linux")),
+    MAC(listOf("mac"));
 
     companion object {
         fun get(): OS? {
@@ -15,4 +16,4 @@ enum class OS(val names: List<String>) {
             return null
         }
     }
-}
+}

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

@@ -17,7 +17,7 @@ object PortProcessHandle {
     fun of(port: Int): Optional<ProcessHandle> {
         val os = OS.get() ?: return Optional.empty()
         val command = when (os) {
-            OS.UNIX -> arrayOf("sh", "-c", "lsof -i :$port | awk '{print \$2}'")
+            OS.LINUX, OS.MAC -> arrayOf("sh", "-c", "lsof -i :$port | awk '{print \$2}'")
             OS.WINDOWS -> arrayOf("cmd", "/c", "netstat -ano | findstr $port")
         }
 
@@ -37,7 +37,7 @@ object PortProcessHandle {
 
     private fun parseProcessIdOrNull(os: OS, line: String): Long? {
         return when (os) {
-            OS.UNIX -> line.toLongOrNull()
+            OS.LINUX, OS.MAC -> line.toLongOrNull()
             OS.WINDOWS -> {
                 val matcher = windowsPattern.matcher(line)
                 if (!matcher.matches()) {