Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove uneccesary lock, fix double server header, organize packages and class-names

This commit is contained in:
Lukas Rieger (Blue) 2023-02-24 13:55:21 +01:00
parent 0123041925
commit 892506f2f9
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
6 changed files with 68 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java
View File

@ -38,6 +38,7 @@ import de.bluecolored.bluemap.common.rendermanager.RenderManager;
import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
import de.bluecolored.bluemap.common.serverinterface.ServerInterface;
import de.bluecolored.bluemap.common.web.*;
import de.bluecolored.bluemap.common.web.http.HttpServer;
import de.bluecolored.bluemap.core.debug.StateDumper;
import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.map.BmMap;
@ -81,7 +82,7 @@ public class Plugin implements ServerEventListener {
private Map<String, BmMap> maps;
private RenderManager renderManager;
private WebServer webServer;
private HttpServer webServer;
private BlueMapAPIImpl api;
@ -192,7 +193,7 @@ public class Plugin implements ServerEventListener {
}
try {
webServer = new WebServer(routingRequestHandler);
webServer = new HttpServer(routingRequestHandler);
webServer.bind(new InetSocketAddress(
webserverConfig.resolveIp(),
webserverConfig.getPort()
@ -581,7 +582,7 @@ public class Plugin implements ServerEventListener {
return renderManager;
}
public WebServer getWebServer() {
public HttpServer getWebServer() {
return webServer;
}

2
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/JsonDataRequestHandler.java
View File

@ -28,7 +28,6 @@ import de.bluecolored.bluemap.common.web.http.HttpRequest;
import de.bluecolored.bluemap.common.web.http.HttpRequestHandler;
import de.bluecolored.bluemap.common.web.http.HttpResponse;
import de.bluecolored.bluemap.common.web.http.HttpStatusCode;
import de.bluecolored.bluemap.core.BlueMap;
import java.util.function.Supplier;
@ -43,7 +42,6 @@ public class JsonDataRequestHandler implements HttpRequestHandler {
@Override
public HttpResponse handle(HttpRequest request) {
HttpResponse response = new HttpResponse(HttpStatusCode.OK);
response.addHeader("Server", "BlueMap v" + BlueMap.VERSION);
response.addHeader("Cache-Control", "no-cache");
response.addHeader("Content-Type", "application/json");
response.setData(dataSupplier.get());

23
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/WebServer.java
View File

@ -1,23 +0,0 @@
package de.bluecolored.bluemap.common.web;
import de.bluecolored.bluemap.common.web.http.HttpConnection;
import de.bluecolored.bluemap.common.web.http.HttpRequestHandler;
import de.bluecolored.bluemap.common.web.http.SelectionConsumer;
import de.bluecolored.bluemap.common.web.http.Server;
import java.io.IOException;
public class WebServer extends Server {
private final HttpRequestHandler requestHandler;
public WebServer(HttpRequestHandler requestHandler) throws IOException {
this.requestHandler = requestHandler;
}
@Override
public SelectionConsumer createConnectionHandler() {
return new HttpConnection(requestHandler);
}
}

96
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/http/HttpConnection.java
View File

@ -9,11 +9,9 @@ import java.net.SocketAddress;
import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import java.util.concurrent.locks.ReentrantLock;
public class HttpConnection implements SelectionConsumer {
private final ReentrantLock processingLock = new ReentrantLock();
private final HttpRequestHandler requestHandler;
private HttpRequest request;
private HttpResponse response;
@ -25,62 +23,56 @@ public class HttpConnection implements SelectionConsumer {
@Override
public void accept(SelectionKey selectionKey) {
if (!selectionKey.isValid()) return;
if (!processingLock.tryLock()) return;
SelectableChannel selChannel = selectionKey.channel();
if (!(selChannel instanceof SocketChannel)) return;
SocketChannel channel = (SocketChannel) selChannel;
try {
SelectableChannel selChannel = selectionKey.channel();
if (!(selChannel instanceof SocketChannel)) return;
SocketChannel channel = (SocketChannel) selChannel;
if (request == null) {
SocketAddress remote = channel.getRemoteAddress();
InetAddress remoteInet = null;
if (remote instanceof InetSocketAddress)
remoteInet = ((InetSocketAddress) remote).getAddress();
try {
if (request == null) {
SocketAddress remote = channel.getRemoteAddress();
InetAddress remoteInet = null;
if (remote instanceof InetSocketAddress)
remoteInet = ((InetSocketAddress) remote).getAddress();
request = new HttpRequest(remoteInet);
}
// receive request
if (!request.write(channel)) {
if (!selectionKey.isValid()) return;
selectionKey.interestOps(SelectionKey.OP_READ);
return;
}
// process request
if (response == null) {
this.response = requestHandler.handle(request);
}
if (!selectionKey.isValid()) return;
// send response
if (!response.read(channel)){
selectionKey.interestOps(SelectionKey.OP_WRITE);
return;
}
// reset to accept new request
request.clear();
response.close();
response = null;
selectionKey.interestOps(SelectionKey.OP_READ);
} catch (IOException e) {
Logger.global.logDebug("Failed to process selection: " + e);
try {
channel.close();
} catch (IOException e2) {
Logger.global.logWarning("Failed to close channel" + e2);
}
request = new HttpRequest(remoteInet);
}
} finally {
processingLock.unlock();
// receive request
if (!request.write(channel)) {
if (!selectionKey.isValid()) return;
selectionKey.interestOps(SelectionKey.OP_READ);
return;
}
// process request
if (response == null) {
this.response = requestHandler.handle(request);
}
if (!selectionKey.isValid()) return;
// send response
if (!response.read(channel)){
selectionKey.interestOps(SelectionKey.OP_WRITE);
return;
}
// reset to accept new request
request.clear();
response.close();
response = null;
selectionKey.interestOps(SelectionKey.OP_READ);
} catch (IOException e) {
Logger.global.logDebug("Failed to process selection: " + e);
try {
channel.close();
} catch (IOException e2) {
Logger.global.logWarning("Failed to close channel" + e2);
}
}
}

18
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/web/http/HttpServer.java Normal file
View File

@ -0,0 +1,18 @@
package de.bluecolored.bluemap.common.web.http;
import java.io.IOException;
public class HttpServer extends Server {
private final HttpRequestHandler requestHandler;
public HttpServer(HttpRequestHandler requestHandler) throws IOException {
this.requestHandler = requestHandler;
}
@Override
public SelectionConsumer createConnectionHandler() {
return new HttpConnection(requestHandler);
}
}

3
implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
View File

@ -40,6 +40,7 @@ import de.bluecolored.bluemap.common.serverinterface.ServerInterface;
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
import de.bluecolored.bluemap.common.web.*;
import de.bluecolored.bluemap.common.web.http.HttpRequestHandler;
import de.bluecolored.bluemap.common.web.http.HttpServer;
import de.bluecolored.bluemap.core.MinecraftVersion;
import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.logger.LoggerLogger;
@ -202,7 +203,7 @@ public class BlueMapCLI implements ServerInterface {
HttpRequestHandler handler = new BlueMapResponseModifier(routingRequestHandler);
if (verbose) handler = new LoggingRequestHandler(handler);
WebServer webServer = new WebServer(handler);
HttpServer webServer = new HttpServer(handler);
webServer.bind(new InetSocketAddress(
config.resolveIp(),
config.getPort()