Update httpz to Zig 0.15.2 (#10299)

* update httpz to zig 0.15.2

* Update Zig installation method in Dockerfile

Replace curl with wget for downloading Zig and adjust installation paths.

* Replace curl with wget in Dockerfile

* Fix tar extraction and move commands in Dockerfile

* Fix URL format for Zig download in Dockerfile

* fix compile error

Author: Kayden1412

frameworks/Zig/httpz/build.zig

@@ -6,16 +6,20 @@ pub fn build(b: *std.Build) !void {
 
     const dep_opts = .{ .target = target, .optimize = optimize };
 
-    const exe = b.addExecutable(.{
-        .name = "httpz",
-        .root_source_file = b.path("src/main.zig"),
+    const root_module = b.addModule("root_mod", .{
         .target = target,
         .optimize = optimize,
+        .root_source_file = b.path("src/main.zig"),
     });
 
     const httpz_module = b.dependency("httpz", dep_opts).module("httpz");
     const pg_module = b.dependency("pg", dep_opts).module("pg");
-    const datetimez_module = b.dependency("datetimez", dep_opts).module("zig-datetime");
+    const datetimez_module = b.dependency("datetimez", dep_opts).module("datetime");
+
+    const exe = b.addExecutable(.{
+        .name = "httpz",
+        .root_module = root_module,
+    });
 
     exe.root_module.addImport("httpz", httpz_module);
     exe.root_module.addImport("pg", pg_module);

frameworks/Zig/httpz/build.zig.zon

@@ -1,15 +1,24 @@
-.{ .name = "Zap testing", .version = "0.1.1", .paths = .{
-    "build.zig",
-    "build.zig.zon",
-    "src",
-}, .dependencies = .{
-    .pg = .{ .url = "https://github.com/karlseguin/pg.zig/archive/239a4468163a49d8c0d03285632eabe96003e9e2.tar.gz", .hash = "1220a1d7e51e2fa45e547c76a9e099c09d06e14b0b9bfc6baa89367f56f1ded399a0" },
-    .httpz = .{
-        .url = "git+https://github.com/karlseguin/http.zig?ref=zig-0.13#7d2ddae87af9b110783085c0ea6b03985faa4584",
-        .hash = "12208c1f2c5f730c4c03aabeb0632ade7e21914af03e6510311b449458198d0835d6",
+.{
+    .name = .httpz_testing,
+    .fingerprint = 0x586e7c8a23a7e7c2,
+    .version = "0.1.1",
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
     },
-    .datetimez = .{
-        .url = "git+https://github.com/frmdstryr/zig-datetime#70aebf28fb3e137cd84123a9349d157a74708721",
-        .hash = "122077215ce36e125a490e59ec1748ffd4f6ba00d4d14f7308978e5360711d72d77f",
+    .dependencies = .{
+        .pg = .{
+            .url = "git+https://github.com/karlseguin/pg.zig.git#f8d4892387fbad2abdf775783e101e50a7114335",
+            .hash = "pg-0.0.0-Wp_7gag6BgD_QAZrPhNNEGpnUZR_LEkKT40Ura3p-4yX",
+        },
+        .httpz = .{
+            .url = "git+https://github.com/karlseguin/http.zig.git#a4477b1dbdc5b820fd4ad301797ca6399f7eb6e4",
+            .hash = "httpz-0.0.0-PNVzrBgtBwCVkSJyophIX6WHwDR0r8XhBGQr96Kk-1El",
+        },
+        .datetimez = .{
+            .url = "git+https://github.com/frmdstryr/zig-datetime.git#3a39a21e6e34dcb0ade0ff828d0914d40ba535f3",
+            .hash = "datetime-0.8.0-cJNXzP_YAQBxQ5hkNNP6ScnG5XsqciJmeP5RVV4xwCBA",
+        },
     },
-} }
+}

frameworks/Zig/httpz/httpz.dockerfile

@@ -12,17 +12,19 @@ COPY src src
 COPY build.zig.zon build.zig.zon
 COPY build.zig build.zig
 
-ARG ZIG_VER=0.13.0
+ARG ZIG_VER=0.15.2
 
-RUN apt-get update && apt-get install -y curl xz-utils ca-certificates
+RUN apt-get update && apt-get install -y wget xz-utils ca-certificates
 
-RUN curl https://ziglang.org/download/${ZIG_VER}/zig-linux-$(uname -m)-${ZIG_VER}.tar.xz -o zig-linux.tar.xz && \
-    tar xf zig-linux.tar.xz && \
-    mv zig-linux-$(uname -m)-${ZIG_VER}/ /opt/zig
+RUN wget https://ziglang.org/download/${ZIG_VER}/zig-$(uname -m)-linux-${ZIG_VER}.tar.xz
 
-RUN /opt/zig/zig build -Doptimize=ReleaseFast
+RUN tar -xvf zig-$(uname -m)-linux-${ZIG_VER}.tar.xz
+
+RUN mv zig-$(uname -m)-linux-${ZIG_VER} /usr/local/zig 
+
+ENV PATH="/usr/local/zig:$PATH"
+RUN zig build -Doptimize=ReleaseFast
 
 EXPOSE 3000
-RUN ls 
 
 CMD ["zig-out/bin/httpz"]

frameworks/Zig/httpz/src/endpoints.zig

@@ -3,11 +3,11 @@ const httpz = @import("httpz");
 const pg = @import("pg");
 const datetimez = @import("datetimez");
 
-pub var date_str: []u8 = "";
+pub var date_str: [29]u8 = undefined;
 
 pub const Global = struct {
     pool: *pg.Pool,
-    rand: *std.rand.Random,
+    rand: *std.Random,
 };
 
 const World = struct {
@@ -70,17 +70,7 @@ fn getWorld(pool: *pg.Pool, random_number: u32) !World {
 fn setHeaders(allocator: std.mem.Allocator, res: *httpz.Response) !void {
     res.header("Server", "Httpz");
 
-    //const now = datetimez.datetime.Date.now();
-    //const time = datetimez.datetime.Time.now();
-
-    // Wed, 17 Apr 2013 12:00:00 GMT
-    // Return date in ISO format YYYY-MM-DD
-    //const TB_DATE_FMT = "{s:0>3}, {d:0>2} {s:0>3} {d:0>4} {d:0>2}:{d:0>2}:{d:0>2} GMT";
-    //const now_str = try std.fmt.allocPrint(allocator, TB_DATE_FMT, .{ now.weekdayName()[0..3], now.day, now.monthName()[0..3], now.year, time.hour, time.minute, time.second });
-
-    //defer allocator.free(now_str);
-
-    res.header("Date", try allocator.dupe(u8, date_str));
+    res.header("Date", try allocator.dupe(u8, &date_str));
 }
 
 fn getFortunesHtml(allocator: std.mem.Allocator, pool: *pg.Pool) ![]const u8 {

frameworks/Zig/httpz/src/main.zig

@@ -7,38 +7,40 @@ const pool = @import("pool.zig");
 
 const endpoints = @import("endpoints.zig");
 
-var server: httpz.ServerCtx(*endpoints.Global, *endpoints.Global) = undefined;
+var server: httpz.Server(*endpoints.Global) = undefined;
 
 pub fn main() !void {
     const cpu_count = try std.Thread.getCpuCount();
     var gpa = std.heap.GeneralPurposeAllocator(.{
         .thread_safe = true,
     }){};
+    defer {
+        if (builtin.mode == .Debug) _ = gpa.deinit();
+    }
 
-    const allocator = gpa.allocator();
+    const allocator = if (builtin.mode == .Debug) gpa.allocator() else std.heap.smp_allocator;
 
     var pg_pool = try pool.initPool(allocator);
     defer pg_pool.deinit();
 
     const date_thread = try std.Thread.spawn(.{}, struct {
         fn update() !void {
-            const ally = std.heap.page_allocator;
             while (true) {
                 const now = datetimez.datetime.Date.now();
                 const time = datetimez.datetime.Time.now();
 
                 // Wed, 17 Apr 2013 12:00:00 GMT
                 // Return date in ISO format YYYY-MM-DD
                 const TB_DATE_FMT = "{s:0>3}, {d:0>2} {s:0>3} {d:0>4} {d:0>2}:{d:0>2}:{d:0>2} GMT";
-                endpoints.date_str = try std.fmt.allocPrint(ally, TB_DATE_FMT, .{ now.weekdayName()[0..3], now.day, now.monthName()[0..3], now.year, time.hour, time.minute, time.second });
-                std.time.sleep(std.time.ns_per_ms * 980);
+                _ = try std.fmt.bufPrint(&endpoints.date_str, TB_DATE_FMT, .{ now.weekdayName()[0..3], now.day, now.monthName()[0..3], now.year, time.hour, time.minute, time.second });
+                std.Thread.sleep(std.time.ns_per_ms * 980);
             }
         }
     }.update, .{});
 
     date_thread.detach();
 
-    var prng = std.rand.DefaultPrng.init(@as(u64, @bitCast(std.time.milliTimestamp())));
+    var prng: std.Random.DefaultPrng = .init(@as(u64, @bitCast(std.time.milliTimestamp())));
 
     var rand = prng.random();
 
@@ -50,7 +52,7 @@ pub fn main() !void {
     const port: u16 = 3000;
     const workers = @as(u16, @intCast(16 * cpu_count));
 
-    server = try httpz.ServerApp(*endpoints.Global).init(allocator, .{
+    server = try httpz.Server(*endpoints.Global).init(allocator, .{
         .port = port,
         .address = "0.0.0.0",
         .workers = .{
@@ -118,24 +120,24 @@ pub fn main() !void {
     defer server.deinit();
 
     // now that our server is up, we register our intent to handle SIGINT
-    try std.posix.sigaction(std.posix.SIG.INT, &.{
+    std.posix.sigaction(std.posix.SIG.INT, &.{
         .handler = .{ .handler = shutdown },
-        .mask = std.posix.empty_sigset,
+        .mask = std.posix.sigemptyset(),
         .flags = 0,
     }, null);
 
-    var router = server.router();
-    router.get("/json", endpoints.json);
-    router.get("/plaintext", endpoints.plaintext);
-    router.get("/db", endpoints.db);
-    router.get("/fortunes", endpoints.fortune);
+    var router = try server.router(.{});
+    router.get("/json", endpoints.json, .{});
+    router.get("/plaintext", endpoints.plaintext, .{});
+    router.get("/db", endpoints.db, .{});
+    router.get("/fortunes", endpoints.fortune, .{});
 
     std.debug.print("Httpz using {d} workers listening at 0.0.0.0:{d}\n", .{ workers, port });
 
     try server.listen();
 }
 
-fn shutdown(_: c_int) callconv(.C) void {
+fn shutdown(_: c_int) callconv(.c) void {
     server.stop();
 }
 

frameworks/Zig/httpz/src/pool.zig

@@ -1,14 +1,11 @@
 const std = @import("std");
-const regex = @import("regex");
 const pg = @import("pg");
 
 const Allocator = std.mem.Allocator;
 const Pool = pg.Pool;
-const ArrayList = std.ArrayList;
 
 pub fn initPool(allocator: Allocator) !*pg.Pool {
     const info = try parsePostgresConnStr(allocator);
-    //std.debug.print("Connection: {s}:{s}@{s}:{d}/{s}\n", .{ info.username, info.password, info.hostname, info.port, info.database });
 
     const pg_pool = try Pool.init(allocator, .{
         .size = 56,