Merge pull request microsoft#165861 from microsoft/connor4312/cli-async-handling

cli: allow handling control server requests in parallel

Author: connor4312

cli/src/desktop/version_manager.rs

@@ -318,17 +318,11 @@ fn detect_installed_program(log: &log::Logger, quality: Quality) -> io::Result<V
 				}
 			}
 			State::LookingForLocation => {
-				if line.starts_with(LOCATION_PREFIX) {
+				if let Some(suffix) = line.strip_prefix(LOCATION_PREFIX) {
 					output.push(
-						[
-							&line[LOCATION_PREFIX.len()..].trim(),
-							"Contents/Resources",
-							"app",
-							"bin",
-							"code",
-						]
-						.iter()
-						.collect(),
+						[suffix.trim(), "Contents/Resources", "app", "bin", "code"]
+							.iter()
+							.collect(),
 					);
 					state = State::LookingForName;
 				}
@@ -338,7 +332,7 @@ fn detect_installed_program(log: &log::Logger, quality: Quality) -> io::Result<V
 
 	// Sort shorter paths to the front, preferring "more global" installs, and
 	// incidentally preferring local installs over Parallels 'installs'.
-	output.sort_by(|a, b| a.as_os_str().len().cmp(&b.as_os_str().len()));
+	output.sort_by_key(|a| a.as_os_str().len());
 
 	Ok(output)
 }

cli/src/tunnels/code_server.rs

@@ -24,6 +24,7 @@ use std::fs;
 use std::fs::File;
 use std::io::{ErrorKind, Write};
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 use std::time::Duration;
 use tokio::fs::remove_file;
 use tokio::io::{AsyncBufReadExt, BufReader};
@@ -209,17 +210,19 @@ struct UpdateServerVersion {
 }
 
 /// Code server listening on a port address.
+#[derive(Clone)]
 pub struct SocketCodeServer {
 	pub commit_id: String,
 	pub socket: PathBuf,
-	pub origin: CodeServerOrigin,
+	pub origin: Arc<CodeServerOrigin>,
 }
 
 /// Code server listening on a socket address.
+#[derive(Clone)]
 pub struct PortCodeServer {
 	pub commit_id: String,
 	pub port: u16,
-	pub origin: CodeServerOrigin,
+	pub origin: Arc<CodeServerOrigin>,
 }
 
 /// A server listening on any address/location.
@@ -448,7 +451,7 @@ impl<'a> ServerBuilder<'a> {
 		)
 		.await?;
 
-		let origin = CodeServerOrigin::Existing(pid);
+		let origin = Arc::new(CodeServerOrigin::Existing(pid));
 		let contents = fs::read_to_string(&self.server_paths.logfile)
 			.expect("Something went wrong reading log file");
 
@@ -544,7 +547,7 @@ impl<'a> ServerBuilder<'a> {
 		Ok(SocketCodeServer {
 			commit_id: self.server_params.release.commit.to_owned(),
 			socket,
-			origin,
+			origin: Arc::new(origin),
 		})
 	}