bump version to v2.1.1 (#533)

.github/workflows/release.yml

@@ -21,7 +21,7 @@ on:
       version:
         description: 'Version for this release'
         type: string
-        default: 'v2.1.0'
+        default: 'v2.1.1'
         required: true
       make_latest:
         description: 'Mark this release as latest'

Cargo.lock

@@ -1830,7 +1830,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easytier"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "aes-gcm",
  "anyhow",
@@ -1926,7 +1926,7 @@ dependencies = [
 
 [[package]]
 name = "easytier-gui"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "chrono",

easytier-gui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "easytier-gui",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "private": true,
   "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4",
   "scripts": {

easytier-gui/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "easytier-gui"
-version = "2.1.0"
+version = "2.1.1"
 description = "EasyTier GUI"
 authors = ["you"]
 edition = "2021"

easytier-gui/src-tauri/tauri.conf.json

@@ -17,7 +17,7 @@
     "createUpdaterArtifacts": false
   },
   "productName": "easytier-gui",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "identifier": "com.kkrainbow.easytier",
   "plugins": {},
   "app": {

easytier-web/src/client_manager/mod.rs

@@ -1,14 +1,13 @@
 pub mod session;
 pub mod storage;
 
-use std::{collections::BTreeMap, str::FromStr, sync::Arc};
+use std::sync::Arc;
 
 use dashmap::DashMap;
 use easytier::{
     common::scoped_task::ScopedTask, proto::web::HeartbeatRequest, tunnel::TunnelListener,
 };
 use session::Session;
-use sqlx::types::chrono;
 use storage::{Storage, StorageToken};
 
 use crate::db::Db;

easytier-web/src/db/mod.rs

@@ -4,8 +4,8 @@ pub mod entity;
 
 use entity::user_running_network_configs;
 use sea_orm::{
-    prelude::Expr, sea_query::OnConflict, ActiveModelTrait, ColumnTrait as _, DatabaseConnection,
+    prelude::Expr, sea_query::OnConflict, ColumnTrait as _, DatabaseConnection, DbErr, EntityTrait,
-    DbErr, EntityTrait, QueryFilter as _, SqlxSqliteConnector, TransactionTrait as _,
+    QueryFilter as _, SqlxSqliteConnector, TransactionTrait as _,
 };
 use sea_orm_migration::MigratorTrait as _;
 use sqlx::{migrate::MigrateDatabase as _, types::chrono, Sqlite, SqlitePool};

easytier-web/src/restful/network.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use axum::extract::{Path, Query};
+use axum::extract::Path;
 use axum::http::StatusCode;
 use axum::routing::{delete, post};
 use axum::{extract::State, routing::get, Json, Router};

easytier/Cargo.toml

@@ -3,7 +3,7 @@ name = "easytier"
 description = "A full meshed p2p VPN, connecting all your devices in one network with one command."
 homepage = "https://github.com/EasyTier/EasyTier"
 repository = "https://github.com/EasyTier/EasyTier"
-version = "2.1.0"
+version = "2.1.1"
 edition = "2021"
 authors = ["kkrainbow"]
 keywords = ["vpn", "p2p", "network", "easytier"]

easytier/src/proto/rpc_impl/standalone.rs

@@ -38,6 +38,33 @@ impl<L: TunnelListener + 'static> StandAloneServer<L> {
         &self.registry
     }
 
+    async fn serve_loop(
+        listener: &mut L,
+        inflight: Arc<AtomicU32>,
+        registry: Arc<ServiceRegistry>,
+        tasks: Arc<Mutex<JoinSet<()>>>,
+    ) -> Result<(), Error> {
+        listener
+            .listen()
+            .await
+            .with_context(|| "failed to listen")?;
+
+        loop {
+            let tunnel = listener.accept().await?;
+            let registry = registry.clone();
+            let inflight_server = inflight.clone();
+            inflight_server.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+            tasks.lock().unwrap().spawn(async move {
+                let server =
+                    BidirectRpcManager::new().set_rx_timeout(Some(Duration::from_secs(60)));
+                server.rpc_server().registry().replace_registry(&registry);
+                server.run_with_tunnel(tunnel);
+                server.wait().await;
+                inflight_server.fetch_sub(1, std::sync::atomic::Ordering::Relaxed);
+            });
+        }
+    }
+
     pub async fn serve(&mut self) -> Result<(), Error> {
         let tasks = self.tasks.clone();
         let mut listener = self.listener.take().unwrap();
@@ -45,28 +72,24 @@ impl<L: TunnelListener + 'static> StandAloneServer<L> {
 
         join_joinset_background(tasks.clone(), "standalone server tasks".to_string());
 
-        listener
-            .listen()
-            .await
-            .with_context(|| "failed to listen")?;
-
         let inflight_server = self.inflight_server.clone();
 
         self.tasks.lock().unwrap().spawn(async move {
-            while let Ok(tunnel) = listener.accept().await {
+            loop {
-                let registry = registry.clone();
+                let ret = Self::serve_loop(
-                let inflight_server = inflight_server.clone();
+                    &mut listener,
-                inflight_server.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+                    inflight_server.clone(),
-                tasks.lock().unwrap().spawn(async move {
+                    registry.clone(),
-                    let server =
+                    tasks.clone(),
-                        BidirectRpcManager::new().set_rx_timeout(Some(Duration::from_secs(60)));
+                )
-                    server.rpc_server().registry().replace_registry(&registry);
+                .await;
-                    server.run_with_tunnel(tunnel);
+                if let Err(e) = ret {
-                    server.wait().await;
+                    tracing::error!(?e, url = ?listener.local_url(), "serve_loop exit unexpectedly");
-                    inflight_server.fetch_sub(1, std::sync::atomic::Ordering::Relaxed);
+                    println!("standalone serve_loop exit unexpectedly: {:?}", e);
-                });
+                }
+
+                tokio::time::sleep(Duration::from_secs(1)).await;
             }
-            panic!("standalone server listener exit");
         });
 
         Ok(())

easytier/src/proto/tests.rs

@@ -287,6 +287,8 @@ async fn standalone_rpc_test() {
     server.registry().register(service, "test");
     server.serve().await.unwrap();
 
+    tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+
     let mut client = StandAloneClient::new(TcpTunnelConnector::new(
         "tcp://127.0.0.1:33455".parse().unwrap(),
     ));

easytier/src/tunnel/tcp.rs

@@ -33,6 +33,7 @@ impl TcpTunnelListener {
 #[async_trait]
 impl TunnelListener for TcpTunnelListener {
     async fn listen(&mut self) -> Result<(), TunnelError> {
+        self.listener = None;
         let addr = check_scheme_and_get_socket_addr::<SocketAddr>(&self.addr, "tcp")?;
 
         let socket2_socket = socket2::Socket::new(