forked from imbytecat/fullstack-starter
refactor: 优化服务器启动逻辑并移除冗余端口检测
- 移除冗余的端口占用检测函数并优化开发与生产模式下的服务器启动逻辑,提升代码可读性与启动可靠性。
This commit is contained in:
@@ -13,9 +13,6 @@ const STARTUP_TIMEOUT_SECS: u64 = 5;
|
||||
/// 默认起始端口
|
||||
const DEFAULT_PORT: u16 = 3000;
|
||||
|
||||
/// 开发模式使用的端口
|
||||
const DEV_PORT: u16 = 3000;
|
||||
|
||||
/// 端口扫描范围(从起始端口开始扫描的端口数量)
|
||||
const PORT_SCAN_RANGE: u16 = 100;
|
||||
|
||||
@@ -40,19 +37,6 @@ async fn is_port_available(port: u16) -> bool {
|
||||
.is_ok()
|
||||
}
|
||||
|
||||
// 检查端口是否被占用(服务器正在监听)
|
||||
async fn is_port_in_use(port: u16) -> bool {
|
||||
use tokio::io::AsyncWriteExt;
|
||||
|
||||
match tokio::net::TcpStream::connect(format!("127.0.0.1:{}", port)).await {
|
||||
Ok(mut stream) => {
|
||||
let _ = stream.shutdown().await;
|
||||
true
|
||||
}
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
// 查找可用端口
|
||||
async fn find_available_port(start: u16) -> u16 {
|
||||
for port in start..start + PORT_SCAN_RANGE {
|
||||
@@ -65,39 +49,14 @@ async fn find_available_port(start: u16) -> u16 {
|
||||
|
||||
/// 启动 Sidecar 进程并创建主窗口
|
||||
pub fn spawn_sidecar(app_handle: tauri::AppHandle) {
|
||||
tauri::async_runtime::spawn(async move {
|
||||
// 检测是否为开发模式
|
||||
let is_dev = cfg!(debug_assertions);
|
||||
|
||||
if is_dev {
|
||||
// 开发模式:直接连接到 localhost:3000
|
||||
println!("🔧 开发模式:使用本地开发服务器 (localhost:{})", DEV_PORT);
|
||||
// 开发模式:直接创建窗口连接到 Vite 开发服务器
|
||||
println!("🔧 开发模式:连接到 Vite 开发服务器 (localhost:3000)");
|
||||
|
||||
// 等待开发服务器就绪(可选:添加重试逻辑)
|
||||
let max_retries = 10;
|
||||
let retry_delay = Duration::from_millis(500);
|
||||
let mut server_ready = false;
|
||||
|
||||
for attempt in 1..=max_retries {
|
||||
if is_port_in_use(DEV_PORT).await {
|
||||
server_ready = true;
|
||||
println!("✓ 开发服务器已就绪 (端口 {})", DEV_PORT);
|
||||
break;
|
||||
}
|
||||
println!(
|
||||
"⏳ 等待开发服务器启动... (尝试 {}/{})",
|
||||
attempt, max_retries
|
||||
);
|
||||
tokio::time::sleep(retry_delay).await;
|
||||
}
|
||||
|
||||
if !server_ready {
|
||||
eprintln!("✗ 开发服务器未就绪,请确保运行了 `bun run dev`");
|
||||
std::process::exit(1);
|
||||
}
|
||||
|
||||
// 创建主窗口
|
||||
let url = format!("http://localhost:{}", DEV_PORT);
|
||||
let url = "http://localhost:3000";
|
||||
tauri::WebviewWindowBuilder::new(
|
||||
&app_handle,
|
||||
"main",
|
||||
@@ -108,8 +67,12 @@ pub fn spawn_sidecar(app_handle: tauri::AppHandle) {
|
||||
.center()
|
||||
.build()
|
||||
.expect("创建窗口失败");
|
||||
} else {
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// 生产模式:启动 sidecar 二进制
|
||||
tauri::async_runtime::spawn(async move {
|
||||
println!("🚀 生产模式:启动 Sidecar Server");
|
||||
|
||||
// 查找可用端口
|
||||
@@ -176,7 +139,6 @@ pub fn spawn_sidecar(app_handle: tauri::AppHandle) {
|
||||
eprintln!("✗ Server 启动失败");
|
||||
std::process::exit(1);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user