Skip to content

Lightpanda: the headless browser designed for AI and automation

test: stop CDP/BiDi harness reads from blocking

Adrià Arrufata68ac01c2b5f
diff --git a/src/server/bidi/testing.zig b/src/server/bidi/testing.zig
index 236291e86..f44b4f887 100644
--- a/src/server/bidi/testing.zig
+++ b/src/server/bidi/testing.zig
@@ -24,6 +24,7 @@ const Frame = @import("../../browser/Frame.zig");
const BiDi = @import("BiDi.zig");
const Inbox = @import("../../Inbox.zig");
const Driver = @import("../Driver.zig");
+const sys_net = @import("../../sys/net.zig");
const json = std.json;
const posix = std.posix;
@@ -292,11 +293,16 @@ pub fn context() !TestContext {
_ = std.c.close(pair[1]);
}
+ // Replies are written synchronously, so reads never need to wait for data.
+ const flags = try sys_net.fcntl(pair[0], posix.F.GETFL, 0);
+ _ = try sys_net.fcntl(pair[0], posix.F.SETFL, flags | @as(u32, @bitCast(posix.O{ .NONBLOCK = true })));
+
const timeout = std.mem.toBytes(posix.timeval{ .sec = 0, .usec = 5_000 });
+ try posix.setsockopt(pair[1], posix.SOL.SOCKET, posix.SO.RCVTIMEO, &timeout);
+ try posix.setsockopt(pair[1], posix.SOL.SOCKET, posix.SO.SNDTIMEO, &timeout);
+
const buffer_size = std.mem.toBytes(@as(c_int, 32_768));
for (pair) |socket| {
- try posix.setsockopt(socket, posix.SOL.SOCKET, posix.SO.RCVTIMEO, &timeout);
- try posix.setsockopt(socket, posix.SOL.SOCKET, posix.SO.SNDTIMEO, &timeout);
try posix.setsockopt(socket, posix.SOL.SOCKET, posix.SO.RCVBUF, &buffer_size);
try posix.setsockopt(socket, posix.SOL.SOCKET, posix.SO.SNDBUF, &buffer_size);
}
diff --git a/src/server/cdp/testing.zig b/src/server/cdp/testing.zig
index 8af7fec67..f6f03b691 100644
--- a/src/server/cdp/testing.zig
+++ b/src/server/cdp/testing.zig
@@ -21,6 +21,7 @@ const std = @import("std");
const CDP = @import("CDP.zig");
const Inbox = @import("../../Inbox.zig");
const Driver = @import("../Driver.zig");
+const sys_net = @import("../../sys/net.zig");
pub const base = @import("../../testing.zig");
@@ -196,7 +197,9 @@ pub const TestContext = struct {
break :blk try std.json.parseFromSliceLeaky(json.Value, base.arena_allocator, serialized, .{});
};
- for (0..5) |_| {
+ try self.read();
+ const start: std.Io.Timestamp = .now(io, .awake);
+ while (true) {
for (self.received.items, 0..) |received, i| {
if (try base.isEqualJson(expected_json, received) == false) {
continue;
@@ -212,13 +215,10 @@ pub const TestContext = struct {
return;
}
- if (self.cdp_.browser_context) |*bc| {
- if (bc.session.hasPage()) {
- var runner = bc.session.runner(.{});
- _ = try runner.tickForFrame(bc.page_handle.?.frame_id, 1000, .{ .until = .done });
- }
+ if (start.durationTo(.now(io, .awake)).toMilliseconds() >= 2000) {
+ break;
}
- io.sleep(.fromMilliseconds(5), .awake) catch {};
+ try self.tick();
try self.read();
}
self.dumpReceived();
@@ -233,16 +233,29 @@ pub const TestContext = struct {
}
pub fn getSentMessage(self: *TestContext, index: usize) !?json.Value {
- for (0..5) |_| {
- if (index < self.received.items.len) {
- return self.received.items[index];
- }
- io.sleep(.fromMilliseconds(5), .awake) catch {};
+ if (index >= self.received.items.len) {
try self.read();
}
+ if (index < self.received.items.len) {
+ return self.received.items[index];
+ }
return null;
}
+ /// Advances the page so asynchronous events get a chance to be sent.
+ fn tick(self: *TestContext) !void {
+ if (self.cdp_.browser_context) |*bc| {
+ if (bc.session.hasPage()) {
+ var runner = bc.session.runner(.{});
+ switch (try runner.tickForFrame(bc.page_handle.?.frame_id, 20, .{ .until = .done })) {
+ .ok => return,
+ .done => {},
+ }
+ }
+ }
+ io.sleep(.fromMilliseconds(1), .awake) catch {};
+ }
+
fn read(self: *TestContext) !void {
while (true) {
const n = posix.read(self.socket, self.read_buf[self.read_at..]) catch |err| switch (err) {
@@ -312,9 +325,11 @@ pub fn context() !TestContext {
_ = std.c.close(pair[1]);
}
+ // Replies are written synchronously, so reads never need to wait for data.
+ const flags = try sys_net.fcntl(pair[0], posix.F.GETFL, 0);
+ _ = try sys_net.fcntl(pair[0], posix.F.SETFL, flags | @as(u32, @bitCast(posix.O{ .NONBLOCK = true })));
+
const timeout = std.mem.toBytes(posix.timeval{ .sec = 0, .usec = 5_000 });
- try posix.setsockopt(pair[0], posix.SOL.SOCKET, posix.SO.RCVTIMEO, &timeout);
- try posix.setsockopt(pair[0], posix.SOL.SOCKET, posix.SO.SNDTIMEO, &timeout);
try posix.setsockopt(pair[1], posix.SOL.SOCKET, posix.SO.RCVTIMEO, &timeout);
try posix.setsockopt(pair[1], posix.SOL.SOCKET, posix.SO.SNDTIMEO, &timeout);