removed stream-api & auth no need, fixed some issues aswell

.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.bash

@@ -0,0 +1 @@
+bash -c 'pkill -9 -x node 2>/dev/null; pkill -9 -x "Vyla Home" 2>/dev/null; pkill -9 -x "vyla-home" 2>/dev/null; rm -rf "$HOME/Library/Application Support/com.vyla.home" "$HOME/Library/Application Support/vyla-home" "$HOME/Library/Application Support/Vyla Home" "$HOME/Library/Caches/com.vyla.home" "$HOME/Library/Caches/vyla-home" "$HOME/Library/Caches/Vyla Home" "$HOME/Library/WebKit/com.vyla.home" "$HOME/Library/WebKit/vyla-home" "$HOME/Library/WebKit/Vyla Home" "$HOME/Library/Logs/Vyla Home" "$HOME/Library/Preferences/com.vyla.home.plist" "$HOME/.vyla-home" "/Applications/Vyla Home.app" "/Applications/vyla-home.app" "$HOME/Applications/Vyla Home.app" "$HOME/Applications/vyla-home.app" "src-tauri/target" "dist-build" "temp-validation-extract" "dist" "frontend" "player" "auth-proxy" "stream-api" "logs" "*.log" "download-temp.zip" "update-payload.zip" "manifest.json" "validation-report.json" "config/encrypted-credentials.json" "config/credentials.json"; echo "Vyla Home cleanup complete."'

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/FIXES.md

@@ -0,0 +1,3 @@
+If someone get's a Webview2 error, they need to download the WebView2Loader.dll and drag it in bin
+
+bin\WebView2Loader.dll

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,24 @@
 # Vyla Home
 
-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 desktop application that provides a fast, secure, and private way to access the Vyla media ecosystem. Vyla Home runs everything locally on your computer, giving you quick access to streaming services without relying on external servers.
 
-## Why this exists
+## What It Does
 
-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 a native desktop app that:
 
-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.
+- **Runs locally** - All services run on your computer for maximum privacy and speed
+- **Manages streaming services** - Handles authentication and streaming APIs automatically
+- **Updates automatically** - Keeps itself up to date with the latest features and fixes
+- **Works offline** - Core functionality doesn't require constant internet connectivity
+- **Keeps your data secure** - Your credentials and settings are encrypted and stored locally
 
-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.
+## How It Works
 
-## What it actually is
+When you launch Vyla Home, it:
 
-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:
+1. Starts the necessary background services (media player server)
+2. Loads your saved settings and credentials (encrypted for security)
+3. Checks for updates and installs them if available
+4. Opens the user interface in a secure, embedded browser window
 
-- 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
-
-Everything runs for you, on your machine, for your own personal use.
-
-## What this is not
-
-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.
+Everything happens on your machine - your data never leaves your computer except when communicating directly with streaming services.

build-pipeline.js

@@ -1,12 +1,11 @@
 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');
 
 const BUILD_DIR = path.join(__dirname, 'dist-build');
-const REPOS = ['frontend', 'player', 'auth-proxy', 'stream-api'];
+const REPOS = ['frontend', 'player'];
 
 const TEMP_EXTRACT_DIR = path.join(__dirname, 'temp-validation-extract');
 
@@ -15,22 +14,25 @@ const GITLAB_GROUP = 'vyla-entertainment';
 const REPO_CONFIG = {
   'frontend': { name: 'frontend', branch: 'main' },
   'player': { name: 'player', branch: 'main' },
-  'auth-proxy': { name: 'auth-proxy', branch: 'main' },
-  'stream-api': { name: 'stream-api', branch: 'main' },
 };
 
