-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a server adapter for undertow.io
Simple remains the default adapter for the web server for the time being, but we might make undertow the default in the future since my own benchmarks show that undertow gets 3 times the throughput. See #53
- Loading branch information
1 parent
595b3d6
commit a4b7605
Showing
5 changed files
with
316 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
274 changes: 274 additions & 0 deletions
274
src/main/java/com/vtence/molecule/servers/UndertowServer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,274 @@ | ||
| package com.vtence.molecule.servers; | ||
|
|
||
| import com.vtence.molecule.Application; | ||
| import com.vtence.molecule.Body; | ||
| import com.vtence.molecule.BodyPart; | ||
| import com.vtence.molecule.FailureReporter; | ||
| import com.vtence.molecule.Request; | ||
| import com.vtence.molecule.Response; | ||
| import com.vtence.molecule.Server; | ||
| import io.undertow.Undertow; | ||
| import io.undertow.server.HttpHandler; | ||
| import io.undertow.server.HttpServerExchange; | ||
| import io.undertow.server.handlers.form.FormData; | ||
| import io.undertow.server.handlers.form.FormDataParser; | ||
| import io.undertow.server.handlers.form.FormEncodedDataDefinition; | ||
| import io.undertow.server.handlers.form.MultiPartParserDefinition; | ||
| import io.undertow.util.HeaderMap; | ||
| import io.undertow.util.HeaderValues; | ||
| import io.undertow.util.HttpString; | ||
| import org.xnio.IoUtils; | ||
|
|
||
| import javax.net.ssl.SSLContext; | ||
| import java.io.Closeable; | ||
| import java.io.FileInputStream; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.ArrayList; | ||
| import java.util.Deque; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.concurrent.CompletionException; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import static io.undertow.util.QueryParameterUtils.getQueryParamEncoding; | ||
| import static io.undertow.util.QueryParameterUtils.parseQueryString; | ||
|
|
||
| public class UndertowServer implements Server { | ||
|
|
||
| private final String host; | ||
| private final int port; | ||
|
|
||
| private Undertow server; | ||
| private FailureReporter failureReporter = FailureReporter.IGNORE; | ||
|
|
||
| public UndertowServer(String host, int port) { | ||
| this.host = host; | ||
| this.port = port; | ||
| } | ||
|
|
||
| public void reportErrorsTo(FailureReporter reporter) { | ||
| this.failureReporter = reporter; | ||
| } | ||
|
|
||
| public int port() { | ||
| return port; | ||
| } | ||
|
|
||
| public String host() { | ||
| return host; | ||
| } | ||
|
|
||
| public void run(final Application app) throws IOException { | ||
| start(Undertow.builder().addHttpListener(port, host), app); | ||
| } | ||
|
|
||
| public void run(final Application app, SSLContext context) throws IOException { | ||
| start(Undertow.builder().addHttpsListener(port, host, context), app); | ||
| } | ||
|
|
||
| private void start(Undertow.Builder builder, Application app) { | ||
| server = builder.setHandler(new DispatchHandler(new ApplicationHandler(app))) | ||
| .build(); | ||
| server.start(); | ||
| } | ||
|
|
||
| public void shutdown() throws IOException { | ||
| if (server != null) server.stop(); | ||
| } | ||
|
|
||
| private static class DispatchHandler implements HttpHandler { | ||
| private final ApplicationHandler handler; | ||
|
|
||
| public DispatchHandler(ApplicationHandler handler) { | ||
| this.handler = handler; | ||
| } | ||
|
|
||
| public void handleRequest(HttpServerExchange exchange) throws Exception { | ||
| exchange.startBlocking(); | ||
| exchange.dispatch(() -> handler.handleRequest(exchange)); | ||
| } | ||
| } | ||
|
|
||
| private class ApplicationHandler implements HttpHandler { | ||
| private final Application app; | ||
|
|
||
| public ApplicationHandler(Application app) { | ||
| this.app = app; | ||
| } | ||
|
|
||
| public void handleRequest(HttpServerExchange exchange) { | ||
| final List<Closeable> resources = new ArrayList<>(); | ||
| final Request request = new Request(); | ||
| final Response response = new Response(); | ||
| try { | ||
| read(request, exchange, resources); | ||
| app.handle(request, response); | ||
| response.whenSuccessful(commitTo(exchange)) | ||
| .whenFailed((result, error) -> failureReporter.errorOccurred(error)) | ||
| .whenComplete((result, error) -> closeAll(resources, exchange)); | ||
| } catch (Throwable failure) { | ||
| failureReporter.errorOccurred(failure); | ||
| closeAll(resources, exchange); | ||
| } | ||
| } | ||
|
|
||
| private void read(Request request, HttpServerExchange exchange, List<Closeable> resources) throws IOException { | ||
| setRequestInfo(request, exchange); | ||
| setHeaders(request, exchange); | ||
| setQueryParameters(request, exchange); | ||
| setFormParameters(request, exchange); | ||
| setParts(request, exchange, resources); | ||
| setBody(request, exchange, resources); | ||
| } | ||
|
|
||
| private void setRequestInfo(Request request, HttpServerExchange exchange) { | ||
| request.uri(exchange.getRequestURI() + queryComponent(exchange)); | ||
| request.path(exchange.getRequestPath()); | ||
| request.remoteIp(exchange.getSourceAddress().getAddress().getHostAddress()); | ||
| request.remotePort(exchange.getSourceAddress().getPort()); | ||
| request.remoteHost(exchange.getSourceAddress().getHostName()); | ||
| request.timestamp(exchange.getRequestStartTime()); | ||
| request.protocol(exchange.getProtocol().toString()); | ||
| request.secure(exchange.getRequestScheme().equalsIgnoreCase("https")); | ||
| request.method(exchange.getRequestMethod().toString()); | ||
| } | ||
|
|
||
| private String queryComponent(HttpServerExchange exchange) { | ||
| return exchange.getQueryString() != null ? "?" + exchange.getQueryString() : ""; | ||
| } | ||
|
|
||
| private void setHeaders(Request request, HttpServerExchange exchange) { | ||
| HeaderMap headers = exchange.getRequestHeaders(); | ||
| for (HeaderValues values : headers) { | ||
| for (String value : values) { | ||
| request.addHeader(values.getHeaderName().toString(), value); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void setQueryParameters(Request request, HttpServerExchange exchange) { | ||
| Map<String, Deque<String>> parameters = | ||
| parseQueryString(exchange.getQueryString(), getQueryParamEncoding(exchange)); | ||
|
|
||
| for (String name : parameters.keySet()) { | ||
| for (String value : parameters.get(name)) { | ||
| request.addParameter(name, value); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void setFormParameters(Request request, HttpServerExchange exchange) throws IOException { | ||
| FormEncodedDataDefinition form = new FormEncodedDataDefinition(); | ||
| form.setDefaultEncoding(StandardCharsets.UTF_8.name()); | ||
| FormDataParser parser = form.create(exchange); | ||
| if (parser == null) return; | ||
|
|
||
| FormData data = parser.parseBlocking(); | ||
| for (String name : data) { | ||
| for (FormData.FormValue param : data.get(name)) { | ||
| request.addParameter(name, param.getValue()); | ||
| } | ||
| } | ||
| parser.close(); | ||
| } | ||
|
|
||
| private void setParts(Request request, HttpServerExchange exchange, List<Closeable> resources) | ||
| throws IOException { | ||
| MultiPartParserDefinition multipart = new MultiPartParserDefinition(); | ||
| multipart.setDefaultEncoding(StandardCharsets.UTF_8.name()); | ||
| FormDataParser parser = multipart.create(exchange); | ||
| if (parser == null) return; | ||
|
|
||
| FormData data = parser.parseBlocking(); | ||
| for (String name : data) { | ||
| for (FormData.FormValue param : data.get(name)) { | ||
| BodyPart part = new BodyPart().filename(param.getFileName()) | ||
| .contentType(contentTypeOf(param)) | ||
| .name(name); | ||
| if (param.isFile()) { | ||
| final FileInputStream content = new FileInputStream(param.getPath().toFile()); | ||
| resources.add(content); | ||
| part.content(content); | ||
| } else { | ||
| part.content(param.getValue()); | ||
| } | ||
| request.addPart(part); | ||
| } | ||
| } | ||
| parser.close(); | ||
| } | ||
|
|
||
| private String contentTypeOf(FormData.FormValue param) { | ||
| HeaderValues contentType = param.getHeaders().get("Content-Type"); | ||
| return contentType != null ? contentType.getFirst() : null; | ||
| } | ||
|
|
||
| private void setBody(Request request, HttpServerExchange exchange, List<Closeable> resources) | ||
| throws IOException { | ||
| final InputStream body = exchange.getInputStream(); | ||
| resources.add(body); | ||
| request.body(body); | ||
| } | ||
|
|
||
| private Consumer<Response> commitTo(HttpServerExchange exchange) { | ||
| return response -> { | ||
| try { | ||
| commit(exchange, response); | ||
| } catch (IOException e) { | ||
| throw new CompletionException(e); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private void commit(HttpServerExchange exchange, Response response) throws IOException { | ||
| setStatusLine(exchange, response); | ||
| setHeaders(exchange, response); | ||
| writeBody(exchange, response); | ||
| } | ||
|
|
||
| private void setStatusLine(HttpServerExchange exchange, Response response) { | ||
| exchange.setStatusCode(response.statusCode()); | ||
| exchange.setReasonPhrase(response.statusText()); | ||
| } | ||
|
|
||
| private void setHeaders(HttpServerExchange exchange, Response response) { | ||
| for (String name : response.headerNames()) { | ||
| for (String value : response.headers(name)) { | ||
| exchange.getResponseHeaders().add(HttpString.tryFromString(name), value); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void writeBody(HttpServerExchange exchange, Response response) throws IOException { | ||
| Body body = response.body(); | ||
| body.writeTo(exchange.getOutputStream(), response.charset()); | ||
| body.close(); | ||
| } | ||
|
|
||
| private void closeAll(List<Closeable> resources, HttpServerExchange exchange) { | ||
| for (Closeable resource : resources) { | ||
| close(resource); | ||
| } | ||
| end(exchange); | ||
| } | ||
|
|
||
| private void close(Closeable resource) { | ||
| try { | ||
| resource.close(); | ||
| } catch (IOException e) { | ||
| failureReporter.errorOccurred(e); | ||
| } | ||
| } | ||
|
|
||
| private void end(HttpServerExchange exchange) { | ||
| try { | ||
| exchange.endExchange(); | ||
| } catch (Throwable e) { | ||
| failureReporter.errorOccurred(e); | ||
| IoUtils.safeClose(exchange.getConnection()); | ||
| } | ||
| } | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/test/java/com/vtence/molecule/servers/UndertowServerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.vtence.molecule.servers; | ||
|
|
||
| import com.vtence.molecule.Server; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.logging.LogManager; | ||
|
|
||
| import static com.vtence.molecule.testing.http.HttpResponseAssert.assertThat; | ||
|
|
||
| public class UndertowServerTest extends ServerCompatibilityTests { | ||
|
|
||
| @BeforeClass public static void | ||
| silenceLogging() { | ||
| LogManager.getLogManager().reset(); | ||
| } | ||
|
|
||
| protected Server createServer(int port) { | ||
| return new UndertowServer("localhost", port); | ||
| } | ||
|
|
||
| @Test public void | ||
| setsContentLengthAutomaticallyForSmallResponses() throws IOException { | ||
| server.run((request, response) -> response.body("<html>...</html>").done()); | ||
|
|
||
| response = request.send(); | ||
| assertNoError(); | ||
| assertThat(response).hasBodyText("<html>...</html>") | ||
| .hasHeader("Content-Length", "16") | ||
| .isNotChunked(); | ||
| } | ||
| } |