Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	gradle/libs.versions.toml

Author: FllipEis

.github/workflows/release.yml

@@ -97,25 +97,13 @@ jobs:
 
       - name: Publish to SimpleCloud Repository
         run: |
-          if [[ "${{ steps.version.outputs.CHANNEL }}" == "release" ]]; then
-            export GPG_TTY=$(tty)
-            export GRADLE_OPTS="-Dorg.gradle.daemon=false"
-            ./gradlew --no-daemon --parallel --build-cache publishMavenJavaPublicationToSimplecloudRepository \
-              -PreleaseType=${{ steps.version.outputs.CHANNEL }} \
-              -Pversion=${{ steps.version.outputs.VERSION }} \
-              -Psigning.gnupg.keyName="${{ secrets.GPG_PRIVATE_KEY }}" \
-              -Psigning.gnupg.passphrase="${{ secrets.GPG_PASSPHRASE }}"
-          else
-            ./gradlew --parallel --build-cache publishMavenJavaPublicationToSimplecloudRepository \
-              -PreleaseType=${{ steps.version.outputs.CHANNEL }} \
-              -Pversion=${{ steps.version.outputs.VERSION }}
-          fi
+          ./gradlew --parallel --build-cache publishMavenJavaPublicationToSimplecloudRepository \
+            -PreleaseType=${{ steps.version.outputs.CHANNEL }} \
+            -Pversion=${{ steps.version.outputs.VERSION }}
         env:
           COMMIT_HASH: ${{ env.COMMIT_HASH }}
           SIMPLECLOUD_USERNAME: ${{ secrets.SIMPLECLOUD_USERNAME }}
           SIMPLECLOUD_PASSWORD: ${{ secrets.SIMPLECLOUD_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
-          ORG_GRADLE_PROJECT_signingPassphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Prepare Artifacts
         run: |
@@ -147,4 +135,4 @@ jobs:
           prerelease: ${{ steps.version.outputs.CHANNEL != 'release' }}
           files: release-artifacts/*.jar
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/ControllerRuntime.kt

@@ -43,7 +43,14 @@ class ControllerRuntime(
     private val serverRepository = ServerRepository(database, numericalIdRepository)
     private val hostRepository = ServerHostRepository()
     private val serverHostAttacher = ServerHostAttacher(hostRepository, serverRepository)
-    private val dropletRepository = DropletRepository(authCallCredentials, serverHostAttacher, controllerStartCommand.envoyStartPort, hostRepository)
+    private val dropletRepository = DropletRepository(
+        authCallCredentials,
+        serverHostAttacher,
+        controllerStartCommand.grpcHost,
+        controllerStartCommand.envoyPort,
+        controllerStartCommand.envoyStartPort,
+        hostRepository
+    )
     private val pubSubService = PubSubService()
     private val controlPlaneServer = ControlPlaneServer(controllerStartCommand, dropletRepository)
     private val authServer = OAuthServer(controllerStartCommand, database)

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/YamlDirectoryRepository.kt

@@ -140,7 +140,6 @@ abstract class YamlDirectoryRepository<E, I>(
                             if (entity != null) {
                                 watcherEvents.onDelete(entity)
                             }
-                            deleteFile(resolvedPath.toFile())
                         }
                     }
                 }

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/droplet/DropletRepository.kt

@@ -16,12 +16,14 @@ import kotlinx.coroutines.launch
 class DropletRepository(
     private val authCallCredentials: AuthCallCredentials,
     private val serverHostAttacher: ServerHostAttacher,
+    envoyHost: String,
+    envoyPort: Int,
     private val envoyStartPort: Int,
     private val serverHostRepository: ServerHostRepository,
 ) : Repository<Droplet, String> {
 
     private val currentDroplets = mutableListOf<Droplet>()
-    private val dropletCache = DropletCache()
+    private val dropletCache = DropletCache(envoyHost, envoyPort)
 
     override suspend fun getAll(): List<Droplet> {
         return currentDroplets

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/envoy/DropletCache.kt

@@ -53,6 +53,9 @@ class ControllerStartCommand(
     val envoyStartPort: Int by option(help = "Envoy start port (default: 8080)", envvar = "ENVOY_START_PORT").int()
         .default(8080)
 
+    val envoyPort: Int by option(help = "Envoy port (default: 8090)", envvar = "ENVOY_PORT").int()
+        .default(1337)
+
     private val authSecretPath: Path by option(
         help = "Path to auth secret file (default: .auth.secret)",
         envvar = "AUTH_SECRET_PATH"

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/launcher/ControllerStartCommand.kt

@@ -22,14 +22,13 @@ class ServerRepository(
 ) : LoadableRepository<Server, String> {
 
     override suspend fun find(identifier: String): Server? {
-       return database.context.selectFrom(CLOUD_SERVERS)
+        return database.context.selectFrom(CLOUD_SERVERS)
             .where(CLOUD_SERVERS.UNIQUE_ID.eq(identifier))
             .limit(1)
             .awaitFirstOrNull()
             ?.let { record -> mapCloudServersRecordToServer(record) }
     }
 
-
     suspend fun findServerByNumerical(group: String, id: Int): Server? {
         return database.context.selectFrom(CLOUD_SERVERS)
             .where(
@@ -121,7 +120,6 @@ class ServerRepository(
         }
     }
 
-    @Synchronized
     override fun save(element: Server) {
         numericalIdRepository.saveNumericalId(element.group, element.numericalId)
 

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/server/ServerRepository.kt

@@ -60,7 +60,7 @@ class ServerService(
             return stopServer(server.toDefinition(), request.stopCause)
         } catch (e: Exception) {
             throw StatusException(
-                Status.INTERNAL.withDescription("Error occured whilest cleaning up stopped server: ").withCause(e)
+                Status.INTERNAL.withDescription("Error occurred whilst cleaning up stopped server: ").withCause(e)
             )
         }
     }
@@ -216,7 +216,9 @@ class ServerService(
                 startedServers.add(server)
             }
         } catch (e: Exception) {
-            throw StatusException(Status.INTERNAL.withDescription("Error whilst starting multiple servers").withCause(e))
+            throw StatusException(
+                Status.INTERNAL.withDescription("Error whilst starting multiple servers").withCause(e)
+            )
         }
 
         return StartMultipleServerResponse.newBuilder()
@@ -245,7 +247,6 @@ class ServerService(
         val server = buildServer(group, numericalId)
         serverRepository.save(server)
         val stub = host.stub ?: throw StatusException(Status.INTERNAL.withDescription("Server host has no stub"))
-        serverRepository.save(server)
         try {
             val result = stub.startServer(
                 ServerHostStartServerRequest.newBuilder()
@@ -263,7 +264,7 @@ class ServerService(
         }
     }
 
-    private suspend fun publishServerStartEvents(server: ServerDefinition, startCause: ServerStartCause) {
+    private fun publishServerStartEvents(server: ServerDefinition, startCause: ServerStartCause) {
         pubSubClient.publish(
             "event", ServerStartEvent.newBuilder()
                 .setServer(server)
@@ -380,7 +381,7 @@ class ServerService(
 
         try {
             timeout?.let {
-                group.timeout = GroupTimeout(it);
+                group.timeout = GroupTimeout(it)
             }
 
             groupServers.forEach { server ->