mirror of
https://github.com/samsonjs/vibetunnel.git
synced 2026-04-18 13:25:52 +00:00
fix tauri compile
This commit is contained in:
parent
4a3f7d4722
commit
806b931980
5 changed files with 20 additions and 16 deletions
|
|
@ -341,19 +341,22 @@ impl NodeJsServer {
|
|||
};
|
||||
|
||||
// Try multiple locations for the vibetunnel executable
|
||||
let current_exe = std::env::current_exe().ok();
|
||||
let possible_paths = vec![
|
||||
// Next to the Tauri executable
|
||||
std::env::current_exe()
|
||||
.ok()
|
||||
.and_then(|p| p.parent().map(|p| p.join(exe_name))),
|
||||
// In resources directory (common for packaged apps)
|
||||
std::env::current_exe()
|
||||
.ok()
|
||||
current_exe.as_ref()
|
||||
.and_then(|p| p.parent().map(|p| p.join("resources").join(exe_name))),
|
||||
// Development path
|
||||
PathBuf::from("../web/native").join(exe_name).canonicalize().ok(),
|
||||
// Another development path
|
||||
// Development path relative to src-tauri
|
||||
Some(PathBuf::from("../../web/native").join(exe_name)),
|
||||
// Development path with canonicalize
|
||||
PathBuf::from("../../web/native").join(exe_name).canonicalize().ok(),
|
||||
// Next to the Tauri executable (but check it's not the Tauri binary itself)
|
||||
current_exe.as_ref()
|
||||
.and_then(|p| p.parent().map(|p| p.join(exe_name)))
|
||||
.filter(|path| {
|
||||
// Make sure this isn't the Tauri executable itself
|
||||
current_exe.as_ref().map_or(true, |exe| path != exe)
|
||||
}),
|
||||
];
|
||||
|
||||
for path_opt in possible_paths {
|
||||
|
|
@ -369,6 +372,7 @@ impl NodeJsServer {
|
|||
let _ = std::fs::set_permissions(&path, perms);
|
||||
}
|
||||
}
|
||||
info!("Using vibetunnel executable at: {:?}", path);
|
||||
return Ok(path);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ pub async fn stop_server(state: State<'_, AppState>, app: tauri::AppHandle) -> R
|
|||
let _ = state.ngrok_manager.stop_tunnel().await;
|
||||
|
||||
// Update menu bar server status
|
||||
crate::tray_menu::TrayMenuManager::update_server_status(&app, 4020, false).await;
|
||||
crate::tray_menu::TrayMenuManager::update_server_status(&app, 4022, false).await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -1805,7 +1805,7 @@ pub async fn update_setting(section: String, key: String, value: String) -> Resu
|
|||
},
|
||||
"dashboard" => match key.as_str() {
|
||||
"server_port" => {
|
||||
settings.dashboard.server_port = json_value.as_u64().unwrap_or(4020) as u16
|
||||
settings.dashboard.server_port = json_value.as_u64().unwrap_or(4022) as u16
|
||||
}
|
||||
"enable_password" => {
|
||||
settings.dashboard.enable_password = json_value.as_bool().unwrap_or(false)
|
||||
|
|
@ -2038,7 +2038,7 @@ pub async fn get_server_logs(limit: usize) -> Result<Vec<ServerLog>, String> {
|
|||
ServerLog {
|
||||
timestamp: chrono::Utc::now().to_rfc3339(),
|
||||
level: "info".to_string(),
|
||||
message: "Server started on port 4020".to_string(),
|
||||
message: "Server started on port 4022".to_string(),
|
||||
},
|
||||
ServerLog {
|
||||
timestamp: chrono::Utc::now().to_rfc3339(),
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ impl Default for Settings {
|
|||
prompt_move_to_applications: None,
|
||||
},
|
||||
dashboard: DashboardSettings {
|
||||
server_port: 4020,
|
||||
server_port: 4022,
|
||||
enable_password: false,
|
||||
password: String::new(),
|
||||
access_mode: "localhost".to_string(),
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ impl TerminalSpawnService {
|
|||
// If no command specified, create a VibeTunnel session command
|
||||
if launch_options.command.is_none() {
|
||||
// Get server status to build the correct URL
|
||||
let port = 4020; // Default port, should get from settings
|
||||
let port = 4022; // Default port for Tauri development
|
||||
launch_options.command = Some(format!(
|
||||
"vt connect localhost:{}/{}",
|
||||
port, request.session_id
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ pub struct TrayMenuManager;
|
|||
|
||||
impl TrayMenuManager {
|
||||
pub fn create_menu(app: &AppHandle) -> Result<Menu<tauri::Wry>, tauri::Error> {
|
||||
Self::create_menu_with_state(app, false, 4020, 0, None)
|
||||
Self::create_menu_with_state(app, false, 4022, 0, None)
|
||||
}
|
||||
|
||||
pub fn create_menu_with_state(
|
||||
|
|
@ -229,7 +229,7 @@ impl TrayMenuManager {
|
|||
let port = if running {
|
||||
settings.dashboard.server_port
|
||||
} else {
|
||||
4020
|
||||
4022
|
||||
};
|
||||
|
||||
// Get monitored sessions for detailed info
|
||||
|
|
|
|||
Loading…
Reference in a new issue