update to zig master and give up

.gitignore

@@ -9,7 +9,7 @@
 # Cheers!
 # -andrewrk
 
-zig-cache/
+.zig-cache/
 zig-out/
 /release/
 /debug/

build.zig

@@ -6,7 +6,7 @@ pub fn build(b: *std.Build) void {
 
     const exe = b.addExecutable(.{
         .name = "master",
-        .root_source_file = .{ .path = "src/main.zig" },
+        .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -21,7 +21,7 @@ pub fn build(b: *std.Build) void {
     run_step.dependOn(&run_cmd.step);
 
     const exe_unit_tests = b.addTest(.{
-        .root_source_file = .{ .path = "src/main.zig" },
+        .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
     });

flake.lock

@@ -0,0 +1,78 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1726108120,
+        "narHash": "sha256-Ji5wO1lLG99grI0qCRb6FyRPpH9tfdfD1QP/r7IlgfM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "111ed8812c10d7dc3017de46cbf509600c93f551",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "zig2nix": "zig2nix"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "zig2nix": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1728437366,
+        "narHash": "sha256-zZF5drwqCC41UpQddNKC6nhAmE2DcON61th+xf1k6n8=",
+        "owner": "Cloudef",
+        "repo": "zig2nix",
+        "rev": "8231ceb8258475093336cac0e8706baf0d634037",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Cloudef",
+        "repo": "zig2nix",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

src/application.zig

@@ -62,7 +62,7 @@ pub fn Application(comptime Context: type) type {
                 var event = Event{
                     .ctx = &ctx,
                     .req = .{
-                        .uri = try std.Uri.parseWithoutScheme(req.head.target),
+                        .uri = try std.Uri.parseAfterScheme("http://", req.head.target),
                         .headers = std.ArrayList(*const http.Header).init(allocator),
                     },
                     .res = .{
@@ -126,7 +126,7 @@ pub fn Router(comptime Context: type) type {
         root_node: *Node,
         // static_routes: std.StringHashMap(*Node),
 
-        pub fn init(allocator: mem.Allocator, root_ctx: Context) Router {
+        pub fn init(allocator: mem.Allocator, root_ctx: Context) Self {
             var arena = heap.ArenaAllocator.init(allocator);
             var node = Node.init(arena.allocator()) catch @panic("OOM");
             node.data = root_ctx;
@@ -139,19 +139,19 @@ pub fn Router(comptime Context: type) type {
             };
         }
 
-        pub fn deinit(self: *Router) void {
+        pub fn deinit(self: *Self) void {
             self.root_node.deinit(self.arena.allocator(), null);
             self.arena.deinit();
             // self.static_routes.deinit();
         }
 
-        // pub fn handle(self: *Router, event: *Listener.Event) !void {
-        //     const route = try self.getRoute(event.req.uri.path);
-        //     try route.handler(event);
-        // }
+        pub fn handle(self: *Router, ctx: *Context) !void {
+            const route = try self.getRoute(ctx.req.uri.path);
+            try route.handler(ctx);
+        }
 
         /// Insert a route if the path is not already present, otherwise overwrite preexisting HandlerFn.
-        pub fn putRoute(self: *Router, path: []const u8, ctx: Context) !void {
+        pub fn putRoute(self: *Self, path: []const u8, ctx: Context) !void {
             std.debug.print("\npath {s}\n", .{path});
             // var is_static_route = true;
             var sections = mem.splitScalar(u8, path, '/');
@@ -216,7 +216,7 @@ pub fn Router(comptime Context: type) type {
         }
 
         /// Get the HandlerFn associated with path, otherwise get root_handler.
-        pub fn getRoute(self: *Router, path: []const u8) !*Node {
+        pub fn getRoute(self: *Self, path: []const u8) !*Node {
             // if (self.static_routes.get(path)) |rt| return rt;
             std.debug.print("\nget path {s}\n", .{path});
 
@@ -277,7 +277,7 @@ pub fn Router(comptime Context: type) type {
         }
 
         /// If there is a route with a matching path, it is deleted from the router, and this function return true. Otherwise it returns false.
-        pub fn removeRoute(self: *Router, path: []const u8) bool {
+        pub fn removeRoute(self: *Self, path: []const u8) bool {
             // _ = self.static_routes.remove(path);
             std.debug.print("\nremoving path {s}\n", .{path});
 
@@ -351,6 +351,8 @@ pub fn Router(comptime Context: type) type {
                 allocator.destroy(self);
             }
         };
+
+        const Self = @This();
     };
 }
 

src/main.zig

@@ -11,23 +11,27 @@ pub fn main() !void {
     defer _ = gpa.deinit();
     const allocator = gpa.allocator();
 
+    var router = Router.init(allocator, handleError);
+    defer router.deinit();
+
+    try router.putRoute("/", &handle);
+    // try listener.router.putRoute("/error", &handleError);
+    // try listener.router.putRoute("//pee", &handleError);
+    // try listener.router.putRoute("/error/*", &handleError);
+
     const address = try net.Address.parseIp("0.0.0.0", 8080);
     var listener = App.init(.{
         .address = address,
         .allocator = allocator,
-        .root_handler = &handleError,
+        // .root_handler = ,
     });
     defer listener.deinit();
 
-    // try listener.router.putRoute("/", &handle);
-    // try listener.router.putRoute("/error", &handleError);
-    // try listener.router.putRoute("//pee", &handleError);
-    // try listener.router.putRoute("/error/*", &handleError);
-
     try listener.listen();
 }
 
 const App = Application(DummyContext);
+const Router = @import("application.zig").Router(App.HandlerFn);
 const DummyContext = struct {};
 
 fn handle(event: *App.Event) anyerror!void {