cdp: fix some id inconsitency accross runtime messages

Author: krichprollsch

src/cdp/cdp.zig

@@ -100,6 +100,7 @@ pub fn do(
 pub const State = struct {
     executionContextId: u32 = 0,
     contextID: ?[]const u8 = null,
+    sessionID: ?[]const u8 = null,
     frameID: []const u8 = FrameID,
     url: []const u8 = URLBase,
     securityOrigin: []const u8 = URLBase,

src/cdp/runtime.zig

@@ -117,6 +117,8 @@ fn sendInspector(
         }
     }
 
+    ctx.state.sessionID = msg.sessionId;
+
     // remove awaitPromise true params
     // TODO: delete when Promise are correctly handled by zig-js-runtime
     if (method == .callFunctionOn or method == .evaluate) {
@@ -129,13 +131,11 @@ fn sendInspector(
         }
     }
 
-    ctx.sendInspector(msg.json);
-
     if (method == .enable) {
         try executionContextCreated(
             alloc,
             ctx,
-            0,
+            1,
             "://",
             "",
             // TODO: hard coded ID
@@ -147,10 +147,12 @@ fn sendInspector(
                 .frameId = cdp.FrameID,
             },
             // TODO: hard coded ID
-            target.BrowserContextID,
+            msg.sessionId orelse target.BrowserContextID,
         );
     }
 
+    ctx.sendInspector(msg.json);
+
     return "";
 }
 

src/cdp/target.zig

@@ -123,7 +123,7 @@ fn setAutoAttach(
             .sessionId = cdp.BrowserSessionID,
             .targetInfo = .{
                 .targetId = PageTargetID,
-                .title = "New Incognito tab",
+                .title = "about:blank",
                 .url = cdp.URLBase,
                 .browserContextId = BrowserContextID,
             },
@@ -156,8 +156,8 @@ fn attachToTarget(
         const attached = AttachToTarget{
             .sessionId = cdp.BrowserSessionID,
             .targetInfo = .{
-                .targetId = PageTargetID,
-                .title = "New Incognito tab",
+                .targetId = input.params.targetId,
+                .title = "about:blank",
                 .url = cdp.URLBase,
                 .browserContextId = BrowserContextID,
             },
@@ -170,7 +170,7 @@ fn attachToTarget(
         sessionId: []const u8,
     };
     const output = SessionId{
-        .sessionId = input.sessionId orelse BrowserContextID,
+        .sessionId = input.sessionId orelse cdp.BrowserSessionID,
     };
     return result(alloc, input.id, SessionId, output, null);
 }
@@ -327,15 +327,17 @@ fn createTarget(
     ctx.state.securityOrigin = "://";
     ctx.state.secureContextType = "InsecureScheme";
     ctx.state.loaderID = LoaderID;
+    ctx.state.sessionID = msg.sessionId;
 
     // send attachToTarget event
     const attached = AttachToTarget{
         .sessionId = cdp.ContextSessionID,
         .targetInfo = .{
             .targetId = ctx.state.frameID,
-            .title = "",
+            .title = "about:blank",
             .url = ctx.state.url,
             .browserContextId = input.params.browserContextId orelse ContextID,
+            .attached = true,
         },
         .waitingForDebugger = true,
     };

src/server.zig

@@ -347,7 +347,7 @@ pub const Ctx = struct {
         const s = try std.fmt.allocPrint(
             allocator,
             tpl,
-            .{ msg_open, cdp.ContextSessionID },
+            .{ msg_open, ctx.state.sessionID orelse cdp.ContextSessionID },
         );
 
         try ctx.send(s);