Added Update Checking...

RealMangorage · RealMangorage · commit fc8b1a77319e · 2025-04-26T01:54:10.000-07:00
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,4 +1,5 @@
 module org.mangorage.installer {
     requires com.google.gson;
     requires jopt.simple;
+    requires java.xml;
 }
diff --git a/src/main/java/org/mangorage/installer/Installer.java b/src/main/java/org/mangorage/installer/Installer.java
@@ -6,6 +6,7 @@
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import joptsimple.util.PathConverter;
+import org.mangorage.installer.core.UpdateChecker;
 import org.mangorage.installer.core.data.*;
 import java.io.*;
 import java.lang.reflect.Method;
@@ -29,23 +30,31 @@ public class Installer {
     private static final Path LIBRARIES_PATH = Path.of("libraries/").toAbsolutePath();
 
     public static void main(String[] args) {
-        System.out.println("Starting Installer...");
-        System.out.println("Arguments Supplied: " + Arrays.toString(args));
+        org.mangorage.installer.core.LogUtil.println("Starting Installer...");
+        org.mangorage.installer.core.LogUtil.println("Arguments Supplied: " + Arrays.toString(args));
 
         OptionParser parser = new OptionParser();
 
-        OptionSpec<Void> launchArg = parser
+        final OptionSpec<Void> launchArg = parser
                 .accepts("launch", "Whether or not to launch the program that will be installed/updated");
 
-        OptionSpec<Path> manualJar = parser
+        final OptionSpec<Path> manualJar = parser
                 .accepts("manualJar", "Provide a path to the jar")
                 .withRequiredArg()
                 .withValuesSeparatedBy(";")
                 .withValuesConvertedBy(new PathConverter());
 
+        final OptionSpec<Integer> checkUpdates = parser
+                .accepts("checkUpdates", "Automatically check for updates for packages which want to be checked")
+                .withRequiredArg()
+                .ofType(Integer.TYPE);
+
         var options = parser.parse(args);
 
-        List<File> jars = options.has("manualJar") ? getManualJars(options, manualJar) : processPackages();
+        List<File> jars = options.has("manualJar") ? getManualJars(options, manualJar) : processPackages(
+                options.has(checkUpdates) && options.has("launch"),
+                options.has(checkUpdates) ? options.valueOf(checkUpdates) : 0
+        );
 
         if (jars.isEmpty()) {
             throw new IllegalStateException("No JARs found to process!");
@@ -55,10 +64,10 @@ public static void main(String[] args) {
         handleDependencies(dependencies);
 
         if (options.has("launch")) {
-            System.out.println("Finished running installer...");
+            org.mangorage.installer.core.LogUtil.println("Finished running installer...");
             launchJar(jars, args);
         } else {
-            System.out.println("Finished running installer...");
+            org.mangorage.installer.core.LogUtil.println("Finished running installer...");
             System.exit(0);
         }
     }
@@ -70,8 +79,8 @@ private static List<File> getManualJars(OptionSet options, OptionSpec<Path> manu
                 .toList();
     }
 
-    private static List<File> processPackages() {
-        System.out.println("Processing installer/packages.json");
+    private static List<File> processPackages(final boolean checkUpdates, final int updateFreq) {
+        org.mangorage.installer.core.LogUtil.println("Processing installer/packages.json");
         File file = new File("installer/packages.json");
         if (!file.exists()) throw new IllegalStateException("packages.json not found!");
 
@@ -80,6 +89,7 @@ private static List<File> processPackages() {
 
         try (var reader = new FileReader(file)) {
             Packages packages = GSON.fromJson(reader, Packages.class);
+            if (checkUpdates) UpdateChecker.startChecker(packages, updateFreq);
             Map<String, String> newVersions = new HashMap<>();
 
             for (Dependency dependency : packages.packages()) {
@@ -125,7 +135,7 @@ private static File handleDependency(Dependency dependency, Map<String, String>
             return new File(destination, dependency.target());
         }
 
-        System.out.println("Installing/updating " + dependency.target());
+        org.mangorage.installer.core.LogUtil.println("Installing/updating " + dependency.target());
         return Util.downloadTo(maven, latestVersion, destination + "/" + dependency.target());
     }
 
@@ -134,13 +144,13 @@ private static String fetchLatestVersion(Maven maven, String defaultVersion) {
         try {
             return Util.parseLatestVersion(future.get(10, TimeUnit.SECONDS), defaultVersion);
         } catch (Exception e) {
-            System.out.println("Failed to get metadata, using default version: " + defaultVersion);
+            org.mangorage.installer.core.LogUtil.println("Failed to get metadata, using default version: " + defaultVersion);
             return defaultVersion;
         }
     }
 
     private static List<Dependency> extractDependencies(List<File> jars) {
-        System.out.println("Extracting dependencies from JARs");
+        org.mangorage.installer.core.LogUtil.println("Extracting dependencies from JARs");
         List<Dependency> dependencies = new ArrayList<>();
 
         for (File jar : jars) {
@@ -150,7 +160,7 @@ private static List<Dependency> extractDependencies(List<File> jars) {
                     try (var reader = new InputStreamReader(jarFile.getInputStream(entry))) {
                         List<Dependency> extracted = GSON.fromJson(reader, Dependencies.class).dependencies();
                         dependencies.addAll(extracted);
-                        extracted.forEach(dep -> System.out.println("Found dependency: " + dep));
+                        extracted.forEach(dep -> org.mangorage.installer.core.LogUtil.println("Found dependency: " + dep));
                     }
                 }
             } catch (IOException e) {
@@ -161,8 +171,8 @@ private static List<Dependency> extractDependencies(List<File> jars) {
     }
 
     private static void handleDependencies(List<Dependency> dependencies) {
-        System.out.println("Handling dependencies...");
-        System.out.println("Skipping dependencies already present...");
+        org.mangorage.installer.core.LogUtil.println("Handling dependencies...");
+        org.mangorage.installer.core.LogUtil.println("Skipping dependencies already present...");
         Set<String> installedJars = new HashSet<>();
         List<File> existingJars = getExistingLibraryJars();
 
@@ -171,7 +181,7 @@ private static void handleDependencies(List<Dependency> dependencies) {
             if (!existingJars.contains(new File(LIBRARIES_PATH.toString(), dep.target()))) {
                 Util.installUrl(dep.getDownloadURL(), LIBRARIES_PATH.toString(), true);
             } else {
-                System.out.println("Skipped -> " + dep.target());
+                org.mangorage.installer.core.LogUtil.println("Skipped -> " + dep.target());
             }
         }
 
@@ -186,7 +196,7 @@ private static List<File> getExistingLibraryJars() {
     private static void deleteUnusedDependencies(List<File> existingJars, Set<String> installedJars) {
         existingJars.forEach(file -> {
             if (!installedJars.contains(file.getName())) {
-                System.out.println("Deleting unused dependency: " + file.getName());
+                org.mangorage.installer.core.LogUtil.println("Deleting unused dependency: " + file.getName());
                 file.delete();
             }
         });
@@ -201,7 +211,7 @@ public static String findMainClass(List<File> files) {
                 ZipEntry entry;
                 while ((entry = zis.getNextEntry()) != null) {
                     if (SERVICE_PATH.equals(entry.getName())) {
-                        System.out.println("Found " + SERVICE_PATH + " in " + file.getName());
+                        org.mangorage.installer.core.LogUtil.println("Found " + SERVICE_PATH + " in " + file.getName());
                         return reader.lines().collect(Collectors.joining("\n"));
                     }
                 }
@@ -213,10 +223,10 @@ public static String findMainClass(List<File> files) {
     }
 
     public static void launchJar(List<File> jars, String[] args) {
-        System.out.println("Attempting to launch....");
+        org.mangorage.installer.core.LogUtil.println("Attempting to launch....");
         String mainClass = findMainClass(jars).strip();
         if (mainClass.isEmpty()) {
-            System.out.println("Could not find Valid Launch File from List of Jars...");
+            org.mangorage.installer.core.LogUtil.println("Could not find Valid Launch File from List of Jars...");
             return;
         }
 
diff --git a/src/main/java/org/mangorage/installer/core/LogUtil.java b/src/main/java/org/mangorage/installer/core/LogUtil.java
@@ -0,0 +1,7 @@
+package org.mangorage.installer.core;
+
+public final class LogUtil {
+    public static void println(final String msg) {
+        System.out.println("[INSTALLER] " + msg);
+    }
+}
diff --git a/src/main/java/org/mangorage/installer/core/UpdateChecker.java b/src/main/java/org/mangorage/installer/core/UpdateChecker.java
@@ -0,0 +1,61 @@
+package org.mangorage.installer.core;
+
+import org.mangorage.installer.core.data.Dependency;
+import org.mangorage.installer.core.data.Packages;
+import org.mangorage.installer.core.data.Util;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.Executors;
+
+public final class UpdateChecker extends TimerTask {
+    public static void startChecker(final Packages packages, final int freq) {
+        org.mangorage.installer.core.LogUtil.println("Starting Update Checker... Checks every " + freq + "ms");
+        new UpdateChecker(packages, freq);
+    }
+
+    private final Map<String, String> lastUpdated = new HashMap<>();
+
+    private final Packages packages;
+    private final Timer timer = new Timer();
+
+    UpdateChecker(final Packages packages, final int freq) {
+        this.packages = packages;
+        Executors.newSingleThreadExecutor().execute(() -> start(freq));
+    }
+
+    void start(final int freq) {
+        org.mangorage.installer.core.LogUtil.println("Started Update Checker.");
+        packages
+                .packages()
+                .stream()
+                .filter(Dependency::checkUpdate)
+                .forEach(dependency -> {
+                    final var metadata = Util.downloadMetadata(dependency.getMaven());
+                    final var lastUpdatedTime = Util.getLastUpdated(metadata);
+                    lastUpdated.put(dependency.target(), lastUpdatedTime);
+                });
+
+        timer.scheduleAtFixedRate(this, freq, freq);
+    }
+
+    @Override
+    public void run() {
+        packages
+                .packages()
+                .stream()
+                .filter(Dependency::checkUpdate)
+                .forEach(dependency -> {
+                    final var metadata = Util.downloadMetadata(dependency.getMaven());
+                    final var lastUpdatedTime = Util.getLastUpdated(metadata);
+                    final var lastCheckedUpdatedTime = lastUpdated.get(dependency.target());
+                    if (lastCheckedUpdatedTime != null) {
+                        if (!lastCheckedUpdatedTime.matches(lastUpdatedTime)) {
+                            org.mangorage.installer.core.LogUtil.println("Exiting... Found update for " + dependency.target());
+                            System.exit(0);
+                        }
+                    }
+                });
+    }
+}
diff --git a/src/main/java/org/mangorage/installer/core/data/Dependency.java b/src/main/java/org/mangorage/installer/core/data/Dependency.java
@@ -22,7 +22,14 @@
 
 package org.mangorage.installer.core.data;
 
-public record Dependency(String url, String group, String artifact, String version, String target) {
+public record Dependency(
+        String url,
+        String group,
+        String artifact,
+        String version,
+        String target,
+        boolean checkUpdate
+) {
     public static String fix(String value) {
         if (value.endsWith("/")) {
             return value.substring(0, value.length() - 1);
@@ -34,6 +41,14 @@ public static String fixDot(String value) {
         return value.replaceAll("\\.", "/");
     }
 
+    public Maven getMaven() {
+        return new Maven(
+                url,
+                group,
+                artifact
+        );
+    }
+
     public String getDownloadURL() {
         return "%s/%s/%s/%s/%s".formatted(fix(url), fixDot(group), artifact, version, target);
     }
diff --git a/src/main/java/org/mangorage/installer/core/data/Util.java b/src/main/java/org/mangorage/installer/core/data/Util.java
@@ -34,7 +34,7 @@
 import java.nio.file.StandardCopyOption;
 import java.util.stream.Collectors;
 
-public class Util {
+public final class Util {
 
     public static File downloadTo(Maven maven, String version, String path) {
         String URL = "%s/%s/%s/%s/%s-%s.jar".formatted(
@@ -54,9 +54,24 @@ public static File downloadTo(Maven maven, String version, String path) {
         return new File(path);
     }
 
+    public static String getLastUpdated(String xmlContent) {
+        String tag = "<lastUpdated>";
+        String endTag = "</lastUpdated>";
+
+        int start = xmlContent.indexOf(tag);
+        int end = xmlContent.indexOf(endTag);
+
+        if (start == -1 || end == -1 || start > end) {
+            throw new IllegalStateException("Can't find your precious <lastUpdated> tag, genius.");
+        }
+
+        start += tag.length();
+        return xmlContent.substring(start, end).trim();
+    }
+
     public static String downloadMetadata(Maven maven) {
         String url = maven.repository() + "/" + maven.groupId().replace(".", "/") + "/" + maven.artifactId() + "/maven-metadata.xml";
-        System.out.println("Downloading Metadata from %s".formatted(url));
+        org.mangorage.installer.core.LogUtil.println("Downloading Metadata from %s".formatted(url));
         try {
             return convertInputStreamToString(new URL(url).openStream());
         } catch (IOException e) {
@@ -102,13 +117,13 @@ public static void installUrl(String url, String destinationPath, boolean resolv
                 if (!Files.exists(destination.getParent())) Files.createDirectories(destination.getParent());
                 Files.copy(inputStream, destination, StandardCopyOption.REPLACE_EXISTING);
 
-                System.out.println("Installation complete. File saved to: " + destination);
+                org.mangorage.installer.core.LogUtil.println("[INSTALLER] Installation complete. File saved to: " + destination);
             } catch (URISyntaxException e) {
                 throw new RuntimeException(e);
             }
 
         } catch (IOException e) {
-            System.out.println(url);
+            org.mangorage.installer.core.LogUtil.println(url);
             throw new IllegalStateException(e);
         }
     }
diff --git a/src/main/java/org/mangorage/installer/core/data/Version.java b/src/main/java/org/mangorage/installer/core/data/Version.java
@@ -5,7 +5,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class Version implements Comparable<Version> {
+public final class Version implements Comparable<Version> {
 
     public static List<Version> parseMetadata(String metadata) {
         return Version.parseVersions(metadata).stream().map(a -> {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`module org.mangorage.installer {`
`2`	`2`	`requires com.google.gson;`
`3`	`3`	`requires jopt.simple;`
	`4`	`+ requires java.xml;`
`4`	`5`	`}`