Improved to using a new system for locating dependencies and the launch target class to be launched.

RealMangorage · RealMangorage · commit 78f65eedbc9b · 2026-01-15T17:00:22.000-08:00
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -10,7 +10,12 @@
 
     opens org.mangorage.bootstrap;
 
+    provides org.mangorage.bootstrap.api.launch.ILaunchTarget with org.mangorage.bootstrap.internal.launch.MangoBotLaunchTarget;
+    provides org.mangorage.bootstrap.api.dependency.IDependencyLocator with org.mangorage.bootstrap.internal.launch.MangoBotDependencyLocator;
+
     uses org.mangorage.bootstrap.api.transformer.IClassTransformer;
     uses org.mangorage.bootstrap.api.module.IModuleConfigurator;
     uses org.mangorage.bootstrap.api.launch.ILaunchTarget;
+    uses org.mangorage.bootstrap.api.dependency.IDependencyLocator;
+    uses org.mangorage.bootstrap.api.launch.ILaunchTargetEntrypoint;
 }
diff --git a/src/main/java/org/mangorage/bootstrap/Bootstrap.java b/src/main/java/org/mangorage/bootstrap/Bootstrap.java
@@ -1,9 +1,10 @@
 package org.mangorage.bootstrap;
 
 import com.google.gson.Gson;
+import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
 import org.mangorage.bootstrap.api.launch.ILaunchTarget;
-import org.mangorage.bootstrap.internal.Util;
-import org.mangorage.bootstrap.internal.MangoBotLaunchTarget;
+import org.mangorage.bootstrap.internal.util.Util;
+import org.mangorage.bootstrap.internal.launch.MangoBotLaunchTarget;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
 import java.nio.file.Files;
