feat: coroutines, pub sub, property env, dev workflow

.github/workflows/release-dev.yml

@@ -0,0 +1,74 @@
+name: Create Release with ShadowJars
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build ShadowJars and Create Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: develop  # Ensure it works from the develop branch
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '21'
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            gradle-${{ runner.os }}
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Build ShadowJars
+        run: ./gradlew clean build shadowJar
+
+      - name: Get Gradle Version
+        id: gradle_version
+        run: echo "GRADLE_VERSION=$(./gradlew properties -q | grep "version:" | awk '{print $2}')" >> $GITHUB_ENV
+
+      - name: Get Commit Hash
+        id: commit_hash
+        run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        with:
+          tag_name: v${{ env.GRADLE_VERSION }}-dev.${{ env.COMMIT_HASH }}
+          release_name: v${{ env.GRADLE_VERSION }}-dev.${{ env.COMMIT_HASH }}
+          draft: false
+          prerelease: true
+          commitish: develop
+          body: |
+            This release contains dev builds for all Gradle modules.
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload ShadowJars to Release
+        run: |
+          # Find JAR files in any submodule's build/libs directory
+          for jar in $(find . -type f -name "*.jar" -path "*/build/libs/*.jar" -not -path "./build/libs/*"); do
+          # Check if the filename contains a version number (e.g., a dash followed by numbers)
+            if [[ $(basename "$jar") =~ -[0-9]+\.[0-9]+ ]]; then
+              echo "Skipping $jar due to version number"
+            else
+              echo "Uploading $jar"
+              gh release upload v${{ env.GRADLE_VERSION }}-dev.${{ env.COMMIT_HASH }} "$jar"
+            fi
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -1,5 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin)
@@ -10,7 +9,7 @@ plugins {
 
 allprojects {
     group = "app.simplecloud.controller"
-    version = "0.0.27-EXPERIMENTAL"
+    version = "0.0.30"
 
     repositories {
         mavenCentral()
@@ -20,7 +19,7 @@ allprojects {
 
 subprojects {
     apply(plugin = "org.jetbrains.kotlin.jvm")
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "com.gradleup.shadow")
     apply(plugin = "net.thebugmc.gradle.sonatype-central-portal-publisher")
     apply(plugin = "maven-publish")
 
@@ -42,11 +41,10 @@ subprojects {
     }
 
     kotlin {
-        jvmToolchain(17)
-    }
-
-    tasks.withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "17"
+        jvmToolchain(21)
+        compilerOptions {
+            apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        }
     }
 
     tasks.named("shadowJar", ShadowJar::class) {

controller-api/src/main/kotlin/app/simplecloud/controller/api/ControllerApi.kt

@@ -1,39 +1,89 @@
 package app.simplecloud.controller.api
 
-import app.simplecloud.controller.api.impl.ControllerApiImpl
+import app.simplecloud.controller.api.impl.coroutines.ControllerApiCoroutineImpl
+import app.simplecloud.controller.api.impl.future.ControllerApiFutureImpl
+import app.simplecloud.pubsub.PubSubClient
 
 interface ControllerApi {
 
-    /**
-     * @return the Controller [GroupApi]
-     */
-    fun getGroups(): GroupApi
+    interface Future {
 
-    /**
-     * @return the Controller [ServerApi]
-     */
-    fun getServers(): ServerApi
+        /**
+         * @return the Controller [GroupApi.Future]
+         */
+        fun getGroups(): GroupApi.Future
+
+        /**
+         * @return the Controller [ServerApi.Future]
+         */
+        fun getServers(): ServerApi.Future
+
+        /**
+         * @return the [PubSubClient] to subscribe to Controller events and send messages
+         */
+        fun getPubSubClient(): PubSubClient
+
+    }
+
+    interface Coroutine {
+
+        /**
+         * @return the Controller [GroupApi.Coroutine]
+         */
+        fun getGroups(): GroupApi.Coroutine
+
+        /**
+         * @return the Controller [ServerApi.Coroutine]
+         */
+        fun getServers(): ServerApi.Coroutine
+
+        /**
+         * @return the [PubSubClient] to subscribe to Controller events and send messages
+         */
+        fun getPubSubClient(): PubSubClient
+
+    }
 
     companion object {
 
         /**
-         * Creates a new [ControllerApi] instance
-         * @return the created [ControllerApi]
+         * Creates a new [ControllerApi.Future] instance
+         * @return the created [ControllerApi.Future]
+         */
+        @JvmStatic
+        fun createFutureApi(): Future {
+            val authSecret = System.getenv("CONTROLLER_SECRET")
+            return createFutureApi(authSecret)
+        }
+
+        /**
+         * Creates a new [ControllerApi.Future] instance
+         * @param authSecret the authentication key used by the Controller
+         * @return the created [ControllerApi.Future]
+         */
+        @JvmStatic
+        fun createFutureApi(authSecret: String): Future {
+            return ControllerApiFutureImpl(authSecret)
+        }
+
+        /**
+         * Creates a new [ControllerApi.Coroutine] instance
+         * @return the created [ControllerApi.Coroutine]
          */
         @JvmStatic
-        fun create(): ControllerApi {
+        fun createCoroutineApi(): Coroutine {
             val authSecret = System.getenv("CONTROLLER_SECRET")
-            return create(authSecret)
+            return createCoroutineApi(authSecret)
         }
 
         /**
-         * Creates a new [ControllerApi] instance
+         * Creates a new [ControllerApi.Coroutine] instance
          * @param authSecret the authentication key used by the Controller
-         * @return the created [ControllerApi]
+         * @return the created [ControllerApi.Coroutine]
          */
         @JvmStatic
-        fun create(authSecret: String): ControllerApi {
-            return ControllerApiImpl(authSecret)
+        fun createCoroutineApi(authSecret: String): Coroutine {
+            return ControllerApiCoroutineImpl(authSecret)
         }
 
     }

controller-api/src/main/kotlin/app/simplecloud/controller/api/GroupApi.kt

@@ -6,38 +6,80 @@ import java.util.concurrent.CompletableFuture
 
 interface GroupApi {
 
-    /**
-     * @param name the name of the group.
-     * @return a [CompletableFuture] with the [Group].
-     */
-    fun getGroupByName(name: String): CompletableFuture<Group>
-
-    /**
-     * @param name the name of the group.
-     * @return the deleted [Group].
-     */
-    fun deleteGroup(name: String): CompletableFuture<Group>
-
-    /**
-     * @param group the [Group] to create.
-     * @return the created [Group].
-     */
-    fun createGroup(group: Group): CompletableFuture<Group>
-
-    /**
-     * @param group the [Group] to update.
-     * @return the updated [Group].
-     */
-    fun updateGroup(group: Group): CompletableFuture<Group>
-    /**
-     * @return a [CompletableFuture] with a list of all groups.
-     */
-    fun getAllGroups(): CompletableFuture<List<Group>>
-
-    /**
-     * @param type the [ServerType] of the group
-     * @return a [CompletableFuture] with a list of all groups matching this type.
-     */
-    fun getGroupsByType(type: ServerType): CompletableFuture<List<Group>>
+    interface Future {
+
+        /**
+         * @param name the name of the group.
+         * @return a [CompletableFuture] with the [Group].
+         */
+        fun getGroupByName(name: String): CompletableFuture<Group>
+
+        /**
+         * @param name the name of the group.
+         * @return the deleted [Group].
+         */
+        fun deleteGroup(name: String): CompletableFuture<Group>
+
+        /**
+         * @param group the [Group] to create.
+         * @return the created [Group].
+         */
+        fun createGroup(group: Group): CompletableFuture<Group>
+
+        /**
+         * @param group the [Group] to update.
+         * @return the updated [Group].
+         */
+        fun updateGroup(group: Group): CompletableFuture<Group>
+        /**
+         * @return a [CompletableFuture] with a list of all groups.
+         */
+        fun getAllGroups(): CompletableFuture<List<Group>>
+
+        /**
+         * @param type the [ServerType] of the group
+         * @return a [CompletableFuture] with a list of all groups matching this type.
+         */
+        fun getGroupsByType(type: ServerType): CompletableFuture<List<Group>>
+
+    }
+
+    interface Coroutine {
+
+        /**
+         * @param name the name of the group.
+         * @return the [Group].
+         */
+        suspend fun getGroupByName(name: String): Group
+
+        /**
+         * @param name the name of the group.
+         * @return the deleted [Group].
+         */
+        suspend fun deleteGroup(name: String): Group
+
+        /**
+         * @param group the [Group] to create.
+         * @return the created [Group].
+         */
+        suspend fun createGroup(group: Group): Group
+
+        /**
+         * @param group the [Group] to update.
+         * @return the updated [Group].
+         */
+        suspend fun updateGroup(group: Group): Group
+        /**
+         * @return a list of all groups.
+         */
+        suspend fun getAllGroups(): List<Group>
+
+        /**
+         * @param type the [ServerType] of the group
+         * @return a list of all groups matching this type.
+         */
+        suspend fun getGroupsByType(type: ServerType): List<Group>
+
+    }
 
 }