open-autonomous-connection/WebServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Updated to latest Protocol Version

Browse Source
This commit is contained in:
UnlegitDqrk
2026-02-22 17:26:22 +01:00
parent 5058e41ce1
commit 5642869097
16 changed files with 879 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/org/openautonomousconnection/webserver/runtime/JavaPageDispatcher.java
View File

@@ -1,7 +1,7 @@
package org.openautonomousconnection.webserver.runtime;
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebRequestPacket;
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebResponsePacket;
import org.openautonomousconnection.protocol.packets.v1_0_1.beta.web.impl.resource.WebResourceRequestPacket;
import org.openautonomousconnection.protocol.packets.v1_0_1.beta.web.impl.resource.WebResourceResponsePacket;
import org.openautonomousconnection.protocol.side.server.CustomConnectedClient;
import org.openautonomousconnection.protocol.side.web.ProtocolWebServer;
import org.openautonomousconnection.webserver.WebServer;
@@ -10,15 +10,12 @@ import org.openautonomousconnection.webserver.api.WebPageContext;
import org.openautonomousconnection.webserver.utils.HeaderMaps;
import org.openautonomousconnection.webserver.utils.RequestParams;
import org.openautonomousconnection.webserver.utils.WebHasher;
import org.openautonomousconnection.webserver.utils.WebUrlUtil;
import java.io.File;
import java.nio.charset.StandardCharsets;
/**
* Dispatches Java WebPages using {@code @Route} annotation.
*
* <p>This dispatcher relies on {@link JavaRouteRegistry} for route-to-source mapping
* and uses {@link JavaPageCache} to compile/load classes from the content tree.
* Dispatches Java WebPages using {@code @Route} annotation (v1.0.1-BETA).
*/
public final class JavaPageDispatcher {
@@ -34,25 +31,30 @@ public final class JavaPageDispatcher {
* @param client connected client
* @param server protocol web server
* @param request request packet
* @return response packet or {@code null} if no Java route matches and static file handling should proceed
* @return response packet or {@code null} if no Java route matches
* @throws Exception on unexpected failures
*/
public static WebResponsePacket dispatch(
public static WebResourceResponsePacket dispatch(
CustomConnectedClient client,
ProtocolWebServer server,
WebRequestPacket request
WebResourceRequestPacket request
) throws Exception {
if (request == null || request.getPath() == null) {
if (request == null || request.getUrl() == null) {
return null;
}
String route = request.getPath();
String route = WebUrlUtil.extractPathAndQuery(request.getUrl());
if (route == null) return null;
int q = route.indexOf('?');
if (q >= 0) route = route.substring(0, q);
if (!route.startsWith("/")) {
route = "/" + route;
}
File contentRoot = server.getContentFolder();
java.io.File contentRoot = server.getContentFolder();
ROUTES.refreshIfNeeded(contentRoot);
JavaRouteRegistry.RouteLookupResult found = ROUTES.find(route);
@@ -65,9 +67,8 @@ public final class JavaPageDispatcher {
JavaPageCache.LoadedClass loaded = CACHE.getOrCompile(contentRoot, found.sourceFile(), contentLm);
Class<?> clazz = loaded.clazz();
// Verify that the loaded class is actually routable.
if (!WebPage.class.isAssignableFrom(clazz)) {
return error(500, "Class has @Route but is not a WebPage: " + found.fqcn());
return error(request, 500, "Class has @Route but is not a WebPage: " + found.fqcn());
}
Object instance = clazz.getDeclaredConstructor().newInstance();
@@ -75,19 +76,41 @@ public final class JavaPageDispatcher {
WebHasher hasher = (server instanceof WebServer ws) ? ws.getHasher() : null;
if (hasher == null) {
return error(500, "WebHasher missing on server instance.");
return error(request, 500, "WebHasher missing on server instance.");
}
WebPageContext ctx = new WebPageContext(client, server, request, new RequestParams(request), hasher);
return page.handle(ctx);
}
private static WebResponsePacket error(int code, String msg) {
return new WebResponsePacket(
private static WebResourceResponsePacket error(WebResourceRequestPacket req, int code, String msg) {
byte[] body = (msg == null ? "" : msg).getBytes(StandardCharsets.UTF_8);
// Mirror correlation from the incoming request if possible.
org.openautonomousconnection.protocol.versions.v1_0_1.beta.WebPacketHeader in =
(req != null && req.getHeader() != null)
? req.getHeader()
: new org.openautonomousconnection.protocol.versions.v1_0_1.beta.WebPacketHeader(
0, 0, 0, 0, org.openautonomousconnection.protocol.versions.v1_0_1.beta.WebPacketFlags.RESOURCE, System.currentTimeMillis()
);
org.openautonomousconnection.protocol.versions.v1_0_1.beta.WebPacketHeader out =
new org.openautonomousconnection.protocol.versions.v1_0_1.beta.WebPacketHeader(
in.getRequestId(),
in.getTabId(),
in.getPageId(),
in.getFrameId(),
in.getFlags() | org.openautonomousconnection.protocol.versions.v1_0_1.beta.WebPacketFlags.RESOURCE,
System.currentTimeMillis()
);
return new WebResourceResponsePacket(
out,
code,
"text/plain; charset=utf-8",
HeaderMaps.mutable(),
msg.getBytes(StandardCharsets.UTF_8)
body,
null
);
}
}