Shutdown webserver before starting new one

Author: adrwa

src/main/kotlin/org/sandboxpowered/fabric/Main.kt

@@ -14,7 +14,7 @@ object Main {
     lateinit var resourceManager: ServerResourceManager
 
     val loader = SandboxLoader()
-    lateinit var webServer: WebServer
+    var webServer: WebServer? = null
 
     fun startSandboxInternals() {
 
@@ -28,15 +28,19 @@ object Main {
     fun startSandboxDedicatedServer() {
         initSandboxContent()
         loader.load(Side.SERVER)
-        webServer = WebServer()
-        webServer.start()
+        webServer?.stop()
+        webServer = WebServer().apply { start() }
     }
 
     fun startSandboxClient() {
         initSandboxContent()
         loader.load(Side.CLIENT)
     }
 
+    fun shutdownSandbox() {
+        webServer?.stop()
+    }
+
     private fun initSandboxContent() {
         val c = Properties::class.java
         c.declaredFields.forEach {

src/main/kotlin/org/sandboxpowered/fabric/loading/WebServer.kt

@@ -8,15 +8,17 @@ import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 import org.apache.logging.log4j.LogManager.getLogger
 import team.yi.ktor.features.banner
+import java.util.concurrent.TimeUnit
 import kotlin.io.path.Path
 import kotlin.io.path.isDirectory
 import kotlin.io.path.notExists
 
 class WebServer {
     private val globalPath = Path(".sandbox/cache/").toAbsolutePath()
+    private var server: NettyApplicationEngine? = null
     fun start() {
         val log = getLogger()
-        embeddedServer(Netty, port = 25566) {
+        server = embeddedServer(Netty, port = 25566) {
             banner {
                 bannerText = "Sandbox 2"
 
@@ -41,12 +43,17 @@ class WebServer {
                                 HttpStatusCode.Forbidden,
                                 "Invalid Access"
                             )
-                            cachePath.notExists() or cachePath.isDirectory() -> call.respond(HttpStatusCode.NotFound, "Unknown Path")
+                            cachePath.notExists() or cachePath.isDirectory() -> call.respond(HttpStatusCode.NotFound,
+                                "Unknown Path")
                             else -> call.respondFile(cachePath.toFile())
                         }
                     }
                 }
             }
         }.start(false)
     }
+
+    fun stop() {
+        server?.stop(10, 10, TimeUnit.SECONDS)
+    }
 }