Merge branch 'release/5.6.0'

GravitLauncher · Mar 24, 2024 · a8b165f · a8b165f
2 parents db6ab06 + 06ada30
commit a8b165f
Show file tree

Hide file tree

Showing 399 changed files with 3,000 additions and 2,997 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -26,6 +26,8 @@ jobs:
 
       - name: Build with Gradle
         run: ./gradlew build
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5
 
       - name: Create artifacts
         run: |

diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle
@@ -1,4 +1,4 @@
-def mainClassName = "pro.gravit.launchserver.LaunchServerStarter"
+def mainClassName = "pro.gravit.launchserver.Main"
 def mainAgentName = "pro.gravit.launchserver.StarterAgent"
 
 evaluationDependsOn(':Launcher')
@@ -37,9 +37,6 @@ jar {
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
             "Multi-Release": "true",
-            "Can-Redefine-Classes": "true",
-            "Can-Retransform-Classes": "true",
-            "Can-Set-Native-Method-Prefix": "true"
     )
 }
 
@@ -65,17 +62,14 @@ tasks.register('cleanjar', Jar) {
     archiveClassifier.set('clean')
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
-            "Can-Redefine-Classes": "true",
-            "Can-Retransform-Classes": "true",
-            "Can-Set-Native-Method-Prefix": "true"
+            "Automatic-Module-Name": "launchserver"
     )
     from sourceSets.main.output
 }
 
 
 dependencies {
     pack project(':LauncherAPI')
-    pack project(':LauncherModernCore')
     bundle group: 'me.tongfei', name: 'progressbar', version: '0.9.2'
     bundle group: 'com.github.Marcono1234', name: 'gson-record-type-adapter-factory', version: 'v0.2.0'
     bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi']
@@ -84,13 +78,15 @@ dependencies {
     bundle group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline']
     bundle group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: rootProject['verBcpkix']
     bundle group: 'org.ow2.asm', name: 'asm-commons', version: rootProject['verAsm']
-    bundle group: 'io.netty', name: 'netty-all', version: rootProject['verNetty']
+    bundle group: 'io.netty', name: 'netty-codec-http', version: rootProject['verNetty']
+    bundle group: 'io.netty', name: 'netty-transport-classes-epoll', version: rootProject['verNetty']
+    bundle group: 'io.netty', name: 'netty-transport-native-epoll', version: rootProject['verNetty'], classifier: 'linux-x86_64'
     bundle group: 'org.slf4j', name: 'slf4j-api', version: rootProject['verSlf4j']
     bundle group: 'com.mysql', name: 'mysql-connector-j', version: rootProject['verMySQLConn']
     bundle group: 'org.postgresql', name: 'postgresql', version: rootProject['verPostgreSQLConn']
     bundle group: 'com.guardsquare', name: 'proguard-base', version: rootProject['verProguard']
     bundle group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j']
-    bundle group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: rootProject['verLog4j']
+    bundle group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: rootProject['verLog4j']
     bundle group: 'io.jsonwebtoken', name: 'jjwt-api', version: rootProject['verJwt']
     bundle group: 'io.jsonwebtoken', name: 'jjwt-impl', version: rootProject['verJwt']
     bundle group: 'io.jsonwebtoken', name: 'jjwt-gson', version: rootProject['verJwt']
@@ -104,16 +100,6 @@ dependencies {
         exclude group: 'org.slf4j'
     }
 
-    launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j']) {
-        exclude group: 'org.apache.ant'
-        exclude group: 'net.java.abeille'
-        exclude group: 'foxtrot'
-        exclude group: 'com.jgoodies'
-        exclude group: 'org.slf4j'
-    }
-    launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + ':workdir-win32') { transitive = false }
-    launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + ':workdir-linux64') { transitive = false }
-
     compileOnlyA group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC']
     // Do not update (laggy deps).
     compileOnlyA 'log4j:log4j:1.2.17'
@@ -126,27 +112,9 @@ tasks.register('hikari', Copy) {
     from configurations.hikari
 }
 
