mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-13 21:57:21 -05:00
huge rewrite
This commit is contained in:
@@ -2,8 +2,9 @@
|
||||
|
||||
use std::path::PathBuf;
|
||||
use std::process::{Child, Command, Stdio};
|
||||
use std::sync::Mutex;
|
||||
use tauri::{Emitter, Manager, State, WebviewUrl, WebviewWindowBuilder};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use tauri::webview::NewWindowResponse;
|
||||
use tauri::{AppHandle, Emitter, Manager, State, WebviewUrl, WebviewWindowBuilder};
|
||||
|
||||
fn debug_log(msg: &str) {
|
||||
let log_dir = if let Ok(app_data) = std::env::var("APPDATA") {
|
||||
@@ -11,8 +12,8 @@ fn debug_log(msg: &str) {
|
||||
.join("vyla-home")
|
||||
.join("vyla-home-files")
|
||||
.join("logs")
|
||||
} else if let Ok(home) = std::env::var("HOME") {
|
||||
std::path::PathBuf::from(home)
|
||||
} else if let Ok(_home) = std::env::var("HOME") {
|
||||
std::path::PathBuf::from(_home)
|
||||
.join("Library")
|
||||
.join("Logs")
|
||||
.join("VylaHome")
|
||||
@@ -39,15 +40,44 @@ fn debug_log(msg: &str) {
|
||||
|
||||
struct NodeServices(Mutex<Option<Child>>);
|
||||
|
||||
static WINDOW_COUNTER: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(1);
|
||||
|
||||
static READY_URL: Mutex<Option<String>> = Mutex::new(None);
|
||||
|
||||
fn js_log(app: &AppHandle, msg: &str) {
|
||||
debug_log(msg);
|
||||
if let Some(w) = app.get_webview_window("main") {
|
||||
let text = serde_json::to_string(&format!("[rust] {}", msg)).unwrap_or_default();
|
||||
let _ = w.eval(&format!("console.log({});", text));
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize, serde::Serialize, Clone)]
|
||||
struct BackendMessage {
|
||||
event: String,
|
||||
data: serde_json::Value,
|
||||
}
|
||||
|
||||
struct UiGate {
|
||||
ready: bool,
|
||||
queue: Vec<BackendMessage>,
|
||||
}
|
||||
|
||||
type SharedGate = Arc<Mutex<UiGate>>;
|
||||
|
||||
fn dispatch(w: &tauri::WebviewWindow, gate: &SharedGate, msg: BackendMessage) {
|
||||
if let Ok(mut lock) = gate.lock() {
|
||||
if lock.ready {
|
||||
let _ = w.emit(&msg.event, msg.data);
|
||||
} else {
|
||||
lock.queue.push(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn clean_path(path: &std::path::Path) -> String {
|
||||
let s = path.to_string_lossy().to_string();
|
||||
if s.starts_with("\\\\?\\") {
|
||||
if s.starts_with(r"\\?\") {
|
||||
s[4..].to_string()
|
||||
} else {
|
||||
s
|
||||
@@ -121,7 +151,7 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
|
||||
if node_exe.exists() {
|
||||
return Some(clean_path(&node_exe));
|
||||
}
|
||||
|
||||
|
||||
let node = p.join("node");
|
||||
if node.exists() {
|
||||
return Some(clean_path(&node));
|
||||
@@ -195,34 +225,7 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
|
||||
(clean_path(&candidate), clean_path(&dir))
|
||||
}
|
||||
|
||||
const LINK_HANDLER_SCRIPT: &str =
|
||||
r##"
|
||||
|
||||
window.vylaHome = {
|
||||
sendUpdateChoice: function(choice) {
|
||||
var action = choice ? 'yes' : 'no';
|
||||
[4891, 4892].forEach(function(port) {
|
||||
['127.0.0.1', 'localhost'].forEach(function(host) {
|
||||
fetch('http://' + host + ':' + port + '/update/' + action, { method: 'POST' }).catch(function() {});
|
||||
fetch('http://' + host + ':' + port + '/update/' + action, { method: 'GET' }).catch(function() {});
|
||||
fetch('http://' + host + ':' + port + '/__tauri_cmd/update_' + action, { method: 'GET' }).catch(function() {});
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
document.addEventListener('click', function(e) {
|
||||
var el = e.target.closest('button, a, .btn');
|
||||
if (!el) return;
|
||||
var text = (el.innerText || el.textContent || '').toLowerCase();
|
||||
var id = (el.id || '').toLowerCase();
|
||||
if (id.includes('install') || id.includes('update-yes') || text.includes('install update')) {
|
||||
window.vylaHome.sendUpdateChoice(true);
|
||||
} else if (id.includes('skip') || id.includes('update-no') || text.includes('skip')) {
|
||||
window.vylaHome.sendUpdateChoice(false);
|
||||
}
|
||||
}, true);
|
||||
|
||||
const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
function doInvoke(cmd, args) {
|
||||
if (window.__TAURI__ && window.__TAURI__.core) {
|
||||
return window.__TAURI__.core.invoke(cmd, args || {});
|
||||
@@ -230,28 +233,89 @@ const LINK_HANDLER_SCRIPT: &str =
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
|
||||
function minimizeWindow() { doInvoke('win_minimize'); }
|
||||
function maximizeWindow() { doInvoke('win_maximize'); }
|
||||
function closeWindow() { doInvoke('win_close'); }
|
||||
function dragWindow() { doInvoke('win_drag'); }
|
||||
function callWindow(method, fallbackCmd) {
|
||||
const fallback = () => doInvoke(fallbackCmd).catch(err => console.error(fallbackCmd + ' failed:', err));
|
||||
try {
|
||||
if (window.__TAURI__ && window.__TAURI__.window) {
|
||||
return window.__TAURI__.window.getCurrentWindow()[method]().catch(fallback);
|
||||
}
|
||||
} catch (err) {}
|
||||
return fallback();
|
||||
}
|
||||
function minimizeWindow() {
|
||||
return callWindow('minimize', 'win_minimize');
|
||||
}
|
||||
function maximizeWindow() {
|
||||
return callWindow('toggleMaximize', 'win_maximize');
|
||||
}
|
||||
function closeWindow() {
|
||||
return callWindow('close', 'win_close');
|
||||
}
|
||||
function dragWindow() {
|
||||
return callWindow('startDragging', 'win_drag');
|
||||
}
|
||||
|
||||
function openExternalUrl(url) {
|
||||
if (window.__TAURI__ && window.__TAURI__.opener) {
|
||||
window.__TAURI__.opener.openUrl(url);
|
||||
} else if (window.__TAURI__ && window.__TAURI__.shell) {
|
||||
window.__TAURI__.shell.open(url);
|
||||
} else {
|
||||
window.open(url, '_blank');
|
||||
}
|
||||
}
|
||||
|
||||
const nativeWindowOpen = window.open.bind(window);
|
||||
|
||||
function openInNewWindow(rawUrl) {
|
||||
let abs;
|
||||
try {
|
||||
abs = new URL(rawUrl, location.href).href;
|
||||
} catch (err) {
|
||||
console.log('[vyla] bad url', rawUrl);
|
||||
return;
|
||||
}
|
||||
console.log('[vyla] open new window', abs);
|
||||
nativeWindowOpen(abs, '_blank');
|
||||
}
|
||||
|
||||
window.open = function(url, target, features) {
|
||||
doInvoke('open_new_window', { url: url });
|
||||
return null;
|
||||
console.log('[vyla] window.open called', url, target, features);
|
||||
const go = (v) => {
|
||||
if (v && !/^(about:|javascript:|blob:|data:)/i.test(String(v))) {
|
||||
openInNewWindow(String(v));
|
||||
}
|
||||
};
|
||||
go(url);
|
||||
const stub = {
|
||||
closed: false,
|
||||
close() {},
|
||||
focus() {},
|
||||
blur() {},
|
||||
postMessage() {},
|
||||
document: { write() {}, writeln() {}, close() {}, open() {} }
|
||||
};
|
||||
Object.defineProperty(stub, 'location', {
|
||||
get() {
|
||||
return { href: '', replace: go, assign: go };
|
||||
},
|
||||
set(v) {
|
||||
go(v);
|
||||
}
|
||||
});
|
||||
return stub;
|
||||
};
|
||||
|
||||
document.addEventListener('click', (e) => {
|
||||
const a = e.target.closest('a');
|
||||
const origAnchorClick = HTMLAnchorElement.prototype.click;
|
||||
HTMLAnchorElement.prototype.click = function() {
|
||||
if (this.href && this.target === '_blank' && !this.isConnected) {
|
||||
console.log('[vyla] detached anchor click', this.href);
|
||||
openInNewWindow(this.href);
|
||||
return;
|
||||
}
|
||||
return origAnchorClick.apply(this, arguments);
|
||||
};
|
||||
|
||||
function handleLinkClick(e) {
|
||||
const a = e.target.closest && e.target.closest('a');
|
||||
if (!a || !a.href) return;
|
||||
|
||||
if (a.href.includes('discord.gg') || a.href.includes('discord.com')) {
|
||||
@@ -264,9 +328,12 @@ const LINK_HANDLER_SCRIPT: &str =
|
||||
if (a.target === '_blank' || e.ctrlKey || e.metaKey || e.button === 1) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
doInvoke('open_new_window', { url: a.href });
|
||||
openInNewWindow(a.href);
|
||||
}
|
||||
}, true);
|
||||
}
|
||||
|
||||
document.addEventListener('click', handleLinkClick, true);
|
||||
document.addEventListener('auxclick', handleLinkClick, true);
|
||||
|
||||
function injectLiquidNavBar() {
|
||||
if (document.getElementById('tauri-custom-titlebar')) return;
|
||||
@@ -291,7 +358,7 @@ const LINK_HANDLER_SCRIPT: &str =
|
||||
margin: 0 !important;
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
|
||||
.tauri-drag-region {
|
||||
position: absolute !important;
|
||||
inset: 0 !important;
|
||||
@@ -299,7 +366,7 @@ const LINK_HANDLER_SCRIPT: &str =
|
||||
cursor: default !important;
|
||||
pointer-events: auto !important;
|
||||
}
|
||||
|
||||
|
||||
.tauri-window-controls {
|
||||
display: flex !important;
|
||||
height: 32px !important;
|
||||
@@ -308,7 +375,7 @@ const LINK_HANDLER_SCRIPT: &str =
|
||||
pointer-events: auto !important;
|
||||
z-index: 2147483648 !important;
|
||||
}
|
||||
|
||||
|
||||
button.tauri-btn {
|
||||
width: 46px !important;
|
||||
min-width: 46px !important;
|
||||
@@ -322,13 +389,17 @@ const LINK_HANDLER_SCRIPT: &str =
|
||||
justify-content: center !important;
|
||||
cursor: pointer !important;
|
||||
outline: none !important;
|
||||
pointer-events: auto !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; }
|
||||
`;
|
||||
document.head.appendChild(style);
|
||||
if (!document.getElementById('tauri-custom-titlebar-style')) {
|
||||
style.id = 'tauri-custom-titlebar-style';
|
||||
(document.head || document.documentElement).appendChild(style);
|
||||
}
|
||||
|
||||
const tb = document.createElement('div');
|
||||
tb.id = 'tauri-custom-titlebar';
|
||||
@@ -347,31 +418,60 @@ const LINK_HANDLER_SCRIPT: &str =
|
||||
const btnClose = tb.querySelector('#tauri-btn-close');
|
||||
const dragEl = tb.querySelector('.tauri-drag-region');
|
||||
|
||||
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 (btnMin) {
|
||||
btnMin.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
e.stopImmediatePropagation();
|
||||
minimizeWindow();
|
||||
}, true);
|
||||
}
|
||||
if (btnMax) {
|
||||
btnMax.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
e.stopImmediatePropagation();
|
||||
maximizeWindow();
|
||||
}, true);
|
||||
}
|
||||
if (btnClose) {
|
||||
btnClose.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
e.stopImmediatePropagation();
|
||||
closeWindow();
|
||||
}, true);
|
||||
}
|
||||
if (dragEl) {
|
||||
dragEl.onmousedown = (e) => {
|
||||
if (e.buttons === 1) {
|
||||
dragEl.addEventListener('mousedown', (e) => {
|
||||
if (e.button === 0) {
|
||||
e.preventDefault();
|
||||
dragWindow();
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function startNavObserver() {
|
||||
const root = document.documentElement;
|
||||
if (!root) {
|
||||
setTimeout(startNavObserver, 5);
|
||||
return;
|
||||
}
|
||||
const navObserver = new MutationObserver(() => {
|
||||
if (!document.getElementById('tauri-custom-titlebar')) {
|
||||
injectLiquidNavBar();
|
||||
}
|
||||
});
|
||||
navObserver.observe(root, { childList: true, subtree: true });
|
||||
}
|
||||
|
||||
if (document.readyState === 'loading') {
|
||||
document.addEventListener('DOMContentLoaded', injectLiquidNavBar);
|
||||
} else {
|
||||
injectLiquidNavBar();
|
||||
}
|
||||
|
||||
const navObserver = new MutationObserver(() => {
|
||||
if (!document.getElementById('vyla-floating-nav')) {
|
||||
injectLiquidNavBar();
|
||||
}
|
||||
});
|
||||
navObserver.observe(document.documentElement, { childList: true, subtree: true });
|
||||
startNavObserver();
|
||||
"##;
|
||||
|
||||
#[tauri::command]
|
||||
@@ -402,174 +502,80 @@ fn win_drag(window: tauri::Window) -> Result<(), 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!("[SAME-TAB] Redirecting main window to: {}", url));
|
||||
|
||||
fn normalize_url(url: &str) -> Option<tauri::Url> {
|
||||
let final_url = if url.starts_with("http") || url.starts_with("tauri://") {
|
||||
url.clone()
|
||||
url.to_string()
|
||||
} else if url.starts_with('/') {
|
||||
format!("http://127.0.0.1:4890{}", url)
|
||||
} else {
|
||||
format!("http://127.0.0.1:4890/{}", url)
|
||||
};
|
||||
|
||||
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())
|
||||
match final_url.parse::<tauri::Url>() {
|
||||
Ok(u) => Some(u),
|
||||
Err(e) => {
|
||||
debug_log(&format!("[NEW-WINDOW] bad url '{}': {}", final_url, e));
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
async fn kill_orphans() -> Result<(), String> {
|
||||
debug_log("[KILL] User requested orphan process kill");
|
||||
fn open_app_window(app: &AppHandle, url: tauri::Url) -> Result<(), String> {
|
||||
js_log(app, &format!("[NEW-WINDOW] Opening: {}", url));
|
||||
|
||||
#[cfg(windows)]
|
||||
let n = WINDOW_COUNTER.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
|
||||
let label = format!("win_{}", n);
|
||||
let nw_handle = app.clone();
|
||||
|
||||
let window = WebviewWindowBuilder::new(app, &label, WebviewUrl::External(url))
|
||||
.title("Vyla Home")
|
||||
.inner_size(1100.0, 700.0)
|
||||
.center()
|
||||
.decorations(false)
|
||||
.resizable(true)
|
||||
.transparent(true)
|
||||
.devtools(true)
|
||||
.focused(true)
|
||||
.initialization_script(&format!("window.__VYLA_WINDOW_LABEL = '{}';", label))
|
||||
.initialization_script(LINK_HANDLER_SCRIPT)
|
||||
.on_new_window(move |new_url, _features| {
|
||||
js_log(&nw_handle, &format!("[NEW-WINDOW] handler fired (child): {}", new_url));
|
||||
let h = nw_handle.clone();
|
||||
std::thread::spawn(move || {
|
||||
let _ = open_app_window(&h, new_url);
|
||||
});
|
||||
NewWindowResponse::Deny
|
||||
})
|
||||
.build()
|
||||
.map_err(|e| {
|
||||
js_log(app, &format!("[NEW-WINDOW] build failed: {}", e));
|
||||
e.to_string()
|
||||
})?;
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
use std::os::windows::process::CommandExt;
|
||||
const CREATE_NO_WINDOW: u32 = 0x08000000;
|
||||
let _ = std::process::Command::new("taskkill")
|
||||
.args(&["/F", "/T", "/IM", "node.exe"])
|
||||
.creation_flags(CREATE_NO_WINDOW)
|
||||
.output();
|
||||
use window_vibrancy::{apply_acrylic, apply_mica};
|
||||
if apply_mica(&window, Some(true)).is_err() {
|
||||
let _ = apply_acrylic(&window, Some((15, 18, 25, 125)));
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
let _ = std::process::Command::new("pkill")
|
||||
.args(&["-9", "-f", "node"])
|
||||
.output();
|
||||
use window_vibrancy::{apply_vibrancy, NSVisualEffectMaterial};
|
||||
let _ = apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None);
|
||||
}
|
||||
|
||||
let _ = &window;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
fn get_logo_base64(app: tauri::AppHandle) -> Result<String, String> {
|
||||
use std::io::Read;
|
||||
let mut candidate_paths = Vec::new();
|
||||
|
||||
if let Ok(res_dir) = app.path().resource_dir() {
|
||||
candidate_paths.push(res_dir.join("build").join("icon_white.png"));
|
||||
candidate_paths.push(res_dir.join("_up_").join("build").join("icon_white.png"));
|
||||
}
|
||||
|
||||
if let Ok(mut cur) = std::env::current_dir() {
|
||||
candidate_paths.push(cur.join("build").join("icon_white.png"));
|
||||
if cur.ends_with("src-tauri") {
|
||||
cur.pop();
|
||||
candidate_paths.push(cur.join("build").join("icon_white.png"));
|
||||
}
|
||||
}
|
||||
|
||||
for path in candidate_paths {
|
||||
if path.exists() {
|
||||
if let Ok(mut file) = std::fs::File::open(&path) {
|
||||
let mut buffer = Vec::new();
|
||||
if file.read_to_end(&mut buffer).is_ok() {
|
||||
use base64::Engine;
|
||||
return Ok(base64::engine::general_purpose::STANDARD.encode(buffer));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Err("icon_white.png not found".to_string())
|
||||
}
|
||||
|
||||
fn handle_tauri_cmd(w: &tauri::WebviewWindow, msg: &BackendMessage) {
|
||||
let window_label = msg
|
||||
.data
|
||||
.get("window")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("main");
|
||||
|
||||
debug_log(&format!("[MAIN-DEBUG] Finding window by label: {}", window_label));
|
||||
|
||||
let cmd_window = match w.app_handle().get_webview_window(window_label) {
|
||||
Some(win) => win,
|
||||
None => {
|
||||
debug_log(&format!("[TAURI-CMD] Window '{}' NOT FOUND!", window_label));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let cmd = match msg.data.get("cmd").and_then(|c| c.as_str()) {
|
||||
Some(c) => c,
|
||||
None => return,
|
||||
};
|
||||
|
||||
debug_log(&format!("[TAURI-CMD] Executing action: {}", cmd));
|
||||
|
||||
match cmd {
|
||||
"win_minimize" => {
|
||||
let res = cmd_window.minimize();
|
||||
debug_log(&format!("[TAURI-CMD] Minimize result: {:?}", res));
|
||||
}
|
||||
"win_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 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()
|
||||
));
|
||||
|
||||
let url = match msg.data.get("url").and_then(|u| u.as_str()) {
|
||||
Some(u) => u.to_string(),
|
||||
None => {
|
||||
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<_>>())
|
||||
));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
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();
|
||||
|
||||
match 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) {
|
||||
Ok(_) => debug_log("[TAURI-CMD-DEBUG] open_new_window succeeded"),
|
||||
Err(e) => debug_log(&format!("[TAURI-CMD-DEBUG] open_new_window error: {}", e)),
|
||||
}
|
||||
}) {
|
||||
Ok(_) => debug_log("[TAURI-CMD-DEBUG] Main thread dispatch succeeded"),
|
||||
Err(e) => debug_log(&format!("[TAURI-CMD-DEBUG] Main thread dispatch failed: {}", e)),
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
fn open_new_window(app: AppHandle, url: String) -> Result<(), String> {
|
||||
let parsed = normalize_url(&url).ok_or_else(|| "invalid url".to_string())?;
|
||||
std::thread::spawn(move || {
|
||||
let _ = open_app_window(&app, parsed);
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn handle_ready(w: &tauri::WebviewWindow, msg: &BackendMessage) {
|
||||
@@ -605,17 +611,13 @@ fn main() {
|
||||
debug_log("=== Vyla Home Executable Started ===");
|
||||
|
||||
tauri::Builder::default()
|
||||
.plugin(tauri_plugin_shell::init())
|
||||
.plugin(tauri_plugin_process::init())
|
||||
.plugin(tauri_plugin_opener::init())
|
||||
.invoke_handler(tauri::generate_handler![
|
||||
win_minimize,
|
||||
win_maximize,
|
||||
win_close,
|
||||
win_drag,
|
||||
open_new_window,
|
||||
get_logo_base64,
|
||||
kill_orphans
|
||||
open_new_window
|
||||
])
|
||||
.manage(NodeServices(Mutex::new(None)))
|
||||
.setup(|app| {
|
||||
@@ -626,13 +628,13 @@ fn main() {
|
||||
std::path::PathBuf::from(appdata_env)
|
||||
.join("vyla-home")
|
||||
.join("vyla-home-files")
|
||||
} else if let Ok(home) = std::env::var("HOME") {
|
||||
} else if let Ok(_home) = std::env::var("HOME") {
|
||||
#[cfg(target_os = "macos")]
|
||||
let base = std::path::PathBuf::from(&home)
|
||||
let base = std::path::PathBuf::from(&_home)
|
||||
.join("Library")
|
||||
.join("Application Support");
|
||||
#[cfg(target_os = "linux")]
|
||||
let base = std::path::PathBuf::from(&home)
|
||||
let base = std::path::PathBuf::from(&_home)
|
||||
.join(".local")
|
||||
.join("share");
|
||||
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
|
||||
@@ -644,16 +646,70 @@ fn main() {
|
||||
|
||||
let _ = std::fs::create_dir_all(&vyla_files);
|
||||
|
||||
let main_nw_handle = app.handle().clone();
|
||||
let gate: SharedGate = Arc::new(Mutex::new(UiGate {
|
||||
ready: false,
|
||||
queue: Vec::new(),
|
||||
}));
|
||||
let load_gate = gate.clone();
|
||||
|
||||
let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
|
||||
.title("Vyla Home")
|
||||
.inner_size(1280.0, 800.0)
|
||||
.decorations(false)
|
||||
.resizable(true)
|
||||
.transparent(true)
|
||||
.devtools(true)
|
||||
.initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
|
||||
.on_page_load(move |wv, payload| {
|
||||
if matches!(payload.event(), tauri::webview::PageLoadEvent::Finished) {
|
||||
if payload.url().host_str() != Some("127.0.0.1") {
|
||||
let known = READY_URL.lock().ok().and_then(|g| g.clone());
|
||||
if let Some(u) = known {
|
||||
if let Ok(parsed) = u.parse::<tauri::Url>() {
|
||||
let _ = wv.navigate(parsed);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
let g = load_gate.clone();
|
||||
std::thread::spawn(move || {
|
||||
std::thread::sleep(std::time::Duration::from_millis(400));
|
||||
if let Ok(mut lock) = g.lock() {
|
||||
lock.ready = true;
|
||||
let pending: Vec<BackendMessage> = lock.queue.drain(..).collect();
|
||||
for m in pending {
|
||||
let _ = wv.emit(&m.event, m.data);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
.initialization_script(LINK_HANDLER_SCRIPT)
|
||||
.on_new_window(move |new_url, _features| {
|
||||
js_log(&main_nw_handle, &format!("[NEW-WINDOW] handler fired (main): {}", new_url));
|
||||
let h = main_nw_handle.clone();
|
||||
std::thread::spawn(move || {
|
||||
let _ = open_app_window(&h, new_url);
|
||||
});
|
||||
NewWindowResponse::Deny
|
||||
})
|
||||
.build()?;
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
use window_vibrancy::{apply_acrylic, apply_mica};
|
||||
if apply_mica(&window, Some(true)).is_err() {
|
||||
let _ = apply_acrylic(&window, Some((15, 18, 25, 125)));
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
use window_vibrancy::{apply_vibrancy, NSVisualEffectMaterial};
|
||||
let _ = apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None);
|
||||
}
|
||||
|
||||
let (main_js, root_dir) = resolve_script_and_root(app);
|
||||
debug_log("Searching for node binary...");
|
||||
|
||||
@@ -664,7 +720,6 @@ fn main() {
|
||||
}
|
||||
None => {
|
||||
debug_log("FATAL: No node binary found in bundle or PATH.");
|
||||
std::thread::sleep(std::time::Duration::from_millis(600));
|
||||
let _ = window.eval("document.getElementById('status-message').textContent='Error: Node runtime missing. Please reinstall.';");
|
||||
let _ = window.eval("var b=document.getElementById('debug-log-box');b.style.display='block';b.textContent='Node binary not found. bin/node missing from app bundle or not executable.';");
|
||||
return Ok(());
|
||||
@@ -672,7 +727,6 @@ fn main() {
|
||||
};
|
||||
|
||||
let vyla_files_str = clean_path(&vyla_files);
|
||||
std::thread::sleep(std::time::Duration::from_millis(400));
|
||||
|
||||
let mut cmd = Command::new(&node_bin);
|
||||
cmd.arg(&main_js)
|
||||
@@ -699,6 +753,7 @@ fn main() {
|
||||
|
||||
if let Some(stderr) = child.stderr.take() {
|
||||
let w = window.clone();
|
||||
let g = gate.clone();
|
||||
std::thread::spawn(move || {
|
||||
use std::io::{BufRead, BufReader};
|
||||
let reader = BufReader::new(stderr);
|
||||
@@ -708,9 +763,13 @@ fn main() {
|
||||
|| line.contains("Exception")
|
||||
|| line.contains("MODULE_NOT_FOUND")
|
||||
{
|
||||
let _ = w.emit(
|
||||
"error",
|
||||
serde_json::json!({ "message": format!("Backend failed: {}", line) }),
|
||||
dispatch(
|
||||
&w,
|
||||
&g,
|
||||
BackendMessage {
|
||||
event: "error".to_string(),
|
||||
data: serde_json::json!({ "message": format!("Backend failed: {}", line) }),
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -719,6 +778,7 @@ fn main() {
|
||||
|
||||
if let Some(stdout) = child.stdout.take() {
|
||||
let w = window.clone();
|
||||
let g = gate.clone();
|
||||
std::thread::spawn(move || {
|
||||
use std::io::{BufRead, BufReader};
|
||||
let reader = BufReader::new(stdout);
|
||||
@@ -735,18 +795,16 @@ fn main() {
|
||||
}
|
||||
};
|
||||
|
||||
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()
|
||||
));
|
||||
|
||||
match msg.event.as_str() {
|
||||
"tauri-cmd" => handle_tauri_cmd(&w, &msg),
|
||||
"ready" => handle_ready(&w, &msg),
|
||||
_ => {
|
||||
let _ = w.emit(&msg.event, msg.data.clone());
|
||||
"ready" => {
|
||||
if let Some(u) = msg.data.get("url").and_then(|u| u.as_str()) {
|
||||
if let Ok(mut g) = READY_URL.lock() {
|
||||
*g = Some(u.to_string());
|
||||
}
|
||||
}
|
||||
handle_ready(&w, &msg)
|
||||
}
|
||||
_ => dispatch(&w, &g, msg.clone()),
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -780,9 +838,10 @@ fn main() {
|
||||
kill_child_process(&mut child);
|
||||
}
|
||||
};
|
||||
window.app_handle().exit(0);
|
||||
}
|
||||
}
|
||||
})
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user