Remove HUB command / Update informer / Update API

Author: EliXorZz

common/src/main/java/fr/epsilon/common/Epsilon.java

@@ -41,6 +41,10 @@ public class Epsilon extends EpsilonAPI {
     private Template template;
 
     public Epsilon() {
+        this(true);
+    }
+
+    public Epsilon(boolean internal) {
         Path namespacePath = Paths.get("/var/run/secrets/kubernetes.io/serviceaccount/namespace");
 
         try (Stream<String> lines = Files.lines(namespacePath)) {
@@ -63,10 +67,12 @@ public Epsilon() {
         OkHttpClient okHttp = new OkHttpClient();
         Gson gson = new Gson();
 
-        try (FileReader reader = new FileReader("./details.epsilon")) {
-            this.template = gson.fromJson(reader, Template.class);
-        } catch (IOException e) {
-            Logger.getAnonymousLogger().info("Read details.epsilon failed.");
+        if (internal) {
+            try (FileReader reader = new FileReader("./details.epsilon")) {
+                this.template = gson.fromJson(reader, Template.class);
+            } catch (IOException e) {
+                Logger.getAnonymousLogger().info("Read details.epsilon failed.");
+            }
         }
 
         this.name = System.getenv("HOSTNAME");

common/src/main/java/fr/epsilon/common/informer/InstanceInformer.java

@@ -10,6 +10,7 @@
 import io.kubernetes.client.informer.SharedIndexInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.informer.cache.Lister;
+import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 
 import java.util.ArrayList;
@@ -24,31 +25,41 @@ public class InstanceInformer extends EInstanceInformer {
 
     private List<EInstanceInformerListener> listeners;
 
+    private String namespace;
+    private GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> epsilonInstanceClient;
+
     public InstanceInformer(String namespace, SharedInformerFactory informerFactory, GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> epsilonInstanceClient) {
         this.instanceInformer = informerFactory.sharedIndexInformerFor(epsilonInstanceClient,
-                EpsilonInstanceCRD.class, TimeUnit.SECONDS.toMillis(1), namespace);
+                EpsilonInstanceCRD.class, TimeUnit.MINUTES.toMillis(5), namespace);
 
         this.instanceStore = new Lister<>(instanceInformer.getIndexer());
 
         this.listeners = new ArrayList<>();
 
+        this.namespace = namespace;
+        this.epsilonInstanceClient = epsilonInstanceClient;
+
         instanceInformer.addEventHandlerWithResyncPeriod(new ResourceEventHandler<EpsilonInstanceCRD>() {
             @Override
             public void onAdd(EpsilonInstanceCRD instance) {}
 
             @Override
             public void onUpdate(EpsilonInstanceCRD oldInstance, EpsilonInstanceCRD newInstance) {
-                if (newInstance.getStatus() != null)
-                    for (EInstanceInformerListener listener : listeners)
-                        listener.onInstanceUpdate(newInstance.getInstance());
+                update(newInstance);
             }
 
             @Override
             public void onDelete(EpsilonInstanceCRD instance, boolean deletedFinalStateUnknown) {
                 for (EInstanceInformerListener listener : listeners)
                     listener.onInstanceRemove(instance.getInstance());
             }
-        }, TimeUnit.SECONDS.toMillis(1));
+        }, TimeUnit.MINUTES.toMillis(10));
+    }
+
+    private void update(EpsilonInstanceCRD instance) {
+        if (instance.getStatus() != null)
+            for (EInstanceInformerListener listener : listeners)
+                listener.onInstanceUpdate(instance.getInstance());
     }
 
     @Override
@@ -80,5 +91,12 @@ public Instance[] getInstances(EType type) {
     @Override
     public void registerListener(EInstanceInformerListener listener) {
         listeners.add(listener);
+
+        try {
+            for (EpsilonInstanceCRD instance : epsilonInstanceClient.list(namespace).throwsApiException().getObject().getItems())
+                update(instance);
+        } catch (ApiException e) {
+            throw new RuntimeException(e);
+        }
     }
 }

proxy/src/main/java/fr/epsilon/exporter/EpsilonExporter.java

@@ -1,7 +1,6 @@
 package fr.epsilon.exporter;
 
 import fr.epsilon.common.Epsilon;
-import fr.epsilon.exporter.commands.HubCommand;
 import fr.epsilon.exporter.listener.EpsilonConnection;
 import fr.epsilon.exporter.listener.EpsilonRegister;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -33,8 +32,6 @@ public void onEnable() {
 
         EpsilonEventStream.init(this);
 
-        getProxy().getPluginManager().registerCommand(this, new HubCommand(this));
-
         try {
             Path path = Paths.get("epsilon_start");
             Files.createFile(path);

proxy/src/main/java/fr/epsilon/exporter/commands/HubCommand.java

@@ -41,10 +41,10 @@ public EpsilonConnection(EpsilonExporter main) {
 
     @EventHandler
     public void onPing(ProxyPingEvent event) {
-        ServerPing ping = event.getResponse();
-        String visibleSlots = template.getLabels().getOrDefault("visible-slots", "1000");
-
-        ping.getPlayers().setMax(Integer.parseInt(visibleSlots));
+//        ServerPing ping = event.getResponse();
+//        String visibleSlots = template.getLabels().getOrDefault("visible-slots", "1000");
+//
+//        ping.getPlayers().setMax(Integer.parseInt(visibleSlots));
     }
 
     @EventHandler