Redirect Runtime domain to JS engine Inspector

Signed-off-by: Francis Bouvier <[email protected]>

Author: francisbouvier

src/browser/browser.zig

@@ -51,10 +51,9 @@ const log = std.log.scoped(.browser);
 pub const Browser = struct {
     session: *Session,
 
-    pub fn init(alloc: std.mem.Allocator, vm: jsruntime.VM) !Browser {
+    pub fn init(alloc: std.mem.Allocator) !Browser {
         // We want to ensure the caller initialised a VM, but the browser
         // doesn't use it directly...
-        _ = vm;
 
         return Browser{
             .session = try Session.init(alloc, "about:blank"),
@@ -91,6 +90,7 @@ pub const Session = struct {
     loader: Loader,
     env: Env = undefined,
     loop: Loop,
+    inspector: ?jsruntime.Inspector = null,
     window: Window,
     // TODO move the shed to the browser?
     storageShed: storage.Shed,
@@ -122,6 +122,10 @@ pub const Session = struct {
     fn deinit(self: *Session) void {
         if (self.page) |page| page.end();
 
+        if (self.inspector) |inspector| {
+            inspector.deinit(self.alloc);
+        }
+
         self.env.deinit();
         self.arena.deinit();
 
@@ -132,9 +136,25 @@ pub const Session = struct {
         self.alloc.destroy(self);
     }
 
+    pub fn setInspector(
+        self: *Session,
+        ctx: *anyopaque,
+        onResp: jsruntime.InspectorOnResponseFn,
+        onEvent: jsruntime.InspectorOnEventFn,
+    ) !void {
+        self.inspector = try jsruntime.Inspector.init(self.alloc, self.env, ctx, onResp, onEvent);
+        self.env.setInspector(self.inspector.?);
+    }
+
     pub fn createPage(self: *Session) !Page {
         return Page.init(self.alloc, self);
     }
+
+    pub fn callInspector(self: *Session, msg: []const u8) void {
+        if (self.inspector) |inspector| {
+            inspector.send(msg, self.env);
+        }
+    }
 };
 
 // Page navigates to an url.
@@ -219,7 +239,7 @@ pub const Page = struct {
     }
 
     // spec reference: https://html.spec.whatwg.org/#document-lifecycle
-    pub fn navigate(self: *Page, uri: []const u8) !void {
+    pub fn navigate(self: *Page, uri: []const u8, auxData: ?[]const u8) !void {
         const alloc = self.arena.allocator();
 
         log.debug("starting GET {s}", .{uri});
@@ -280,7 +300,7 @@ pub const Page = struct {
         log.debug("header content-type: {s}", .{ct.?});
         const mime = try Mime.parse(ct.?);
         if (mime.eql(Mime.HTML)) {
-            try self.loadHTMLDoc(req.reader(), mime.charset orelse "utf-8");
+            try self.loadHTMLDoc(req.reader(), mime.charset orelse "utf-8", auxData);
         } else {
             log.info("non-HTML document: {s}", .{ct.?});
 
@@ -290,7 +310,7 @@ pub const Page = struct {
     }
 
     // https://html.spec.whatwg.org/#read-html
-    fn loadHTMLDoc(self: *Page, reader: anytype, charset: []const u8) !void {
+    fn loadHTMLDoc(self: *Page, reader: anytype, charset: []const u8, auxData: ?[]const u8) !void {
         const alloc = self.arena.allocator();
 
         // start netsurf memory arena.
@@ -327,6 +347,11 @@ pub const Page = struct {
         log.debug("start js env", .{});
         try self.session.env.start();
 
+        // inspector
+        if (self.session.inspector) |inspector| {
+            inspector.contextCreated(self.session.env, "", self.origin.?, auxData);
+        }
+
         // replace the user context document with the new one.
         try self.session.env.setUserContext(.{
             .document = html_doc,

src/cdp/cdp.zig

@@ -16,6 +16,7 @@ const performance = @import("performance.zig").performance;
 pub const Error = error{
     UnknonwDomain,
     UnknownMethod,
+    NoResponse,
 };
 
 pub fn isCdpError(err: anyerror) ?Error {
@@ -85,7 +86,7 @@ pub fn do(
         .Target => target(alloc, id, iter.next().?, &scanner, ctx),
         .Page => page(alloc, id, iter.next().?, &scanner, ctx),
         .Log => log(alloc, id, iter.next().?, &scanner, ctx),
-        .Runtime => runtime(alloc, id, iter.next().?, &scanner, ctx),
+        .Runtime => runtime(alloc, id, iter.next().?, &scanner, s, ctx),
         .Network => network(alloc, id, iter.next().?, &scanner, ctx),
         .Emulation => emulation(alloc, id, iter.next().?, &scanner, ctx),
         .Fetch => fetch(alloc, id, iter.next().?, &scanner, ctx),
@@ -199,7 +200,7 @@ fn getParams(
     key: []const u8,
 ) !?T {
 
-    // check key key is "params"
+    // check key is "params"
     if (!std.mem.eql(u8, "params", key)) return null;
 
     // skip "params" if not requested
@@ -285,7 +286,8 @@ pub fn getMsg(
 // Common
 // ------
 
-pub const SessionID = "9559320D92474062597D9875C664CAC0";
+pub const BrowserSessionID = "9559320D92474062597D9875C664CAC0";
+pub const ContextSessionID = "4FDC2CB760A23A220497A05C95417CF4";
 pub const URLBase = "chrome://newtab/";
 pub const FrameID = "90D14BBD8AED408A0467AC93100BCDBE";
 pub const LoaderID = "CFC8BED824DD2FD56CF1EF33C965C79C";

src/cdp/page.zig

@@ -144,13 +144,38 @@ fn createIsolatedWorld(
     alloc: std.mem.Allocator,
     id: ?u16,
     scanner: *std.json.Scanner,
-    _: *Ctx,
+    ctx: *Ctx,
 ) ![]const u8 {
-    const msg = try getMsg(alloc, void, scanner);
+
+    // input
+    const Params = struct {
+        frameId: []const u8,
+        worldName: []const u8,
+        grantUniveralAccess: bool,
+    };
+    const msg = try getMsg(alloc, Params, scanner);
+    std.debug.assert(msg.sessionID != null);
+    const params = msg.params.?;
+
+    // noop executionContextCreated event
+    try Runtime.executionContextCreated(
+        alloc,
+        ctx,
+        0,
+        "",
+        params.worldName,
+        "7102379147004877974.3265385113993241162",
+        .{
+            .isDefault = false,
+            .type = "isolated",
+            .frameId = params.frameId,
+        },
+        msg.sessionID,
+    );
 
     // output
     const Resp = struct {
-        executionContextId: u8 = 2,
+        executionContextId: u8 = 0,
     };
 
     return result(alloc, id orelse msg.id.?, Resp, .{}, msg.sessionID);
@@ -230,20 +255,14 @@ fn navigate(
 
     // Launch navigate
     var p = try ctx.browser.currentSession().createPage();
-    _ = try p.navigate(params.url);
-
-    // Send create runtime context event
     ctx.state.executionContextId += 1;
-    try Runtime.executionContextCreated(
+    const auxData = try std.fmt.allocPrint(
         alloc,
-        ctx,
-        ctx.state.executionContextId,
-        "http://127.0.0.1:1234", // TODO: real domain
-        "",
-        "7102379147004877974.3265385113993241162",
-        .{ .frameId = ctx.state.frameID },
-        msg.sessionID,
+        "{{\"isDefault\":true,\"type\":\"default\",\"frameId\":\"{s}\"}}",
+        .{ctx.state.frameID},
     );
+    defer alloc.free(auxData);
+    _ = try p.navigate(params.url, auxData);
 
     // frameNavigated event
     const FrameNavigated = struct {