Merge pull request 'dweb concurrency (more in default and configurable worker threads)' (#28) from riddim/dweb:concurrency2 into main

Reviewed-on: https://codeberg.org/happybeing/dweb/pulls/28

Author: happybeing

README.md

@@ -46,6 +46,21 @@ To see the list of website names available:
 dweb list-names
 ```
 
+### Server concurrency (workers)
+
+The dweb HTTP server (Actix) runs with a configurable number of worker threads.
+
+- Environment variable: `DWEB_WORKERS`
+- Default: `12`
+- Example:
+  ```bash
+  DWEB_WORKERS=24 dweb
+  ```
+
+Notes:
+- More workers can increase throughput for I/O-bound workloads at the cost of CPU/RAM/file descriptors.
+- A good starting point is near the number of logical CPU cores. Measure and adjust.
+
 ## Status and Documentation
 The dweb library is a work in progress so expect breaking changes expecially in newly added features. The web publishing format and command line interface are more stable but breaking changes are still possible.
 

dweb-cli/src/cli_options.rs

@@ -43,7 +43,8 @@ use dweb::web::name::validate_dweb_name;
     author,
     version,
     about,
-    long_about = "a web publishing and browsing app for Autonomi peer-to-peer network"
+    long_about = "a web publishing and browsing app for Autonomi peer-to-peer network",
+    after_help = "Server concurrency: set maximum number of parallel requests via DWEB_WORKERS (default: 12). Example: DWEB_WORKERS=24 dweb serve"
 )]
 pub struct Opt {
     /// Connect to the alpha public network
@@ -145,6 +146,7 @@ fn greater_than_0(s: &str) -> Result<u64, String> {
 #[derive(Subcommand, Debug)]
 pub enum Subcommands {
     /// Start a server to view Autonomi websites in your browser. Also required for some dweb subcommands.
+    #[command(after_help = "Server concurrency: set maximum number of parallel requests via DWEB_WORKERS (default: 12). Example: DWEB_WORKERS=24 dweb serve")]
     ///
     /// Afterwards, if you open a new terminal you can view a website in your browser
     /// by typing 'dweb open awesome'. The 'awesome' website contains links to other websites.

dweb-server/src/services.rs

@@ -122,7 +122,10 @@ pub async fn init_dweb_server_blocking(
     let port = client_config.port.unwrap_or(SERVER_PORTS_MAIN_PORT);
     let client = client.clone();
 
-    let server = HttpServer::new(move || {
+    // Determine number of Actix workers from env var DWEB_WORKERS (default 12)
+    let workers = get_worker_count_from_env();
+
+    let http_server = HttpServer::new(move || {
         App::new()
             .wrap(
                 actix_cors::Cors::default()
@@ -221,9 +224,9 @@ pub async fn init_dweb_server_blocking(
             .app_data(Data::new(is_main_server))
             .into_app()
     })
-    .keep_alive(Duration::from_secs(crate::services::CONNECTION_TIMEOUT));
-
-    let http_server = server.bind((host.clone(), port));
+    .keep_alive(Duration::from_secs(crate::services::CONNECTION_TIMEOUT))
+    .workers(workers)
+    .bind((host.clone(), port));
     match http_server {
         Ok(server) => {
             match directory_version_with_port_copy2 {
@@ -252,3 +255,17 @@ pub async fn init_dweb_server_blocking(
         }
     }
 }
+
+const DEFAULT_WORKERS: usize = 12;
+
+fn parse_workers(value: Option<String>) -> usize {
+    match value.and_then(|s| s.trim().parse::<usize>().ok()) {
+        Some(n) if n >= 1 => n,
+        Some(_) => 1, // clamp to minimum of 1
+        None => DEFAULT_WORKERS,
+    }
+}
+
+fn get_worker_count_from_env() -> usize {
+    parse_workers(std::env::var("DWEB_WORKERS").ok())
+}