Compare commits

..

7 Commits

10 changed files with 222 additions and 28 deletions

View File

@@ -1,13 +1,40 @@
taskkill /F /IM node.exe -ErrorAction SilentlyContinue taskkill /F /IM "node.exe" 2>$null
taskkill /F /IM vyla-home.exe -ErrorAction SilentlyContinue taskkill /F /IM "vyla-home.exe" 2>$null
taskkill /F /IM "Vyla Home.exe" 2>$null
Remove-Item -Recurse -Force "$env:APPDATA\com.vyla.home" -ErrorAction SilentlyContinue Stop-Process -Name "node", "vyla-home", "Vyla Home" -Force -ErrorAction SilentlyContinue
Remove-Item -Recurse -Force "$env:APPDATA\vyla-home" -ErrorAction SilentlyContinue
Remove-Item -Force "$env:USERPROFILE\Downloads\vyla-*-debug*.log" -ErrorAction SilentlyContinue $pathsToDelete = @(
"$env:APPDATA\com.vyla.home",
"$env:APPDATA\vyla-home",
"$env:LOCALAPPDATA\com.vyla.home",
"$env:LOCALAPPDATA\vyla-home",
"$env:LOCALAPPDATA\Vyla Home",
"$env:LOCALAPPDATA\Programs\Vyla Home",
"$env:LOCALAPPDATA\Programs\vyla-home",
"$env:USERPROFILE\AppData\LocalLow\com.vyla.home",
"$env:USERPROFILE\AppData\LocalLow\vyla-home",
"$env:ProgramFiles\Vyla Home",
"${env:ProgramFiles(x86)}\Vyla Home",
"$env:USERPROFILE\Desktop\Vyla Home.lnk",
"$env:APPDATA\Microsoft\Windows\Start Menu\Programs\Vyla Home.lnk",
"$env:USERPROFILE\Downloads\vyla-*-debug*.log",
"src-tauri\target",
"dist-build",
"temp-validation-extract",
"dist",
"frontend",
"player",
"auth-proxy",
"stream-api",
"update-payload.zip",
"manifest.json",
"validation-report.json",
"config\encrypted-credentials.json"
)
Remove-Item -Recurse -Force "src-tauri\target" -ErrorAction SilentlyContinue foreach ($path in $pathsToDelete) {
Remove-Item -Recurse -Force "dist-build" -ErrorAction SilentlyContinue if (Test-Path $path) {
Remove-Item -Force "update-payload.zip" -ErrorAction SilentlyContinue Remove-Item -Recurse -Force $path -ErrorAction SilentlyContinue
Remove-Item -Force "manifest.json" -ErrorAction SilentlyContinue }
Remove-Item -Force "validation-report.json" -ErrorAction SilentlyContinue }

14
main.js
View File

@@ -128,14 +128,24 @@ async function start() {
await installBuild(release); await installBuild(release);
} else if (hasUpdate) { } else if (hasUpdate) {
debugLog("Update available. Prompting user..."); debugLog("Update available. Prompting user...");
sendToTauri('update-available', { current: localVersion, latest: release.version });
const tempApp = express(); const tempApp = express();
let userDecision = null; let userDecision = null;
tempApp.use((req, res, next) => {
res.header('Access-Control-Allow-Origin', '*');
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
res.header('Access-Control-Allow-Headers', '*');
if (req.method === 'OPTIONS') return res.sendStatus(200);
next();
});
tempApp.get('/update/info', (req, res) => {
res.json({ available: true, current: localVersion, latest: release.version });
});
tempApp.post('/update/yes', (req, res) => { userDecision = true; res.sendStatus(200); }); tempApp.post('/update/yes', (req, res) => { userDecision = true; res.sendStatus(200); });
tempApp.post('/update/no', (req, res) => { userDecision = false; res.sendStatus(200); }); tempApp.post('/update/no', (req, res) => { userDecision = false; res.sendStatus(200); });
const tempServer = tempApp.listen(4891, '127.0.0.1'); const tempServer = tempApp.listen(4891, '127.0.0.1');
sendToTauri('update-available', { current: localVersion, latest: release.version });
while (userDecision === null) { while (userDecision === null) {
await new Promise(r => setTimeout(r, 500)); await new Promise(r => setTimeout(r, 500));
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "vyla-home", "name": "vyla-home",
"version": "1.0.1", "version": "1.0.5",
"description": "Vyla Home Desktop App Launcher", "description": "Vyla Home Desktop App Launcher",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
@@ -54,4 +54,4 @@
"installerHeaderIcon": "build/icon.ico" "installerHeaderIcon": "build/icon.ico"
} }
} }
} }

