diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/main.rs | 2 | ||||
| -rw-r--r-- | cli/tools/coverage.rs | 8 | ||||
| -rw-r--r-- | cli/tools/repl.rs | 218 | ||||
| -rw-r--r-- | cli/tools/test_runner.rs | 11 |
4 files changed, 114 insertions, 125 deletions
diff --git a/cli/main.rs b/cli/main.rs index 60c202a7a..185de5bfe 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -866,7 +866,7 @@ async fn run_command(flags: Flags, script: String) -> Result<(), AnyError> { let mut maybe_coverage_collector = if let Some(ref coverage_dir) = program_state.coverage_dir { - let session = worker.create_inspector_session(); + let session = worker.create_inspector_session().await; let coverage_dir = PathBuf::from(coverage_dir); let mut coverage_collector = diff --git a/cli/tools/coverage.rs b/cli/tools/coverage.rs index 23b4a4fb6..204141b25 100644 --- a/cli/tools/coverage.rs +++ b/cli/tools/coverage.rs @@ -13,7 +13,7 @@ use deno_core::error::AnyError; use deno_core::serde_json; use deno_core::serde_json::json; use deno_core::url::Url; -use deno_runtime::inspector::InspectorSession; +use deno_runtime::inspector::LocalInspectorSession; use deno_runtime::permissions::Permissions; use regex::Regex; use serde::Deserialize; @@ -26,18 +26,17 @@ use uuid::Uuid; pub struct CoverageCollector { pub dir: PathBuf, - session: Box<InspectorSession>, + session: LocalInspectorSession, } impl CoverageCollector { - pub fn new(dir: PathBuf, session: Box<InspectorSession>) -> Self { + pub fn new(dir: PathBuf, session: LocalInspectorSession) -> Self { Self { dir, session } } pub async fn start_collecting(&mut self) -> Result<(), AnyError> { self.session.post_message("Debugger.enable", None).await?; self.session.post_message("Profiler.enable", None).await?; - self .session .post_message( @@ -45,7 +44,6 @@ impl CoverageCollector { Some(json!({"callCount": true, "detailed": true})), ) .await?; - Ok(()) } diff --git a/cli/tools/repl.rs b/cli/tools/repl.rs index ce0879a85..ba69c9234 100644 --- a/cli/tools/repl.rs +++ b/cli/tools/repl.rs @@ -6,9 +6,10 @@ use crate::colors; use crate::media_type::MediaType; use crate::program_state::ProgramState; use deno_core::error::AnyError; +use deno_core::futures::FutureExt; use deno_core::serde_json::json; use deno_core::serde_json::Value; -use deno_runtime::inspector::InspectorSession; +use deno_runtime::inspector::LocalInspectorSession; use deno_runtime::worker::MainWorker; use rustyline::completion::Completer; use rustyline::error::ReadlineError; @@ -255,34 +256,9 @@ impl Highlighter for Helper { } } -async fn post_message_and_poll( - worker: &mut MainWorker, - session: &mut InspectorSession, - method: &str, - params: Option<Value>, -) -> Result<Value, AnyError> { - let response = session.post_message(method, params); - tokio::pin!(response); - - loop { - tokio::select! { - result = &mut response => { - return result - } - - _ = worker.run_event_loop() => { - // A zero delay is long enough to yield the thread in order to prevent the loop from - // running hot for messages that are taking longer to resolve like for example an - // evaluation of top level await. - tokio::time::sleep(tokio::time::Duration::from_millis(0)).await; - } - } - } -} - async fn read_line_and_poll( worker: &mut MainWorker, - session: &mut InspectorSession, + session: &mut LocalInspectorSession, message_rx: &Receiver<(String, Option<Value>)>, response_tx: &Sender<Result<Value, AnyError>>, editor: Arc<Mutex<Editor<Helper>>>, @@ -294,9 +270,10 @@ async fn read_line_and_poll( loop { for (method, params) in message_rx.try_iter() { - response_tx - .send(session.post_message(&method, params).await) - .unwrap(); + let result = worker + .with_event_loop(session.post_message(&method, params).boxed_local()) + .await; + response_tx.send(result).unwrap(); } // Because an inspector websocket client may choose to connect at anytime when we have an @@ -353,44 +330,50 @@ Object.defineProperty(globalThis, "_error", { async fn inject_prelude( worker: &mut MainWorker, - session: &mut InspectorSession, + session: &mut LocalInspectorSession, context_id: u64, ) -> Result<(), AnyError> { - post_message_and_poll( - worker, - session, - "Runtime.evaluate", - Some(json!({ - "expression": PRELUDE, - "contextId": context_id, - })), - ) - .await?; + worker + .with_event_loop( + session + .post_message( + "Runtime.evaluate", + Some(json!({ + "expression": PRELUDE, + "contextId": context_id, + })), + ) + .boxed_local(), + ) + .await?; Ok(()) } pub async fn is_closing( worker: &mut MainWorker, - session: &mut InspectorSession, + session: &mut LocalInspectorSession, context_id: u64, ) -> Result<bool, AnyError> { - let closed = post_message_and_poll( - worker, - session, - "Runtime.evaluate", - Some(json!({ - "expression": "(globalThis.closed)", - "contextId": context_id, - })), - ) - .await? - .get("result") - .unwrap() - .get("value") - .unwrap() - .as_bool() - .unwrap(); + let closed = worker + .with_event_loop( + session + .post_message( + "Runtime.evaluate", + Some(json!({ + "expression": "(globalThis.closed)", + "contextId": context_id, + })), + ) + .boxed_local(), + ) + .await? + .get("result") + .unwrap() + .get("value") + .unwrap() + .as_bool() + .unwrap(); Ok(closed) } @@ -399,13 +382,13 @@ pub async fn run( program_state: &ProgramState, mut worker: MainWorker, ) -> Result<(), AnyError> { - let mut session = worker.create_inspector_session(); + let mut session = worker.create_inspector_session().await; let history_file = program_state.dir.root.join("deno_history.txt"); - post_message_and_poll(&mut worker, &mut session, "Runtime.enable", None) + worker + .with_event_loop(session.post_message("Runtime.enable", None).boxed_local()) .await?; - // Enabling the runtime domain will always send trigger one executionContextCreated for each // context the inspector knows about so we grab the execution context from that since // our inspector does not support a default context (0 is an invalid context id). @@ -471,15 +454,15 @@ pub async fn run( line.clone() }; - let evaluate_response = post_message_and_poll( - &mut worker, - &mut session, - "Runtime.evaluate", - Some(json!({ - "expression": format!("'use strict'; void 0;\n{}", &wrapped_line), - "contextId": context_id, - "replMode": true, - })), + let evaluate_response = worker.with_event_loop( + session.post_message( + "Runtime.evaluate", + Some(json!({ + "expression": format!("'use strict'; void 0;\n{}", &wrapped_line), + "contextId": context_id, + "replMode": true, + })), + ).boxed_local() ) .await?; @@ -489,17 +472,20 @@ pub async fn run( if evaluate_response.get("exceptionDetails").is_some() && wrapped_line != line { - post_message_and_poll( - &mut worker, - &mut session, - "Runtime.evaluate", - Some(json!({ - "expression": format!("'use strict'; void 0;\n{}", &line), - "contextId": context_id, - "replMode": true, - })), - ) - .await? + worker + .with_event_loop( + session + .post_message( + "Runtime.evaluate", + Some(json!({ + "expression": format!("'use strict'; void 0;\n{}", &line), + "contextId": context_id, + "replMode": true, + })), + ) + .boxed_local(), + ) + .await? } else { evaluate_response }; @@ -515,48 +501,48 @@ pub async fn run( evaluate_response.get("exceptionDetails"); if evaluate_exception_details.is_some() { - post_message_and_poll( - &mut worker, - &mut session, - "Runtime.callFunctionOn", - Some(json!({ - "executionContextId": context_id, - "functionDeclaration": "function (object) { Deno[Deno.internal].lastThrownError = object; }", - "arguments": [ - evaluate_result, - ], - })), - ).await?; + worker.with_event_loop( + session.post_message( + "Runtime.callFunctionOn", + Some(json!({ + "executionContextId": context_id, + "functionDeclaration": "function (object) { Deno[Deno.internal].lastThrownError = object; }", + "arguments": [ + evaluate_result, + ], + })), + ).boxed_local() + ).await?; } else { - post_message_and_poll( - &mut worker, - &mut session, - "Runtime.callFunctionOn", - Some(json!({ - "executionContextId": context_id, - "functionDeclaration": "function (object) { Deno[Deno.internal].lastEvalResult = object; }", - "arguments": [ - evaluate_result, - ], - })), - ).await?; + worker.with_event_loop( + session.post_message( + "Runtime.callFunctionOn", + Some(json!({ + "executionContextId": context_id, + "functionDeclaration": "function (object) { Deno[Deno.internal].lastEvalResult = object; }", + "arguments": [ + evaluate_result, + ], + })), + ).boxed_local() + ).await?; } // TODO(caspervonb) we should investigate using previews here but to keep things // consistent with the previous implementation we just get the preview result from // Deno.inspectArgs. let inspect_response = - post_message_and_poll( - &mut worker, - &mut session, - "Runtime.callFunctionOn", - Some(json!({ - "executionContextId": context_id, - "functionDeclaration": "function (object) { return Deno[Deno.internal].inspectArgs(['%o', object], { colors: !Deno.noColor }); }", - "arguments": [ - evaluate_result, - ], - })), + worker.with_event_loop( + session.post_message( + "Runtime.callFunctionOn", + Some(json!({ + "executionContextId": context_id, + "functionDeclaration": "function (object) { return Deno[Deno.internal].inspectArgs(['%o', object], { colors: !Deno.noColor }); }", + "arguments": [ + evaluate_result, + ], + })), + ).boxed_local() ).await?; let inspect_result = inspect_response.get("result").unwrap(); diff --git a/cli/tools/test_runner.rs b/cli/tools/test_runner.rs index f112eef16..7d1eae9ee 100644 --- a/cli/tools/test_runner.rs +++ b/cli/tools/test_runner.rs @@ -14,6 +14,7 @@ use crate::tools::coverage::CoverageCollector; use deno_core::error::AnyError; use deno_core::futures::future; use deno_core::futures::stream; +use deno_core::futures::FutureExt; use deno_core::futures::StreamExt; use deno_core::serde_json::json; use deno_core::url::Url; @@ -286,10 +287,12 @@ pub async fn run_test_file( let mut maybe_coverage_collector = if let Some(ref coverage_dir) = program_state.coverage_dir { - let session = worker.create_inspector_session(); + let session = worker.create_inspector_session().await; let coverage_dir = PathBuf::from(coverage_dir); let mut coverage_collector = CoverageCollector::new(coverage_dir, session); - coverage_collector.start_collecting().await?; + worker + .with_event_loop(coverage_collector.start_collecting().boxed_local()) + .await?; Some(coverage_collector) } else { @@ -308,7 +311,9 @@ pub async fn run_test_file( worker.execute("window.dispatchEvent(new Event('unload'))")?; if let Some(coverage_collector) = maybe_coverage_collector.as_mut() { - coverage_collector.stop_collecting().await?; + worker + .with_event_loop(coverage_collector.stop_collecting().boxed_local()) + .await?; } Ok(()) |