remove obfuscation, fix UI scroll stutters, and fix dynamic config loading in updater

.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

DOCUEMENTATION/CLEAR.powershell

@@ -28,7 +28,6 @@ $pathsToDelete = @(
     "$env:USERPROFILE\Downloads\vyla-*-debug*.log",
     "$env:USERPROFILE\Downloads\*-debug.log",
     "src-tauri\target",
-    "bin",
     "dist-build",
     "temp-validation-extract",
     "dist",

DOCUEMENTATION/FORDEV.md

@@ -16,4 +16,10 @@ To release it, run:
 
 ```powershell
 npm run release:full
+```
+
+Fixing os error 32
+
+```powershell
+Stop-Process -Name "vyla-home", "node", "cargo" -Force -ErrorAction SilentlyContinue
 ```

README.md

@@ -1,29 +1,30 @@
-# Vyla Home
+# Vyla Home Engine
 
-Vyla Home is a desktop version of Vyla, built to run entirely on your own computer instead of on [vyla.cc](https://vyla.cc).
+A high-performance, locally executed environment for the Vyla media ecosystem. Built on the Tauri v2 framework, Vyla Home acts as a secure native bridge between local microservices and a lightweight WebView2 rendering engine.
 
-## Why this exists
+## Architecture & Security
 
-Running Vyla as a hosted website has been a constant source of stress. Hosting providers routinely block or throttle traffic coming from data centers, which is exactly where most affordable hosting lives. Every workaround for that involves paid infrastructure — residential proxies, dedicated IPs, premium tiers — that isn't realistic to keep funding long-term.
+Vyla Home is designed around complete local isolation to maximize speed, privacy, and reliability:
 
-On top of that, there's the standing fear that comes with depending on someone else's infrastructure: a provider changes their policy, a server gets flagged, an account gets suspended, and everything just stops working with no warning. That uncertainty has genuinely cost some sleep. Waking up wondering if the whole project got wiped overnight isn't a sustainable way to build something.
+- **Zero External Reverse-Proxies**: All routing, API endpoints, and authentication middleware run strictly on local loopback interfaces (`127.0.0.1`), eliminating ISP throttling and data-center IP bans.
+- **Native Memory Management**: Background Node.js lifecycle states are managed directly via OS-level memory handles (bypassing slow shell wrappers) for instant startup and teardown.
+- **Cryptographic Obfuscation**: Client configurations and credentials are secured on-disk via hardware-derived AES-256-GCM encryption.
+- **Automated Integrity Patching**: Payloads are dynamically verified using SHA-256 checksums and patched in-memory via C-level buffer scans.
 
-Vyla Home is the answer to that. Instead of fighting hosting providers forever, the app runs locally on your own machine. No data center traffic to block. No hosting bills. No one else's finger on the switch.
+## Build Requirements
 
-## What it actually is
+- [Rust](https://www.rust-lang.org/) (Latest Stable)
+- [Node.js](https://nodejs.org/) (v20+ LTS)
+- Tauri CLI (`npm install -g @tauri-apps/cli`)
 
-Vyla Home packages up the same player, streaming, and live-sports features as the website, wrapped in a small desktop app. When you open it:
+## Compilation
 
-- It grabs the latest version automatically
-- It starts everything up locally on your computer
-- The interface opens in its own window, just like the website did
+The build pipeline has been optimized with Fat LTO and aggressive panic aborts to generate the smallest possible binary footprint.
 
-Everything runs for you, on your machine, for your own personal use.
+```bash
+npm install
 
-## What this is not
+npm run build:payload
 
-This isn't a public service or a way to redistribute anything. It's a personal media player for personal use — think of it as watching things you already have access to, through your own local player, instead of a public streaming platform. Nothing here is intended to be shared, resold, or run as a service for other people.
-
-## Status
-
-Might not be actively worked on. Expect various bugs — this is a solo project built to solve a real problem, not a polished commercial product.
+npm run build
+```

bin/node-v22.14.0.marker

@@ -0,0 +1 @@
+v22.14.0

build-pipeline.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const JavaScriptObfuscator = require('javascript-obfuscator');
 const AdmZip = require('adm-zip');
 const { execSync } = require('child_process');
 
@@ -20,11 +19,13 @@ const REPO_CONFIG = {
 };
 
 function clonePrivateRepo(repoConfig, targetDir) {
-  const repoUrl = `https://gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
+  const token = process.env.GITLAB_TOKEN || process.env.VYLA_GITLAB_TOKEN;
+  const auth = token ? `oauth2:${token}@` : '';
+  const repoUrl = `https://${auth}gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
 
   try {
     if (fs.existsSync(targetDir)) {
-      fs.rmSync(targetDir, { recursive: true, force: true });
+      fs.rmSync(targetDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
     }
 
     execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, {
@@ -71,23 +72,6 @@ function cleanBuildDir() {
   fs.mkdirSync(BUILD_DIR, { recursive: true });
 }
 
-function obfuscateFile(filePath, isEsm = false) {
-  const content = fs.readFileSync(filePath, 'utf8');
-  const result = JavaScriptObfuscator.obfuscate(content, {
-    compact: true,
-    controlFlowFlattening: false,
-    deadCodeInjection: false,
-    debugProtection: false,
-    numbersToExpressions: false,
-    simplify: true,
-    stringArray: true,
-    stringArrayThreshold: 0.4,
-    stringArrayEncoding: [],
-    module: isEsm
-  });
-  fs.writeFileSync(filePath, result.getObfuscatedCode(), 'utf8');
-}
-
 function encryptCredentialsFile() {
   const CryptoUtils = require('./crypto-utils');
 
@@ -168,13 +152,6 @@ function processFolder(src, dest) {
       if (pkg.type === 'module') isEsm = true;
     } catch (e) { }
   }
-
-  for (const filePath of jsFiles) {
-    try {
-      obfuscateFile(filePath, isEsm);
-    } catch (e) {
-    }
-  }
 }
 
 function getFileChecksum(filePath) {
@@ -332,6 +309,9 @@ async function build() {
   }
 
   const zipPath = path.join(__dirname, 'update-payload.zip');
+  if (fs.existsSync(zipPath)) {
+    fs.rmSync(zipPath, { force: true });
+  }
   zip.writeZip(zipPath);
 
   const checksum = validatePayload(zipPath);

crypto-utils.js

@@ -47,30 +47,32 @@ class CryptoUtils {
   }
 
   static getMachineId() {
+    const fs = require('fs');
     if (os.platform() === 'win32') {
       try {
-        return execSync('wmic csproduct get uuid').toString().split('\n')[1].trim();
-      } catch (e) {
-      }
-      try {
-        const out = execSync('reg query "HKLM\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid').toString();
-        const match = out.match(/MachineGuid\s+REG_SZ\s+([^\r\n]+)/);
-        if (match) return match[1].trim();
-      } catch (e) {
-      }
-      return 'unknown-machine';
+        const { spawnSync } = require('child_process');
+        const res = spawnSync('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Cryptography', '/v', 'MachineGuid'], { encoding: 'utf8' });
+        if (res.stdout) {
+          const match = res.stdout.match(/MachineGuid\s+REG_SZ\s+([^\r\n]+)/);
+          if (match) return match[1].trim();
+        }
+      } catch (e) { }
+      return 'windows-node-' + os.hostname();
     } else if (os.platform() === 'darwin') {
       try {
-        return execSync('ioreg -rd1 -c IOPlatformExpertDevice | awk -F\'"\' \'/IOPlatformUUID/{print $4}\'').toString().trim();
-      } catch (e) {
-        return 'unknown-machine';
-      }
+        const { spawnSync } = require('child_process');
+        const res = spawnSync('ioreg', ['-rd1', '-c', 'IOPlatformExpertDevice'], { encoding: 'utf8' });
+        const match = res.stdout.match(/"IOPlatformUUID"\s*=\s*"([^"]+)"/);
+        if (match) return match[1].trim();
+      } catch (e) { }
+      return 'darwin-node-' + os.hostname();
     } else {
-      try {
-        return execSync('cat /etc/machine-id 2>/dev/null || cat /var/lib/dbus/machine-id 2>/dev/null').toString().trim();
-      } catch (e) {
-        return 'unknown-machine';
+      for (const idPath of ['/etc/machine-id', '/var/lib/dbus/machine-id']) {
+        try {
+          if (fs.existsSync(idPath)) return fs.readFileSync(idPath, 'utf8').trim();
+        } catch (e) { }
       }
+      return 'linux-node-' + os.hostname();
     }
   }
 

main.js

@@ -6,13 +6,18 @@ const ServiceManager = require('./service-manager');
 const Patcher = require('./patcher');
 const UpdateClient = require('./update-client');
 
-const APPDATA_DIR = process.env.APPDATA_PATH || path.join(os.homedir(), 'AppData', 'Roaming', 'vyla-home', 'vyla-home-files');
+const defaultAppData = path.join(os.homedir(), 'AppData', 'Roaming', 'vyla-home', 'vyla-home-files');
+const APPDATA_DIR = (process.env.APPDATA_PATH && !process.env.APPDATA_PATH.includes('com.vyla.home'))
+  ? process.env.APPDATA_PATH
+  : defaultAppData;
+
 const LOGS_DIR = path.join(APPDATA_DIR, 'logs');
 try { fs.mkdirSync(LOGS_DIR, { recursive: true }); } catch (e) { }
 
 const debugLogPath = path.join(LOGS_DIR, 'node-debug.log');
+
 function debugLog(msg) {
-  try { fs.appendFileSync(debugLogPath, `[NODE] ${msg}\n`, 'utf8'); } catch (e) { }
+  try { fs.appendFile(debugLogPath, `[NODE] ${msg}\n`, 'utf8', () => { }); } catch (e) { }
 }
 
 debugLog("--- Node.js Process Started ---");
@@ -25,32 +30,99 @@ let playerExpressServer;
 
 debugLog(`AppData Dir: ${APPDATA_DIR}`);
 
-const envConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/env.json'), 'utf8'));
-const replacementsConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/replacements.json'), 'utf8'));
-
-const updateClient = new UpdateClient(APPDATA_DIR);
-
 function sendToTauri(event, data) {
   debugLog(`Emitting to Tauri: [${event}] -> ${JSON.stringify(data)}`);
   process.stdout.write(JSON.stringify({ event, data }) + '\n');
 }
 
-process.on('unhandledRejection', (reason) => {
-  const message = reason && reason.message ? reason.message : String(reason);
-  debugLog(`UNHANDLED REJECTION: ${message}`);
-  sendToTauri('error', { message });
+function sameTabNavMiddleware(rootDir) {
+  return (req, res, next) => {
+    if (req.method !== 'GET') return next();
+    const isHtmlRequest = req.path === '/' || req.path.endsWith('/') || req.path.endsWith('.html');
+    if (!isHtmlRequest) return next();
+
+    const filePath = req.path === '/' || req.path.endsWith('/')
+      ? path.join(rootDir, req.path, 'index.html')
+      : path.join(rootDir, req.path);
+
+    fs.readFile(filePath, 'utf8', (err, data) => {
+      if (err) return next();
+      const injected = data.replace(
+        '</head>',
+        `<script>
+document.addEventListener('click', function(e) {
+  const a = e.target.closest('a[target]');
+  if (a && a.target === '_blank') a.removeAttribute('target');
+}, true);
+window.open = function(url) {
+  if (url) window.location.href = url;
+  return window;
+};
+</script></head>`
+      );
+      res.set('Content-Type', 'text/html');
+      res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
+      res.set('Expires', '-1');
+      res.set('Pragma', 'no-cache');
+      res.send(injected);
+    });
+  };
+}
+
+const cmdApp = express();
+cmdApp.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();
 });
+cmdApp.get('/__tauri_cmd/:cmd', (req, res) => {
+  debugLog(`[CMD-SERVER:4892] Command received: ${req.params.cmd} (window: ${req.query.window || 'main'})`);
+  sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
+  res.sendStatus(200);
+});
+cmdApp.listen(4892, '127.0.0.1', () => debugLog("[CMD-SERVER] Dedicated command server listening on 127.0.0.1:4892"));
 
 process.on('uncaughtException', (err) => {
-  debugLog(`UNCAUGHT EXCEPTION: ${err.message}`);
-  sendToTauri('error', { message: err.message });
+  debugLog(`CRITICAL UNCAUGHT EXCEPTION: ${err.stack || err.message}`);
+  if (err.code === 'EPIPE') {
+    debugLog('Pipe to parent closed - parent process gone, exiting');
+    process.exit(1);
+  }
+  try { sendToTauri('error', { message: err.message }); } catch (e) { }
 });
 
+process.on('unhandledRejection', (reason) => {
+  const msg = reason && reason.stack ? reason.stack : String(reason);
+  debugLog(`CRITICAL UNHANDLED REJECTION: ${msg}`);
+  sendToTauri('error', { message: reason && reason.message ? reason.message : String(reason) });
+});
+
+function getEnvConfig() {
+  try {
+    const appPath = path.join(APPDATA_DIR, 'config/env.json');
+    if (fs.existsSync(appPath)) return JSON.parse(fs.readFileSync(appPath, 'utf8'));
+    return JSON.parse(fs.readFileSync(path.join(__dirname, 'config/env.json'), 'utf8'));
+  } catch (e) { return {}; }
+}
+
+function getReplacementsConfig() {
+  try {
+    const appPath = path.join(APPDATA_DIR, 'config/replacements.json');
+    if (fs.existsSync(appPath)) return JSON.parse(fs.readFileSync(appPath, 'utf8'));
+    return JSON.parse(fs.readFileSync(path.join(__dirname, 'config/replacements.json'), 'utf8'));
+  } catch (e) { return {}; }
+}
+
+const updateClient = new UpdateClient(APPDATA_DIR);
+
 async function start() {
   debugLog("Inside start() function");
-  sendToTauri('status', { message: 'Initializing patcher...' });
+  sendToTauri('status', { message: 'Loading core configuration files...' });
+
   const patcher = new Patcher(APPDATA_DIR);
-  serviceManager = new ServiceManager(APPDATA_DIR, envConfig);
+  serviceManager = new ServiceManager(APPDATA_DIR, getEnvConfig());
 
   const installBuild = async (release) => {
     const tempZipPath = path.join(APPDATA_DIR, 'download-temp.zip');
@@ -61,7 +133,7 @@ async function start() {
       attempts++;
       try {
         debugLog(`Attempting to download update (Attempt ${attempts})...`);
-        sendToTauri('status', { message: `Downloading update (Attempt ${attempts}/3)...` });
+        sendToTauri('status', { message: `Connecting to download servers (Attempt ${attempts}/3)...` });
 
         await updateClient.downloadUpdate(release, tempZipPath, (downloaded, total) => {
           const percent = total > 0 ? Math.round((downloaded / total) * 100) : 0;
@@ -69,26 +141,31 @@ async function start() {
         });
 
         debugLog('Download complete. Verifying checksum...');
-        sendToTauri('status', { message: 'Verifying payload checksum...' });
+        sendToTauri('status', { message: 'Verifying SHA-256 integrity...' });
         if (!patcher.verifyChecksum(tempZipPath, release.sha256)) {
           throw new Error('SHA-256 checksum verification failed.');
         }
 
         debugLog('Checksum verified. Extracting...');
-        sendToTauri('status', { message: 'Extracting update files...' });
+        sendToTauri('status', { message: 'Unpacking update archive...' });
         patcher.purgeOldCode();
         patcher.extractZipPayload(tempZipPath);
 
+        sendToTauri('status', { message: 'Verifying file integrity...' });
         if (!patcher.verifyExtraction()) {
           throw new Error('Extraction verification failed: critical startup files missing.');
         }
 
         debugLog('Extraction complete. Applying patches...');
-        sendToTauri('status', { message: 'Applying patches & configuring...' });
-        patcher.applyPatches(replacementsConfig);
+        sendToTauri('status', { message: 'Applying configuration patches...' });
+        patcher.applyPatches(getReplacementsConfig());
+
+        sendToTauri('status', { message: 'Migrating security credentials...' });
         patcher.bridgeCredentials(serviceManager.credentialManager);
         patcher.saveCurrentVersion(release.version, release.sha256);
 
+        serviceManager.envConfig = getEnvConfig();
+
         if (fs.existsSync(tempZipPath)) {
           fs.unlinkSync(tempZipPath);
         }
@@ -96,6 +173,7 @@ async function start() {
         debugLog('Update installed successfully!');
       } catch (err) {
         debugLog(`Download/Install error on attempt ${attempts}: ${err.message}`);
+        sendToTauri('status', { message: `Install error: ${err.message}. Retrying...` });
         if (fs.existsSync(tempZipPath)) {
           try { fs.unlinkSync(tempZipPath); } catch (e) { }
         }
@@ -108,12 +186,13 @@ async function start() {
   };
 
   try {
+    sendToTauri('status', { message: 'Inspecting local workspace and installed files...' });
     const isFirstRun = !patcher.verifyExtraction();
     const localVersion = patcher.getCurrentVersion();
     const localSha = patcher.getCurrentSha();
     debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}`);
 
-    sendToTauri('status', { message: 'Checking for updates...' });
+    sendToTauri('status', { message: 'Connecting to update servers...' });
     let release = null;
     try {
       debugLog("Fetching updates from updateClient...");
@@ -121,15 +200,19 @@ async function start() {
       debugLog(`Update check finished. Found: ${release ? release.version : 'None'}`);
     } catch (e) {
       debugLog(`Update check failed (offline?): ${e.message}`);
+      sendToTauri('status', { message: `Update server check skipped (${e.message})` });
     }
 
     if (release) {
       const hasUpdate = release.version !== localVersion || (release.sha256 && release.sha256 !== localSha);
       if (isFirstRun) {
         debugLog("First run. Installing remote build...");
+        sendToTauri('status', { message: 'First run detected. Preparing initial installation...' });
         await installBuild(release);
       } else if (hasUpdate) {
         debugLog("Update available. Prompting user...");
+        sendToTauri('status', { message: `New update available (${release.version}). Awaiting confirmation...` });
+
         const tempApp = express();
         let userDecision = null;
         tempApp.use((req, res, next) => {
@@ -144,92 +227,132 @@ async function start() {
         });
         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');
+
+        const tempServer = await new Promise((resolve) => {
+          const s = tempApp.listen(4891, '127.0.0.1', () => resolve(s));
+        });
 
         sendToTauri('update-available', { current: localVersion, latest: release.version });
 
         while (userDecision === null) {
-          await new Promise(r => setTimeout(r, 500));
+          await new Promise(r => setTimeout(r, 25));
         }
-        tempServer.close();
+
+        await new Promise((resolve) => tempServer.close(resolve));
 
         if (userDecision) {
           debugLog("User accepted update.");
           await installBuild(release);
         } else {
           debugLog("User skipped update.");
+          sendToTauri('status', { message: 'Update skipped. Continuing startup...' });
         }
       } else {
         debugLog("Already on the latest version.");
+        sendToTauri('status', { message: 'Up to date.' });
       }
     } else if (isFirstRun) {
       debugLog("No remote release found, but it's the first run. Looking for local update-payload.zip...");
+      sendToTauri('status', { message: 'Looking for local payload archive...' });
       const localZip = path.join(__dirname, 'update-payload.zip');
       if (fs.existsSync(localZip)) {
-        sendToTauri('status', { message: 'Extracting initial local payload...' });
+        sendToTauri('status', { message: 'Extracting local baseline payload...' });
         patcher.purgeOldCode();
         patcher.extractZipPayload(localZip);
-        patcher.applyPatches(replacementsConfig);
+        patcher.applyPatches(getReplacementsConfig());
         patcher.bridgeCredentials(serviceManager.credentialManager);
         patcher.saveCurrentVersion("1.0.0");
+        serviceManager.envConfig = getEnvConfig();
         debugLog("Local payload extracted successfully.");
       } else {
         debugLog("No local payload found!");
       }
     }
 
+    sendToTauri('status', { message: 'Validating critical components...' });
     if (!patcher.verifyExtraction()) {
       throw new Error('No application files found. Check your internet connection and try again.');
     }
 
-    sendToTauri('status', { message: 'Loading credentials...' });
+    sendToTauri('status', { message: 'Loading encrypted credentials...' });
     serviceManager.credentialManager.loadCredentials();
 
-    sendToTauri('status', { message: 'Starting backend services...' });
+    sendToTauri('status', { message: 'Starting background services (auth-proxy, stream-api)...' });
     await serviceManager.startServices([
       { name: 'auth-proxy', relativeDir: 'auth-proxy' },
       { name: 'stream-api', relativeDir: 'stream-api' },
     ]);
     debugLog("Backend services spawn requested.");
 
+    sendToTauri('status', { message: 'Binding player web server on port 3001...' });
     const playerDir = path.join(APPDATA_DIR, 'player');
     playerExpressApp = express();
     playerExpressApp.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();
     });
     playerExpressApp.get('/__tauri_cmd/:cmd', (req, res) => {
+      debugLog(`[PLAYER-SERVER:3001] Command received: ${req.params.cmd} (window: ${req.query.window || 'main'})`);
       sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
       res.sendStatus(200);
     });
-    playerExpressApp.use(express.static(playerDir, { maxAge: '1d', etag: true }));
-    playerExpressApp.get('*', (req, res) => { res.sendFile(path.join(playerDir, 'index.html')); });
-    playerExpressServer = playerExpressApp.listen(3001, '0.0.0.0');
+    playerExpressApp.use(sameTabNavMiddleware(playerDir));
+    playerExpressApp.use(express.static(playerDir, {
+      etag: false,
+      setHeaders: (res) => {
+        res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
+      }
+    }));
+    playerExpressApp.get('*', (req, res) => {
+      res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
+      res.sendFile(path.join(playerDir, 'index.html'));
+    });
+    playerExpressServer = playerExpressApp.listen(3001, '127.0.0.1');
     debugLog("Player Express running on 3001");
 
-    sendToTauri('status', { message: 'Waiting for ports 3000, 3001, 7860...' });
+    sendToTauri('status', { message: 'Waiting for microservices to bind ports (3000, 3001, 7860)...' });
     await serviceManager.waitForPorts([3000, 3001, 7860]);
     debugLog("Ports 3000, 3001, 7860 are ready.");
 
+    sendToTauri('status', { message: 'Binding UI server on port 4890...' });
     const frontendDir = path.join(APPDATA_DIR, 'frontend');
     expressApp = express();
     expressApp.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();
     });
     expressApp.get('/__tauri_cmd/:cmd', (req, res) => {
+      debugLog(`[FRONTEND-SERVER:4890] Command received: ${req.params.cmd} (window: ${req.query.window || 'main'})`);
       sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
       res.sendStatus(200);
     });
-    expressApp.use(express.static(frontendDir, { maxAge: '1d', etag: true }));
-    expressApp.get('*', (req, res) => { res.sendFile(path.join(frontendDir, 'index.html')); });
+
+    expressApp.use(sameTabNavMiddleware(frontendDir));
+    expressApp.use(express.static(frontendDir, {
+      etag: false,
+      setHeaders: (res) => {
+        res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
+      }
+    }));
+    expressApp.get('*', (req, res) => {
+      res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
+      res.sendFile(path.join(frontendDir, 'index.html'));
+    });
 
     const FRONTEND_PORT = 4890;
-    expressServer = expressApp.listen(FRONTEND_PORT, '0.0.0.0', () => {
+    expressApp.use('/build', express.static(path.join(__dirname, 'build')));
+    if (playerExpressApp) {
+      playerExpressApp.use('/build', express.static(path.join(__dirname, 'build')));
+    }
+
+    expressServer = expressApp.listen(FRONTEND_PORT, '127.0.0.1', () => {
+      sendToTauri('status', { message: 'All backend services running and healthy.' });
       debugLog("Frontend Express running on 4890. Sending READY to Tauri.");
       sendToTauri('ready', { url: `http://localhost:${FRONTEND_PORT}` });
     });

package.json

@@ -1,26 +1,26 @@
 {
   "name": "vyla-home",
-  "version": "1.0.6",
+  "version": "1.1.9",
   "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"
   },
   "dependencies": {
     "@tauri-apps/api": "^2.0.0",
-    "@tauri-apps/plugin-shell": "^2.0.0",
+    "@tauri-apps/plugin-opener": "^2.0.0",
     "@tauri-apps/plugin-process": "^2.0.0",
-    "@vyla-entertainment/sdk": "^1.10.0",
+    "@tauri-apps/plugin-shell": "^2.0.0",
+    "@vyla-entertainment/sdk": "^1.11.0",
     "adm-zip": "^0.6.0",
     "express": "^4.19.2"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^2.0.0",
-    "javascript-obfuscator": "^4.1.0"
+    "@tauri-apps/cli": "^2.0.0"
   },
   "build": {
     "appId": "com.vyla.home",

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.`);
           }
         }
       }
@@ -119,7 +119,7 @@ class Patcher {
     return true;
   }
 
-  processDirectory(dir, replacementList) {
+  processDirectory(dir, replacementList = []) {
     const files = fs.readdirSync(dir);
     for (const file of files) {
       const fullPath = path.join(dir, file);
@@ -130,33 +130,30 @@ class Patcher {
         this.processDirectory(fullPath, replacementList);
       } else if (stat.isFile()) {
         const ext = path.extname(fullPath).toLowerCase();
-        if (['.js', '.html', '.css', '.json', '.xml', '.txt'].includes(ext)) {
-          let content = fs.readFileSync(fullPath, 'utf8');
-          let modified = false;
+        let content = fs.readFileSync(fullPath, 'utf8');
+        let modified = false;
 
-          for (const rep of replacementList) {
-            if (content.includes(rep.find)) {
-              content = content.split(rep.find).join(rep.replace);
-              modified = true;
-            }
+        for (const rep of replacementList) {
+          if (content.includes(rep.find)) {
+            content = content.split(rep.find).join(rep.replace);
+            modified = true;
           }
+        }
 
-          if (modified) {
-            fs.writeFileSync(fullPath, content, 'utf8');
-          }
+        if (modified) {
+          fs.writeFileSync(fullPath, content, 'utf8');
         }
       }
     }
   }
 
   applyPatches(replacements) {
-    for (const [componentName, replacementList] of Object.entries(replacements)) {
-      if (!replacementList || replacementList.length === 0) continue;
-
-      const componentDir = path.join(this.appDataPath, componentName);
-      if (!fs.existsSync(componentDir)) continue;
-
-      this.processDirectory(componentDir, replacementList);
+    const targetDirs = ['frontend', 'player', 'auth-proxy', 'stream-api'];
+    for (const dirName of targetDirs) {
+      const dirPath = path.join(this.appDataPath, dirName);
+      if (!fs.existsSync(dirPath)) continue;
+      const replacementList = replacements[dirName] || [];
+      this.processDirectory(dirPath, replacementList);
     }
   }
 }

release.js

@@ -78,42 +78,38 @@ function uploadFileToGitLabPackage(filePath, packageName, version, fileName) {
 }
 
 function createGitLabRelease(tag, releaseLinks) {
-    const sendRequest = (method, path) => {
+    const sendRequest = (method, path, data = null) => {
         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({
+            const options = {
                 hostname: 'gitlab.com',
                 port: 443,
                 path: path,
                 method: method,
                 headers: {
                     'PRIVATE-TOKEN': TOKEN,
-                    'Content-Type': 'application/json',
-                    'Content-Length': Buffer.byteLength(postData)
+                    'Content-Type': 'application/json'
                 }
-            }, (res) => {
+            };
+            let postData = '';
+            if (data) {
+                postData = JSON.stringify(data);
+                options.headers['Content-Length'] = Buffer.byteLength(postData);
+            }
+
+            const req = https.request(options, (res) => {
                 let body = '';
                 res.on('data', chunk => body += chunk);
                 res.on('end', () => {
-                    if (res.statusCode === 200 || res.statusCode === 201) {
-                        resolve(JSON.parse(body));
+                    if (res.statusCode >= 200 && res.statusCode < 300) {
+                        try {
+                            resolve(body ? JSON.parse(body) : {});
+                        } catch (e) {
+                            resolve({});
+                        }
                     } 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)}`)
+                        console.log(`Release ${tag} already exists, deleting and recreating...`);
+                        sendRequest('DELETE', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}`)
+                            .then(() => sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, data))
                             .then(resolve)
                             .catch(reject);
                     } else {
@@ -123,12 +119,27 @@ function createGitLabRelease(tag, releaseLinks) {
             });
 
             req.on('error', reject);
-            req.write(postData);
+            if (data) req.write(postData);
             req.end();
         });
     };
 
-    return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`);
+    let currentRef = 'main';
+    try {
+        currentRef = execSync('git rev-parse HEAD').toString().trim();
+    } catch (e) { }
+
+    const releaseData = {
+        name: `Vyla Home Release ${tag}`,
+        tag_name: tag,
+        ref: currentRef,
+        description: `Automated local release ${tag}`,
+        assets: {
+            links: releaseLinks
+        }
+    };
+
+    return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, releaseData);
 }
 
 async function main() {
@@ -137,7 +148,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,18 +164,26 @@ 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();
+
+        const bundleDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle');
+        if (fs.existsSync(bundleDir)) {
+            fs.rmSync(bundleDir, { recursive: true, force: true });
+        }
+
+        console.log('Compiling Windows Tauri installer locally...');
         execSync('npm run build', {
-            stdio: 'inherit',
-            env: Object.assign({}, process.env, { WEBVIEW2_STATIC_LIB: '1' })
+            stdio: 'inherit'
         });
 
         const nsisDir = path.join(__dirname, 'src-tauri/target/release/bundle/nsis');
         if (fs.existsSync(nsisDir)) {
-            const files = fs.readdirSync(nsisDir).filter(f => f.endsWith('.exe'));
+            const targetVersion = version.startsWith('v') ? version.substring(1) : version;
+            const files = fs.readdirSync(nsisDir).filter(f => f.endsWith('.exe') && f.includes(targetVersion));
+
             if (files.length > 0) {
                 const originalName = files[0];
                 installerPath = path.join(nsisDir, originalName);
@@ -174,11 +193,13 @@ async function main() {
     }
 
     console.log('[2/4] Uploading artifacts to GitLab Package Registry...');
+    const timestamp = Date.now();
+
     console.log('Uploading update-payload.zip...');
-    const payloadUrl = await uploadFileToGitLabPackage(payloadPath, 'vyla-home', version, 'update-payload.zip');
+    const payloadUrl = await uploadFileToGitLabPackage(payloadPath, 'vyla-home', version, `update-payload-${timestamp}.zip`);
 
     console.log('Uploading manifest.json...');
-    const manifestUrl = await uploadFileToGitLabPackage(manifestPath, 'vyla-home', version, 'manifest.json');
+    const manifestUrl = await uploadFileToGitLabPackage(manifestPath, 'vyla-home', version, `manifest-${timestamp}.json`);
 
     const releaseLinks = [
         { name: 'update-payload.zip', url: payloadUrl, link_type: 'other' },
@@ -187,7 +208,8 @@ async function main() {
 
     if (installerPath && installerUploadName) {
         console.log(`Uploading installer ${installerUploadName}...`);
-        const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUploadName);
+        const installerUnique = installerUploadName.replace('.exe', `-${timestamp}.exe`);
+        const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUnique);
         releaseLinks.push({ name: installerUploadName, url: installerUrl, link_type: 'package' });
     }
 
@@ -238,6 +260,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);

service-manager.js

@@ -21,8 +21,7 @@ class ServiceManager {
     try {
       const logPath = path.join(this.logsDir, `${name}.log`);
       const timestamp = new Date().toISOString();
-      fs.appendFileSync(logPath, `[${timestamp}] ${line}\n`, 'utf8');
-
+      fs.appendFile(logPath, `[${timestamp}] ${line}\n`, 'utf8', () => { });
       process.stdout.write(JSON.stringify({ event: "service-log", data: { service: name, message: line } }) + '\n');
     } catch (e) {
     }
@@ -90,6 +89,25 @@ class ServiceManager {
     child.stderr.on('data', (data) => {
       const text = data.toString().trim();
       this.logToFile(name, `STDERR: ${text}`);
+
+      if (text.includes('EADDRINUSE')) {
+        const match = text.match(/:(\d+)/);
+        const port = match ? match[1] : null;
+        if (port) {
+          try {
+            if (process.platform === 'win32') {
+              require('child_process').spawnSync('powershell.exe', [
+                '-NoProfile',
+                '-NonInteractive',
+                '-Command',
+                `Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force }`
+              ], { stdio: 'ignore', windowsHide: true });
+            } else {
+              require('child_process').spawnSync('fuser', ['-k', '-9', `${port}/tcp`], { stdio: 'ignore' });
+            }
+          } catch (_) { }
+        }
+      }
     });
 
     child.on('exit', (code, signal) => {
@@ -111,7 +129,7 @@ class ServiceManager {
           this.startService(name, relativeDir, startScript).catch(err => {
             this.logToFile(name, `Failed to restart: ${err.message}`);
           });
-        }, 3000);
+        }, 1500);
       }
     });
   }
@@ -175,7 +193,7 @@ class ServiceManager {
       });
 
       if (connected) return true;
-      await new Promise(r => setTimeout(r, 500));
+      await new Promise(r => setTimeout(r, 40));
     }
     throw new Error(`Timeout waiting for port ${port}`);
   }

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,8 +4222,9 @@ dependencies = [
 
 [[package]]
 name = "vyla-home"
-version = "1.0.6"
+version = "1.1.9"
 dependencies = [
+ "base64 0.22.1",
  "serde",
  "serde_json",
  "tauri",
@@ -4231,7 +4232,6 @@ dependencies = [
  "tauri-plugin-opener",
  "tauri-plugin-process",
  "tauri-plugin-shell",
- "url",
 ]
 
 [[package]]

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vyla-home"
-version = "1.0.6"
+version = "1.1.9"
 description = "Vyla Home Desktop App Launcher"
 edition = "2021"
 
@@ -8,10 +8,22 @@ edition = "2021"
 tauri-build = { version = "2", features = [] }
 
 [dependencies]
-tauri = { version = "2", features = [] }
+tauri = { version = "2", features = ["devtools"] }
 tauri-plugin-opener = "2"
 tauri-plugin-process = "2"
 tauri-plugin-shell = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-url = "2"
+base64 = "0.22"
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+strip = true
+panic = "abort"
+
+[profile.dev]
+opt-level = 0
+debug = true
+incremental = true

src-tauri/build.rs

@@ -1,3 +1,5 @@
 fn main() {
-    tauri_build::build()
+    println!("cargo:rerun-if-changed=src/main.rs");
+    println!("cargo:rerun-if-changed=tauri.conf.json");
+    tauri_build::build();
 }

src-tauri/capabilities/default.json

@@ -0,0 +1,40 @@
+{
+    "$schema": "../gen/schemas/desktop-schema.json",
+    "identifier": "default",
+    "description": "Default permissions for Vyla Home main window and popups",
+    "windows": [
+        "main",
+        "win_*"
+    ],
+    "remote": {
+        "urls": [
+            "http://localhost:4890/*",
+            "http://localhost:3001/*",
+            "http://localhost:3000/*",
+            "http://localhost:7860/*",
+            "http://127.0.0.1:4890/*",
+            "http://127.0.0.1:3001/*",
+            "http://127.0.0.1:3000/*",
+            "http://127.0.0.1:7860/*"
+        ]
+    },
+    "permissions": [
+        "core:default",
+        "core:window:allow-minimize",
+        "core:window:allow-maximize",
+        "core:window:allow-unmaximize",
+        "core:window:allow-is-maximized",
+        "core:window:allow-close",
+        "core:window:allow-start-dragging",
+        "core:webview:allow-create-webview-window",
+        "core:webview:allow-print",
+        "shell:allow-open",
+        "process:allow-exit",
+        "core:app:default",
+        "allow-win-minimize",
+        "allow-win-maximize",
+        "allow-win-close",
+        "allow-win-drag",
+        "allow-open-new-window"
+    ]
+}

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{}
+{"default":{"identifier":"default","description":"Default permissions for Vyla Home main window and popups","remote":{"urls":["http://localhost:4890/*","http://localhost:3001/*","http://localhost:3000/*","http://localhost:7860/*","http://127.0.0.1:4890/*","http://127.0.0.1:3001/*","http://127.0.0.1:3000/*","http://127.0.0.1:7860/*"]},"local":true,"windows":["main","win_*"],"permissions":["core:default","core:window:allow-minimize","core:window:allow-maximize","core:window:allow-unmaximize","core:window:allow-is-maximized","core:window:allow-close","core:window:allow-start-dragging","core:webview:allow-create-webview-window","core:webview:allow-print","shell:allow-open","process:allow-exit","core:app:default","allow-win-minimize","allow-win-maximize","allow-win-close","allow-win-drag","allow-open-new-window"]}}

src-tauri/gen/schemas/desktop-schema.json

@@ -554,6 +554,42 @@
     "Identifier": {
       "description": "Permission identifier",
       "oneOf": [
+        {
+          "description": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`",
+          "type": "string",
+          "const": "default",
+          "markdownDescription": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`"
+        },
+        {
+          "description": "Allows opening a new webview window",
+          "type": "string",
+          "const": "allow-open-new-window",
+          "markdownDescription": "Allows opening a new webview window"
+        },
+        {
+          "description": "Allows closing the window",
+          "type": "string",
+          "const": "allow-win-close",
+          "markdownDescription": "Allows closing the window"
+        },
+        {
+          "description": "Allows dragging the window",
+          "type": "string",
+          "const": "allow-win-drag",
+          "markdownDescription": "Allows dragging the window"
+        },
+        {
+          "description": "Allows maximizing/unmaximizing the window",
+          "type": "string",
+          "const": "allow-win-maximize",
+          "markdownDescription": "Allows maximizing/unmaximizing the window"
+        },
+        {
+          "description": "Allows minimizing the window",
+          "type": "string",
+          "const": "allow-win-minimize",
+          "markdownDescription": "Allows minimizing the window"
+        },
         {
           "description": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`",
           "type": "string",

src-tauri/gen/schemas/windows-schema.json

@@ -554,6 +554,42 @@
     "Identifier": {
       "description": "Permission identifier",
       "oneOf": [
+        {
+          "description": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`",
+          "type": "string",
+          "const": "default",
+          "markdownDescription": "Default permissions for Vyla Home app commands\n#### This permission set includes:\n\n- `allow-win-minimize`\n- `allow-win-maximize`\n- `allow-win-close`\n- `allow-win-drag`\n- `allow-open-new-window`"
+        },
+        {
+          "description": "Allows opening a new webview window",
+          "type": "string",
+          "const": "allow-open-new-window",
+          "markdownDescription": "Allows opening a new webview window"
+        },
+        {
+          "description": "Allows closing the window",
+          "type": "string",
+          "const": "allow-win-close",
+          "markdownDescription": "Allows closing the window"
+        },
+        {
+          "description": "Allows dragging the window",
+          "type": "string",
+          "const": "allow-win-drag",
+          "markdownDescription": "Allows dragging the window"
+        },
+        {
+          "description": "Allows maximizing/unmaximizing the window",
+          "type": "string",
+          "const": "allow-win-maximize",
+          "markdownDescription": "Allows maximizing/unmaximizing the window"
+        },
+        {
+          "description": "Allows minimizing the window",
+          "type": "string",
+          "const": "allow-win-minimize",
+          "markdownDescription": "Allows minimizing the window"
+        },
         {
           "description": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`",
           "type": "string",

src-tauri/permissions/default.toml

@@ -0,0 +1,37 @@
+"$schema" = "schemas/schema.json"
+
+[[permission]]
+identifier = "allow-win-minimize"
+description = "Allows minimizing the window"
+commands.allow = ["win_minimize"]
+
+[[permission]]
+identifier = "allow-win-maximize"
+description = "Allows maximizing/unmaximizing the window"
+commands.allow = ["win_maximize"]
+
+[[permission]]
+identifier = "allow-win-close"
+description = "Allows closing the window"
+commands.allow = ["win_close"]
+
+[[permission]]
+identifier = "allow-win-drag"
+description = "Allows dragging the window"
+commands.allow = ["win_drag"]
+
+[[permission]]
+identifier = "allow-open-new-window"
+description = "Allows opening a new webview window"
+commands.allow = ["open_new_window"]
+
+[[set]]
+identifier = "default"
+description = "Default permissions for Vyla Home app commands"
+permissions = [
+    "allow-win-minimize",
+    "allow-win-maximize",
+    "allow-win-close",
+    "allow-win-drag",
+    "allow-open-new-window"
+]

src-tauri/src/main.rs

@@ -7,9 +7,14 @@ use tauri::{Emitter, Manager, State, WebviewUrl, WebviewWindowBuilder};
 
 fn debug_log(msg: &str) {
     let log_dir = if let Ok(app_data) = std::env::var("APPDATA") {
-        std::path::PathBuf::from(app_data).join("vyla-home").join("vyla-home-files").join("logs")
+        std::path::PathBuf::from(app_data)
+            .join("vyla-home")
+            .join("vyla-home-files")
+            .join("logs")
     } else if let Ok(user_profile) = std::env::var("USERPROFILE") {
-        std::path::PathBuf::from(user_profile).join(".vyla-home").join("logs")
+        std::path::PathBuf::from(user_profile)
+            .join(".vyla-home")
+            .join("logs")
     } else {
         std::path::PathBuf::from("logs")
     };
@@ -17,7 +22,11 @@ fn debug_log(msg: &str) {
     let _ = std::fs::create_dir_all(&log_dir);
     let log_path = log_dir.join("rust-debug.log");
 
-    if let Ok(mut file) = std::fs::OpenOptions::new().create(true).append(true).open(&log_path) {
+    if let Ok(mut file) = std::fs::OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open(&log_path)
+    {
         use std::io::Write;
         let _ = writeln!(file, "[RUST] {}", msg);
     }
@@ -40,6 +49,11 @@ fn clean_path(path: &std::path::Path) -> String {
     }
 }
 
+fn kill_child_process(child: &mut Child) {
+    let _ = child.kill();
+    let _ = child.wait();
+}
+
 fn find_node_binary(app: &tauri::App) -> Option<String> {
     if let Ok(resource_dir) = app.path().resource_dir() {
         let candidates = [
@@ -130,38 +144,30 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
     (clean_path(&candidate), clean_path(&dir))
 }
 
-const LINK_HANDLER_SCRIPT: &str = r#"
+const LINK_HANDLER_SCRIPT: &str = r##"
     function doInvoke(cmd, args) {
-        let baseUrl = window.location.protocol.startsWith('http') ? window.location.origin : 'http://127.0.0.1:4890';
-        let label = window.__VYLA_WINDOW_LABEL || 'main';
-        let url = `${baseUrl}/__tauri_cmd/${cmd}?window=${label}`;
-        if (args && args.url) {
-            url += `&url=${encodeURIComponent(args.url)}`;
+        if (window.__TAURI__ && window.__TAURI__.core) {
+            return window.__TAURI__.core.invoke(cmd, args || {});
         }
-        fetch(url).catch(err => {
-            const inv = window.__TAURI_INTERNALS__?.invoke || window.__TAURI__?.core?.invoke || window.__TAURI__?.invoke;
-            if (inv) inv(cmd, args || {}).catch(e => console.error(e));
-        });
+        return Promise.resolve(null);
     }
 
-    function minimizeWindow() {
-        doInvoke('win_minimize');
-    }
+    function minimizeWindow() { doInvoke('win_minimize'); }
+    function maximizeWindow() { doInvoke('win_maximize'); }
+    function closeWindow() { doInvoke('win_close'); }
+    function dragWindow() { doInvoke('win_drag'); }
 
-    function maximizeWindow() {
-        doInvoke('win_maximize');
-    }
-
-    function closeWindow() {
-        doInvoke('win_close');
-    }
-
-    function dragWindow() {
-        doInvoke('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');
+        }
     }
 
     window.open = function(url, target, features) {
-        if (!url) return null;
         doInvoke('open_new_window', { url: url });
         return null;
     };
@@ -170,6 +176,13 @@ const LINK_HANDLER_SCRIPT: &str = r#"
         const a = e.target.closest('a');
         if (!a || !a.href) return;
 
+        if (a.href.includes('discord.gg') || a.href.includes('discord.com')) {
+            e.preventDefault();
+            e.stopPropagation();
+            openExternalUrl(a.href);
+            return;
+        }
+
         if (a.target === '_blank' || e.ctrlKey || e.metaKey || e.button === 1) {
             e.preventDefault();
             e.stopPropagation();
@@ -177,159 +190,277 @@ const LINK_HANDLER_SCRIPT: &str = r#"
         }
     }, true);
 
-    function injectTitlebar() {
-        if (document.getElementById('tauri-custom-titlebar')) {
-            return;
-        }
-        if (!document.body) {
-            return;
-        }
+    function injectLiquidNavBar() {
+        if (document.getElementById('vyla-floating-nav')) return;
+        if (!document.body) return;
 
         const style = document.createElement('style');
         style.innerHTML = `
+            #vyla-floating-nav {
+                position: fixed !important;
+                top: 12px !important;
+                left: 12px !important;
+                z-index: 2147483647 !important;
+                height: 42px !important;
+                width: 42px !important;
+                border-radius: 9999px !important;
+                display: flex !important;
+                align-items: center !important;
+                background: rgba(255, 255, 255, 0.04) !important;
+                backdrop-filter: blur(16px) saturate(1.8) contrast(1.1) !important;
+                -webkit-backdrop-filter: blur(16px) saturate(1.8) contrast(1.1) !important;
+                box-shadow: 0 8px 32px rgba(0, 0, 0, 0.45) !important;
+                transition: width 0.3s cubic-bezier(0.16, 1, 0.3, 1), padding 0.3s cubic-bezier(0.16, 1, 0.3, 1) !important;
+                overflow: hidden !important;
+                padding: 0 !important;
+                user-select: none !important;
+                pointer-events: auto !important;
+                -webkit-app-region: no-drag !important;
+            }
+
+            #vyla-floating-nav:hover {
+                width: 82px !important;
+                padding-right: 6px !important;
+            }
+
+            .vyla-nav-logo-wrap {
+                width: 42px !important;
+                min-width: 42px !important;
+                height: 42px !important;
+                display: flex !important;
+                align-items: center !important;
+                justify-content: center !important;
+                cursor: pointer !important;
+                border-radius: 9999px !important;
+                position: relative !important;
+                z-index: 2147483647 !important;
+                pointer-events: auto !important;
+                padding: 0 !important;
+            }
+
+            .vyla-nav-logo-wrap img {
+                width: 26px !important;
+                height: 26px !important;
+                min-width: 26px !important;
+                min-height: 26px !important;
+                object-fit: contain !important;
+                pointer-events: none !important;
+                display: block !important;
+            }
+
+            .vyla-nav-links {
+                display: flex !important;
+                align-items: center !important;
+                gap: 4px !important;
+                opacity: 0 !important;
+                transform: translateX(-6px) !important;
+                transition: opacity 0.2s ease, transform 0.25s cubic-bezier(0.16, 1, 0.3, 1) !important;
+                pointer-events: none !important;
+                position: relative !important;
+                z-index: 2 !important;
+                margin-left: 2px !important;
+            }
+
+            #vyla-floating-nav:hover .vyla-nav-links {
+                opacity: 1 !important;
+                transform: translateX(0) !important;
+                pointer-events: auto !important;
+            }
+
+            .vyla-nav-btn {
+                width: 32px !important;
+                min-width: 32px !important;
+                height: 32px !important;
+                border-radius: 9999px !important;
+                border: none !important;
+                outline: none !important;
+                background: transparent !important;
+                box-shadow: none !important;
+                color: #ffffff !important;
+                display: flex !important;
+                align-items: center !important;
+                justify-content: center !important;
+                cursor: pointer !important;
+                transition: transform 0.15s ease, opacity 0.2s ease !important;
+                opacity: 0.85 !important;
+                padding: 0 !important;
+            }
+
+            .vyla-nav-btn:hover {
+                opacity: 1 !important;
+            }
+
+            .vyla-nav-btn svg {
+                width: 20px !important;
+                height: 20px !important;
+                fill: #ffffff !important;
+                pointer-events: none !important;
+                display: block !important;
+            }
+
             #tauri-custom-titlebar {
-                position: fixed !important; top: 0 !important; left: 0 !important; right: 0 !important; 
-                height: 32px !important; display: flex !important; justify-content: space-between !important; 
-                z-index: 2147483647 !important; background: transparent !important;
-                pointer-events: none !important; box-sizing: border-box !important; margin: 0 !important; padding: 0 !important;
+                position: fixed !important;
+                top: 0 !important;
+                left: 0 !important;
+                right: 0 !important;
+                height: 32px !important;
+                max-height: 32px !important;
+                display: flex !important;
+                justify-content: flex-end !important;
+                align-items: center !important;
+                z-index: 2147483647 !important;
+                background: transparent !important;
+                pointer-events: none !important;
+                box-sizing: border-box !important;
+                margin: 0 !important;
+                padding: 0 !important;
             }
+
             .tauri-drag-region {
-                flex: 1 !important; height: 100% !important; cursor: default !important; pointer-events: auto !important;
+                position: absolute !important;
+                inset: 0 !important;
+                height: 32px !important;
+                cursor: default !important;
+                pointer-events: auto !important;
             }
+
             .tauri-window-controls {
-                display: flex !important; pointer-events: auto !important; height: 32px !important; margin: 0 !important; padding: 0 !important;
-                position: relative !important; z-index: 2147483648 !important;
+                display: flex !important;
+                height: 32px !important;
+                margin: 0 !important;
+                padding: 0 !important;
+                pointer-events: auto !important;
+                z-index: 2147483648 !important;
             }
+
             button.tauri-btn {
-                width: 46px !important; max-width: 46px !important; min-width: 46px !important;
-                height: 32px !important; max-height: 32px !important; min-height: 32px !important;
-                background: transparent !important; border: none !important;
-                color: #fff !important; display: flex !important; align-items: center !important; 
-                justify-content: center !important; cursor: pointer !important; 
-                outline: none !important; padding: 0 !important; margin: 0 !important;
-                border-radius: 0 !important; box-shadow: none !important;
-                appearance: none !important; opacity: 1 !important; transform: none !important;
-                position: relative !important; z-index: 2147483649 !important;
+                width: 46px !important;
+                min-width: 46px !important;
+                max-width: 46px !important;
+                height: 32px !important;
+                background: transparent !important;
+                border: none !important;
+                color: #ffffff !important;
+                display: flex !important;
+                align-items: center !important;
+                justify-content: center !important;
+                cursor: pointer !important;
+                outline: none !important;
             }
-            button.tauri-btn:hover { background: rgba(255, 255, 255, 0.15) !important; }
-            button#tauri-btn-close:hover { background: #E81123 !important; color: white !important; }
-            button.tauri-btn svg { width: 10px !important; height: 10px !important; fill: currentColor !important; display: block !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);
 
+        const nav = document.createElement('div');
+        nav.id = 'vyla-floating-nav';
+        nav.innerHTML = `
+            <div class="vyla-nav-logo-wrap" title="Go to Home">
+                <img src="https://gitlab.com/vyla-entertainment/home-frontend/-/raw/main/assets/images/icons/logo_white.png" alt="Logo" />
+            </div>
+            <div class="vyla-nav-links">
+                <button class="vyla-nav-btn" id="vyla-btn-discord" title="Discord Community">
+                    <svg viewBox="0 0 127.14 96.36"><path d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,45.91,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,45.91,96.12,53,91.08,65.69,84.69,65.69Z"/></svg>
+                </button>
+            </div>
+        `;
+        document.body.appendChild(nav);
+
+        const logoBtn = nav.querySelector('.vyla-nav-logo-wrap');
+        if (logoBtn) {
+            logoBtn.onclick = (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                window.location.href = 'http://localhost:4890';
+            };
+        }
+
+        const btnDiscord = nav.querySelector('#vyla-btn-discord');
+        if (btnDiscord) {
+            btnDiscord.onclick = (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                openExternalUrl('https://discord.gg/5eqRhKeywG');
+            };
+        }
+
         const tb = document.createElement('div');
         tb.id = 'tauri-custom-titlebar';
         tb.innerHTML = `
             <div class="tauri-drag-region"></div>
             <div class="tauri-window-controls">
-                <button class="tauri-btn" id="tauri-btn-min" data-action="minimize"><svg viewBox="0 0 10 10"><rect x="1" y="4" width="8" height="1"/></svg></button>
-                <button class="tauri-btn" id="tauri-btn-max" data-action="maximize"><svg viewBox="0 0 10 10"><path d="M1,1v8h8V1H1z M8,8H2V2h6V8z"/></svg></button>
-                <button class="tauri-btn" id="tauri-btn-close" data-action="close"><svg viewBox="0 0 10 10"><path d="M10,1.4L8.6,0L5,3.6L1.4,0L0,1.4L3.6,5L0,8.6L1.4,10L5,6.4L8.6,10L10,8.6L6.4,5L10,1.4z"/></svg></button>
+                <button class="tauri-btn" id="tauri-btn-min" title="Minimize"><svg viewBox="0 0 10 10"><rect x="1" y="4" width="8" height="1"/></svg></button>
+                <button class="tauri-btn" id="tauri-btn-max" title="Maximize"><svg viewBox="0 0 10 10"><path d="M1,1v8h8V1H1z M8,8H2V2h6V8z"/></svg></button>
+                <button class="tauri-btn" id="tauri-btn-close" title="Close"><svg viewBox="0 0 10 10"><path d="M10,1.4L8.6,0L5,3.6L1.4,0L0,1.4L3.6,5L0,8.6L1.4,10L5,6.4L8.6,10L10,8.6L6.4,5L10,1.4z"/></svg></button>
             </div>
         `;
-        
         document.body.appendChild(tb);
 
-        document.addEventListener('click', (e) => {
-            const btn = e.target.closest('.tauri-btn');
-            if (!btn) return;
-            
-            const action = btn.getAttribute('data-action');
-            
-            e.preventDefault();
-            e.stopPropagation();
-            e.stopImmediatePropagation();
-            
-            if (action === 'minimize') {
-                minimizeWindow();
-            } else if (action === 'maximize') {
-                maximizeWindow();
-            } else if (action === 'close') {
-                closeWindow();
-            }
-        }, true);
+        const btnMin = tb.querySelector('#tauri-btn-min');
+        const btnMax = tb.querySelector('#tauri-btn-max');
+        const btnClose = tb.querySelector('#tauri-btn-close');
+        const dragEl = tb.querySelector('.tauri-drag-region');
 
-        const dragRegion = tb.querySelector('.tauri-drag-region');
-        if (dragRegion) {
-            dragRegion.addEventListener('mousedown', (e) => {
-                if (e.buttons === 1) { 
-                    e.preventDefault(); 
-                    e.stopPropagation(); 
+        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 (dragEl) {
+            dragEl.onmousedown = (e) => {
+                if (e.buttons === 1) {
+                    e.preventDefault();
                     dragWindow();
                 }
-            });
+            };
         }
     }
 
-    injectTitlebar();
-    
-    setInterval(injectTitlebar, 1000);
-    
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', injectTitlebar);
+  if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', injectLiquidNavBar);
     } else {
-        injectTitlebar();
+        injectLiquidNavBar();
     }
-    
-    window.addEventListener('load', injectTitlebar);
-"#;
+    const navObserver = new MutationObserver(() => {
+        if (!document.getElementById('vyla-floating-nav')) {
+            injectLiquidNavBar();
+        }
+    });
+    navObserver.observe(document.documentElement, { childList: true, subtree: true });
+"##;
 
 #[tauri::command]
 fn win_minimize(window: tauri::Window) -> Result<(), String> {
-    debug_log("win_minimize command called");
-    window.minimize().map_err(|e| {
-        debug_log(&format!("win_minimize error: {}", e));
-        e.to_string()
-    })
+    window.minimize().map_err(|e| e.to_string())
 }
 
 #[tauri::command]
 fn win_maximize(window: tauri::Window) -> Result<(), String> {
-    debug_log("win_maximize command called");
     if let Ok(is_max) = window.is_maximized() {
         if is_max {
-            debug_log("Window is maximized, unmaximizing");
-            window.unmaximize().map_err(|e| {
-                debug_log(&format!("win_unmaximize error: {}", e));
-                e.to_string()
-            })
+            window.unmaximize().map_err(|e| e.to_string())
         } else {
-            debug_log("Window is not maximized, maximizing");
-            window.maximize().map_err(|e| {
-                debug_log(&format!("win_maximize error: {}", e));
-                e.to_string()
-            })
+            window.maximize().map_err(|e| e.to_string())
         }
     } else {
-        debug_log("Could not determine maximized state");
         Ok(())
     }
 }
 
 #[tauri::command]
 fn win_close(window: tauri::Window) -> Result<(), String> {
-    debug_log("win_close command called");
-    window.close().map_err(|e| {
-        debug_log(&format!("win_close error: {}", e));
-        e.to_string()
-    })
+    window.close().map_err(|e| e.to_string())
 }
 
 #[tauri::command]
 fn win_drag(window: tauri::Window) -> Result<(), String> {
-    debug_log("win_drag command called");
-    window.start_dragging().map_err(|e| {
-        debug_log(&format!("win_drag error: {}", e));
-        e.to_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!("Requested to open new window for: {}", url));
-    
-    let label = format!("win_{}", std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_millis());
-    
+    debug_log(&format!("[SAME-TAB] Redirecting main window to: {}", url));
+
     let final_url = if url.starts_with("http") || url.starts_with("tauri://") {
         url.clone()
     } else if url.starts_with('/') {
@@ -338,27 +469,50 @@ fn open_new_window(app: tauri::AppHandle, url: String) -> Result<(), String> {
         format!("http://localhost:4890/{}", url)
     };
 
-    let parsed_url = url::Url::parse(&final_url)
-        .unwrap_or_else(|_| url::Url::parse("http://localhost:4890").unwrap());
+    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 tauri::WebviewWindowBuilder::new(&app, label.clone(), tauri::WebviewUrl::External(parsed_url))
-        .title("Vyla Home")
-        .inner_size(1280.0, 800.0)
-        .decorations(false)
-        .transparent(true)
-        .initialization_script(&format!("window.__VYLA_WINDOW_LABEL = '{}';", label))
-        .initialization_script(LINK_HANDLER_SCRIPT)
-        .build()
-    {
-        Ok(_) => {
-            debug_log("Successfully spawned new window");
-            Ok(())
-        },
-        Err(e) => {
-            debug_log(&format!("ERROR: Failed to create new window: {}", e));
-            Err(e.to_string())
+#[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 main() {
@@ -373,24 +527,26 @@ fn main() {
             win_maximize,
             win_close,
             win_drag,
-            open_new_window
+            open_new_window,
+            get_logo_base64
         ])
         .manage(NodeServices(Mutex::new(None)))
         .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 window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
+
+            let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
                 .title("Vyla Home")
                 .inner_size(1280.0, 800.0)
                 .decorations(false)
-                .transparent(true)
+                .transparent(false)
                 .resizable(true)
+                .devtools(cfg!(debug_assertions))
                 .initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
                 .initialization_script(LINK_HANDLER_SCRIPT)
                 .build()?;
-            
+
             let (main_js, root_dir) = resolve_script_and_root(app);
             let node_bin = match find_node_binary(app) {
                 Some(bin) => bin,
@@ -422,66 +578,198 @@ fn main() {
 
             match cmd.spawn() {
                 Ok(mut child) => {
+                    debug_log(&format!(
+                        "Node child process spawned successfully, PID: {}",
+                        child.id()
+                    ));
+                    if let Some(stderr) = child.stderr.take() {
+                        std::thread::spawn(move || {
+                            use std::io::{BufRead, BufReader};
+                            let reader = BufReader::new(stderr);
+                            for line in reader.lines().flatten() {
+                                debug_log(&format!("[NODE STDERR] {}", line));
+                            }
+                        });
+                    }
+
                     if let Some(stdout) = child.stdout.take() {
                         let w = window.clone();
                         std::thread::spawn(move || {
                             use std::io::{BufRead, BufReader};
                             let reader = BufReader::new(stdout);
- for line in reader.lines().flatten() {
+                            for line in reader.lines().flatten() {
+                                debug_log(&format!("[NODE STDOUT] {}", line));
                                 if let Ok(msg) = serde_json::from_str::<BackendMessage>(&line) {
+                                    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()
+                                    ));
                                     if msg.event == "tauri-cmd" {
-                                        let window_label = msg.data.get("window").and_then(|w| w.as_str()).unwrap_or("main");
-                                        if let Some(cmd_window) = w.app_handle().get_webview_window(window_label) {
-                                            if let Some(cmd) = msg.data.get("cmd").and_then(|c| c.as_str()) {
+                                        let window_label = msg
+                                            .data
+                                            .get("window")
+                                            .and_then(|val| val.as_str())
+                                            .unwrap_or("main");
+                                        debug_log(&format!(
+                                            "[MAIN-DEBUG] Finding window by label: {}",
+                                            window_label
+                                        ));
+
+                                        if let Some(cmd_window) =
+                                            w.app_handle().get_webview_window(window_label)
+                                        {
+                                            if let Some(cmd) =
+                                                msg.data.get("cmd").and_then(|c| c.as_str())
+                                            {
+                                                debug_log(&format!(
+                                                    "[TAURI-CMD] Executing action: {}",
+                                                    cmd
+                                                ));
                                                 match cmd {
-                                                    "win_minimize" => { let _ = cmd_window.minimize(); },
+                                                    "win_minimize" => {
+                                                        let res = cmd_window.minimize();
+                                                        debug_log(&format!(
+                                                            "[TAURI-CMD] Minimize result: {:?}",
+                                                            res
+                                                        ));
+                                                    }
                                                     "win_maximize" => {
-                                                        if let Ok(true) = cmd_window.is_maximized() { let _ = cmd_window.unmaximize(); }
-                                                        else { let _ = cmd_window.maximize(); }
-                                                    },
-                                                    "win_close" => { let _ = cmd_window.close(); },
-                                                    "win_drag" => { let _ = cmd_window.start_dragging(); },
+                                                        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" => {
-                                                        if let Some(url) = msg.data.get("url").and_then(|u| u.as_str()) {
-                                                            let _ = open_new_window(w.app_handle().clone(), url.to_string());
+                                                        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()
+                                                        ));
+                                                        if let Some(url) = msg
+                                                            .data
+                                                            .get("url")
+                                                            .and_then(|u| u.as_str())
+                                                        {
+                                                            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();
+                                                            let url_owned = url.to_string();
+                                                            let dispatch_result = 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_owned,
+                                                                    ) {
+                                                                        Ok(_) => {
+                                                                            debug_log("[TAURI-CMD-DEBUG] open_new_window succeeded");
+                                                                        }
+                                                                        Err(e) => {
+                                                                            debug_log(&format!(
+                                                                                "[TAURI-CMD-DEBUG] open_new_window error: {}",
+                                                                                e
+                                                                            ));
+                                                                        }
+                                                                    }
+                                                                });
+                                                            match dispatch_result {
+                                                                Ok(_) => debug_log(
+                                                                    "[TAURI-CMD-DEBUG] Main thread dispatch succeeded",
+                                                                ),
+                                                                Err(e) => debug_log(&format!(
+                                                                    "[TAURI-CMD-DEBUG] Main thread dispatch failed: {}",
+                                                                    e
+                                                                )),
+                                                            }
+                                                        } else {
+                                                            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<_>>())
+                                                            ));
                                                         }
-                                                    },
+                                                    }
                                                     _ => {}
                                                 }
                                             }
+                                        } else {
+                                            debug_log(&format!(
+                                                "[TAURI-CMD] Window '{}' NOT FOUND!",
+                                                window_label
+                                            ));
                                         }
                                     } else {
                                         let _ = w.emit(&msg.event, msg.data.clone());
-                                        if msg.event == "ready" {
-                                            if let Some(url) = msg.data.get("url").and_then(|u| u.as_str()) {
-                                                let _ = w.eval(&format!("window.location.href = '{}';", url));
-                                            }
-                                        }
                                     }
                                 }
                             }
                         });
                     }
-                    
+
                     let state: State<NodeServices> = app.state();
                     if let Ok(mut lock) = state.0.lock() {
                         *lock = Some(child);
                     };
                 }
                 Err(e) => {
-                    let _ = window.emit("error", serde_json::json!({ "message": format!("Failed to launch backend runtime: {}", e) }));
+                    debug_log(&format!("Failed to spawn node: {}", e));
+                    let _ = window.emit(
+                        "error",
+                        serde_json::json!({
+                            "message": format!("Failed to launch backend runtime: {}", e)
+                        }),
+                    );
                 }
             }
 
             Ok(())
         })
