Move port CLI parsing into config

Author: vipmax

anycode-backend/src/config.rs

@@ -1,3 +1,4 @@
+use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::{fmt::format, path::Path};
 
@@ -146,6 +147,75 @@ pub struct Terminal {
     pub command: String,
 }
 
+const DEFAULT_PORT: u16 = 3000;
+
+fn print_help() {
+    println!("anycode - Code editor server");
+    println!();
+    println!("USAGE:");
+    println!("    anycode [OPTIONS]");
+    println!();
+    println!("OPTIONS:");
+    println!("    -h, --help         Print help information");
+    println!("    --version          Print version information");
+    println!("    -p, --port <PORT>  Port to listen on");
+    println!();
+    println!("ENVIRONMENT:");
+    println!("    ANYCODE_PORT                  Port to listen on (default: 3000)");
+    println!("    ANYCODE_HOME                  Path to configuration directory");
+    println!("    ANYCODE_ACP_PERMISSION_MODE   ACP permission mode: full_access (default) or ask");
+    println!();
+    println!("Start the anycode server. The server will be available at http://localhost:<port>");
+}
+
+fn parse_port(value: &str, source: &str) -> Result<u16> {
+    value
+        .parse::<u16>()
+        .map_err(|_| anyhow::anyhow!("Invalid {source}: {value}"))
+}
+
+pub fn resolve_server_port() -> Result<u16> {
+    let mut args = std::env::args().skip(1);
+    let mut cli_port: Option<u16> = None;
+
+    while let Some(arg) = args.next() {
+        match arg.as_str() {
+            "--help" | "-h" => {
+                print_help();
+                std::process::exit(0);
+            }
+            "--version" | "-V" => {
+                println!("anycode {}", env!("CARGO_PKG_VERSION"));
+                std::process::exit(0);
+            }
+            "--port" | "-p" => {
+                let value = args
+                    .next()
+                    .ok_or_else(|| anyhow::anyhow!("Missing value for {arg}"))?;
+                cli_port = Some(parse_port(&value, "CLI port")?);
+            }
+            _ if arg.starts_with("--port=") => {
+                cli_port = Some(parse_port(&arg["--port=".len()..], "CLI port")?);
+            }
+            _ if arg.starts_with('-') => {
+                anyhow::bail!("Unknown option: {arg}");
+            }
+            _ => {
+                anyhow::bail!("Unknown positional argument: {arg}");
+            }
+        }
+    }
+
+    if let Some(port) = cli_port {
+        return Ok(port);
+    }
+
+    match std::env::var("ANYCODE_PORT") {
+        Ok(value) => parse_port(&value, "ANYCODE_PORT"),
+        Err(_) => Ok(DEFAULT_PORT),
+    }
+}
+
 #[cfg(test)]
 mod congif_tests {
     use super::*;

anycode-backend/src/main.rs

@@ -229,46 +229,8 @@ async fn not_found() -> Response {
     (StatusCode::NOT_FOUND, "404").into_response()
 }
 
-fn print_help() {
-    println!("anycode - Code editor server");
-    println!();
-    println!("USAGE:");
-    println!("    anycode [OPTIONS]");
-    println!();
-    println!("OPTIONS:");
-    println!("    -h, --help       Print help information");
-    println!("    --version        Print version information");
-    println!();
-    println!("ENVIRONMENT:");
-    println!("    ANYCODE_PORT     Port to listen on (default: 3000)");
-    println!("    ANYCODE_HOME     Path to configuration directory");
-    println!("    ANYCODE_ACP_PERMISSION_MODE  ACP permission mode: full_access (default) or ask");
-    println!();
-    println!("Start the anycode server. The server will be available at http://localhost:<port>");
-}
-
 #[tokio::main]
 async fn main() -> Result<()> {
-    let args: Vec<String> = std::env::args().collect();
-
-    if args.len() > 1 {
-        match args[1].as_str() {
-            "--help" | "-h" => {
-                print_help();
-                return Ok(());
-            }
-            "--version" | "-V" => {
-                println!("anycode {}", env!("CARGO_PKG_VERSION"));
-                return Ok(());
-            }
-            _ => {
-                eprintln!("Unknown option: {}", args[1]);
-                eprintln!("Run 'anycode --help' for usage information.");
-                std::process::exit(1);
-            }
-        }
-    }
-
     tracing_subscriber::fmt()
         .with_env_filter(tracing_subscriber::EnvFilter::new("info"))
         .init();
@@ -344,7 +306,7 @@ async fn main() -> Result<()> {
         .with_state(io.clone())
         .layer(cors);
 
-    let port = std::env::var("ANYCODE_PORT").unwrap_or("3000".to_string());
+    let port = crate::config::resolve_server_port()?;
     let url = format!("0.0.0.0:{}", port);
     let listener = tokio::net::TcpListener::bind(url).await?;