Expose APIs for pageWait

Author: carson-katri

include/lightpanda.h

@@ -1,6 +1,12 @@
 #ifndef _LIGHTPANDA_H
 #define _LIGHTPANDA_H
 
+typedef enum {
+    done = 0,
+    no_page = 1,
+    extra_socket = 2,
+} Session_WaitResult;
+
 void* lightpanda_app_init();
 void lightpanda_app_deinit(void* app_ptr);
 
@@ -10,6 +16,7 @@ void lightpanda_browser_deinit(void* browser_ptr);
 void* lightpanda_browser_new_session(void* browser_ptr);
 
 void* lightpanda_session_create_page(void* session_ptr);
+void* lightpanda_session_page(void* session_ptr);
 
 void lightpanda_page_navigate(void* page_ptr, const char *url);
 
@@ -19,6 +26,8 @@ const char* lightpanda_cdp_create_browser_context(void* cdp_ptr);
 void* lightpanda_cdp_browser(void* cdp_ptr);
 void lightpanda_cdp_process_message(void* cdp_ptr, const char *msg);
 void* lightpanda_cdp_browser_context(void* cdp_ptr);
+Session_WaitResult lightpanda_cdp_page_wait(void* cdp_ptr, int ms);
+
 void* lightpanda_browser_context_session(void* browser_context_ptr);
 
 #endif

src/lib.zig

@@ -9,7 +9,19 @@ const BrowserContext = @import("cdp/cdp.zig").BrowserContext;
 export fn lightpanda_app_init() ?*anyopaque {
     const allocator = std.heap.c_allocator;
 
-    const app = App.init(allocator, .{ .run_mode = .fetch, .tls_verify_host = false }) catch return null;
+    const app = App.init(allocator, .{
+        // .run_mode = .serve,
+        // .tls_verify_host = false
+        .run_mode = .serve,
+        .tls_verify_host = false,
+        // .http_proxy = null,
+        // .proxy_bearer_token = args.proxyBearerToken(),
+        // .tls_verify_host = args.tlsVerifyHost(),
+        // .http_timeout_ms = args.httpTimeout(),
+        // .http_connect_timeout_ms = args.httpConnectTiemout(),
+        // .http_max_host_open = args.httpMaxHostOpen(),
+        // .http_max_concurrent = args.httpMaxConcurrent(),
+    }) catch return null;
 
     return app;
 }
@@ -45,6 +57,11 @@ export fn lightpanda_session_create_page(session_ptr: *anyopaque) ?*anyopaque {
     return page;
 }
 
+export fn lightpanda_session_page(session_ptr: *anyopaque) ?*anyopaque {
+    const session: *Session = @ptrCast(@alignCast(session_ptr));
+    return &session.page;
+}
+
 export fn lightpanda_page_navigate(page_ptr: *anyopaque, url: [*:0]const u8) void {
     const page: *Page = @ptrCast(@alignCast(page_ptr));
     page.navigate(std.mem.span(url), .{}) catch return;
@@ -72,19 +89,11 @@ const NativeClient = struct {
         const slice = try self.allocator.dupeZ(u8, serialized);
         defer self.allocator.free(slice);
         self.handler(self.ctx, slice.ptr);
-
-        // try self.serialized.append(self.allocator, serialized);
-
-        // const value = try std.json.parseFromSliceLeaky(std.json.Value, self.allocator, serialized, .{});
-        // try self.sent.append(self.allocator, value);
-        // @panic("trying to send JSON to nativeClient");
     }
 
     pub fn sendJSONRaw(self: *NativeClient, buf: std.ArrayListUnmanaged(u8)) !void {
-        // const value = try std.json.parseFromSliceLeaky(std.json.Value, self.allocator, buf.items, .{});
-        // try self.sent.append(self.allocator, value);
-        // @panic("trying to send raw JSON to nativeClient");
-        const slice = try self.allocator.dupeZ(u8, buf.items);
+        const msg = buf.items[10..]; // CDP adds 10 0s for a WebSocket header.
+        const slice = try self.allocator.dupeZ(u8, msg);
         defer self.allocator.free(slice);
         self.handler(self.ctx, slice.ptr);
     }
@@ -143,6 +152,11 @@ export fn lightpanda_cdp_browser_context(cdp_ptr: *anyopaque) *anyopaque {
     return &cdp.browser_context.?;
 }
 
+export fn lightpanda_cdp_page_wait(cdp_ptr: *anyopaque, ms: i32) c_int {
+    const cdp: *CDP = @ptrCast(@alignCast(cdp_ptr));
+    return @intFromEnum(cdp.pageWait(ms));
+}
+
 export fn lightpanda_browser_context_session(browser_context_ptr: *anyopaque) *anyopaque {
     const browser_context: *BrowserContext(CDP) = @ptrCast(@alignCast(browser_context_ptr));
     return browser_context.session;

src/log.zig

@@ -49,7 +49,7 @@ const Opts = struct {
     filter_scopes: []const Scope = &.{},
 };
 
-pub var opts = Opts{};
+pub var opts = Opts{ .level = .info, .format = .pretty };
 
 // synchronizes writes to the output
 var out_lock: Thread.Mutex = .{};