fix(cli): bind directly from pre-allocated tcplistener

Author: michael-0acf4

meta-cli/src/com/server.rs

@@ -10,20 +10,31 @@ use lazy_static::lazy_static;
 use reqwest::StatusCode;
 use serde::Deserialize;
 use serde_json::json;
-use std::net::{Ipv4Addr, SocketAddrV4, TcpListener};
+use std::{
+    io::{Error, ErrorKind},
+    net::{Ipv4Addr, SocketAddrV4, TcpListener},
+    sync::Arc,
+};
+
+pub struct PortManager {
+    pub tcp_listener: Arc<TcpListener>,
+}
 
-pub fn random_free_port() -> u16 {
-    let addr = SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0);
-    TcpListener::bind(addr)
-        .unwrap()
-        .local_addr()
-        .unwrap()
-        .port()
+impl PortManager {
+    pub fn new() -> Self {
+        let addr = SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0);
+        Self {
+            tcp_listener: Arc::new(TcpListener::bind(addr).unwrap()),
+        }
+    }
 }
 
 lazy_static! {
-    #[derive(Debug)]
-    pub static ref SERVER_PORT: u16 = random_free_port();
+    pub static ref PORT_MAN: Arc<PortManager> = Arc::new(PortManager::new());
+}
+
+pub fn get_instance_port() -> u16 {
+    PORT_MAN.tcp_listener.local_addr().unwrap().port()
 }
 
 #[derive(Debug, Deserialize)]
@@ -102,15 +113,23 @@ async fn response(req_body: String) -> impl Responder {
 }
 
 pub async fn spawn_server() -> std::io::Result<()> {
-    let port = SERVER_PORT.to_owned();
+    let port = get_instance_port();
+
+    let tcp_listener = PORT_MAN
+        .tcp_listener
+        .try_clone()
+        .map_err(|e| Error::new(ErrorKind::AddrNotAvailable, e.to_string()))?;
+
     eprintln!("Server is running at {:?}", port);
     HttpServer::new(|| {
         App::new()
             .service(config)
             .service(command)
             .service(response)
     })
-    .bind(("127.0.0.1", port))?
+    .listen(tcp_listener)?
     .run()
-    .await
+    .await?;
+
+    Ok(())
 }

meta-cli/src/main.rs

@@ -22,7 +22,7 @@ use clap::Parser;
 use cli::upgrade::upgrade_check;
 use cli::Action;
 use cli::Args;
-use com::server::{spawn_server, SERVER_PORT};
+use com::server::{get_instance_port, spawn_server};
 use futures::try_join;
 use futures::TryFutureExt;
 use log::{error, warn};
@@ -33,7 +33,8 @@ shadow!(build);
 fn main() -> Result<()> {
     setup_panic_hook();
     logger::init();
-    std::env::set_var("META_CLI_SERVER_PORT", SERVER_PORT.to_string());
+
+    std::env::set_var("META_CLI_SERVER_PORT", get_instance_port().to_string());
 
     let _ = actix::System::with_tokio_rt(|| {
         tokio::runtime::Builder::new_multi_thread()