place WebView2Loader in root resources to guarantee NSIS extraction alongside executable

.gitignore

@@ -1,7 +1,6 @@
-# Dependencies
 node_modules/
+package-lock.json
 
-# Build outputs
 dist/
 dist-build/
 temp-validation-extract/
@@ -10,37 +9,30 @@ manifest.json
 integrity-report.json
 validation-report.json
 
-# Rust & Tauri
 src-tauri/target/
 
-# Encrypted files (build-time only)
 config/encrypted-credentials.json
 
-# Sensitive files
 credentials.json
 .env
 *.key
 *.pem
 
-# OS files
 .DS_Store
 Thumbs.db
 desktop.ini
 
-# IDE
 .vscode/
 .idea/
 *.swp
 *.swo
 *~
 
-# Logs
 *.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# Temporary files
 *.tmp
 *.temp
 download-temp.zip

package.json

@@ -1,12 +1,12 @@
 {
   "name": "vyla-home",
-  "version": "1.0.9",
+  "version": "1.1.2",
   "description": "Vyla Home Desktop App Launcher",
   "main": "main.js",
   "scripts": {
     "dev": "tauri dev",
     "build:payload": "node build-pipeline.js",
-    "build": "node -e \"require('child_process').execSync('tauri build', {stdio:'inherit', env:Object.assign({}, process.env, {WEBVIEW2_STATIC_LIB:'1'})})\"",
+    "build": "tauri build",
     "release": "node release.js",
     "release:full": "node release.js --installer"
   },

patcher.js

@@ -69,7 +69,7 @@ class Patcher {
             const trashPath = fullPath + '.trash.' + Date.now();
             fs.renameSync(fullPath, trashPath);
           } catch (renameErr) {
-            console.warn(`[PATCHER] Could not remove or rename ${fullPath}. It will be overwritten.`);
+            console.warn(`Could not remove or rename ${fullPath}. It will be overwritten.`);
           }
         }
       }

release.js

