fixed version outdated UI

This commit is contained in:
2026-08-22 18:40:08 -07:00
parent cc423fd63a
commit 21a4120c0a
16 changed files with 507 additions and 189 deletions

View File

@@ -40,6 +40,48 @@ fn clean_path(path: &std::path::Path) -> String {
}
}
// Windows kill(pid) only terminates the named process, never its descendants.
// service-manager.js spawns auth-proxy and stream-api as children of node.exe,
// so a plain child.kill() from Rust leaves those orphaned and still holding
// ports/handles open - which is exactly why node.exe survives in Task Manager
// after the main window closes. taskkill /T walks the full process tree.
#[cfg(windows)]
fn kill_process_tree(pid: u32) {
use std::os::windows::process::CommandExt;
const CREATE_NO_WINDOW: u32 = 0x08000000;
let result = Command::new("taskkill")
.args(["/PID", &pid.to_string(), "/T", "/F"])
.creation_flags(CREATE_NO_WINDOW)
.output();
match result {
Ok(output) => debug_log(&format!(
"[KILL-TREE] taskkill on PID {} -> status: {}, stdout: {}, stderr: {}",
pid,
output.status,
String::from_utf8_lossy(&output.stdout).trim(),
String::from_utf8_lossy(&output.stderr).trim()
)),
Err(e) => debug_log(&format!("[KILL-TREE] taskkill failed to spawn for PID {}: {}", pid, e)),
}
}
#[cfg(not(windows))]
fn kill_process_tree(pid: u32) {
// On Unix, killing the process group covers the same case (auth-proxy/
// stream-api inherit the parent's group since detached is never set).
unsafe {
libc_kill_pgid(pid);
}
}
#[cfg(not(windows))]
unsafe fn libc_kill_pgid(pid: u32) {
// Negative pid signals the whole process group in POSIX kill(2).
let _ = Command::new("kill")
.args(["-9", &format!("-{}", pid)])
.output();
}
fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Ok(resource_dir) = app.path().resource_dir() {
let candidates = [
@@ -132,36 +174,26 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
const LINK_HANDLER_SCRIPT: &str = r#"
function doInvoke(cmd, args) {
let baseUrl = window.location.protocol.startsWith('http') ? window.location.origin : 'http://127.0.0.1:4890';
let label = window.__VYLA_WINDOW_LABEL || 'main';
let url = `${baseUrl}/__tauri_cmd/${cmd}?window=${label}`;
if (args && args.url) {
url += `&url=${encodeURIComponent(args.url)}`;
console.log(`[TitleBar-DEBUG] Invoking command: ${cmd}`, args);
console.log(`[TitleBar-DEBUG] __TAURI__ available:`, !!window.__TAURI__);
console.log(`[TitleBar-DEBUG] __TAURI__.core available:`, !!(window.__TAURI__ && window.__TAURI__.core));
if (window.__TAURI__ && window.__TAURI__.core) {
window.__TAURI__.core.invoke(cmd, args || {})
.then(() => console.log(`[TitleBar-DEBUG] ${cmd} succeeded`))
.catch((err) => console.error(`[TitleBar-DEBUG] ${cmd} failed:`, err));
} else {
console.error('[TitleBar-DEBUG] __TAURI__ global not available yet');
}
fetch(url).catch(err => {
const inv = window.__TAURI_INTERNALS__?.invoke || window.__TAURI__?.core?.invoke || window.__TAURI__?.invoke;
if (inv) inv(cmd, args || {}).catch(e => console.error(e));
});
}
function minimizeWindow() {
doInvoke('win_minimize');
}
function maximizeWindow() {
doInvoke('win_maximize');
}
function closeWindow() {
doInvoke('win_close');
}
function dragWindow() {
doInvoke('win_drag');
}
function minimizeWindow() { doInvoke('win_minimize'); }
function maximizeWindow() { doInvoke('win_maximize'); }
function closeWindow() { doInvoke('win_close'); }
function dragWindow() { doInvoke('win_drag'); }
window.open = function(url, target, features) {
if (!url) return null;
console.log('[TitleBar-DEBUG] window.open intercepted:', url, 'target:', target, 'features:', features);
console.log('[TitleBar-DEBUG] Current window label:', window.__VYLA_WINDOW_LABEL);
doInvoke('open_new_window', { url: url });
return null;
};
@@ -170,7 +202,10 @@ const LINK_HANDLER_SCRIPT: &str = r#"
const a = e.target.closest('a');
if (!a || !a.href) return;
console.log('[TitleBar-DEBUG] Link clicked:', a.href, 'target:', a.target, 'ctrlKey:', e.ctrlKey, 'metaKey:', e.metaKey, 'button:', e.button);
if (a.target === '_blank' || e.ctrlKey || e.metaKey || e.button === 1) {
console.log('[TitleBar-DEBUG] Intercepting link click for new window:', a.href);
e.preventDefault();
e.stopPropagation();
doInvoke('open_new_window', { url: a.href });
@@ -178,42 +213,82 @@ const LINK_HANDLER_SCRIPT: &str = r#"
}, true);
function injectTitlebar() {
console.log('[TitleBar-DEBUG] injectTitlebar called');
console.log('[TitleBar-DEBUG] Document URL:', window.location.href);
console.log('[TitleBar-DEBUG] Document readyState:', document.readyState);
console.log('[TitleBar-DEBUG] Window label:', window.__VYLA_WINDOW_LABEL);
if (document.getElementById('tauri-custom-titlebar')) {
console.log('[TitleBar-DEBUG] Titlebar already exists, skipping');
return;
}
if (!document.body) {
console.log('[TitleBar-DEBUG] No document.body yet, skipping');
return;
}
const style = document.createElement('style');
style.innerHTML = `
#tauri-custom-titlebar {
position: fixed !important; top: 0 !important; left: 0 !important; right: 0 !important;
height: 32px !important; display: flex !important; justify-content: space-between !important;
z-index: 2147483647 !important; background: transparent !important;
pointer-events: none !important; box-sizing: border-box !important; margin: 0 !important; padding: 0 !important;
position: fixed !important;
top: 0 !important;
left: 0 !important;
right: 0 !important;
height: 32px !important;
max-height: 32px !important;
display: flex !important;
justify-content: space-between !important;
align-items: center !important;
z-index: 2147483647 !important;
background: transparent !important;
pointer-events: none !important;
box-sizing: border-box !important;
margin: 0 !important;
padding: 0 !important;
}
.tauri-drag-region {
flex: 1 !important; height: 100% !important; cursor: default !important; pointer-events: auto !important;
flex: 1 !important;
height: 32px !important;
margin-left: 100px !important;
cursor: default !important;
pointer-events: auto !important;
}
.tauri-window-controls {
display: flex !important; pointer-events: auto !important; height: 32px !important; margin: 0 !important; padding: 0 !important;
position: relative !important; z-index: 2147483648 !important;
display: flex !important;
height: 32px !important;
margin: 0 !important;
padding: 0 !important;
pointer-events: auto !important;
z-index: 2147483648 !important;
}
button.tauri-btn {
width: 46px !important; max-width: 46px !important; min-width: 46px !important;
height: 32px !important; max-height: 32px !important; min-height: 32px !important;
background: transparent !important; border: none !important;
color: #fff !important; display: flex !important; align-items: center !important;
justify-content: center !important; cursor: pointer !important;
outline: none !important; padding: 0 !important; margin: 0 !important;
border-radius: 0 !important; box-shadow: none !important;
appearance: none !important; opacity: 1 !important; transform: none !important;
position: relative !important; z-index: 2147483649 !important;
width: 46px !important;
min-width: 46px !important;
max-width: 46px !important;
height: 32px !important;
min-height: 32px !important;
max-height: 32px !important;
background: transparent !important;
border: none !important;
color: #ffffff !important;
display: flex !important;
align-items: center !important;
justify-content: center !important;
cursor: pointer !important;
outline: none !important;
padding: 0 !important;
margin: 0 !important;
border-radius: 0 !important;
box-shadow: none !important;
appearance: none !important;
opacity: 1 !important;
transform: none !important;
pointer-events: auto !important;
user-select: none !important;
}
button.tauri-btn:hover { background: rgba(255, 255, 255, 0.15) !important; }
button#tauri-btn-close:hover { background: #E81123 !important; color: white !important; }
button.tauri-btn svg { width: 10px !important; height: 10px !important; fill: currentColor !important; display: block !important; }
button.tauri-btn:hover { background: rgba(255, 255, 255, 0.2) !important; }
button#tauri-btn-close:hover { background: #e81123 !important; color: #ffffff !important; }
button.tauri-btn svg { width: 10px !important; height: 10px !important; fill: currentColor !important; pointer-events: none !important; display: block !important; }
`;
document.head.appendChild(style);
@@ -222,114 +297,86 @@ const LINK_HANDLER_SCRIPT: &str = r#"
tb.innerHTML = `
<div class="tauri-drag-region"></div>
<div class="tauri-window-controls">
<button class="tauri-btn" id="tauri-btn-min" data-action="minimize"><svg viewBox="0 0 10 10"><rect x="1" y="4" width="8" height="1"/></svg></button>
<button class="tauri-btn" id="tauri-btn-max" data-action="maximize"><svg viewBox="0 0 10 10"><path d="M1,1v8h8V1H1z M8,8H2V2h6V8z"/></svg></button>
<button class="tauri-btn" id="tauri-btn-close" data-action="close"><svg viewBox="0 0 10 10"><path d="M10,1.4L8.6,0L5,3.6L1.4,0L0,1.4L3.6,5L0,8.6L1.4,10L5,6.4L8.6,10L10,8.6L6.4,5L10,1.4z"/></svg></button>
<button class="tauri-btn" id="tauri-btn-min" title="Minimize"><svg viewBox="0 0 10 10"><rect x="1" y="4" width="8" height="1"/></svg></button>
<button class="tauri-btn" id="tauri-btn-max" title="Maximize"><svg viewBox="0 0 10 10"><path d="M1,1v8h8V1H1z M8,8H2V2h6V8z"/></svg></button>
<button class="tauri-btn" id="tauri-btn-close" title="Close"><svg viewBox="0 0 10 10"><path d="M10,1.4L8.6,0L5,3.6L1.4,0L0,1.4L3.6,5L0,8.6L1.4,10L5,6.4L8.6,10L10,8.6L6.4,5L10,1.4z"/></svg></button>
</div>
`;
document.body.appendChild(tb);
document.addEventListener('click', (e) => {
const btn = e.target.closest('.tauri-btn');
if (!btn) return;
const action = btn.getAttribute('data-action');
e.preventDefault();
e.stopPropagation();
e.stopImmediatePropagation();
if (action === 'minimize') {
minimizeWindow();
} else if (action === 'maximize') {
maximizeWindow();
} else if (action === 'close') {
closeWindow();
}
}, true);
const btnMin = tb.querySelector('#tauri-btn-min');
const btnMax = tb.querySelector('#tauri-btn-max');
const btnClose = tb.querySelector('#tauri-btn-close');
const dragEl = tb.querySelector('.tauri-drag-region');
const dragRegion = tb.querySelector('.tauri-drag-region');
if (dragRegion) {
dragRegion.addEventListener('mousedown', (e) => {
if (e.buttons === 1) {
e.preventDefault();
e.stopPropagation();
if (btnMin) btnMin.onclick = (e) => { e.preventDefault(); e.stopPropagation(); minimizeWindow(); };
if (btnMax) btnMax.onclick = (e) => { e.preventDefault(); e.stopPropagation(); maximizeWindow(); };
if (btnClose) btnClose.onclick = (e) => { e.preventDefault(); e.stopPropagation(); closeWindow(); };
if (dragEl) {
dragEl.onmousedown = (e) => {
if (e.buttons === 1) {
e.preventDefault();
dragWindow();
}
});
};
}
console.log('[TitleBar-DEBUG] Custom titlebar injected successfully');
}
console.log('[TitleBar-DEBUG] Link handler script executing');
console.log('[TitleBar-DEBUG] Current URL:', window.location.href);
console.log('[TitleBar-DEBUG] Document readyState:', document.readyState);
console.log('[TitleBar-DEBUG] Window label:', window.__VYLA_WINDOW_LABEL);
injectTitlebar();
setInterval(injectTitlebar, 1000);
if (document.readyState === 'loading') {
console.log('[TitleBar-DEBUG] Document still loading, adding DOMContentLoaded listener');
document.addEventListener('DOMContentLoaded', injectTitlebar);
} else {
console.log('[TitleBar-DEBUG] Document already loaded, injecting titlebar immediately');
injectTitlebar();
}
window.addEventListener('load', injectTitlebar);
console.log('[TitleBar-DEBUG] Link handler script setup complete');
"#;
#[tauri::command]
fn win_minimize(window: tauri::Window) -> Result<(), String> {
debug_log("win_minimize command called");
window.minimize().map_err(|e| {
debug_log(&format!("win_minimize error: {}", e));
e.to_string()
})
window.minimize().map_err(|e| e.to_string())
}
#[tauri::command]
fn win_maximize(window: tauri::Window) -> Result<(), String> {
debug_log("win_maximize command called");
if let Ok(is_max) = window.is_maximized() {
if is_max {
debug_log("Window is maximized, unmaximizing");
window.unmaximize().map_err(|e| {
debug_log(&format!("win_unmaximize error: {}", e));
e.to_string()
})
window.unmaximize().map_err(|e| e.to_string())
} else {
debug_log("Window is not maximized, maximizing");
window.maximize().map_err(|e| {
debug_log(&format!("win_maximize error: {}", e));
e.to_string()
})
window.maximize().map_err(|e| e.to_string())
}
} else {
debug_log("Could not determine maximized state");
Ok(())
}
}
#[tauri::command]
fn win_close(window: tauri::Window) -> Result<(), String> {
debug_log("win_close command called");
window.close().map_err(|e| {
debug_log(&format!("win_close error: {}", e));
e.to_string()
})
window.close().map_err(|e| e.to_string())
}
#[tauri::command]
fn win_drag(window: tauri::Window) -> Result<(), String> {
debug_log("win_drag command called");
window.start_dragging().map_err(|e| {
debug_log(&format!("win_drag error: {}", e));
e.to_string()
})
window.start_dragging().map_err(|e| e.to_string())
}
#[tauri::command]
fn open_new_window(app: tauri::AppHandle, url: String) -> Result<(), String> {
debug_log(&format!("Requested to open new window for: {}", url));
let label = format!("win_{}", std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_millis());
debug_log(&format!("[SAME-TAB] Redirecting main window to: {}", url));
let final_url = if url.starts_with("http") || url.starts_with("tauri://") {
url.clone()
} else if url.starts_with('/') {
@@ -338,26 +385,13 @@ fn open_new_window(app: tauri::AppHandle, url: String) -> Result<(), String> {
format!("http://localhost:4890/{}", url)
};
let parsed_url = url::Url::parse(&final_url)
.unwrap_or_else(|_| url::Url::parse("http://localhost:4890").unwrap());
match tauri::WebviewWindowBuilder::new(&app, label.clone(), tauri::WebviewUrl::External(parsed_url))
.title("Vyla Home")
.inner_size(1280.0, 800.0)
.decorations(false)
.transparent(true)
.initialization_script(&format!("window.__VYLA_WINDOW_LABEL = '{}';", label))
.initialization_script(LINK_HANDLER_SCRIPT)
.build()
{
Ok(_) => {
debug_log("Successfully spawned new window");
Ok(())
},
Err(e) => {
debug_log(&format!("ERROR: Failed to create new window: {}", e));
Err(e.to_string())
}
if let Some(window) = app.get_webview_window("main") {
window
.eval(&format!("window.location.href = '{}';", final_url.replace('\'', "\\'")))
.map_err(|e| e.to_string())?;
Ok(())
} else {
Err("main window not found".to_string())
}
}
@@ -380,17 +414,18 @@ fn main() {
debug_log("Tauri setup started");
let app_data = app.path().app_data_dir().unwrap_or_default();
let app_data_str = clean_path(&app_data);
let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
.title("Vyla Home")
.inner_size(1280.0, 800.0)
.decorations(false)
.transparent(true)
.resizable(true)
.initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
.initialization_script(LINK_HANDLER_SCRIPT)
.build()?;
let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
.title("Vyla Home")
.inner_size(1280.0, 800.0)
.decorations(false)
.transparent(true)
.resizable(true)
.devtools(true)
.initialization_script("console.log('[MAIN-WINDOW-DEBUG] Main window initialization script running'); window.__VYLA_WINDOW_LABEL = 'main'; console.log('[MAIN-WINDOW-DEBUG] Main window label set to main');")
.initialization_script(LINK_HANDLER_SCRIPT)
.build()?;
let (main_js, root_dir) = resolve_script_and_root(app);
let node_bin = match find_node_binary(app) {
Some(bin) => bin,
@@ -422,33 +457,88 @@ fn main() {
match cmd.spawn() {
Ok(mut child) => {
debug_log(&format!("Node child process spawned successfully, PID: {}", child.id()));
if let Some(stderr) = child.stderr.take() {
std::thread::spawn(move || {
use std::io::{BufRead, BufReader};
let reader = BufReader::new(stderr);
for line in reader.lines().flatten() {
debug_log(&format!("[NODE STDERR] {}", line));
}
});
}
if let Some(stdout) = child.stdout.take() {
let w = window.clone();
std::thread::spawn(move || {
use std::io::{BufRead, BufReader};
let reader = BufReader::new(stdout);
for line in reader.lines().flatten() {
for line in reader.lines().flatten() {
debug_log(&format!("[NODE STDOUT] {}", line));
if let Ok(msg) = serde_json::from_str::<BackendMessage>(&line) {
debug_log(&format!("[MAIN-DEBUG] Received event: {}", msg.event));
debug_log(&format!("[MAIN-DEBUG] Event data: {}", serde_json::to_string(&msg.data).unwrap_or_default()));
if msg.event == "tauri-cmd" {
let window_label = msg.data.get("window").and_then(|w| w.as_str()).unwrap_or("main");
let window_label = msg.data.get("window").and_then(|val| val.as_str()).unwrap_or("main");
debug_log(&format!("[MAIN-DEBUG] Finding window by label: {}", window_label));
if let Some(cmd_window) = w.app_handle().get_webview_window(window_label) {
if let Some(cmd) = msg.data.get("cmd").and_then(|c| c.as_str()) {
debug_log(&format!("[TAURI-CMD] Executing action: {}", cmd));
match cmd {
"win_minimize" => { let _ = cmd_window.minimize(); },
"win_minimize" => {
let res = cmd_window.minimize();
debug_log(&format!("[TAURI-CMD] Minimize result: {:?}", res));
},
"win_maximize" => {
if let Ok(true) = cmd_window.is_maximized() { let _ = cmd_window.unmaximize(); }
else { let _ = cmd_window.maximize(); }
let is_max = cmd_window.is_maximized().unwrap_or(false);
debug_log(&format!("[TAURI-CMD] Currently maximized: {}", is_max));
let res = if is_max { cmd_window.unmaximize() } else { cmd_window.maximize() };
debug_log(&format!("[TAURI-CMD] Maximize/Unmaximize result: {:?}", res));
},
"win_close" => { let _ = cmd_window.close(); },
"win_drag" => { let _ = cmd_window.start_dragging(); },
"open_new_window" => {
if let Some(url) = msg.data.get("url").and_then(|u| u.as_str()) {
let _ = open_new_window(w.app_handle().clone(), url.to_string());
}
"win_close" => {
let res = cmd_window.close();
debug_log(&format!("[TAURI-CMD] Close result: {:?}", res));
},
"win_drag" => {
let res = cmd_window.start_dragging();
debug_log(&format!("[TAURI-CMD] Drag result: {:?}", res));
},
"open_new_window" => {
debug_log("[TAURI-CMD-DEBUG] open_new_window command received");
debug_log(&format!("[TAURI-CMD-DEBUG] Full message data: {}", serde_json::to_string(&msg.data).unwrap_or_default()));
if let Some(url) = msg.data.get("url").and_then(|u| u.as_str()) {
debug_log(&format!("[TAURI-CMD-DEBUG] URL extracted: {}", url));
debug_log(&format!("[TAURI-CMD-DEBUG] URL length: {}", url.len()));
debug_log("[TAURI-CMD-DEBUG] Attempting to dispatch to main thread");
let app_handle = w.app_handle().clone();
let closure_handle = app_handle.clone();
let url_owned = url.to_string();
let dispatch_result = app_handle.run_on_main_thread(move || {
debug_log("[TAURI-CMD-DEBUG] Now on main thread, calling open_new_window");
match open_new_window(closure_handle, url_owned) {
Ok(_) => {
debug_log("[TAURI-CMD-DEBUG] open_new_window succeeded");
},
Err(e) => {
debug_log(&format!("[TAURI-CMD-DEBUG] open_new_window error: {}", e));
},
}
});
match dispatch_result {
Ok(_) => debug_log("[TAURI-CMD-DEBUG] Main thread dispatch succeeded"),
Err(e) => debug_log(&format!("[TAURI-CMD-DEBUG] Main thread dispatch failed: {}", e)),
}
} else {
debug_log("[TAURI-CMD-DEBUG] ERROR: No URL found in message data");
debug_log(&format!("[TAURI-CMD-DEBUG] Available keys: {:?}", msg.data.as_object().map(|o| o.keys().collect::<Vec<_>>())));
}
},
_ => {}
}
}
} else {
debug_log(&format!("[TAURI-CMD] Window '{}' NOT FOUND!", window_label));
}
} else {
let _ = w.emit(&msg.event, msg.data.clone());
@@ -462,13 +552,14 @@ fn main() {
}
});
}
let state: State<NodeServices> = app.state();
if let Ok(mut lock) = state.0.lock() {
*lock = Some(child);
};
}
Err(e) => {
debug_log(&format!("Failed to spawn node: {}", e));
let _ = window.emit("error", serde_json::json!({ "message": format!("Failed to launch backend runtime: {}", e) }));
}
}
@@ -480,8 +571,10 @@ fn main() {
if window.label() == "main" {
let state: State<NodeServices> = window.state();
if let Ok(mut lock) = state.0.lock() {
if let Some(mut child) = lock.take() {
let _ = child.kill();
if let Some(child) = lock.take() {
let pid = child.id();
debug_log(&format!("[SHUTDOWN] Main window destroyed, killing process tree for PID {}", pid));
kill_process_tree(pid);
}
};
}