Merge pull request #67 from rlqu/patch-2

fix: auth is being done even when it's not needed

.github/dependabot.yml

@@ -1,9 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
 # https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 
 version: 2
 updates:
   - package-ecosystem: "gradle"
-    directory: "/"
+    directory: "/" # Location of package manifests
     target-branch: "dev"
     schedule:
       interval: "weekly"

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build and Publish (production builds)
 on:
   push:
     branches:
-      - $default-branch
+      - "master"
     paths-ignore:
       - "docs/**"
 
@@ -37,12 +37,12 @@ jobs:
         env:
           build_number: ${{ github.run_number }}
           build_vcs_number: ${{ github.sha }}
-          branch: ${{ github.ref_name }}
+          branch: ${{ github.head_ref }}
 
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v3
         with:
-          arguments: clean build
+          arguments: build
 
       - name: Copy files
         run: |

.github/workflows/dev_build.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v3
         with:
-          arguments: clean build
+          arguments: build
 
       - name: Copy files
         run: |

README.md

@@ -50,5 +50,6 @@ A redis based cluster cloud system for minecraft.
 - smart server start (retry other nodes on failed start) ✅
 - print server error directly to node console (loop, spam protection) ✅ 
 - clean console design ✅
-- Small further details (designs, small functions) can be changed per property, no code editing needed! 
+- Small further details (designs, small functions) can be changed per property, no code editing needed!
+- updater command ✅
 - ...

build.gradle.kts

