diff --git a/build.zig b/build.zig index 83d5d94..2015235 100644 --- a/build.zig +++ b/build.zig @@ -1,17 +1,67 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) void { - // Standard release options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. - const mode = b.standardReleaseOptions(); +// Although this function looks imperative, note that its job is to +// declaratively construct a build graph that will be executed by an external +// runner. +pub fn build(b: *std.Build) void { + // Standard target options allows the person running `zig build` to choose + // what target to build for. Here we do not override the defaults, which + // means any target is allowed, and the default is native. Other options + // for restricting supported target set are available. + const target = b.standardTargetOptions(.{}); - const lib = b.addStaticLibrary("zeam", "src/main.zig"); - lib.setBuildMode(mode); - lib.install(); + // Standard optimization options allow the person running `zig build` to select + // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not + // set a preferred release mode, allowing the user to decide how to optimize. + const optimize = b.standardOptimizeOption(.{}); - const main_tests = b.addTest("src/main.zig"); - main_tests.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "zerve", + // In this case the main source file is merely a path, however, in more + // complicated build scripts, this could be a generated file. + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); - const test_step = b.step("test", "Run library tests"); - test_step.dependOn(&main_tests.step); + // This declares intent for the executable to be installed into the + // standard location when the user invokes the "install" step (the default + // step when running `zig build`). + exe.install(); + + // This *creates* a RunStep in the build graph, to be executed when another + // step is evaluated that depends on it. The next line below will establish + // such a dependency. + const run_cmd = exe.run(); + + // By making the run step depend on the install step, it will be run from the + // installation directory rather than directly from within the cache directory. + // This is not necessary, however, if the application depends on other installed + // files, this ensures they will be present and in the expected location. + run_cmd.step.dependOn(b.getInstallStep()); + + // This allows the user to pass arguments to the application in the build + // command itself, like this: `zig build run -- arg1 arg2 etc` + if (b.args) |args| { + run_cmd.addArgs(args); + } + + // This creates a build step. It will be visible in the `zig build --help` menu, + // and can be selected like this: `zig build run` + // This will evaluate the `run` step rather than the default, which is "install". + const run_step = b.step("run", "Run the app"); + run_step.dependOn(&run_cmd.step); + + // Creates a step for unit testing. + const exe_tests = b.addTest(.{ + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); + + // Similar to creating the run step earlier, this exposes a `test` step to + // the `zig build --help` menu, providing a way for the user to request + // running the unit tests. + const test_step = b.step("test", "Run unit tests"); + test_step.dependOn(&exe_tests.step); } diff --git a/src/main.zig b/src/main.zig index 62342e2..2e70d34 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,43 +1,13 @@ const std = @import("std"); -const allocator = std.heap.page_allocator; +const zrv = @import("zerve.zig"); pub fn main() !void { + var rt = [_]zrv.Route{.{ "/", index }}; - // Init server - const server_options: std.net.StreamServer.Options = .{}; - var server = std.net.StreamServer.init(server_options); - defer server.deinit(); - const addr = try std.net.Address.parseIp("0.0.0.0", 8080); - - while (true) { - server.listen(addr) catch { - server.close(); - continue; - }; - break; - } - - // Handling connections - while (true) { - const conn = if (server.accept()) |conn| conn else |_| continue; - defer conn.stream.close(); - - var buffer = std.ArrayList(u8).init(allocator); - defer buffer.deinit(); - - var chunk_buf: [4096]u8 = undefined; - // Collect max 4096 bytes of data from the stream into the chunk_buf. Then add it - // to the ArrayList. Repeat this until request stream ends by counting the appearence - // of "\r\n" - while (true) { - _ = try conn.stream.read(chunk_buf[0..]); - try buffer.appendSlice(chunk_buf[0..]); - if (std.mem.containsAtLeast(u8, buffer.items, 2, "\r\n")) break; - } - std.debug.print("Data sent by the client:\n{s}\n", .{buffer.items}); - // Creating Response - _ = try conn.stream.write("HTTP/1.1 200 OK\r\n"); - _ = try conn.stream.write("Content-Type: text/html\r\n\r\n"); - _ = try conn.stream.write("