Jonas_Jones/McWebserver
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/McWebserver.git synced 2025-10-23 11:29:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

small changes and added stop method

Browse source
This commit is contained in:
Jonas_Jones 2024-01-13 20:58:06 +01:00
parent ffdff60a10
commit 178e38f9ab
2 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/me/jonasjones/mcwebserver/mixin/WebserverStopMixin.java
View file

@ -3,6 +3,7 @@ package me.jonasjones.mcwebserver.mixin;
import me.jonasjones.mcwebserver.McWebserver; import me.jonasjones.mcwebserver.McWebserver;
import me.jonasjones.mcwebserver.config.ModConfigs; import me.jonasjones.mcwebserver.config.ModConfigs;
import me.jonasjones.mcwebserver.web.ServerHandler; import me.jonasjones.mcwebserver.web.ServerHandler;
import me.jonasjones.mcwebserver.web.php.PhpServer;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@ -16,5 +17,6 @@ public class WebserverStopMixin {
McWebserver.LOGGER.info("Stopping Webserver..."); McWebserver.LOGGER.info("Stopping Webserver...");
ModConfigs.VERBOSE = false; ModConfigs.VERBOSE = false;
ServerHandler.mcserveractive = false; ServerHandler.mcserveractive = false;
PhpServer.stop();
} }
} }

47
src/main/java/me/jonasjones/mcwebserver/web/php/PhpServer.java
View file

@ -1,38 +1,53 @@
package me.jonasjones.mcwebserver.web.php; package me.jonasjones.mcwebserver.web.php;
import me.jonasjones.mcwebserver.config.ModConfigs; import me.jonasjones.mcwebserver.McWebserver;
import org.jetbrains.annotations.NotNull;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import static me.jonasjones.mcwebserver.config.ModConfigs.WEB_PORT;
import static me.jonasjones.mcwebserver.config.ModConfigs.WEB_ROOT;
public class PhpServer { public class PhpServer {
private static Process process;
public static void main() { public static void main() {
try { try {
String documentRoot = ModConfigs.WEB_ROOT; process = getProcess();
// Set the port number
int port = ModConfigs.WEB_PORT;
// Build the command to start the PHP built-in web server
String command = String.format("php -S localhost:%d -t %s", port, documentRoot);
// Start the process
ProcessBuilder processBuilder = new ProcessBuilder(command.split("\\s+"));
processBuilder.redirectErrorStream(true);
Process process = processBuilder.start();
// Read the output // Read the output
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
System.out.println(line); McWebserver.VERBOSELOGGER.info(line);
} }
System.out.println("PHP server is running. Press Enter to stop."); McWebserver.LOGGER.info("PHP server started!");
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); McWebserver.LOGGER.error("Error with PHP server: ", e);
} }
} }
@NotNull
private static Process getProcess() throws IOException {
// Build the command to start the PHP built-in web server
String command = String.format("php -S localhost:%d -t %s", WEB_PORT, WEB_ROOT);
// Start the process
ProcessBuilder processBuilder = new ProcessBuilder(command.split("\\s+"));
processBuilder.redirectErrorStream(true);
return processBuilder.start();
}
public static void stop() {
if (process == null || !process.isAlive()) {
return;
}
process.destroy();
McWebserver.LOGGER.info("PHP server stopped!");
}
} }