From bd9829f6842f0c989389aa4ce9784ab6e3cb4ee5 Mon Sep 17 00:00:00 2001
From: Robby Zambito <contact@robbyzambito.me>
Date: Sat, 3 Jan 2026 05:33:13 +0000
Subject: Organize things

Making it easier to use the server as a library
---
 src/server/main.zig | 329 ++++------------------------------------------------
 1 file changed, 22 insertions(+), 307 deletions(-)

(limited to 'src/server/main.zig')

diff --git a/src/server/main.zig b/src/server/main.zig
index 4e47c10..1aaf572 100644
--- a/src/server/main.zig
+++ b/src/server/main.zig
@@ -1,48 +1,32 @@
 const std = @import("std");
-const builtin = @import("builtin");
-const Message = @import("./message_parser.zig").Message;
-pub const ServerInfo = Message.ServerInfo;
+const Allocator = std.mem.Allocator;
+const AtomicValue = std.atomic.Value;
+const DebugAllocator = std.heap.DebugAllocator;
+const Sigaction = std.posix.Sigaction;
 
-const Client = @import("./client.zig");
-const Server = @This();
+const Io = std.Io;
+const Threaded = Io.Threaded;
 
-const Subscription = struct {
-    subject: []const u8,
-    client_id: usize,
-    sid: []const u8,
+const builtin = @import("builtin");
 
-    fn deinit(self: Subscription, alloc: std.mem.Allocator) void {
-        alloc.free(self.subject);
-        alloc.free(self.sid);
-    }
-};
+const zits = @import("zits");
+const Message = zits.Server.Message;
+const ServerInfo = Message.ServerInfo;
 
-info: ServerInfo,
-clients: std.AutoHashMapUnmanaged(usize, *Client) = .empty,
+const Server = zits.Server;
 
-subs_lock: std.Io.Mutex = .init,
-subscriptions: std.ArrayList(Subscription) = .empty,
+const safe_build = builtin.mode == .Debug or builtin.mode == .ReleaseSafe;
 
-var keep_running = std.atomic.Value(bool).init(true);
+var keep_running = AtomicValue(bool).init(true);
 
 fn handleSigInt(sig: std.os.linux.SIG) callconv(.c) void {
     _ = sig;
     keep_running.store(false, .monotonic);
 }
 
