From 60f4eab759066f77bb42c158f738a072bf6fa240 Mon Sep 17 00:00:00 2001 From: sjorsdonkers <72333389+sjorsdonkers@users.noreply.github.com> Date: Tue, 17 Jun 2025 18:13:06 +0200 Subject: [PATCH] handle no params --- src/cdp/domains/network.zig | 6 +++--- src/cdp/domains/storage.zig | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/cdp/domains/network.zig b/src/cdp/domains/network.zig index 2cee435d..7a5cd02b 100644 --- a/src/cdp/domains/network.zig +++ b/src/cdp/domains/network.zig @@ -132,6 +132,7 @@ fn deleteCookies(cmd: anytype) !void { } fn clearBrowserCookies(cmd: anytype) !void { + if (try cmd.params(struct {}) != null) return error.InvalidParams; const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded; bc.session.cookie_jar.clearRetainingCapacity(); return cmd.sendResult(null, .{}); @@ -161,11 +162,10 @@ fn setCookies(cmd: anytype) !void { try cmd.sendResult(null, .{}); } +const GetCookiesParam = struct { urls: ?[]const []const u8 = null }; fn getCookies(cmd: anytype) !void { const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded; - const params = (try cmd.params(struct { - urls: ?[]const []const u8 = null, - })) orelse return error.InvalidParams; + const params = (try cmd.params(GetCookiesParam)) orelse GetCookiesParam{}; // If not specified, use the URLs of the page and all of its subframes. TODO subframes const page_url = if (bc.session.page) |*page| page.url.raw else null; // @speed: avoid repasing the URL diff --git a/src/cdp/domains/storage.zig b/src/cdp/domains/storage.zig index c9c01323..f26bdfef 100644 --- a/src/cdp/domains/storage.zig +++ b/src/cdp/domains/storage.zig @@ -38,11 +38,11 @@ pub fn processMessage(cmd: anytype) !void { } } +const BrowserContextParam = struct { browserContextId: ?[]const u8 = null }; + fn clearCookies(cmd: anytype) !void { const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded; - const params = (try cmd.params(struct { - browserContextId: ?[]const u8 = null, - })) orelse return error.InvalidParams; + const params = (try cmd.params(BrowserContextParam)) orelse BrowserContextParam{}; if (params.browserContextId) |browser_context_id| { if (std.mem.eql(u8, browser_context_id, bc.id) == false) { @@ -57,9 +57,7 @@ fn clearCookies(cmd: anytype) !void { fn getCookies(cmd: anytype) !void { const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded; - const params = (try cmd.params(struct { - browserContextId: ?[]const u8 = null, - })) orelse return error.InvalidParams; + const params = (try cmd.params(BrowserContextParam)) orelse BrowserContextParam{}; if (params.browserContextId) |browser_context_id| { if (std.mem.eql(u8, browser_context_id, bc.id) == false) {