Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] Управление лаунчсервером из лаунчера

Browse source
This commit is contained in:
Gravit 2019-05-04 15:23:43 +07:00
parent 0e9d8b4ca7
commit ea202eee5b
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
6 changed files with 93 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Launcher/src/main/java/ru/gravit/launcher/console/admin/ExecCommand.java Normal file
View file

@ -0,0 +1,24 @@
package ru.gravit.launcher.console.admin;
import ru.gravit.launcher.events.request.ExecCommandRequestEvent;
import ru.gravit.launcher.request.admin.ExecCommandRequest;
import ru.gravit.utils.command.Command;
import ru.gravit.utils.helper.LogHelper;
public class ExecCommand extends Command {
@Override
public String getArgsDescription() {
return null;
}
@Override
public String getUsageDescription() {
return null;
}
@Override
public void invoke(String... args) throws Exception {
ExecCommandRequestEvent request = new ExecCommandRequest(String.join(" ", args)).request();
if(!request.success) LogHelper.error("Error executing command");
}
}

53
Launcher/src/main/java/ru/gravit/launcher/console/admin/LogListenerCommand.java Normal file
View file

@ -0,0 +1,53 @@
package ru.gravit.launcher.console.admin;
import ru.gravit.launcher.LauncherNetworkAPI;
import ru.gravit.launcher.events.request.LogEvent;
import ru.gravit.launcher.request.Request;
import ru.gravit.launcher.request.websockets.RequestInterface;
import ru.gravit.utils.command.Command;
import ru.gravit.utils.helper.LogHelper;
public class LogListenerCommand extends Command {
public class LogListenerRequest implements RequestInterface
{
@LauncherNetworkAPI
public LogHelper.OutputTypes outputType;
public LogListenerRequest(LogHelper.OutputTypes outputType) {
this.outputType = outputType;
}
@Override
public String getType() {
return "addLogListener";
}
}
@Override
public String getArgsDescription() {
return null;
}
@Override
public String getUsageDescription() {
return null;
}
@Override
public void invoke(String... args) throws Exception {
LogHelper.info("Send log listener request");
Request.service.sendObject(new LogListenerRequest(LogHelper.JANSI ? LogHelper.OutputTypes.JANSI : LogHelper.OutputTypes.PLAIN));
LogHelper.info("Add log handler");
Request.service.registerHandler((result) -> {
if(result instanceof LogEvent)
{
LogHelper.rawLog(() -> {
return ((LogEvent) result).string;
}, () -> {
return ((LogEvent) result).string;
}, () -> {
return ((LogEvent) result).string;
});
}
});
}
}

7
Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java
View file

@ -1,5 +1,8 @@
package ru.gravit.launcher.managers;
import ru.gravit.launcher.console.admin.ExecCommand;
import ru.gravit.launcher.console.admin.LogListenerCommand;
import ru.gravit.utils.command.BaseCommandCategory;
import ru.gravit.utils.command.basic.ClearCommand;
import ru.gravit.utils.command.basic.DebugCommand;
import ru.gravit.utils.command.basic.GCCommand;
@ -48,5 +51,9 @@ public static boolean checkUnlockKey(String key)
public static void unlock()
{
handler.registerCommand("debug", new DebugCommand());
BaseCommandCategory admin = new BaseCommandCategory();
admin.registerCommand("exec", new ExecCommand());
admin.registerCommand("logListen", new LogListenerCommand());
handler.registerCategory(new CommandHandler.Category(admin, "admin", "Server admin commands"));
}
}

2
LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java
View file

@ -15,6 +15,6 @@ public ExecCommandRequest(String cmd) {
@Override
public String getType() {
return "execCmd";
return "cmdExec";
}
}

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

@ -118,7 +118,7 @@ public void registerResults() {
registerResult("getSecureToken", GetSecureTokenRequestEvent.class);
registerResult("verifySecureToken", VerifySecureTokenRequestEvent.class);
registerResult("log", LogEvent.class);
registerResult("execCmd", ExecCommandRequestEvent.class);
registerResult("cmdExec", ExecCommandRequestEvent.class);
registerResult("getAvailabilityAuth", GetAvailabilityAuthRequestEvent.class);
registerResult("exception", ExceptionEvent.class);
}

8
libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java
View file

@ -4,6 +4,7 @@
import org.fusesource.jansi.AnsiConsole;
import org.fusesource.jansi.AnsiOutputStream;
import ru.gravit.launcher.LauncherAPI;
import ru.gravit.launcher.LauncherNetworkAPI;
import java.io.*;
import java.nio.file.Path;
@ -47,7 +48,12 @@ public OutputEnity(Output output, OutputTypes type) {
}
public enum OutputTypes {
PLAIN, JANSI, HTML
@LauncherNetworkAPI
PLAIN,
@LauncherNetworkAPI
JANSI,
@LauncherNetworkAPI
HTML
}
private static final Set<OutputEnity> OUTPUTS = Collections.newSetFromMap(new ConcurrentHashMap<>(2));