tigerbeetle-node 0.5.0 → 0.6.0

package/README.md

@@ -9,13 +9,12 @@ The following steps will install the `tigerbeetle-node` module to your current w
 * NodeJS >= `14.0.0`. _(If the correct version is not installed, an installation error will occur)_ 
 
 > Your operating system should be Linux (kernel >= v5.6) or macOS. Windows support is not yet available but is in the works.
-
-> Ensure you are not currently in the project (tigerbeetle-node) directory, but the `parent` directory instead;
      
 ### YARN Package Manager
 
 ```sh
-yarn add tigerbeetle-node
+# Run the following from this directory
+yarn add
 ```
 or
 
@@ -146,7 +145,7 @@ const errors = await client.createTransfers([transfer])
 Two-phase transfers are supported natively by toggling the appropriate flag. TigerBeetle will then adjust the `credits_reserved` and `debits_reserved` fields of the appropriate accounts. A corresponding commit transfer then needs to be sent to accept or reject the transfer.
 | bit 0    | bit 1              | bit 2            |
 |----------|--------------------|------------------|
-| `linked` | `two_phase_commit` | `condition`      |
+| `linked` | `posting`          | `condition`      |
 
 The `condition` flag signals to TigerBeetle that a 256-bit cryptographic condition will be supplied in the `reserved` field. This will be validated against a supplied pre-image when the transfer is committed. Transfers within a batch may also be linked (see [linked events](#linked-events)).
 ```js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tigerbeetle-node",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "TigerBeetle Node.js client",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -37,7 +37,7 @@
     "benchmark": "./scripts/benchmark.sh",
     "build": "yarn build:tsc && yarn build:zig",
     "build:tsc": "tsc",
-    "build:zig": "mkdir -p dist && ZIG_SYSTEM_LINKER_HACK=1 zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node",
+    "build:zig": "mkdir -p dist && zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node",
     "clean": "rm -rf build dist node_modules src/zig-cache zig",
     "install:zig": "./src/tigerbeetle/scripts/install_zig.sh",
     "postinstall": "./scripts/postinstall.sh",

package/scripts/postinstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
 
-./src/tigerbeetle/scripts/install_zig.sh 0.8.1
+./src/tigerbeetle/scripts/install_zig.sh
 ./scripts/download_node_headers.sh
-mkdir -p dist && ZIG_SYSTEM_LINKER_HACK=1 zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node
+mkdir -p dist && zig/zig build-lib -mcpu=baseline -OReleaseSafe -dynamic -lc -isystem build/node-$(node --version)/include/node src/node.zig -fallow-shlib-undefined -femit-bin=dist/client.node

package/src/node.zig

@@ -45,7 +45,7 @@ export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi
 
     const allocator = std.heap.c_allocator;
     var global = Globals.init(allocator, env) catch {
-        std.log.emerg("Failed to initialise environment.\n", .{});
+        std.log.err("Failed to initialise environment.\n", .{});
         return null;
     };
     errdefer global.deinit();
@@ -57,7 +57,7 @@ export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi
     // state.
     translate.set_instance_data(
         env,
-        @ptrCast(*c_void, @alignCast(@alignOf(u8), global)),
+        @ptrCast(*anyopaque, @alignCast(@alignOf(u8), global)),
         Globals.destroy,
     ) catch {
         global.deinit();
@@ -68,11 +68,11 @@ export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi
 }
 
 const Globals = struct {
-    allocator: *std.mem.Allocator,
+    allocator: std.mem.Allocator,
     io: IO,
     napi_undefined: c.napi_value,
 
-    pub fn init(allocator: *std.mem.Allocator, env: c.napi_env) !*Globals {
+    pub fn init(allocator: std.mem.Allocator, env: c.napi_env) !*Globals {
         const self = try allocator.create(Globals);
         errdefer allocator.destroy(self);
 
@@ -93,7 +93,7 @@ const Globals = struct {
         };
         errdefer self.io.deinit();
 
-        if (c.napi_get_undefined(env, &self.napi_undefined) != .napi_ok) {
+        if (c.napi_get_undefined(env, &self.napi_undefined) != c.napi_ok) {
             return translate.throw(env, "Failed to capture the value of \"undefined\".");
         }
 
@@ -105,13 +105,16 @@ const Globals = struct {
         self.allocator.destroy(self);
     }
 
-    pub fn destroy(env: c.napi_env, data: ?*c_void, hint: ?*c_void) callconv(.C) void {
+    pub fn destroy(env: c.napi_env, data: ?*anyopaque, hint: ?*anyopaque) callconv(.C) void {
+        _ = env;
+        _ = hint;
+
         const self = globalsCast(data.?);
         self.deinit();
     }
 };
 
-fn globalsCast(globals_raw: *c_void) *Globals {
+fn globalsCast(globals_raw: *anyopaque) *Globals {
     return @ptrCast(*Globals, @alignCast(@alignOf(Globals), globals_raw));
 }
 
@@ -123,7 +126,7 @@ const Context = struct {
 
     fn create(
         env: c.napi_env,
-        allocator: *std.mem.Allocator,
+        allocator: std.mem.Allocator,
         io: *IO,
         cluster: u32,
         addresses_raw: []const u8,
@@ -163,7 +166,7 @@ const Context = struct {
     }
 };
 
-fn contextCast(context_raw: *c_void) !*Context {
+fn contextCast(context_raw: *anyopaque) !*Context {
     return @ptrCast(*Context, @alignCast(@alignOf(Context), context_raw));
 }
 
@@ -522,7 +525,7 @@ fn encode_napi_results_array(
 fn init(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 1;
     var argv: [1]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
     if (argc != 1) translate.throw(
@@ -555,7 +558,7 @@ fn init(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
 fn request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 4;
     var argv: [4]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 
@@ -576,12 +579,7 @@ fn request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_valu
         translate.throw(env, "Unknown operation.") catch return null;
     }
 
-    const message = context.client.get_message() orelse {
-        translate.throw(
-            env,
-            "Too many requests outstanding.",
-        ) catch return null;
-    };
+    const message = context.client.get_message();
     defer context.client.unref(message);
 
     const operation = @intToEnum(Operation, @intCast(u8, operation_int));
@@ -609,7 +607,7 @@ fn request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_valu
 fn raw_request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 4;
     var argv: [4]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 
@@ -631,12 +629,7 @@ fn raw_request(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_
     }
     const operation = @intToEnum(Operation, @intCast(u8, operation_int));
 
-    const message = context.client.get_message() orelse {
-        translate.throw(
-            env,
-            "Too many requests outstanding.",
-        ) catch return null;
-    };
+    const message = context.client.get_message();
     defer context.client.unref(message);
 
     const body_length = translate.bytes_from_buffer(
@@ -730,11 +723,10 @@ fn on_result(user_data: u128, operation: Operation, results: Client.Error![]cons
 fn tick(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 1;
     var argv: [1]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 
-    const allocator = std.heap.c_allocator;
     if (argc != 1) translate.throw(
         env,
         "Function tick() requires 1 argument exactly.",
@@ -760,7 +752,7 @@ fn tick(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
 fn deinit(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
     var argc: usize = 1;
     var argv: [1]c.napi_value = undefined;
-    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != .napi_ok) {
+    if (c.napi_get_cb_info(env, info, &argc, &argv, null, null) != c.napi_ok) {
         translate.throw(env, "Failed to get args.") catch return null;
     }
 

package/src/tigerbeetle/scripts/benchmark.bat

@@ -0,0 +1,46 @@
+@echo off
+setlocal enabledelayedexpansion
+
+if "%~1" equ ":main" (
+    shift /1
+    goto main
+)
+
+cmd /d /c "%~f0" :main %*
+set ZIG_RESULT=%ERRORLEVEL%
+taskkill /F /IM tigerbeetle.exe >nul
+
+if !ZIG_RESULT! equ 0 (
+    del /f benchmark.log
+) else (
+    echo.
+    echo Error running benchmark, here are more details
+    type benchmark.log
+)
+
+echo.
+exit /b
+
+:main
+zig\zig.exe build -Drelease-safe
+move zig-out\bin\tigerbeetle.exe . >nul
+
+for /l %%i in (0, 1, 0) do (
+    echo Initializing replica %%i
+    set ZIG_FILE=.\cluster_0000000000_replica_00%%i.tigerbeetle
+    if exist "!ZIG_FILE!" DEL /F "!ZIG_FILE!"
+    .\tigerbeetle.exe init --directory=. --cluster=0 --replica=%%i > benchmark.log 2>&1
+)
+
+for /l %%i in (0, 1, 0) do (
+    echo Starting replica %%i
+    start /B "tigerbeetle_%%i" .\tigerbeetle.exe start --directory=. --cluster=0 --addresses=3001 --replica=%%i > benchmark.log 2>&1
+)
+
+rem Wait for replicas to start, listen and connect:
+timeout /t 2
+
+echo.
+echo Benchmarking...
+zig\zig.exe run -OReleaseSafe src\benchmark.zig
+exit /b %errorlevel%

package/src/tigerbeetle/scripts/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-scripts/install_zig.sh 0.8.1
+scripts/install_zig.sh
 echo "Building TigerBeetle..."
 zig/zig build -Dcpu=baseline -Drelease-safe
 mv zig-out/bin/tigerbeetle .

package/src/tigerbeetle/scripts/install_zig.bat

@@ -1,10 +1,10 @@
 @echo off
 
-set DEFAULT_RELEASE=0.8.1
+set ZIG_RELEASE_DEFAULT=0.9.1
 
 :: Determine the Zig build:
 if "%~1"=="" (
-    set ZIG_RELEASE=%DEFAULT_RELEASE%
+    set ZIG_RELEASE=%ZIG_RELEASE_DEFAULT%
 ) else if "%~1"=="latest" (
     set ZIG_RELEASE=builds
 ) else (
@@ -39,7 +39,7 @@ if "%ZIG_RELEASE%"=="builds" (
 )
 
 :: Using variable modifiers to determine the directory and filename from the URL:
-:: %~ni Expands %i to a file name only and %~xi Expands %i to a file name extension only.
+:: %%~ni Expands %%i to a file name only and %%~xi Expands %%i to a file name extension only.
 for /f %%i in ("%ZIG_URL%") do (
     set ZIG_DIRECTORY=%%~ni
     set ZIG_TARBALL=%%~nxi
@@ -106,4 +106,4 @@ if exist %ZIG_TARBALL% (
   exit 1
 )
 
-echo "Congratulations, you have successfully installed Zig version %ZIG_RELEASE%. Enjoy!"
+echo "Congratulations, you have successfully installed Zig version %ZIG_RELEASE%. Enjoy!"

package/src/tigerbeetle/scripts/install_zig.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 set -e
 
-# Default to the 0.8.1 build, or allow the latest dev build, or an explicit release version:
+ZIG_RELEASE_DEFAULT="0.9.1"
+
+# Default to the release build, or allow the latest dev build, or an explicit release version:
 if [ -z "$1" ]; then
-    ZIG_RELEASE="0.8.1"
+    ZIG_RELEASE=$ZIG_RELEASE_DEFAULT
 elif [ "$1" == "latest" ]; then
     ZIG_RELEASE="builds"
 else

package/src/tigerbeetle/scripts/lint.zig

@@ -23,7 +23,7 @@ var file_stats = std.ArrayListUnmanaged(Stats){};
 var seen = std.AutoArrayHashMapUnmanaged(fs.File.INode, void){};
 
 var general_purpose_allocator = std.heap.GeneralPurposeAllocator(.{}){};
-const gpa = &general_purpose_allocator.allocator;
+const gpa = general_purpose_allocator.allocator();
 
 pub fn main() !void {
     const argv = std.os.argv;
@@ -119,7 +119,13 @@ fn lint_file(file_path: []const u8, dir: fs.Dir, sub_path: []const u8) LintError
     // Add to set after no longer possible to get error.IsDir.
     if (try seen.fetchPut(gpa, stat.inode, {})) |_| return;
 
-    const source = try source_file.readToEndAlloc(gpa, math.maxInt(usize));
+    const source = try source_file.readToEndAllocOptions(
+        gpa,
+        math.maxInt(usize),
+        null,
+        @alignOf(u8),
+        0,
+    );
     try check_line_length(source, file_path);
 
     var tree = try std.zig.parse(gpa, source);

package/src/tigerbeetle/scripts/vopr.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
-# Install Zig 0.8.0 if it does not already exist:
+# Install Zig if it does not already exist:
 if [ ! -d "zig" ]; then
-    scripts/install_zig.sh 0.8.0
+    scripts/install_zig.sh
     echo ""
     echo "Running the TigerBeetle VOPR for the first time..."
     echo "Visit https://www.tigerbeetle.com"

package/src/tigerbeetle/src/benchmark.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const assert = std.debug.assert;
 const config = @import("config.zig");
 
@@ -30,7 +31,7 @@ const BATCHES: f32 = MAX_TRANSFERS / BATCH_SIZE;
 const TOTAL_BATCHES = @ceil(BATCHES);
 
 const log = std.log;
-pub const log_level: std.log.Level = .notice;
+pub const log_level: std.log.Level = .info;
 
 var accounts = [_]Account{
     Account{
@@ -65,13 +66,14 @@ pub fn main() !void {
     const stdout = std.io.getStdOut().writer();
     const stderr = std.io.getStdErr().writer();
 
-    if (std.builtin.mode != .ReleaseSafe and std.builtin.mode != .ReleaseFast) {
+    if (builtin.mode != .ReleaseSafe and builtin.mode != .ReleaseFast) {
         try stderr.print("Benchmark must be built as ReleaseSafe for minimum performance.\n", .{});
     }
 
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
-    const allocator = &arena.allocator;
+
+    const allocator = arena.allocator();
 
     const client_id = std.crypto.random.int(u128);
     const cluster_id: u32 = 0;
@@ -90,7 +92,7 @@ pub fn main() !void {
     message_bus.set_on_message(*Client, &client, Client.on_message);
 
     // Pre-allocate a million transfers:
-    var transfers = try arena.allocator.alloc(Transfer, MAX_TRANSFERS);
+    const transfers = try arena.allocator().alloc(Transfer, MAX_TRANSFERS);
     for (transfers) |*transfer, index| {
         transfer.* = .{
             .id = index,
@@ -106,7 +108,7 @@ pub fn main() !void {
     }
 
     // Pre-allocate a million commits:
-    var commits: ?[]Commit = if (IS_TWO_PHASE_COMMIT) try arena.allocator.alloc(Commit, MAX_TRANSFERS) else null;
+    const commits: ?[]Commit = if (IS_TWO_PHASE_COMMIT) try arena.allocator().alloc(Commit, MAX_TRANSFERS) else null;
     if (commits) |all_commits| {
         for (all_commits) |*commit, index| {
             commit.* = .{
@@ -226,9 +228,7 @@ const TimedQueue = struct {
         if (self.batches.head_ptr()) |starting_batch| {
             log.debug("sending first batch...", .{});
             self.batch_start = now;
-            var message = self.client.get_message() orelse {
-                @panic("Client message pool has been exhausted. Cannot execute batch.");
-            };
+            const message = self.client.get_message();
             defer self.client.unref(message);
 
             std.mem.copy(
@@ -254,7 +254,7 @@ const TimedQueue = struct {
     pub fn lap(user_data: u128, operation: Operation, results: Client.Error![]const u8) void {
         const now = std.time.milliTimestamp();
         const value = results catch |err| {
-            log.emerg("Client returned error={o}", .{@errorName(err)});
+            log.err("Client returned error={o}", .{@errorName(err)});
             @panic("Client returned error during benchmarking.");
         };
 
@@ -286,9 +286,7 @@ const TimedQueue = struct {
         }
 
         if (self.batches.head_ptr()) |next_batch| {
-            var message = self.client.get_message() orelse {
-                @panic("Client message pool has been exhausted.");
-            };
+            const message = self.client.get_message();
             defer self.client.unref(message);
 
             std.mem.copy(

package/src/tigerbeetle/src/cli.zig

@@ -8,6 +8,7 @@ const os = std.os;
 
 const config = @import("config.zig");
 const vsr = @import("vsr.zig");
+const IO = @import("io.zig").IO;
 
 const usage = fmt.comptimePrint(
     \\Usage:
@@ -87,18 +88,31 @@ pub const Command = union(enum) {
 
 /// Parse the command line arguments passed to the tigerbeetle binary.
 /// Exits the program with a non-zero exit code if an error is found.
-pub fn parse_args(allocator: *std.mem.Allocator) Command {
+pub fn parse_args(allocator: std.mem.Allocator) !Command {
     var maybe_cluster: ?[]const u8 = null;
     var maybe_replica: ?[]const u8 = null;
     var maybe_addresses: ?[]const u8 = null;
     var maybe_directory: ?[:0]const u8 = null;
 
-    var args = std.process.args();
+    var args = try std.process.argsWithAllocator(allocator);
+    defer args.deinit();
+
+    // Keep track of the args from the ArgIterator above that were allocated
+    // then free them all at the end of the scope.
+    var args_allocated = std.ArrayList([:0]const u8).init(allocator);
+    defer {
+        for (args_allocated.items) |arg| allocator.free(arg);
+        args_allocated.deinit();
+    }
+
     // Skip argv[0] which is the name of this executable
-    _ = args.nextPosix();
+    const did_skip = args.skip();
+    assert(did_skip);
+
+    const raw_command = try (args.next(allocator) orelse
+        fatal("no command provided, expected 'start' or 'init'", .{}));
+    defer allocator.free(raw_command);
 
-    const raw_command = args.nextPosix() orelse
-        fatal("no command provided, expected 'start' or 'init'", .{});
     if (mem.eql(u8, raw_command, "-h") or mem.eql(u8, raw_command, "--help")) {
         std.io.getStdOut().writeAll(usage) catch os.exit(1);
         os.exit(0);
@@ -106,7 +120,10 @@ pub fn parse_args(allocator: *std.mem.Allocator) Command {
     const command = meta.stringToEnum(meta.Tag(Command), raw_command) orelse
         fatal("unknown command '{s}', expected 'start' or 'init'", .{raw_command});
 
-    while (args.nextPosix()) |arg| {
+    while (args.next(allocator)) |parsed_arg| {
+        const arg = try parsed_arg;
+        try args_allocated.append(arg);
+
         if (mem.startsWith(u8, arg, "--cluster")) {
             maybe_cluster = parse_flag("--cluster", arg);
         } else if (mem.startsWith(u8, arg, "--replica")) {
@@ -118,8 +135,10 @@ pub fn parse_args(allocator: *std.mem.Allocator) Command {
         } else if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
             std.io.getStdOut().writeAll(usage) catch os.exit(1);
             os.exit(0);
-        } else {
+        } else if (mem.startsWith(u8, arg, "--")) {
             fatal("unexpected argument: '{s}'", .{arg});
+        } else {
+            fatal("unexpected argument: '{s}' (must start with '--')", .{arg});
         }
     }
 
@@ -130,7 +149,7 @@ pub fn parse_args(allocator: *std.mem.Allocator) Command {
     const replica = parse_replica(raw_replica);
 
     const dir_path = maybe_directory orelse config.directory;
-    const dir_fd = os.openZ(dir_path, os.O_CLOEXEC | os.O_RDONLY, 0) catch |err|
+    const dir_fd = IO.open_dir(dir_path) catch |err|
         fatal("failed to open directory '{s}': {}", .{ dir_path, err });
 
     switch (command) {
@@ -139,11 +158,13 @@ pub fn parse_args(allocator: *std.mem.Allocator) Command {
                 fatal("--addresses: supported only by 'start' command", .{});
             }
 
-            return .{ .init = .{
-                .cluster = cluster,
-                .replica = replica,
-                .dir_fd = dir_fd,
-            } };
+            return Command{
+                .init = .{
+                    .cluster = cluster,
+                    .replica = replica,
+                    .dir_fd = dir_fd,
+                },
+            };
         },
         .start => {
             const raw_addresses = maybe_addresses orelse
@@ -154,12 +175,14 @@ pub fn parse_args(allocator: *std.mem.Allocator) Command {
                 fatal("--replica: value greater than length of --addresses array", .{});
             }
 
-            return .{ .start = .{
-                .cluster = cluster,
-                .replica = replica,
-                .addresses = addresses,
-                .dir_fd = dir_fd,
-            } };
+            return Command{
+                .start = .{
+                    .cluster = cluster,
+                    .replica = replica,
+                    .addresses = addresses,
+                    .dir_fd = dir_fd,
+                },
+            };
         },
     }
 }
@@ -193,7 +216,7 @@ fn parse_cluster(raw_cluster: []const u8) u32 {
 }
 
 /// Parse and allocate the addresses returning a slice into that array.
-fn parse_addresses(allocator: *std.mem.Allocator, raw_addresses: []const u8) []net.Address {
+fn parse_addresses(allocator: std.mem.Allocator, raw_addresses: []const u8) []net.Address {
     return vsr.parse_addresses(allocator, raw_addresses) catch |err| switch (err) {
         error.AddressHasTrailingComma => fatal("--addresses: invalid trailing comma", .{}),
         error.AddressLimitExceeded => {

package/src/tigerbeetle/src/config.zig

@@ -1,8 +1,11 @@
+const std = @import("std");
+const assert = std.debug.assert;
+
 /// Whether development or production:
 pub const deployment_environment = .development;
 
-/// The maximum log level in increasing order of verbosity (emergency=0, debug=7):
-pub const log_level = 6;
+/// The maximum log level in increasing order of verbosity (emergency=0, debug=3):
+pub const log_level = 2;
 
 /// The maximum number of replicas allowed in a cluster.
 pub const replicas_max = 6;
@@ -86,12 +89,6 @@ pub const connections_max = replicas_max + clients_max;
 /// This impacts the amount of memory allocated at initialization by the server.
 pub const message_size_max = 1 * 1024 * 1024;
 
-/// The number of full-sized messages allocated at initialization by the message bus.
-pub const message_bus_messages_max = connections_max * 4;
-/// The number of header-sized messages allocated at initialization by the message bus.
-/// These are much smaller/cheaper and we can therefore have many of them.
-pub const message_bus_headers_max = connections_max * connection_send_queue_max * 2;
-
 /// The maximum number of Viewstamped Replication prepare messages that can be inflight at a time.
 /// This is immutable once assigned per cluster, as replicas need to know how many operations might
 /// possibly be uncommitted during a view change, and this must be constant for all replicas.
@@ -102,8 +99,15 @@ pub const pipelining_max = clients_max;
 pub const connection_delay_min_ms = 50;
 pub const connection_delay_max_ms = 1000;
 
-/// The maximum number of outgoing messages that may be queued on a connection.
-pub const connection_send_queue_max = pipelining_max;
+/// The maximum number of outgoing messages that may be queued on a replica connection.
+pub const connection_send_queue_max_replica = std.math.max(std.math.min(clients_max, 4), 2);
+
+/// The maximum number of outgoing messages that may be queued on a client connection.
+/// The client has one in-flight request, and occasionally a ping.
+pub const connection_send_queue_max_client = 2;
+
+/// The maximum number of outgoing requests that may be queued on a client (including the in-flight request).
+pub const client_request_queue_max = 32;
 
 /// The maximum number of connections in the kernel's complete connection queue pending an accept():
 /// If the backlog argument is greater than the value in `/proc/sys/net/core/somaxconn`, then it is
@@ -124,7 +128,8 @@ pub const tcp_rcvbuf = 4 * 1024 * 1024;
 /// This sets SO_SNDBUF as an alternative to the auto-tuning range in /proc/sys/net/ipv4/tcp_wmem.
 /// The value is limited by /proc/sys/net/core/wmem_max, unless the CAP_NET_ADMIN privilege exists.
 /// The kernel doubles this value to allow space for packet bookkeeping overhead.
-pub const tcp_sndbuf = 4 * 1024 * 1024;
+pub const tcp_sndbuf_replica = connection_send_queue_max_replica * message_size_max;
+pub const tcp_sndbuf_client = connection_send_queue_max_client * message_size_max;
 
 /// Whether to enable TCP keepalive:
 pub const tcp_keepalive = true;
@@ -218,3 +223,13 @@ pub const clock_synchronization_window_min_ms = 2000;
 /// This eliminates the impact of gradual clock drift on our clock offset (clock skew) measurements.
 /// If a window expires because of this then it is likely that the clock epoch will also be expired.
 pub const clock_synchronization_window_max_ms = 20000;
+
+comptime {
+    // vsr.parse_address assumes that config.address/config.port are valid.
+    _ = std.net.Address.parseIp4(address, 0) catch unreachable;
+    _ = @as(u16, port);
+
+    // Avoid latency issues from a too-large sndbuf.
+    assert(tcp_sndbuf_replica <= 4 * 1024 * 1024);
+    assert(tcp_sndbuf_client <= 4 * 1024 * 1024);
+}