diff --git a/moli-protocol/src/domains/runtime/tests/mod.rs b/moli-protocol/src/domains/runtime/tests/mod.rs
index 1dc5da8f1b6..07429929573 100644
--- a/moli-protocol/src/domains/runtime/tests/mod.rs
+++ b/moli-protocol/src/domains/runtime/tests/mod.rs
@@ -221,3 +221,4 @@ mod service_worker;
mod shared_worker;
mod worker_emulation;
+mod worker_loading_attachment;
diff --git a/moli-protocol/src/domains/runtime/tests/worker_loading_attachment.rs b/moli-protocol/src/domains/runtime/tests/worker_loading_attachment.rs
new file mode 100644
index 00000000000..8c7c0c426e1
--- /dev/null
+++ b/moli-protocol/src/domains/runtime/tests/worker_loading_attachment.rs
@@ -0,0 +1,214 @@
+use super::*;
+use serde_json::Value;
+use std::{sync::Arc, time::Duration};
+use tokio::sync::Notify;
+
+async fn command(
+ ctx: &mut TestContext,
+ id: u64,
+ session: Option<&str>,
+ method: &str,
+ params: Value,
+) -> Value {
+ let mut request = json!({"id":id, "method":method, "params":params});
+ if let Some(session) = session {
+ request["sessionId"] = json!(session);
+ }
+ ctx.process_and_wait_for_response_async(request).await;
+ let response = take_response_by_id(ctx, id);
+ assert!(response.get("error").is_none(), "{response}");
+ assert!(
+ response["result"].get("exceptionDetails").is_none(),
+ "{response}"
+ );
+ response["result"].clone()
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn dedicated_worker_early_attachment_survives_script_loading() {
+ check_loading_attachment(false).await;
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn dedicated_worker_loading_does_not_restore_detached_inspector_session() {
+ check_loading_attachment(true).await;
+}
+
+async fn check_loading_attachment(detach_first: bool) {
+ let release = Arc::new(Notify::new());
+ let requested = Arc::new(Notify::new());
+ let worker_release = release.clone();
+ let worker_requested = requested.clone();
+ let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+ let base = format!("http://{}", listener.local_addr().unwrap());
+ let app = Router::new()
+ .route(
+ "/page",
+ get(|| async {
+ (
+ [(CONTENT_TYPE.as_str(), "text/html")],
+ "
worker attachment",
+ )
+ }),
+ )
+ .route(
+ "/worker.js",
+ get(move || {
+ let release = worker_release.clone();
+ let requested = worker_requested.clone();
+ async move {
+ requested.notify_one();
+ release.notified().await;
+ (
+ [(CONTENT_TYPE.as_str(), "text/javascript")],
+ "globalThis.attachmentProbe = 42; postMessage('ready');",
+ )
+ }
+ }),
+ );
+ let server = tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
+ let mut ctx = TestContext::new();
+ with_loaded_http_document_async(&mut ctx, &format!("{base}/page"), "SID-page", "TID-page")
+ .await;
+ command(
+ &mut ctx,
+ 80100,
+ None,
+ "Target.setDiscoverTargets",
+ json!({"discover":true}),
+ )
+ .await;
+ command(
+ &mut ctx,
+ 80101,
+ Some("SID-page"),
+ "Runtime.enable",
+ json!({}),
+ )
+ .await;
+ command(&mut ctx, 80102, Some("SID-page"), "Runtime.evaluate", json!({
+ "expression":"globalThis.workerReady = false; globalThis.worker = new Worker('/worker.js'); worker.onmessage = () => {workerReady = true;}; 'started'",
+ "returnByValue":true
+ })).await;
+ tokio::time::timeout(Duration::from_secs(5), requested.notified())
+ .await
+ .unwrap();
+ wait_until_message(
+ &mut ctx,
+ None,
+ "loading DedicatedWorker target",
+ |message| {
+ message["method"] == "Target.targetCreated"
+ && message["params"]["targetInfo"]["type"] == "worker"
+ && message["params"]["targetInfo"]["openerId"] == "TID-page"
+ },
+ )
+ .await;
+ let target = ctx
+ .sent
+ .iter()
+ .find(|message| {
+ message["method"] == "Target.targetCreated"
+ && message["params"]["targetInfo"]["type"] == "worker"
+ && message["params"]["targetInfo"]["openerId"] == "TID-page"
+ })
+ .unwrap()["params"]["targetInfo"]["targetId"]
+ .as_str()
+ .unwrap()
+ .to_owned();
+ let original_session = command(
+ &mut ctx,
+ 80103,
+ None,
+ "Target.attachToTarget",
+ json!({"targetId":target,"flatten":true}),
+ )
+ .await["sessionId"]
+ .as_str()
+ .unwrap()
+ .to_owned();
+ let session = if detach_first {
+ command(
+ &mut ctx,
+ 80104,
+ None,
+ "Target.detachFromTarget",
+ json!({"sessionId":original_session}),
+ )
+ .await;
+ command(
+ &mut ctx,
+ 80105,
+ None,
+ "Target.attachToTarget",
+ json!({"targetId":target,"flatten":true}),
+ )
+ .await["sessionId"]
+ .as_str()
+ .unwrap()
+ .to_owned()
+ } else {
+ original_session.clone()
+ };
+ release.notify_one();
+ for index in 0..256 {
+ let value = command(
+ &mut ctx,
+ 80200 + index,
+ Some("SID-page"),
+ "Runtime.evaluate",
+ json!({"expression":"workerReady","returnByValue":true}),
+ )
+ .await;
+ if value["result"]["value"] == true {
+ break;
+ }
+ assert!(index < 255, "worker script did not run");
+ tokio::time::sleep(Duration::from_millis(10)).await;
+ }
+ if detach_first {
+ let (runtime, instance) = ctx.with_fixture(|conn| {
+ let context = conn.browser_context.as_ref().unwrap();
+ (
+ context.renderer_runtime(),
+ context
+ .dedicated_worker_target(&target)
+ .unwrap()
+ .renderer_instance_id,
+ )
+ });
+ let late = runtime
+ .dispatch_dedicated_worker_runtime_protocol_message(
+ instance,
+ Some(original_session),
+ json!({"id":1,"method":"Runtime.enable"}).to_string(),
+ )
+ .await;
+ assert!(
+ late.is_err(),
+ "detached early session must not be installed in the live renderer: {late:?}"
+ );
+ }
+ ctx.sent.clear();
+ command(&mut ctx, 81000, Some(&session), "Runtime.enable", json!({})).await;
+ wait_until_message(
+ &mut ctx,
+ Some(session.as_str()),
+ "early attachment execution context",
+ |message| {
+ message["method"] == "Runtime.executionContextCreated"
+ && message["sessionId"] == session
+ },
+ )
+ .await;
+ let value = command(
+ &mut ctx,
+ 81001,
+ Some(&session),
+ "Runtime.evaluate",
+ json!({"expression":"attachmentProbe","returnByValue":true}),
+ )
+ .await;
+ assert_eq!(value["result"]["value"], 42);
+ server.abort();
+}
diff --git a/moli-renderer-v8/src/runtime/browser_context_runtime.rs b/moli-renderer-v8/src/runtime/browser_context_runtime.rs
index e158729f58e..74e4bdef79d 100644
--- a/moli-renderer-v8/src/runtime/browser_context_runtime.rs
+++ b/moli-renderer-v8/src/runtime/browser_context_runtime.rs
@@ -215,9 +215,14 @@ struct RendererBrowserContextRuntimeInner {
}
#[derive(Clone, Debug)]
-struct DedicatedWorkerDevToolsTarget {
- handle: crate::worker::WorkerDevToolsHandle,
- output_journal: Option,
+enum DedicatedWorkerDevToolsTarget {
+ Loading {
+ inspector_sessions: Vec