4.1.0: Use MVNLoader instead of DepDownloader

Author: AuroraLS3

api/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     implementation "com.googlecode.json-simple:json-simple:$jsonSimpleVersion"
     implementation "com.google.guava:guava:$guavaVersion"
     compileOnly "org.slf4j:slf4j-api:1.7.30"
-    compile "com.github.egg82:DepDownloader:20373b7f6e"
+    compile "com.github.egg82:MVNLoader:276fc2165f"
     compile "me.lucko:jar-relocator:1.4"
 }
 

api/src/main/java/net/playeranalytics/plugin/dependencies/DependencyLoader.java

@@ -1,75 +1,51 @@
 package net.playeranalytics.plugin.dependencies;
 
-import me.lucko.jarrelocator.JarRelocator;
 import me.lucko.jarrelocator.Relocation;
 import net.playeranalytics.plugin.PluginInformation;
-import net.playeranalytics.plugin.server.PluginLogger;
-import ninja.egg82.maven.Artifact;
-import ninja.egg82.maven.Repository;
-import ninja.egg82.maven.Scope;
-import ninja.egg82.utils.InjectUtil;
-import org.xml.sax.SAXException;
+import ninja.egg82.mvn.JarBuilder;
+import ninja.egg82.mvn.JarInjector;
+import ninja.egg82.mvn.classloaders.TransparentInjectableClassLoader;
+import org.apache.maven.model.building.ModelBuildingException;
 
