Merge remote-tracking branch 'origin/main'

Author: julian-siebert

.devcontainer/devcontainer.json

@@ -16,5 +16,8 @@
       "installGradle": true
     }
   },
+  "runArgs": [
+    "--env-file=${localEnv:HOME}/dev.env"
+  ],
   "remoteUser": "ubuntu"
 }

README.md

@@ -30,6 +30,25 @@ Please use it for being able to tell "It works on my machine".
 
 **Docker is required to be installed on your machine!**
 
+### Create ~/dev.env
+
+The development container is using a local env file on your
+host machine for reading e.g. GitHub Tokens, Usernames, Email.
+So please make sure it exists with your credentials in `~/dev.env`:
+
+```text
+GITHUB_EMAIL=your-mail@your-domain.com
+GITHUB_USERNAME=YOUR_GITHUB_USERNAME
+GITHUB_TOKEN=ghp_***
+```
+
+The `GITHUB_TOKEN` must've set following permission:
+
+- `repo`
+- `read:packages`
+- `read:user`
+- `user:email`
+
 ### IntelliJ IDEA
 
 - Open IntelliJ (Welcome screen)

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

@@ -36,7 +36,7 @@ public OctopusImpl(Plugin plugin) {
     }
 
     @Override
-    public Collection<Entry> get(@NonNull String keyPattern, boolean includeExpired, @Nullable Instant createdRangeStart, @Nullable Instant createdRangeEnd) {
+    public @NotNull Collection<Entry> get(@NonNull String keyPattern, boolean includeExpired, @Nullable Instant createdRangeStart, @Nullable Instant createdRangeEnd) {
         var builder = GetRequest.newBuilder();
 
         builder.setKeyPattern(keyPattern);
@@ -58,28 +58,33 @@ public void registerListener(@NonNull Listener listener) {
         var observer = stub.listen(new StreamObserver<>() {
             @Override
             public void onNext(EventCall value) {
-                var request = requestRef.get();
-                if (request == null) return;
+                try {
+                    var request = requestRef.get();
+                    if (request == null) return;
 
-                listener.onCall(value.getObject());
+                    listener.onCall(value.getObject());
 
-                var msg = ListenMessage.newBuilder()
-                        .setCallback(value)
-                        .build();
+                    var msg = ListenMessage.newBuilder()
+                            .setCallback(value)
+                            .build();
 
-                request.onNext(msg);
+                    request.onNext(msg);
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                }
             }
 
             @Override
             public void onError(Throwable t) {
                 requestRef.set(null);
                 logger.error("Cannot call event on listener {} with key-pattern {}", listener.getListenerUniqueId(), listener.getKeyPattern(), t);
+                unregisterListener(listener);
             }
 
             @Override
             public void onCompleted() {
                 requestRef.set(null);
-                listeners.remove(listener.getListenerUniqueId());
+                unregisterListener(listener);
             }
         });