client bad case handle

admin-web/src/view/network/NetworkDetailPage.tsx

@@ -67,7 +67,7 @@ export default function NetworkDetailPage() {
                     <Col span={8}>
                         <Form.Item rules={[{required: true}]} name={['setting','protocol']}
                                    label="Protocol">
-                            <Select disabled>
+                            <Select>
                                 <Option value={NetworkProtocol.TCP}>TCP</Option>
                                 <Option value={NetworkProtocol.UDP}>UDP</Option>
                             </Select>
@@ -84,4 +84,4 @@ export default function NetworkDetailPage() {
 // add Nodes Navigator, Invite Code
 // <Col span={8}>
 //     <Form.Item name={['setting', 'dns']} label="Default DNS"><Input/></Form.Item>
-// </Col>
+// </Col>

backend/src/main/scala/com/timzaak/fornet/pubsub/NodeChangeNotifyService.scala

@@ -119,16 +119,6 @@ class NodeChangeNotifyService(
         val network = networkDao.findById(node.networkId).get
         val peer = EntityConvert.toPeer(node, network)
 
-        connectionManager.sendNetworkMessage(
-          node.networkId,
-          NetworkMessage(
-            networkId = networkId,
-            NetworkMessage.Info.Peer(
-              PeerChange(addPeer = Some(peer))
-            )
-          )
-        )
-
         val notifyNodes = nodeService.getAllRelativeNodes(node)
 
         connectionManager.sendClientMessage(
@@ -142,6 +132,16 @@ class NodeChangeNotifyService(
             ),
           )
         )
+
+        connectionManager.sendNetworkMessage(
+          node.networkId,
+          NetworkMessage(
+            networkId = networkId,
+            NetworkMessage.Info.Peer(
+              PeerChange(addPeer = Some(peer))
+            )
+          )
+        )
       case _ =>
       // do nothing.
     }

client/.cargo/config.toml

@@ -0,0 +1,3 @@
+[build]
+# This is for tokio-console
+#rustflags = ["--cfg", "tokio_unstable"]

client/bin/Cargo.toml

@@ -18,9 +18,10 @@ fornet-lib = {path = "../lib"}
 clap = { version = "3.2.20", features = ["env"] }
 anyhow = "1.0"
 
-tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread", "net", "signal"] }
+tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread", "net", "signal", "tracing"] }
 tracing = "0.1.36"
 tracing-subscriber = {version = "0.3.15",  features = ["env-filter"]}
+#console-subscriber = "0.1.9"
 
 serde = { version = "1.0.144" }
 serde_json = "1.0.85"

client/bin/src/fornet.rs

@@ -16,48 +16,43 @@ async fn main() -> anyhow::Result<()> {
 
     let matches = Command::new(APP_NAME)
         .version(env!("CARGO_PKG_VERSION"))
-        .author("timzaak <zsy.evan@gmail.com>")
+        .author("ForNetCode <zsy.evan@gmail.com>")
         .args(&[
             Arg::new("config")
                 .long("config")
                 .short('c')
                 .env("FORNET_CONFIG")
                 .help("config directory path")
-                .default_value(&default_config_path)
+                .default_value(&default_config_path),
         ])
         .get_matches();
 
+
     let config_dir = matches.value_of("config").unwrap().to_owned();
 
-    match matches.subcommand() {
-        None => {
-            let log_level = if cfg!(debug_assertions) {
-                "debug"
-            } else {
-                "info"
-            };
-            let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::from_str(log_level).unwrap());
-            if cfg!(debug_assertions) {
-                tracing_subscriber::fmt()
-                    .with_env_filter(env_filter)
-                    .init();
-            } else {
-                tracing_subscriber::fmt()
-                    .with_env_filter(env_filter)
-                    .with_target(false)
-                    .with_ansi(false)
-                    .init();
-            }
 
-            //tracing::info!("log level: {log_level}");
-            ServerManager::start_server(config_dir, StartMethod::CommandLine).await?;
-            tokio::signal::ctrl_c().await.unwrap();
-            //TODO: add signal
-        }
-        _ => {
-            println!("please type: fornet --help for more information.")
-        }
+    //console_subscriber::init();
+
+    let log_level = if cfg!(debug_assertions) {
+        "debug"
+    } else {
+        "info"
     };
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::from_str(log_level).unwrap());
+    if cfg!(debug_assertions) {
+        tracing_subscriber::fmt()
+            .with_env_filter(env_filter)
+            .init();
+    } else {
+        tracing_subscriber::fmt()
+            .with_env_filter(env_filter)
+            .with_target(false)
+            .with_ansi(false)
+            .init();
+    }
+
+    ServerManager::start_server(config_dir, StartMethod::CommandLine).await?;
+    tokio::signal::ctrl_c().await.unwrap();
     Ok(())
 }
 

client/bin/src/fornet_cli.rs

@@ -8,7 +8,7 @@ use fornet_lib::wr_manager::DeviceInfoResp;
 pub async fn main() -> anyhow::Result<()> {
     let mut command = Command::new("fornet-cli")
         .version(env!("CARGO_PKG_VERSION"))
-        .author("timzaak <zsy.evan@gmail.com>")
+        .author("ForNetCode <zsy.evan@gmail.com>")
         .subcommand(
             Command::new("join").arg(Arg::new("invite_token").help("base64 token").required(true)),
         ).subcommand(

client/lib/Cargo.toml

@@ -61,8 +61,6 @@ paho-mqtt = "0.12"
 
 
 
-
-
 [dependencies.boringtun]
 version = "0.5.2"
 path = "../../third/boringtun/boringtun"
@@ -76,5 +74,9 @@ windows = {version = "0.44", features=["Win32_Networking_WinSock"]}
 cidr-utils = "0.5.10"
 #winapi = {version = "0.3", features=["ws2def"]}
 
+
+
+
+
 [build-dependencies]
 tonic-build = "0.8"

client/lib/examples/tokio_select_example.rs

@@ -0,0 +1,28 @@
+use std::time::Duration;
+
+async fn interval() {
+    let mut interval = tokio::time::interval(Duration::from_secs(1));
+    loop {
+        interval.tick().await;
+        println!("interval...")
+    }
+}
+#[tokio::main]
+async fn main() -> anyhow::Result<()>{
+    let task = tokio::spawn(async move {
+       loop {
+           tokio::select! {
+               _ = interval() => {
+                   println!("interval finish");
+               }
+           }
+       }
+    });
+    tokio::time::sleep(Duration::from_secs(5)).await;
+    task.abort();
+    println!("task is finish: {}", task.is_finished());
+    tokio::time::sleep(Duration::from_secs(5)).await;
+    println!("task is finish: {}", task.is_finished());
+    tokio::signal::ctrl_c().await.unwrap();
+    Ok(())
+}