refactor(cli): reorganize main.rs and split workers (denoland#8495)

Factored out "init_v8_flags", "init_logger" and "get_subcommand" from "main" function. Also "Worker" was removed in favor of moving logic to "MainWorker" and "WebWorker" respectively.
mikoloism · Nov 26, 2020 · 85a5a08 · 85a5a08
1 parent 8d0b1b4
commit 85a5a08
Show file tree

Hide file tree

Showing 6 changed files with 574 additions and 589 deletions.
diff --git a/cli/main.rs b/cli/main.rs
@@ -45,6 +45,7 @@ mod tools;
 mod tsc;
 mod tsc_config;
 mod version;
+mod web_worker;
 mod worker;
 
 use crate::file_fetcher::File;
@@ -792,37 +793,31 @@ async fn test_command(
   Ok(())
 }
 
-pub fn main() {
-  #[cfg(windows)]
-  colors::enable_ansi(); // For Windows 10
-
-  let args: Vec<String> = env::args().collect();
-  let flags = flags::flags_from_vec(args);
-
-  if let Some(ref v8_flags) = flags.v8_flags {
-    let v8_flags_includes_help = v8_flags
-      .iter()
-      .any(|flag| flag == "-help" || flag == "--help");
-    let v8_flags = once("UNUSED_BUT_NECESSARY_ARG0".to_owned())
-      .chain(v8_flags.iter().cloned())
-      .collect::<Vec<_>>();
-    let unrecognized_v8_flags = v8_set_flags(v8_flags)
-      .into_iter()
-      .skip(1)
-      .collect::<Vec<_>>();
-    if !unrecognized_v8_flags.is_empty() {
-      for f in unrecognized_v8_flags {
-        eprintln!("error: V8 did not recognize flag '{}'", f);
-      }
-      eprintln!("\nFor a list of V8 flags, use '--v8-flags=--help'");
-      std::process::exit(1);
-    }
-    if v8_flags_includes_help {
-      std::process::exit(0);
+fn init_v8_flags(v8_flags: &[String]) {
+  let v8_flags_includes_help = v8_flags
+    .iter()
+    .any(|flag| flag == "-help" || flag == "--help");
+  let v8_flags = once("UNUSED_BUT_NECESSARY_ARG0".to_owned())
+    .chain(v8_flags.iter().cloned())
+    .collect::<Vec<_>>();
+  let unrecognized_v8_flags = v8_set_flags(v8_flags)
+    .into_iter()
+    .skip(1)
+    .collect::<Vec<_>>();
+  if !unrecognized_v8_flags.is_empty() {
+    for f in unrecognized_v8_flags {
+      eprintln!("error: V8 did not recognize flag '{}'", f);
     }
+    eprintln!("\nFor a list of V8 flags, use '--v8-flags=--help'");
+    std::process::exit(1);
+  }
+  if v8_flags_includes_help {
+    std::process::exit(0);
   }
+}
 
-  let log_level = match flags.log_level {
+fn init_logger(maybe_level: Option<Level>) {
+  let log_level = match maybe_level {
     Some(level) => level,
     None => Level::Info, // Default log level
   };
@@ -853,8 +848,12 @@ pub fn main() {
     }
   })
   .init();
+}
 
-  let fut = match flags.clone().subcommand {
+fn get_subcommand(
+  flags: Flags,
+) -> Pin<Box<dyn Future<Output = Result<(), AnyError>>>> {
+  match flags.clone().subcommand {
     DenoSubcommand::Bundle {
       source_file,
       out_file,
@@ -914,15 +913,15 @@ pub fn main() {
         eprintln!("{}", e);
         std::process::exit(1);
       }
-      return;
+      std::process::exit(0);
     }
     DenoSubcommand::Types => {
       let types = get_types(flags.unstable);
       if let Err(e) = write_to_stdout_ignore_sigpipe(types.as_bytes()) {
         eprintln!("{}", e);
         std::process::exit(1);
       }
-      return;
+      std::process::exit(0);
     }
     DenoSubcommand::Upgrade {
       force,
@@ -934,9 +933,23 @@ pub fn main() {
       tools::upgrade::upgrade_command(dry_run, force, version, output, ca_file)
         .boxed_local()
     }
-  };
+  }
+}
+
+pub fn main() {
+  #[cfg(windows)]
+  colors::enable_ansi(); // For Windows 10
+
+  let args: Vec<String> = env::args().collect();
+  let flags = flags::flags_from_vec(args);
+
+  if let Some(ref v8_flags) = flags.v8_flags {
+    init_v8_flags(v8_flags);
+  }
+  init_logger(flags.log_level);
 
-  let result = tokio_util::run_basic(fut);
+  let subcommand_future = get_subcommand(flags);
+  let result = tokio_util::run_basic(subcommand_future);
   if let Err(err) = result {
     eprintln!("{}: {}", colors::red_bold("error"), err.to_string());
     std::process::exit(1);

diff --git a/cli/ops/web_worker.rs b/cli/ops/web_worker.rs
@@ -1,7 +1,7 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
-use crate::worker::WebWorkerHandle;
-use crate::worker::WorkerEvent;
+use crate::web_worker::WebWorkerHandle;
+use crate::web_worker::WorkerEvent;
 use deno_core::futures::channel::mpsc;
 use deno_core::serde_json::json;
 

diff --git a/cli/ops/worker_host.rs b/cli/ops/worker_host.rs
@@ -5,9 +5,9 @@ use crate::ops::io::get_stdio;
 use crate::permissions::Permissions;
 use crate::program_state::ProgramState;
 use crate::tokio_util::create_basic_runtime;
-use crate::worker::WebWorker;
-use crate::worker::WebWorkerHandle;
-use crate::worker::WorkerEvent;
+use crate::web_worker::WebWorker;
+use crate::web_worker::WebWorkerHandle;
+use crate::web_worker::WorkerEvent;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::error::JsError;

diff --git a/cli/tools/repl.rs b/cli/tools/repl.rs
@@ -4,7 +4,6 @@ use crate::colors;
 use crate::inspector::InspectorSession;
 use crate::program_state::ProgramState;
 use crate::worker::MainWorker;
-use crate::worker::Worker;
 use deno_core::error::AnyError;
 use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
@@ -280,7 +279,7 @@ impl Highlighter for LineHighlighter {
 }
 
 async fn post_message_and_poll(
-  worker: &mut Worker,
+  worker: &mut MainWorker,
   session: &mut InspectorSession,
   method: &str,
   params: Option<Value>,
@@ -305,7 +304,7 @@ async fn post_message_and_poll(
 }
 
 async fn read_line_and_poll(
-  worker: &mut Worker,
+  worker: &mut MainWorker,
   session: &mut InspectorSession,
   message_rx: &Receiver<(String, Option<Value>)>,
   response_tx: &Sender<Result<Value, AnyError>>,
@@ -425,7 +424,7 @@ pub async fn run(
 
   let history_file = program_state.dir.root.join("deno_history.txt");
 
-  post_message_and_poll(&mut *worker, &mut session, "Runtime.enable", None)
+  post_message_and_poll(&mut worker, &mut session, "Runtime.enable", None)
     .await?;
 
   // Enabling the runtime domain will always send trigger one executionContextCreated for each
@@ -474,7 +473,7 @@ pub async fn run(
 
   while !is_closing(&mut worker, &mut session, context_id).await? {
     let line = read_line_and_poll(
-      &mut *worker,
+      &mut worker,
       &mut session,
       &message_rx,
       &response_tx,
@@ -495,7 +494,7 @@ pub async fn run(
         };
 
         let evaluate_response = post_message_and_poll(
-          &mut *worker,
+          &mut worker,
           &mut session,
           "Runtime.evaluate",
           Some(json!({
@@ -513,7 +512,7 @@ pub async fn run(
             && wrapped_line != line
           {
             post_message_and_poll(
-              &mut *worker,
+              &mut worker,
               &mut session,
               "Runtime.evaluate",
               Some(json!({
@@ -533,7 +532,7 @@ pub async fn run(
 
         if evaluate_exception_details.is_some() {
           post_message_and_poll(
-                    &mut *worker,
+                    &mut worker,
                     &mut session,
                     "Runtime.callFunctionOn",
                     Some(json!({
@@ -546,7 +545,7 @@ pub async fn run(
                   ).await?;
         } else {
           post_message_and_poll(
-                    &mut *worker,
+                    &mut worker,
                     &mut session,
                     "Runtime.callFunctionOn",
                     Some(json!({
@@ -564,7 +563,7 @@ pub async fn run(
         // Deno.inspectArgs.
         let inspect_response =
           post_message_and_poll(
-            &mut *worker,
+            &mut worker,
             &mut session,
             "Runtime.callFunctionOn",
             Some(json!({