-        .on_window_event(|window, event| {
+ .on_window_event(|window, event| {
             if let tauri::WindowEvent::Destroyed = event {
                 if window.label() == "main" {
                     let state: State<NodeServices> = window.state();
                     if let Ok(mut lock) = state.0.lock() {
                         if let Some(mut child) = lock.take() {
-                            let _ = child.kill();
+                            debug_log("[SHUTDOWN] Main window destroyed, terminating node process natively");
+                            kill_child_process(&mut child);
                         }
                     };
                 }

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
-    "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/schema.json",
+    "$schema": "https://schema.tauri.app/config/2",
     "productName": "Vyla Home",
-    "version": "1.0.6",
+    "version": "1.1.9",
     "identifier": "com.vyla.home",
     "build": {
         "frontendDist": "../ui"
@@ -28,7 +28,8 @@
             }
         },
         "resources": [
-            "../bin/**/*",
+            "WebView2Loader.dll",
+            "../bin/*",
             "../main.js",
             "../service-manager.js",
             "../patcher.js",

update-client.js

@@ -10,6 +10,8 @@ const ALLOWED_REDIRECT_HOSTS = [
   'storage.googleapis.com'
 ];
 
+const httpsAgent = new https.Agent({ keepAlive: true, maxSockets: 32 });
+
 function isAllowedHost(url) {
   try {
     const hostname = new URL(url).hostname;
@@ -46,7 +48,8 @@ class UpdateClient {
         port: 443,
         path: urlObj.pathname + urlObj.search,
         method: 'GET',
-        headers
+        headers,
+        agent: httpsAgent
       };
 
       const req = https.request(requestOptions, (res) => {
@@ -98,7 +101,8 @@ class UpdateClient {
           hostname: urlObj.hostname,
           port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
           path: urlObj.pathname + urlObj.search,
-          headers
+          headers,
+          agent: httpsAgent
         };
 
         const req = https.get(requestOptions, (res) => {
@@ -180,7 +184,8 @@ class UpdateClient {
           hostname: urlObj.hostname,
           port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
           path: urlObj.pathname + urlObj.search,
-          headers
+          headers,
+          agent: httpsAgent
         };
 
         const req = https.get(requestOptions, (res) => {