http/router: asynchronous fs serving

mookums · Oct 22, 2024 · ff2de71 · ff2de71
1 parent fb57b4e
commit ff2de71
Show file tree

Hide file tree

Showing 11 changed files with 1,306 additions and 1,277 deletions.
diff --git a/examples/http/basic/main.zig b/examples/http/basic/main.zig
@@ -34,11 +34,12 @@ pub fn main() !void {
     }.handler_fn));
 
     var server = http.Server(.plain, .auto).init(.{
+        .router = &router,
         .allocator = allocator,
         .threading = .single,
     });
     defer server.deinit();
 
     try server.bind(host, port);
-    try server.listen(.{ .router = &router });
+    try server.listen();
 }
diff --git a/examples/http/fs/main.zig b/examples/http/fs/main.zig
@@ -7,13 +7,15 @@ pub fn main() !void {
     const host: []const u8 = "0.0.0.0";
     const port: u16 = 9862;
 
-    const allocator = std.heap.page_allocator;
+    var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true }){ .backing_allocator = std.heap.c_allocator };
+    const allocator = gpa.allocator();
+    defer _ = gpa.deinit();
 
     var router = http.Router.init(allocator);
     defer router.deinit();
 
     try router.serve_route("/", http.Route.init().get(struct {
-        pub fn handler_fn(_: http.Request, response: *http.Response, _: http.Context) void {
+        pub fn handler_fn(ctx: *http.Context) void {
             const body =
                 \\ <!DOCTYPE html>
                 \\ <html>
@@ -23,17 +25,35 @@ pub fn main() !void {
                 \\ </html>
             ;
 
-            response.set(.{
+            ctx.respond(.{
                 .status = .OK,
                 .mime = http.Mime.HTML,
                 .body = body[0..],
             });
         }
     }.handler_fn));
 
+    try router.serve_route("/kill", http.Route.init().get(struct {
+        pub fn handler_fn(ctx: *http.Context) void {
+            ctx.runtime.stop();
+
+            ctx.respond(.{
+                .status = .OK,
+                .mime = http.Mime.HTML,
+                .body = "",
+            });
+        }
+    }.handler_fn));
+
     try router.serve_fs_dir("/static", "./examples/http/fs/static");
 
-    var server = http.Server(.plain, .auto).init(.{ .allocator = allocator });
+    var server = http.Server(.plain, .auto).init(.{
+        .allocator = allocator,
+        .threading = .auto,
+        .size_connections_max = 256,
+    });
+    defer server.deinit();
+
     try server.bind(host, port);
     try server.listen(.{ .router = &router });
 }
diff --git a/src/core/lib.zig b/src/core/lib.zig
@@ -1,3 +1,2 @@
 pub const Job = @import("job.zig").Job;
 pub const Pseudoslice = @import("pseudoslice.zig").Pseudoslice;
-pub const Server = @import("server.zig").Server;