Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-24 16:43:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add system for setting handbook address and port

Browse Source
This commit is contained in:
KingRainbow44
2023-05-30 16:53:57 -04:00
parent 36a35c11aa
commit a35ce5fecb
7 changed files with 84 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/grasscutter/config/ConfigContainer.java
View File

@@ -32,9 +32,11 @@ public class ConfigContainer {
* The field for 'legacyResources' has been removed.
* Version 7 - 'regionKey' is being added for authentication
* with the new dispatch server.
* Version 8 - 'server' is being added for enforcing handbook server
* addresses.
*/
private static int version() {
return 7;
return 8;
}
/**
@@ -299,9 +301,19 @@ public class ConfigContainer {
public static class HandbookOptions {
public boolean enable = false;
public boolean allowCommands = true;
public int maxRequests = 10;
public int maxEntities = 100;
public Server server = new Server();
public static class Server {
public boolean enforced = false;
public String address = "127.0.0.1";
public int port = 443;
public boolean canChange = true;
}
}
}

23
src/main/java/emu/grasscutter/server/http/documentation/HandbookHandler.java
View File

@@ -15,7 +15,7 @@ import static emu.grasscutter.config.Configuration.HANDBOOK;
/** Handles requests for the new GM Handbook. */
public final class HandbookHandler implements Router {
private final byte[] handbook;
private String handbook;
private final boolean serve;
/**
@@ -23,8 +23,16 @@ public final class HandbookHandler implements Router {
* found.
*/
public HandbookHandler() {
this.handbook = FileUtils.readResource("/html/handbook.html");
this.serve = HANDBOOK.enable && this.handbook.length > 0;
this.handbook = new String(FileUtils.readResource("/html/handbook.html"));
this.serve = HANDBOOK.enable && this.handbook.length() > 0;
var server = HANDBOOK.server;
if (this.serve && server.enforced) {
this.handbook = this.handbook
.replace("{{DETAILS_ADDRESS}}", server.address)
.replace("{{DETAILS_PORT}}", String.valueOf(server.port))
.replace("{{DETAILS_DISABLE}}", Boolean.toString(server.canChange));
}
}
@Override
@@ -48,7 +56,7 @@ public final class HandbookHandler implements Router {
* @return True if the server can execute handbook commands.
*/
private boolean controlSupported() {
return HANDBOOK.enable;
return HANDBOOK.enable && HANDBOOK.allowCommands;
}
/**
@@ -61,7 +69,9 @@ public final class HandbookHandler implements Router {
if (!this.serve) {
ctx.status(500).result("Handbook not found.");
} else {
ctx.contentType("text/html").result(this.handbook);
ctx
.contentType(ContentType.TEXT_HTML)
.result(this.handbook);
}
}
@@ -102,8 +112,7 @@ public final class HandbookHandler implements Router {
} else {
ctx.status(result.getStatus())
.result(result.getBody())
.contentType(
result.isHtml() ? ContentType.TEXT_HTML : ContentType.TEXT_PLAIN);
.contentType(result.isHtml() ? ContentType.TEXT_HTML : ContentType.TEXT_PLAIN);
}
}
}