Feature: 支持自定义公共节点

src/controller/api.rs

@@ -91,7 +91,7 @@ pub fn set_waiting() {
     state.set(AppState::Waiting);
 }
 
-pub fn set_scanning(room: Option<String>, player: Option<String>) {
+pub fn set_scanning(room: Option<String>, player: Option<String>, public_nodes: Vec<String>) {
     let capture = {
         let state = AppState::acquire();
         if !matches!(state.as_ref(), AppState::Waiting) {
@@ -113,7 +113,7 @@ pub fn set_scanning(room: Option<String>, player: Option<String>) {
         let room2 = room.clone();
         thread::spawn(move || {
             // EasyTier Uptime is undergoing DDOS attack, so it's crucial to perform a prefetch logic.
-            let _ = sender.send(fetch_public_nodes(&room2));
+            let _ = sender.send(fetch_public_nodes(&room2, public_nodes));
         });
 
         let (room, port, capture) = loop {
@@ -135,7 +135,7 @@ pub fn set_scanning(room: Option<String>, player: Option<String>) {
     });
 }
 
-pub fn set_guesting(room: Room, player: Option<String>) -> bool {
+pub fn set_guesting(room: Room, player: Option<String>, public_nodes: Vec<String>) -> bool {
     let capture = {
         let state = AppState::acquire();
         if !matches!(state.as_ref(), AppState::Waiting { .. }) {
@@ -144,7 +144,10 @@ pub fn set_guesting(room: Room, player: Option<String>) -> bool {
         state.set(AppState::GuestConnecting { room: room.clone() })
     };
     logging!("Core", "Connecting to room, code={}", room.code);
-    thread::spawn(move || room.start_guest(capture, player));
+    thread::spawn(move || {
+        let public_nodes = fetch_public_nodes(&room, public_nodes);
+        scaffolding::start_guest(room, player, capture, public_nodes)
+    });
 
     true
 }

src/controller/rooms/mod.rs

@@ -1,7 +1,5 @@
 pub mod scaffolding;
 
-use crate::controller::states::AppStateCapture;
-
 #[derive(Debug, Clone)]
 pub struct Room {
     pub code: String,
@@ -30,8 +28,4 @@ impl Room {
     pub fn from(code: &str) -> Option<Room> {
         scaffolding::parse(code)
     }
-
-    pub fn start_guest(self, capture: AppStateCapture, player: Option<String>) {
-        scaffolding::start_guest(self, player, capture)
-    }
 }

src/controller/rooms/scaffolding/room.rs

@@ -3,22 +3,22 @@ use crate::controller::states::{AppState, AppStateCapture};
 use crate::controller::{ConnectionDifficulty, ExceptionType, Room, RoomKind, SCAFFOLDING_PORT};
 use crate::easytier;
 use crate::easytier::argument::{Argument, PortForward, Proto};
-use crate::easytier::publics::{fetch_public_nodes, PublicServers};
+use crate::easytier::publics::PublicServers;
+use crate::easytier::EasyTierMember;
 use crate::mc::fakeserver::FakeServer;
 use crate::ports::PortRequest;
 use crate::scaffolding::client::ClientSession;
 use crate::scaffolding::profile::{Profile, ProfileKind, ProfileSnapshot};
 use crate::scaffolding::PacketResponse;
 use rand_core::{OsRng, TryRngCore};
 use serde_json::{json, Value};
+use socket2::{Domain, SockAddr, Socket, Type};
 use std::borrow::Cow;
 use std::mem::{transmute, MaybeUninit};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddrV4, SocketAddrV6};
 use std::str::FromStr;
-use std::time::{Duration, SystemTime};
 use std::thread;
-use socket2::{Domain, SockAddr, Socket, Type};
-use crate::easytier::EasyTierMember;
+use std::time::{Duration, SystemTime};
 
 static CHARS: &[u8] = "0123456789ABCDEFGHJKLMNPQRSTUVWXYZ".as_bytes();
 
@@ -215,8 +215,8 @@ pub fn start_host(room: Room, port: u16, player: Option<String>, capture: AppSta
     });
 }
 
-pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture) {
-    let mut args = compute_arguments(&room, fetch_public_nodes(&room));
+pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture, public_servers: PublicServers) {
+    let mut args = compute_arguments(&room, public_servers);
     args.push(Argument::DHCP);
     args.push(Argument::TcpWhitelist(0));
     args.push(Argument::UdpWhitelist(0));

src/easytier/publics.rs

@@ -2,11 +2,13 @@ use crate::controller::Room;
 
 pub type PublicServers = Vec<String>;
 
-pub fn fetch_public_nodes(_: &Room) -> PublicServers {
-    Vec::from([
+pub fn fetch_public_nodes(_: &Room, mut external_nodes: PublicServers) -> PublicServers {
+    external_nodes.extend_from_slice(&[
         "tcp://public.easytier.top:11010",
         "tcp://public2.easytier.cn:54321",
         "https://etnode.zkitefly.eu.org/node1",
         "https://etnode.zkitefly.eu.org/node2",
-    ].map(|s| s.into()))
+    ].map(|s| s.into()));
+
+    external_nodes
 }

src/lib.rs

@@ -281,7 +281,7 @@ extern "system" fn jni_set_scanning<'l>(jenv: JNIEnv<'l>, _: JClass<'l>, room: J
     try_jvm! { |jenv|
         let room = parse_jstring(&jenv, &room);
         let player = parse_jstring(&jenv, &player);
-        controller::set_scanning(room, player);
+        controller::set_scanning(room, player, vec![]);
     }
 }
 
@@ -290,7 +290,7 @@ extern "system" fn jni_set_guesting<'l>(jenv: JNIEnv<'l>, _: JClass<'l>, room: J
         let room = parse_jstring(&jenv, &room).expect("'room' must not be NULL.");
         let player = parse_jstring(&jenv, &player);
 
-        if let Some(room) = Room::from(&room) && controller::set_guesting(room, player) {
+        if let Some(room) = Room::from(&room) && controller::set_guesting(room, player, vec![]) {
             JNI_TRUE
         } else {
             JNI_FALSE

src/server/states.rs

@@ -16,17 +16,15 @@ fn set_state_ide() -> Status {
     Status::Ok
 }
 
-#[get("/scanning?<room>&<player>")]
-fn set_state_scanning(room: Option<String>, player: Option<String>) -> Status {
-    controller::set_scanning(room, player);
+#[get("/scanning?<room>&<player>&<public_nodes>")]
+fn set_state_scanning(room: Option<String>, player: Option<String>, public_nodes: Vec<String>) -> Status {
+    controller::set_scanning(room, player, public_nodes);
     Status::Ok
 }
 
-#[get("/guesting?<room>&<player>")]
-fn set_state_guesting(room: Option<String>, player: Option<String>) -> Status {
-    if let Some(room) = room
-        && let Some(room) = Room::from(&room)
-        && controller::set_guesting(room, player)
+#[get("/guesting?<room>&<player>&<public_nodes>")]
+fn set_state_guesting(room: &str, player: Option<String>, public_nodes: Vec<String>) -> Status {
+    if let Some(room) = Room::from(room) && controller::set_guesting(room, player, public_nodes)
     {
         return Status::Ok;
     }