From b865247da7ff3b9d37cfbaf1c206e98fbbb2373e Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Thu, 9 Jan 2025 21:52:11 -0500
Subject: [PATCH] Added photon, tagged version of primitives, and some server
 logic cleanup.

---
 dub.json                                      |  5 +-
 dub.selections.json                           |  4 +-
 source/handy_http_transport/http1/transport.d | 62 +++++++++++--------
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/dub.json b/dub.json
index 6ab897a..94c3dd8 100644
--- a/dub.json
+++ b/dub.json
@@ -4,9 +4,8 @@
 	],
 	"copyright": "Copyright © 2024, Andrew Lalis",
 	"dependencies": {
-		"handy-http-primitives": {
-			"path": "../primitives"
-		},
+		"handy-http-primitives": "~>1.0.0",
+		"photon": "~>0.10.2",
 		"streams": "~>3.5.0"
 	},
 	"description": "Implementations of HTTP transport protocols.",
diff --git a/dub.selections.json b/dub.selections.json
index e1ceb3b..1e52fe2 100644
--- a/dub.selections.json
+++ b/dub.selections.json
@@ -1,7 +1,9 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"handy-http-primitives": {"path":"../primitives"},
+		"handy-http-primitives": "1.0.0",
+		"photon": "0.10.2",
+		"sharded-map": "2.7.0",
 		"streams": "3.5.0"
 	}
 }
diff --git a/source/handy_http_transport/http1/transport.d b/source/handy_http_transport/http1/transport.d
index a27ae60..7e2e11f 100644
--- a/source/handy_http_transport/http1/transport.d
+++ b/source/handy_http_transport/http1/transport.d
@@ -1,42 +1,34 @@
 module handy_http_transport.http1.transport;
 
-import std.socket; // TODO: Implement this without std.socket?
-import std.stdio;
+import std.socket;
 
 import handy_http_transport.interfaces;
 import handy_http_primitives;
 
 import streams;
+import photon;
 
 /**
- * The HTTP/1.1 transport protocol implementation.
+ * The HTTP/1.1 transport protocol implementation, using Dimitry Olshansky's
+ * Photon fiber scheduling library for concurrency.
  */
 class Http1Transport : HttpTransport {
     private Socket serverSocket;
     private HttpRequestHandler requestHandler;
+    private const ushort port;
     private bool running = false;
 
-    this(HttpRequestHandler requestHandler) {
+    this(HttpRequestHandler requestHandler, ushort port = 8080) {
+        assert(requestHandler !is null);
         this.serverSocket = new TcpSocket();
         this.requestHandler = requestHandler;
+        this.port = port;
     }
 
     void start() {
-        this.running = true;
-        serverSocket.setOption(SocketOptionLevel.SOCKET, SocketOption.REUSEADDR, 1);
-        serverSocket.bind(new InternetAddress("127.0.0.1", 8080));
-        serverSocket.listen(100);
-        while (running) {
-            try {
-                Socket clientSocket = serverSocket.accept();
-                import core.thread.osthread;
-                Thread t = new Thread(() => handleClient(clientSocket, requestHandler));
-                t.start();
-            } catch (SocketAcceptException e) {
-                import std.stdio;
-                stderr.writefln!"Failed to accept socket connection: %s"(e);
-            }
-        }
+        startloop();
+        go(() => runServer());
+        runFibers();
     }
 
     void stop() {
@@ -44,6 +36,22 @@ class Http1Transport : HttpTransport {
         this.serverSocket.shutdown(SocketShutdown.BOTH);
         this.serverSocket.close();
     }
+
+    private void runServer() {
+        this.running = true;
+        serverSocket.setOption(SocketOptionLevel.SOCKET, SocketOption.REUSEADDR, 1);
+        serverSocket.bind(new InternetAddress("127.0.0.1", port));
+        serverSocket.listen(100);
+        while (running) {
+            try {
+                Socket clientSocket = serverSocket.accept();
+                go(() => handleClient(clientSocket, requestHandler));
+            } catch (SocketAcceptException e) {
+                import std.stdio;
+                stderr.writefln!"Failed to accept socket connection: %s"(e);
+            }
+        }
+    }
 }
 
 /**
@@ -60,19 +68,23 @@ void handleClient(Socket clientSocket, HttpRequestHandler requestHandler) {
     auto bufferedInput = bufferedInputStreamFor!(8192)(inputStream);
     auto result = readHttpRequest(&bufferedInput);
     if (result.hasError) {
+        import std.stdio;
         stderr.writeln("Failed to read HTTP request: " ~ result.error.message);
         inputStream.closeStream();
         return;
     }
-    ServerHttpRequest request = result.request;
-    ServerHttpResponse response;
+    scope ServerHttpRequest request = result.request;
+    scope ServerHttpResponse response;
     SocketOutputStream outputStream = SocketOutputStream(clientSocket);
     response.outputStream = outputStreamObjectFor(HttpResponseOutputStream!(SocketOutputStream*)(
         &outputStream,
         &response
     ));
-    if (requestHandler !is null) {
+    try {
         requestHandler.handle(request, response);
+    } catch (Exception e) {
+        import std.stdio;
+        stderr.writeln("Exception thrown while handling request: " ~ e.msg);
     }
     inputStream.closeStream();
 }
@@ -214,7 +226,7 @@ private string stripSpaces(string s) {
 
 /**
  * Helper function to append an unsigned integer value to a char buffer. It is
- * assumed that there's enough space to write value.
+ * assumed that there's enough space to write the value.
  * Params:
  *   value = The value to append.
  *   buffer = The buffer to append to.
@@ -314,11 +326,11 @@ unittest {
     class TestHandler : HttpRequestHandler {
         void handle(ref ServerHttpRequest request, ref ServerHttpResponse response) {
             response.status = HttpStatus.OK;
-            response.headers.add("ContentType", "application/json");
+            response.headers.add("Content-Type", "application/json");
             response.outputStream.writeToStream(cast(ubyte[]) "{\"a\": 1}");
         }
     }
 
-    HttpTransport tp = new Http1Transport(new TestHandler());
+    HttpTransport tp = new Http1Transport(new TestHandler(), 8080);
     tp.start();
 }