renamed all NodeId to EndpointId

Author: rustonbsd

README.md

@@ -124,7 +124,7 @@ or use ephemeral keys
 
 ```
 
-Display its Node ID and share it to allow connection
+Display its Endpoint ID and share it to allow connection
 
 ![Starting server/Installing as service](/media/t-rec_server_service.gif)
 <br>
@@ -134,14 +134,14 @@ Display its Node ID and share it to allow connection
 // note: works only with persistent keys
 > iroh-ssh info
 
-    Your iroh-ssh nodeid: 38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
+    Your iroh-ssh endpoint id: 38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
     iroh-ssh version 0.2.7
     https://github.com/rustonbsd/iroh-ssh
 
-    Your server iroh-ssh nodeid:
+    Your server iroh-ssh endpoint id:
       iroh-ssh my-user@38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
 
-    Your service iroh-ssh nodeid:
+    Your service iroh-ssh endpoint id:
       iroh-ssh my-user@4fjeeiui4jdm96005255c3begj389xk3aeaeef6cfebd88344aa8c85e1dbfc1ad
 ```
 
@@ -181,7 +181,7 @@ Display its Node ID and share it to allow connection
 ## Commands
 
 ```bash
-# Get your Node ID and info
+# Get your Endpoint ID and info
 > iroh-ssh info
 
 # Server modes
@@ -194,13 +194,13 @@ Display its Node ID and share it to allow connection
 > iroh-ssh service uninstall                 # Uninstall service
 
 # Client connection
-> iroh-ssh user@<NODE_ID>                    # Connect to remote server
-> iroh-ssh connect user@<NODE_ID>            # Explicit connect command, works with all standard ssh params and flags
+> iroh-ssh user@<ENDPOINT_ID>                    # Connect to remote server
+> iroh-ssh connect user@<ENDPOINT_ID>            # Explicit connect command, works with all standard ssh params and flags
 ```
 
 ## Security Model
 
-- **Node ID access**: Anyone with the Node ID can reach your SSH port
+- **Endpoint ID access**: Anyone with the Endpoint ID can reach your SSH port
 - **SSH authentication**: SSH key file, certificate and password auth are supported
 - **Persistent keys**: Uses dedicated `.ssh/iroh_ssh_ed25519` keypair
 - **QUIC encryption**: Transport layer encryption between endpoints

README_es.md

@@ -134,14 +134,14 @@ Mostrar su ID de nodo y compártalo para permitir la conexión
 // nota: funciona solo con llaves persistentes
 > iroh-ssh info
 
-    Your iroh-ssh nodeid: 38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
+    Your iroh-ssh endpoint id: 38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
     iroh-ssh version 0.2.7
     https://github.com/rustonbsd/iroh-ssh
 
-    Your server iroh-ssh nodeid:
+    Your server iroh-ssh endpoint id:
       iroh-ssh my-user@38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
 
-    Your service iroh-ssh nodeid:
+    Your service iroh-ssh endpoint id:
       iroh-ssh my-user@4fjeeiui4jdm96005255c3begj389xk3aeaeef6cfebd88344aa8c85e1dbfc1ad
 ```
 
@@ -194,8 +194,8 @@ Mostrar su ID de nodo y compártalo para permitir la conexión
 > iroh-ssh service uninstall                 # Desinstalar servicio
 
 # Conexión de cliente
-> iroh-ssh user@<NODE_ID>                           # Conectarse a un servidor remoto
-> iroh-ssh connect user@<NODE_ID>                   # Comando de conexión explicito, funciona con todos los parametros y opciones ssh estándar
+> iroh-ssh user@<ENDPOINT_ID>                           # Conectarse a un servidor remoto
+> iroh-ssh connect user@<ENDPOINT_ID>                   # Comando de conexión explicito, funciona con todos los parametros y opciones ssh estándar
 ```
 
 ## Modelo de seguridad

README_pt.md

@@ -134,14 +134,14 @@ Exiba seu ID de nó e compartilhe-o para permitir a conexão
 // nota: funciona apenas com chaves persistentes
 > iroh-ssh info
 
-    Your iroh-ssh nodeid: 38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
+    Your iroh-ssh endpoint id: 38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
     iroh-ssh version 0.2.7
     https://github.com/rustonbsd/iroh-ssh
 
-    Your server iroh-ssh nodeid:
+    Your server iroh-ssh endpoint id:
       iroh-ssh my-user@38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
 