-tasks.register('launch4j', Copy) {
-    duplicatesStrategy = 'EXCLUDE'
-    into "$buildDir/libs/libraries/launch4j"
-    from(configurations.launch4j.collect {
-        it.isDirectory() ? it : ((it.getName().startsWith("launch4j") && it.getName().contains("workdir")) ? zipTree(it) : it)
-    })
-    includeEmptyDirs false
-    eachFile { FileCopyDetails fcp ->
-        if (fcp.relativePath.pathString.startsWith("launch4j-") &&
-                fcp.relativePath.pathString.contains("workdir")) {
-            def segments = fcp.relativePath.segments
-            def pathSegments = segments[1..-1] as String[]
-            fcp.relativePath = new RelativePath(!fcp.file.isDirectory(), pathSegments)
-        } else if (fcp.relativePath.pathString.contains("META-INF")) fcp.exclude()
-        fcp.mode = 0755
-    }
-}
-
 tasks.register('dumpLibs', Copy) {
     duplicatesStrategy = 'EXCLUDE'
-    dependsOn tasks.hikari, tasks.launch4j
+    dependsOn tasks.hikari
     into "$buildDir/libs/libraries"
     from configurations.bundleOnly
 }

diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java b/LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java
@@ -1,7 +1,7 @@
 package pro.gravit.launchserver;
 
 import com.google.gson.JsonElement;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.helper.HttpHelper;
 
 import java.io.IOException;

diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
@@ -2,15 +2,13 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.events.RequestEvent;
-import pro.gravit.launcher.events.request.ProfilesRequestEvent;
-import pro.gravit.launcher.managers.ConfigManager;
-import pro.gravit.launcher.modules.events.ClosePhase;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.events.RequestEvent;
+import pro.gravit.launcher.base.events.request.ProfilesRequestEvent;
+import pro.gravit.launcher.base.modules.events.ClosePhase;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.RejectAuthCoreProvider;
-import pro.gravit.launchserver.binary.EXEL4JLauncherBinary;
 import pro.gravit.launchserver.binary.EXELauncherBinary;
 import pro.gravit.launchserver.binary.JARLauncherBinary;
 import pro.gravit.launchserver.binary.LauncherBinary;
@@ -36,7 +34,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.lang.ProcessBuilder.Redirect;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.KeyStore;
@@ -117,11 +114,12 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
     public final AtomicBoolean started = new AtomicBoolean(false);
     public final LauncherModuleLoader launcherModuleLoader;
     private final Logger logger = LogManager.getLogger();
+    public final int shardId;
     public LaunchServerConfig config;
     // Updates and profiles
     private volatile Set<ClientProfile> profilesList;
 
-    public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, LaunchServerConfig config, LaunchServerRuntimeConfig runtimeConfig, LaunchServerConfigManager launchServerConfigManager, LaunchServerModulesManager modulesManager, KeyAgreementManager keyAgreementManager, CommandHandler commandHandler, CertificateManager certificateManager) throws IOException {
+    public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, LaunchServerConfig config, LaunchServerRuntimeConfig runtimeConfig, LaunchServerConfigManager launchServerConfigManager, LaunchServerModulesManager modulesManager, KeyAgreementManager keyAgreementManager, CommandHandler commandHandler, CertificateManager certificateManager, int shardId) throws IOException {
         this.dir = directories.dir;
         this.tmpDir = directories.tmpDir;
         this.env = env;
@@ -138,6 +136,7 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
         launcherLibraries = directories.launcherLibrariesDir;
         launcherLibrariesCompile = directories.launcherLibrariesCompileDir;
         launcherPack = directories.launcherPackDir;
+        this.shardId = shardId;
         if(!Files.isDirectory(launcherPack)) {
             Files.createDirectories(launcherPack);
         }
@@ -268,7 +267,7 @@ public void invoke(String... args) throws Exception {
                 }
                 pair.core.close();
                 pair.core = new RejectAuthCoreProvider();
-                pair.core.init(instance);
+                pair.core.init(instance, pair);
             }
         };
         commands.put("resetauth", resetauth);
@@ -300,12 +299,6 @@ private LauncherBinary binary() {
         if(event.binary != null) {
             return event.binary;
         }
-        try {
-            Class.forName("net.sf.launch4j.Builder");
-            if (config.launch4j.enabled) return new EXEL4JLauncherBinary(this);
-        } catch (ClassNotFoundException ignored) {
-            logger.warn("Launch4J isn't in classpath.");
-        }
         return new EXELauncherBinary(this);
     }
 
@@ -393,7 +386,7 @@ public void syncLauncherBinaries() throws IOException {
 
         // Syncing launcher EXE binary
         logger.info("Syncing launcher EXE binary file");
-        if (!launcherEXEBinary.sync() && config.launch4j.enabled)
+        if (!launcherEXEBinary.sync())
             logger.warn("Missing launcher EXE binary file");
 
     }
