[FEATURE] Improve UpdateVariant

Author: gravit0

components/launchserver/src/main/java/pro/gravit/launchserver/LaunchServer.java

@@ -86,11 +86,7 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
     /**
      * Pipeline for building JAR
      */
-    public final JARLauncherBinary launcherBinary;
-    /**
-     * Pipeline for building EXE
-     */
-    public final LauncherBinary launcherEXEBinary;
+    public final Map<UpdatesProvider.UpdateVariant, LauncherBinary> launcherBinaries;
     // Server config
     public final AuthHookManager authHookManager;
     public final LaunchServerModulesManager modulesManager;
@@ -165,11 +161,8 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
         modulesManager.invokeEvent(new LaunchServerInitPhase(this));
 
         // Set launcher EXE binary
-        launcherBinary = new JARLauncherBinary(this);
-        launcherEXEBinary = binary();
-
-        launcherBinary.init();
-        launcherEXEBinary.init();
+        launcherBinaries = new HashMap<>();
+        collectBinary();
         launcherModuleLoader = new LauncherModuleLoader(this);
         if (config.components != null) {
             logger.debug("Init components");
@@ -307,30 +300,34 @@ public Path createTempFilePath(String name, String ext) throws IOException {
         return path;
     }
 
-    private LauncherBinary binary() {
-        LaunchServerLauncherExeInit event = new LaunchServerLauncherExeInit(this, null);
+    private void collectBinary() throws IOException {
+        launcherBinaries.clear();
+        launcherBinaries.put(UpdatesProvider.UpdateVariant.JAR, new JARLauncherBinary(this));
+        LaunchServerLauncherBinaryInit event = new LaunchServerLauncherBinaryInit(this, launcherBinaries);
         modulesManager.invokeEvent(event);
-        if(event.binary != null) {
-            return event.binary;
+        for(var e : launcherBinaries.values()) {
+            e.init();
         }
-        return new EXELauncherBinary(this);
     }
 
     public void buildLauncherBinaries() throws IOException {
-        PipelineContext launcherContext = launcherBinary.build();
-        PipelineContext exeContext = launcherEXEBinary.build();
-        UpdatesProvider.UpdateUploadInfo jarInfo = launcherContext.makeUploadInfo(UpdatesProvider.UpdateVariant.JAR);
-        UpdatesProvider.UpdateUploadInfo exeInfo = exeContext.makeUploadInfo(UpdatesProvider.UpdateVariant.EXE);
-        List<UpdatesProvider.UpdateUploadInfo> list = new ArrayList<>(2);
-        if(jarInfo != null) {
-            list.add(jarInfo);
-        }
-        if(exeInfo != null) {
-            list.add(exeInfo);
+        List<PipelineContext> contexts = new ArrayList<>(2);
+        try {
+            List<UpdatesProvider.UpdateUploadInfo> list = new ArrayList<>(2);
+            for(var e : launcherBinaries.entrySet()) {
+                var variant = e.getKey();
+                var binary = e.getValue();
+                var context = binary.build();
+                var info = context.makeUploadInfo(variant);
+                list.add(info);
+                contexts.add(context);
+            }
+            config.updatesProvider.pushUpdate(list);
+        } finally {
+            for(var e : contexts) {
+                e.clear();
+            }
         }
-        config.updatesProvider.pushUpdate(list);
-        launcherContext.clear();
-        exeContext.clear();
     }
 
     public void close() throws Exception {

components/launchserver/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerLauncherBinaryInit.java

@@ -0,0 +1,18 @@
+package pro.gravit.launchserver.modules.events;
+
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launchserver.LaunchServer;
+import pro.gravit.launchserver.auth.updates.UpdatesProvider;
+import pro.gravit.launchserver.binary.LauncherBinary;
+
+import java.util.Map;
+
+public class LaunchServerLauncherBinaryInit extends LauncherModule.Event {
+    public final LaunchServer server;
+    public final Map<UpdatesProvider.UpdateVariant, LauncherBinary> binary;
+
+    public LaunchServerLauncherBinaryInit(LaunchServer server, Map<UpdatesProvider.UpdateVariant, LauncherBinary> binary) {
+        this.server = server;
+        this.binary = binary;
+    }
+}