+const clonedRepos = new Set();
+
 function clonePrivateRepo(repoConfig, targetDir) {
-  const repoUrl = `https://gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
+  if (fs.existsSync(targetDir)) {
+    console.log(`Removing stale ${repoConfig.name} before fresh clone...`);
+    fs.rmSync(targetDir, { recursive: true, force: true });
+  }
+
+  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 });
-    }
-
     execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, {
       stdio: 'inherit'
     });
-
+    clonedRepos.add(repoConfig.name);
   } catch (error) {
     throw new Error(`Failed to clone ${repoConfig.name}: ${error.message}`);
   }
@@ -71,23 +73,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 +153,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) {
@@ -194,12 +172,10 @@ function validatePayload(zipPath) {
   zip.extractAllTo(TEMP_EXTRACT_DIR, true);
 
   const requiredFiles = [
-    'player/index.html',
-    'auth-proxy/server.js',
-    'stream-api/server.js',
+    'player/server.js',
     'frontend/index.html'
   ];
-
+  
   const validationResults = {
     valid: true,
     errors: [],
@@ -332,6 +308,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);
@@ -352,9 +331,11 @@ async function build() {
   fs.writeFileSync(path.join(__dirname, 'manifest.json'), JSON.stringify(manifest, null, 2), 'utf8');
 
   for (const repo of REPOS) {
-    const repoPath = path.join(__dirname, repo);
-    if (fs.existsSync(repoPath)) {
-      fs.rmSync(repoPath, { recursive: true, force: true });
+    if (clonedRepos.has(repo)) {
+      const repoPath = path.join(__dirname, repo);
+      if (fs.existsSync(repoPath)) {
+        fs.rmSync(repoPath, { recursive: true, force: true });
+      }
     }
   }
 

codemagic.yaml

@@ -0,0 +1,46 @@
+workflows:
+  macos-release:
+    name: Build macOS Release
+    max_build_duration: 60
+    instance_type: mac_mini_m2
+    environment:
+      groups:
+        - gitlab_credentials
+      node: 22.14.0
+    cache:
+      cache_paths:
+        - $HOME/.cargo/registry
+        - $HOME/.cargo/git
+        - src-tauri/target
+    scripts:
+      - name: Setup Rust toolchain
+        script: |
+          if ! command -v cargo &> /dev/null; then
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          fi
+      - name: Install dependencies
+        script: |
+          export PATH="$HOME/.cargo/bin:$PATH"
+          npm install
+      - name: Build & Publish macOS Release
+        script: |
+          export PATH="$HOME/.cargo/bin:$PATH"
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+          node release.js --installer --tag="v$PACKAGE_VERSION"
+      - name: Verify bundled node permissions
+        script: |
+          if [ -f "bin/node" ]; then
+            chmod +x bin/node
+            xattr -cr bin/node || true
+            ls -la bin/node
+            file bin/node
+          fi
+          APP_NODE=$(find src-tauri/target/release/bundle -name "node" -path "*bin*" 2>/dev/null | head -1)
+          if [ -n "$APP_NODE" ]; then
+            chmod +x "$APP_NODE"
+            xattr -cr "$APP_NODE" || true
+            ls -la "$APP_NODE"
+          fi
+    artifacts:
+      - src-tauri/target/release/bundle/dmg/*.dmg
+      - src-tauri/target/release/bundle/macos/*.app

config/credentials-template.json

@@ -1,16 +1,5 @@
 {
     "player": {
-        "TMDB_KEY": "YOUR_TMDB_KEY_HERE",
-        "API_KEY": "YOUR_API_KEY_HERE"
-    },
-    "auth-proxy": {
-        "VITE_API_KEY": "YOUR_VITE_API_KEY_HERE",
-        "PROXY_VITE_API_KEY": "YOUR_PROXY_VITE_API_KEY_HERE"
-    },
-    "stream-api": {
-        "TMDB_API_KEY": "YOUR_TMDB_API_KEY_HERE",
-        "GA_MEASUREMENT_ID": "YOUR_GA_MEASUREMENT_ID_HERE",
-        "GA_API_SECRET": "YOUR_GA_API_SECRET_HERE",
-        "TOKEN_SECRET": "YOUR_TOKEN_SECRET_HERE"
+        "TMDB_KEY": "YOUR_TMDB_KEY_HERE"
     }
 }

config/env.json

@@ -1,20 +1,5 @@
 {
   "player": {
-    "PORT": "3001",
-    "BASE_URL": "http://localhost:7860",
-    "BYPASS_AUTH": "true"
-  },
-  "auth-proxy": {
-    "PORT": "3000",
-    "VITE_BASE_URL": "http://localhost:7860",
-    "DEV_BYPASS_AUTH": "true"
-  },
-  "stream-api": {
-    "PORT": "7860",
-    "PROXY_URL": "https://txt.primebox.workers.dev",
-    "PROXY_STREAMS": "true",
-    "ENABLE_DEBUG_ROUTE": "true",
-    "BYPASS_AUTH": "true",
-    "TOKEN_SECRET": "vyla_default_secure_token_secret_local_dev_32chars"
+    "PORT": "3000"
   }
 }

config/replacements.json

@@ -2,40 +2,17 @@
   "frontend": [
     {
       "find": "https://player.vyla.cc",
-      "replace": "http://localhost:3001"
+      "replace": "http://localhost:3000"
     },
     {
       "find": "http://player.vyla.cc",
-      "replace": "http://localhost:3001"
-    },
-    {
-      "find": "https://api.vyla.cc",
-      "replace": "http://localhost:7860"
-    },
-    {
-      "find": "https://auth.vyla.cc",
       "replace": "http://localhost:3000"
     }
   ],
   "player": [
-    {
-      "find": "https://api.vyla.cc",
-      "replace": "http://localhost:7860"
-    },
-    {
-      "find": "https://auth.vyla.cc",
-      "replace": "http://localhost:3000"
-    },
     {
       "find": "https://player.vyla.cc",
       "replace": "http://localhost:4890"
     }
-  ],
-  "auth-proxy": [
-    {
-      "find": "https://player.vyla.cc",
-      "replace": "http://localhost:3001"
-    }
-  ],
-  "stream-api": []
+  ]
 }

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();
     }
   }
 

github-client.js

@@ -4,9 +4,7 @@ const path = require('path');
 
 const REPOS = {
     frontend: { branch: 'main' },
-    player: { branch: 'main' },
-    'stream-api': { branch: 'main' },
-    'auth-proxy': { branch: 'main' }
+    player: { branch: 'main' }
 };
 
 const GITLAB_GROUP = 'vyla-entertainment';

main.js

@@ -6,13 +6,27 @@ 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');
+function getDefaultAppData() {
+  if (process.platform === 'darwin') {
+    return path.join(os.homedir(), 'Library', 'Application Support', 'vyla-home', 'vyla-home-files');
+  }
+  if (process.platform === 'linux') {
+    return path.join(os.homedir(), '.local', 'share', 'vyla-home', 'vyla-home-files');
+  }
+  return 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
+  : getDefaultAppData();
+
 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 ---");
@@ -20,40 +34,117 @@ debugLog("--- Node.js Process Started ---");
 let serviceManager;
 let expressApp;
 let expressServer;
-let playerExpressApp;
-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.stdin.resume();
+process.stdin.on('end', () => {
+  debugLog('stdin closed - parent died. Self-terminating...');
+  process.exit(0);
+});
+process.stdin.on('error', () => {
+  process.exit(0);
 });
 
 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' || err.code === 'EOF') {
+    debugLog('Pipe to parent closed - parent process gone, exiting');
+    process.exit(0);
+  }
+  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');
+    if (fs.existsSync(tempZipPath)) {
+      try { fs.unlinkSync(tempZipPath); } catch (e) { }
+    }
     let attempts = 0;
     let downloadSuccess = false;
 
@@ -61,34 +152,43 @@ 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)...` });
 
+        let lastPercent = -1;
         await updateClient.downloadUpdate(release, tempZipPath, (downloaded, total) => {
           const percent = total > 0 ? Math.round((downloaded / total) * 100) : 0;
-          sendToTauri('download-progress', { downloaded, total, percent });
+          if (percent !== lastPercent) {
+            lastPercent = percent;
+            sendToTauri('download-progress', { downloaded, total, percent });
+          }
         });
 
         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 +196,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,28 +209,106 @@ async function start() {
   };
 
   try {
-    const isFirstRun = !patcher.verifyExtraction();
-    const localVersion = patcher.getCurrentVersion();
-    const localSha = patcher.getCurrentSha();
-    debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}`);
+    sendToTauri('status', { message: 'Inspecting local workspace and installed files...' });
+    let isFirstRun = !patcher.verifyExtraction();
+    let localVersion = patcher.getCurrentVersion();
+    let localSha = patcher.getCurrentSha();
+    debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}, Local SHA: ${localSha}`);
 
