Merge pull request #22 from renvins/feat/reduce-size-influxdb

Extremely reduce size of plugin/mod jars

Author: renvins

api/build.gradle.kts

@@ -15,10 +15,6 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    api("com.influxdb:influxdb-client-java:7.2.0")
-}
-
 publishing {
     publications {
         create<MavenPublication>("maven") {

api/src/main/java/it/renvins/serverpulse/api/data/LineProtocolPoint.java

@@ -0,0 +1,69 @@
+package it.renvins.serverpulse.api.data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Represents a single point in the InfluxDB line protocol format.
+ * This class is used to construct a line protocol point with measurement, tags, fields, and timestamp.
+ */
+public class LineProtocolPoint {
+
+    private final String measurement;
+    private final Map<String, String> tags;
+    private final Map<String, Object> fields;
+    private long timestamp;
+
+    public LineProtocolPoint(String measurement) {
+        this.measurement = measurement;
+        this.tags = new HashMap<>();
+        this.fields = new HashMap<>();
+    }
+
+    public LineProtocolPoint addTag(String key, String value) {
+        tags.put(key, value);
+        return this;
+    }
+
+    public LineProtocolPoint addField(String key, Object value) {
+        fields.put(key, value);
+        return this;
+    }
+
+    public LineProtocolPoint setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+        return this;
+    }
+
+    public String toLineProtocol() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(measurement);
+
+        if (!tags.isEmpty()) {
+            sb.append(",");
+            tags.forEach((key, value) -> sb.append(key).append("=").append(value).append(","));
+            sb.setLength(sb.length() - 1); // Remove the last comma
+        }
+
+        sb.append(" ");
+
+        if (!fields.isEmpty()) {
+            fields.forEach((key, value) -> {
+                sb.append(key).append("=");
+                if (value instanceof String) {
+                    sb.append("\"").append(value).append("\"");
+                } else if (value instanceof Integer || value instanceof Long) {
+                    sb.append(value).append("i");
+                } else {
+                    sb.append(value);
+                }
+                sb.append(",");
+            });
+            sb.setLength(sb.length() - 1); // Remove the last comma
+        }
+
+        sb.append(" ").append(timestamp);
+
+        return sb.toString();
+    }
+}

api/src/main/java/it/renvins/serverpulse/api/service/IDatabaseService.java

@@ -1,10 +1,16 @@
 package it.renvins.serverpulse.api.service;
 
-import com.influxdb.client.InfluxDBClient;
-import com.influxdb.client.WriteApi;
+import java.util.concurrent.CompletableFuture;
 
 public interface IDatabaseService extends Service {
 
+    /**
+     * Writes a line protocol string to the InfluxDB instance.
+     * @param lineProtocol The line protocol string to write.
+     * @return A CompletableFuture that completes with true if the write was successful, false otherwise.
+     */
+    CompletableFuture<Boolean> writeLineProtocol(String lineProtocol);
+
     /**
      * Performs a health check ping to the InfluxDB instance.
      * Should only be called internally by connect() or dedicated health checks.
@@ -13,16 +19,15 @@ public interface IDatabaseService extends Service {
     boolean ping();
 
     /**
-     * Returns the last known connection status. Does not perform a live check.
-     * @return true if the service believes it's connected, false otherwise.
+     * Sets the isConnected flag to false.
      */
-    boolean isConnected();
+    void disconnect();
 
     /**
-     * Connects to the InfluxDB instance using the configured settings.
-     * This method should be called before performing any database operations.
+     * Returns the last known connection status. Does not perform a live check.
+     * @return true if the service believes it's connected, false otherwise.
      */
-    void disconnect();
+    boolean isConnected();
 
     /**
      * Disconnects from the InfluxDB instance and cleans up resources.
@@ -31,17 +36,4 @@ public interface IDatabaseService extends Service {
      */
     void startRetryTaskIfNeeded();
 
-    /**
-     * Gets the configured InfluxDB client instance.
-     *
-     * @return The InfluxDBClient.
-     */
-    InfluxDBClient getClient();
-
-    /**
-     * Gets the InfluxDB Write API instance for sending data points.
-     *
-     * @return The WriteApi.
-     */
-    WriteApi getWriteApi();
 }

bukkit/build.gradle.kts

@@ -21,40 +21,16 @@ dependencies {
     implementation(project(":common"))
 
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
 }
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
-val relocatePath = "it.renvins.serverpulse.bukkit.libs"
-
 tasks.withType<ShadowJar> {
     archiveBaseName = "serverpulse"
     archiveClassifier = "bukkit"
     archiveVersion = "${rootProject.version}"
-
-    relocate("com.influxdb", "$relocatePath.influxdb")
-    relocate("okhttp3", "$relocatePath.okhttp3")
-    relocate("okio", "$relocatePath.okio")
-    relocate("org.jetbrains", "$relocatePath.jetbrains")
-    relocate("com.google", "$relocatePath.google")
-    relocate("io.reactivex", "$relocatePath.reactivex")
-    relocate("javax.annotation", "$relocatePath.annotation")
-    relocate("org.apache", "$relocatePath.apache")
-    relocate("org.intellij", "$relocatePath.intellij")
-    relocate("org.reactivestreams", "$relocatePath.reactivestreams")
-    relocate("retrofit2", "$relocatePath.retrofit2")
-    relocate("kotlin", "$relocatePath.kotlin") // Relocate instead of exclude
-    relocate("org.jetbrains.kotlin", "$relocatePath.jetbrains.kotlin") // Relocate instead of exclude
-
-    // Prevent Paper from giving errors about duplicate files
-    exclude("META-INF/AL2.0")
-    exclude("META-INF/LGPL2.1")
-    exclude("META-INF/LICENSE")
-    exclude("META-INF/LICENSE.txt")
-    exclude("META-INF/NOTICE.txt")
 }
 
 tasks.withType<ProcessResources> {