@@ -430,21 +423,6 @@ public void syncUpdatesDir(Collection<String> dirs) throws IOException {
         updatesManager.syncUpdatesDir(dirs);
     }
 
-    public void restart() {
-        ProcessBuilder builder = new ProcessBuilder();
-        if (config.startScript != null) builder.command(Collections.singletonList(config.startScript));
-        else throw new IllegalArgumentException("Please create start script and link it as startScript in config.");
-        builder.directory(this.dir.toFile());
-        builder.inheritIO();
-        builder.redirectErrorStream(true);
-        builder.redirectOutput(Redirect.PIPE);
-        try {
-            builder.start();
-        } catch (IOException e) {
-            logger.error("Restart failed", e);
-        }
-    }
-
     public void registerObject(String name, Object object) {
         if (object instanceof Reconfigurable) {
             reconfigurableManager.registerReconfigurable(name, (Reconfigurable) object);
@@ -457,11 +435,6 @@ public void unregisterObject(String name, Object object) {
         }
     }
 
-    public void fullyRestart() {
-        restart();
-        JVMHelper.RUNTIME.exit(0);
-    }
-
 
     public enum ReloadType {
         NO_AUTH,
@@ -504,6 +477,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
                 profile = Launcher.gsonManager.gson.fromJson(reader, ClientProfile.class);
             }
             profile.verify();
+            profile.setProfileFilePath(file);
 
             // Add SIGNED profile to result list
             result.add(profile);

diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerBuilder.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerBuilder.java
@@ -19,6 +19,7 @@ public class LaunchServerBuilder {
     private KeyAgreementManager keyAgreementManager;
     private CertificateManager certificateManager;
     private LaunchServer.LaunchServerConfigManager launchServerConfigManager;
+    private Integer shardId;
 
     public LaunchServerBuilder setConfig(LaunchServerConfig config) {
         this.config = config;
@@ -55,6 +56,11 @@ public LaunchServerBuilder setDir(Path dir) {
         return this;
     }
 
+    public LaunchServerBuilder setShardId(Integer shardId) {
+        this.shardId = shardId;
+        return this;
+    }
+
     public LaunchServerBuilder setLaunchServerConfigManager(LaunchServer.LaunchServerConfigManager launchServerConfigManager) {
         this.launchServerConfigManager = launchServerConfigManager;
         return this;
@@ -63,32 +69,15 @@ public LaunchServerBuilder setLaunchServerConfigManager(LaunchServer.LaunchServe
     public LaunchServer build() throws Exception {
         directories.collect();
         if (launchServerConfigManager == null) {
-            launchServerConfigManager = new LaunchServer.LaunchServerConfigManager() {
-                @Override
-                public LaunchServerConfig readConfig() {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public LaunchServerRuntimeConfig readRuntimeConfig() {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public void writeConfig(LaunchServerConfig config) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public void writeRuntimeConfig(LaunchServerRuntimeConfig config) {
-                    throw new UnsupportedOperationException();
-                }
-            };
+            launchServerConfigManager = new NullLaunchServerConfigManager();
         }
         if (keyAgreementManager == null) {
             keyAgreementManager = new KeyAgreementManager(directories.keyDirectory);
         }
-        return new LaunchServer(directories, env, config, runtimeConfig, launchServerConfigManager, modulesManager, keyAgreementManager, commandHandler, certificateManager);
+        if(shardId == null) {
+            shardId = Integer.parseInt(System.getProperty("launchserver.shardId", "0"));
+        }
+        return new LaunchServer(directories, env, config, runtimeConfig, launchServerConfigManager, modulesManager, keyAgreementManager, commandHandler, certificateManager, shardId);
     }
 
     public LaunchServerBuilder setCertificateManager(CertificateManager certificateManager) {
@@ -99,4 +88,26 @@ public LaunchServerBuilder setCertificateManager(CertificateManager certificateM
     public void setKeyAgreementManager(KeyAgreementManager keyAgreementManager) {
         this.keyAgreementManager = keyAgreementManager;
     }
+
+    private static class NullLaunchServerConfigManager implements LaunchServer.LaunchServerConfigManager {
+        @Override
+        public LaunchServerConfig readConfig() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public LaunchServerRuntimeConfig readRuntimeConfig() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void writeConfig(LaunchServerConfig config) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void writeRuntimeConfig(LaunchServerRuntimeConfig config) {
+            throw new UnsupportedOperationException();
+        }
+    }
 }