-    Your service iroh-ssh nodeid:
+    Your service iroh-ssh endpoint id:
       iroh-ssh my-user@4fjeeiui4jdm96005255c3begj389xk3aeaeef6cfebd88344aa8c85e1dbfc1ad
 ```
 
@@ -194,8 +194,8 @@ Exiba seu ID de nó e compartilhe-o para permitir a conexão
 > iroh-ssh service uninstall                 # Desinstalar serviço
 
 # Conexão do cliente
-> iroh-ssh user@<NODE_ID>                           # Conectar-se a um servidor remoto
-> iroh-ssh connect user@<NODE_ID>                   # Comando de conexão explícito, funciona com todos os parâmetros e flags ssh padrão
+> iroh-ssh user@<ENDPOINT_ID>                           # Conectar-se a um servidor remoto
+> iroh-ssh connect user@<ENDPOINT_ID>                   # Comando de conexão explícito, funciona com todos os parâmetros e flags ssh padrão
 ```
 
 ## Modelo de segurança

src/api.rs

@@ -37,14 +37,14 @@ pub async fn info_mode() -> anyhow::Result<()> {
 
     if let Some(key) = server_key {
         println!();
-        println!("Your server iroh-ssh nodeid:");
+        println!("Your server iroh-ssh endpoint id:");
         println!("  iroh-ssh {}@{}", whoami::username(), key.clone().public());
         println!();
     }
 
     if let Some(key) = service_key {
         println!();
-        println!("Your service iroh-ssh nodeid:");
+        println!("Your service iroh-ssh endpoint id:");
         println!("  iroh-ssh {}@{}", whoami::username(), key.clone().public());
         println!();
     }
@@ -84,7 +84,7 @@ pub async fn server_mode(server_args: ServerArgs, service: bool) -> anyhow::Resu
     println!(
         "\n  iroh-ssh {}@{}\n",
         whoami::username(),
-        iroh_ssh.node_id()
+        iroh_ssh.endpoint_id()
     );
     if server_args.persist {
         let distro_home = my_home()?.ok_or_else(|| anyhow::anyhow!("home directory not found"))?;
@@ -109,12 +109,12 @@ pub async fn server_mode(server_args: ServerArgs, service: bool) -> anyhow::Resu
 
 pub async fn proxy_mode(proxy_args: ProxyArgs) -> anyhow::Result<()> {
     let iroh_ssh = IrohSsh::builder().accept_incoming(false).build().await?;
-    let endpoint_id = EndpointId::from_str(if proxy_args.node_id.len() == 64 {
-        &proxy_args.node_id
-    } else if proxy_args.node_id.len() > 64 {
-        &proxy_args.node_id[proxy_args.node_id.len() - 64..]
+    let endpoint_id = EndpointId::from_str(if proxy_args.endpoint_id.len() == 64 {
+        &proxy_args.endpoint_id
+    } else if proxy_args.endpoint_id.len() > 64 {
+        &proxy_args.endpoint_id[proxy_args.endpoint_id.len() - 64..]
     } else {
-        return Err(anyhow::anyhow!("invalid node id length"));
+        return Err(anyhow::anyhow!("invalid endpoint id length"));
     })?;
     iroh_ssh.connect(endpoint_id).await
 }

src/cli.rs

@@ -2,7 +2,7 @@ use std::{ffi::OsString, path::PathBuf};
 
 use clap::{ArgAction, Args, Parser, Subcommand, command};
 
-const TARGET_HELP: &str = "Target in the form user@NODE_ID";
+const TARGET_HELP: &str = "Target in the form user@ENDPOINT_ID";
 
 #[derive(Parser, Debug)]
 #[command(name = "iroh-ssh", about = "ssh without ip")]
@@ -39,8 +39,8 @@ pub enum Cmd {
 
 #[derive(Args, Clone, Debug)]
 pub struct ProxyArgs {
-    #[arg(help = "Proxy node ID")]
-    pub node_id: String,
+    #[arg(help = "Proxy Endpoint ID")]
+    pub endpoint_id: String,
 }
 
 #[derive(Args, Clone, Debug)]
@@ -78,11 +78,11 @@ pub struct SshOpts {
     pub identity_file: Option<PathBuf>,
 
     #[arg(short = 'L', value_name = "LPORT:HOST:RPORT",
-        help = "Local forward [bind_addr:]lport:host:rport (host can't be node_id yet)", action = ArgAction::Append)]
+        help = "Local forward [bind_addr:]lport:host:rport (host can't be endpoint_id yet)", action = ArgAction::Append)]
     pub local_forward: Vec<String>,
 
     #[arg(short = 'R', value_name = "RPORT:HOST:LPORT",
-        help = "Remote forward [bind_addr:]rport:host:lport  (host can't be node_id yet)", action = ArgAction::Append)]
+        help = "Remote forward [bind_addr:]rport:host:lport  (host can't be endpoint_id yet)", action = ArgAction::Append)]
     pub remote_forward: Vec<String>,
 
     #[arg(

src/ssh.rs

@@ -198,7 +198,7 @@ impl IrohSsh {
         Ok(())
     }
 
-    pub fn node_id(&self) -> EndpointId {
+    pub fn endpoint_id(&self) -> EndpointId {
         self.inner
             .as_ref()
             .expect("inner not set")