Merge branch 'main' into fix_context_lifetime

src/cdp/cdp.zig

@@ -17,6 +17,8 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 const std = @import("std");
+const lp = @import("lightpanda");
+
 const Allocator = std.mem.Allocator;
 const json = std.json;
 
@@ -35,6 +37,8 @@ const InterceptState = @import("domains/fetch.zig").InterceptState;
 pub const URL_BASE = "chrome://newtab/";
 pub const LOADER_ID = "LOADERID24DD2FD56CF1EF33C965C79C";
 
+const IS_DEBUG = @import("builtin").mode == .Debug;
+
 pub const CDP = CDPT(struct {
     const Client = *@import("../Server.zig").Client;
 });
@@ -657,7 +661,7 @@ pub fn BrowserContext(comptime CDP_T: type) type {
         pub fn onInspectorEvent(ctx: *anyopaque, msg: []const u8) void {
             if (log.enabled(.cdp, .debug)) {
                 // msg should be {"method":<method>,...
-                std.debug.assert(std.mem.startsWith(u8, msg, "{\"method\":"));
+                lp.assert(std.mem.startsWith(u8, msg, "{\"method\":"), "onInspectorEvent prefix", .{});
                 const method_end = std.mem.indexOfScalar(u8, msg, ',') orelse {
                     log.err(.cdp, "invalid inspector event", .{ .msg = msg });
                     return;
@@ -716,7 +720,9 @@ pub fn BrowserContext(comptime CDP_T: type) type {
             buf.appendSliceAssumeCapacity(field);
             buf.appendSliceAssumeCapacity(session_id);
             buf.appendSliceAssumeCapacity("\"}");
-            std.debug.assert(buf.items.len == message_len);
+            if (comptime IS_DEBUG) {
+                std.debug.assert(buf.items.len == message_len);
+            }
 
             try cdp.client.sendJSONRaw(buf);
         }

src/cdp/domains/network.zig

@@ -17,6 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 const std = @import("std");
+const lp = @import("lightpanda");
 const Allocator = std.mem.Allocator;
 
 const CdpStorage = @import("storage.zig");
@@ -215,7 +216,7 @@ pub fn httpRequestFail(arena: Allocator, bc: anytype, msg: *const Notification.R
 
     // Isn't possible to do a network request within a Browser (which our
     // notification is tied to), without a page.
-    std.debug.assert(bc.session.page != null);
+    lp.assert(bc.session.page != null, "CDP.network.httpRequestFail null page", .{});
 
     // We're missing a bunch of fields, but, for now, this seems like enough
     try bc.cdp.sendEvent("Network.loadingFailed", .{

src/cdp/domains/page.zig

@@ -17,13 +17,15 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 const std = @import("std");
+const lp = @import("lightpanda");
+
+const log = @import("../../log.zig");
+const js = @import("../../browser/js/js.zig");
 const Page = @import("../../browser/Page.zig");
 const timestampF = @import("../../datetime.zig").timestamp;
 const Notification = @import("../../Notification.zig");
-const log = @import("../../log.zig");
-const js = @import("../../browser/js/js.zig");
-const v8 = js.v8;
 
+const v8 = js.v8;
 const Allocator = std.mem.Allocator;
 
 pub fn processMessage(cmd: anytype) !void {
@@ -142,7 +144,7 @@ fn close(cmd: anytype) !void {
     const target_id = bc.target_id orelse return error.TargetNotLoaded;
 
     // can't be null if we have a target_id
-    std.debug.assert(bc.session.page != null);
+    lp.assert(bc.session.page != null, "CDP.page.close null page", .{});
 
     try cmd.sendResult(.{}, .{});
 

src/cdp/domains/target.zig

@@ -17,6 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 const std = @import("std");
+const lp = @import("lightpanda");
 const log = @import("../../log.zig");
 const js = @import("../../browser/js/js.zig");
 
@@ -165,10 +166,10 @@ fn createTarget(cmd: anytype) !void {
     }
 
     // if target_id is null, we should never have a page
-    std.debug.assert(bc.session.page == null);
+    lp.assert(bc.session.page == null, "CDP.target.createTarget not null page", .{});
 
     // if target_id is null, we should never have a session_id
-    std.debug.assert(bc.session_id == null);
+    lp.assert(bc.session_id == null, "CDP.target.createTarget not null session_id", .{});
 
     const target_id = cmd.cdp.target_id_gen.next();
 
@@ -260,7 +261,7 @@ fn closeTarget(cmd: anytype) !void {
     }
 
     // can't be null if we have a target_id
-    std.debug.assert(bc.session.page != null);
+    lp.assert(bc.session.page != null, "CDP.target.closeTarget null page", .{});
 
     try cmd.sendResult(.{ .success = true }, .{ .include_session_id = false });
 
@@ -337,7 +338,7 @@ fn sendMessageToTarget(cmd: anytype) !void {
         return error.TargetNotLoaded;
     }
 
-    std.debug.assert(bc.session_id != null);
+    lp.assert(bc.session_id != null, "CDP.target.sendMessageToTarget null session_id", .{});
     if (std.mem.eql(u8, bc.session_id.?, params.sessionId) == false) {
         // Is this right? Is the params.sessionId meant to be the active
         // sessionId? What else could it be? We have no other session_id.
@@ -445,7 +446,7 @@ fn setAutoAttach(cmd: anytype) !void {
 
 fn doAttachtoTarget(cmd: anytype, target_id: []const u8) !void {
     const bc = cmd.browser_context.?;
-    std.debug.assert(bc.session_id == null);
+    lp.assert(bc.session_id == null, "CDP.target.doAttachtoTarget not null session_id", .{});
     const session_id = cmd.cdp.session_id_gen.next();
 
     // extra_headers should not be kept on a new page or tab,