Initial plan

.github/workflows/Dockerfile

@@ -42,4 +42,7 @@ EXPOSE 11011/tcp
 # wss
 EXPOSE 11012/tcp
 
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=5 \
+    CMD ["/usr/local/bin/easytier-cli", "--rpc-portal", "127.0.0.1:15888", "--output", "json", "node", "info"]
+
 ENTRYPOINT ["/sbin/tini", "--", "easytier-core"]

Cargo.lock

@@ -4623,7 +4623,7 @@ dependencies = [
 [[package]]
 name = "kcp-sys"
 version = "0.1.0"
-source = "git+https://github.com/EasyTier/kcp-sys?rev=94964794caaed5d388463137da59b97499619e5f#94964794caaed5d388463137da59b97499619e5f"
+source = "git+https://github.com/EasyTier/kcp-sys?rev=d7427c22d764deb1860a7d37acc446ed5033464c#d7427c22d764deb1860a7d37acc446ed5033464c"
 dependencies = [
  "anyhow",
  "auto_impl",

easytier-contrib/easytier-ohrs/Cargo.lock

@@ -2595,7 +2595,7 @@ dependencies = [
 [[package]]
 name = "kcp-sys"
 version = "0.1.0"
-source = "git+https://github.com/EasyTier/kcp-sys?rev=94964794caaed5d388463137da59b97499619e5f#94964794caaed5d388463137da59b97499619e5f"
+source = "git+https://github.com/EasyTier/kcp-sys?rev=d7427c22d764deb1860a7d37acc446ed5033464c#d7427c22d764deb1860a7d37acc446ed5033464c"
 dependencies = [
  "anyhow",
  "auto_impl",

easytier/Cargo.toml

@@ -224,7 +224,7 @@ service-manager = { git = "https://github.com/EasyTier/service-manager-rs.git",
 
 zstd = { version = "0.13", optional = true }
 
-kcp-sys = { git = "https://github.com/EasyTier/kcp-sys", rev = "94964794caaed5d388463137da59b97499619e5f", optional = true }
+kcp-sys = { git = "https://github.com/EasyTier/kcp-sys", rev = "d7427c22d764deb1860a7d37acc446ed5033464c", optional = true }
 
 prost-reflect = { version = "0.14.5", default-features = false, features = [
     "derive",

easytier/locales/app.yml

@@ -5,12 +5,10 @@ core_clap:
     en: |+
       config server address, allow format:
       full url: --config-server udp://127.0.0.1:22020/admin, 'udp' can be replaced with tcp, ws, wss (when config server ws is proxied to wss)
-      short link: --config-server https://example.com/easytier/admin, the HTTP(S) response should redirect to the full config server URL
       only user name: --config-server admin, will use official server
     zh-CN: |+
       配置服务器地址。允许格式：
       完整URL：--config-server udp://127.0.0.1:22020/admin，udp可以根据配置服务器替换为 tcp，ws，wss(配置服务器ws被代理为wss时)
-      短链接：--config-server https://example.com/easytier/admin，HTTP(S) 响应应重定向到完整配置服务器 URL
       仅用户名：--config-server admin，将使用官方的服务器
   machine_id:
     en: |+

easytier/src/web_client/mod.rs

@@ -78,22 +78,6 @@ impl TunnelConnector for ConfigServerConnector {
     }
 }
 
-fn parse_config_server_input(config_server_url_s: &str) -> Result<Url> {
-    match Url::parse(config_server_url_s) {
-        Ok(u) => Ok(u),
-        Err(_) => format!(
-            "udp://config-server.easytier.cn:22020/{}",
-            config_server_url_s
-        )
-        .parse()
-        .with_context(|| "failed to parse config server URL"),
-    }
-}
-
-fn is_config_server_http_short_link(url: &Url) -> bool {
-    matches!(url.scheme(), "http" | "https")
-}
-
 impl WebClient {
     pub fn new<T: TunnelConnector + 'static, S: ToString, H: ToString>(
         connector: T,
@@ -256,7 +240,15 @@ pub async fn run_web_client(
 ) -> Result<WebClient> {
     let machine_id = resolve_machine_id(&machine_id_opts)
         .with_context(|| "failed to resolve machine id for web client")?;
-    let config_server_url = parse_config_server_input(config_server_url_s)?;
+    let config_server_url = match Url::parse(config_server_url_s) {
+        Ok(u) => u,
+        Err(_) => format!(
+            "udp://config-server.easytier.cn:22020/{}",
+            config_server_url_s
+        )
+        .parse()
+        .with_context(|| "failed to parse config server URL")?,
+    };
 
     TunnelScheme::try_from(&config_server_url).map_err(|_| {
         anyhow::anyhow!(
@@ -266,8 +258,7 @@ pub async fn run_web_client(
     })?;
 
     let mut c_url = config_server_url.clone();
-    // Keep HTTP(S) paths so HttpTunnelConnector can request short links and handle their redirects.
-    if !matches!(c_url.scheme(), "ws" | "wss") && !is_config_server_http_short_link(&c_url) {
+    if !matches!(c_url.scheme(), "ws" | "wss") {
         c_url.set_path("");
     }
     let token = config_server_url
@@ -314,15 +305,7 @@ pub async fn run_web_client(
 mod tests {
     use std::sync::{Arc, atomic::AtomicBool};
 
-    use crate::{
-        common::{MachineIdOptions, config::TomlConfigLoader, global_ctx::GlobalCtx},
-        instance_manager::NetworkInstanceManager,
-        tunnel::TunnelConnector,
-    };
-    use tokio::{
-        io::{AsyncReadExt as _, AsyncWriteExt as _},
-        net::TcpListener,
-    };
+    use crate::{common::MachineIdOptions, instance_manager::NetworkInstanceManager};
 
     #[tokio::test]
     async fn test_manager_wait() {
@@ -380,47 +363,4 @@ mod tests {
         assert!(!client.is_connected());
         drop(client);
     }
-
-    #[tokio::test]
-    async fn config_server_short_link_uses_existing_http_redirect_connector() {
-        let target_listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let target_addr = target_listener.local_addr().unwrap();
-        let target_task = tokio::spawn(async move {
-            let _ = target_listener.accept().await.unwrap();
-        });
-
-        let http_listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let http_addr = http_listener.local_addr().unwrap();
-        let http_task = tokio::spawn(async move {
-            let (mut stream, _) = http_listener.accept().await.unwrap();
-            let mut buf = [0u8; 4096];
-            let n = stream.read(&mut buf).await.unwrap();
-            let req = String::from_utf8_lossy(&buf[..n]).to_string();
-            let resp = format!(
-                "HTTP/1.1 302 Found\r\nLocation: tcp://{}\r\nContent-Length: 0\r\n\r\n",
-                target_addr
-            );
-            stream.write_all(resp.as_bytes()).await.unwrap();
-            req
-        });
-
-        let config = TomlConfigLoader::default();
-        let global_ctx = Arc::new(GlobalCtx::new(config));
-        let mut flags = global_ctx.get_flags();
-        flags.bind_device = false;
-        global_ctx.set_flags(flags);
-        let url: url::Url = format!("http://{}/short-token", http_addr).parse().unwrap();
-        let mut connector = super::ConfigServerConnector { url, global_ctx };
-
-        let tunnel = connector.connect().await.unwrap();
-
-        let req = http_task.await.unwrap();
-        assert!(req.starts_with("GET /short-token "));
-        let info = tunnel.info().unwrap();
-        assert_eq!(
-            info.resolved_remote_addr.unwrap().url,
-            format!("tcp://{}", target_addr)
-        );
-        target_task.await.unwrap();
-    }
 }