BREAKING: split TCP and Web servers; make HTTP a distinct TCP handler

.github/workflows/test.yml

@@ -26,3 +26,4 @@ jobs:
         run: npx haxe tests.hxml
       - name: run test
         run: hl test.hl
+        timeout-minutes: 5

tests/Request.hx

@@ -16,7 +16,7 @@ class Request {
 		});
 		app.listen(2000, false);
 
-		sys.thread.Thread.create(() -> {
+		{
 			var response = Http.requestUrl("http://localhost:2000");
 			if (response != data)
 				throw "post response data does not match: " + response + " data: " + data;
@@ -26,12 +26,8 @@ class Request {
 			if (http.responseData != data + data)
 				throw "post response data does not match: " + http.responseData + " data: " + data + data;
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 }

tests/Test.hx

@@ -10,23 +10,28 @@ import tests.security.TestSign;
 
 class Test {
 	public static function main() {
-		Request.main();
-		TestBCryptPassword.main();
-		TestCompression.main();
-		TestCookie.main();
-		TestCredentialsProvider.main();
-		TestEndpointExample.main();
-		TestHeaders.main();
-		TestJwks.main();
-		TestJwt.main();
-		TestOAuth2.main();
-		TestMiddlewareCorrectOrder.main();
-		TestMiddlewareShortCircuit.main();
-		TestPath.main();
-		TestPostData.main();
-		TestProjection.main();
-		TestRadixTree.main();
-		TestSign.main();
+		try {
+			Request.main();
+			TestBCryptPassword.main();
+			TestCompression.main();
+			TestCookie.main();
+			TestCredentialsProvider.main();
+			TestEndpointExample.main();
+			TestHeaders.main();
+			TestJwks.main();
+			TestJwt.main();
+			TestOAuth2.main();
+			TestMiddlewareCorrectOrder.main();
+			TestMiddlewareShortCircuit.main();
+			TestPath.main();
+			TestPostData.main();
+			TestProjection.main();
+			TestRadixTree.main();
+			TestSign.main();
+		} catch (e) {
+			trace(e.details());
+			Sys.exit(1);
+		}
 		Sys.exit(0);
 	}
 }

tests/TestCompression.hx

@@ -16,7 +16,7 @@ class TestCompression {
 		}, Compression.deflateCompressionMiddleware);
 		app.listen(2000, false);
 
-		sys.thread.Thread.create(() -> {
+		{
 			var http = new Http("http://localhost:2000");
 			var response:Bytes = null;
 			http.onBytes = function(bytes) {
@@ -29,12 +29,8 @@ class TestCompression {
 			if (response.compare(compressedData) != 0)
 				throw "get response compressed data does not match: " + response + " compressedData: " + compressedData;
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 }

tests/TestCookie.hx

@@ -18,7 +18,7 @@ class TestCookie {
 		});
 		app.listen(2000, false);
 
-		sys.thread.Thread.create(() -> {
+		{
 			var http = new Http("http://localhost:2000");
 			http.onStatus = function(status) {
 				if (status == 200) {
@@ -31,12 +31,8 @@ class TestCookie {
 			http.request(false);
 
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 }

tests/TestMiddlewareCorrectOrder.hx

@@ -31,7 +31,7 @@ class TestMiddlewareCorrectOrder {
 		app.get("/", (_, res) -> res.send('$v1$v2$v3'));
 		app.listen(2000, false);
 
-		Thread.create(() -> {
+		{
 			final http = new Http("http://localhost:2000");
 			var response:Null<Bytes> = null;
 			http.onBytes = bytes -> response = bytes;
@@ -40,12 +40,8 @@ class TestMiddlewareCorrectOrder {
 			if (response.toString() != "bazbarfoo")
 				throw "not the response we expected";
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 }

tests/TestMiddlewareShortCircuit.hx

@@ -14,7 +14,7 @@ class TestMiddlewareShortCircuit {
 		});
 		app.listen(2000, false);
 
-		Thread.create(() -> {
+		{
 			final http = new Http("http://localhost:2000");
 			var response:Null<Bytes> = null;
 			http.onBytes = bytes -> response = bytes;
@@ -23,12 +23,8 @@ class TestMiddlewareShortCircuit {
 			if (response.toString() != "foo")
 				throw "not the response we expected";
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 }

tests/TestPath.hx

@@ -5,13 +5,12 @@ class TestPath {
 		trace("Starting Path Test");
 		var app = new weblink.Weblink();
 
-		//simply reimplement the route not found to confirm that doing this doesn't kill everything.
-		app.set_pathNotFound(function(request, response){
+		// simply reimplement the route not found to confirm that doing this doesn't kill everything.
+		app.set_pathNotFound(function(request, response) {
 			response.status = 404;
 			response.send("Error 404, Route Not found.");
 		});
 
-
 		var data = haxe.io.Bytes.ofString(Std.string(Std.random(10 * 1000))).toHex();
 		app.get("/path", function(request, response) {
 			response.send(data);
@@ -27,7 +26,7 @@ class TestPath {
 		});
 		app.listen(2000, false);
 
-		sys.thread.Thread.create(() -> {
+		{
 			var response = Http.requestUrl("http://localhost:2000/path");
 			if (response != data)
 				throw "/path: post response data does not match: " + response + " data: " + data;
@@ -43,17 +42,13 @@ class TestPath {
 			try {
 				var nopath = Http.requestUrl("http://localhost:2000/notapath");
 			} catch (e) {
-				if(e.message != "Http Error #404"){
+				if (e.message != "Http Error #404") {
 					throw "/notapath should return a Status 404.";
 				}
 			}
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 }

tests/security/TestCredentialsProvider.hx

@@ -12,19 +12,15 @@ class TestCredentialsProvider {
 		app.users(credentialsProvider);
 		app.listen(2000, false);
 
-		sys.thread.Thread.create(() -> {
+		{
 			var response = Http.requestUrl("http://localhost:2000/users");
 			var testValue = '{"users":[{"username":"johndoe","email":"[email protected]","full_name":"John Doe","disabled":false}]}';
 			if (response != testValue)
 				trace("/users: response data does not match: " + response + " data: " + testValue);
 
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 }

tests/security/TestEndpointExample.hx

@@ -10,7 +10,11 @@ import weblink.security.OAuth;
 class EndpointExample {
 	var oAuth:OAuth;
 
-	public function new(tokenUrl:String, secret_key:String, credentialsProvider:CredentialsProvider) {
+	public function new(
+		tokenUrl:String,
+		secret_key:String,
+		credentialsProvider:CredentialsProvider
+	) {
 		this.oAuth = new OAuth(tokenUrl, secret_key, credentialsProvider);
 	}
 
@@ -45,7 +49,7 @@ class TestEndpointExample {
 		var password = "secret";
 		var scope = "";
 
-		sys.thread.Thread.create(() -> {
+		{
 			var http = new Http("http://localhost:2000/token");
 			http.setPostData('grant_type=${grant_type}&username=${username}&password=${password}&scope=${scope}');
 			http.request(false);
@@ -63,21 +67,22 @@ class TestEndpointExample {
 			usersMeRequest.request(false);
 			var testValueGet = '{"username":"johndoe","email":"[email protected]","full_name":"John Doe","disabled":false}';
 			if (usersMeRequest.responseData != testValueGet)
-				throw "/users/me/: response data does not match: " + usersMeRequest.responseData + " data: " + testValueGet;
+				throw "/users/me/: response data does not match: "
+					+ usersMeRequest.responseData
+					+ " data: "
+					+ testValueGet;
 
 			var usersMeItemsRequest = new Http("http://localhost:2000/users/me/items/");
 			usersMeItemsRequest.setHeader("Authorization", 'bearer ${data.access_token}');
 			usersMeItemsRequest.request(false);
 			var testItemsGet = '[{"item_id":"Foo","owner":"johndoe"}]';
 			if (usersMeItemsRequest.responseData != testItemsGet)
-				throw "/users/me/: response data does not match: " + usersMeItemsRequest.responseData + " data: " + testItemsGet;
+				throw "/users/me/: response data does not match: "
+					+ usersMeItemsRequest.responseData
+					+ " data: "
+					+ testItemsGet;
 
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
 
 		trace("done");

tests/security/TestJwks.hx

@@ -20,7 +20,7 @@ class TestJwks {
 		app.jwks(jwks);
 		app.listen(2000, false);
 
-		sys.thread.Thread.create(() -> {
+		{
 			var response = Http.requestUrl("http://localhost:2000/jwks");
 			var testValue = '{"keys":[]}';
 			if (response != testValue)
@@ -36,12 +36,8 @@ class TestJwks {
 				throw "/jwks: response data does not match: " + responseAfterPost + " data: " + testValueGet;
 
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 

tests/security/TestOAuth2.hx

@@ -3,7 +3,6 @@ package tests.security;
 import haxe.Http;
 import haxe.Json;
 import weblink.security.CredentialsProvider;
-import weblink.security.OAuth.OAuthEndpoints;
 import weblink.security.OAuth;
 
 class TestOAuth2 {
@@ -23,7 +22,7 @@ class TestOAuth2 {
 		var password = "secret";
 		var scope = "";
 
-		sys.thread.Thread.create(() -> {
+		{
 			var http = new Http("http://localhost:2000/token");
 			http.setPostData('grant_type=${grant_type}&username=${username}&password=${password}&scope=${scope}');
 			http.request(false);
@@ -36,12 +35,8 @@ class TestOAuth2 {
 				throw 'empty access token';
 			}
 			app.close();
-		});
-
-		while (app.server.running) {
-			app.server.update(false);
-			Sys.sleep(0.2);
 		}
+
 		trace("done");
 	}
 

weblink/Request.hx

@@ -2,10 +2,11 @@ package weblink;
 
 import haxe.http.HttpMethod;
 import haxe.io.Bytes;
-import weblink._internal.Server;
+import weblink._internal.WebServer;
 import weblink.http.HeaderMap;
 import weblink.http.HeaderName;
 import weblink.http.HeaderValue;
+import weblink.tcp.ITcpClient;
 
 using StringTools;
 
@@ -192,8 +193,8 @@ class Request {
 		return obj;
 	}
 
-	private function response(parent:Server, socket):Response {
-		@:privateAccess var rep = new Response(socket, parent);
+	private function response(client:ITcpClient):Response {
+		@:privateAccess var rep = new Response(client);
 		var connection = headers.get("Connection");
 		if (connection != null)
 			@:privateAccess rep.close = connection == "close"; // assume keep alive HTTP 1.1