-pub fn deinit(server: *Server, io: std.Io, alloc: std.mem.Allocator) void {
-    server.subs_lock.lockUncancelable(io);
-    defer server.subs_lock.unlock(io);
-    for (server.subscriptions.items) |sub| {
-        sub.deinit(alloc);
-    }
-    server.subscriptions.deinit(alloc);
-    server.clients.deinit(alloc);
-}
-
-pub fn main(alloc: std.mem.Allocator, server_config: ServerInfo) !void {
+pub fn main(outer_alloc: Allocator, server_config: ServerInfo) !void {
     // Configure the signal action
-    const act = std.posix.Sigaction{
+    const act = Sigaction{
         .handler = .{ .handler = handleSigInt },
         .mask = std.posix.sigemptyset(),
         .flags = 0,
@@ -52,23 +36,24 @@ pub fn main(alloc: std.mem.Allocator, server_config: ServerInfo) !void {
     std.posix.sigaction(std.posix.SIG.INT, &act, null);
 
     {
-        var dba: std.heap.DebugAllocator(.{}) = .init;
-        dba.backing_allocator = alloc;
+        var dba: DebugAllocator(.{}) = .init;
+        dba.backing_allocator = outer_alloc;
         defer _ = dba.deinit();
-        const gpa = if (builtin.mode == .Debug or builtin.mode == .ReleaseSafe) dba.allocator() else alloc;
+        const alloc = if (safe_build) dba.allocator() else outer_alloc;
 
-        var threaded: std.Io.Threaded = .init(gpa, .{});
+        var threaded: Threaded = .init(alloc, .{});
         defer threaded.deinit();
         const io = threaded.io();
 
         var server: Server = .{
             .info = server_config,
         };
-        defer server.deinit(io, gpa);
+        defer server.deinit(io, alloc);
 
-        var server_task = try io.concurrent(start, .{ &server, io, gpa });
+        var server_task = try io.concurrent(Server.start, .{ &server, io, alloc });
         defer server_task.cancel(io) catch {};
 
+        // Block until Ctrl+C
         while (keep_running.load(.monotonic)) {
             try io.sleep(.fromMilliseconds(1), .awake);
         }
@@ -79,273 +64,3 @@ pub fn main(alloc: std.mem.Allocator, server_config: ServerInfo) !void {
     }
     std.log.info("Goodbye", .{});
 }
-
-pub fn start(server: *Server, io: std.Io, gpa: std.mem.Allocator) !void {
-    var tcp_server = try std.Io.net.IpAddress.listen(try std.Io.net.IpAddress.parse(
-        server.info.host,
-        server.info.port,
-    ), io, .{ .reuse_address = true });
-    defer tcp_server.deinit(io);
-    std.log.debug("Server headers: {s}", .{if (server.info.headers) "true" else "false"});
-    std.log.debug("Server max payload: {d}", .{server.info.max_payload});
-    std.log.info("Server ID: {s}", .{server.info.server_id});
-    std.log.info("Server name: {s}", .{server.info.server_name});
-    std.log.info("Server listening on {s}:{d}", .{ server.info.host, server.info.port });
-
-    var client_group: std.Io.Group = .init;
-    defer client_group.cancel(io);
-
-    var id: usize = 0;
-    while (true) : (id +%= 1) {
-        if (server.clients.contains(id)) continue;
-        std.log.debug("Accepting next client", .{});
-        const stream = try tcp_server.accept(io);
-        std.log.debug("Accepted connection {d}", .{id});
-        _ = client_group.concurrent(io, handleConnectionInfallible, .{ server, gpa, io, id, stream }) catch {
-            std.log.err("Could not start concurrent handler for {d}", .{id});
-            stream.close(io);
-        };
-    }
-}
-
-fn addClient(server: *Server, allocator: std.mem.Allocator, id: usize, client: *Client) !void {
-    try server.clients.put(allocator, id, client);
-}
-
-fn removeClient(server: *Server, io: std.Io, allocator: std.mem.Allocator, id: usize) void {
-    server.subs_lock.lockUncancelable(io);
-    defer server.subs_lock.unlock(io);
-    if (server.clients.remove(id)) {
-        const len = server.subscriptions.items.len;
-        for (0..len) |from_end| {
-            const i = len - from_end - 1;
-            const sub = server.subscriptions.items[i];
-            if (sub.client_id == id) {
-                sub.deinit(allocator);
-                _ = server.subscriptions.swapRemove(i);
-            }
-        }
-    }
-}
-
-fn handleConnectionInfallible(
-    server: *Server,
-    server_allocator: std.mem.Allocator,
-    io: std.Io,
-    id: usize,
-    stream: std.Io.net.Stream,
-) void {
-    handleConnection(server, server_allocator, io, id, stream) catch |err| {
-        std.log.err("Failed processing client {d}: {any}", .{ id, err });
-    };
-}
-
-fn handleConnection(
-    server: *Server,
-    server_allocator: std.mem.Allocator,
-    io: std.Io,
-    id: usize,
-    stream: std.Io.net.Stream,
-) !void {
-    defer stream.close(io);
-
-    //var client_allocator: std.heap.DebugAllocator(.{}) = .init;
-    //client_allocator.backing_allocator = server_allocator;
-    //defer _ = client_allocator.deinit();
-    //const allocator = if (builtin.mode == .Debug or builtin.mode == .ReleaseSafe) client_allocator.allocator() else server_allocator;
-
-    // Set up client writer
-    var w_buffer: [1024 * 16]u8 = undefined;
-    var writer = stream.writer(io, &w_buffer);
-    const out = &writer.interface;
-
-    // Set up client reader
-    var r_buffer: [1024 * 16]u8 = undefined;
-    var reader = stream.reader(io, &r_buffer);
-    const in = &reader.interface;
-
-    // Set up buffer queue
-    var qbuf: [8]Message = undefined;
-    var queue: std.Io.Queue(Message) = .init(&qbuf);
-    defer {
-        queue.close(io);
-        while (queue.getOne(io)) |msg| {
-            switch (msg) {
-                .msg => |m| m.deinit(server_allocator),
-                .hmsg => |h| h.deinit(server_allocator),
-                else => {},
-            }
-        } else |_| {}
-    }
-
-    // Create client
-    var client: Client = .init(null, &queue, in, out);
-    defer client.deinit(server_allocator);
-
-    try server.addClient(server_allocator, id, &client);
-    defer server.removeClient(io, server_allocator, id);
-
-    // Do initial handshake with client
-    try queue.putOne(io, .{ .info = server.info });
-
-    var client_task = try io.concurrent(Client.start, .{ &client, io, server_allocator });
-    defer client_task.cancel(io) catch {};
-
-    // Messages are owned by the server after they are received from the client
-    while (client.next(server_allocator)) |msg| {
-        switch (msg) {
-            .ping => {
-                // Respond to ping with pong.
-                try client.send(io, .pong);
-            },
-            .@"pub", .hpub => {
-                defer switch (msg) {
-                    .@"pub" => |pb| pb.deinit(server_allocator),
-                    .hpub => |hp| hp.deinit(server_allocator),
-                    else => unreachable,
-                };
-                try server.publishMessage(io, server_allocator, &client, msg);
-            },
-            .sub => |sub| {
-                defer sub.deinit(server_allocator);
-                try server.subscribe(io, server_allocator, id, sub);
-            },
-            .unsub => |unsub| {
-                defer unsub.deinit(server_allocator);
-                try server.unsubscribe(io, server_allocator, id, unsub);
-            },
-            .connect => |connect| {
-                if (client.connect) |*current| {
-                    current.deinit(server_allocator);
-                }
-                client.connect = connect;
-            },
-            else => |e| {
-                std.debug.panic("Unimplemented message: {any}\n", .{e});
-            },
-        }
-    } else |err| switch (err) {
-        error.EndOfStream => {
-            std.log.debug("Client {d} disconnected", .{id});
-        },
-        else => {
-            return err;
-        },
-    }
-}
-
-fn subjectMatches(sub_subject: []const u8, pub_subject: []const u8) bool {
-    // TODO: assert that sub_subject and pub_subject are valid.
-    var sub_iter = std.mem.splitScalar(u8, sub_subject, '.');
-    var pub_iter = std.mem.splitScalar(u8, pub_subject, '.');
-
-    while (sub_iter.next()) |st| {
-        const pt = pub_iter.next() orelse return false;
-
-        if (std.mem.eql(u8, st, ">")) return true;
-
-        if (!std.mem.eql(u8, st, "*") and !std.mem.eql(u8, st, pt)) {
-            return false;
-        }
-    }
-
-    return pub_iter.next() == null;
-}
-
-test subjectMatches {
-    try std.testing.expect(subjectMatches("foo", "foo"));
-    try std.testing.expect(!subjectMatches("foo", "bar"));
-
-    try std.testing.expect(subjectMatches("foo.*", "foo.bar"));
-    try std.testing.expect(!subjectMatches("foo.*", "foo"));
-    try std.testing.expect(!subjectMatches("foo.>", "foo"));
-
-    // the wildcard subscriptions foo.*.quux and foo.> both match foo.bar.quux, but only the latter matches foo.bar.baz.
-    try std.testing.expect(subjectMatches("foo.*.quux", "foo.bar.quux"));
-    try std.testing.expect(subjectMatches("foo.>", "foo.bar.quux"));
-    try std.testing.expect(!subjectMatches("foo.*.quux", "foo.bar.baz"));
-    try std.testing.expect(subjectMatches("foo.>", "foo.bar.baz"));
-}
-
-fn publishMessage(server: *Server, io: std.Io, alloc: std.mem.Allocator, source_client: *Client, msg: Message) !void {
-    errdefer {
-        if (source_client.connect) |c| {
-            if (c.verbose) {
-                source_client.send(io, .{ .@"-err" = "Slow Consumer" }) catch {};
-            }
-        }
-    }
-    const subject = switch (msg) {
-        .@"pub" => |pb| pb.subject,
-        .hpub => |hp| hp.@"pub".subject,
-        else => unreachable,
-    };
-    try server.subs_lock.lock(io);
-    defer server.subs_lock.unlock(io);
-    for (server.subscriptions.items) |subscription| {
-        if (subjectMatches(subscription.subject, subject)) {
-            const client = server.clients.get(subscription.client_id) orelse {
-                std.debug.print("trying to publish to a client that no longer exists: {d}\n", .{subscription.client_id});
-                continue;
-            };
-
-            switch (msg) {
-                .@"pub" => |pb| client.send(io, .{
-                    .msg = try pb.toMsg(alloc, subscription.sid),
-                }) catch |err| switch (err) {
-                    error.Canceled => return err,
-                    else => {},
-                },
-                .hpub => |hp| client.send(io, .{ .hmsg = try hp.toHMsg(
-                    alloc,
-                    subscription.sid,
-                ) }) catch |err| switch (err) {
-                    error.Canceled => return err,
-                    else => {},
-                },
-                else => unreachable,
-            }
-        }
-    }
-    if (source_client.connect) |c| {
-        if (c.verbose) {
-            source_client.send(io, .@"+ok") catch {};
-        }
-    }
-}
-
-fn subscribe(server: *Server, io: std.Io, gpa: std.mem.Allocator, id: usize, msg: Message.Sub) !void {
-    try server.subs_lock.lock(io);
-    defer server.subs_lock.unlock(io);
-    const subject = try gpa.dupe(u8, msg.subject);
-    errdefer gpa.free(subject);
-    const sid = try gpa.dupe(u8, msg.sid);
-    errdefer gpa.free(sid);
-    try server.subscriptions.append(gpa, .{
-        .subject = subject,
-        .client_id = id,
-        .sid = sid,
-    });
-}
-
-fn unsubscribe(server: *Server, io: std.Io, gpa: std.mem.Allocator, id: usize, msg: Message.Unsub) !void {
-    try server.subs_lock.lock(io);
-    defer server.subs_lock.unlock(io);
-    const len = server.subscriptions.items.len;
-    for (0..len) |from_end| {
-        const i = len - from_end - 1;
-        const sub = server.subscriptions.items[i];
-        if (sub.client_id == id and std.mem.eql(u8, sub.sid, msg.sid)) {
-            sub.deinit(gpa);
-            _ = server.subscriptions.swapRemove(i);
-        }
-    }
-}
-
-pub fn createId() []const u8 {
-    return "SERVERID";
-}
-
-pub fn createName() []const u8 {
-    return "SERVERNAME";
-}
-- 
cgit