bundle standalone node runtime and fix updater prompt race condition

DOCUEMENTATION/CLEAR.md

@@ -1,13 +1,40 @@
-taskkill /F /IM node.exe -ErrorAction SilentlyContinue
-taskkill /F /IM vyla-home.exe -ErrorAction SilentlyContinue
+taskkill /F /IM "node.exe" 2>$null
+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
-Remove-Item -Recurse -Force "$env:APPDATA\vyla-home" -ErrorAction SilentlyContinue
+Stop-Process -Name "node", "vyla-home", "Vyla Home" -Force -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
-Remove-Item -Recurse -Force "dist-build" -ErrorAction SilentlyContinue
-Remove-Item -Force "update-payload.zip" -ErrorAction SilentlyContinue
-Remove-Item -Force "manifest.json" -ErrorAction SilentlyContinue
-Remove-Item -Force "validation-report.json" -ErrorAction SilentlyContinue
+foreach ($path in $pathsToDelete) {
+    if (Test-Path $path) {
+        Remove-Item -Recurse -Force $path -ErrorAction SilentlyContinue
+    }
+}

main.js

@@ -123,9 +123,40 @@ async function start() {
 
     if (release) {
       const hasUpdate = release.version !== localVersion || (release.sha256 && release.sha256 !== localSha);
-      if (isFirstRun || hasUpdate) {
-        debugLog("Update required or first run. Installing remote build...");
+      if (isFirstRun) {
+        debugLog("First run. Installing remote build...");
         await installBuild(release);
+      } else if (hasUpdate) {
+        debugLog("Update available. Prompting user...");
+        const tempApp = express();
+        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/no', (req, res) => { userDecision = false; res.sendStatus(200); });
+        const tempServer = tempApp.listen(4891, '127.0.0.1');
+
+        sendToTauri('update-available', { current: localVersion, latest: release.version });
+
+        while (userDecision === null) {
+          await new Promise(r => setTimeout(r, 500));
+        }
+        tempServer.close();
+
+        if (userDecision) {
+          debugLog("User accepted update.");
+          await installBuild(release);
+        } else {
+          debugLog("User skipped update.");
+        }
       } else {
         debugLog("Already on the latest version.");
       }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vyla-home",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vyla-home",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "dependencies": {
         "@tauri-apps/api": "^2.0.0",
         "@tauri-apps/plugin-process": "^2.0.0",

package.json

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

release.js

@@ -12,9 +12,32 @@ if (!TOKEN) {
     process.exit(1);
 }
 
-function getPackageVersion() {
-    const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8'));
-    return pkg.version || '1.0.0';
+function incrementVersion() {
+    const pkgPath = path.join(__dirname, 'package.json');
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+
+    let [major, minor, patch] = (pkg.version || '1.0.0').split('.').map(Number);
+    patch = (patch || 0) + 1;
+    const newVersion = `${major}.${minor}.${patch}`;
+
+    pkg.version = newVersion;
+    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
+
+    const tauriPath = path.join(__dirname, 'src-tauri', 'tauri.conf.json');
+    if (fs.existsSync(tauriPath)) {
+        const tauriConf = JSON.parse(fs.readFileSync(tauriPath, 'utf8'));
+        tauriConf.version = newVersion;
+        fs.writeFileSync(tauriPath, JSON.stringify(tauriConf, null, 4) + '\n', 'utf8');
+    }
+
+    const cargoPath = path.join(__dirname, 'src-tauri', 'Cargo.toml');
+    if (fs.existsSync(cargoPath)) {
+        let cargo = fs.readFileSync(cargoPath, 'utf8');
+        cargo = cargo.replace(/^version\s*=\s*".*"/m, `version = "${newVersion}"`);
+        fs.writeFileSync(cargoPath, cargo, 'utf8');
+    }
+
+    return newVersion;
 }
 
 function uploadFileToGitLabPackage(filePath, packageName, version, fileName) {
@@ -55,55 +78,64 @@ function uploadFileToGitLabPackage(filePath, packageName, version, fileName) {
 }
 
 function createGitLabRelease(tag, releaseLinks) {
-    return new Promise((resolve, reject) => {
-        let currentRef = 'main';
-        try {
-            currentRef = execSync('git rev-parse HEAD').toString().trim();
-        } catch (e) { }
+    const sendRequest = (method, path) => {
+        return new Promise((resolve, reject) => {
+            let currentRef = 'main';
+            try {
+                currentRef = execSync('git rev-parse HEAD').toString().trim();
+            } catch (e) { }
 
-        const postData = JSON.stringify({
-            name: `Vyla Home Release ${tag}`,
-            tag_name: tag,
-            ref: currentRef,
-            description: `Automated local release ${tag}`,
-            assets: {
-                links: releaseLinks
-            }
-        });
-
-        const req = https.request({
-            hostname: 'gitlab.com',
-            port: 443,
-            path: `/api/v4/projects/${PROJECT_ID}/releases`,
-            method: 'POST',
-            headers: {
-                'PRIVATE-TOKEN': TOKEN,
-                'Content-Type': 'application/json',
-                'Content-Length': Buffer.byteLength(postData)
-            }
-        }, (res) => {
-            let body = '';
-            res.on('data', chunk => body += chunk);
-            res.on('end', () => {
-                if (res.statusCode === 201 || res.statusCode === 200) {
-                    resolve(JSON.parse(body));
-                } else {
-                    reject(new Error(`Failed to create release (HTTP ${res.statusCode}): ${body}`));
+            const postData = JSON.stringify({
+                name: `Vyla Home Release ${tag}`,
+                tag_name: tag,
+                ref: currentRef,
+                description: `Automated local release ${tag}`,
+                assets: {
+                    links: releaseLinks
                 }
             });
-        });
 
-        req.on('error', reject);
-        req.write(postData);
-        req.end();
-    });
+            const req = https.request({
+                hostname: 'gitlab.com',
+                port: 443,
+                path: path,
+                method: method,
+                headers: {
+                    'PRIVATE-TOKEN': TOKEN,
+                    'Content-Type': 'application/json',
+                    'Content-Length': Buffer.byteLength(postData)
+                }
+            }, (res) => {
+                let body = '';
+                res.on('data', chunk => body += chunk);
+                res.on('end', () => {
+                    if (res.statusCode === 200 || res.statusCode === 201) {
+                        resolve(JSON.parse(body));
+                    } else if (res.statusCode === 409 && method === 'POST') {
+                        console.log(`Release ${tag} already exists, updating assets...`);
+                        sendRequest('PUT', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}`)
+                            .then(resolve)
+                            .catch(reject);
+                    } else {
+                        reject(new Error(`Failed to publish release (HTTP ${res.statusCode}): ${body}`));
+                    }
+                });
+            });
+
+            req.on('error', reject);
+            req.write(postData);
+            req.end();
+        });
+    };
+
+    return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`);
 }
 
 async function main() {
     const isFullBuild = process.argv.includes('--installer');
     const customTag = process.argv.find(arg => arg.startsWith('--tag='))?.split('=')[1];
 
-    const version = customTag || `v${getPackageVersion()}`;
+    const version = customTag || `v${incrementVersion()}`;
 
     console.log(`=== Building Vyla Home Release (${version}) ===`);
 
@@ -121,6 +153,9 @@ async function main() {
     let installerUploadName = null;
 
     if (isFullBuild) {
+        console.log('[Optional] Ensuring bundled Node.js runtime...');
+        await ensureBundledNode();
+
         console.log('[Optional] Compiling Windows Tauri installer locally...');
         execSync('npm run build', { stdio: 'inherit' });
 
@@ -158,6 +193,43 @@ async function main() {
     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');
+
+    if (fs.existsSync(nodeExePath) && fs.statSync(nodeExePath).size > 10000000) {
+        return Promise.resolve();
+    }
+
+    fs.mkdirSync(binDir, { recursive: true });
+    console.log('Downloading standalone Node.js runtime for bundling...');
+
+    const nodeUrl = 'https://nodejs.org/dist/v20.18.0/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();
+                        resolve();
+                    });
+                }).on('error', reject);
+                return;
+            }
+            res.pipe(fileStream);
+            fileStream.on('finish', () => {
+                fileStream.close();
+                resolve();
+            });
+        }).on('error', (err) => {
+            try { fs.unlinkSync(nodeExePath); } catch (e) { }
+            reject(err);
+        });
+    });
+}
+
 main().catch(err => {
     console.error('Release failed:', err.message);
     process.exit(1);

service-manager.js

@@ -59,11 +59,13 @@ class ServiceManager {
 
     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,
       env,
       stdio: ['ignore', 'pipe', 'pipe'],
-      shell: process.platform === 'win32'
+      shell: false
     });
 
     this.processes[name] = {

src-tauri/Cargo.lock

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

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vyla-home"
-version = "1.0.0"
+version = "1.0.4"
 description = "Vyla Home Desktop App Launcher"
 edition = "2021"
 
@@ -9,8 +9,8 @@ tauri-build = { version = "2", features = [] }
 
 [dependencies]
 tauri = { version = "2", features = [] }
-tauri-plugin-shell = "2"
-tauri-plugin-process = "2"
 tauri-plugin-opener = "2"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+tauri-plugin-process = "2"
+tauri-plugin-shell = "2"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"

src-tauri/src/main.rs

@@ -23,7 +23,6 @@ struct BackendMessage {
     data: serde_json::Value,
 }
 
-// Helper to remove the \\?\ prefix that Node.js chokes on
 fn clean_path(path: &std::path::Path) -> String {
     let s = path.to_string_lossy().to_string();
     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) {
     if let Ok(resource_dir) = app.path().resource_dir() {
         debug_log(&format!("Resource dir found: {:?}", resource_dir));
@@ -117,13 +183,28 @@ fn main() {
             debug_log("Webview created");
 
             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));
 
-            let mut cmd = Command::new("node");
+            let mut cmd = Command::new(&node_bin);
             cmd.arg(&main_js)
                 .current_dir(&root_dir)
                 .env("APPDATA_PATH", &app_data_str)
+                .env("NODE_EXE", &node_bin)
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
 
@@ -172,6 +253,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)
+                        }),
+                    );
                 }
             }
 

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/schema.json",
     "productName": "Vyla Home",
-    "version": "1.0.0",
+    "version": "1.0.4",
     "identifier": "com.vyla.home",
     "build": {
         "frontendDist": "../ui"
@@ -22,7 +22,13 @@
             "icons/icon.icns",
             "icons/icon.ico"
         ],
+        "windows": {
+            "webviewInstallMode": {
+                "type": "downloadBootstrapper"
+            }
+        },
         "resources": [
+            "../bin/**/*",
             "../main.js",
             "../service-manager.js",
             "../patcher.js",

ui/index.html

@@ -633,6 +633,21 @@
         </div>
     </div>
 
+    <div id="view-update" class="view-state">
+        <div class="container">
+            <svg class="icon icon-loader" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+                style="color:#0a84ff; animation:none; transform:none;">
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4M7 10l5 5 5-5M12 15V3" />
+            </svg>
+            <h1>Update Available</h1>
+            <p id="update-msg">A new version is available.</p>
+            <div class="buttons">
+                <button class="secondary" onclick="skipUpdate()">Skip</button>
+                <button class="primary" onclick="installUpdate()">Install Update</button>
+            </div>
+        </div>
+    </div>
+
     <div id="view-error" class="view-state">
         <div class="container">
             <svg class="icon icon-error" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
@@ -653,6 +668,7 @@
     <script>
         const viewLoader = document.getElementById('view-loader');
         const viewError = document.getElementById('view-error');
+        const viewUpdate = document.getElementById('view-update');
 
         const statusMsg = document.getElementById('status-msg');
         const errorMsg = document.getElementById('error-msg');
@@ -665,14 +681,27 @@
             viewElement.classList.add('active');
         }
 
-        if (window.__TAURI__ && window.__TAURI__.event) {
-            window.__TAURI__.event.listen('status', (e) => {
+        function setupTauriListeners() {
+            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) {
+                    document.getElementById('update-msg').textContent = `Version ${e.payload.latest} is available (Current: ${e.payload.current}).`;
+                    showView(viewUpdate);
+                }
+            });
+
+            eventApi.listen('status', (e) => {
                 if (e.payload && e.payload.message) {
                     statusMsg.textContent = e.payload.message;
                 }
             });
 
-            window.__TAURI__.event.listen('download-progress', (e) => {
+            eventApi.listen('download-progress', (e) => {
                 if (e.payload) {
                     statusMsg.textContent = `Downloading update: ${e.payload.percent}%`;
                     progressWrap.style.display = 'block';
@@ -680,19 +709,47 @@
                 }
             });
 
-            window.__TAURI__.event.listen('error', (e) => {
+            eventApi.listen('error', (e) => {
                 if (e.payload && e.payload.message) {
                     errorMsg.textContent = e.payload.message;
                     showView(viewError);
                 }
             });
 
-            window.__TAURI__.event.listen('ready', (e) => {
+            eventApi.listen('ready', (e) => {
                 if (e.payload && 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() {
+            clearInterval(updateInterval);
+            fetch('http://127.0.0.1:4891/update/yes', { method: 'POST' }).catch(() => { });
+            statusMsg.textContent = 'Starting update...';
+            showView(viewLoader);
+        }
+
+        function skipUpdate() {
+            clearInterval(updateInterval);
+            fetch('http://127.0.0.1:4891/update/no', { method: 'POST' }).catch(() => { });
+            statusMsg.textContent = 'Continuing to app...';
+            showView(viewLoader);
+        }
 
         function pollBackend() {
             fetch('http://localhost:4890')