Lightpanda: the headless browser designed for AI and automation
include header copy option to sync requests
Muki Kiboigof786c180558d
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zigindex 55bc76786..819eb805d 100644--- a/src/browser/Frame.zig+++ b/src/browser/Frame.zig@@ -2520,7 +2520,7 @@ pub fn loadExternalStylesheet(self: *Frame, link: *Element.Html.Link, href: []cosm.is_evaluating = true;defer sm.endEvaluationWindow(was_evaluating);- var response = transfer.submitSync() catch |err| {+ var response = transfer.submitSync(.{}) catch |err| {log.warn(.http, "external stylesheet fetch", .{ .err = err, .url = resolved });return self.fireElementEvent(element, comptime .wrap("error"));};diff --git a/src/browser/ScriptManager.zig b/src/browser/ScriptManager.zigindex 08fced465..b60d34223 100644--- a/src/browser/ScriptManager.zig+++ b/src/browser/ScriptManager.zig@@ -395,7 +395,7 @@ pub fn addFromElement(self: *ScriptManager, comptime from_parser: bool, script_etry frame.headersForRequest(transfer, .{});}- const response = try transfer.submitSync();+ const response = try transfer.submitSync(.{});// Take the body's arena rather than releasing it: `source`// has to outlive this call, up to script.deinit().diff --git a/src/browser/webapi/WorkerGlobalScope.zig b/src/browser/webapi/WorkerGlobalScope.zigindex 54a71ee56..2a371fd50 100644--- a/src/browser/webapi/WorkerGlobalScope.zig+++ b/src/browser/webapi/WorkerGlobalScope.zig@@ -437,7 +437,7 @@ fn importScript(self: *WorkerGlobalScope, arena: Allocator, url: [:0]const u8) !try self.headersForRequest(transfer, .{});}- var response = transfer.submitSync() catch |err| {+ var response = transfer.submitSync(.{}) catch |err| {log.warn(.http, "importScript", .{ .url = resolved_url, .err = err });return error.NetworkError;};diff --git a/src/browser/webapi/net/XMLHttpRequest.zig b/src/browser/webapi/net/XMLHttpRequest.zigindex c4dacf90c..97fc9e667 100644--- a/src/browser/webapi/net/XMLHttpRequest.zig+++ b/src/browser/webapi/net/XMLHttpRequest.zig@@ -384,7 +384,7 @@ pub fn send(self: *XMLHttpRequest, body_: ?BodyInit, exec_: *const Execution) !vreturn;}- var resp = transfer.submitSync() catch |err| {+ var resp = transfer.submitSync(.{ .copy_headers = true }) catch |err| {log.err(.http, "sync request failed", .{.source = "xhr",.url = self._url,diff --git a/src/network/HttpClient.zig b/src/network/HttpClient.zigindex 9022edcb3..d53e6eeec 100644--- a/src/network/HttpClient.zig+++ b/src/network/HttpClient.zig@@ -1424,6 +1424,11 @@ fn cacheStore(self: *Client, transfer: *Transfer) void {};}+pub const SyncOptions = struct {+ // Whether to copy the response headers into SyncResponse.headers.+ copy_headers: bool = false,+};+const SyncContext = struct {client: *Client,completion: union(enum) {@@ -1433,6 +1438,8 @@ const SyncContext = struct {shutdown: void,} = .in_progress,+ options: SyncOptions = .{},+status: u16 = 0,status_text: http.StatusText = .{},body: std.ArrayList(u8),@@ -1450,12 +1457,14 @@ const SyncContext = struct {const body_len = transfer.bodyLen();const allocator = try self.bodyAllocator(body_len);- var it = transfer.responseHeaderIterator();- while (it.next()) |hdr| {- try self.headers.append(allocator, .{- .name = try allocator.dupe(u8, hdr.name),- .value = try allocator.dupe(u8, hdr.value),- });+ if (self.options.copy_headers) {+ var it = transfer.responseHeaderIterator();+ while (it.next()) |hdr| {+ try self.headers.append(allocator, .{+ .name = try allocator.dupe(u8, hdr.name),+ .value = try allocator.dupe(u8, hdr.value),+ });+ }}if (body_len > 0) {@@ -2630,7 +2639,7 @@ pub const Transfer = struct {};}- pub fn submitSync(self: *Transfer) !SyncResponse {+ pub fn submitSync(self: *Transfer, opts: SyncOptions) !SyncResponse {const client = self.client;if (client.disconnected) {@@ -2646,7 +2655,7 @@ pub const Transfer = struct {return error.SyncWaitInterrupted;}- var sync_ctx = SyncContext{ .client = client, .body = .empty };+ var sync_ctx = SyncContext{ .client = client, .body = .empty, .options = opts };errdefer if (sync_ctx.arena) |arena| arena.release();const req = &self.req;diff --git a/src/server/cdp/CDP.zig b/src/server/cdp/CDP.zigindex b716273d0..0287ff236 100644--- a/src/server/cdp/CDP.zig+++ b/src/server/cdp/CDP.zig@@ -1713,5 +1713,5 @@ test "cdp: syncRequest short-circuits after disconnect" {.resource_type = .fetch,.shutdown_callback = HttpClient.noopShutdown,}, null);- try testing.expectError(error.ClientDisconnected, transfer.submitSync());+ try testing.expectError(error.ClientDisconnected, transfer.submitSync(.{}));}