Allow the server to send ClientDiff

.gitignore

@@ -71,6 +71,7 @@ tmp/
 # Extra
 Nebula Handbook.txt
 config.json
+patchlist.json
 *.mv
 *.exe
 *.p12

src/main/java/emu/nebula/Config.java

@@ -24,6 +24,7 @@ public class Config {
 
     public String resourceDir = "./resources";
     public String dataDir = "./data";
+    public String patchListPath = "./patchlist.json";
 
     @Getter
     public static class DatabaseInfo {

src/main/java/emu/nebula/GameConstants.java

@@ -3,7 +3,7 @@ package emu.nebula;
 import java.time.ZoneId;
 
 public class GameConstants {
-    public static final int DATA_VERSION = 40;
+    public static final int DATA_VERSION = 46;
     public static final String VERSION = "1.0.0." + DATA_VERSION;
     
     public static final ZoneId UTC_ZONE = ZoneId.of("UTC");

src/main/java/emu/nebula/command/commands/ReloadCommand.java

@@ -11,6 +11,11 @@ public class ReloadCommand implements CommandHandler {
     @Override
     public void execute(CommandArgs args) {
         Nebula.loadConfig();
+        
+        if (Nebula.getHttpServer() != null) {
+            Nebula.getHttpServer().loadPatchList();
+        }
+        
         args.sendMessage("Reloaded the server config");
     }
 

src/main/java/emu/nebula/server/HttpServer.java

@@ -1,5 +1,8 @@
 package emu.nebula.server;
 
+import java.io.File;
+import java.io.FileReader;
+
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
@@ -7,9 +10,12 @@ import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 import emu.nebula.Config.HttpServerConfig;
+import emu.nebula.GameConstants;
 import emu.nebula.Nebula;
 import emu.nebula.Nebula.ServerType;
+import emu.nebula.proto.Pb.ClientDiff;
 import emu.nebula.server.routes.*;
+import emu.nebula.util.JsonUtils;
 import io.javalin.Javalin;
 import io.javalin.http.ContentType;
 import io.javalin.http.Context;
@@ -21,10 +27,15 @@ public class HttpServer {
     private ServerType type;
     private boolean started;
     
+    // Cached client diff
+    private PatchList patchlist;
+    private byte[] diff;
+    
     public HttpServer(ServerType type) {
         this.app = Javalin.create();
         this.type = type;
 
+        this.loadPatchList();
         this.addRoutes();
     }
     
@@ -49,6 +60,39 @@ public class HttpServer {
         return sslContextFactory;
     }
     
+    // Patch list
+    
+    public long getDataVersion() {
+        return getPatchlist() != null ? getPatchlist().getVersion() : GameConstants.DATA_VERSION;
+    }
+    
+    public synchronized void loadPatchList() {
+        // Clear
+        this.patchlist = null;
+        this.diff = null;
+        
+        // Get file
+        File file = new File(Nebula.getConfig().getPatchListPath());
+        
+        if (!file.exists()) {
+            this.diff = ClientDiff.newInstance().toByteArray();
+            return;
+        }
+        
+        // Load
+        try (FileReader reader = new FileReader(file)) {
+            this.patchlist = JsonUtils.loadToClass(reader, PatchList.class);
+            this.diff = patchlist.toProto().toByteArray();
+        } catch (Exception e) {
+            this.patchlist = null;
+            this.diff = ClientDiff.newInstance().toByteArray();
+        }
+        
+        if (this.patchlist != null) {
+            Nebula.getLogger().info("Loaded patchlist version " + patchlist.getVersion());
+        }
+    }
+    
     // Start server
     
     public void start() {
@@ -107,7 +151,7 @@ public class HttpServer {
         
         // https://nova-static.stellasora.global/
         getApp().get("/meta/serverlist.html", new MetaServerlistHandler(this));
-        getApp().get("/meta/win.html", new MetaWinHandler());
+        getApp().get("/meta/win.html", new MetaWinHandler(this));
     }
     
     private void addGameServerRoutes() {

src/main/java/emu/nebula/server/PatchList.java

@@ -0,0 +1,39 @@
+package emu.nebula.server;
+
+import java.util.List;
+
+import emu.nebula.proto.Pb.ClientDiff;
+import emu.nebula.proto.Pb.FileDiff;
+import lombok.Getter;
+
+@Getter
+public class PatchList {
+    public long version;
+    public List<PatchListFile> files;
+    
+    @Getter
+    public static class PatchListFile {
+        public String name;
+        public String hash;
+        public long version;
+        public String additionalPath;
+    }
+    
+    // Proto
+    
+    public ClientDiff toProto() {
+        var proto = ClientDiff.newInstance();
+        
+        for (var file : files) {
+            var diff = FileDiff.newInstance()
+                    .setFileName(file.getName())
+                    .setHash(file.getHash())
+                    .setVersion(this.getVersion())
+                    .setAdditionalPath(file.getAdditionalPath());
+            
+            proto.addDiff(diff);
+        }
+        
+        return proto;
+    }
+}

src/main/java/emu/nebula/server/routes/MetaServerlistHandler.java

@@ -2,7 +2,6 @@ package emu.nebula.server.routes;
 
 import org.jetbrains.annotations.NotNull;
 
-import emu.nebula.GameConstants;
 import emu.nebula.proto.Pb.ServerAgent;
 import emu.nebula.proto.Pb.ServerListMeta;
 import emu.nebula.server.HttpServer;
@@ -24,7 +23,7 @@ public class MetaServerlistHandler implements Handler {
         
         // Create server list
         this.list = ServerListMeta.newInstance()
-                .setVersion(GameConstants.DATA_VERSION)
+                .setVersion(server.getDataVersion())
                 .setReportEndpoint(server.getServerConfig().getDisplayAddress() + "/report");
         
         var agent = ServerAgent.newInstance()

src/main/java/emu/nebula/server/routes/MetaWinHandler.java

@@ -2,8 +2,9 @@ package emu.nebula.server.routes;
 
 import org.jetbrains.annotations.NotNull;
 
-import emu.nebula.proto.Pb.ClientDiff;
+import emu.nebula.server.HttpServer;
 import emu.nebula.util.AeadHelper;
+import emu.nebula.util.Utils;
 import io.javalin.http.ContentType;
 import io.javalin.http.Context;
 import io.javalin.http.Handler;
@@ -12,24 +13,27 @@ import lombok.Getter;
 
 @Getter(AccessLevel.PRIVATE)
 public class MetaWinHandler implements Handler {
-    private ClientDiff list;
+    private HttpServer server;
-    private byte[] proto;
     
-    public MetaWinHandler() {
+    public MetaWinHandler(HttpServer server) {
-        // Create client diff
+        this.server = server;
-        this.list = ClientDiff.newInstance();
-        
-        // TODO load from json or something
-        
-        // Cache proto
-        this.proto = list.toByteArray();
     }
 
     @Override
     public void handle(@NotNull Context ctx) throws Exception {
-        // Result
+        // Get diff
+        var diffBytes = this.getServer().getDiff();
+        
+        // Sanity check
+        if (diffBytes == null) {
+            ctx.contentType(ContentType.APPLICATION_OCTET_STREAM);
+            ctx.result(Utils.EMPTY_BYTE_ARRAY);
+            return;
+        }
+        
+        // Encrypt patch list
         ctx.contentType(ContentType.APPLICATION_OCTET_STREAM);
-        ctx.result(AeadHelper.encryptCBC(this.getProto()));
+        ctx.result(AeadHelper.encryptCBC(diffBytes));
     }
 
 }