@@ -2,7 +2,7 @@ import org.gradle.kotlin.dsl.extra
 
 plugins {
     kotlin("jvm")
-    id("dev.redicloud.libloader") version BuildDependencies.cloudLibloaderVersion apply false
+    id("dev.redicloud.libloader") version Versions.libloader apply false
 }
 
 allprojects {
@@ -19,7 +19,7 @@ allprojects {
     the(dev.redicloud.libloader.plugin.LibraryLoader.LibraryLoaderConfig::class).configurationName.set("dependency")
     the(dev.redicloud.libloader.plugin.LibraryLoader.LibraryLoaderConfig::class).doBootstrapShade.set(false)
 
-    version = BuildDependencies.cloudVersion
+    version = Versions.cloud
 
     repositories {
         maven("https://repo.redicloud.dev/releases")
@@ -29,13 +29,13 @@ allprojects {
     }
 
     dependencies {
-        compileOnly(BuildDependencies.gson)
-        dependency(BuildDependencies.cloudLibloaderBootstrap)
-        dependency(BuildDependencies.kotlinxCoroutines)
-        compileOnly(BuildDependencies.redisson)
-        dependency(BuildDependencies.khttp)
-        dependency(BuildDependencies.kotlinReflect)
-        dependency(BuildDependencies.guice)
+        compileOnly("com.google.code.gson:gson:${Versions.gson}")
+        dependency("dev.redicloud.libloader:libloader-bootstrap:${Versions.libloaderBootstrap}")
+        dependency("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinxCoroutines}")
+        compileOnly("org.redisson:redisson:${Versions.redisson}")
+        dependency("com.github.jkcclemens:khttp:${Versions.khttp}")
+        dependency("org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}")
+        dependency("com.google.inject:guice:${Versions.guice}")
     }
 
     tasks {

buildSrc/build.gradle.kts

@@ -9,4 +9,4 @@ repositories {
 dependencies {
     compileOnly(kotlin("gradle-plugin", "1.8.22"))
     runtimeOnly(kotlin("gradle-plugin", "1.8.22"))
-}
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -0,0 +1,18 @@
+object Versions {
+    const val cloud = "2.2.0-RELEASE"
+    const val kotlin = "1.8.22"
+    const val gson = "2.10.1"
+    const val libloader = "1.6.7"
+    const val libloaderBootstrap = "1.6.7"
+    const val kotlinxCoroutines = "1.8.0"
+    const val redisson = "3.27.1"
+    const val khttp = "0.1.0"
+    const val minecraftVersion = "1.20.1-R0.1-SNAPSHOT"
+    const val netty = "4.1.107.Final" //Check compatibility with redission
+    const val jline = "3.25.1"
+    const val guice = "7.0.0"
+    const val sshd = "2.10.0"
+    const val jsch = "0.1.55"
+    const val bcprov = "1.70"
+    const val logback = "1.4.14"
+}

buildSrc/src/main/kotlin/backup-base-script.gradle.kts

@@ -12,10 +12,10 @@ repositories {
 }
 
 dependencies {
-    implementation(BuildDependencies.gson)
-    implementation(BuildDependencies.cloudLibloaderBootstrap)
-    implementation(BuildDependencies.kotlinxCoroutines)
-    implementation(BuildDependencies.redisson)
+    implementation("com.google.code.gson:gson:${Versions.gson}")
+    implementation("dev.redicloud.libloader:libloader-bootstrap:${Versions.libloaderBootstrap}")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinxCoroutines}")
+    implementation("org.redisson:redisson:${Versions.redisson}")
 }
 
 tasks {

connectors/bukkit-connector/build.gradle.kts

@@ -35,12 +35,12 @@ dependencies {
     shade(project(":logging"))
     shade(project(":console"))
     shade(project(":tasks"))
-    shade(BuildDependencies.cloudLibloaderBootstrap)
+    shade("dev.redicloud.libloader:libloader-bootstrap:${Versions.libloaderBootstrap}")
     shade(project(":modules:module-handler"))
     shade(project(":server-factories:remote-server-factory"))
     shade(project(":apis:connector-api"))
 
-    compileOnly(BuildDependencies.spigotApi)
+    compileOnly("org.spigotmc:spigot-api:${Versions.minecraftVersion}")
     shade(project(":connectors:bukkit-legacy"))
 }
 

connectors/bukkit-connector/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: redicloud-connector
-version: 2.2.1-SNAPSHOT
+version: 2.2.0-RELEASE
 main: dev.redicloud.connector.bukkit.bootstrap.BukkitConnectorBootstrap
 author: RediCloud
 description: RediCloud Connector Bukkit

connectors/bukkit-legacy/build.gradle.kts

@@ -1,18 +1,19 @@
 group = "dev.redicloud.connector"
 
 dependencies {
-    shade(BuildDependencies.redisson) {
+    shade("org.redisson:redisson:${Versions.redisson}") {
         exclude("com.fasterxml.jackson.core")
     }
-    shade(BuildDependencies.gson)
-    shade(BuildDependencies.guice)
-    shade(BuildDependencies.nettyHandler)
-    shade(BuildDependencies.nettyResolverDns)
-    shade(BuildDependencies.nettyResolver)
-    shade(BuildDependencies.nettyTransport)
-    shade(BuildDependencies.nettyBuffer)
-    shade(BuildDependencies.nettyCodec)
-    shade(BuildDependencies.nettyCommon)
-    shade(BuildDependencies.logbackCore.withVersion("1.3.14"))
-    shade(BuildDependencies.logbackClassic.withVersion("1.3.14"))
+    shade("com.google.code.gson:gson:${Versions.gson}")
+    shade("com.google.inject:guice:${Versions.guice}")
+    shade("io.netty:netty-handler:${Versions.netty}")
+    shade("io.netty:netty-resolver-dns:${Versions.netty}")
+    shade("io.netty:netty-resolver:${Versions.netty}")
+    shade("io.netty:netty-transport:${Versions.netty}")
+    shade("io.netty:netty-buffer:${Versions.netty}")
+    shade("io.netty:netty-codec:${Versions.netty}")
+    shade("io.netty:netty-common:${Versions.netty}")
+
+    shade("ch.qos.logback:logback-core:1.3.14")
+    shade("ch.qos.logback:logback-classic:1.3.14")
 }

connectors/bungeecord-connector/build.gradle.kts

@@ -31,9 +31,9 @@ dependencies {
     shade(project(":modules:module-handler"))
     shade(project(":server-factories:remote-server-factory"))
     shade(project(":apis:connector-api"))
-    shade(BuildDependencies.cloudLibloaderBootstrap)
+    shade("dev.redicloud.libloader:libloader-bootstrap:${Versions.libloaderBootstrap}")
 
-    compileOnly(BuildDependencies.bungeeCordApi)
+    compileOnly("net.md-5:bungeecord-api:1.20-R0.3-SNAPSHOT")
 }
 
 tasks.register("buildAndCopy") {

connectors/bungeecord-connector/src/main/resources/bungee.yml

@@ -1,5 +1,5 @@
 name: redicloud-connector
-version: 2.2.1-SNAPSHOT
+version: 2.2.0-RELEASE
 url: https://redicloud.dev
 author: RediCloud
 main: dev.redicloud.connector.bungeecord.bootstrap.BungeeCordConnectorBootstrap

connectors/minestom-connector/build.gradle.kts

@@ -45,10 +45,10 @@ dependencies {
     shade(project(":modules:module-handler"))
     shade(project(":server-factories:remote-server-factory"))
     shade(project(":apis:connector-api"))
-    shade(BuildDependencies.cloudLibloaderBootstrap)
+    shade("dev.redicloud.libloader:libloader-bootstrap:${Versions.libloaderBootstrap}")
 
-    compileOnly(BuildDependencies.minestomApi)
-    compileOnly(BuildDependencies.minestomExtensions)
+    compileOnly("dev.hollowcube:minestom-ce:1619cedc53")
+    compileOnly("dev.hollowcube:minestom-ce-extensions:1.2.0")
 }
 
 tasks.register("buildAndCopy") {

connectors/minestom-connector/src/main/resources/extension.json

@@ -1,7 +1,7 @@
 {
   "entrypoint": "dev.redicloud.connector.minestom.bootstrap.MinestomConnectorBootstrap",
   "name": "redicloud_connector",
-  "version": "2.2.1-SNAPSHOT",
+  "version": "2.2.0-RELEASE",
   "dependencies": [],
   "externalDependencies": {
     "repositories": [],

connectors/velocity-connector/build.gradle.kts

@@ -35,10 +35,10 @@ dependencies {
     shade(project(":server-factories:remote-server-factory"))
     shade(project(":modules:module-handler"))
     shade(project(":apis:connector-api"))
-    shade(BuildDependencies.cloudLibloaderBootstrap)
+    shade("dev.redicloud.libloader:libloader-bootstrap:${Versions.libloaderBootstrap}")
 
-    compileOnly(BuildDependencies.velocityApi)
-    kapt(BuildDependencies.velocityApi)
+    compileOnly("com.velocitypowered:velocity-api:3.1.1")
+    kapt("com.velocitypowered:velocity-api:3.1.1")
 }
 
 tasks.register("buildAndCopy") {

connectors/velocity-connector/src/main/kotlin/dev/redicloud/connector/velocity/bootstrap/VelocityConnectorBootstrap.kt

@@ -19,7 +19,7 @@ import kotlin.system.exitProcess
 @Plugin(
     id = "redicloud-connector",
     name = "redicloud-connector-velocity",
-    version = "2.2.1-SNAPSHOT",
+    version = "2.2.0-RELEASE",
     url = "https://redicloud.dev",
     authors = ["RediCloud"]
 )

console/build.gradle.kts

@@ -18,6 +18,6 @@ dependencies {
 
     testImplementation(project(":commands:command-api"))
 
-    dependency(BuildDependencies.jlineConsole)
-    dependency(BuildDependencies.jlineJansi)
+    dependency("org.jline:jline-console:${Versions.jline}")
+    dependency("org.jline:jline-terminal-jansi:${Versions.jline}")
 }

database/build.gradle.kts

@@ -8,8 +8,7 @@ dependencies {
     compileOnly(project(":utils"))
     compileOnly(project(":apis:base-api"))
     compileOnly(project(":logging"))
-    compileOnly(project(":tasks"))
 
-    dependency(BuildDependencies.redisson)
-    dependency(BuildDependencies.gson)
+    dependency("org.redisson:redisson:${Versions.redisson}")
+    dependency("com.google.code.gson:gson:${Versions.gson}")
 }

database/src/main/kotlin/dev/redicloud/database/DatabaseConnection.kt

@@ -7,11 +7,9 @@ import dev.redicloud.logging.LogManager
 import dev.redicloud.api.service.ServiceId
 import dev.redicloud.api.service.ServiceType
 import org.redisson.Redisson
-import org.redisson.api.RLock
 import org.redisson.api.RedissonClient
 import org.redisson.client.codec.BaseCodec
 import org.redisson.config.Config
-import java.util.concurrent.TimeUnit
 
 class DatabaseConnection(
     config: DatabaseConfiguration,
@@ -30,15 +28,15 @@ class DatabaseConnection(
     private val redissonConfig = Config()
     private var client: RedissonClient? = null
     private val repositories = mutableListOf<DatabaseRepository<*>>()
-    var lock: RLock? = null
 
     init {
         redissonConfig
             .setCodec(codec)
         if (config.isCluster()) {
             val clusterConfig = redissonConfig.useClusterServers()
-                .setClientName(serviceId.toName())
-                .setPassword(config.password)
+                .setClientName(serviceId.toName()).also {
+                    if(config.password.isNotEmpty()) it.setPassword(config.password)
+                }
             if (!config.username.isNullOrEmpty()) {
                 clusterConfig.setUsername(config.username)
             }
@@ -55,11 +53,12 @@ class DatabaseConnection(
                 .setAddress(config.nodes.first().toConnectionString())
                 .setDatabase(config.databaseId)
                 .setClientName(serviceId.toName())
-                .setPassword(config.password)
                 .setConnectionPoolSize(connectionPoolSize)
                 .setSubscriptionConnectionPoolSize(subscriptionConnectionPoolSize)
                 .setConnectionMinimumIdleSize(connectionMinimumIdleSize)
-                .setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize)
+                .setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize).also {
+                    if(config.password.isNotEmpty()) it.setPassword(config.password)
+                }
             if (!config.username.isNullOrEmpty()) {
                 singleConfig.setUsername(config.username)
             }
@@ -68,20 +67,11 @@ class DatabaseConnection(
 
     suspend fun connect() {
         client = Redisson.create(redissonConfig)
-        lock = client!!.getLock("cloud:locks:${serviceId.toDatabaseIdentifier()}")
-        if (lock!!.isLocked) {
-            throw IllegalStateException("Service is already started (${serviceId.toName()}) !")
-        }
         LOGGER.fine("Successfully connected to redis")
     }
 
     fun disconnect() {
-        if (isConnected()) {
-            if (lock?.isLocked == true) {
-                lock?.forceUnlock()
-            }
-            client!!.shutdown()
-        }
+        if (isConnected()) client!!.shutdown()
         LOGGER.fine("Successfully disconnected from redis")
     }
 
@@ -92,4 +82,4 @@ class DatabaseConnection(
 
     fun getClient(): RedissonClient = client!!
 
-}
+}