-    sendToTauri('status', { message: 'Checking for updates...' });
+    function findLocalZip() {
+      const searchRoots = [__dirname, process.cwd()];
+      for (const root of searchRoots) {
+        let cur = root;
+        for (let i = 0; i < 6; i++) {
+          const zp = path.join(cur, 'update-payload.zip');
+          if (fs.existsSync(zp)) {
+            const mp = path.join(cur, 'manifest.json');
+            return { zipPath: zp, manifestPath: fs.existsSync(mp) ? mp : null };
+          }
+          const parent = path.dirname(cur);
+          if (parent === cur) break;
+          cur = parent;
+        }
+      }
+      return null;
+    }
+
+    const localFound = findLocalZip();
+    let localZipPath = localFound ? localFound.zipPath : null;
+    let localManifestPath = localFound ? localFound.manifestPath : null;
+    let localZipManifest = null;
+
+    if (localManifestPath) {
+      try {
+        localZipManifest = JSON.parse(fs.readFileSync(localManifestPath, 'utf8'));
+      } catch (e) { }
+    }
+
+    if (localZipPath && (isFirstRun || (localZipManifest && localZipManifest.sha256 !== localSha))) {
+      debugLog(`Applying local development payload from: ${localZipPath}`);
+      sendToTauri('status', { message: 'Extracting local development payload...' });
+      patcher.purgeOldCode();
+      patcher.extractZipPayload(localZipPath);
+      patcher.applyPatches(getReplacementsConfig());
+      patcher.bridgeCredentials(serviceManager.credentialManager);
+
+      const ver = localZipManifest ? localZipManifest.version : '1.1.32';
+      const sha = localZipManifest ? localZipManifest.sha256 : null;
+      patcher.saveCurrentVersion(ver, sha);
+      serviceManager.envConfig = getEnvConfig();
+
+      isFirstRun = false;
+      localVersion = ver;
+      localSha = sha;
+      debugLog("Local payload applied successfully.");
+    }
+
+    sendToTauri('status', { message: 'Connecting to update servers...' });
     let release = null;
     try {
       debugLog("Fetching updates from updateClient...");
       release = await updateClient.checkForUpdates();
       debugLog(`Update check finished. Found: ${release ? release.version : 'None'}`);
+
+      let appPkgVer = '0.0.0';
+      try {
+        appPkgVer = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8')).version || '0.0.0';
+      } catch (e) { }
+
+      if (release && release.version) {
+        const rVer = release.version.replace('v', '').split('.').map(Number);
+        const aVer = appPkgVer.split('.').map(Number);
+        let isOlder = false;
+        for (let i = 0; i < 3; i++) {
+          if ((rVer[i] || 0) < (aVer[i] || 0)) { isOlder = true; break; }
+          if ((rVer[i] || 0) > (aVer[i] || 0)) { break; }
+        }
+        if (isOlder) {
+          debugLog(`Remote version ${release.version} is older than local package ${appPkgVer}. Ignoring remote release.`);
+          release = null;
+        }
+      }
     } catch (e) {
       debugLog(`Update check failed (offline?): ${e.message}`);
+      sendToTauri('status', { message: `Update server check skipped (${e.message})` });
     }
 
+    const normalizeVer = (v) => (v || '').toString().replace(/^v/, '').trim();
+
     if (release) {
-      const hasUpdate = release.version !== localVersion || (release.sha256 && release.sha256 !== localSha);
+      const isNewerSha = release.sha256 && localSha && release.sha256 !== localSha;
+      const isDifferentVer = normalizeVer(release.version) !== normalizeVer(localVersion);
+      const hasUpdate = (isDifferentVer || isNewerSha) && !localZipPath;
+
       if (isFirstRun) {
-        debugLog("First run. Installing remote build...");
+        debugLog("First run with no local payload. 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 +323,112 @@ 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");
+
+        let ver = "1.0.0";
+        try {
+          const man = JSON.parse(fs.readFileSync(path.join(__dirname, 'manifest.json'), 'utf8'));
+          ver = man.version || ver;
+        } catch (e) { }
+
+        patcher.saveCurrentVersion(ver);
+        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.');
+      throw new Error('No application files found. Ensure you run "npm run build:payload" to generate the local development payload.');
     }
 
-    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 (player)...' });
     await serviceManager.startServices([
-      { name: 'auth-proxy', relativeDir: 'auth-proxy' },
-      { name: 'stream-api', relativeDir: 'stream-api' },
+      { name: 'player', relativeDir: 'player', startScript: 'server.js' }
     ]);
     debugLog("Backend services spawn requested.");
 
-    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');
-      if (req.method === 'OPTIONS') return res.sendStatus(200);
-      next();
-    });
-    playerExpressApp.get('/__tauri_cmd/:cmd', (req, res) => {
-      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');
-    debugLog("Player Express running on 3001");
-
-    sendToTauri('status', { message: 'Waiting for ports 3000, 3001, 7860...' });
-    await serviceManager.waitForPorts([3000, 3001, 7860]);
-    debugLog("Ports 3000, 3001, 7860 are ready.");
+    sendToTauri('status', { message: 'Waiting for microservices to bind port 3000...' });
+    await serviceManager.waitForPorts([3000]);
+    debugLog("Port 3000 is 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.use(express.static(path.join(frontendDir, 'src'), {
+      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')));
+
+    expressServer = expressApp.listen(FRONTEND_PORT, () => {
+      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}` });
     });
@@ -244,17 +443,23 @@ process.on('exit', () => {
   if (serviceManager) {
     for (const name of Object.keys(serviceManager.processes)) {
       const proc = serviceManager.processes[name];
-      if (proc && proc.child) {
-        try { proc.child.kill('SIGKILL'); } catch (e) { }
+      if (proc && proc.child && proc.child.pid) {
+        try {
+          if (process.platform === 'win32') {
+            require('child_process').spawnSync('taskkill', ['/F', '/T', '/PID', proc.child.pid.toString()], { stdio: 'ignore', windowsHide: true });
+          } else {
+            process.kill(-proc.child.pid, 'SIGKILL');
+          }
+        } catch (e) { }
       }
     }
   }
 });
 
-process.on('SIGINT', async () => {
-  if (expressServer) expressServer.close();
-  if (playerExpressServer) playerExpressServer.close();
-  if (serviceManager) await serviceManager.stopAll();
+process.on('SIGINT', () => {
+  process.exit(0);
+});
+process.on('SIGTERM', () => {
   process.exit(0);
 });
 

package.json

@@ -1,26 +1,26 @@
 {
   "name": "vyla-home",
-  "version": "1.0.7",
+  "version": "1.1.32",
   "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",
@@ -54,4 +54,4 @@
       "installerHeaderIcon": "build/icon.ico"
     }
   }
-}
+}

patcher.js

@@ -63,17 +63,24 @@ class Patcher {
       const fullPath = path.join(this.appDataPath, dir);
       if (fs.existsSync(fullPath)) {
         try {
-          fs.rmSync(fullPath, { recursive: true, force: true });
+          const trashPath = path.join(this.appDataPath, `.trash_${dir}_${Date.now()}`);
+          fs.renameSync(fullPath, trashPath);
+          fs.rmSync(trashPath, { recursive: true, force: true });
         } catch (e) {
           try {
-            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.`);
-          }
+            fs.rmSync(fullPath, { recursive: true, force: true });
+          } catch (err2) { }
         }
       }
     }
