2 files changed, 7 insertions, 6 deletions
diff --git a/src/main.zig b/src/main.zig
index d1a0165..6c3dd09 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -32,9 +32,9 @@ pub fn main() !void {
 
     // _ = try Saprus.sendInitialConnection(if (message.items.len > 0) message.items else "Hello darkness my old friend", 6868, gpa);
 
-    const res = Saprus.connect(if (message.items.len > 0) message.items else "Hello darkness my old friend", gpa) catch |err| {
-        std.debug.print("Error: {s}", .{@errorName(err)});
-        return;
+    const res: ?SaprusMessage = Saprus.connect(if (message.items.len > 0) message.items else "Hello darkness my old friend", gpa) catch |err| switch (err) {
+        error.WouldBlock => null,
+        else => return err,
     };
     defer if (res) |r| r.deinit(gpa);
     if (res) |r| {
@@ -52,3 +52,4 @@ const DebugAllocator = std.heap.DebugAllocator(.{});
 const ArrayList = std.ArrayList;
 
 const Saprus = @import("./saprus.zig");
+const SaprusMessage = Saprus.SaprusMessage;
diff --git a/src/saprus.zig b/src/saprus.zig
index e89998a..b8a84b2 100644
--- a/src/saprus.zig
+++ b/src/saprus.zig
@@ -98,13 +98,13 @@ pub fn connect(payload: []const u8, allocator: Allocator) !?SaprusMessage {
     };
 
     // timeout 1s
-    try sock.setReadTimeout(1_000_000);
+    try sock.setReadTimeout(1 * std.time.us_per_s);
     try sock.bind(bind_addr);
 
     const msg = try sendInitialConnection(payload, initial_port, allocator);
 
     var response_buf: [4096]u8 = undefined;
-    _ = try sock.receive(&response_buf);
+    _ = try sock.receive(&response_buf); // Ignore message that I sent.
     const len = try sock.receive(&response_buf);
 
     initial_conn_res = try SaprusMessage.fromBytes(response_buf[0..len], allocator);
@@ -115,7 +115,7 @@ pub fn connect(payload: []const u8, allocator: Allocator) !?SaprusMessage {
     return initial_conn_res;
 }
 
-const SaprusMessage = @import("./saprus_message.zig").SaprusMessage;
+pub const SaprusMessage = @import("./saprus_message.zig").SaprusMessage;
 
 const std = @import("std");
 const Random = std.Random;