allow using http connector for config server

easytier/src/connector/manual.rs

@@ -367,7 +367,7 @@ impl ManualConnectorManager {
         for ip_version in ip_versions {
             let ret = timeout(
                 // allow http connector to wait longer
-                std::time::Duration::from_secs(if dead_url.starts_with("http") { 20 } else { 1 }),
+                std::time::Duration::from_secs(if dead_url.starts_with("http") { 20 } else { 2 }),
                 Self::conn_reconnect_with_ip_version(
                     data.clone(),
                     dead_url.clone(),

easytier/src/easytier-core.rs

@@ -6,6 +6,7 @@ extern crate rust_i18n;
 use std::{
     net::{Ipv4Addr, SocketAddr},
     path::PathBuf,
+    sync::Arc,
 };
 
 use anyhow::Context;
@@ -19,12 +20,16 @@ use easytier::{
             TomlConfigLoader, VpnPortalConfig,
         },
         constants::EASYTIER_VERSION,
-        global_ctx::{EventBusSubscriber, GlobalCtxEvent},
+        global_ctx::{EventBusSubscriber, GlobalCtx, GlobalCtxEvent},
         scoped_task::ScopedTask,
+        stun::MockStunInfoCollector,
     },
+    connector::create_connector_by_url,
     launcher,
-    proto::{self, common::CompressionAlgoPb},
-    tunnel::udp::UdpTunnelConnector,
+    proto::{
+        self,
+        common::{CompressionAlgoPb, NatType},
+    },
     utils::{init_logger, setup_panic_handler},
     web_client,
 };
@@ -860,7 +865,15 @@ async fn run_main(cli: Cli) -> anyhow::Result<()> {
             panic!("empty token");
         }
 
-        let _wc = web_client::WebClient::new(UdpTunnelConnector::new(c_url), token.to_string());
+        let config = TomlConfigLoader::default();
+        let global_ctx = Arc::new(GlobalCtx::new(config));
+        global_ctx.replace_stun_info_collector(Box::new(MockStunInfoCollector {
+            udp_nat_type: NatType::Unknown,
+        }));
+        let _wc = web_client::WebClient::new(
+            create_connector_by_url(c_url.as_str(), &global_ctx).await?,
+            token.to_string(),
+        );
         tokio::signal::ctrl_c().await.unwrap();
         return Ok(());
     }

easytier/src/lib.rs

@@ -1,13 +1,13 @@
 #![allow(dead_code)]
 
 mod arch;
-mod connector;
 mod gateway;
 mod instance;
 mod peer_center;
 mod vpn_portal;
 
 pub mod common;
+pub mod connector;
 pub mod launcher;
 pub mod peers;
 pub mod proto;