From 102a6a0307135ca0ec7afbfcd17ea3d1738ec8bf Mon Sep 17 00:00:00 2001 From: Michal Skorczak Date: Fri, 28 Mar 2025 16:38:07 +0000 Subject: [PATCH] Adding in homepage, zig setup --- homepage.html | 7 +++ homepage/build.zig | 124 +++++++++++++++++++++++++++++++++++++++++ homepage/build.zig.zon | 52 +++++++++++++++++ homepage/src/main.zig | 77 +++++++++++++++++++++++++ zig/setup_zig.sh | 13 +++++ 5 files changed, 273 insertions(+) create mode 100644 homepage.html create mode 100644 homepage/build.zig create mode 100644 homepage/build.zig.zon create mode 100644 homepage/src/main.zig create mode 100755 zig/setup_zig.sh diff --git a/homepage.html b/homepage.html new file mode 100644 index 0000000..ebef1cc --- /dev/null +++ b/homepage.html @@ -0,0 +1,7 @@ + + +
+ +

This is the new homepage

+ + diff --git a/homepage/build.zig b/homepage/build.zig new file mode 100644 index 0000000..634fd99 --- /dev/null +++ b/homepage/build.zig @@ -0,0 +1,124 @@ +const std = @import("std"); + +// 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(.{}); + + // 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(.{}); + + // This creates a "module", which represents a collection of source files alongside + // some compilation options, such as optimization mode and linked system libraries. + // Every executable or library we compile will be based on one or more modules. + // const lib_mod = b.createModule(.{ + // // `root_source_file` is the Zig "entry point" of the module. If a module + // // only contains e.g. external object files, you can make this `null`. + // // 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 = b.path("src/root.zig"), + // .target = target, + // .optimize = optimize, + // }); + + // We will also create a module for our other entry point, 'main.zig'. + const exe_mod = b.createModule(.{ + // `root_source_file` is the Zig "entry point" of the module. If a module + // only contains e.g. external object files, you can make this `null`. + // 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 = b.path("src/main.zig"), + .target = target, + .optimize = optimize, + }); + + // Modules can depend on one another using the `std.Build.Module.addImport` function. + // This is what allows Zig source code to use `@import("foo")` where 'foo' is not a + // file path. In this case, we set up `exe_mod` to import `lib_mod`. + // exe_mod.addImport("homepage_lib", lib_mod); + + // Now, we will create a static library based on the module we created above. + // This creates a `std.Build.Step.Compile`, which is the build step responsible + // for actually invoking the compiler. + // const lib = b.addLibrary(.{ + // .linkage = .static, + // .name = "homepage", + // .root_module = lib_mod, + // }); + + // This declares intent for the library to be installed into the standard + // location when the user invokes the "install" step (the default step when + // running `zig build`). + // b.installArtifact(lib); + + // This creates another `std.Build.Step.Compile`, but this one builds an executable + // rather than a static library. + const exe = b.addExecutable(.{ + .name = "homepage", + .root_module = exe_mod, + }); + + // 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`). + b.installArtifact(exe); + + const zap = b.dependency("zap", .{ + .target = target, + .optimize = optimize, + .openssl = false, // set to true to enable TLS support + }); + + exe.root_module.addImport("zap", zap.module("zap")); + + // This *creates* a Run step 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 = b.addRunArtifact(exe); + + // 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. This only builds the test executable + // but does not run it. + // const lib_unit_tests = b.addTest(.{ + // .root_module = lib_mod, + // }); + + //const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests); + + const exe_unit_tests = b.addTest(.{ + .root_module = exe_mod, + }); + + const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests); + + // 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(&run_lib_unit_tests.step); + test_step.dependOn(&run_exe_unit_tests.step); +} diff --git a/homepage/build.zig.zon b/homepage/build.zig.zon new file mode 100644 index 0000000..c3ca478 --- /dev/null +++ b/homepage/build.zig.zon @@ -0,0 +1,52 @@ +.{ + // This is the default name used by packages depending on this one. For + // example, when a user runs `zig fetch --save `, this field is used + // as the key in the `dependencies` table. Although the user can choose a + // different name, most users will stick with this provided value. + // + // It is redundant to include "zig" in this name because it is already + // within the Zig package namespace. + .name = .homepage, + + // This is a [Semantic Version](https://semver.org/). + // In a future version of Zig it will be used for package deduplication. + .version = "0.0.0", + + // Together with name, this represents a globally unique package + // identifier. This field is generated by the Zig toolchain when the + // package is first created, and then *never changes*. This allows + // unambiguous detection of one package being an updated version of + // another. + // + // When forking a Zig project, this id should be regenerated (delete the + // field and run `zig build`) if the upstream project is still maintained. + // Otherwise, the fork is *hostile*, attempting to take control over the + // original project's identity. Thus it is recommended to leave the comment + // on the following line intact, so that it shows up in code reviews that + // modify the field. + .fingerprint = 0xcb24d5ee73a6a8a9, // Changing this has security and trust implications. + + // Tracks the earliest Zig version that the package considers to be a + // supported use case. + .minimum_zig_version = "0.15.0-dev.132+263ba3461", + + // This field is optional. + // Each dependency must either provide a `url` and `hash`, or a `path`. + // `zig build --fetch` can be used to fetch all dependencies of a package, recursively. + // Once all dependencies are fetched, `zig build` no longer requires + // internet connectivity. + .dependencies = .{ + .zap = .{ + .url = "git+https://github.com/zigzap/zap?ref=v0.9.1#ae5c9278335d8e1133cd6d22707323dda712e120", + .hash = "zap-0.8.0-AAAAAHquIwACI9dqts0y91vC4xRjsLQpu1srb6TOj2je", + }, + }, + .paths = .{ + "build.zig", + "build.zig.zon", + "src", + // For example... + //"LICENSE", + //"README.md", + }, +} diff --git a/homepage/src/main.zig b/homepage/src/main.zig new file mode 100644 index 0000000..77e83fc --- /dev/null +++ b/homepage/src/main.zig @@ -0,0 +1,77 @@ +////! By convention, main.zig is where your main function lives in the case that +////! you are building an executable. If you are making a library, the convention +////! is to delete this file and start with root.zig instead. + +//pub fn main() !void { +// // Prints to stderr (it's a shortcut based on `std.io.getStdErr()`) +// std.debug.print("All your {s} are belong to us.\n", .{"codebase"}); + +// // stdout is for the actual output of your application, for example if you +// // are implementing gzip, then only the compressed bytes should be sent to +// // stdout, not any debugging messages. +// const stdout_file = std.io.getStdOut().writer(); +// var bw = std.io.bufferedWriter(stdout_file); +// const stdout = bw.writer(); + +// try stdout.print("Run `zig build test` to run the tests.\n", .{}); + +// try bw.flush(); // Don't forget to flush! +//} + +//test "simple test" { +// var list = std.ArrayList(i32).init(std.testing.allocator); +// defer list.deinit(); // Try commenting this out and see if zig detects the memory leak! +// try list.append(42); +// try std.testing.expectEqual(@as(i32, 42), list.pop()); +//} + +//test "use other module" { +// try std.testing.expectEqual(@as(i32, 150), lib.add(100, 50)); +//} + +//test "fuzz example" { +// const Context = struct { +// fn testOne(context: @This(), input: []const u8) anyerror!void { +// _ = context; +// // Try passing `--fuzz` to `zig build test` and see if it manages to fail this test case! +// try std.testing.expect(!std.mem.eql(u8, "canyoufindme", input)); +// } +// }; +// try std.testing.fuzz(Context{}, Context.testOne, .{}); +//} + +//const std = @import("std"); + +///// This imports the separate module containing `root.zig`. Take a look in `build.zig` for details. +//const lib = @import("homepage_lib"); + +const std = @import("std"); +const zap = @import("zap"); + +fn on_request(r: zap.Request) void { + if (r.path) |the_path| { + std.debug.print("PATH: {s}\n", .{the_path}); + } + + if (r.query) |the_query| { + std.debug.print("QUERY: {s}\n", .{the_query}); + } + r.sendBody("

Hello from ZAP!!!

") catch return; +} + +pub fn main() !void { + var listener = zap.HttpListener.init(.{ + .port = 3000, + .on_request = on_request, + .log = true, + }); + try listener.listen(); + + std.debug.print("Listening on 0.0.0.0:3000\n", .{}); + + // start worker threads + zap.start(.{ + .threads = 2, + .workers = 2, + }); +} diff --git a/zig/setup_zig.sh b/zig/setup_zig.sh new file mode 100755 index 0000000..60a0eac --- /dev/null +++ b/zig/setup_zig.sh @@ -0,0 +1,13 @@ +#!/bin/sh +echo "Requires curl, jq, wget and tar." +OS=$(uname -s | tr '[:upper:]' '[:lower:]') + +if [ "$OS" = "linux" ]; then + OS="x86_64-linux" +elif [ "$OS" = "darwin" ]; then + OS="x86_64-macos" +elif [ "$OS" = "mingw64_nt" ] || [ "$OS" = "cygwin" ]; then + OS="x86_64-windows" +fi +curl https://ziglang.org/download/index.json | jq -r ".master.[\"$OS\"].tarball" | wget -O zig-master.tar.xz -i - +tar xvf ./zig-master.tar.xz