factotum/nats.zig
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connection: add additional tests and fix various bindings

Browse Source 
If you think these unit tests look crappy, that's because they are.
Actual behavioral tests are pretty much exclusively relying on the
underlying C library being well-tested, so all these tests are really
trying to do is ref the bindings in our endpoints to make sure there
aren't any compilation issues with them. Obviously this is making a
difference, since a variety of issues have been found and addressed as
a result.
This commit is contained in:
torque
2023-09-02 21:56:40 -07:00
parent d541e1e759
commit dfb6d10277
2 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/connection.zig
View File

@@ -40,13 +40,13 @@ const thunk = @import("./thunk.zig");
pub const default_server_url: [:0]const u8 = nats_c.NATS_DEFAULT_URL;
pub const ConnectionStatus = enum(c_int) {
disconnected = nats_c.DISCONNECTED,
connecting = nats_c.CONNECTING,
connected = nats_c.CONNECTED,
closed = nats_c.CLOSED,
reconnecting = nats_c.RECONNECTING,
draining_subs = nats_c.DRAINING_SUBS,
draining_pubs = nats_c.DRAINING_PUBS,
disconnected = nats_c.NATS_CONN_STATUS_DISCONNECTED,
connecting = nats_c.NATS_CONN_STATUS_CONNECTING,
connected = nats_c.NATS_CONN_STATUS_CONNECTED,
closed = nats_c.NATS_CONN_STATUS_CLOSED,
reconnecting = nats_c.NATS_CONN_STATUS_RECONNECTING,
draining_subs = nats_c.NATS_CONN_STATUS_DRAINING_SUBS,
draining_pubs = nats_c.NATS_CONN_STATUS_DRAINING_PUBS,
_,
pub fn fromInt(int: c_uint) ConnectionStatus {
@@ -57,6 +57,10 @@ pub const ConnectionStatus = enum(c_int) {
pub const AddressPort = struct {
address: [:0]u8,
port: u16,
pub fn deinit(self: AddressPort) void {
std.heap.raw_c_allocator.free(self.address);
}
};
pub const Connection = opaque {
@@ -115,7 +119,7 @@ pub const Connection = opaque {
return Status.fromInt(nats_c.natsConnection_FlushTimeout(@ptrCast(self), timeout)).raise();
}
pub fn getMaxPayload(self: *Connection) c_int {
pub fn getMaxPayload(self: *Connection) i64 {
return nats_c.natsConnection_GetMaxPayload(@ptrCast(self));
}
@@ -150,31 +154,47 @@ pub const Connection = opaque {
return status.toError() orelse std.mem.sliceTo(@as([*c]u8, buffer.ptr), 0);
}
pub fn getServers(self: *Connection) Error![][*:0]u8 {
pub const ServerList = struct {
raw_data: [][*:0]u8,
index: usize = 0,
pub fn next(self: *ServerList) ?[:0]u8 {
if (self.index >= self.raw_data.len) return null;
defer self.index += 1;
return std.mem.sliceTo(self.raw_data[self.index], 0);
}
pub fn deinit(self: *ServerList) void {
std.heap.raw_c_allocator.free(self.raw_data);
}
};
pub fn getServers(self: *Connection) Error!ServerList {
var servers: [*][*:0]u8 = undefined;
var count: c_int = 0;
const status = Status.fromInt(
nats_c.natsConnection_GetServers(@ptrCast(self), &servers, &count),
nats_c.natsConnection_GetServers(@ptrCast(self), @ptrCast(&servers), &count),
);
return status.toError() orelse servers[0..@intCast(count)];
return status.toError() orelse .{ .raw_data = servers[0..@intCast(count)] };
}
pub fn getDiscoveredServers(self: *Connection) Error![][*:0]u8 {
pub fn getDiscoveredServers(self: *Connection) Error!ServerList {
var servers: [*][*:0]u8 = undefined;
var count: c_int = 0;
const status = Status.fromInt(
nats_c.natsConnection_GetDiscoveredServers(@ptrCast(self), &servers, &count),
nats_c.natsConnection_GetDiscoveredServers(@ptrCast(self), @ptrCast(&servers), &count),
);
return status.toError() orelse servers[0..@intCast(count)];
return status.toError() orelse .{ .raw_data = servers[0..@intCast(count)] };
}
pub fn getLastError(self: *Connection) ErrorInfo {
var desc: [*:0]const u8 = 0;
const status = nats_c.natsConnection_GetLastError(@ptrCast(self), &desc);
var desc: [*:0]const u8 = undefined;
const status = nats_c.natsConnection_GetLastError(@ptrCast(self), @ptrCast(&desc));
return .{
.code = Status.fromInt(status).toError(),
@@ -204,7 +224,7 @@ pub const Connection = opaque {
var sig = [_]u8{0} ** 64;
const status = Status.fromInt(
nats_c.natsConnection_Sign(@ptrCast(self), message.ptr, message.len, &sig),
nats_c.natsConnection_Sign(@ptrCast(self), message.ptr, @intCast(message.len), &sig),
);
return status.toError() orelse sig;
@@ -225,7 +245,7 @@ pub const Connection = opaque {
var port: c_int = 0;
const status = Status.fromInt(
nats_c.natsConnection_GetLocalIPAndPort(@ptrCast(self), &address, &port),
nats_c.natsConnection_GetLocalIPAndPort(@ptrCast(self), @ptrCast(&address), &port),
);
return status.toError() orelse .{