mirrors/zits
1
0
Fork 0
mirror of https://git.robbyzambito.me/zits synced 2026-02-04 11:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Process pub

Browse Source
This commit is contained in:
Robby Zambito
2025-11-19 09:49:32 -05:00
parent 938504e12e
commit 5471cbe155
1 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/server/message_parser.zig
View File

@@ -47,7 +47,6 @@ pub const MessageType = enum {
}, },
); );
fn parseStaticStringMap(input: []const u8) ?MessageType { fn parseStaticStringMap(input: []const u8) ?MessageType {
std.debug.print("input: '{s}'\n", .{input});
return client_types.get(input); return client_types.get(input);
} }
@@ -88,7 +87,7 @@ const Message = union(MessageType) {
}; };
const Pub = struct { const Pub = struct {
subject: []const u8, subject: []const u8,
reply_to: ?[]const u8, reply_to: ?[]const u8 = null,
bytes: usize, bytes: usize,
payload: []const u8, payload: []const u8,
}; };
@@ -102,13 +101,15 @@ fn parseJsonMessage(T: type, alloc: std.mem.Allocator, in: *std.Io.Reader) !T {
fn parsePub(in: *std.Io.Reader) !Message.Pub { fn parsePub(in: *std.Io.Reader) !Message.Pub {
const subject = (try in.takeDelimiter(' ')) orelse return error.EndOfStream; const subject = (try in.takeDelimiter(' ')) orelse return error.EndOfStream;
const next = (try in.takeDelimiter(' ')) orelse return error.EndOfStream; const next = (try in.takeDelimiter('\r')) orelse return error.EndOfStream;
std.debug.print("next: '{s}'\n", .{next});
var reply_to: ?[]const u8 = null; var reply_to: ?[]const u8 = null;
const bytes = std.fmt.parseUnsigned(usize, next, 10) catch blk: { const bytes = std.fmt.parseUnsigned(usize, next, 10) catch blk: {
reply_to = next; reply_to = next;
break :blk try std.fmt.parseUnsigned(usize, (try in.takeDelimiter(' ')) orelse return error.EndOfStream, 10); break :blk try std.fmt.parseUnsigned(usize, (try in.takeDelimiter(' ')) orelse return error.EndOfStream, 10);
}; };
in.toss(2); // CRLF
in.toss(1); // LF
const payload = try in.take(bytes); const payload = try in.take(bytes);
return .{ return .{
@@ -126,19 +127,18 @@ pub fn parseNextMessage(alloc: std.mem.Allocator, in: *std.Io.Reader) ?Message {
std.debug.print("word: {s}\n", .{word}); std.debug.print("word: {s}\n", .{word});
break :blk MessageType.parse(word) orelse return null; break :blk MessageType.parse(word) orelse return null;
}; };
defer in.toss(2); // CRLF // defer in.toss(2); // CRLF
return switch (message_type) { return switch (message_type) {
.connect => .{ .connect = parseJsonMessage(Message.Connect, alloc, in) catch return null }, .connect => .{ .connect = parseJsonMessage(Message.Connect, alloc, in) catch return null },
.@"pub" => .{ .@"pub" = parsePub(in) catch return null }, .@"pub" => .{ .@"pub" = parsePub(in) catch |err| std.debug.panic("{}", .{err}) },
.ping => .{ .ping = {} }, .ping => .{ .ping = {} },
else => null, else => null,
}; };
} }
test parseNextMessage { test parseNextMessage {
const input = {
\\CONNECT {"verbose":false,"pedantic":false,"tls_required":false,"name":"NATS CLI Version v0.2.4","lang":"go","version":"1.43.0","protocol":1,"echo":true,"headers":true,"no_responders":true}\r\n const input = "CONNECT {\"verbose\":false,\"pedantic\":false,\"tls_required\":false,\"name\":\"NATS CLI Version v0.2.4\",\"lang\":\"go\",\"version\":\"1.43.0\",\"protocol\":1,\"echo\":true,\"headers\":true,\"no_responders\":true}\r\n";
;
var reader: std.Io.Reader = .fixed(input); var reader: std.Io.Reader = .fixed(input);
var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); var arena: std.heap.ArenaAllocator = .init(std.testing.allocator);
defer arena.deinit(); defer arena.deinit();
@@ -158,6 +158,23 @@ test parseNextMessage {
} }; } };
try std.testing.expect(msg != null); try std.testing.expect(msg != null);
try std.testing.expectEqualDeep(msg, expected); try std.testing.expectEqualDeep(msg, expected);
}
{
const input = "PUB hi 3\r\nfoo\r\n";
var reader: std.Io.Reader = .fixed(input);
var arena: std.heap.ArenaAllocator = .init(std.testing.allocator);
defer arena.deinit();
const gpa = arena.allocator();
const msg: ?Message = parseNextMessage(gpa, &reader);
std.debug.print("msg: {any}\n", .{msg});
const expected: ?Message = .{ .@"pub" = .{
.subject = "hi",
.bytes = 3,
.payload = "foo",
} };
try std.testing.expect(msg != null);
try std.testing.expectEqualDeep(msg, expected);
}
} }
test "MessageType.parse performance" { test "MessageType.parse performance" {