From da8156a7d4e79f9d1bca06ce88253af2681f9bd4 Mon Sep 17 00:00:00 2001 From: Lukas Lalinsky Date: Mon, 16 Nov 2026 20:32:08 +0100 Subject: [PATCH] Upgrade dusty to v0.6.0 and zio to v0.20.1 Move the listen address into the new listeners config, start the server with run(), and drop the removed use_tls build option. --- frameworks/dusty-std/build.zig | 1 - frameworks/dusty-std/build.zig.zon | 4 ++-- frameworks/dusty-std/main.zig | 16 ++++++++-------- frameworks/dusty-zio/build.zig | 1 - frameworks/dusty-zio/build.zig.zon | 8 ++++---- frameworks/dusty-zio/main.zig | 16 ++++++++-------- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/frameworks/dusty-std/build.zig b/frameworks/dusty-std/build.zig index eb0e080..38034a5 100644 --- a/frameworks/dusty-std/build.zig +++ b/frameworks/dusty-std/build.zig @@ -25,7 +25,6 @@ pub fn build(b: *std.Build) void { const dusty = b.dependency("dusty", .{ .target = target, .optimize = optimize, - .use_tls = false, }); exe.root_module.addImport("dusty", dusty.module("dusty")); b.installArtifact(exe); diff --git a/frameworks/dusty-std/build.zig.zon b/frameworks/dusty-std/build.zig.zon index 7f2d2ce..694ce67 100644 --- a/frameworks/dusty-std/build.zig.zon +++ b/frameworks/dusty-std/build.zig.zon @@ -5,8 +5,8 @@ .minimum_zig_version = "0.16.0", .dependencies = .{ .dusty = .{ - .url = "git+https://github.com/lalinsky/dusty#v0.3.0", - .hash = "dusty-0.3.0-Qdw7RuMmIADEfIvweBs3lT1-8DL2W0iR4V3PlYrkeiX2", + .url = "git+https://github.com/lalinsky/dusty?ref=v0.6.0#102b0c76eee2ed9c0ea3fff199473a7d731eb258", + .hash = "dusty-0.6.0-Qdw7RhVxJgA6uMKSP4-Ll-7uj8fkY7BJQ9VcRFMAFVk0", }, }, .paths = .{ diff --git a/frameworks/dusty-std/main.zig b/frameworks/dusty-std/main.zig index 0418bcb..03ea92b 100644 --- a/frameworks/dusty-std/main.zig +++ b/frameworks/dusty-std/main.zig @@ -9,12 +9,15 @@ pub fn main(init: std.process.Init) !void { }); defer threaded.deinit(); + const listeners = [_]http.Listener{.{ + .address = .{ .ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port) }, + .reuse_address = true, + .kernel_backlog = shared_mod.connection_count, + }}; + var server = http.Server(void).init(init.gpa, threaded.io(), .{ .max_connections = shared_mod.connection_count, - .listen = .{ - .reuse_address = true, - .kernel_backlog = shared_mod.connection_count, - }, + .listeners = &listeners, .timeout = .{ .request = null, .keepalive = null, @@ -27,11 +30,8 @@ pub fn main(init: std.process.Init) !void { server.router.get("/api/users", users); server.router.get("/api/users/:id", user); - const addr: http.Address = .{ - .ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port), - }; std.debug.print("Started on port {d}\n", .{shared_mod.port}); - try server.listen(addr); + try server.run(); } fn root(_: *http.Request, res: *http.Response) !void { diff --git a/frameworks/dusty-zio/build.zig b/frameworks/dusty-zio/build.zig index 7c3b3f1..ecb582a 100644 --- a/frameworks/dusty-zio/build.zig +++ b/frameworks/dusty-zio/build.zig @@ -29,7 +29,6 @@ pub fn build(b: *std.Build) void { const dusty_dep = b.dependency("dusty", .{ .target = target, .optimize = optimize, - .use_tls = false, }); // Prefer zio's AutoCancel timeouts over dusty's portable std.Io stub. const dusty_mod = dusty_dep.module("dusty"); diff --git a/frameworks/dusty-zio/build.zig.zon b/frameworks/dusty-zio/build.zig.zon index 819b6d7..846a830 100644 --- a/frameworks/dusty-zio/build.zig.zon +++ b/frameworks/dusty-zio/build.zig.zon @@ -5,12 +5,12 @@ .minimum_zig_version = "0.16.0", .dependencies = .{ .dusty = .{ - .url = "git+https://github.com/lalinsky/dusty#v0.3.0", - .hash = "dusty-0.3.0-Qdw7RuMmIADEfIvweBs3lT1-8DL2W0iR4V3PlYrkeiX2", + .url = "git+https://github.com/lalinsky/dusty?ref=v0.6.0#102b0c76eee2ed9c0ea3fff199473a7d731eb258", + .hash = "dusty-0.6.0-Qdw7RhVxJgA6uMKSP4-Ll-7uj8fkY7BJQ9VcRFMAFVk0", }, .zio = .{ - .url = "git+https://github.com/lalinsky/zio#417757935ef6d0f0a2396d4023a44ca82ac1901c", - .hash = "zio-0.18.0-xHbVVELgKQAU2hnwYL9MA0iXUydUZYlBfXxOUUM6v_Uv", + .url = "git+https://github.com/lalinsky/zio?ref=v0.20.1#c0a6b5877c9bbc71d2d2c0b3374ce7fa61a4ec12", + .hash = "zio-0.20.1-xHbVVI0wLwDgE2dXWDCWH0UfCQYEhnBYHs1Td12oAGeR", }, }, .paths = .{ diff --git a/frameworks/dusty-zio/main.zig b/frameworks/dusty-zio/main.zig index 163c11e..545a9e7 100644 --- a/frameworks/dusty-zio/main.zig +++ b/frameworks/dusty-zio/main.zig @@ -9,12 +9,15 @@ pub fn main(init: std.process.Init) !void { }); defer rt.deinit(); + const listeners = [_]http.Listener{.{ + .address = .{ .ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port) }, + .reuse_address = true, + .kernel_backlog = shared_mod.connection_count, + }}; + var server = http.Server(void).init(init.gpa, rt.io(), .{ .max_connections = shared_mod.connection_count, - .listen = .{ - .reuse_address = true, - .kernel_backlog = shared_mod.connection_count, - }, + .listeners = &listeners, .timeout = .{ .request = null, .keepalive = null, @@ -27,11 +30,8 @@ pub fn main(init: std.process.Init) !void { server.router.get("/api/users", users); server.router.get("/api/users/:id", user); - const addr: http.Address = .{ - .ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port), - }; std.debug.print("Started on port {d} (zio, {d} threads)\n", .{ shared_mod.port, shared_mod.thread_count }); - try server.listen(addr); + try server.run(); } fn root(_: *http.Request, res: *http.Response) !void {