Revert "refactor(repl): use an inspector session (denoland#7763)"

This reverts commit 4c779b5.

cli/Cargo.toml

@@ -57,7 +57,6 @@ rand = "0.7.3"
 regex = "1.3.9"
 ring = "0.16.15"
 rustyline = { version = "6.3.0", default-features = false }
-rustyline-derive = "0.3.1"
 serde = { version = "1.0.116", features = ["derive"] }
 sys-info = "0.7.0"
 sourcemap = "6.0.1"

cli/flags.rs

@@ -120,7 +120,6 @@ pub struct Flags {
   pub no_remote: bool,
   pub read_allowlist: Vec<PathBuf>,
   pub reload: bool,
-  pub repl: bool,
   pub seed: Option<u64>,
   pub unstable: bool,
   pub v8_flags: Option<Vec<String>>,
@@ -448,7 +447,6 @@ fn completions_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
 
 fn repl_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
   runtime_args_parse(flags, matches, false);
-  flags.repl = true;
   flags.subcommand = DenoSubcommand::Repl;
   flags.allow_net = true;
   flags.allow_env = true;
@@ -2144,7 +2142,6 @@ mod tests {
     assert_eq!(
       r.unwrap(),
       Flags {
-        repl: true,
         subcommand: DenoSubcommand::Repl,
         allow_net: true,
         allow_env: true,
@@ -2165,7 +2162,6 @@ mod tests {
     assert_eq!(
       r.unwrap(),
       Flags {
-        repl: true,
         subcommand: DenoSubcommand::Repl,
         unstable: true,
         import_map_path: Some("import_map.json".to_string()),

cli/inspector.rs

@@ -857,7 +857,6 @@ impl v8::inspector::ChannelImpl for InspectorSession {
   ) {
     let raw_message = message.unwrap().string().to_string();
     let message = serde_json::from_str(&raw_message).unwrap();
-
     self
       .response_tx_map
       .remove(&call_id)

cli/main.rs

@@ -63,7 +63,6 @@ use crate::file_fetcher::SourceFileFetcher;
 use crate::file_fetcher::TextDocument;
 use crate::fs as deno_fs;
 use crate::global_state::GlobalState;
-use crate::inspector::InspectorSession;
 use crate::media_type::MediaType;
 use crate::permissions::Permissions;
 use crate::worker::MainWorker;
@@ -429,26 +428,9 @@ async fn run_repl(flags: Flags) -> Result<(), AnyError> {
   let main_module =
     ModuleSpecifier::resolve_url_or_path("./$deno$repl.ts").unwrap();
   let global_state = GlobalState::new(flags)?;
-  let mut worker = MainWorker::new(&global_state, main_module.clone());
-  (&mut *worker).await?;
-
-  let inspector = worker
-    .inspector
-    .as_mut()
-    .expect("Inspector is not created.");
-
-  let inspector_session = InspectorSession::new(&mut **inspector);
-  let repl = repl::run(&global_state, inspector_session);
-
-  tokio::pin!(repl);
-
+  let mut worker = MainWorker::new(&global_state, main_module);
   loop {
-    tokio::select! {
-      result = &mut repl => {
-          return result;
-      }
-      _ = &mut *worker => {}
-    }
+    (&mut *worker).await?;
   }
 }
 

cli/ops/mod.rs

@@ -16,6 +16,7 @@ pub mod permissions;
 pub mod plugin;
 pub mod process;
 pub mod random;
+pub mod repl;
 pub mod runtime;
 pub mod runtime_compiler;
 pub mod signal;

cli/ops/repl.rs

@@ -0,0 +1,78 @@
+// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+
+use crate::repl;
+use crate::repl::Repl;
+use deno_core::error::bad_resource_id;
+use deno_core::error::AnyError;
+use deno_core::serde_json;
+use deno_core::serde_json::json;
+use deno_core::serde_json::Value;
+use deno_core::BufVec;
+use deno_core::OpState;
+use deno_core::ZeroCopyBuf;
+use serde::Deserialize;
+use std::cell::RefCell;
+use std::rc::Rc;
+use std::sync::Arc;
+use std::sync::Mutex;
+
+pub fn init(rt: &mut deno_core::JsRuntime) {
+  super::reg_json_sync(rt, "op_repl_start", op_repl_start);
+  super::reg_json_async(rt, "op_repl_readline", op_repl_readline);
+}
+
+struct ReplResource(Arc<Mutex<Repl>>);
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct ReplStartArgs {
+  history_file: String,
+}
+
+fn op_repl_start(
+  state: &mut OpState,
+  args: Value,
+  _zero_copy: &mut [ZeroCopyBuf],
+) -> Result<Value, AnyError> {
+  let args: ReplStartArgs = serde_json::from_value(args)?;
+  debug!("op_repl_start {}", args.history_file);
+  let history_path = {
+    let cli_state = super::global_state(state);
+    repl::history_path(&cli_state.dir, &args.history_file)
+  };
+  let repl = repl::Repl::new(history_path);
+  let resource = ReplResource(Arc::new(Mutex::new(repl)));
+  let rid = state.resource_table.add("repl", Box::new(resource));
+  Ok(json!(rid))
+}
+
+#[derive(Deserialize)]
+struct ReplReadlineArgs {
+  rid: i32,
+  prompt: String,
+}
+
+async fn op_repl_readline(
+  state: Rc<RefCell<OpState>>,
+  args: Value,
+  _zero_copy: BufVec,
+) -> Result<Value, AnyError> {
+  let args: ReplReadlineArgs = serde_json::from_value(args)?;
+  let rid = args.rid as u32;
+  let prompt = args.prompt;
+  debug!("op_repl_readline {} {}", rid, prompt);
+  let repl = {
+    let state = state.borrow();
+    let resource = state
+      .resource_table
+      .get::<ReplResource>(rid)
+      .ok_or_else(bad_resource_id)?;
+    resource.0.clone()
+  };
+  tokio::task::spawn_blocking(move || {
+    let line = repl.lock().unwrap().readline(&prompt)?;
+    Ok(json!(line))
+  })
+  .await
+  .unwrap()
+}

cli/ops/runtime.rs

@@ -4,6 +4,7 @@ use crate::colors;
 use crate::metrics::Metrics;
 use crate::permissions::Permissions;
 use crate::version;
+use crate::DenoSubcommand;
 use deno_core::error::AnyError;
 use deno_core::serde_json;
 use deno_core::serde_json::json;
@@ -40,6 +41,7 @@ fn op_start(
     "noColor": !colors::use_color(),
     "pid": std::process::id(),
     "ppid": ppid(),
+    "repl": gs.flags.subcommand == DenoSubcommand::Repl,
     "target": env!("TARGET"),
     "tsVersion": version::TYPESCRIPT,
     "unstableFlag": gs.flags.unstable,