@@ -137,7 +137,7 @@ async function main() {
 
     const version = customTag || `v${incrementVersion()}`;
 
-    console.log(`=== Building Vyla Home Release (${version}) ===`);
+    console.log(`Building Vyla Home Release (${version})`);
 
     console.log('[1/4] Building update payload and manifest...');
     execSync('node build-pipeline.js', { stdio: 'inherit' });
@@ -153,13 +153,13 @@ async function main() {
     let installerUploadName = null;
 
     if (isFullBuild) {
-        console.log('[Optional] Ensuring bundled Node.js runtime...');
+        console.log('Ensuring bundled Node.js runtime...');
         await ensureBundledNode();
 
-        console.log('[Optional] Compiling Windows Tauri installer locally...');
+        await ensureWebView2Loader();
+
         execSync('npm run build', {
-            stdio: 'inherit',
+            stdio: 'inherit'
-            env: Object.assign({}, process.env, { WEBVIEW2_STATIC_LIB: '1' })
         });
 
         const nsisDir = path.join(__dirname, 'src-tauri/target/release/bundle/nsis');
@@ -238,6 +238,59 @@ function ensureBundledNode() {
     });
 }
 
+function ensureWebView2Loader() {
+    const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release');
+    const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll');
+    fs.mkdirSync(releaseDir, { recursive: true });
+
+    const targetDllPath = path.join(releaseDir, 'WebView2Loader.dll');
+
+    if (fs.existsSync(rootDllPath) && fs.existsSync(targetDllPath)) {
+        return Promise.resolve();
+    }
+
+    const AdmZip = require('adm-zip');
+    const tempNupkg = path.join(__dirname, 'temp-wv2.zip');
+    const nupkgUrl = 'https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/1.0.2903.40';
+
+    return new Promise((resolve, reject) => {
+        const fileStream = fs.createWriteStream(tempNupkg);
+        const request = (url) => {
+            https.get(url, (res) => {
+                if (res.statusCode === 301 || res.statusCode === 302) {
+                    return request(res.headers.location);
+                }
+                res.pipe(fileStream);
+                fileStream.on('finish', () => {
+                    fileStream.close();
+                    try {
+                        const zip = new AdmZip(tempNupkg);
+                        const zipEntries = zip.getEntries();
+                        const dllEntry = zipEntries.find(e =>
+                            e.entryName.includes('x64/WebView2Loader.dll') ||
+                            e.entryName.includes('x64\\WebView2Loader.dll')
+                        );
+                        if (dllEntry) {
+                            const buffer = dllEntry.getData();
+                            fs.writeFileSync(targetDllPath, buffer);
+                            fs.writeFileSync(rootDllPath, buffer);
+                        }
+                        try { fs.unlinkSync(tempNupkg); } catch (_) { }
+                        resolve();
+                    } catch (e) {
+                        try { fs.unlinkSync(tempNupkg); } catch (_) { }
+                        reject(e);
+                    }
+                });
+            }).on('error', (err) => {
+                try { fs.unlinkSync(tempNupkg); } catch (_) { }
+                reject(err);
+            });
+        };
+        request(nupkgUrl);
+    });
+}
+
 main().catch(err => {
     console.error('Release failed:', err.message);
     process.exit(1);

src-tauri/Cargo.lock

@@ -412,9 +412,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.4.3"
+version = "1.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "509591b7bcd67f4ef775afad7662703b4935daaa6ec0e5605cfb1090b32a2b6d"
+checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -545,9 +545,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+checksum = "8498c871161e1742aaa9d52551b2d6ebdd4c3d45a3be423e3728f33b955be550"
 dependencies = [
  "cfg-if",
 ]
@@ -2012,9 +2012,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "markup5ever"
@@ -4178,9 +4178,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.24.1"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9"
+checksum = "f053576934f05a761a402421fbbe3d425d9366f75f978806a037b3ca481abecc"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",
@@ -4222,7 +4222,7 @@ dependencies = [
 
 [[package]]
 name = "vyla-home"
-version = "1.0.9"
+version = "1.1.2"
 dependencies = [
  "serde",
  "serde_json",

src-tauri/Cargo.toml

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

src-tauri/build.rs

@@ -1,35 +1,3 @@
-use std::env;
-use std::fs;
-use std::path::PathBuf;
-
 fn main() {
     tauri_build::build();
-
-    if env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "windows" {
-        let target_dir = PathBuf::from(env::var("OUT_DIR").unwrap())
-            .ancestors()
-            .nth(3)
-            .unwrap()
-            .to_path_buf();
-
-        let build_dir = PathBuf::from(env::var("OUT_DIR").unwrap())
-            .ancestors()
-            .nth(2)
-            .unwrap()
-            .to_path_buf();
-
-        if let Ok(entries) = fs::read_dir(&build_dir) {
-            for entry in entries.flatten() {
-                let name = entry.file_name().to_string_lossy().to_string();
-                if name.starts_with("webview2-com-sys-") {
-                    let dll_path = entry.path().join("out").join("x64").join("WebView2Loader.dll");
-                    if dll_path.exists() {
-                        let _ = fs::copy(&dll_path, target_dir.join("WebView2Loader.dll"));
-                        let _ = fs::copy(&dll_path, PathBuf::from("../bin").join("WebView2Loader.dll"));
-                        break;
-                    }
-                }
-            }
-        }
-    }
 }

src-tauri/src/main.rs

@@ -40,11 +40,6 @@ 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;
@@ -67,8 +62,6 @@ fn kill_process_tree(pid: u32) {
 
 #[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);
     }
@@ -76,7 +69,6 @@ fn kill_process_tree(pid: u32) {
 
 #[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();
@@ -174,15 +166,8 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
 
 const LINK_HANDLER_SCRIPT: &str = r#"
     function doInvoke(cmd, args) {
-        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 || {})
+            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');
         }
     }
 
@@ -192,8 +177,6 @@ const LINK_HANDLER_SCRIPT: &str = r#"
     function dragWindow() { doInvoke('win_drag'); }
 
     window.open = function(url, target, features) {
-        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;
     };
@@ -202,10 +185,7 @@ 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 });
@@ -213,17 +193,10 @@ 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;
         }
 
@@ -321,28 +294,18 @@ const LINK_HANDLER_SCRIPT: &str = r#"
                 }
             };
         }
-
-        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]
@@ -422,7 +385,7 @@ let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html"
     .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("window.__VYLA_WINDOW_LABEL = 'main';")
     .initialization_script(LINK_HANDLER_SCRIPT)
     .build()?;
 

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://schema.tauri.app/config/2",
     "productName": "Vyla Home",
-    "version": "1.0.9",
+    "version": "1.1.2",
     "identifier": "com.vyla.home",
     "build": {
         "frontendDist": "../ui"
@@ -28,6 +28,7 @@
             }
         },
         "resources": [
+            "WebView2Loader.dll",
             "../bin/*",
             "../main.js",
             "../service-manager.js",