Compare commits

...

2 Commits

Author SHA1 Message Date
45d6515f2e fixed some issues...? 2026-09-04 20:46:08 -07:00
a3e6a278fe v1.1.15 2026-09-04 20:15:10 -07:00
6 changed files with 179 additions and 147 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "vyla-home",
"version": "1.1.14",
"version": "1.1.15",
"description": "Vyla Home Desktop App Launcher",
"main": "main.js",
"scripts": {

2
src-tauri/Cargo.lock generated
View File

@@ -4222,7 +4222,7 @@ dependencies = [
[[package]]
name = "vyla-home"
version = "1.1.14"
version = "1.1.15"
dependencies = [
"base64 0.22.1",
"serde",

View File

@@ -1,6 +1,6 @@
[package]
name = "vyla-home"
version = "1.1.14"
version = "1.1.15"
description = "Vyla Home Desktop App Launcher"
edition = "2021"

View File

@@ -589,10 +589,23 @@ fn main() {
.setup(|app| {
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 vyla_files = if let Ok(appdata_env) = std::env::var("APPDATA") {
std::path::PathBuf::from(appdata_env).join("vyla-home").join("vyla-home-files")
std::path::PathBuf::from(appdata_env)
.join("vyla-home")
.join("vyla-home-files")
} else if let Ok(_home) = std::env::var("HOME") {
#[cfg(target_os = "macos")]
let base = std::path::PathBuf::from(&home)
.join("Library")
.join("Application Support");
#[cfg(target_os = "linux")]
let base = std::path::PathBuf::from(&home)
.join(".local")
.join("share");
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
let base = app_data.clone();
base.join("vyla-home").join("vyla-home-files")
} else {
app_data.join("vyla-home-files")
};
@@ -637,21 +650,25 @@ fn main() {
.build()?;
let (main_js, root_dir) = resolve_script_and_root(app);
debug_log("Searching for node binary...");
let node_bin = match find_node_binary(app) {
Some(bin) => bin,
Some(bin) => {
debug_log(&format!("Found node binary: {}", bin));
bin
}
None => {
let _ = window.emit(
"error",
serde_json::json!({
"message": "Node.js runtime not found. Please ensure Node.js is installed or bundled correctly."
}),
);
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(());
}
};
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)
.current_dir(&root_dir)
@@ -847,12 +864,12 @@ fn main() {
}
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)
}),
let emsg = format!("Failed to spawn node: {}", e);
let js = format!(
"document.getElementById('status-message').textContent='Spawn Error';var b=document.getElementById('debug-log-box');b.style.display='block';b.textContent={};",
serde_json::to_string(&emsg).unwrap_or_default()
);
let _ = window.eval(&js);
}
}

View File

@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "Vyla Home",
"version": "1.1.14",
"version": "1.1.15",
"identifier": "com.vyla.home",
"build": {
"frontendDist": "../ui"

View File

@@ -271,6 +271,11 @@
console.warn("OGL Shader background failed to load (offline):", err);
}
window.dispatchEvent(new Event('ogl-ready'));
</script>
<script>
window.addEventListener('ogl-ready', () => {
if (!window.__OGL_LOADED__) {
document.body.style.background = "radial-gradient(circle at 80% 20%, #1e1b4b 0%, #050505 70%)";
} else {
@@ -499,6 +504,7 @@ void main() {
initLiquidButtons();
}
});
</script>
<script>
@@ -535,8 +541,17 @@ void main() {
}
async function initTauriEvents() {
const eventApi = window.__TAURI__?.event || window.__TAURI_INTERNALS__;
if (!eventApi || typeof eventApi.listen !== 'function') {
let eventApi = null;
if (window.__TAURI__?.event && typeof window.__TAURI__.event.listen === 'function') {
eventApi = window.__TAURI__.event;
} else if (window.__TAURI_INTERNALS__ && typeof window.__TAURI_INTERNALS__.listen === 'function') {
eventApi = window.__TAURI_INTERNALS__;
} else if (window.__TAURI__ && typeof window.__TAURI__.listen === 'function') {
eventApi = window.__TAURI__;
}
if (!eventApi) {
setTimeout(initTauriEvents, 50);
return;
}