Feat/update url name

emissary-cli/Cargo.toml

@@ -26,6 +26,7 @@ thiserror = "2.0.12"
 tokio-tungstenite = { version = "0.27.0", default-features = false, features = ["native-tls"], optional = true }
 url = "2.5.4"
 base64 = "0.21"
+num_cpus = "1.16"
 
 # workspace dependencies
 anyhow = { workspace = true }

emissary-cli/assets/index.html

@@ -169,7 +169,7 @@ <h1>Client destinations</h1>
 
                 data.server_destinations.forEach(([key, value]) => {
                     const div = document.createElement("div");
-                    div.textContent = `${key}: http://${value}.b32.i2p`;
+                    div.textContent = `${key}: http://${value}.b32.echo`;
                     destContainer.appendChild(div);
                 });
             }

emissary-cli/src/config.rs

@@ -215,7 +215,7 @@ impl Default for EmissaryConfig {
             address_book: None,
             // address_book: Some(AddressBookConfig {
             //     default: Some(String::from(
-            //         "http://udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p/hosts.txt",
+            //         "http://udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.echo/hosts.txt",
             //     )),
             //     subscriptions: None,
             // }),

emissary-cli/src/main.rs

@@ -38,7 +38,7 @@ use emissary_util::{
     port_mapper::PortMapper, reseeder::Reseeder, runtime::tokio::Runtime, storage::Storage,
     su3::ReseedRouterInfo,
 };
-use futures::{channel::oneshot, StreamExt};
+use futures::{channel::oneshot, future, StreamExt};
 use tokio::sync::mpsc::{channel, Receiver};
 
 use std::{fs::File, io::Write, mem, pin::Pin, sync::Arc, path::PathBuf};
@@ -361,7 +361,7 @@ async fn setup_router(arguments: Arguments) -> anyhow::Result<RouterContext> {
             // been built), it'll signal the address book that it can start download hosts file(s)
             //
             // additionally, acquire handle to address book which is passed to http proxy so it can
-            // resolve .i2p hosts to .b32.i2p hosts
+            // resolve .echo hosts to .b32.echo hosts
             let (http_proxy_ready_tx, address_book_handle) = match address_book_manager {
                 None => (None, None),
                 Some(address_book_manager) => {
@@ -537,21 +537,15 @@ async fn router_event_loop(
                 // router.add_external_address(address.expect("value"));
             },
             _ = async {
-                    loop {
-                        let mut router_guard = router.lock().await;
-                        let mut pinned_router = Pin::new(&mut *router_guard);
-                        let waker = futures::task::noop_waker();
-                        let mut cx = std::task::Context::from_waker(&waker);
-                        match pinned_router.as_mut().poll(&mut cx) {
-                            std::task::Poll::Ready(()) => return (),
-                            std::task::Poll::Pending => {
-                                drop(router_guard);
-                                tokio::task::yield_now().await;
-                            }
-                        }
-                    }
-                } => {
-            // _ = &mut router => {
+                // Poll router properly using tokio's async mechanism
+                future::poll_fn(|cx| {
+                    let mut router_guard = match router.try_lock() {
+                        Ok(guard) => guard,
+                        Err(_) => return std::task::Poll::Pending,
+                    };
+                    Pin::new(&mut *router_guard).poll(cx)
+                }).await
+            } => {
                 tracing::info!(
                     target: LOG_TARGET,
                     "emissary shut down",
@@ -580,7 +574,13 @@ fn main() -> anyhow::Result<()> {
 
 #[cfg(feature = "web-ui")]
 fn main() -> anyhow::Result<()> {
-    let runtime = tokio::runtime::Runtime::new()?;
+    // let runtime = tokio::runtime::Runtime::new()?;
+    let runtime = tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(num_cpus::get())  // Use all CPU cores
+        .enable_all()
+        .thread_stack_size(4 * 1024 * 1024)  // 4MB stack per thread
+        .build()?;
+
     let (shutdown_tx, shutdown_rx) = channel(1);
     let arguments = runtime.block_on(parse_arguments());
     let RouterContext {

emissary-cli/src/proxy/http/error.rs

@@ -72,7 +72,7 @@ impl std::fmt::Display for HttpError {
             HttpError::MethodNotSupported(method) => write!(f, "Method not supported: {method}"),
             HttpError::HostNotFound => write!(f, "Host not found in address book"),
             HttpError::AddressBookNotEnabled =>
-                write!(f, "Cannot connect to .i2p host, address book not enabled"),
+                write!(f, "Cannot connect to .echo host, address book not enabled"),
             HttpError::OutproxyNotEnabled => write!(
                 f,
                 "Cannot connect to clearnet address, outproxy not enabled"

emissary-cli/src/proxy/http/mod.rs

@@ -108,9 +108,9 @@ impl HttpProxy {
 
         // validate outproxy
         //
-        // if the outproxy is given as a .b32.i2p host, it can be used as-is
+        // if the outproxy is given as a .b32.echo host, it can be used as-is
         //
-        // if it's given as a .i2p host, it must be converted into a .b32.i2p host by doing a host
+        // if it's given as a .echo host, it must be converted into a .b32.echo host by doing a host
         // lookup into address book
         //
         // if either address book is disabled or hostname is not found in it, outproxy is disabled
@@ -120,19 +120,19 @@ impl HttpProxy {
                 let outproxy = outproxy.strip_prefix("http://").unwrap_or(&outproxy);
                 let outproxy = outproxy.strip_prefix("www.").unwrap_or(outproxy);
 
-                match outproxy.ends_with(".i2p") {
+                match outproxy.ends_with(".echo") {
                     false => {
                         tracing::warn!(
                             target: LOG_TARGET,
                             %outproxy,
-                            "outproxy must be .b32.i2p or .i2p hostname",
+                            "outproxy must be .b32.echo or .echo hostname",
                         );
                         None
                     }
-                    true => match (outproxy.ends_with(".b32.i2p"), &address_book_handle) {
+                    true => match (outproxy.ends_with(".b32.echo"), &address_book_handle) {
                         (true, _) => Some(outproxy.to_owned()),
                         (false, Some(handle)) => match handle.resolve_base32(outproxy) {
-                            Some(host) => Some(format!("{host}.b32.i2p")),
+                            Some(host) => Some(format!("{host}.b32.echo")),
                             None => {
                                 tracing::warn!(
                                     target: LOG_TARGET,
@@ -197,8 +197,8 @@ impl HttpProxy {
 
     /// Handle `request`.
     ///
-    /// Assembles the validated request into an actual HTTP request and resolves a .i2p host into a
-    /// .b32.i2p host if a .i2p host was used and if address book was enabled.
+    /// Assembles the validated request into an actual HTTP request and resolves a .echo host into a
+    /// .b32.echo host if a .echo host was used and if address book was enabled.
     ///
     /// If the outbound request was for an outproxy, ensures that an outproxy has been configured.
     ///
@@ -457,7 +457,7 @@ mod tests {
             .expect("to succeed");
 
         match client
-            .get("http://zzz.i2p")
+            .get("http://zzz.echo")
             .headers(HeaderMap::from_iter([(
                 CONNECTION,
                 HeaderValue::from_static("close"),
@@ -472,7 +472,7 @@ mod tests {
                     .text()
                     .await
                     .unwrap()
-                    .contains("Cannot connect to .i2p host, address book not enabled"));
+                    .contains("Cannot connect to .echo host, address book not enabled"));
             }
         };
     }
@@ -526,7 +526,7 @@ mod tests {
             .expect("to succeed");
 
         match client
-            .get("http://zzz.i2p")
+            .get("http://zzz.echo")
             .headers(HeaderMap::from_iter([(
                 CONNECTION,
                 HeaderValue::from_static("close"),
@@ -608,7 +608,7 @@ mod tests {
             HttpProxyConfig {
                 port: 0,
                 host: "127.0.0.1".to_string(),
-                outproxy: Some("outproxy.i2p".to_string()),
+                outproxy: Some("outproxy.echo".to_string()),
             },
             sam_port,
             None,
@@ -677,7 +677,7 @@ mod tests {
             HttpProxyConfig {
                 port: 0,
                 host: "127.0.0.1".to_string(),
-                outproxy: Some("outproxy.i2p".to_string()),
+                outproxy: Some("outproxy.echo".to_string()),
             },
             sam_port,
             None,
@@ -727,10 +727,10 @@ mod tests {
 
         // create empty address book
         let address_book = {
-            let hosts = "psi.i2p=avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a\n\
-                    zerobin.i2p=3564erslxzaoucqasxsjerk4jz2xril7j2cbzd4p7flpb4ut67hq\n\
-                    tracker2.postman.i2p=6a4kxkg5wp33p25qqhgwl6sj4yh4xuf5b3p3qldwgclebchm3eea\n\
-                    zzz.i2p=lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua\n"
+            let hosts = "psi.echo=avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a\n\
+                    zerobin.echo=3564erslxzaoucqasxsjerk4jz2xril7j2cbzd4p7flpb4ut67hq\n\
+                    tracker2.postman.echo=6a4kxkg5wp33p25qqhgwl6sj4yh4xuf5b3p3qldwgclebchm3eea\n\
+                    zzz.echo=lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua\n"
                 .to_string();
 
             let dir = tempdir().unwrap().keep();
@@ -754,7 +754,7 @@ mod tests {
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
-                    outproxy: Some("zzz.i2p".to_string()),
+                    outproxy: Some("zzz.echo".to_string()),
                 },
                 sam_port,
                 None,
@@ -765,7 +765,7 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
 
@@ -775,7 +775,7 @@ mod tests {
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
-                    outproxy: Some("www.zzz.i2p".to_string()),
+                    outproxy: Some("www.zzz.echo".to_string()),
                 },
                 sam_port,
                 None,
@@ -786,7 +786,7 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
 
@@ -796,7 +796,7 @@ mod tests {
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
-                    outproxy: Some("http://zzz.i2p".to_string()),
+                    outproxy: Some("http://zzz.echo".to_string()),
                 },
                 sam_port,
                 None,
@@ -807,7 +807,7 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
 
@@ -817,7 +817,7 @@ mod tests {
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
-                    outproxy: Some("http://www.zzz.i2p".to_string()),
+                    outproxy: Some("http://www.zzz.echo".to_string()),
                 },
                 sam_port,
                 None,
@@ -828,18 +828,18 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
 
-        // http://www. .b32.i2p host
+        // http://www. .b32.echo host
         {
             let proxy = HttpProxy::new(
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
                     outproxy: Some(
-                        "http://www.lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                        "http://www.lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
                             .to_string(),
                     ),
                 },
@@ -852,18 +852,18 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
 
-        // http:// .b32.i2p host
+        // http:// .b32.echo host
         {
             let proxy = HttpProxy::new(
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
                     outproxy: Some(
-                        "http://lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                        "http://lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
                             .to_string(),
                     ),
                 },
@@ -876,18 +876,18 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
 
-        // http:// .b32.i2p host
+        // http:// .b32.echo host
         {
             let proxy = HttpProxy::new(
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
                     outproxy: Some(
-                        "www.lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                        "www.lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
                             .to_string(),
                     ),
                 },
@@ -900,18 +900,18 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
 
-        // .b32.i2p host
+        // .b32.echo host
         {
             let proxy = HttpProxy::new(
                 HttpProxyConfig {
                     port: 0,
                     host: "127.0.0.1".to_string(),
                     outproxy: Some(
-                        "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p".to_string(),
+                        "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo".to_string(),
                     ),
                 },
                 sam_port,
@@ -923,7 +923,7 @@ mod tests {
 
             assert_eq!(
                 proxy.outproxy.as_ref().unwrap().as_str(),
-                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.i2p"
+                "lhbd7ojcaiofbfku7ixh47qj537g572zmhdc4oilvugzxdpdghua.b32.echo"
             );
         }
     }