+    try {
+      const files = fs.readdirSync(this.appDataPath);
+      for (const file of files) {
+        if (file.startsWith('.trash_')) {
+          fs.rmSync(path.join(this.appDataPath, file), { recursive: true, force: true });
+        }
+      }
+    } catch (e) { }
   }
 
   extractZipPayload(zipPath) {
@@ -92,9 +99,7 @@ class Patcher {
 
   verifyExtraction() {
     const requiredFiles = [
-      'player/index.html',
-      'auth-proxy/server.js',
-      'stream-api/server.js',
+      'player/server.js',
       'frontend/index.html'
     ];
 
@@ -119,7 +124,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 +135,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'];
+    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,57 +78,82 @@ function uploadFileToGitLabPackage(filePath, packageName, version, fileName) {
 }
 
 function createGitLabRelease(tag, releaseLinks) {
-    const sendRequest = (method, path) => {
+    const sendRequest = (method, reqPath, 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,
+                path: reqPath,
                 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));
-                    } else if (res.statusCode === 409 && method === 'POST') {
-                        console.log(`Release ${tag} already exists, updating assets...`);
-                        sendRequest('PUT', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}`)
-                            .then(resolve)
-                            .catch(reject);
+                    if (res.statusCode >= 200 && res.statusCode < 300) {
+                        try { resolve(body ? JSON.parse(body) : {}); } catch (e) { resolve({}); }
                     } else {
-                        reject(new Error(`Failed to publish release (HTTP ${res.statusCode}): ${body}`));
+                        reject(new Error(`HTTP ${res.statusCode}: ${body}`));
                     }
                 });
             });
 
             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 Multi-Platform Release ${tag}`,
+        assets: {
+            links: releaseLinks
+        }
+    };
+
+    return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, releaseData)
+        .catch(err => {
+            if (err.message.includes('HTTP 409')) {
+                console.log(`[CI Sync] Release ${tag} already exists. Appending our OS-specific files to it...`);
+                let promiseChain = Promise.resolve();
+
+                for (const link of releaseLinks) {
+                    promiseChain = promiseChain.then(() => {
+                        return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}/assets/links`, {
+                            name: link.name,
+                            url: link.url,
+                            link_type: link.link_type
+                        }).catch(e => {
+                            if (e.message.includes('already been taken') || e.message.includes('HTTP 409') || e.message.includes('HTTP 400')) {
+                                console.log(`[CI Sync] Asset link '${link.name}' is already attached. Skipping.`);
+                                return Promise.resolve();
+                            }
+                            throw e;
+                        });
+                    });
+                }
+                return promiseChain.then(() => ({ name: `Vyla Home Release ${tag}`, tag_name: tag }));
+            }
+            throw err;
+        });
 }
 
 async function main() {
@@ -137,7 +162,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,32 +178,53 @@ 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();
+        await ensureWebView2Loader();
 
-        console.log('[Optional] Compiling Windows Tauri installer locally...');
-        execSync('npm run build', {
-            stdio: 'inherit',
-            env: Object.assign({}, process.env, { WEBVIEW2_STATIC_LIB: '1' })
-        });
+        const bundleDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle');
+        if (fs.existsSync(bundleDir)) {
+            fs.rmSync(bundleDir, { recursive: true, force: true });
+        }
 
-        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'));
-            if (files.length > 0) {
-                const originalName = files[0];
-                installerPath = path.join(nsisDir, originalName);
-                installerUploadName = originalName.replace(/\s+/g, '-');
+        console.log('Compiling native Tauri application...');
+        execSync('npm run build', { stdio: 'inherit' });
+
+        const targetVersion = version.startsWith('v') ? version.substring(1) : version;
+
+        if (process.platform === 'win32') {
+            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') && f.includes(targetVersion));
+                if (files.length > 0) {
+                    installerPath = path.join(nsisDir, files[0]);
+                    installerUploadName = files[0].replace(/\s+/g, '-');
+                }
+            }
+        } else {
+            const dmgDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle', 'dmg');
+            console.log(`Checking for Mac installer in: ${dmgDir}`);
+            if (fs.existsSync(dmgDir)) {
+                const files = fs.readdirSync(dmgDir).filter(f => f.endsWith('.dmg') && f.includes(targetVersion));
+                if (files.length > 0) {
+                    installerPath = path.join(dmgDir, files[0]);
+                    installerUploadName = files[0].replace(/\s+/g, '-');
+                    console.log(`Found Mac installer: ${installerUploadName}`);
+                } else {
+                    console.log(`[WARNING] No .dmg found containing version ${targetVersion}`);
+                }
             }
         }
     }
 
     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,18 +233,25 @@ async function main() {
 
     if (installerPath && installerUploadName) {
         console.log(`Uploading installer ${installerUploadName}...`);
-        const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUploadName);
+        const ext = path.extname(installerUploadName);
+        const installerUnique = installerUploadName.replace(ext, `-${timestamp}${ext}`);
+        const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUnique);
         releaseLinks.push({ name: installerUploadName, url: installerUrl, link_type: 'package' });
+    } else {
+        console.log(`[WARNING] No installer was selected for upload! (isFullBuild: ${isFullBuild})`);
     }
 
     console.log('[3/4] Publishing GitLab Release...');
-    const release = await createGitLabRelease(version, releaseLinks);
-    console.log(`[4/4] Release successfully created: ${release.name} (${release.tag_name})`);
+    await createGitLabRelease(version, releaseLinks);
+    console.log(`[4/4] Release process successfully completed for ${version}!`);
 }
 
 function ensureBundledNode() {
+    const os = require('os');
     const binDir = path.join(__dirname, 'bin');
-    const nodeExePath = path.join(binDir, 'node.exe');
+    const isWin = os.platform() === 'win32';
+    const nodeExeName = isWin ? 'node.exe' : 'node';
+    const nodeExePath = path.join(binDir, nodeExeName);
 
     const nodeVersion = 'v22.14.0';
     const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`);
@@ -210,31 +263,114 @@ function ensureBundledNode() {
     fs.mkdirSync(binDir, { recursive: true });
     console.log(`Downloading standalone Node.js ${nodeVersion} runtime for bundling...`);
 
-    const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
     return new Promise((resolve, reject) => {
-        const fileStream = fs.createWriteStream(nodeExePath);
-        https.get(nodeUrl, (res) => {
-            if (res.statusCode === 302 || res.statusCode === 301) {
-                https.get(res.headers.location, (redirectRes) => {
-                    redirectRes.pipe(fileStream);
-                    fileStream.on('finish', () => {
-                        fileStream.close();
-                        fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
-                        resolve();
-                    });
-                }).on('error', reject);
-                return;
-            }
-            res.pipe(fileStream);
-            fileStream.on('finish', () => {
-                fileStream.close();
+        const download = (url, dest, cb) => {
+            https.get(url, (res) => {
+                if (res.statusCode === 302 || res.statusCode === 301) {
+                    return download(res.headers.location, dest, cb);
+                }
+                const fileStream = fs.createWriteStream(dest);
+                res.pipe(fileStream);
+                fileStream.on('finish', () => {
+                    fileStream.close();
+                    cb();
+                });
+            }).on('error', reject);
+        };
+
+        if (isWin) {
+            const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
+            download(nodeUrl, nodeExePath, () => {
                 fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
                 resolve();
             });
-        }).on('error', (err) => {
-            try { fs.unlinkSync(nodeExePath); } catch (e) { }
-            reject(err);
-        });
+        } else {
+            const arch = os.arch() === 'arm64' ? 'arm64' : 'x64';
+            const platform = os.platform() === 'darwin' ? 'darwin' : 'linux';
+            const tarName = `node-${nodeVersion}-${platform}-${arch}`;
+            const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/${tarName}.tar.gz`;
+            const tarPath = path.join(binDir, 'node.tar.gz');
+
+            download(nodeUrl, tarPath, () => {
+                try {
+                    execSync(`tar -xzf node.tar.gz ${tarName}/bin/node`, { cwd: binDir });
+
+                    const extractedNode = path.join(binDir, tarName, 'bin', 'node');
+                    const finalNode = path.join(binDir, 'node');
+
+                    fs.renameSync(extractedNode, finalNode);
+                    fs.rmSync(path.join(binDir, tarName), { recursive: true, force: true });
+                    fs.unlinkSync(tarPath);
+
+                    fs.chmodSync(finalNode, 0o755);
+
+                    try {
+                        execSync(`xattr -d com.apple.quarantine "${finalNode}"`);
+                    } catch (_) { }
+
+                    fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        }
+    });
+}
+
+function ensureWebView2Loader() {
+    const os = require('os');
+    if (os.platform() !== 'win32') return Promise.resolve();
+
+    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);
     });
 }
 

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) {
     }
@@ -41,18 +40,16 @@ class ServiceManager {
     }
 
     let tokenSecret = process.env.TOKEN_SECRET ||
-      process.env.STREAM_API_TOKEN_SECRET ||
-      this.credentialManager.getCredential('stream-api', 'TOKEN_SECRET');
+      this.credentialManager.getCredential('player', 'TOKEN_SECRET');
 
     if (!tokenSecret || tokenSecret.length < 32) {
       tokenSecret = require('crypto').randomBytes(32).toString('hex');
-      this.credentialManager.setCredential('stream-api', 'TOKEN_SECRET', tokenSecret);
+      this.credentialManager.setCredential('player', 'TOKEN_SECRET', tokenSecret);
     }
 
     const env = {
       ...process.env,
       TOKEN_SECRET: tokenSecret,
-      STREAM_API_TOKEN_SECRET: tokenSecret,
       ...(this.envConfig[name] || {}),
       ...(this.credentialManager.getServiceCredentials(name) || {})
     };
@@ -90,6 +87,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 +127,7 @@ class ServiceManager {
           this.startService(name, relativeDir, startScript).catch(err => {
             this.logToFile(name, `Failed to restart: ${err.message}`);
           });
-        }, 3000);
+        }, 1500);
       }
     });
   }
@@ -175,7 +191,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

@@ -270,7 +270,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -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",
 ]
@@ -762,7 +762,7 @@ dependencies = [
  "bitflags 2.13.1",
  "block2",
  "libc",
- "objc2",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -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"
@@ -2079,7 +2079,7 @@ dependencies = [
  "dpi",
  "gtk",
  "keyboard-types",
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -2157,6 +2157,22 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
 [[package]]
 name = "objc2"
 version = "0.6.4"
@@ -2175,7 +2191,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.13.1",
  "block2",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation",
 ]
@@ -2187,7 +2203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
  "bitflags 2.13.1",
- "objc2",
+ "objc2 0.6.4",
  "objc2-foundation",
 ]
 
@@ -2197,7 +2213,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
  "objc2-foundation",
 ]
 
@@ -2209,7 +2225,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
  "bitflags 2.13.1",
  "dispatch2",
- "objc2",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -2220,7 +2236,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
  "bitflags 2.13.1",
  "dispatch2",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -2231,7 +2247,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
  "objc2-foundation",
 ]
 
@@ -2241,7 +2257,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
  "objc2-foundation",
 ]
 
@@ -2252,7 +2268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
  "bitflags 2.13.1",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
 ]
@@ -2280,7 +2296,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.13.1",
  "block2",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -2291,7 +2307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
  "bitflags 2.13.1",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -2302,7 +2318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
  "bitflags 2.13.1",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation",
 ]
@@ -2315,7 +2331,7 @@ checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.13.1",
  "block2",
- "objc2",
+ "objc2 0.6.4",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-foundation",
@@ -2334,7 +2350,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
  "objc2-foundation",
 ]
 
@@ -2346,7 +2362,7 @@ checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
 dependencies = [
  "bitflags 2.13.1",
  "block2",
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -3211,7 +3227,7 @@ dependencies = [
  "bytemuck",
  "js-sys",
  "ndk",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation",
@@ -3385,7 +3401,7 @@ dependencies = [
  "log",
  "ndk",
  "ndk-sys",
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-foundation",
  "objc2-ui-kit",
@@ -3441,7 +3457,7 @@ dependencies = [
  "log",
  "mime",
  "muda",
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-foundation",
  "objc2-ui-kit",
@@ -3612,7 +3628,7 @@ dependencies = [
  "gtk",
  "http",
  "jni",
- "objc2",
+ "objc2 0.6.4",
  "objc2-ui-kit",
  "objc2-web-kit",
  "raw-window-handle",
@@ -3636,7 +3652,7 @@ dependencies = [
  "http",
  "jni",
  "log",
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "once_cell",
  "percent-encoding",
@@ -4051,7 +4067,7 @@ dependencies = [
  "dirs",
  "libappindicator",
  "muda",
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-core-graphics",
@@ -4178,9 +4194,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 +4238,10 @@ dependencies = [
 
 [[package]]
 name = "vyla-home"
-version = "1.0.7"
+version = "1.1.32"
 dependencies = [
+ "base64 0.22.1",
+ "objc2 0.5.2",
  "serde",
  "serde_json",
  "tauri",
@@ -4231,7 +4249,6 @@ dependencies = [
  "tauri-plugin-opener",
  "tauri-plugin-process",
  "tauri-plugin-shell",
- "url",
 ]
 
 [[package]]
@@ -4475,7 +4492,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -4930,7 +4947,7 @@ dependencies = [
  "jni",
  "libc",
  "ndk",
- "objc2",
+ "objc2 0.6.4",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-foundation",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vyla-home"
-version = "1.0.7"
+version = "1.1.32"
 description = "Vyla Home Desktop App Launcher"
 edition = "2021"
 
@@ -8,10 +8,25 @@ 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"
+
+[target.'cfg(target_os = "macos")'.dependencies]
+objc2 = "0.5"
+
+[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/Info.plist

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>NSAppTransportSecurity</key>
+  <dict>
+    <key>NSAllowsLocalNetworking</key>
+    <true/>
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+  </dict>
+</dict>
+</plist>

src-tauri/build.rs

@@ -1,3 +1,32 @@
 fn main() {
-    tauri_build::build()
+    println!("cargo:rerun-if-changed=src/main.rs");
+    println!("cargo:rerun-if-changed=tauri.conf.json");
+    
+    if std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "windows" {
+        if let (Ok(manifest_dir), Ok(out_dir)) = (std::env::var("CARGO_MANIFEST_DIR"), std::env::var("OUT_DIR")) {
+            let mut target_dir = std::path::PathBuf::from(out_dir);
+            target_dir.pop();
+            target_dir.pop();
+            target_dir.pop();
+            let dll_src = std::path::Path::new(&manifest_dir).join("WebView2Loader.dll");
+            let dll_dest = target_dir.join("WebView2Loader.dll");
+            if dll_src.exists() {
+                let _ = std::fs::copy(dll_src, dll_dest);
+            }
+        }
+    }
+
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        let node_path = std::path::Path::new("../bin/node");
+        if node_path.exists() {
+            let _ = std::fs::set_permissions(
+                node_path,
+                std::fs::Permissions::from_mode(0o755),
+            );
+        }
+    }
+    
+    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,17 +7,31 @@ 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(home) = std::env::var("HOME") {
+        std::path::PathBuf::from(home)
+            .join("Library")
+            .join("Logs")
+            .join("VylaHome")
     } 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")
+        std::env::temp_dir().join("vyla-home-logs")
     };
 
     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,13 +54,39 @@ fn clean_path(path: &std::path::Path) -> String {
     }
 }
 
+fn kill_child_process(child: &mut Child) {
+    #[cfg(windows)]
+    {
+        use std::os::windows::process::CommandExt;
+        const CREATE_NO_WINDOW: u32 = 0x08000000;
+        let _ = Command::new("taskkill")
+            .args(&["/F", "/T", "/PID", &child.id().to_string()])
+            .creation_flags(CREATE_NO_WINDOW)
+            .output();
+    }
+    let _ = child.kill();
+    let _ = child.wait();
+}
+
 fn find_node_binary(app: &tauri::App) -> Option<String> {
     if let Ok(resource_dir) = app.path().resource_dir() {
+        #[cfg(windows)]
         let candidates = [
             resource_dir.join("bin").join("node.exe"),
             resource_dir.join("node.exe"),
             resource_dir.join("_up_").join("bin").join("node.exe"),
             resource_dir.join("_up_").join("node.exe"),
+            resource_dir.join("up").join("bin").join("node.exe"),
+            resource_dir.join("up").join("node.exe"),
+        ];
+        #[cfg(not(windows))]
+        let candidates = [
+            resource_dir.join("bin").join("node"),
+            resource_dir.join("node"),
+            resource_dir.join("_up_").join("bin").join("node"),
+            resource_dir.join("_up_").join("node"),
+            resource_dir.join("up").join("bin").join("node"),
+            resource_dir.join("up").join("node"),
         ];
         for candidate in candidates {
             if candidate.exists() {
@@ -59,9 +99,13 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
         if let Some(parent) = exe_path.parent() {
             let candidates = [
                 parent.join("bin").join("node.exe"),
+                parent.join("bin").join("node"),
                 parent.join("node.exe"),
+                parent.join("node"),
                 parent.join("resources").join("bin").join("node.exe"),
+                parent.join("resources").join("bin").join("node"),
                 parent.join("resources").join("node.exe"),
+                parent.join("resources").join("node"),
             ];
             for candidate in candidates {
                 if candidate.exists() {
@@ -73,9 +117,14 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
 
     if let Ok(path_var) = std::env::var("PATH") {
         for p in std::env::split_paths(&path_var) {
-            let candidate = p.join("node.exe");
-            if candidate.exists() {
-                return Some(clean_path(&candidate));
+            let node_exe = p.join("node.exe");
+            if node_exe.exists() {
+                return Some(clean_path(&node_exe));
+            }
+                
+            let node = p.join("node");
+            if node.exists() {
+                return Some(clean_path(&node));
             }
         }
     }
@@ -104,6 +153,22 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
         }
     }
 
+    #[cfg(not(windows))]
+    {
+        let default_paths = [
+            "/usr/local/bin/node",
+            "/usr/bin/node",
+            "/opt/homebrew/bin/node",
+            "/opt/local/bin/node",
+        ];
+        for path in default_paths {
+            let candidate = std::path::Path::new(path);
+            if candidate.exists() {
+                return Some(clean_path(candidate));
+            }
+        }
+    }
+
     None
 }
 
@@ -112,8 +177,8 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
         let candidates = vec![
             resource_dir.join("main.js"),
             resource_dir.join("_up_").join("main.js"),
+            resource_dir.join("up").join("main.js"),
         ];
-
         for candidate in candidates {
             if candidate.exists() {
                 let root_dir = candidate.parent().unwrap();
@@ -130,38 +195,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 +227,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,188 +241,468 @@ 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);
+        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('/') {
-        format!("http://localhost:4890{}", url)
+        format!("http://127.0.0.1:4890{}", url)
     } else {
-        format!("http://localhost:4890/{}", url)
+        format!("http://127.0.0.1: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()
+#[tauri::command]
+async fn kill_orphans() -> Result<(), String> {
+    debug_log("[KILL] User requested orphan process kill");
+
+    #[cfg(windows)]
     {
-        Ok(_) => {
-            debug_log("Successfully spawned new window");
-            Ok(())
-        },
-        Err(e) => {
-            debug_log(&format!("ERROR: Failed to create new window: {}", e));
-            Err(e.to_string())
+        use std::os::windows::process::CommandExt;
+        const CREATE_NO_WINDOW: u32 = 0x08000000;
+        let _ = std::process::Command::new("taskkill")
+            .args(&["/F", "/T", "/IM", "node.exe"])
+            .creation_flags(CREATE_NO_WINDOW)
+            .output();
+    }
+
+    #[cfg(not(windows))]
+    {
+        let _ = std::process::Command::new("pkill")
+            .args(&["-9", "-f", "node"])
+            .output();
+    }
+
+    Ok(())
+}
+
+#[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 handle_tauri_cmd(w: &tauri::WebviewWindow, msg: &BackendMessage) {
+    let window_label = msg
+        .data
+        .get("window")
+        .and_then(|v| v.as_str())
+        .unwrap_or("main");
+
+    debug_log(&format!("[MAIN-DEBUG] Finding window by label: {}", window_label));
+
+    let cmd_window = match w.app_handle().get_webview_window(window_label) {
+        Some(win) => win,
+        None => {
+            debug_log(&format!("[TAURI-CMD] Window '{}' NOT FOUND!", window_label));
+            return;
+        }
+    };
+
+    let cmd = match msg.data.get("cmd").and_then(|c| c.as_str()) {
+        Some(c) => c,
+        None => return,
+    };
+
+    debug_log(&format!("[TAURI-CMD] Executing action: {}", cmd));
+
+    match cmd {
+        "win_minimize" => {
+            let res = cmd_window.minimize();
+            debug_log(&format!("[TAURI-CMD] Minimize result: {:?}", res));
+        }
+        "win_maximize" => {
+            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" => {
+            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()
+            ));
+
+            let url = match msg.data.get("url").and_then(|u| u.as_str()) {
+                Some(u) => u.to_string(),
+                None => {
+                    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<_>>())
+                    ));
+                    return;
+                }
+            };
+
+            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();
+
+            match 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) {
+                    Ok(_) => debug_log("[TAURI-CMD-DEBUG] open_new_window succeeded"),
+                    Err(e) => debug_log(&format!("[TAURI-CMD-DEBUG] open_new_window error: {}", e)),
+                }
+            }) {
+                Ok(_) => debug_log("[TAURI-CMD-DEBUG] Main thread dispatch succeeded"),
+                Err(e) => debug_log(&format!("[TAURI-CMD-DEBUG] Main thread dispatch failed: {}", e)),
+            }
+        }
+        _ => {}
+    }
+}
+
+fn handle_ready(w: &tauri::WebviewWindow, msg: &BackendMessage) {
+    let url_str = match msg.data.get("url").and_then(|u| u.as_str()) {
+        Some(u) => u,
+        None => return,
+    };
+
+    let url_parsed = match url_str.parse::<tauri::Url>() {
+        Ok(u) => u,
+        Err(_) => return,
+    };
+
+    #[cfg(target_os = "macos")]
+    {
+        use objc2::msg_send;
+        use objc2::runtime::AnyObject;
+        debug_log("Attempting with_webview on ready event");
+        let result = w.with_webview(|webview| unsafe {
+            debug_log("Inside with_webview closure");
+            let wk_webview = webview.inner() as *mut AnyObject;
+            let config: *mut AnyObject = msg_send![wk_webview, configuration];
+            let _: () = msg_send![config, setUpgradeKnownHostsToHTTPS: false];
+            debug_log("setUpgradeKnownHostsToHTTPS set to false");
+        });
+        debug_log(&format!("with_webview result: {:?}", result));
+    }
+
+    let _ = w.navigate(url_parsed);
 }
 
 fn main() {
@@ -373,43 +717,73 @@ fn main() {
             win_maximize,
             win_close,
             win_drag,
-            open_new_window
+            open_new_window,
+            get_logo_base64,
+            kill_orphans
         ])
         .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 vyla_files = if let Ok(appdata_env) = std::env::var("APPDATA") {
+                std::path::PathBuf::from(appdata_env)
+                    .join("vyla-home")
+                    .join("vyla-home-files")
+            } else if let Ok(home) = std::env::var("HOME") {
+                #[cfg(target_os = "macos")]
+                let base = std::path::PathBuf::from(&home)
+                    .join("Library")
+                    .join("Application Support");
+                #[cfg(target_os = "linux")]
+                let base = std::path::PathBuf::from(&home)
+                    .join(".local")
+                    .join("share");
+                #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+                let base = app_data.clone();
+                base.join("vyla-home").join("vyla-home-files")
+            } else {
+                app_data.join("vyla-home-files")
+            };
+
+            let _ = std::fs::create_dir_all(&vyla_files);
+
+            let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
                 .title("Vyla Home")
                 .inner_size(1280.0, 800.0)
                 .decorations(false)
-                .transparent(true)
                 .resizable(true)
+                .devtools(true)
                 .initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
                 .initialization_script(LINK_HANDLER_SCRIPT)
                 .build()?;
-            
+
             let (main_js, root_dir) = resolve_script_and_root(app);
+            debug_log("Searching for node binary...");
+
             let node_bin = match find_node_binary(app) {
-                Some(bin) => bin,
+                Some(bin) => {
+                    debug_log(&format!("Found node binary: {}", bin));
+                    bin
+                }
                 None => {
-                    let _ = window.emit(
-                        "error",
-                        serde_json::json!({
-                            "message": "Node.js runtime not found. Please ensure Node.js is installed or bundled correctly."
-                        }),
-                    );
+                    debug_log("FATAL: No node binary found in bundle or PATH.");
+                    std::thread::sleep(std::time::Duration::from_millis(600));
+                    let _ = window.eval("document.getElementById('status-message').textContent='Error: Node runtime missing. Please reinstall.';");
+                    let _ = window.eval("var b=document.getElementById('debug-log-box');b.style.display='block';b.textContent='Node binary not found. bin/node missing from app bundle or not executable.';");
                     return Ok(());
                 }
             };
 
+            let vyla_files_str = clean_path(&vyla_files);
+            std::thread::sleep(std::time::Duration::from_millis(400));
+
             let mut cmd = Command::new(&node_bin);
             cmd.arg(&main_js)
                 .current_dir(&root_dir)
-                .env("APPDATA_PATH", &app_data_str)
+                .env("APPDATA_PATH", &vyla_files_str)
                 .env("NODE_EXE", &node_bin)
+                .stdin(Stdio::piped())
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
 
@@ -422,54 +796,74 @@ 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() {
+                        let w = window.clone();
+                        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 line.contains("Error")
+                                    || line.contains("Exception")
+                                    || line.contains("MODULE_NOT_FOUND")
+                                {
+                                    let _ = w.emit(
+                                        "error",
+                                        serde_json::json!({ "message": format!("Backend failed: {}", 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() {
-                                if let Ok(msg) = serde_json::from_str::<BackendMessage>(&line) {
-                                    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()) {
-                                                match cmd {
-                                                    "win_minimize" => { let _ = cmd_window.minimize(); },
-                                                    "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(); },
-                                                    "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());
-                                                        }
-                                                    },
-                                                    _ => {}
-                                                }
-                                            }
-                                        }
-                                    } else {
+                            for line in reader.lines().flatten() {
+                                debug_log(&format!("[NODE STDOUT] {}", line));
+
+                                let msg = match serde_json::from_str::<BackendMessage>(&line) {
+                                    Ok(m) => m,
+                                    Err(_) => continue,
+                                };
+
+                                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()
+                                ));
+
+                                match msg.event.as_str() {
+                                    "tauri-cmd" => handle_tauri_cmd(&w, &msg),
+                                    "ready" => handle_ready(&w, &msg),
+                                    _ => {
                                         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 emsg = format!("Failed to spawn node: {}", e);
+                    let js = format!(
+                        "document.getElementById('status-message').textContent='Spawn Error';var b=document.getElementById('debug-log-box');b.style.display='block';b.textContent={};",
+                        serde_json::to_string(&emsg).unwrap_or_default()
+                    );
+                    let _ = window.eval(&js);
                 }
             }
 
@@ -481,7 +875,8 @@ fn 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.7",
+    "version": "1.1.32",
     "identifier": "com.vyla.home",
     "build": {
         "frontendDist": "../ui"
@@ -9,7 +9,7 @@
     "app": {
         "withGlobalTauri": true,
         "security": {
-            "csp": null
+            "csp": "default-src 'self' http://localhost:4890 http://127.0.0.1:4890; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:4890 http://127.0.0.1:4890 https://esm.sh; style-src 'self' 'unsafe-inline' http://localhost:4890 http://127.0.0.1:4890; img-src 'self' data: https: http://localhost:4890 http://127.0.0.1:4890; font-src 'self' data: http://localhost:4890 http://127.0.0.1:4890; connect-src 'self' http://localhost: http://127.0.0.1:"
         }
     },
     "bundle": {
@@ -22,14 +22,20 @@
             "icons/icon.icns",
             "icons/icon.ico"
         ],
+        "macOS": {
+            "exceptionDomain": "localhost",
+            "infoPlist": "Info.plist"
+        },
         "windows": {
             "webviewInstallMode": {
                 "type": "downloadBootstrapper"
             }
         },
         "resources": [
+            "WebView2Loader.dll",
             "../bin/**/*",
             "../main.js",
+            "../preload.js",
             "../service-manager.js",
             "../patcher.js",
             "../crypto-utils.js",
@@ -39,4 +45,4 @@
             "../node_modules/**/*"
         ]
     }
-}
+}

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) => {
@@ -223,7 +228,8 @@ class UpdateClient {
   }
 
   async checkForUpdates() {
-    const releases = await this.fetchJson(RELEASES_API);
+    const cacheBuster = `?cb=${Date.now()}`;
+    const releases = await this.fetchJson(RELEASES_API + cacheBuster);
     if (!releases || releases.length === 0) {
       return null;
     }