Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-06 16:32:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/5.6.11'

Browse source
This commit is contained in:
Gravita 2025-04-05 10:03:36 +07:00
commit b16281e04a
59 changed files with 170 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
View file

@ -2,7 +2,6 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
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;
@ -23,20 +22,16 @@
import pro.gravit.launchserver.socket.Client;
import pro.gravit.launchserver.socket.SocketCommandServer;
import pro.gravit.launchserver.socket.handlers.NettyServerSocketHandler;
import pro.gravit.launchserver.socket.response.auth.ProfilesResponse;
import pro.gravit.launchserver.socket.response.auth.RestoreResponse;
import pro.gravit.utils.command.Command;
import pro.gravit.utils.command.CommandHandler;
import pro.gravit.utils.command.SubCommand;
import pro.gravit.utils.helper.CommonHelper;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.JVMHelper;
import pro.gravit.utils.helper.SecurityHelper;
import java.io.BufferedReader;
import java.io.IOException;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.security.KeyStore;
import java.time.Duration;
import java.time.Instant;

1
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java
View file

@ -36,7 +36,6 @@
import java.nio.file.Path;
import java.security.Security;
import java.security.cert.CertificateException;
import java.util.ArrayList;
import java.util.List;
public class LaunchServerStarter {

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java
View file

@ -174,7 +174,7 @@ public AuthManager.AuthReport sudo(User user, boolean shadow) throws IOException
}
@Override
public User checkServer(Client client, String username, String serverID) throws IOException {
public User checkServer(Client client, String username, String serverID) {
SQLUser user = (SQLUser) getUserByUsername(username);
if (user == null) {
return null;

1
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java
View file

@ -1,6 +1,5 @@
package pro.gravit.launchserver.auth.core;
import pro.gravit.launcher.base.ClientPermissions;
import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.auth.AuthProviderPair;

4
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/RejectAuthCoreProvider.java
View file

@ -41,12 +41,12 @@ public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext c
}
@Override
public User checkServer(Client client, String username, String serverID) throws IOException {
public User checkServer(Client client, String username, String serverID) {
return null;
}
@Override
public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) throws IOException {
public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) {
return false;
}

12
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/SQLCoreProvider.java
View file

@ -11,9 +11,7 @@
import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportHardware;
import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportHardware;
import pro.gravit.launchserver.socket.Client;
import pro.gravit.utils.helper.IOHelper;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.sql.*;
import java.util.Base64;
@ -85,7 +83,7 @@ protected SQLUser constructUser(ResultSet set) throws SQLException {
set.getString(accessTokenColumn), set.getString(serverIDColumn), set.getString(passwordColumn), set.getLong(hardwareIdColumn)) : null;
}
private SQLUserHardware fetchHardwareInfo(ResultSet set) throws SQLException, IOException {
private SQLUserHardware fetchHardwareInfo(ResultSet set) throws SQLException {
HardwareReportRequest.HardwareInfo hardwareInfo = new HardwareReportRequest.HardwareInfo();
hardwareInfo.hwDiskId = set.getString("hwDiskId");
hardwareInfo.baseboardSerialNumber = set.getString("baseboardSerialNumber");
@ -126,7 +124,7 @@ public UserHardware getHardwareInfoByPublicKey(byte[] publicKey) {
return null;
}
}
} catch (SQLException | IOException throwables) {
} catch (SQLException throwables) {
logger.error("SQL Error", throwables);
return null;
}
@ -149,7 +147,7 @@ public UserHardware getHardwareInfoByData(HardwareReportRequest.HardwareInfo inf
}
}
}
} catch (SQLException | IOException throwables) {
} catch (SQLException throwables) {
logger.error("SQL Error", throwables);
}
return null;
@ -170,7 +168,7 @@ public UserHardware getHardwareInfoById(String id) {
return null;
}
}
} catch (SQLException | IOException throwables) {
} catch (SQLException throwables) {
logger.error("SQL Error", throwables);
return null;
}
@ -294,7 +292,7 @@ protected AbstractSQLCoreProvider.SQLUserSession createSession(AbstractSQLCorePr
}
@Override
public UserSession extendedCheckServer(Client client, String username, String serverID) throws IOException {
public UserSession extendedCheckServer(Client client, String username, String serverID) {
AbstractSQLCoreProvider.SQLUser user = (AbstractSQLCoreProvider.SQLUser) getUserByUsername(username);
if (user == null) {
return null;

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportExtendedCheckServer.java
View file

@ -6,5 +6,5 @@
import java.io.IOException;
public interface AuthSupportExtendedCheckServer {
UserSession extendedCheckServer(Client client, String username, String serverID) throws IOException;
UserSession extendedCheckServer(Client client, String username, String serverID);
}

4
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/openid/OpenIDAuthCoreProvider.java
View file

@ -143,7 +143,7 @@ public void init(LaunchServer server, AuthProviderPair pair) {
}
@Override
public User checkServer(Client client, String username, String serverID) throws IOException {
public User checkServer(Client client, String username, String serverID) {
var savedServerId = sqlSessionStore.getServerIdByUsername(username);
if (!serverID.equals(savedServerId)) {
return null;
@ -153,7 +153,7 @@ public User checkServer(Client client, String username, String serverID) throws
}
@Override
public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) throws IOException {
public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) {
User user;
try {
user = createUserFromMinecraftToken(accessToken);

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/openid/SQLServerSessionStore.java
View file

@ -3,8 +3,6 @@
import pro.gravit.launchserver.auth.SQLSourceConfig;
import pro.gravit.utils.helper.LogHelper;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.sql.SQLException;
import java.util.UUID;

2
LaunchServer/src/main/java/pro/gravit/launchserver/binary/BinaryPipeline.java
View file

@ -4,9 +4,7 @@
import org.apache.logging.log4j.Logger;
import pro.gravit.launchserver.binary.tasks.LauncherBuildTask;
import pro.gravit.utils.helper.CommonHelper;
import pro.gravit.utils.helper.IOHelper;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;

2
LaunchServer/src/main/java/pro/gravit/launchserver/binary/LauncherBinary.java
View file

@ -56,7 +56,7 @@ public final byte[] getDigest() {
public void init() {
}
public final boolean sync() throws IOException {
public final boolean sync() {
try {
var target = syncBinaryFile.toString();
var path = server.config.updatesProvider.download(null, List.of(target)).get(target);

1
LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java
View file

@ -13,7 +13,6 @@
import pro.gravit.utils.command.CommandException;
import pro.gravit.utils.helper.IOHelper;
import java.io.BufferedWriter;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collections;

4
LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/CloneProfileCommand.java
View file

@ -2,17 +2,13 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.launcher.base.Launcher;
import pro.gravit.launcher.base.profiles.ClientProfile;
import pro.gravit.launcher.base.profiles.ClientProfileBuilder;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;
import pro.gravit.utils.helper.CommonHelper;
import pro.gravit.utils.helper.IOHelper;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;

2
LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/DeleteProfileCommand.java
View file

@ -5,9 +5,7 @@
import pro.gravit.launcher.base.profiles.ClientProfile;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;
import pro.gravit.utils.helper.IOHelper;
import java.nio.file.Files;
import java.util.UUID;
public class DeleteProfileCommand extends Command {

2
LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/ListProfilesCommand.java
View file

@ -22,7 +22,7 @@ public String getUsageDescription() {
}
@Override
public void invoke(String... args) throws Exception {
public void invoke(String... args) {
for(var profile : server.getProfiles()) {
logger.info("{} ({}) {}", profile.getTitle(), profile.getVersion().toString(), profile.isLimited() ? "limited" : "");
}

4
LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/MakeProfileCommand.java
View file

@ -2,14 +2,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.launcher.base.Launcher;
import pro.gravit.launcher.base.profiles.ClientProfile;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;
import pro.gravit.launchserver.helper.MakeProfileHelper;
import pro.gravit.utils.helper.IOHelper;
import java.io.Writer;
public class MakeProfileCommand extends Command {
private transient final Logger logger = LogManager.getLogger();

7
LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/SaveProfilesCommand.java
View file

@ -2,17 +2,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.launcher.base.Launcher;
import pro.gravit.launcher.base.profiles.ClientProfile;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;
import pro.gravit.utils.helper.IOHelper;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.UUID;
public class SaveProfilesCommand extends Command {

2
LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java
View file

@ -117,7 +117,7 @@ public void invoke(String... args) throws Exception {
Files.deleteIfExists(proguardConf.mappings);
}
});
return null;
return commands;
}
public static class ProGuardMultiReleaseFixer implements LauncherBuildTask {

1
LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java
View file

@ -1,6 +1,5 @@
package pro.gravit.launchserver.config;
import io.netty.channel.epoll.Epoll;
import io.netty.handler.logging.LogLevel;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

1
LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java
View file

@ -49,7 +49,6 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti
// Official Mojang launcher java arguments
if (version.compareTo(ClientProfileVersions.MINECRAFT_1_12_2) <= 0) {
// lwjgl3ify arguments https://github.com/GTNewHorizons/lwjgl3ify
jvmArgs.add("-Djava.security.manager=allow");
jvmArgs.add("--add-opens");
jvmArgs.add("java.base/jdk.internal.loader=ALL-UNNAMED");
jvmArgs.add("--add-opens");

14
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/UpdatesManager.java
View file

@ -1,20 +1,10 @@
package pro.gravit.launchserver.manangers;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import pro.gravit.launcher.core.hasher.HashedDir;
import pro.gravit.launcher.core.serialize.HInput;
import pro.gravit.launcher.core.serialize.HOutput;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.modules.events.LaunchServerUpdatesSyncEvent;
import pro.gravit.utils.helper.IOHelper;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.stream.Stream;
public class UpdatesManager {
private final LaunchServer server;
@ -24,12 +14,12 @@ public UpdatesManager(LaunchServer server) {
}
@Deprecated
public void readUpdatesFromCache() throws IOException {
public void readUpdatesFromCache() {
}
@Deprecated
public void readUpdatesDir() throws IOException {
public void readUpdatesDir() {
}

1
LaunchServer/src/main/java/pro/gravit/launchserver/socket/LauncherNettyServer.java
View file

@ -4,7 +4,6 @@
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.epoll.Epoll;
import io.netty.channel.group.DefaultChannelGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.handler.codec.http.HttpObjectAggregator;

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/NettyObjectFactory.java
View file

@ -5,10 +5,8 @@
import io.netty.channel.MultiThreadIoEventLoopGroup;
import io.netty.channel.ServerChannel;
import io.netty.channel.epoll.Epoll;
import io.netty.channel.epoll.EpollEventLoopGroup;
import io.netty.channel.epoll.EpollIoHandler;
import io.netty.channel.epoll.EpollServerSocketChannel;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.uring.IoUring;

14
LaunchServer/src/main/java/pro/gravit/launchserver/socket/SocketCommandServer.java
View file

@ -5,7 +5,6 @@
import pro.gravit.launchserver.config.log4j.LogAppender;
import pro.gravit.utils.command.CommandHandler;
import java.io.IOException;
import java.net.StandardProtocolFamily;
import java.net.UnixDomainSocketAddress;
import java.nio.ByteBuffer;
@ -64,29 +63,28 @@ public void run() {
ByteBuffer buffer = ByteBuffer.allocate(1024);
while (true) {
SocketChannel channel = serverChannel.accept();
channel.configureBlocking(true);
String command = null;
try {
try (channel) {
channel.configureBlocking(true);
String command = null;
mark:
while (true) {
int bytesRead = channel.read(buffer);
if (bytesRead < 0) {
break;
}
for (var i=0;i<buffer.limit();i++) {
if(buffer.get(i) == '\n') {
for (var i = 0; i < buffer.limit(); i++) {
if (buffer.get(i) == '\n') {
command = new String(buffer.array(), 0, i);
break mark;
}
}
}
if(command != null) {
if (command != null) {
runCommand(channel, command);
}
} finally {
buffer.clear();
channel.close();
}
}
} catch (Throwable e) {

1
LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/fileserver/FileServerHandler.java
View file

@ -22,7 +22,6 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.util.Arrays;

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/WebSocketServerResponse.java
View file

@ -7,7 +7,7 @@
public interface WebSocketServerResponse extends WebSocketRequest {
String getType();
void execute(ChannelHandlerContext ctx, Client client) throws Exception;
void execute(ChannelHandlerContext ctx, Client client);
default ThreadSafeStatus getThreadSafeStatus() {
return ThreadSafeStatus.READ;

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java
View file

@ -23,7 +23,7 @@ public String getType() {
}
@Override
public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
public void execute(ChannelHandlerContext ctx, Client client) {
sendResult(new CurrentUserRequestEvent(collectUserInfoFromClient(server, client)));
}
}

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreResponse.java
View file

@ -44,7 +44,7 @@ public String getType() {
}
@Override
public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
public void execute(ChannelHandlerContext ctx, Client client) {
if (accessToken == null && !client.isAuth && needUserInfo) {
sendError("Invalid request");
return;

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/cabinet/AssetUploadInfoResponse.java
View file

@ -12,7 +12,7 @@ public String getType() {
}
@Override
public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
public void execute(ChannelHandlerContext ctx, Client client) {
if(!client.isAuth || client.auth == null || client.getUser() == null) {
sendError("Access denied");
return;

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/cabinet/GetAssetUploadInfoResponse.java
View file

@ -14,7 +14,7 @@ public String getType() {
}
@Override
public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
public void execute(ChannelHandlerContext ctx, Client client) {
if(!client.isAuth || client.auth == null || client.getUser() == null) {
sendError("Access denied");
return;

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/GetConnectUUIDResponse.java
View file

@ -12,7 +12,7 @@ public String getType() {
}
@Override
public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
public void execute(ChannelHandlerContext ctx, Client client) {
sendResult(new GetConnectUUIDRequestEvent(connectUUID, server.shardId));
}
}

1
Launcher/src/main/java/pro/gravit/launcher/runtime/client/ClientLauncherProcess.java
View file

@ -28,7 +28,6 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;
public class ClientLauncherProcess {
public final List<String> pre = new LinkedList<>();

1
LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java
View file

@ -12,7 +12,6 @@
import java.lang.reflect.Type;
import java.net.InetSocketAddress;
import java.nio.file.Path;
import java.util.*;
public final class ClientProfile implements Comparable<ClientProfile> {

2
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/Request.java
View file

@ -154,7 +154,7 @@ public static String getRefreshToken() {
public static void reconnect() throws Exception {
getRequestService().open();
getRequestService().connect();
restore();
}

1
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestException.java
View file

@ -3,7 +3,6 @@
import java.io.IOException;
public final class RequestException extends IOException {
private static final long serialVersionUID = 7558237657082664821L;
public RequestException(String message) {

2
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestService.java
View file

@ -6,7 +6,7 @@
public interface RequestService {
<T extends WebSocketEvent> CompletableFuture<T> request(Request<T> request) throws IOException;
void open() throws Exception;
void connect() throws Exception;
void registerEventHandler(EventHandler handler);

18
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientJSONPoint.java
View file

@ -9,6 +9,7 @@
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.WebSocket;
import java.nio.ByteBuffer;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@ -33,7 +34,7 @@ public abstract class ClientJSONPoint implements WebSocket.Listener {
private final Object sendSyncObject = new Object();
private volatile StringBuilder builder = new StringBuilder();
public ClientJSONPoint(final String uri) throws SSLException {
public ClientJSONPoint(final String uri) {
this(URI.create(uri));
}
@ -63,7 +64,7 @@ public ClientJSONPoint(URI uri) {
}
}
public void open() throws Exception {
public void connect() throws Exception {
webSocket = webSocketBuilder.buildAsync(uri, this).get();
}
@ -97,6 +98,17 @@ public CompletionStage<?> onClose(WebSocket webSocket, int statusCode, String re
return WebSocket.Listener.super.onClose(webSocket, statusCode, reason);
}
@Override
public void onOpen(WebSocket webSocket) {
onOpen();
WebSocket.Listener.super.onOpen(webSocket);
}
@Override
public CompletionStage<?> onBinary(WebSocket webSocket, ByteBuffer data, boolean last) {
return WebSocket.Listener.super.onBinary(webSocket, data, last);
}
@Override
public void onError(WebSocket webSocket, Throwable error) {
LogHelper.error(error);
@ -114,7 +126,7 @@ public void send(String text) {
abstract void onOpen();
public void close() throws InterruptedException {
public void close() {
webSocket.abort();
}

2
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientWebSocketService.java
View file

@ -33,7 +33,7 @@ public abstract class ClientWebSocketService extends ClientJSONPoint {
public OnCloseCallback onCloseCallback;
public ReconnectCallback reconnectCallback;
public ClientWebSocketService(String address) throws SSLException {
public ClientWebSocketService(String address) {
super(createURL(address));
this.gson = Launcher.gsonManager.gson;
this.onConnect = true;

2
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/OfflineRequestService.java
View file

@ -45,7 +45,7 @@ public <T extends WebSocketEvent> CompletableFuture<T> request(Request<T> reques
}
@Override
public void open() {
public void connect() {
}

9
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/StdWebSocketService.java
View file

@ -11,9 +11,12 @@
import javax.net.ssl.SSLException;
import java.io.IOException;
import java.net.http.WebSocket;
import java.nio.ByteBuffer;
import java.util.HashSet;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
@ -40,11 +43,7 @@ public static CompletableFuture<StdWebSocketService> initWebSockets(String addre
service.openAsync(() -> {
future.complete(service);
JVMHelper.RUNTIME.addShutdownHook(new Thread(() -> {
try {
service.close();
} catch (InterruptedException e) {
LogHelper.error(e);
}
service.close();
}));
}, future::completeExceptionally);
return future;

2
LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/VoidRequestService.java
View file

@ -26,7 +26,7 @@ public <T extends WebSocketEvent> CompletableFuture<T> request(Request<T> reques
}
@Override
public void open() {
public void connect() {
}

6
LauncherAPI/src/test/java/pro/gravit/launcher/ClientVersionTest.java
View file

@ -7,9 +7,9 @@
public class ClientVersionTest {
@Test
public void parseTest() {
Assertions.assertEquals(ClientProfile.Version.of("1.0.0").toCleanString(), "1.0.0");
Assertions.assertEquals(ClientProfile.Version.of("1.0.0-1").toCleanString(), "1.0.0.1");
Assertions.assertEquals(ClientProfile.Version.of("-----1.0.0").toCleanString(), "1.0.0");
Assertions.assertEquals("1.0.0", ClientProfile.Version.of("1.0.0").toCleanString());
Assertions.assertEquals("1.0.0.1", ClientProfile.Version.of("1.0.0-1").toCleanString());
Assertions.assertEquals("1.0.0", ClientProfile.Version.of("-----1.0.0").toCleanString());
}
@Test

16
LauncherAPI/src/test/java/pro/gravit/launcher/ModulesTest.java
View file

@ -49,12 +49,12 @@ public void dependenciesTest() {
moduleManager.loadModule(new Depend3Module());
moduleManager.loadModule(new MainModule());
moduleManager.initModules(null);
Assertions.assertEquals(moduleManager.getModule("depend1").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(moduleManager.getModule("depend2").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(moduleManager.getModule("depend3").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(moduleManager.getModule("internal").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(moduleManager.getModule("virtual").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(moduleManager.getModule("main").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("depend1").getInitStatus());
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("depend2").getInitStatus());
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("depend3").getInitStatus());
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("internal").getInitStatus());
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("virtual").getInitStatus());
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("main").getInitStatus());
}
@Test
@ -62,7 +62,7 @@ public void cyclicTest() {
moduleManager.loadModule(new CyclicDependModule());
moduleManager.loadModule(new Cyclic2DependModule());
moduleManager.initModules(null);
Assertions.assertEquals(moduleManager.getModule("cyclic1").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(moduleManager.getModule("cyclic2").getInitStatus(), LauncherModule.InitStatus.FINISH);
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("cyclic1").getInitStatus());
Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("cyclic2").getInitStatus());
}
}

6
LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend1Module.java
View file

@ -16,10 +16,10 @@ public Depend1Module() {
@Override
public void init(LauncherInitContext initContext) {
InternalModule module = modulesManager.getModule(InternalModule.class);
Assertions.assertEquals(module.getInitStatus(), InitStatus.FINISH);
Assertions.assertEquals(InitStatus.FINISH, module.getInitStatus());
Depend3Module module1 = modulesManager.getModule(Depend3Module.class);
Assertions.assertEquals(module1.getInitStatus(), InitStatus.FINISH);
Assertions.assertEquals(InitStatus.FINISH, module1.getInitStatus());
VirtualInterface virtualInterface = modulesManager.getModuleByInterface(VirtualInterface.class);
Assertions.assertEquals(((LauncherModule) virtualInterface).getInitStatus(), InitStatus.FINISH);
Assertions.assertEquals(InitStatus.FINISH, ((LauncherModule) virtualInterface).getInitStatus());
}
}

4
LauncherAPI/src/test/java/pro/gravit/launcher/impl/MainModule.java
View file

@ -17,8 +17,8 @@ public MainModule() {
@Override
public void init(LauncherInitContext initContext) {
Depend1Module module = modulesManager.getModule(Depend1Module.class);
Assertions.assertEquals(module.getInitStatus(), InitStatus.FINISH);
Assertions.assertEquals(InitStatus.FINISH, module.getInitStatus());
Depend2Module module2 = modulesManager.getModule(Depend2Module.class);
Assertions.assertEquals(module2.getInitStatus(), InitStatus.FINISH);
Assertions.assertEquals(InitStatus.FINISH, module2.getInitStatus());
}
}

2
LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
View file

@ -124,7 +124,7 @@ private static void realMain(String[] args) throws Throwable {
LogHelper.dev("Classpath entry %s", e);
}
}
List<URL> classpathURLs = classpath.stream().map(IOHelper::toURL).collect(Collectors.toList());
List<URL> classpathURLs = classpath.stream().map(IOHelper::toURL).toList();
// Start client with WatchService monitoring
RequestService service;
if (params.offlineMode) {

2
LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedDir.java
View file

@ -282,7 +282,7 @@ public enum WalkAction {
@FunctionalInterface
public interface WalkCallback {
WalkAction walked(String path, String name, HashedEntry entry) throws IOException;
WalkAction walked(String path, String name, HashedEntry entry);
}
public static class FindRecursiveResult {

1
LauncherCore/src/main/java/pro/gravit/utils/HookException.java
View file

@ -1,7 +1,6 @@
package pro.gravit.utils;
public class HookException extends RuntimeException {
private static final long serialVersionUID = -529141998961943161L;
public HookException(String message) {
super(message);

2
LauncherCore/src/main/java/pro/gravit/utils/Version.java
View file

@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
public static final int MAJOR = 5;
public static final int MINOR = 6;
public static final int PATCH = 10;
public static final int PATCH = 11;
public static final int BUILD = 1;
public static final Version.Type RELEASE = Type.STABLE;
public final int major;

1
LauncherCore/src/main/java/pro/gravit/utils/command/CommandException.java
View file

@ -1,7 +1,6 @@
package pro.gravit.utils.command;
public final class CommandException extends Exception {
private static final long serialVersionUID = -6588814993972117772L;
public CommandException(String message) {

64
LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java
View file

@ -221,37 +221,39 @@ public static ArgsParseResult parseJavaArgs(List<String> args) {
continue;
}
}
if(arg.equals("--module-path") || arg.equals("-p")) {
prevArgType = PrevArgType.MODULE_PATH;
continue;
}
if(arg.equals("--classpath") || arg.equals("-cp")) {
prevArgType = PrevArgType.CLASSPATH;
continue;
}
if(arg.equals("--add-modules")) {
prevArgType = PrevArgType.ADD_MODULES;
continue;
}
if(arg.equals("--add-opens")) {
prevArgType = PrevArgType.ADD_OPENS;
continue;
}
if(arg.equals("--add-exports")) {
prevArgType = PrevArgType.ADD_EXPORTS;
continue;
}
if(arg.equals("--add-reads")) {
prevArgType = PrevArgType.ADD_READS;
continue;
}
if(arg.equals("--module") || arg.equals("-m")) {
prevArgType = PrevArgType.MODULE;
continue;
}
if(arg.equals("-jar")) {
prevArgType = PrevArgType.JAR;
continue;
switch (arg) {
case "--module-path", "-p" -> {
prevArgType = PrevArgType.MODULE_PATH;
continue;
}
case "--classpath", "-cp" -> {
prevArgType = PrevArgType.CLASSPATH;
continue;
}
case "--add-modules" -> {
prevArgType = PrevArgType.ADD_MODULES;
continue;
}
case "--add-opens" -> {
prevArgType = PrevArgType.ADD_OPENS;
continue;
}
case "--add-exports" -> {
prevArgType = PrevArgType.ADD_EXPORTS;
continue;
}
case "--add-reads" -> {
prevArgType = PrevArgType.ADD_READS;
continue;
}
case "--module", "-m" -> {
prevArgType = PrevArgType.MODULE;
continue;
}
case "-jar" -> {
prevArgType = PrevArgType.JAR;
continue;
}
}
jvmArgs.add(arg);
}

2
LauncherCore/src/main/java/pro/gravit/utils/helper/JarHelper.java
View file

@ -83,7 +83,7 @@ public static byte[] getClassBytes(Class<?> clazz, ClassLoader classLoader) thro
return IOHelper.read(classLoader.getResourceAsStream(getClassFile(clazz)));
}
public static InputStream getClassBytesStream(Class<?> clazz) throws IOException {
public static InputStream getClassBytesStream(Class<?> clazz) {
return getClassBytesStream(clazz, clazz.getClassLoader());
}

2
LauncherCore/src/main/java/pro/gravit/utils/launch/BasicLaunch.java
View file

@ -68,7 +68,7 @@ public void addTransformer(ClassTransformer transformer) {
}
instrumentation.addTransformer(new ClassFileTransformer() {
@Override
public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
if(transformer.filter(null, className)) {
return transformer.transform(null, className, protectionDomain, classfileBuffer);
}

4
LauncherCore/src/test/java/pro/gravit/launcher/SerializeTest.java
View file

@ -30,8 +30,8 @@ public void main() {
String json2 = gson.toJson(new MyTestClass2("BBBB"), TestInterface.class);
TestInterface test1 = gson.fromJson(json, TestInterface.class);
TestInterface test2 = gson.fromJson(json2, TestInterface.class);
Assertions.assertEquals(test1.get(), "AAAA");
Assertions.assertEquals(test2.get(), "BBBB");
Assertions.assertEquals("AAAA", test1.get());
Assertions.assertEquals("BBBB", test2.get());
}
public interface TestInterface {

35
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
View file

@ -32,6 +32,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
public class ServerWrapper extends JsonConfigurable<ServerWrapper.Config> {
@ -121,6 +122,7 @@ public void run(String... args) throws Throwable {
}
LogHelper.debug("Read ServerWrapperConfig.json");
loadConfig();
config.applyEnv();
updateLauncherConfig();
Launcher.applyLauncherEnv(Objects.requireNonNullElse(config.env, LauncherConfig.LauncherEnvironment.STD));
StdWebSocketService service = StdWebSocketService.initWebSockets(config.address).get();
@ -304,5 +306,38 @@ public void apply() {
ConfigService.checkServerConfig.needProperties = checkServerNeedProperties;
}
}
public void applyEnv() {
this.authId = applyEnvOrDefault("SERVERWRAPPER_AUTH_ID", this.authId);
this.address = applyEnvOrDefault("SERVERWRAPPER_ADDRESS", this.address);
this.serverName = applyEnvOrDefault("SERVERWRAPPER_SERVER_NAME", this.serverName);
this.encodedServerEcPublicKey = applyEnvOrDefault("SERVERWRAPPER_EC_PUBLIC_KEY", Base64.getUrlDecoder()::decode, null);
this.encodedServerRsaPublicKey = applyEnvOrDefault("SERVERWRAPPER_RSA_PUBLIC_KEY", Base64.getUrlDecoder()::decode, null);
{
String token = System.getenv("SERVERWRAPPER_CHECK_SERVER_TOKEN");
if(token != null) {
if(extendedTokens == null) {
extendedTokens = new HashMap<>();
}
extendedTokens.put("checkServer", new Request.ExtendedToken(token, 0L));
}
}
}
private static String applyEnvOrDefault(String envName, String def) {
String value = System.getenv(envName);
if(value == null) {
return def;
}
return value;
}
private static<T> T applyEnvOrDefault(String envName, Function<String, T> mappingFunction, T def) {
String value = System.getenv(envName);
if(value == null) {
return def;
}
return mappingFunction.apply(value);
}
}
}

31
ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java
View file

@ -30,8 +30,11 @@ public ServerWrapperSetup() throws IOException {
public void run() throws Exception {
ServerWrapper wrapper = ServerWrapper.wrapper;
System.out.println("Print server jar filename:");
String jarName = commands.commandHandler.readLine();
String jarName = System.getenv("SERVERWRAPPER_JAR_NAME");
if(jarName == null) {
System.out.println("Print server jar filename:");
jarName = commands.commandHandler.readLine();
}
Path jarPath = Paths.get(jarName);
String mainClassName;
String agentClassName;
@ -56,14 +59,18 @@ public void run() throws Exception {
if (agentClassName != null) {
LogHelper.info("Found PremainClass %s", agentClassName);
}
System.out.println("Print your server name:");
wrapper.config.serverName = commands.commandHandler.readLine();
if(wrapper.config.serverName == null || wrapper.config.serverName.isEmpty()) {
System.out.println("Print your server name:");
wrapper.config.serverName = commands.commandHandler.readLine();
}
wrapper.config.mainclass = mainClassName;
boolean altMode = false;
for (int i = 0; i < 10; ++i) {
if(!Request.isAvailable() || Request.getRequestService().isClosed()) {
System.out.println("Print launchserver websocket host( ws://host:port/api ):");
wrapper.config.address = commands.commandHandler.readLine();
if(wrapper.config.address == null || wrapper.config.address.isEmpty()) {
System.out.println("Print launchserver websocket host( ws://host:port/api ):");
wrapper.config.address = commands.commandHandler.readLine();
}
StdWebSocketService service;
try {
service = StdWebSocketService.initWebSockets(wrapper.config.address).get();
@ -73,9 +80,11 @@ public void run() throws Exception {
}
Request.setRequestService(service);
}
System.out.println("Print server token:");
String checkServerToken = commands.commandHandler.readLine();
wrapper.config.extendedTokens.put("checkServer", new Request.ExtendedToken(checkServerToken, 0));
if(wrapper.config.extendedTokens == null || wrapper.config.extendedTokens.get("checkServer") == null) {
System.out.println("Print server token:");
String checkServerToken = commands.commandHandler.readLine();
wrapper.config.extendedTokens.put("checkServer", new Request.ExtendedToken(checkServerToken, 0));
}
wrapper.updateLauncherConfig();
try {
wrapper.restore();
@ -93,7 +102,9 @@ public void run() throws Exception {
}
if(wrapper.profile != null && wrapper.profile.getVersion().compareTo(ClientProfileVersions.MINECRAFT_1_18) >= 0) {
LogHelper.info("Switch to alternative start mode (1.18)");
wrapper.config.classpath.add(jarName);
if(!wrapper.config.classpath.contains(jarName)) {
wrapper.config.classpath.add(jarName);
}
wrapper.config.classLoaderConfig = ClientProfile.ClassLoaderConfig.LAUNCHER;
altMode = true;
}

2
build.gradle
View file

@ -5,7 +5,7 @@
id 'org.openjfx.javafxplugin' version '0.1.0' apply false
}
group = 'pro.gravit.launcher'
version = '5.6.10'
version = '5.6.11'
apply from: 'props.gradle'

2
modules

@ -1 +1 @@
Subproject commit aa5ab332d65dd14ce5321453aa809e30b87a186d
Subproject commit eeea07098281c5cc98feffaae9b5a01677ca2eb7

8
props.gradle
View file

@ -1,18 +1,18 @@
project.ext {
verAsm = '9.7.1'
verNetty = '4.2.0.RC3'
verOshiCore = '6.6.6'
verNetty = '4.2.0.RC4'
verOshiCore = '6.8.0'
verJunit = '5.11.4'
verJansi = '2.4.1'
verJline = '3.29.0'
verJwt = '0.12.6'
verGson = '2.12.1'
verBcpkix = '1.80'
verSlf4j = '2.0.16'
verSlf4j = '2.0.17'
verLog4j = '2.24.3'
verMySQLConn = '9.2.0'
verMariaDBConn = '3.5.1'
verPostgreSQLConn = '42.7.5'
verH2Conn = '2.3.232'
verProguard = '7.6.1'
verProguard = '7.7.0'
}