View File

@@ -153,6 +153,9 @@ async function main() {
let installerUploadName = null; let installerUploadName = null;
if (isFullBuild) { if (isFullBuild) {
console.log('[Optional] Ensuring bundled Node.js runtime...');
await ensureBundledNode();
console.log('[Optional] Compiling Windows Tauri installer locally...'); console.log('[Optional] Compiling Windows Tauri installer locally...');
execSync('npm run build', { stdio: 'inherit' }); execSync('npm run build', { stdio: 'inherit' });
@@ -190,6 +193,48 @@ async function main() {
console.log(`[4/4] Release successfully created: ${release.name} (${release.tag_name})`); console.log(`[4/4] Release successfully created: ${release.name} (${release.tag_name})`);
} }
function ensureBundledNode() {
const binDir = path.join(__dirname, 'bin');
const nodeExePath = path.join(binDir, 'node.exe');
const nodeVersion = 'v22.14.0';
const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`);
if (fs.existsSync(nodeExePath) && fs.existsSync(versionMarker)) {
return Promise.resolve();
}
fs.mkdirSync(binDir, { recursive: true });
console.log(`Downloading standalone Node.js ${nodeVersion} runtime for bundling...`);
const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
return new Promise((resolve, reject) => {
const fileStream = fs.createWriteStream(nodeExePath);
https.get(nodeUrl, (res) => {
if (res.statusCode === 302 || res.statusCode === 301) {
https.get(res.headers.location, (redirectRes) => {
redirectRes.pipe(fileStream);
fileStream.on('finish', () => {
fileStream.close();
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
resolve();
});
}).on('error', reject);
return;
}
res.pipe(fileStream);
fileStream.on('finish', () => {
fileStream.close();
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
resolve();
});
}).on('error', (err) => {
try { fs.unlinkSync(nodeExePath); } catch (e) { }
reject(err);
});
});
}
main().catch(err => { main().catch(err => {
console.error('Release failed:', err.message); console.error('Release failed:', err.message);
process.exit(1); process.exit(1);

View File

@@ -59,11 +59,13 @@ class ServiceManager {
this.logToFile(name, `--- Starting ${name} in ${serviceDir} ---`); this.logToFile(name, `--- Starting ${name} in ${serviceDir} ---`);
const child = spawn('node', [scriptPath], { const nodeExecutable = process.env.NODE_EXE || 'node';
const child = spawn(nodeExecutable, [scriptPath], {
cwd: serviceDir, cwd: serviceDir,
env, env,
stdio: ['ignore', 'pipe', 'pipe'], stdio: ['ignore', 'pipe', 'pipe'],
shell: process.platform === 'win32' shell: false
}); });
this.processes[name] = { this.processes[name] = {

2
src-tauri/Cargo.lock generated
View File

@@ -4222,7 +4222,7 @@ dependencies = [
[[package]] [[package]]
name = "vyla-home" name = "vyla-home"
version = "1.0.1" version = "1.0.5"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",

View File

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

View File

@@ -23,7 +23,6 @@ struct BackendMessage {
data: serde_json::Value, data: serde_json::Value,
} }
// Helper to remove the \\?\ prefix that Node.js chokes on
fn clean_path(path: &std::path::Path) -> String { fn clean_path(path: &std::path::Path) -> String {
let s = path.to_string_lossy().to_string(); let s = path.to_string_lossy().to_string();
if s.starts_with("\\\\?\\") { if s.starts_with("\\\\?\\") {
@@ -33,6 +32,73 @@ fn clean_path(path: &std::path::Path) -> String {
} }
} }
fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Ok(resource_dir) = app.path().resource_dir() {
let candidates = [
resource_dir.join("bin").join("node.exe"),
resource_dir.join("node.exe"),
resource_dir.join("_up_").join("bin").join("node.exe"),
resource_dir.join("_up_").join("node.exe"),
];
for candidate in candidates {
if candidate.exists() {
return Some(clean_path(&candidate));
}
}
}
if let Ok(exe_path) = std::env::current_exe() {
if let Some(parent) = exe_path.parent() {
let candidates = [
parent.join("bin").join("node.exe"),
parent.join("node.exe"),
parent.join("resources").join("bin").join("node.exe"),
parent.join("resources").join("node.exe"),
];
for candidate in candidates {
if candidate.exists() {
return Some(clean_path(&candidate));
}
}
}
}
if let Ok(path_var) = std::env::var("PATH") {
for p in std::env::split_paths(&path_var) {
let candidate = p.join("node.exe");
if candidate.exists() {
return Some(clean_path(&candidate));
}
}
}
#[cfg(windows)]
{
let default_paths = [
r"C:\Program Files\nodejs\node.exe",
r"C:\Program Files (x86)\nodejs\node.exe",
];
for path in default_paths {
let candidate = std::path::Path::new(path);
if candidate.exists() {
return Some(clean_path(candidate));
}
}
if let Ok(local_app_data) = std::env::var("LOCALAPPDATA") {
let candidate = std::path::PathBuf::from(local_app_data)
.join("Programs")
.join("nodejs")
.join("node.exe");
if candidate.exists() {
return Some(clean_path(&candidate));
}
}
}
None
}
fn resolve_script_and_root(app: &tauri::App) -> (String, String) { fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
if let Ok(resource_dir) = app.path().resource_dir() { if let Ok(resource_dir) = app.path().resource_dir() {
debug_log(&format!("Resource dir found: {:?}", resource_dir)); debug_log(&format!("Resource dir found: {:?}", resource_dir));
@@ -117,13 +183,28 @@ fn main() {
debug_log("Webview created"); debug_log("Webview created");
let (main_js, root_dir) = resolve_script_and_root(app); let (main_js, root_dir) = resolve_script_and_root(app);
let node_bin = match find_node_binary(app) {
Some(bin) => bin,
None => {
debug_log("Node.js runtime not found anywhere");
let _ = window.emit(
"error",
serde_json::json!({
"message": "Node.js runtime not found on this system. Please install Node.js (https://nodejs.org) and restart Vyla Home."
}),
);
return Ok(());
}
};
debug_log(&format!("Using Node binary: {}", node_bin));
debug_log(&format!("Spawning node with script: {}", main_js)); debug_log(&format!("Spawning node with script: {}", main_js));
let mut cmd = Command::new("node"); let mut cmd = Command::new(&node_bin);
cmd.arg(&main_js) cmd.arg(&main_js)
.current_dir(&root_dir) .current_dir(&root_dir)
.env("APPDATA_PATH", &app_data_str) .env("APPDATA_PATH", &app_data_str)
.env("NODE_EXE", &node_bin)
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.stderr(Stdio::piped()); .stderr(Stdio::piped());
@@ -172,6 +253,12 @@ fn main() {
} }
Err(e) => { Err(e) => {
debug_log(&format!("FAILED to spawn Node: {}", e)); debug_log(&format!("FAILED to spawn Node: {}", e));
let _ = window.emit(
"error",
serde_json::json!({
"message": format!("Failed to launch backend runtime: {}", e)
}),
);
} }
} }

View File

@@ -1,7 +1,7 @@
{ {
"$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/schema.json", "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/schema.json",
"productName": "Vyla Home", "productName": "Vyla Home",
"version": "1.0.1", "version": "1.0.5",
"identifier": "com.vyla.home", "identifier": "com.vyla.home",
"build": { "build": {
"frontendDist": "../ui" "frontendDist": "../ui"
@@ -28,6 +28,7 @@
} }
}, },
"resources": [ "resources": [
"../bin/**/*",
"../main.js", "../main.js",
"../service-manager.js", "../service-manager.js",
"../patcher.js", "../patcher.js",
@@ -38,4 +39,4 @@
"../node_modules/**/*" "../node_modules/**/*"
] ]
} }
} }

View File

@@ -681,21 +681,27 @@
viewElement.classList.add('active'); viewElement.classList.add('active');
} }
if (window.__TAURI__ && window.__TAURI__.event) { function setupTauriListeners() {
window.__TAURI__.event.listen('update-available', (e) => { const eventApi = window.__TAURI__?.event || window.__TAURI_INTERNALS__;
if (!eventApi || typeof eventApi.listen !== 'function') {
setTimeout(setupTauriListeners, 200);
return;
}
eventApi.listen('update-available', (e) => {
if (e.payload) { if (e.payload) {
document.getElementById('update-msg').textContent = `Version ${e.payload.latest} is available (Current: ${e.payload.current}).`; document.getElementById('update-msg').textContent = `Version ${e.payload.latest} is available (Current: ${e.payload.current}).`;
showView(viewUpdate); showView(viewUpdate);
} }
}); });
window.__TAURI__.event.listen('status', (e) => { eventApi.listen('status', (e) => {
if (e.payload && e.payload.message) { if (e.payload && e.payload.message) {
statusMsg.textContent = e.payload.message; statusMsg.textContent = e.payload.message;
} }
}); });
window.__TAURI__.event.listen('download-progress', (e) => { eventApi.listen('download-progress', (e) => {
if (e.payload) { if (e.payload) {
statusMsg.textContent = `Downloading update: ${e.payload.percent}%`; statusMsg.textContent = `Downloading update: ${e.payload.percent}%`;
progressWrap.style.display = 'block'; progressWrap.style.display = 'block';
@@ -703,27 +709,43 @@
} }
}); });
window.__TAURI__.event.listen('error', (e) => { eventApi.listen('error', (e) => {
if (e.payload && e.payload.message) { if (e.payload && e.payload.message) {
errorMsg.textContent = e.payload.message; errorMsg.textContent = e.payload.message;
showView(viewError); showView(viewError);
} }
}); });
window.__TAURI__.event.listen('ready', (e) => { eventApi.listen('ready', (e) => {
if (e.payload && e.payload.url) { if (e.payload && e.payload.url) {
window.location.href = e.payload.url; window.location.href = e.payload.url;
} }
}); });
} }
setupTauriListeners();
function checkUpdateApi() {
fetch('http://127.0.0.1:4891/update/info')
.then(r => r.json())
.then(data => {
if (data && data.available) {
document.getElementById('update-msg').textContent = `Version ${data.latest} is available (Current: ${data.current}).`;
showView(viewUpdate);
}
})
.catch(() => { });
}
const updateInterval = setInterval(checkUpdateApi, 500);
function installUpdate() { function installUpdate() {
clearInterval(updateInterval);
fetch('http://127.0.0.1:4891/update/yes', { method: 'POST' }).catch(() => { }); fetch('http://127.0.0.1:4891/update/yes', { method: 'POST' }).catch(() => { });
statusMsg.textContent = 'Starting update...'; statusMsg.textContent = 'Starting update...';
showView(viewLoader); showView(viewLoader);
} }
function skipUpdate() { function skipUpdate() {
clearInterval(updateInterval);
fetch('http://127.0.0.1:4891/update/no', { method: 'POST' }).catch(() => { }); fetch('http://127.0.0.1:4891/update/no', { method: 'POST' }).catch(() => { });
statusMsg.textContent = 'Continuing to app...'; statusMsg.textContent = 'Continuing to app...';
showView(viewLoader); showView(viewLoader);