Add cli command to start mch-hub server

build.gradle.kts

@@ -27,6 +27,7 @@ subprojects {
 
     tasks.withType<JavaCompile>() {
         options.encoding = "UTF-8"
+        options.release = 17
     }
 
     tasks.withType<Javadoc>() {

mch-cli/build.gradle.kts

@@ -14,6 +14,7 @@ repositories {
 
 dependencies {
     implementation(project(":mch"))
+    implementation(project(":mch-hub-server"))
     implementation("com.google.inject:guice:6.0.0")
     implementation("info.picocli:picocli:4.7.4")
     annotationProcessor("info.picocli:picocli-codegen:4.7.4")

mch-cli/src/main/java/ca/bkaw/mch/cli/MchCli.java

@@ -1,6 +1,7 @@
 package ca.bkaw.mch.cli;
 
 import ca.bkaw.mch.cli.ftp.FtpCommand;
+import ca.bkaw.mch.cli.hub.HubCommand;
 import ca.bkaw.mch.cli.research.ResearchCommand;
 import ca.bkaw.mch.cli.sftp.SftpCommand;
 import ca.bkaw.mch.cli.world.WorldCommand;
@@ -11,6 +12,7 @@
     CommitCommand.class,
     CatCommand.class,
     FtpCommand.class,
+    HubCommand.class,
     InitCommand.class,
     LogCommand.class,
     ResearchCommand.class,

mch-cli/src/main/java/ca/bkaw/mch/cli/hub/HubCommand.java

@@ -0,0 +1,47 @@
+package ca.bkaw.mch.cli.hub;
+
+import ca.bkaw.mch.hub.MchHub;
+import ca.bkaw.mch.hub.MchHubServer;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.ExitCode;
+import picocli.CommandLine.Parameters;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.concurrent.CountDownLatch;
+
+@Command(name = "hub")
+public class HubCommand {
+    @Command(name = "start")
+    public int start(
+        @Parameters(index = "0", defaultValue = "0.0.0.0")
+        InetAddress host,
+        @Parameters(index = "1", defaultValue = "4148")
+        int port
+    ) {
+        try {
+            MchHubServer server = MchHub.start(new InetSocketAddress(host, port));
+            if (server == null) {
+                return ExitCode.USAGE;
+            }
+
+            CountDownLatch latch = new CountDownLatch(1);
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                try {
+                    System.out.println("\nStopping mch-hub server");
+                    server.stop(0);
+                } finally {
+                    latch.countDown();
+                }
+            }));
+
+            latch.await();
+
+            return ExitCode.OK;
+        } catch (Throwable e) {
+            System.err.println("mch-hub-server crashed");
+            e.printStackTrace();
+            return ExitCode.SOFTWARE;
+        }
+    }
+}

mch-hub-server/src/main/java/ca/bkaw/mch/hub/MchHub.java

@@ -10,7 +10,7 @@
 import java.nio.file.Path;
 
 public class MchHub {
-    public static void start(InetSocketAddress addr) throws IOException {
+    public static MchHubServer start(InetSocketAddress addr) throws IOException {
         MchHubServer server = new MchHubServer();
 
         Path configPath = Path.of("mch-hub.toml");
@@ -20,7 +20,7 @@ public static void start(InetSocketAddress addr) throws IOException {
             Config reposConfig = config.get("repos");
             if (reposConfig == null) {
                 System.out.println("mch-hub-server is not configured. Add a repository to mch-hub.toml to get started!");
-                return;
+                return null;
             }
             for (Config.Entry entry : reposConfig.entrySet()) {
                 String key = entry.getKey();
@@ -44,6 +44,7 @@ public static void start(InetSocketAddress addr) throws IOException {
 
         server.start(addr);
         System.out.println("Starting mch-hub-server on port " + addr.getPort());
+        return server;
     }
 
     public static void main(String[] args) throws IOException {

mch-hub-server/src/main/java/ca/bkaw/mch/hub/MchHubServer.java

@@ -29,4 +29,8 @@ public void addRepo(String identifier, MchRepository repository) {
         this.httpServer.createContext("/repo/" + identifier + "/v1/restoreFile", handler::restoreFile);
         this.httpServer.createContext("/repo/" + identifier + "/v1/list", handler::list);
     }
+
+    public void stop(int delay) {
+        this.httpServer.stop(delay);
+    }
 }

mch-viewer/fabric/src/main/java/ca/bkaw/mch/viewer/fabric/RepoViewerConfig.java

@@ -50,7 +50,7 @@ public static RepoViewerConfig fromConfig(Config config) throws IOException {
                 }
             }
         } else {
-            trackedWorldSha1 = trackedWorlds.getFirst();
+            trackedWorldSha1 = trackedWorlds.iterator().next();
         }
         if (trackedWorldSha1 == null) {
             throw new RuntimeException("Unable to find tracked world.");