-import javax.xml.xpath.XPathExpressionException;
 import java.io.File;
 import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URISyntaxException;
 import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.List;
 
 public class DependencyLoader {
 
     private final URLClassLoader classLoader;
-    private final PluginLogger pluginLogger;
 
-    private final ExecutorService downloadPool = Executors.newWorkStealingPool(Math.max(4, Runtime.getRuntime().availableProcessors() / 2));
-    private final Set<DependencyAndRelocations> dependencies = new HashSet<>();
-    private final File dependencyCache;
-    private final File libraryFolder;
+    private final JarInjector jarInjector;
 
-    public DependencyLoader(URLClassLoader classLoader, PluginLogger pluginLogger, PluginInformation pluginInformation) {
+    public DependencyLoader(URLClassLoader classLoader, PluginInformation pluginInformation) {
         this.classLoader = classLoader;
-        this.pluginLogger = pluginLogger;
-        dependencyCache = pluginInformation.getDataDirectory().resolve("dependency_cache").toFile();
-        libraryFolder = pluginInformation.getDataDirectory().resolve("libraries").toFile();
+
+        File dependencyCache = pluginInformation.getDataDirectory().resolve("dep_cache").toFile();
+
+        jarInjector = new JarInjector(dependencyCache);
     }
 
     public DependencyLoader addDependency(
             String repositoryAddress, String group, String artifact, String version,
             List<Relocation> relocations
-    ) throws IOException {
+    ) {
         try {
-            Artifact dependency = Artifact.builder(group, artifact, version, dependencyCache, Scope.COMPILE)
-                    .addRepository(Repository.builder(repositoryAddress).build())
-                    .build();
-            Stack<DependencyAndRelocations> dependencyLookup = new Stack<>();
-            dependencyLookup.add(new DependencyAndRelocations(dependency, relocations));
-            while (!dependencyLookup.isEmpty() && dependencyLookup.peek() != null) {
-                DependencyAndRelocations current = dependencyLookup.pop();
-                Artifact currentArtifact = current.getArtifact();
-                if (currentArtifact.getScope() == Scope.COMPILE) {
-                    currentArtifact.getDependencies().stream()
-                            .map(dependencyArtifact ->
-                                    new DependencyAndRelocations(dependencyArtifact, relocations))
-                            .forEach(dependencyLookup::add);
-                    dependencies.add(current);
-                }
+            jarInjector.addBuilder(new JarBuilder(group, artifact, version, repositoryAddress));
+            for (Relocation relocation : relocations) {
+                jarInjector.addRelocation(relocation);
             }
-        } catch (URISyntaxException | XPathExpressionException | SAXException e) {
+        } catch (ClassCastException e) {
             throw new IllegalArgumentException("Incorrect dependency definition", e);
         }
         return this;
     }
 
-    public void load() throws IOException {
+    public void load() throws IOException, ModelBuildingException {
         ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(classLoader);
-            loadDependencies();
+            jarInjector.inject(new TransparentInjectableClassLoader(classLoader));
         } finally {
             Thread.currentThread().setContextClassLoader(origClassLoader);
         }
@@ -85,99 +61,4 @@ public <T extends Runnable> void executeWithDependencyClassloaderContext(T runna
             Thread.currentThread().setContextClassLoader(origClassLoader);
         }
     }
-
-    private void loadDependencies() throws IOException {
-        List<CompletableFuture<?>> loading = new ArrayList<>();
-        List<Throwable> downloadErrors = new CopyOnWriteArrayList<>();
-        for (DependencyAndRelocations dependency : dependencies) {
-            loading.add(scheduleLoading(downloadErrors, dependency));
-        }
-        CompletableFuture.allOf(loading.toArray(new CompletableFuture[0])).join();
-        shutdownPool(downloadErrors);
-
-        if (!downloadErrors.isEmpty()) {
-            throwError(downloadErrors);
-        }
-    }
-
-    private CompletableFuture<Void> scheduleLoading(List<Throwable> downloadErrors, DependencyAndRelocations dependency) {
-        return CompletableFuture.runAsync(() -> {
-            try {
-                loadDependency(dependency);
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-        }, downloadPool).exceptionally(throwable -> {
-            downloadErrors.add(throwable);
-            return null;
-        });
-    }
-
-    private void shutdownPool(List<Throwable> downloadErrors) {
-        downloadPool.shutdown();
-        try {
-            if (!downloadPool.awaitTermination(1, TimeUnit.HOURS)) {
-                downloadErrors.add(0, new IOException("Download timeout exceeded"));
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-    }
-
-    private void throwError(List<Throwable> downloadErrors) throws IOException {
-        IOException firstError = new IOException("Failed to download all dependencies (see suppressed exceptions for why it failed)");
-        for (Throwable downloadError : downloadErrors) {
-            firstError.addSuppressed(downloadError.getCause());
-        }
-        throw firstError;
-    }
-
-    private void loadDependency(DependencyAndRelocations toLoad) throws IOException {
-        Artifact dependency = toLoad.getArtifact();
-        String artifactCoordinates = dependency.getGroupId() + "-" +
-                dependency.getArtifactId() + "-" + dependency.getVersion();
-        Files.createDirectories(libraryFolder.toPath());
-        File artifactFile = libraryFolder.toPath().resolve(artifactCoordinates + ".jar").toFile();
-        File relocatedArtifactFile = libraryFolder.toPath().resolve(artifactCoordinates + "-relocated.jar").toFile();
-
-        if (!relocatedArtifactFile.exists() && !toLoad.getRelocations().isEmpty()) {
-            if (!dependency.fileExists(artifactFile)) {
-                pluginLogger.info("Downloading library: " + dependency.getArtifactId() + "..");
-                download(dependency, artifactCoordinates, artifactFile);
-            }
-            new JarRelocator(artifactFile, relocatedArtifactFile, toLoad.getRelocations()).run();
-
-            inject(relocatedArtifactFile);
-        } else if (relocatedArtifactFile.exists()) {
-            inject(relocatedArtifactFile);
-        } else {
-            if (!dependency.fileExists(artifactFile)) {
-                pluginLogger.info("Downloading library: " + dependency.getArtifactId() + "..");
-                download(dependency, artifactCoordinates, artifactFile);
-            }
-
-            inject(artifactFile);
-        }
-    }
-
-    private void inject(File artifactFile) throws IOException {
-        try {
-            InjectUtil.injectFile(artifactFile, classLoader);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new IOException("Failed to download " + artifactFile + ", " + e.getMessage(), e);
-        }
-    }
-
-    private void download(Artifact dependency, String artifactCoordinates, File artifactFile) throws IOException {
-        try {
-            dependency.downloadJar(artifactFile);
-        } catch (IOException e) {
-            StringBuilder repositories = new StringBuilder();
-            for (Repository repository : dependency.getRepositories()) {
-                repositories.append(" ").append(repository.getURL());
-            }
-            pluginLogger.warn("Failed to download " + artifactCoordinates + " from repositories (" + repositories + "), " + e.getMessage());
-            throw e;
-        }
-    }
 }

build.gradle

@@ -2,17 +2,17 @@ plugins {
     id 'java'
 }
 group 'net.playeranalytics'
-version '4.0.13'
+version '4.1.0'
 
 allprojects {
     group 'net.playeranalytics'
-    version '4.0.13'
+    version '4.1.0'
 
     ext.version = project.version
 
     compileJava { options.encoding = "UTF-8" }
 
-    ext.paperVersion = '1.16.5-R0.1-SNAPSHOT'
+    ext.paperVersion = '1.16.4-R0.1-SNAPSHOT'
     ext.spongeVersion = '7.3.0'
     ext.nukkitVersion = '1.0-SNAPSHOT'
     ext.bungeecordVersion = '1.16-R0.4'

bukkit/src/main/java/net/playeranalytics/plugin/BukkitPlatformLayer.java

@@ -59,7 +59,6 @@ public DependencyLoader getDependencyLoader() {
         if (dependencyLoader == null) {
             dependencyLoader = new DependencyLoader(
                     (URLClassLoader) getClass().getClassLoader(),
-                    getPluginLogger(),
                     getPluginInformation()
             );
         }

bungeecord/src/main/java/net/playeranalytics/plugin/BungeePlatformLayer.java

@@ -61,7 +61,6 @@ public DependencyLoader getDependencyLoader() {
         if (dependencyLoader == null) {
             dependencyLoader = new DependencyLoader(
                     (URLClassLoader) getClass().getClassLoader(),
-                    getPluginLogger(),
                     getPluginInformation()
             );
         }

nukkit/src/main/java/net/playeranalytics/plugin/NukkitPlatformLayer.java

@@ -54,7 +54,6 @@ public DependencyLoader getDependencyLoader() {
         if (dependencyLoader == null) {
             dependencyLoader = new DependencyLoader(
                     (URLClassLoader) getClass().getClassLoader(),
-                    getPluginLogger(),
                     getPluginInformation()
             );
         }

sponge/src/main/java/net/playeranalytics/plugin/SpongePlatformLayer.java

@@ -59,7 +59,6 @@ public DependencyLoader getDependencyLoader() {
         if (dependencyLoader == null) {
             dependencyLoader = new DependencyLoader(
                     (URLClassLoader) getClass().getClassLoader(),
-                    getPluginLogger(),
                     getPluginInformation()
             );
         }

velocity/src/main/java/net/playeranalytics/plugin/VelocityPlatformLayer.java

@@ -64,7 +64,6 @@ public DependencyLoader getDependencyLoader() {
         if (dependencyLoader == null) {
             dependencyLoader = new DependencyLoader(
                     (URLClassLoader) getClass().getClassLoader(),
-                    getPluginLogger(),
                     getPluginInformation()
             );
         }