Jonas_Jones/BetterConsoleMC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/BetterConsoleMC.git synced 2025-10-24 14:19:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added Command ExecutionTimeout

Browse source 
Added the long missing feature of a timeout after which the process would be cleared as specified in the config file
This commit is contained in:
J-onasJones 2023-09-26 23:34:11 +02:00
parent f897d7630e
commit 01214a78e7
1 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/me/jonasjones/betterconsolemc/system/ShellCommand.java
View file

@ -6,6 +6,7 @@ import me.jonasjones.betterconsolemc.command.GameCommandHandler;
import me.jonasjones.betterconsolemc.modconfig.ModConfigs;
import me.jonasjones.betterconsolemc.util.CommandPreRegistry;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.Text;
import java.io.BufferedReader;
import java.io.IOException;
@ -27,16 +28,47 @@ public class ShellCommand {
Process process = processBuilder.start();
//set timeout
long timeout = System.currentTimeMillis()/1000L + command.getExecTimeout();
//if timeout is 0, set it to not have a timeout
if (command.getExecTimeout() == 0) {
timeout = Long.MAX_VALUE;
}
BufferedReader reader =
new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
System.out.println("TIMEOUT: " + timeout);
System.out.println("TIME: " + System.currentTimeMillis()/1000L);
long finalTimeout = timeout;
new Thread(() -> {
while (System.currentTimeMillis()/1000L < finalTimeout) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
if (process.isAlive()) {
process.destroy();
}
}).start();
while ((line = reader.readLine()) != null) {
if (ModConfigs.LOG_CMD_OUTPUT) {
GameCommandHandler.returnCommandOutput(command.getCommand(), line, context);
}
//get the ingame command name
output.append("[").append(command.getIngamecommand()).append("]").append(line).append("\n");
String finalLine = line;
context.getSource().sendFeedback(() -> Text.of("[" + command.getIngamecommand() + "] " + finalLine), command.isBroadcastToOp());
}
//quit the process if it's still running
if (process.isAlive()) {
process.destroy();
}
// Read buffered reader line by line and append to output with prefix of command before each line