feat: Reimplemented octopus sdk

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
   "features": {
     "ghcr.io/devcontainers/features/git" : {},
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "21.0.7",
+      "version": "23",
       "installGradle": true
     }
   },

README.md

@@ -38,7 +38,7 @@ Please use it for being able to tell "It works on my machine".
 - Select `From VCS Project`
 - Select and connect with `Docker`
 - Select `IntelliJ IDEA`
-- Enter `Git Repository`: `https://github.com/o7studios/cheetah`
+- Enter `Git Repository`: `https://github.com/o7studios/octopus-plugin`
 - Select `Detection for devcontainer.json file` `Automatic`
 - Press `Build Container and Continue`
 

api/build.gradle.kts

@@ -1,5 +1,5 @@
 dependencies {
-    api("studio.o7:octopus-sdk:0.0.2")
+    api("studio.o7:octopus-sdk:0.1.2")
 }
 
 information {

api/src/main/java/studio/o7/octopus/plugin/api/Octopus.java

@@ -1,9 +1,15 @@
 package studio.o7.octopus.plugin.api;
 
-import org.bukkit.plugin.java.JavaPlugin;
+import lombok.NonNull;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 import org.jspecify.annotations.NullMarked;
-import studio.o7.octopus.plugin.api.client.OctopusClient;
 import studio.o7.octopus.plugin.Unsafe;
+import studio.o7.octopus.sdk.gen.api.v1.Entry;
+import studio.o7.octopus.sdk.gen.api.v1.Event;
+
+import java.util.Collection;
+import java.util.List;
 
 @NullMarked
 public interface Octopus {
@@ -12,13 +18,38 @@ static Octopus get() {
         return Unsafe.getInstance().get();
     }
 
-    OctopusClient getClient();
-
-    JavaPlugin getLibraryPlugin();
-
+    /**
+     * Returns true if event has been published successfully.
+     */
+    boolean publishEvent(@NonNull Event event);
+
+    /**
+     * Get entries by key, optionally filtered.
+     */
+    @NotNull List<Entry> getEntry(@NonNull String key);
+
+    /**
+     * Adds list of keys that should be subscribed.
+     */
+    void addSubscriptions(@NonNull Collection<String> subscriptions);
+
+
+    /**
+     * Removes list of keys that shouldn't be subscribed.
+     */
+    void removeSubscriptions(@NonNull Collection<String> subscriptions);
+
+    /**
+     * Resets list of keys that should be subscribed completely.
+     * @apiNote Also resets all subscribed/unsubscribed keys
+     * which have been added by {@link Octopus#addSubscriptions}
+     * or removed by {@link Octopus#removeSubscriptions}
+     */
+    @ApiStatus.Experimental
+    void setSubscriptions(@NonNull Collection<String> subscriptions);
+
+    /**
+     * Returns the identifier of this service (e.g. service-name)
+     */
     String getIdentifier();
-
-    String getHost();
-
-    int getPort();
 }

api/src/main/java/studio/o7/octopus/plugin/api/client/OctopusClient.java

@@ -1,17 +1,17 @@
 package studio.o7.octopus.plugin.api.client;
 
-import studio.o7.octopus.sdk.gen.api.v1.EntryResponse;
+import lombok.NonNull;
+import studio.o7.octopus.sdk.gen.api.v1.Entry;
 import studio.o7.octopus.sdk.gen.api.v1.Event;
 
+import java.util.Collection;
 import java.util.List;
 
 public interface OctopusClient {
 
-    boolean emitEvent(Event event);
+    boolean publishEvent(@NonNull Event event);
 
-    EntryResponse getEntry(String key);
+    List<Entry> getEntry(@NonNull String key);
 
-    void initializeSubscription(List<String> subscriptions);
-
-    void updateSubscriptions(List<String> subscriptions);
+    void updateSubscriptions(@NonNull Collection<String> subscriptions);
 }

api/src/main/java/studio/o7/octopus/plugin/api/events/OctopusActionEvent.java

@@ -1,19 +1,24 @@
 package studio.o7.octopus.plugin.api.events;
 
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NonNull;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 import studio.o7.octopus.sdk.gen.api.v1.Action;
 
-@RequiredArgsConstructor
 @Getter
 public class OctopusActionEvent extends Event {
-
     private static final HandlerList HANDLER_LIST = new HandlerList();
-    private final Action action;
+
     private final String key;
+    private final Action action;
+
+    public OctopusActionEvent(@NonNull String key, @NonNull Action action) {
+        super(true);
+        this.key = key;
+        this.action = action;
+    }
 
     @Override
     public @NotNull HandlerList getHandlers() {

api/src/main/java/studio/o7/octopus/plugin/api/events/OctopusEntryChangeEvent.java → api/src/main/java/studio/o7/octopus/plugin/api/events/OctopusEntryMutationEvent.java

@@ -1,19 +1,25 @@
 package studio.o7.octopus.plugin.api.events;
 
 import lombok.Getter;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
-import studio.o7.octopus.sdk.gen.api.v1.EntryEdit;
+import studio.o7.octopus.sdk.gen.api.v1.EntryMutation;
 
-@RequiredArgsConstructor
 @Getter
-public class OctopusEntryChangeEvent extends Event {
-
+public final class OctopusEntryMutationEvent extends Event {
     private static final HandlerList HANDLER_LIST = new HandlerList();
-    private final EntryEdit entry;
+
     private final String key;
+    private final EntryMutation entryMutation;
+
+    public OctopusEntryMutationEvent(@NonNull String key, @NonNull EntryMutation entryMutation) {
+        super(true);
+        this.key = key;
+        this.entryMutation = entryMutation;
+    }
 
     @Override
     public @NotNull HandlerList getHandlers() {
@@ -23,5 +29,4 @@ public class OctopusEntryChangeEvent extends Event {
     public static HandlerList getHandlerList() {
         return HANDLER_LIST;
     }
-
 }

api/src/main/java/studio/o7/octopus/plugin/api/events/OctopusPlayerNotificationEvent.java

@@ -1,18 +1,24 @@
 package studio.o7.octopus.plugin.api.events;
 
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NonNull;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 import studio.o7.octopus.sdk.gen.api.v1.PlayerNotification;
 
-@RequiredArgsConstructor
 @Getter
 public class OctopusPlayerNotificationEvent extends Event {
     private static final HandlerList HANDLER_LIST = new HandlerList();
-    private final PlayerNotification playerNotification;
+
     private final String key;
+    private final PlayerNotification playerNotification;
+
+    public OctopusPlayerNotificationEvent(@NonNull String key, @NonNull PlayerNotification playerNotification) {
+        super(true);
+        this.key = key;
+        this.playerNotification = playerNotification;
+    }
 
     @Override
     public @NotNull HandlerList getHandlers() {

plugin/src/main/java/studio/o7/octopus/plugin/OctopusImpl.java

@@ -1,49 +1,90 @@
 package studio.o7.octopus.plugin;
 
+import it.unimi.dsi.fastutil.objects.ObjectArraySet;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
 import studio.o7.octopus.plugin.api.Octopus;
-import studio.o7.octopus.plugin.api.client.OctopusClient;
-import studio.o7.octopus.plugin.client.OctopusClientImpl;
+import studio.o7.octopus.sdk.OctopusSDK;
+import studio.o7.octopus.sdk.gen.api.v1.Entry;
+import studio.o7.octopus.sdk.gen.api.v1.EntryRequest;
+import studio.o7.octopus.sdk.gen.api.v1.Event;
+import studio.o7.octopus.sdk.gen.api.v1.OctopusServiceGrpc;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 public final class OctopusImpl implements Octopus {
+    private final Plugin plugin;
+
+    private final OctopusServiceGrpc.OctopusServiceStub stub = OctopusSDK.stub();
+    private final OctopusServiceGrpc.OctopusServiceBlockingStub blockingStub = OctopusSDK.blockingStub();
+
+    private final Logger logger;
+    private final OctopusSubscriptions subscriptions;
 
-    private final OctopusClient client;
-    private final String identifier;
-    private final String host;
-    private final int port;
+    private String identifier;
+
+    private final Collection<String> subscriptionList = Collections.synchronizedSet(new ObjectArraySet<>());
 
     public OctopusImpl(Plugin plugin) {
-        this.identifier = "test-minecraft-plugin";
-        this.host = "127.0.0.1";
-        this.port = 50051;
-        this.client = new OctopusClientImpl(host, port, plugin, identifier);
+        this.plugin = plugin;
+        logger = plugin.getSLF4JLogger();
+        subscriptions = new OctopusSubscriptions(plugin, logger, stub);
     }
 
     @Override
-    public @NotNull OctopusClient getClient() {
-        return client;
+    public boolean publishEvent(@NonNull Event event) {
+        try {
+            var publishEventResponse = blockingStub.publishEvent(event);
+            logger.info("Published event on key {}", event.getKey());
+            return publishEventResponse.getSuccess();
+        } catch (Exception e) {
+            logger.error("Failed to publish event on key {}", event.getKey(), e);
+            return false;
+        }
     }
 
     @Override
-    public @NotNull JavaPlugin getLibraryPlugin() {
-        return JavaPlugin.getPlugin(OctopusPlugin.class);
+    public @NotNull List<Entry> getEntry(@NonNull String key) {
+        try {
+            return blockingStub.getEntry(EntryRequest.newBuilder().setKey(key).build()).getEntriesList();
+        } catch (Exception e) {
+            logger.error("Failed to retrieve entry on key {}", key, e);
+            return Collections.emptyList();
+        }
     }
 
     @Override
-    public @NotNull String getIdentifier() {
-        return identifier;
+    public void addSubscriptions(@NonNull Collection<String> subscriptions) {
+        this.subscriptionList.addAll(subscriptions);
+        this.subscriptions.updateSubscriptions(subscriptionList);
     }
 
     @Override
-    public @NotNull String getHost() {
-        return host;
+    public void removeSubscriptions(@NonNull Collection<String> subscriptions) {
+        this.subscriptionList.removeAll(subscriptions);
+        this.subscriptions.updateSubscriptions(subscriptionList);
     }
 
     @Override
-    public int getPort() {
-        return port;
+    public synchronized void setSubscriptions(@NonNull Collection<String> subscriptions) {
+        this.subscriptionList.clear();
+        this.subscriptionList.addAll(subscriptions);
+        this.subscriptions.updateSubscriptions(subscriptionList);
     }
 
+    @Override
+    public @NotNull String getIdentifier() {
+        if (this.identifier != null) return identifier;
+        identifier = System.getProperty("octopus.identifier");
+        if (identifier == null || identifier.isEmpty())
+            identifier = System.getenv("OCTOPUS_IDENTIFIER");
+        if (identifier == null || identifier.isEmpty())
+            identifier = "default";
+        return identifier;
+    }
 }

plugin/src/main/java/studio/o7/octopus/plugin/OctopusPlugin.java

@@ -5,7 +5,6 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import studio.o7.octopus.plugin.api.Octopus;
 
-@SuppressWarnings("UnstableApiUsage")
 @Getter
 public final class OctopusPlugin extends JavaPlugin implements PluginInstance {