diff --git a/src/main/java/org/mangorage/bootstrap/api/dependency/IDependency.java b/src/main/java/org/mangorage/bootstrap/api/dependency/IDependency.java
@@ -0,0 +1,9 @@
+package org.mangorage.bootstrap.api.dependency;
+
+import java.nio.file.Path;
+
+public interface IDependency {
+    String getName();
+    ModuleNameOrigin getModuleNameOrigin();
+    Path resolveJar();
+}
diff --git a/src/main/java/org/mangorage/bootstrap/api/dependency/IDependencyLocator.java b/src/main/java/org/mangorage/bootstrap/api/dependency/IDependencyLocator.java
@@ -0,0 +1,8 @@
+package org.mangorage.bootstrap.api.dependency;
+
+import java.util.List;
+
+public interface IDependencyLocator {
+    boolean isValidLocatorFor(String launchTarget);
+    List<IDependency> locate();
+}
diff --git a/src/main/java/org/mangorage/bootstrap/api/dependency/ModuleNameOrigin.java b/src/main/java/org/mangorage/bootstrap/api/dependency/ModuleNameOrigin.java
@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.internal.util;
+package org.mangorage.bootstrap.api.dependency;
 
 public enum ModuleNameOrigin {
     MODULE_INFO, // HIGHEST
diff --git a/src/main/java/org/mangorage/bootstrap/api/launch/ILaunchTargetEntrypoint.java b/src/main/java/org/mangorage/bootstrap/api/launch/ILaunchTargetEntrypoint.java
@@ -0,0 +1,12 @@
+package org.mangorage.bootstrap.api.launch;
+
+/**
+ * Entrypoint for launching
+ */
+public interface ILaunchTargetEntrypoint {
+    /**
+     * @return should match the same id of a launch target {@link ILaunchTarget}).
+     */
+    String getLaunchTargetId();
+    void init(String[] args);
+}
diff --git a/src/main/java/org/mangorage/bootstrap/api/loader/IMangoLoader.java b/src/main/java/org/mangorage/bootstrap/api/loader/IMangoLoader.java
@@ -1,6 +1,6 @@
 package org.mangorage.bootstrap.api.loader;
 
-import org.mangorage.bootstrap.internal.MangoLoaderImpl;
+import org.mangorage.bootstrap.internal.launch.MangoLoaderImpl;
 
 public sealed interface IMangoLoader permits MangoLoaderImpl {
     byte[] getClassBytes(String name);
diff --git a/src/main/java/org/mangorage/bootstrap/api/module/IModuleLayer.java b/src/main/java/org/mangorage/bootstrap/api/module/IModuleLayer.java
@@ -1,6 +1,6 @@
 package org.mangorage.bootstrap.api.module;
 
-import org.mangorage.bootstrap.internal.ModuleLayerImpl;
+import org.mangorage.bootstrap.internal.launch.ModuleLayerImpl;
 
 import java.util.List;
 
diff --git a/src/main/java/org/mangorage/bootstrap/internal/DependencyHandler.java b/src/main/java/org/mangorage/bootstrap/internal/DependencyHandler.java
@@ -2,9 +2,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import org.mangorage.bootstrap.api.dependency.IDependency;
 import org.mangorage.bootstrap.internal.util.Dependencies;
-import org.mangorage.bootstrap.internal.util.Result;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,18 +12,16 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
 public final class DependencyHandler {
     private static final Gson GSON = new GsonBuilder().create();
 
-    public static Map<String, List<Result>> scanPackages(Path packagesPath, Path librariesPath) throws IOException {
+    public static List<IDependency> scanPackages(Path packagesPath, Path librariesPath) throws IOException {
 
-        final Map<String, List<Result>> results = new HashMap<>();
+        final List<IDependency> results = new ArrayList<>();
 
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(packagesPath)) {
             for (Path entry : stream) {
@@ -38,7 +35,7 @@ public static Map<String, List<Result>> scanPackages(Path packagesPath, Path lib
                         final var result = JarHandler.resolveModuleName(
                                 librariesPath.resolve(dependency.output())
                         );
-                        results.computeIfAbsent(result.name(), k -> new ArrayList<>()).add(result);
+                        results.add(result);
                     });
                 }
             }
diff --git a/src/main/java/org/mangorage/bootstrap/internal/JarHandler.java b/src/main/java/org/mangorage/bootstrap/internal/JarHandler.java
@@ -1,6 +1,6 @@
 package org.mangorage.bootstrap.internal;
 
-import org.mangorage.bootstrap.internal.util.ModuleNameOrigin;
+import org.mangorage.bootstrap.api.dependency.ModuleNameOrigin;
 import org.mangorage.bootstrap.internal.util.Result;
 
 import java.io.IOException;
@@ -58,9 +58,7 @@ public static Result resolveModuleName(Path jarPath) {
                 }
 
                 try {
-                    System.out.println("MAYBE!?");
                     final var found = ModuleFinder.of(jarPath).findAll();
-                    System.out.println(found);
                     if (found != null) {
                         final var foundModule = found.stream().findAny();
                         if (foundModule.isPresent())
diff --git a/src/main/java/org/mangorage/bootstrap/internal/launch/ClassTransformers.java b/src/main/java/org/mangorage/bootstrap/internal/launch/ClassTransformers.java
@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.internal;
+package org.mangorage.bootstrap.internal.launch;
 
 import org.mangorage.bootstrap.api.transformer.IClassTransformer;
 import org.mangorage.bootstrap.api.transformer.TransformResult;
diff --git a/src/main/java/org/mangorage/bootstrap/internal/launch/LoadedModule.java b/src/main/java/org/mangorage/bootstrap/internal/launch/LoadedModule.java
@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.internal;
+package org.mangorage.bootstrap.internal.launch;
 
 import java.io.IOException;
 import java.lang.module.ModuleReader;
diff --git a/src/main/java/org/mangorage/bootstrap/internal/launch/MangoBotDependencyLocator.java b/src/main/java/org/mangorage/bootstrap/internal/launch/MangoBotDependencyLocator.java
@@ -0,0 +1,29 @@
+package org.mangorage.bootstrap.internal.launch;
+
+import org.mangorage.bootstrap.api.dependency.IDependency;
+import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
+import org.mangorage.bootstrap.internal.DependencyHandler;
+import java.nio.file.Path;
+import java.util.List;
+
+public class MangoBotDependencyLocator implements IDependencyLocator {
+    @Override
+    public boolean isValidLocatorFor(String launchTarget) {
+        return launchTarget.equals("mangobot");
+    }
+
+    @Override
+    public List<IDependency> locate() {
+        final var librariesPath = Path.of("libraries");
+        final var pluginsPath = Path.of("plugins");
+
+        try {
+            return DependencyHandler.scanPackages(pluginsPath.toAbsolutePath(), librariesPath.toAbsolutePath());
+        } catch (Exception e) {
+            System.out.println("Failed to locate dependencies in " + getClass() + " cause -> " + e);
+            return List.of();
+        }
+    }
+
+
+}
diff --git a/src/main/java/org/mangorage/bootstrap/internal/launch/MangoBotLaunchTarget.java b/src/main/java/org/mangorage/bootstrap/internal/launch/MangoBotLaunchTarget.java
@@ -1,6 +1,11 @@
-package org.mangorage.bootstrap.internal;
+package org.mangorage.bootstrap.internal.launch;
 
+import org.mangorage.bootstrap.api.dependency.IDependency;
+import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
 import org.mangorage.bootstrap.api.launch.ILaunchTarget;
+import org.mangorage.bootstrap.api.launch.ILaunchTargetEntrypoint;
+import org.mangorage.bootstrap.internal.DependencyHandler;
+import org.mangorage.bootstrap.internal.util.Util;
 import org.mangorage.bootstrap.internal.util.Result;
 
 import java.io.IOException;
@@ -9,14 +14,16 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 import java.util.Set;
 
-import static org.mangorage.bootstrap.internal.Util.callMain;
+import static org.mangorage.bootstrap.internal.util.Util.callMain;
 
 public final class MangoBotLaunchTarget implements ILaunchTarget {
 
@@ -49,7 +56,7 @@ private static void deleteDirectoryRecursively(Path dir) throws IOException {
 
         // Walk the directory bottom-up and delete everything
         Files.walk(dir)
-                .sorted((a, b) -> b.compareTo(a)) // delete children first
+                .sorted(Comparator.reverseOrder()) // delete children first
                 .forEach(path -> {
                     try {
                         Files.delete(path);
@@ -66,23 +73,39 @@ public String getId() {
 
     @Override
     public void launch(ModuleLayer parent, String[] args) throws Throwable {
-        final var librariesPath = Path.of("libraries");
         final var pluginsPath = Path.of("plugins");
 
-        final Map<String, List<Result>> dependencies = DependencyHandler.scanPackages(pluginsPath.toAbsolutePath(), librariesPath.toAbsolutePath());
-        final Map<String, Result> finalDependencies = new HashMap<>();
+        List<IDependencyLocator> dependencyLocators =
+                ServiceLoader.load(parent, IDependencyLocator.class)
+                        .stream()
+                        .map(ServiceLoader.Provider::get)
+                        .toList();
+
+        final Map<String, List<IDependency>> dependencies = new HashMap<>();
+
+        dependencyLocators.forEach(locator -> {
+            if (locator.isValidLocatorFor(getId())) {
+                final var foundDependencies = locator.locate();
+                foundDependencies.forEach(dependency -> {
+                    dependencies.computeIfAbsent(dependency.getName(), k -> new ArrayList<>()).add(dependency);
+                });
+            }
+        });
+
+        final Map<String, IDependency> finalDependencies = new HashMap<>();
 
         dependencies.forEach((id, results) -> {
-            final Result bestResult = results.stream()
-                    .min(Comparator.comparingInt(r -> r.origin().ordinal()))
+            final IDependency bestResult = results.stream()
+                    .min(Comparator.comparingInt(r -> r.getModuleNameOrigin().ordinal()))
                     .get();
-            finalDependencies.put(bestResult.name(), bestResult);
+            finalDependencies.put(bestResult.getName(), bestResult);
         });
 
         Set<String> moduleNames = new HashSet<>();
         moduleNames.addAll(Util.getModuleNames(pluginsPath));
         moduleNames.addAll(finalDependencies.keySet());
 
+        System.out.println("----------------------------------------------");
         System.out.println("Module Info");
         System.out.println("----------------------------------------------");
         moduleNames.forEach(name -> {
@@ -92,14 +115,14 @@ public void launch(ModuleLayer parent, String[] args) throws Throwable {
         System.out.println("Module -> Jar Info");
         System.out.println("----------------------------------------------");
         finalDependencies.forEach((module, result) -> {
-            System.out.println("Module -> " + module + " Jar -> " + result.jar() + " Name -> " + result.name() + " Origin -> " + result.origin());
+            System.out.println("Module -> " + module + " Jar -> " + result.resolveJar() + " Name -> " + result.getName() + " Origin -> " + result.getModuleNameOrigin());
         });
         System.out.println("----------------------------------------------");
 
         final var moduleCfg = Configuration.resolve(
                 ModuleFinder.of(
-                        finalDependencies.entrySet().stream()
-                                .map(entry -> entry.getValue().jar())
+                        finalDependencies.values().stream()
+                                .map(IDependency::resolveJar)
                                 .toArray(Path[]::new)
                 ),
                 List.of(
@@ -120,8 +143,12 @@ public void launch(ModuleLayer parent, String[] args) throws Throwable {
 
         moduleCL.load(moduleLayer, moduleLayerController);
 
-        // TODO: Perhaps come up with a better system for locating this?
-        // TODO: Perhaps have a Manifest attribute that searches for MangoBotBootStrapTargetClass?
-        callMain("org.mangorage.mangobotcore.entrypoint.MangoBotCore", args, moduleLayer.findModule("org.mangorage.mangobotcore").get());
+        ServiceLoader.load(moduleLayer, ILaunchTargetEntrypoint.class)
+                .stream()
+                .map(ServiceLoader.Provider::get)
+                .filter(entrypoint -> entrypoint.getLaunchTargetId().equals("mangobot"))
+                .findAny()
+                .orElseThrow(() -> new IllegalStateException("Unable to find entrypoint for mangobot launch target"))
+                .init(args);
     }
 }
diff --git a/src/main/java/org/mangorage/bootstrap/internal/launch/MangoLoaderImpl.java b/src/main/java/org/mangorage/bootstrap/internal/launch/MangoLoaderImpl.java
@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.internal;
+package org.mangorage.bootstrap.internal.launch;
 
 import org.mangorage.bootstrap.api.loader.IMangoLoader;
 import org.mangorage.bootstrap.api.module.IModuleConfigurator;
diff --git a/src/main/java/org/mangorage/bootstrap/internal/launch/ModuleLayerImpl.java b/src/main/java/org/mangorage/bootstrap/internal/launch/ModuleLayerImpl.java
@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.internal;
+package org.mangorage.bootstrap.internal.launch;
 
 import org.mangorage.bootstrap.api.module.IModuleLayer;
 
diff --git a/src/main/java/org/mangorage/bootstrap/internal/util/Dependency.java b/src/main/java/org/mangorage/bootstrap/internal/util/Dependency.java
@@ -29,6 +29,4 @@ public record Dependency(
         String version,
         String target,
         String output
-) {
-
-}
+) {}
diff --git a/src/main/java/org/mangorage/bootstrap/internal/util/Result.java b/src/main/java/org/mangorage/bootstrap/internal/util/Result.java
@@ -1,12 +1,23 @@
 package org.mangorage.bootstrap.internal.util;
 
-import org.mangorage.bootstrap.internal.JarHandler;
+import org.mangorage.bootstrap.api.dependency.IDependency;
+import org.mangorage.bootstrap.api.dependency.ModuleNameOrigin;
 
 import java.nio.file.Path;
-import java.util.concurrent.atomic.AtomicReference;
 
-public record Result(String name, ModuleNameOrigin origin, Path jar, AtomicReference<UnsafeRunnable> task) {
-    public Result(String name, ModuleNameOrigin origin, Path jar) {
-        this(name, origin, jar, new AtomicReference<>());
+public record Result(String name, ModuleNameOrigin origin, Path jar) implements IDependency {
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public ModuleNameOrigin getModuleNameOrigin() {
+        return origin;
+    }
+
+    @Override
+    public Path resolveJar() {
+        return jar;
     }
 }
diff --git a/src/main/java/org/mangorage/bootstrap/internal/util/Util.java b/src/main/java/org/mangorage/bootstrap/internal/util/Util.java
@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.internal;
+package org.mangorage.bootstrap.internal.util;
 
 import java.io.File;
 import java.lang.module.ModuleFinder;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.mangorage.bootstrap.internal.util;`
	`1`	`+package org.mangorage.bootstrap.api.dependency;`
`2`	`2`
`3`	`3`	`public enum ModuleNameOrigin {`
`4`	`4`	`MODULE_INFO, // HIGHEST`