going off the deep end with with generic message type

src/Client.zig

@@ -48,22 +48,15 @@ fn broadcastSaprusMessage(msg: *SaprusMessage, udp_port: u16) !void {
 }
 
 pub fn sendRelay(payload: []const u8, dest: [4]u8, allocator: Allocator) !void {
-    const msg_bytes = try allocator.alignedAlloc(
+    const msg: *SaprusMessageNew(.relay) = try .init(
-        u8,
+        allocator,
-        @alignOf(SaprusMessage),
+        @intCast(base64Enc.calcSize(payload.len)),
-        try SaprusMessage.lengthForPayloadLength(
-            .relay,
-            base64Enc.calcSize(payload.len),
-        ),
     );
-    defer allocator.free(msg_bytes);
+    defer msg.deinit(allocator);
-    const msg: *SaprusMessage = .init(.relay, msg_bytes);
+    msg.dest = dest;
+    _ = base64Enc.encode(msg.getPayload(), payload);
 
-    const relay = (try msg.getSaprusTypePayload()).relay;
+    try broadcastSaprusMessage(try SaprusMessage.bytesAsValue(msg.asBytes()), 8888);
-    relay.dest = dest;
-    _ = base64Enc.encode(relay.getPayload(), payload);
-
-    try broadcastSaprusMessage(msg, 8888);
 }
 
 fn randomPort() u16 {
@@ -77,21 +70,12 @@ fn randomPort() u16 {
 
 pub fn sendInitialConnection(payload: []const u8, initial_port: u16, allocator: Allocator) !*SaprusMessage {
     const dest_port = randomPort();
-    const msg_bytes = try allocator.alignedAlloc(
+    const msg: *SaprusMessage = try .init(allocator, .connection, @intCast(payload.len));
-        u8,
+    defer msg.deinit(allocator);
-        @alignOf(SaprusMessage),
-        try SaprusMessage.lengthForPayloadLength(
-            .connection,
-            base64Enc.calcSize(payload.len),
-        ),
-    );
-
-    const msg: *SaprusMessage = .init(.connection, msg_bytes);
-
     const connection = (try msg.getSaprusTypePayload()).connection;
     connection.src_port = initial_port;
     connection.dest_port = dest_port;
-    _ = base64Enc.encode(connection.getPayload(), payload);
+    @memcpy(connection.getPayload(), payload);
 
     try broadcastSaprusMessage(msg, 8888);
 
@@ -104,7 +88,8 @@ pub fn connect(payload: []const u8, allocator: Allocator) !?SaprusConnection {
         initial_port = r.intRangeAtMost(u16, 1024, 65000);
     } else unreachable;
 
-    var initial_conn_res: ?*SaprusMessage = null;
+    var initial_conn_res: ?SaprusMessage = null;
+    errdefer if (initial_conn_res) |*c| c.deinit(allocator);
 
     var sock = try network.Socket.create(.ipv4, .udp);
     defer sock.close();
@@ -120,14 +105,13 @@ pub fn connect(payload: []const u8, allocator: Allocator) !?SaprusConnection {
     try sock.bind(bind_addr);
 
     const msg = try sendInitialConnection(payload, initial_port, allocator);
-    defer allocator.free(msg.asBytes());
 
-    var response_buf: [4096]u8 align(@alignOf(SaprusMessage)) = undefined;
+    var response_buf: [4096]u8 align(4) = @splat(0);
     _ = try sock.receive(&response_buf); // Ignore message that I sent.
     const len = try sock.receive(&response_buf);
 
-    std.debug.print("response bytes: {x}\n", .{response_buf[0..len]});
+    std.debug.print("response bytes: {x}\n", .{response_buf});
-    initial_conn_res = SaprusMessage.init(.connection, response_buf[0..len]);
+    initial_conn_res = (try SaprusMessage.bytesAsValue(response_buf[0..len])).*;
 
     // Complete handshake after awaiting response
     try broadcastSaprusMessage(msg, randomPort());
@@ -139,6 +123,7 @@ pub fn connect(payload: []const u8, allocator: Allocator) !?SaprusConnection {
 }
 
 const SaprusMessage = @import("message.zig").Message;
+const SaprusMessageNew = @import("message.zig").MessageNew;
 const SaprusConnection = @import("Connection.zig");
 
 const std = @import("std");

src/message.zig

@@ -20,14 +20,130 @@ pub const ConnectionOptions = packed struct(u8) {
     opt8: bool = false,
 };
 
-pub const MessageTypeError = error{
+pub const Error = error{
     NotImplementedSaprusType,
     UnknownSaprusType,
-};
-pub const MessageParseError = MessageTypeError || error{
     InvalidMessage,
 };
 
+pub fn MessageNew(comptime packet_type: PacketType) type {
+    comptime {
+        if (packet_type == .file_transfer)
+            @compileError("File transfer not implemented");
+        if (packet_type != .relay and packet_type != .connection)
+            @compileError("Unkown message type");
+    }
+
+    return packed struct {
+        const Self = @This();
+        const SelfBytes = []align(@alignOf(Self)) u8;
+
+        const Relay = struct {
+            pub fn getPayload(self: *Self) []u8 {
+                return @as([*]align(@alignOf(Self)) u8, @ptrCast(&self.payload))[0 .. self.length - 4];
+            }
+        };
+        const Connection = packed struct {
+            pub fn getPayload(self: Self) []u8 {
+                return @as([*]u8, &self.payload)[0 .. self.length - 4];
+            }
+        };
+
+        type: PacketType = packet_type,
+        length: u16,
+
+        // Relay
+        dest: if (packet_type == .relay) @Vector(4, u8) else void,
+
+        // Connection
+        src_port: if (packet_type == .connection) u16 else void, // random number > 1024
+        dest_port: if (packet_type == .connection) u16 else void, // random number > 1024
+        seq_num: if (packet_type == .connection) u32 else void,
+        msg_id: if (packet_type == .connection) u32 else void,
+        reserved: if (packet_type == .connection) u8 else void,
+        options: if (packet_type == .connection) ConnectionOptions else void = if (packet_type == .connection) .{} else {},
+
+        // Relay or Connection
+        payload: switch (packet_type) {
+            .relay, .connection => void,
+            else => noreturn,
+        },
+
+        pub usingnamespace switch (packet_type) {
+            .relay => Relay,
+            .connection => Connection,
+            .file_transfer => @compileError("File Transfer message type not implemented"),
+            else => @compileError("Unknown message type"),
+        };
+
+        pub fn init(allocator: Allocator, payload_len: u16) !*Self {
+            const size = payload_len + @sizeOf(Self);
+            const bytes = try allocator.alignedAlloc(u8, @alignOf(Self), size);
+            const res: *Self = @ptrCast(bytes.ptr);
+            res.type = packet_type;
+            res.length = payload_len;
+            return res;
+        }
+
+        pub fn deinit(self: *Self, allocator: Allocator) void {
+            allocator.free(self.asBytes());
+        }
+
+        pub fn nativeFromNetworkEndian(self: *Self) void {
+            self.type = @enumFromInt(bigToNative(
+                @typeInfo(@TypeOf(self.type)).@"enum".tag_type,
+                @intFromEnum(self.type),
+            ));
+            self.length = bigToNative(@TypeOf(self.length), self.length);
+
+            if (packet_type == .connection) {
+                self.src_port = bigToNative(@TypeOf(self.src_port), self.src_port);
+                self.dest_port = bigToNative(@TypeOf(self.dest_port), self.dest_port);
+                self.seq_num = bigToNative(@TypeOf(self.seq_num), self.seq_num);
+                self.msg_id = bigToNative(@TypeOf(self.msg_id), self.msg_id);
+            }
+        }
+
+        pub fn networkFromNativeEndian(self: *Self) void {
+            self.type = @enumFromInt(bigToNative(
+                @typeInfo(@TypeOf(self.type)).@"enum".tag_type,
+                @intFromEnum(self.type),
+            ));
+            self.length = bigToNative(@TypeOf(self.length), self.length);
+
+            if (packet_type == .connection) {
+                self.src_port = nativeToBig(@TypeOf(self.src_port), self.src_port);
+                self.dest_port = nativeToBig(@TypeOf(self.dest_port), self.dest_port);
+                self.seq_num = nativeToBig(@TypeOf(self.seq_num), self.seq_num);
+                self.msg_id = nativeToBig(@TypeOf(self.msg_id), self.msg_id);
+            }
+        }
+
+        pub fn asBytes(self: *Self) SelfBytes {
+            const size = @sizeOf(Self) + self.length;
+            return @as([*]align(@alignOf(Self)) u8, @ptrCast(self))[0..size];
+        }
+    };
+}
+
+test MessageNew {
+    comptime for (@typeInfo(MessageNew(.connection)).@"struct".decls) |field| {
+        @compileLog(field);
+    };
+}
+
+// pub fn bytesAsMessage(bytes: []const u8) !*Self {
+//     const res = std.mem.bytesAsValue(Self, bytes);
+//     return switch (res.type) {
+//         .relay, .connection => if (bytes.len == res.length + @sizeOf(Self))
+//             res
+//         else
+//             Error.InvalidMessage,
+//         .file_transfer => Error.NotImplementedSaprusType,
+//         else => Error.UnknownSaprusType,
+//     };
+// }
+
 // ZERO COPY STUFF
 // &payload could be a void value that is treated as a pointer to a [*]u8
 /// All Saprus messages
@@ -77,25 +193,23 @@ pub const Message = packed struct {
     length: u16,
     bytes: void = {},
 
-    /// Takes a byte slice, and returns a Message struct backed by the slice.
+    pub fn init(allocator: Allocator, comptime @"type": PacketType, payload_len: u16) !*Self {
-    /// This properly initializes the top level headers within the slice.
-    pub fn init(@"type": PacketType, bytes: []align(@alignOf(Self)) u8) *Self {
-        std.debug.assert(bytes.len >= @sizeOf(Self));
-        const res: *Self = @ptrCast(bytes.ptr);
-        res.type = @"type";
-        res.length = @intCast(bytes.len - @sizeOf(Self));
-        return res;
-    }
-
-    pub fn lengthForPayloadLength(comptime @"type": PacketType, payload_len: usize) MessageTypeError!u16 {
-        std.debug.assert(payload_len < std.math.maxInt(u16));
         const header_size = @sizeOf(switch (@"type") {
             .relay => Relay,
             .connection => Connection,
-            .file_transfer => return MessageTypeError.NotImplementedSaprusType,
+            .file_transfer => return Error.NotImplementedSaprusType,
-            else => return MessageTypeError.UnknownSaprusType,
+            else => return Error.UnknownSaprusType,
         });
-        return @intCast(payload_len + @sizeOf(Self) + header_size);
+        const size = payload_len + @sizeOf(Self) + header_size;
+        const bytes = try allocator.alignedAlloc(u8, @alignOf(Self), size);
+        const res: *Self = @ptrCast(bytes.ptr);
+        res.type = @"type";
+        res.length = payload_len + header_size;
+        return res;
+    }
+
+    pub fn deinit(self: *Self, allocator: Allocator) void {
+        allocator.free(self.asBytes());
     }
 
     fn getRelay(self: *Self) *align(1) Relay {
@@ -105,7 +219,7 @@ pub const Message = packed struct {
         return std.mem.bytesAsValue(Connection, &self.bytes);
     }
 
-    pub fn getSaprusTypePayload(self: *Self) MessageTypeError!(union(PacketType) {
+    pub fn getSaprusTypePayload(self: *Self) Error!(union(PacketType) {
         relay: *align(1) Relay,
         file_transfer: void,
         connection: *align(1) Connection,
@@ -113,12 +227,12 @@ pub const Message = packed struct {
         return switch (self.type) {
             .relay => .{ .relay = self.getRelay() },
             .connection => .{ .connection = self.getConnection() },
-            .file_transfer => MessageTypeError.NotImplementedSaprusType,
+            .file_transfer => Error.NotImplementedSaprusType,
-            else => MessageTypeError.UnknownSaprusType,
+            else => Error.UnknownSaprusType,
         };
     }
 
-    pub fn nativeFromNetworkEndian(self: *Self) MessageTypeError!void {
+    pub fn nativeFromNetworkEndian(self: *Self) Error!void {
         self.type = @enumFromInt(bigToNative(
             @typeInfo(@TypeOf(self.type)).@"enum".tag_type,
             @intFromEnum(self.type),
@@ -141,12 +255,12 @@ pub const Message = packed struct {
         }
     }
 
-    pub fn networkFromNativeEndian(self: *Self) MessageTypeError!void {
+    pub fn networkFromNativeEndian(self: *Self) Error!void {
         try switch (try self.getSaprusTypePayload()) {
             .relay => {},
             .connection => |*con| con.*.networkFromNativeEndian(),
-            .file_transfer => MessageTypeError.NotImplementedSaprusType,
+            .file_transfer => Error.NotImplementedSaprusType,
-            else => MessageTypeError.UnknownSaprusType,
+            else => Error.UnknownSaprusType,
         };
         self.type = @enumFromInt(nativeToBig(
             @typeInfo(@TypeOf(self.type)).@"enum".tag_type,
@@ -155,8 +269,18 @@ pub const Message = packed struct {
         self.length = nativeToBig(@TypeOf(self.length), self.length);
     }
 
-    /// Deprecated.
+    pub fn bytesAsValue(bytes: SelfBytes) !*Self {
-    /// If I need the bytes, I should just pass around the slice that is backing this to begin with.
+        const res = std.mem.bytesAsValue(Self, bytes);
+        return switch (res.type) {
+            .relay, .connection => if (bytes.len == res.length + @sizeOf(Self))
+                res
+            else
+                Error.InvalidMessage,
+            .file_transfer => Error.NotImplementedSaprusType,
+            else => Error.UnknownSaprusType,
+        };
+    }
+
     pub fn asBytes(self: *Self) SelfBytes {
         const size = @sizeOf(Self) + self.length;
         return @as([*]align(@alignOf(Self)) u8, @ptrCast(self))[0..size];
@@ -210,45 +334,6 @@ const asBytes = std.mem.asBytes;
 const nativeToBig = std.mem.nativeToBig;
 const bigToNative = std.mem.bigToNative;
 
-test "Round trip Relay toBytes and fromBytes" {
-    const gpa = std.testing.allocator;
-    const msg = Message{
-        .relay = .{
-            .header = .{ .dest = .{ 255, 255, 255, 255 } },
-            .payload = "Hello darkness my old friend",
-        },
-    };
-
-    const to_bytes = try msg.toBytes(gpa);
-    defer gpa.free(to_bytes);
-
-    const from_bytes = try Message.fromBytes(to_bytes, gpa);
-    defer from_bytes.deinit(gpa);
-
-    try std.testing.expectEqualDeep(msg, from_bytes);
-}
-
-test "Round trip Connection toBytes and fromBytes" {
-    const gpa = std.testing.allocator;
-    const msg = Message{
-        .connection = .{
-            .header = .{
-                .src_port = 0,
-                .dest_port = 0,
-            },
-            .payload = "Hello darkness my old friend",
-        },
-    };
-
-    const to_bytes = try msg.toBytes(gpa);
-    defer gpa.free(to_bytes);
-
-    const from_bytes = try Message.fromBytes(to_bytes, gpa);
-    defer from_bytes.deinit(gpa);
-
-    try std.testing.expectEqualDeep(msg, from_bytes);
-}
-
 test {
     std.testing.refAllDeclsRecursive(@This());
 }