Compare commits

...

57 Commits

Author SHA1 Message Date
33e285953c prevent macOS HTTPS upgrade for localhost resources 2026-09-05 10:21:18 -07:00
f46869f967 v1.1.28 2026-09-05 09:31:35 -07:00
b19e6b21c9 use 127.0.0.1 for macOS localhost navigation to avoid ATS SSL errors 2026-09-05 09:15:27 -07:00
c8ea2598b9 v1.1.27 2026-09-04 23:20:34 -07:00
e3257b8a3a v1.1.25 2026-09-04 23:16:26 -07:00
fbb5a4437d v1.1.25 2026-09-04 23:01:44 -07:00
dbaab9a00e fixed mismatch 2026-09-04 22:55:31 -07:00
fc49bb93a7 allow localhost subresource loads in WKWebView 2026-09-04 22:52:34 -07:00
9229f0c2dd added this 2026-09-04 22:45:47 -07:00
843abf7df4 supported devtools 2026-09-04 22:39:33 -07:00
27fda0430b v1.1.23 2026-09-04 22:37:36 -07:00
8b49d679bd add macOS ATS exception domain for localhost webview requests 2026-09-04 22:37:15 -07:00
62883b3180 v1.1.22 2026-09-04 22:27:50 -07:00
3c6ae0125b use location.replace for WKWebView navigation 2026-09-04 22:27:24 -07:00
be0810ea6d fix: only check platform-matching node binary extension; bump to 1.1.20 2026-09-04 22:02:38 -07:00
dff55060e7 fix: only check platform-matching node binary extension 2026-09-04 22:02:16 -07:00
df767b5ffc v1.1.20 2026-09-04 21:54:10 -07:00
1b70c6784a resolve bundled resources under both _up_ and up folder names 2026-09-04 21:53:44 -07:00
e25e1c93f9 chore: bump version to 1.1.19 2026-09-04 21:37:32 -07:00
4c708ad97c preserve execute bit on bundled macOS node binary 2026-09-04 21:34:41 -07:00
b81a4e044b v1.1.18 2026-09-04 21:19:06 -07:00
f6aa2daa01 fixed (os error 13) 2026-09-04 21:13:11 -07:00
e03eb38adc v1.1.17 2026-09-04 21:04:44 -07:00
2b690b47c1 fixed typo 2026-09-04 20:58:53 -07:00
dffbdb92a5 v1.1.16 2026-09-04 20:52:21 -07:00
45d6515f2e fixed some issues...? 2026-09-04 20:46:08 -07:00
a3e6a278fe v1.1.15 2026-09-04 20:15:10 -07:00
7ffc20ee48 fixed harmless warning 2026-09-04 20:11:01 -07:00
ddf3abb314 add macOS Node runtime and appdata support 2026-09-04 20:08:27 -07:00
ec50c4e07f v1.1.14 2026-09-04 19:55:59 -07:00
49b2a7622b added debug text 2026-09-04 19:51:27 -07:00
b8e474cb92 Fix Mac tar extraction argument parsing 2026-09-04 19:35:21 -07:00
8b29c9e3c7 Fix Mac Node architecture and resources bundle 2026-09-04 19:30:40 -07:00
5dab61b359 Fix release installer path detection 2026-09-04 19:17:05 -07:00
eab843aa16 Detect and upload macOS DMG bundle 2026-09-04 19:10:21 -07:00
b757f741b7 Fix release log object and multi-platform extension replacement 2026-09-04 19:04:10 -07:00
5f4c47a07c Handle duplicate release asset links 2026-09-04 18:58:51 -07:00
32677c9fb2 Fix Tauri window builder for macOS 2026-09-04 18:53:56 -07:00
7eab57cfd9 Fix Rust PATH and lock release version 2026-09-04 18:50:17 -07:00
c8fc7da64d Configure free Mac cloud workflow 2026-09-04 18:47:30 -07:00
88c1824bf7 removed the gitlab yml 2026-09-04 18:45:22 -07:00
a50cb2b6b8 Fix Windows instance type 2026-09-04 18:45:15 -07:00
971eae4af1 Add Windows and macOS Codemagic workflows 2026-09-04 18:44:28 -07:00
1400d538f3 support mac user test 2026-09-04 18:32:40 -07:00
b1d01d94da v1.1.13 2026-09-04 14:38:43 -07:00
9d7e218ff6 v1.1.12 2026-09-01 20:20:53 -07:00
c19e1e2cf7 fixed downloading update ( sorry lmfao ) 2026-09-01 20:14:28 -07:00
6b06bc8170 v1.1.11 2026-09-01 19:45:46 -07:00
769c0dadcd possibly fixed the auto updater, and fixed the node processes closing 2026-09-01 19:39:27 -07:00
414ef73e1d v1.1.10 2026-09-01 13:41:06 -07:00
01c04111bd remove obfuscation, fix UI scroll stutters, and fix dynamic config loading in updater 2026-09-01 13:26:41 -07:00
a729bb81a3 v1.1.9 2026-09-01 13:12:12 -07:00
547eb59709 disable express static caching to resolve stale UI on app updates 2026-08-28 16:57:17 -07:00
d774bed69b v1.1.8 2026-08-28 16:51:14 -07:00
393a007e4a optimize runtime performance, eliminate AV flags, and apply maximum JS obfuscation 2026-08-28 16:41:47 -07:00
cb3028387c removed launch button 2026-08-28 15:53:06 -07:00
f689fcac03 v1.1.7 2026-08-27 20:05:12 -07:00
19 changed files with 843 additions and 629 deletions

View File

@@ -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."'

View File

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

View File

@@ -1,7 +1,6 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const crypto = require('crypto'); const crypto = require('crypto');
const JavaScriptObfuscator = require('javascript-obfuscator');
const AdmZip = require('adm-zip'); const AdmZip = require('adm-zip');
const { execSync } = require('child_process'); const { execSync } = require('child_process');
@@ -19,20 +18,23 @@ const REPO_CONFIG = {
'stream-api': { name: 'stream-api', branch: 'main' }, 'stream-api': { name: 'stream-api', branch: 'main' },
}; };
const clonedRepos = new Set();
function clonePrivateRepo(repoConfig, targetDir) { function clonePrivateRepo(repoConfig, targetDir) {
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 token = process.env.GITLAB_TOKEN || process.env.VYLA_GITLAB_TOKEN;
const auth = token ? `oauth2:${token}@` : ''; const auth = token ? `oauth2:${token}@` : '';
const repoUrl = `https://${auth}gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`; const repoUrl = `https://${auth}gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
try { try {
if (fs.existsSync(targetDir)) {
fs.rmSync(targetDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
}
execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, { execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, {
stdio: 'inherit' stdio: 'inherit'
}); });
clonedRepos.add(repoConfig.name);
} catch (error) { } catch (error) {
throw new Error(`Failed to clone ${repoConfig.name}: ${error.message}`); throw new Error(`Failed to clone ${repoConfig.name}: ${error.message}`);
} }
@@ -73,23 +75,6 @@ function cleanBuildDir() {
fs.mkdirSync(BUILD_DIR, { recursive: true }); 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() { function encryptCredentialsFile() {
const CryptoUtils = require('./crypto-utils'); const CryptoUtils = require('./crypto-utils');
@@ -170,13 +155,6 @@ function processFolder(src, dest) {
if (pkg.type === 'module') isEsm = true; if (pkg.type === 'module') isEsm = true;
} catch (e) { } } catch (e) { }
} }
for (const filePath of jsFiles) {
try {
obfuscateFile(filePath, isEsm);
} catch (e) {
}
}
} }
function getFileChecksum(filePath) { function getFileChecksum(filePath) {
@@ -357,9 +335,11 @@ async function build() {
fs.writeFileSync(path.join(__dirname, 'manifest.json'), JSON.stringify(manifest, null, 2), 'utf8'); fs.writeFileSync(path.join(__dirname, 'manifest.json'), JSON.stringify(manifest, null, 2), 'utf8');
for (const repo of REPOS) { for (const repo of REPOS) {
const repoPath = path.join(__dirname, repo); if (clonedRepos.has(repo)) {
if (fs.existsSync(repoPath)) { const repoPath = path.join(__dirname, repo);
fs.rmSync(repoPath, { recursive: true, force: true }); if (fs.existsSync(repoPath)) {
fs.rmSync(repoPath, { recursive: true, force: true });
}
} }
} }

46
codemagic.yaml Normal file
View File

@@ -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

View File

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

175
main.js
View File

@@ -6,17 +6,27 @@ const ServiceManager = require('./service-manager');
const Patcher = require('./patcher'); const Patcher = require('./patcher');
const UpdateClient = require('./update-client'); const UpdateClient = require('./update-client');
const defaultAppData = 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')) const APPDATA_DIR = (process.env.APPDATA_PATH && !process.env.APPDATA_PATH.includes('com.vyla.home'))
? process.env.APPDATA_PATH ? process.env.APPDATA_PATH
: defaultAppData; : getDefaultAppData();
const LOGS_DIR = path.join(APPDATA_DIR, 'logs'); const LOGS_DIR = path.join(APPDATA_DIR, 'logs');
try { fs.mkdirSync(LOGS_DIR, { recursive: true }); } catch (e) { } try { fs.mkdirSync(LOGS_DIR, { recursive: true }); } catch (e) { }
const debugLogPath = path.join(LOGS_DIR, 'node-debug.log'); const debugLogPath = path.join(LOGS_DIR, 'node-debug.log');
function debugLog(msg) { 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 ---"); debugLog("--- Node.js Process Started ---");
@@ -60,6 +70,9 @@ window.open = function(url) {
</script></head>` </script></head>`
); );
res.set('Content-Type', 'text/html'); 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); res.send(injected);
}); });
}; };
@@ -78,13 +91,22 @@ cmdApp.get('/__tauri_cmd/:cmd', (req, res) => {
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window }); sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
res.sendStatus(200); res.sendStatus(200);
}); });
cmdApp.listen(4892, '0.0.0.0', () => debugLog("[CMD-SERVER] Dedicated command server listening on 0.0.0.0:4892")); 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) => { process.on('uncaughtException', (err) => {
debugLog(`CRITICAL UNCAUGHT EXCEPTION: ${err.stack || err.message}`); debugLog(`CRITICAL UNCAUGHT EXCEPTION: ${err.stack || err.message}`);
if (err.code === 'EPIPE') { if (err.code === 'EPIPE' || err.code === 'EOF') {
debugLog('Pipe to parent closed - parent process gone, exiting'); debugLog('Pipe to parent closed - parent process gone, exiting');
process.exit(1); process.exit(0);
} }
try { sendToTauri('error', { message: err.message }); } catch (e) { } try { sendToTauri('error', { message: err.message }); } catch (e) { }
}); });
@@ -95,8 +117,21 @@ process.on('unhandledRejection', (reason) => {
sendToTauri('error', { message: reason && reason.message ? reason.message : String(reason) }); sendToTauri('error', { message: reason && reason.message ? reason.message : String(reason) });
}); });
const envConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/env.json'), 'utf8')); function getEnvConfig() {
const replacementsConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/replacements.json'), 'utf8')); 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); const updateClient = new UpdateClient(APPDATA_DIR);
@@ -105,10 +140,13 @@ async function start() {
sendToTauri('status', { message: 'Loading core configuration files...' }); sendToTauri('status', { message: 'Loading core configuration files...' });
const patcher = new Patcher(APPDATA_DIR); const patcher = new Patcher(APPDATA_DIR);
serviceManager = new ServiceManager(APPDATA_DIR, envConfig); serviceManager = new ServiceManager(APPDATA_DIR, getEnvConfig());
const installBuild = async (release) => { const installBuild = async (release) => {
const tempZipPath = path.join(APPDATA_DIR, 'download-temp.zip'); const tempZipPath = path.join(APPDATA_DIR, 'download-temp.zip');
if (fs.existsSync(tempZipPath)) {
try { fs.unlinkSync(tempZipPath); } catch (e) { }
}
let attempts = 0; let attempts = 0;
let downloadSuccess = false; let downloadSuccess = false;
@@ -118,9 +156,13 @@ async function start() {
debugLog(`Attempting to download update (Attempt ${attempts})...`); debugLog(`Attempting to download update (Attempt ${attempts})...`);
sendToTauri('status', { message: `Connecting to download servers (Attempt ${attempts}/3)...` }); sendToTauri('status', { message: `Connecting to download servers (Attempt ${attempts}/3)...` });
let lastPercent = -1;
await updateClient.downloadUpdate(release, tempZipPath, (downloaded, total) => { await updateClient.downloadUpdate(release, tempZipPath, (downloaded, total) => {
const percent = total > 0 ? Math.round((downloaded / total) * 100) : 0; 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...'); debugLog('Download complete. Verifying checksum...');
@@ -141,12 +183,14 @@ async function start() {
debugLog('Extraction complete. Applying patches...'); debugLog('Extraction complete. Applying patches...');
sendToTauri('status', { message: 'Applying configuration patches...' }); sendToTauri('status', { message: 'Applying configuration patches...' });
patcher.applyPatches(replacementsConfig); patcher.applyPatches(getReplacementsConfig());
sendToTauri('status', { message: 'Migrating security credentials...' }); sendToTauri('status', { message: 'Migrating security credentials...' });
patcher.bridgeCredentials(serviceManager.credentialManager); patcher.bridgeCredentials(serviceManager.credentialManager);
patcher.saveCurrentVersion(release.version, release.sha256); patcher.saveCurrentVersion(release.version, release.sha256);
serviceManager.envConfig = getEnvConfig();
if (fs.existsSync(tempZipPath)) { if (fs.existsSync(tempZipPath)) {
fs.unlinkSync(tempZipPath); fs.unlinkSync(tempZipPath);
} }
@@ -168,10 +212,34 @@ async function start() {
try { try {
sendToTauri('status', { message: 'Inspecting local workspace and installed files...' }); sendToTauri('status', { message: 'Inspecting local workspace and installed files...' });
const isFirstRun = !patcher.verifyExtraction(); let isFirstRun = !patcher.verifyExtraction();
const localVersion = patcher.getCurrentVersion(); let localVersion = patcher.getCurrentVersion();
const localSha = patcher.getCurrentSha(); let localSha = patcher.getCurrentSha();
debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}`); debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}, Local SHA: ${localSha}`);
const localZipPath = path.join(__dirname, 'update-payload.zip');
const localManifestPath = path.join(__dirname, 'manifest.json');
let localZipManifest = null;
if (fs.existsSync(localZipPath) && fs.existsSync(localManifestPath)) {
try { localZipManifest = JSON.parse(fs.readFileSync(localManifestPath, 'utf8')); } catch (e) { }
}
if (localZipManifest && (isFirstRun || localZipManifest.sha256 !== localSha)) {
debugLog("New local payload detected! Applying local build...");
sendToTauri('status', { message: 'Extracting local development payload...' });
patcher.purgeOldCode();
patcher.extractZipPayload(localZipPath);
patcher.applyPatches(getReplacementsConfig());
patcher.bridgeCredentials(serviceManager.credentialManager);
patcher.saveCurrentVersion(localZipManifest.version, localZipManifest.sha256);
serviceManager.envConfig = getEnvConfig();
isFirstRun = false;
localVersion = localZipManifest.version;
localSha = localZipManifest.sha256;
debugLog("Local payload applied successfully.");
}
sendToTauri('status', { message: 'Connecting to update servers...' }); sendToTauri('status', { message: 'Connecting to update servers...' });
let release = null; let release = null;
@@ -216,7 +284,7 @@ async function start() {
sendToTauri('update-available', { current: localVersion, latest: release.version }); sendToTauri('update-available', { current: localVersion, latest: release.version });
while (userDecision === null) { while (userDecision === null) {
await new Promise(r => setTimeout(r, 200)); await new Promise(r => setTimeout(r, 25));
} }
await new Promise((resolve) => tempServer.close(resolve)); await new Promise((resolve) => tempServer.close(resolve));
@@ -240,9 +308,17 @@ async function start() {
sendToTauri('status', { message: 'Extracting local baseline payload...' }); sendToTauri('status', { message: 'Extracting local baseline payload...' });
patcher.purgeOldCode(); patcher.purgeOldCode();
patcher.extractZipPayload(localZip); patcher.extractZipPayload(localZip);
patcher.applyPatches(replacementsConfig); patcher.applyPatches(getReplacementsConfig());
patcher.bridgeCredentials(serviceManager.credentialManager); 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."); debugLog("Local payload extracted successfully.");
} else { } else {
debugLog("No local payload found!"); debugLog("No local payload found!");
@@ -257,18 +333,6 @@ async function start() {
sendToTauri('status', { message: 'Loading encrypted credentials...' }); sendToTauri('status', { message: 'Loading encrypted credentials...' });
serviceManager.credentialManager.loadCredentials(); serviceManager.credentialManager.loadCredentials();
sendToTauri('status', { message: 'Checking SDK dependencies...' });
try {
require('child_process').execSync('npm install @vyla-entertainment/sdk@latest --no-save --no-audit --no-fund', {
cwd: APPDATA_DIR,
stdio: 'ignore',
windowsHide: true
});
debugLog("Vyla SDK updated to latest successfully.");
} catch (e) {
debugLog(`Failed to install Vyla SDK: ${e.message}`);
}
sendToTauri('status', { message: 'Starting background services (auth-proxy, stream-api)...' }); sendToTauri('status', { message: 'Starting background services (auth-proxy, stream-api)...' });
await serviceManager.startServices([ await serviceManager.startServices([
{ name: 'auth-proxy', relativeDir: 'auth-proxy' }, { name: 'auth-proxy', relativeDir: 'auth-proxy' },
@@ -292,9 +356,17 @@ async function start() {
res.sendStatus(200); res.sendStatus(200);
}); });
playerExpressApp.use(sameTabNavMiddleware(playerDir)); playerExpressApp.use(sameTabNavMiddleware(playerDir));
playerExpressApp.use(express.static(playerDir, { maxAge: '1d', etag: true })); playerExpressApp.use(express.static(playerDir, {
playerExpressApp.get('*', (req, res) => { res.sendFile(path.join(playerDir, 'index.html')); }); etag: false,
playerExpressServer = playerExpressApp.listen(3001, '0.0.0.0'); setHeaders: (res) => {
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
}
}));
playerExpressApp.get('*', (req, res) => {
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
res.sendFile(path.join(playerDir, 'index.html'));
});
playerExpressServer = playerExpressApp.listen(3001, '127.0.0.1');
debugLog("Player Express running on 3001"); debugLog("Player Express running on 3001");
sendToTauri('status', { message: 'Waiting for microservices to bind ports (3000, 3001, 7860)...' }); sendToTauri('status', { message: 'Waiting for microservices to bind ports (3000, 3001, 7860)...' });
@@ -316,20 +388,29 @@ async function start() {
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window }); sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
res.sendStatus(200); res.sendStatus(200);
}); });
expressApp.use(sameTabNavMiddleware(frontendDir)); expressApp.use(sameTabNavMiddleware(frontendDir));
expressApp.use(express.static(frontendDir, { maxAge: '1d', etag: true })); expressApp.use(express.static(frontendDir, {
expressApp.get('*', (req, res) => { res.sendFile(path.join(frontendDir, 'index.html')); }); 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; const FRONTEND_PORT = 4890;
expressApp.use('/build', express.static(path.join(__dirname, 'build'))); expressApp.use('/build', express.static(path.join(__dirname, 'build')));
if (playerExpressApp) { if (playerExpressApp) {
playerExpressApp.use('/build', express.static(path.join(__dirname, 'build'))); playerExpressApp.use('/build', express.static(path.join(__dirname, 'build')));
} }
expressServer = expressApp.listen(FRONTEND_PORT, '0.0.0.0', () => { expressServer = expressApp.listen(FRONTEND_PORT, '127.0.0.1', () => {
sendToTauri('status', { message: 'All backend services running and healthy.' }); sendToTauri('status', { message: 'All backend services running and healthy.' });
debugLog("Frontend Express running on 4890. Sending READY to Tauri."); debugLog("Frontend Express running on 4890. Sending READY to Tauri.");
sendToTauri('ready', { url: `http://localhost:${FRONTEND_PORT}` }); sendToTauri('ready', { url: `http://127.0.0.1:${FRONTEND_PORT}` });
}); });
} catch (error) { } catch (error) {
@@ -342,17 +423,23 @@ process.on('exit', () => {
if (serviceManager) { if (serviceManager) {
for (const name of Object.keys(serviceManager.processes)) { for (const name of Object.keys(serviceManager.processes)) {
const proc = serviceManager.processes[name]; const proc = serviceManager.processes[name];
if (proc && proc.child) { if (proc && proc.child && proc.child.pid) {
try { proc.child.kill('SIGKILL'); } catch (e) { } 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 () => { process.on('SIGINT', () => {
if (expressServer) expressServer.close(); process.exit(0);
if (playerExpressServer) playerExpressServer.close(); });
if (serviceManager) await serviceManager.stopAll(); process.on('SIGTERM', () => {
process.exit(0); process.exit(0);
}); });

View File

@@ -1,6 +1,6 @@
{ {
"name": "vyla-home", "name": "vyla-home",
"version": "1.1.6", "version": "1.1.28",
"description": "Vyla Home Desktop App Launcher", "description": "Vyla Home Desktop App Launcher",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
@@ -12,15 +12,15 @@
}, },
"dependencies": { "dependencies": {
"@tauri-apps/api": "^2.0.0", "@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", "@tauri-apps/plugin-process": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.0",
"@vyla-entertainment/sdk": "^1.11.0", "@vyla-entertainment/sdk": "^1.11.0",
"adm-zip": "^0.6.0", "adm-zip": "^0.6.0",
"express": "^4.19.2" "express": "^4.19.2"
}, },
"devDependencies": { "devDependencies": {
"@tauri-apps/cli": "^2.0.0", "@tauri-apps/cli": "^2.0.0"
"javascript-obfuscator": "^4.1.0"
}, },
"build": { "build": {
"appId": "com.vyla.home", "appId": "com.vyla.home",

View File

@@ -63,17 +63,24 @@ class Patcher {
const fullPath = path.join(this.appDataPath, dir); const fullPath = path.join(this.appDataPath, dir);
if (fs.existsSync(fullPath)) { if (fs.existsSync(fullPath)) {
try { 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) { } catch (e) {
try { try {
const trashPath = fullPath + '.trash.' + Date.now(); fs.rmSync(fullPath, { recursive: true, force: true });
fs.renameSync(fullPath, trashPath); } catch (err2) { }
} catch (renameErr) {
console.warn(`Could not remove or rename ${fullPath}. It will be overwritten.`);
}
} }
} }
} }
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) { extractZipPayload(zipPath) {
@@ -119,7 +126,7 @@ class Patcher {
return true; return true;
} }
processDirectory(dir, replacementList) { processDirectory(dir, replacementList = []) {
const files = fs.readdirSync(dir); const files = fs.readdirSync(dir);
for (const file of files) { for (const file of files) {
const fullPath = path.join(dir, file); const fullPath = path.join(dir, file);
@@ -130,33 +137,30 @@ class Patcher {
this.processDirectory(fullPath, replacementList); this.processDirectory(fullPath, replacementList);
} else if (stat.isFile()) { } else if (stat.isFile()) {
const ext = path.extname(fullPath).toLowerCase(); const ext = path.extname(fullPath).toLowerCase();
if (['.js', '.html', '.css', '.json', '.xml', '.txt'].includes(ext)) { let content = fs.readFileSync(fullPath, 'utf8');
let content = fs.readFileSync(fullPath, 'utf8'); let modified = false;
let modified = false;
for (const rep of replacementList) { for (const rep of replacementList) {
if (content.includes(rep.find)) { if (content.includes(rep.find)) {
content = content.split(rep.find).join(rep.replace); content = content.split(rep.find).join(rep.replace);
modified = true; modified = true;
}
} }
}
if (modified) { if (modified) {
fs.writeFileSync(fullPath, content, 'utf8'); fs.writeFileSync(fullPath, content, 'utf8');
}
} }
} }
} }
} }
applyPatches(replacements) { applyPatches(replacements) {
for (const [componentName, replacementList] of Object.entries(replacements)) { const targetDirs = ['frontend', 'player', 'auth-proxy', 'stream-api'];
if (!replacementList || replacementList.length === 0) continue; for (const dirName of targetDirs) {
const dirPath = path.join(this.appDataPath, dirName);
const componentDir = path.join(this.appDataPath, componentName); if (!fs.existsSync(dirPath)) continue;
if (!fs.existsSync(componentDir)) continue; const replacementList = replacements[dirName] || [];
this.processDirectory(dirPath, replacementList);
this.processDirectory(componentDir, replacementList);
} }
} }
} }

View File

@@ -78,12 +78,12 @@ function uploadFileToGitLabPackage(filePath, packageName, version, fileName) {
} }
function createGitLabRelease(tag, releaseLinks) { function createGitLabRelease(tag, releaseLinks) {
const sendRequest = (method, path, data = null) => { const sendRequest = (method, reqPath, data = null) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const options = { const options = {
hostname: 'gitlab.com', hostname: 'gitlab.com',
port: 443, port: 443,
path: path, path: reqPath,
method: method, method: method,
headers: { headers: {
'PRIVATE-TOKEN': TOKEN, 'PRIVATE-TOKEN': TOKEN,
@@ -101,19 +101,9 @@ function createGitLabRelease(tag, releaseLinks) {
res.on('data', chunk => body += chunk); res.on('data', chunk => body += chunk);
res.on('end', () => { res.on('end', () => {
if (res.statusCode >= 200 && res.statusCode < 300) { if (res.statusCode >= 200 && res.statusCode < 300) {
try { try { resolve(body ? JSON.parse(body) : {}); } catch (e) { resolve({}); }
resolve(body ? JSON.parse(body) : {});
} catch (e) {
resolve({});
}
} else if (res.statusCode === 409 && method === 'POST') {
console.log(`Release ${tag} already exists, deleting and recreating...`);
sendRequest('DELETE', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}`)
.then(() => sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, data))
.then(resolve)
.catch(reject);
} else { } else {
reject(new Error(`Failed to publish release (HTTP ${res.statusCode}): ${body}`)); reject(new Error(`HTTP ${res.statusCode}: ${body}`));
} }
}); });
}); });
@@ -133,13 +123,37 @@ function createGitLabRelease(tag, releaseLinks) {
name: `Vyla Home Release ${tag}`, name: `Vyla Home Release ${tag}`,
tag_name: tag, tag_name: tag,
ref: currentRef, ref: currentRef,
description: `Automated local release ${tag}`, description: `Automated Multi-Platform Release ${tag}`,
assets: { assets: {
links: releaseLinks links: releaseLinks
} }
}; };
return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, releaseData); 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() { async function main() {
@@ -166,7 +180,6 @@ async function main() {
if (isFullBuild) { if (isFullBuild) {
console.log('Ensuring bundled Node.js runtime...'); console.log('Ensuring bundled Node.js runtime...');
await ensureBundledNode(); await ensureBundledNode();
await ensureWebView2Loader(); await ensureWebView2Loader();
const bundleDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle'); const bundleDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle');
@@ -174,20 +187,32 @@ async function main() {
fs.rmSync(bundleDir, { recursive: true, force: true }); fs.rmSync(bundleDir, { recursive: true, force: true });
} }
console.log('Compiling Windows Tauri installer locally...'); console.log('Compiling native Tauri application...');
execSync('npm run build', { execSync('npm run build', { stdio: 'inherit' });
stdio: 'inherit'
});
const nsisDir = path.join(__dirname, 'src-tauri/target/release/bundle/nsis'); const targetVersion = version.startsWith('v') ? version.substring(1) : version;
if (fs.existsSync(nsisDir)) {
const targetVersion = version.startsWith('v') ? version.substring(1) : version;
const files = fs.readdirSync(nsisDir).filter(f => f.endsWith('.exe') && f.includes(targetVersion));
if (files.length > 0) { if (process.platform === 'win32') {
const originalName = files[0]; const nsisDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle', 'nsis');
installerPath = path.join(nsisDir, originalName); if (fs.existsSync(nsisDir)) {
installerUploadName = originalName.replace(/\s+/g, '-'); 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}`);
}
} }
} }
} }
@@ -208,19 +233,25 @@ async function main() {
if (installerPath && installerUploadName) { if (installerPath && installerUploadName) {
console.log(`Uploading installer ${installerUploadName}...`); console.log(`Uploading installer ${installerUploadName}...`);
const installerUnique = installerUploadName.replace('.exe', `-${timestamp}.exe`); const ext = path.extname(installerUploadName);
const installerUnique = installerUploadName.replace(ext, `-${timestamp}${ext}`);
const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUnique); const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUnique);
releaseLinks.push({ name: installerUploadName, url: installerUrl, link_type: 'package' }); 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...'); console.log('[3/4] Publishing GitLab Release...');
const release = await createGitLabRelease(version, releaseLinks); await createGitLabRelease(version, releaseLinks);
console.log(`[4/4] Release successfully created: ${release.name} (${release.tag_name})`); console.log(`[4/4] Release process successfully completed for ${version}!`);
} }
function ensureBundledNode() { function ensureBundledNode() {
const os = require('os');
const binDir = path.join(__dirname, 'bin'); 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 nodeVersion = 'v22.14.0';
const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`); const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`);
@@ -232,35 +263,65 @@ function ensureBundledNode() {
fs.mkdirSync(binDir, { recursive: true }); fs.mkdirSync(binDir, { recursive: true });
console.log(`Downloading standalone Node.js ${nodeVersion} runtime for bundling...`); 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) => { return new Promise((resolve, reject) => {
const fileStream = fs.createWriteStream(nodeExePath); const download = (url, dest, cb) => {
https.get(nodeUrl, (res) => { https.get(url, (res) => {
if (res.statusCode === 302 || res.statusCode === 301) { if (res.statusCode === 302 || res.statusCode === 301) {
https.get(res.headers.location, (redirectRes) => { return download(res.headers.location, dest, cb);
redirectRes.pipe(fileStream); }
fileStream.on('finish', () => { const fileStream = fs.createWriteStream(dest);
fileStream.close(); res.pipe(fileStream);
fs.writeFileSync(versionMarker, nodeVersion, 'utf8'); fileStream.on('finish', () => {
resolve(); fileStream.close();
}); cb();
}).on('error', reject); });
return; }).on('error', reject);
} };
res.pipe(fileStream);
fileStream.on('finish', () => { if (isWin) {
fileStream.close(); const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
download(nodeUrl, nodeExePath, () => {
fs.writeFileSync(versionMarker, nodeVersion, 'utf8'); fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
resolve(); resolve();
}); });
}).on('error', (err) => { } else {
try { fs.unlinkSync(nodeExePath); } catch (e) { } const arch = os.arch() === 'arm64' ? 'arm64' : 'x64';
reject(err); 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() { function ensureWebView2Loader() {
const os = require('os');
if (os.platform() !== 'win32') return Promise.resolve();
const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release'); const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release');
const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll'); const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll');
fs.mkdirSync(releaseDir, { recursive: true }); fs.mkdirSync(releaseDir, { recursive: true });

View File

@@ -21,8 +21,7 @@ class ServiceManager {
try { try {
const logPath = path.join(this.logsDir, `${name}.log`); const logPath = path.join(this.logsDir, `${name}.log`);
const timestamp = new Date().toISOString(); 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'); process.stdout.write(JSON.stringify({ event: "service-log", data: { service: name, message: line } }) + '\n');
} catch (e) { } catch (e) {
} }
@@ -97,9 +96,14 @@ class ServiceManager {
if (port) { if (port) {
try { try {
if (process.platform === 'win32') { if (process.platform === 'win32') {
require('child_process').execSync(`powershell -Command "Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force }"`, { stdio: 'ignore' }); 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 { } else {
require('child_process').execSync(`fuser -k -9 ${port}/tcp`, { stdio: 'ignore' }); require('child_process').spawnSync('fuser', ['-k', '-9', `${port}/tcp`], { stdio: 'ignore' });
} }
} catch (_) { } } catch (_) { }
} }
@@ -189,7 +193,7 @@ class ServiceManager {
}); });
if (connected) return true; 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}`); throw new Error(`Timeout waiting for port ${port}`);
} }

70
src-tauri/Cargo.lock generated
View File

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

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "vyla-home" name = "vyla-home"
version = "1.1.6" version = "1.1.28"
description = "Vyla Home Desktop App Launcher" description = "Vyla Home Desktop App Launcher"
edition = "2021" edition = "2021"
@@ -14,5 +14,19 @@ tauri-plugin-process = "2"
tauri-plugin-shell = "2" tauri-plugin-shell = "2"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
url = "2"
base64 = "0.22" 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

13
src-tauri/Info.plist Normal file
View File

@@ -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>

View File

@@ -1,3 +1,20 @@
fn main() { fn main() {
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);
}
}
}
tauri_build::build(); tauri_build::build();
} }

View File

@@ -7,26 +7,19 @@ use tauri::{Emitter, Manager, State, WebviewUrl, WebviewWindowBuilder};
fn debug_log(msg: &str) { fn debug_log(msg: &str) {
let log_dir = if let Ok(app_data) = std::env::var("APPDATA") { let log_dir = if let Ok(app_data) = std::env::var("APPDATA") {
std::path::PathBuf::from(app_data) std::path::PathBuf::from(app_data).join("vyla-home").join("vyla-home-files").join("logs")
.join("vyla-home") } else if let Ok(home) = std::env::var("HOME") {
.join("vyla-home-files") std::path::PathBuf::from(home).join("Library").join("Logs").join("VylaHome")
.join("logs")
} else if let Ok(user_profile) = std::env::var("USERPROFILE") { } else if let Ok(user_profile) = std::env::var("USERPROFILE") {
std::path::PathBuf::from(user_profile) std::path::PathBuf::from(user_profile).join(".vyla-home").join("logs")
.join(".vyla-home")
.join("logs")
} else { } else {
std::path::PathBuf::from("logs") std::env::temp_dir().join("vyla-home-logs")
}; };
let _ = std::fs::create_dir_all(&log_dir); let _ = std::fs::create_dir_all(&log_dir);
let log_path = log_dir.join("rust-debug.log"); let log_path = log_dir.join("rust-debug.log");
if let Ok(mut file) = std::fs::OpenOptions::new() if let Ok(mut file) = std::fs::OpenOptions::new().create(true).append(true).open(&log_path) {
.create(true)
.append(true)
.open(&log_path)
{
use std::io::Write; use std::io::Write;
let _ = writeln!(file, "[RUST] {}", msg); let _ = writeln!(file, "[RUST] {}", msg);
} }
@@ -49,84 +42,39 @@ fn clean_path(path: &std::path::Path) -> String {
} }
} }
#[cfg(windows)] fn kill_child_process(child: &mut Child) {
fn kill_processes_on_ports(ports: &[u16]) { #[cfg(windows)]
use std::os::windows::process::CommandExt; {
const CREATE_NO_WINDOW: u32 = 0x08000000; use std::os::windows::process::CommandExt;
const CREATE_NO_WINDOW: u32 = 0x08000000;
let output = Command::new("netstat") let _ = Command::new("taskkill")
.args(["-ano", "-p", "tcp"]) .args(&["/F", "/T", "/PID", &child.id().to_string()])
.creation_flags(CREATE_NO_WINDOW) .creation_flags(CREATE_NO_WINDOW)
.output();
if let Ok(out) = output {
let text = String::from_utf8_lossy(&out.stdout);
for line in text.lines() {
for port in ports {
let pattern = format!(":{}", port);
if line.contains(&pattern) && line.contains("LISTENING") {
if let Some(pid_str) = line.split_whitespace().last() {
if let Ok(pid) = pid_str.parse::<u32>() {
if pid > 0 && pid != std::process::id() {
let _ = Command::new("taskkill")
.args(["/PID", &pid.to_string(), "/T", "/F"])
.creation_flags(CREATE_NO_WINDOW)
.output();
}
}
}
}
}
}
}
}
#[cfg(not(windows))]
fn kill_processes_on_ports(ports: &[u16]) {
for port in ports {
let _ = Command::new("sh")
.arg("-c")
.arg(format!(
"fuser -k -9 {}/tcp 2>/dev/null || lsof -ti :{} | xargs -r kill -9",
port, port
))
.output(); .output();
} }
} let _ = child.kill();
let _ = child.wait();
#[cfg(windows)]
fn kill_process_tree(pid: u32) {
use std::os::windows::process::CommandExt;
const CREATE_NO_WINDOW: u32 = 0x08000000;
let _ = Command::new("taskkill")
.args(["/PID", &pid.to_string(), "/T", "/F"])
.creation_flags(CREATE_NO_WINDOW)
.output();
kill_processes_on_ports(&[3000, 3001, 4890, 4891, 4892, 7860]);
}
#[cfg(not(windows))]
fn kill_process_tree(pid: u32) {
unsafe {
libc_kill_pgid(pid);
}
kill_processes_on_ports(&[3000, 3001, 4890, 4891, 4892, 7860]);
}
#[cfg(not(windows))]
unsafe fn libc_kill_pgid(pid: u32) {
let _ = Command::new("kill")
.args(["-9", &format!("-{}", pid)])
.output();
} }
fn find_node_binary(app: &tauri::App) -> Option<String> { fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Ok(resource_dir) = app.path().resource_dir() { if let Ok(resource_dir) = app.path().resource_dir() {
#[cfg(windows)]
let candidates = [ let candidates = [
resource_dir.join("bin").join("node.exe"), resource_dir.join("bin").join("node.exe"),
resource_dir.join("node.exe"), resource_dir.join("node.exe"),
resource_dir.join("_up_").join("bin").join("node.exe"), resource_dir.join("_up_").join("bin").join("node.exe"),
resource_dir.join("_up_").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 { for candidate in candidates {
if candidate.exists() { if candidate.exists() {
@@ -139,9 +87,13 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Some(parent) = exe_path.parent() { if let Some(parent) = exe_path.parent() {
let candidates = [ let candidates = [
parent.join("bin").join("node.exe"), parent.join("bin").join("node.exe"),
parent.join("bin").join("node"),
parent.join("node.exe"), parent.join("node.exe"),
parent.join("node"),
parent.join("resources").join("bin").join("node.exe"), 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.exe"),
parent.join("resources").join("node"),
]; ];
for candidate in candidates { for candidate in candidates {
if candidate.exists() { if candidate.exists() {
@@ -153,9 +105,13 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
if let Ok(path_var) = std::env::var("PATH") { if let Ok(path_var) = std::env::var("PATH") {
for p in std::env::split_paths(&path_var) { for p in std::env::split_paths(&path_var) {
let candidate = p.join("node.exe"); let node_exe = p.join("node.exe");
if candidate.exists() { if node_exe.exists() {
return Some(clean_path(&candidate)); return Some(clean_path(&node_exe));
}
let node = p.join("node");
if node.exists() {
return Some(clean_path(&node));
} }
} }
} }
@@ -184,6 +140,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 None
} }
@@ -192,6 +164,7 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
let candidates = vec![ let candidates = vec![
resource_dir.join("main.js"), resource_dir.join("main.js"),
resource_dir.join("_up_").join("main.js"), resource_dir.join("_up_").join("main.js"),
resource_dir.join("up").join("main.js"),
]; ];
for candidate in candidates { for candidate in candidates {
@@ -262,17 +235,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
const style = document.createElement('style'); const style = document.createElement('style');
style.innerHTML = ` style.innerHTML = `
#vyla-nav-filter-svg {
position: fixed !important;
top: 0 !important;
left: 0 !important;
width: 0 !important;
height: 0 !important;
pointer-events: none !important;
opacity: 0 !important;
z-index: -1 !important;
}
#vyla-floating-nav { #vyla-floating-nav {
position: fixed !important; position: fixed !important;
top: 12px !important; top: 12px !important;
@@ -284,7 +246,7 @@ const LINK_HANDLER_SCRIPT: &str = r##"
display: flex !important; display: flex !important;
align-items: center !important; align-items: center !important;
background: rgba(255, 255, 255, 0.04) !important; background: rgba(255, 255, 255, 0.04) !important;
backdrop-filter: url(#vyla-glass-filter) blur(16px) saturate(1.8) contrast(1.1) !important; backdrop-filter: blur(16px) saturate(1.8) contrast(1.1) !important;
-webkit-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; 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; transition: width 0.3s cubic-bezier(0.16, 1, 0.3, 1), padding 0.3s cubic-bezier(0.16, 1, 0.3, 1) !important;
@@ -364,7 +326,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
} }
.vyla-nav-btn:hover { .vyla-nav-btn:hover {
transform: scale(1.15) !important;
opacity: 1 !important; opacity: 1 !important;
} }
@@ -432,26 +393,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
`; `;
document.head.appendChild(style); document.head.appendChild(style);
const filterSvg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
filterSvg.id = 'vyla-nav-filter-svg';
filterSvg.innerHTML = `
<defs>
<filter id="vyla-glass-filter" color-interpolation-filters="sRGB" x="0%" y="0%" width="100%" height="100%">
<feImage id="vyla-nav-fe-img" x="0" y="0" width="100%" height="100%" preserveAspectRatio="none" result="map" />
<feDisplacementMap id="vyla-nav-red" in="SourceGraphic" in2="map" result="dispRed" />
<feColorMatrix in="dispRed" type="matrix" values="1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0" result="red" />
<feDisplacementMap id="vyla-nav-green" in="SourceGraphic" in2="map" result="dispGreen" />
<feColorMatrix in="dispGreen" type="matrix" values="0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0" result="green" />
<feDisplacementMap id="vyla-nav-blue" in="SourceGraphic" in2="map" result="dispBlue" />
<feColorMatrix in="dispBlue" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0" result="blue" />
<feBlend in="red" in2="green" mode="screen" result="rg" />
<feBlend in="rg" in2="blue" mode="screen" result="output" />
<feGaussianBlur in="output" stdDeviation="0.8" />
</filter>
</defs>
`;
document.body.appendChild(filterSvg);
const nav = document.createElement('div'); const nav = document.createElement('div');
nav.id = 'vyla-floating-nav'; nav.id = 'vyla-floating-nav';
nav.innerHTML = ` nav.innerHTML = `
@@ -484,54 +425,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
}; };
} }
const feImage = document.getElementById('vyla-nav-fe-img');
const redChannel = document.getElementById('vyla-nav-red');
const greenChannel = document.getElementById('vyla-nav-green');
const blueChannel = document.getElementById('vyla-nav-blue');
function generateNavMap() {
const rect = nav.getBoundingClientRect();
const w = Math.round(rect.width) || 42;
const h = Math.round(rect.height) || 42;
const edgeSize = Math.min(w, h) * 0.08;
const svgContent = `
<svg viewBox="0 0 ${w} ${h}" xmlns="http://www.w3.org/2000/svg">
<defs>
<linearGradient id="vyla-nav-red-g" x1="100%" y1="0%" x2="0%" y2="0%">
<stop offset="0%" stop-color="#000000" stop-opacity="0"/>
<stop offset="100%" stop-color="red"/>
</linearGradient>
<linearGradient id="vyla-nav-blue-g" x1="0%" y1="0%" x2="0%" y2="100%">
<stop offset="0%" stop-color="#000000" stop-opacity="0"/>
<stop offset="100%" stop-color="blue"/>
</linearGradient>
</defs>
<rect width="${w}" height="${h}" fill="black"/>
<rect width="${w}" height="${h}" rx="9999" fill="url(#vyla-nav-red-g)"/>
<rect width="${w}" height="${h}" rx="9999" fill="url(#vyla-nav-blue-g)" style="mix-blend-mode: screen;"/>
<rect x="${edgeSize}" y="${edgeSize}" width="${w - edgeSize * 2}" height="${h - edgeSize * 2}" rx="9999" fill="rgba(255,255,255,0.4)" style="filter: blur(4px);"/>
</svg>
`;
return "data:image/svg+xml," + encodeURIComponent(svgContent);
}
function updateNavGlass() {
if (!feImage) return;
feImage.setAttribute("href", generateNavMap());
const distortionScale = -180;
redChannel.setAttribute("scale", distortionScale - 10);
greenChannel.setAttribute("scale", distortionScale);
blueChannel.setAttribute("scale", distortionScale + 10);
[redChannel, greenChannel, blueChannel].forEach((ch) => {
ch.setAttribute("xChannelSelector", "R");
ch.setAttribute("yChannelSelector", "G");
});
}
updateNavGlass();
const obs = new ResizeObserver(() => setTimeout(updateNavGlass, 0));
obs.observe(nav);
const tb = document.createElement('div'); const tb = document.createElement('div');
tb.id = 'tauri-custom-titlebar'; tb.id = 'tauri-custom-titlebar';
tb.innerHTML = ` tb.innerHTML = `
@@ -562,12 +455,17 @@ const LINK_HANDLER_SCRIPT: &str = r##"
} }
} }
if (document.readyState === 'loading') { if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', injectLiquidNavBar); document.addEventListener('DOMContentLoaded', injectLiquidNavBar);
} else { } else {
injectLiquidNavBar(); injectLiquidNavBar();
} }
setInterval(injectLiquidNavBar, 1000); const navObserver = new MutationObserver(() => {
if (!document.getElementById('vyla-floating-nav')) {
injectLiquidNavBar();
}
});
navObserver.observe(document.documentElement, { childList: true, subtree: true });
"##; "##;
#[tauri::command] #[tauri::command]
@@ -605,9 +503,9 @@ fn open_new_window(app: tauri::AppHandle, url: String) -> Result<(), String> {
let final_url = if url.starts_with("http") || url.starts_with("tauri://") { let final_url = if url.starts_with("http") || url.starts_with("tauri://") {
url.clone() url.clone()
} else if url.starts_with('/') { } else if url.starts_with('/') {
format!("http://localhost:4890{}", url) format!("http://127.0.0.1:4890{}", url)
} else { } else {
format!("http://localhost:4890/{}", url) format!("http://127.0.0.1:4890/{}", url)
}; };
if let Some(window) = app.get_webview_window("main") { if let Some(window) = app.get_webview_window("main") {
@@ -623,6 +521,30 @@ fn open_new_window(app: tauri::AppHandle, url: String) -> Result<(), String> {
} }
} }
#[tauri::command]
async fn kill_orphans() -> Result<(), String> {
debug_log("[KILL] User requested orphan process kill");
#[cfg(windows)]
{
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] #[tauri::command]
fn get_logo_base64(app: tauri::AppHandle) -> Result<String, String> { fn get_logo_base64(app: tauri::AppHandle) -> Result<String, String> {
use std::io::Read; use std::io::Read;
@@ -669,45 +591,110 @@ fn main() {
win_close, win_close,
win_drag, win_drag,
open_new_window, open_new_window,
get_logo_base64 get_logo_base64,
kill_orphans
]) ])
.manage(NodeServices(Mutex::new(None))) .manage(NodeServices(Mutex::new(None)))
.setup(|app| { .setup(|app| {
debug_log("Tauri setup started"); debug_log("Tauri setup started");
kill_processes_on_ports(&[3000, 3001, 4890, 4891, 4892, 7860]);
let app_data = app.path().app_data_dir().unwrap_or_default(); let app_data = app.path().app_data_dir().unwrap_or_default();
let app_data_str = clean_path(&app_data);
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 version_file = vyla_files.join("version.json");
let current_app_version = app.package_info().version.to_string();
let mut version_mismatch = false;
if version_file.exists() {
if let Ok(content) = std::fs::read_to_string(&version_file) {
if let Ok(json) = serde_json::from_str::<serde_json::Value>(&content) {
if let Some(version) = json.get("version").and_then(|v| v.as_str()) {
if version != current_app_version {
version_mismatch = true;
}
} else {
version_mismatch = true;
}
} else {
version_mismatch = true;
}
}
}
if version_mismatch {
debug_log(&format!("App version updated to {}. Cleaning old files.", current_app_version));
let dirs_to_remove = ["frontend", "player", "stream-api", "auth-proxy", "config"];
for d in dirs_to_remove {
let _ = std::fs::remove_dir_all(vyla_files.join(d));
}
let _ = std::fs::remove_file(&version_file);
}
let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into())) let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
.title("Vyla Home") .title("Vyla Home")
.inner_size(1280.0, 800.0) .inner_size(1280.0, 800.0)
.decorations(false) .decorations(false)
.transparent(true)
.resizable(true) .resizable(true)
.devtools(true) .devtools(true)
.initialization_script("window.__VYLA_WINDOW_LABEL = 'main';") .initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
.initialization_script(LINK_HANDLER_SCRIPT) .initialization_script(LINK_HANDLER_SCRIPT)
.build()?; .build()?;
#[cfg(target_os = "macos")]
{
use objc2::msg_send;
use objc2::runtime::AnyObject;
let _ = window.with_webview(|webview| unsafe {
let wk_webview = webview.inner() as *mut AnyObject;
let config: *mut AnyObject = msg_send![wk_webview, configuration];
let _: () = msg_send![config, setUpgradeKnownHostsToHTTPS: false];
});
}
let (main_js, root_dir) = resolve_script_and_root(app); let (main_js, root_dir) = resolve_script_and_root(app);
debug_log("Searching for node binary...");
let node_bin = match find_node_binary(app) { let node_bin = match find_node_binary(app) {
Some(bin) => bin, Some(bin) => {
debug_log(&format!("Found node binary: {}", bin));
bin
}
None => { None => {
let _ = window.emit( debug_log("FATAL: No node binary found in bundle or PATH.");
"error", std::thread::sleep(std::time::Duration::from_millis(600));
serde_json::json!({ let _ = window.eval("document.getElementById('status-message').textContent='Error: Node runtime missing. Please reinstall.';");
"message": "Node.js runtime not found. Please ensure Node.js is installed or bundled correctly." 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(()); 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); let mut cmd = Command::new(&node_bin);
cmd.arg(&main_js) cmd.arg(&main_js)
.current_dir(&root_dir) .current_dir(&root_dir)
.env("APPDATA_PATH", &app_data_str) .env("APPDATA_PATH", &vyla_files_str)
.env("NODE_EXE", &node_bin) .env("NODE_EXE", &node_bin)
.stdin(Stdio::piped())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.stderr(Stdio::piped()); .stderr(Stdio::piped());
@@ -725,11 +712,15 @@ fn main() {
child.id() child.id()
)); ));
if let Some(stderr) = child.stderr.take() { if let Some(stderr) = child.stderr.take() {
let w = window.clone();
std::thread::spawn(move || { std::thread::spawn(move || {
use std::io::{BufRead, BufReader}; use std::io::{BufRead, BufReader};
let reader = BufReader::new(stderr); let reader = BufReader::new(stderr);
for line in reader.lines().flatten() { for line in reader.lines().flatten() {
debug_log(&format!("[NODE STDERR] {}", line)); 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) }));
}
} }
}); });
} }
@@ -878,9 +869,15 @@ fn main() {
window_label window_label
)); ));
} }
} else { } else if msg.event == "ready" {
let _ = w.emit(&msg.event, msg.data.clone()); if let Some(url_str) = msg.data.get("url").and_then(|u| u.as_str()) {
} if let Ok(url_parsed) = url_str.parse::<tauri::Url>() {
let _ = w.navigate(url_parsed);
}
}
} else {
let _ = w.emit(&msg.event, msg.data.clone());
}
} }
} }
}); });
@@ -893,32 +890,27 @@ fn main() {
} }
Err(e) => { Err(e) => {
debug_log(&format!("Failed to spawn node: {}", e)); debug_log(&format!("Failed to spawn node: {}", e));
let _ = window.emit( let emsg = format!("Failed to spawn node: {}", e);
"error", let js = format!(
serde_json::json!({ "document.getElementById('status-message').textContent='Spawn Error';var b=document.getElementById('debug-log-box');b.style.display='block';b.textContent={};",
"message": format!("Failed to launch backend runtime: {}", e) serde_json::to_string(&emsg).unwrap_or_default()
}),
); );
let _ = window.eval(&js);
} }
} }
Ok(()) Ok(())
}) })
.on_window_event(|window, event| { .on_window_event(|window, event| {
if let tauri::WindowEvent::Destroyed = event { if let tauri::WindowEvent::Destroyed = event {
if window.label() == "main" { if window.label() == "main" {
let state: State<NodeServices> = window.state(); let state: State<NodeServices> = window.state();
if let Ok(mut lock) = state.0.lock() { if let Ok(mut lock) = state.0.lock() {
if let Some(child) = lock.take() { if let Some(mut child) = lock.take() {
let pid = child.id(); debug_log("[SHUTDOWN] Main window destroyed, terminating node process natively");
debug_log(&format!( kill_child_process(&mut child);
"[SHUTDOWN] Main window destroyed, killing process tree for PID {}",
pid
));
kill_process_tree(pid);
} }
}; };
kill_processes_on_ports(&[3000, 3001, 4890, 4891, 4892, 7860]);
} }
} }
}) })

View File

@@ -1,7 +1,7 @@
{ {
"$schema": "https://schema.tauri.app/config/2", "$schema": "https://schema.tauri.app/config/2",
"productName": "Vyla Home", "productName": "Vyla Home",
"version": "1.1.6", "version": "1.1.28",
"identifier": "com.vyla.home", "identifier": "com.vyla.home",
"build": { "build": {
"frontendDist": "../ui" "frontendDist": "../ui"
@@ -9,7 +9,7 @@
"app": { "app": {
"withGlobalTauri": true, "withGlobalTauri": true,
"security": { "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": { "bundle": {
@@ -22,6 +22,10 @@
"icons/icon.icns", "icons/icon.icns",
"icons/icon.ico" "icons/icon.ico"
], ],
"macOS": {
"exceptionDomain": "localhost",
"infoPlist": "Info.plist"
},
"windows": { "windows": {
"webviewInstallMode": { "webviewInstallMode": {
"type": "downloadBootstrapper" "type": "downloadBootstrapper"
@@ -29,8 +33,9 @@
}, },
"resources": [ "resources": [
"WebView2Loader.dll", "WebView2Loader.dll",
"../bin/*", "../bin/**/*",
"../main.js", "../main.js",
"../preload.js",
"../service-manager.js", "../service-manager.js",
"../patcher.js", "../patcher.js",
"../crypto-utils.js", "../crypto-utils.js",

View File

@@ -195,40 +195,13 @@
<div class="loader-container"> <div class="loader-container">
<div class="loader-card"> <div class="loader-card">
<div class="status-text" id="status-message">Starting runtime engine...</div> <div class="status-text" id="status-message">Starting runtime engine...</div>
<div id="debug-log-box"
style="display: none; width: 100%; max-height: 180px; overflow-y: auto; background: rgba(255, 50, 50, 0.12); border: 1px solid rgba(255, 100, 100, 0.3); border-radius: 8px; padding: 12px; font-family: monospace; font-size: 12px; color: #fca5a5; text-align: left; white-space: pre-wrap; word-break: break-all; margin-bottom: 20px; user-select: text;">
</div>
<div class="progress-track" id="progress-track" style="display: none;"> <div class="progress-track" id="progress-track" style="display: none;">
<div class="progress-fill" id="progress-fill"></div> <div class="progress-fill" id="progress-fill"></div>
</div> </div>
<div class="button-group" id="launch-actions" style="display: none; margin-top: 8px;">
<div class="glass-surface glass-surface--fallback liquid-glass-btn">
<svg class="glass-surface__filter" xmlns="http://www.w3.org/2000/svg">
<defs>
<filter id="glass-filter-launch" color-interpolation-filters="sRGB" x="0%" y="0%"
width="100%" height="100%">
<feImage class="fe-image" x="0" y="0" width="100%" height="100%"
preserveAspectRatio="none" result="map" />
<feDisplacementMap class="redchannel" in="SourceGraphic" in2="map" result="dispRed" />
<feColorMatrix in="dispRed" type="matrix"
values="1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0" result="red" />
<feDisplacementMap class="greenchannel" in="SourceGraphic" in2="map"
result="dispGreen" />
<feColorMatrix in="dispGreen" type="matrix"
values="0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0" result="green" />
<feDisplacementMap class="bluechannel" in="SourceGraphic" in2="map" result="dispBlue" />
<feColorMatrix in="dispBlue" type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0" result="blue" />
<feBlend in="red" in2="green" mode="screen" result="rg" />
<feBlend in="rg" in2="blue" mode="screen" result="output" />
<feGaussianBlur class="gaussianBlur" in="output" stdDeviation="0" />
</filter>
</defs>
</svg>
<div class="glass-surface__content">
<button class="glass-button" id="btn-launch-vyla">Launch Vyla Home</button>
</div>
</div>
</div>
<div class="button-group" id="update-actions" style="display: none;"> <div class="button-group" id="update-actions" style="display: none;">
<div class="glass-surface glass-surface--fallback liquid-glass-btn"> <div class="glass-surface glass-surface--fallback liquid-glass-btn">
<svg class="glass-surface__filter" xmlns="http://www.w3.org/2000/svg"> <svg class="glass-surface__filter" xmlns="http://www.w3.org/2000/svg">
@@ -286,23 +259,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="view-error" class="view-state">
<div class="container">
<svg class="icon icon-error" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<circle cx="12" cy="12" r="10" />
<line x1="12" y1="7" x2="12" y2="13" />
<circle cx="12" cy="17" r="1" />
</svg>
<h1>Couldn't start Vyla Home</h1>
<p id="error-msg"></p>
<div class="buttons">
<button class="primary" onclick="location.reload()">Try Again</button>
</div>
</div> </div>
</div> </div>
@@ -314,61 +271,66 @@
console.warn("OGL Shader background failed to load (offline):", err); console.warn("OGL Shader background failed to load (offline):", err);
} }
if (!window.__OGL_LOADED__) { window.dispatchEvent(new Event('ogl-ready'));
document.body.style.background = "radial-gradient(circle at 80% 20%, #1e1b4b 0%, #050505 70%)"; </script>
} else {
const { Renderer, Program, Triangle, Mesh } = window.__OGL_LOADED__;
const rayContainer = document.getElementById("side-rays");
const settings = {
speed: 2.5,
rayColor1: "#EAB308",
rayColor2: "#96c8ff",
intensity: 2,
spread: 2,
origin: "top-right",
tilt: 0,
saturation: 1.5,
blend: 0.75,
falloff: 1.6,
opacity: 1
};
function hexToRgb(hex) { <script>
const match = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); window.addEventListener('ogl-ready', () => {
if (!match) return [1, 1, 1]; if (!window.__OGL_LOADED__) {
return [ document.body.style.background = "radial-gradient(circle at 80% 20%, #1e1b4b 0%, #050505 70%)";
parseInt(match[1], 16) / 255, } else {
parseInt(match[2], 16) / 255, const { Renderer, Program, Triangle, Mesh } = window.__OGL_LOADED__;
parseInt(match[3], 16) / 255 const rayContainer = document.getElementById("side-rays");
]; const settings = {
} speed: 2.5,
rayColor1: "#EAB308",
rayColor2: "#96c8ff",
intensity: 2,
spread: 2,
origin: "top-right",
tilt: 0,
saturation: 1.5,
blend: 0.75,
falloff: 1.6,
opacity: 1
};
function originToFlip(origin) { function hexToRgb(hex) {
switch (origin) { const match = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
case "top-left": return [1, 0]; if (!match) return [1, 1, 1];
case "bottom-right": return [0, 1]; return [
case "bottom-left": return [1, 1]; parseInt(match[1], 16) / 255,
default: return [0, 0]; parseInt(match[2], 16) / 255,
parseInt(match[3], 16) / 255
];
} }
}
const renderer = new Renderer({ function originToFlip(origin) {
dpr: Math.min(window.devicePixelRatio, 2), switch (origin) {
alpha: true case "top-left": return [1, 0];
}); case "bottom-right": return [0, 1];
const gl = renderer.gl; case "bottom-left": return [1, 1];
gl.canvas.style.width = "100%"; default: return [0, 0];
gl.canvas.style.height = "100%"; }
rayContainer.appendChild(gl.canvas); }
const vertexShader = ` const renderer = new Renderer({
dpr: Math.min(window.devicePixelRatio, 2),
alpha: true
});
const gl = renderer.gl;
gl.canvas.style.width = "100%";
gl.canvas.style.height = "100%";
rayContainer.appendChild(gl.canvas);
const vertexShader = `
attribute vec2 position; attribute vec2 position;
void main() { void main() {
gl_Position = vec4(position, 0.0, 1.0); gl_Position = vec4(position, 0.0, 1.0);
} }
`; `;
const fragmentShader = ` const fragmentShader = `
precision highp float; precision highp float;
uniform float iTime; uniform float iTime;
uniform vec2 iResolution; uniform vec2 iResolution;
@@ -429,77 +391,77 @@ void main() {
} }
`; `;
const [flipX, flipY] = originToFlip(settings.origin); const [flipX, flipY] = originToFlip(settings.origin);
const uniforms = { const uniforms = {
iTime: { value: 0 }, iTime: { value: 0 },
iResolution: { value: [1, 1] }, iResolution: { value: [1, 1] },
iSpeed: { value: settings.speed }, iSpeed: { value: settings.speed },
iRayColor1: { value: hexToRgb(settings.rayColor1) }, iRayColor1: { value: hexToRgb(settings.rayColor1) },
iRayColor2: { value: hexToRgb(settings.rayColor2) }, iRayColor2: { value: hexToRgb(settings.rayColor2) },
iIntensity: { value: settings.intensity }, iIntensity: { value: settings.intensity },
iSpread: { value: settings.spread }, iSpread: { value: settings.spread },
iFlipX: { value: flipX }, iFlipX: { value: flipX },
iFlipY: { value: flipY }, iFlipY: { value: flipY },
iTilt: { value: settings.tilt }, iTilt: { value: settings.tilt },
iSaturation: { value: settings.saturation }, iSaturation: { value: settings.saturation },
iBlend: { value: settings.blend }, iBlend: { value: settings.blend },
iFalloff: { value: settings.falloff }, iFalloff: { value: settings.falloff },
iOpacity: { value: settings.opacity } iOpacity: { value: settings.opacity }
}; };
const geometry = new Triangle(gl); const geometry = new Triangle(gl);
const program = new Program(gl, { vertex: vertexShader, fragment: fragmentShader, uniforms }); const program = new Program(gl, { vertex: vertexShader, fragment: fragmentShader, uniforms });
const mesh = new Mesh(gl, { geometry, program }); const mesh = new Mesh(gl, { geometry, program });
function resize() { function resize() {
const width = rayContainer.clientWidth; const width = rayContainer.clientWidth;
const height = rayContainer.clientHeight; const height = rayContainer.clientHeight;
renderer.dpr = Math.min(window.devicePixelRatio, 2); renderer.dpr = Math.min(window.devicePixelRatio, 2);
renderer.setSize(width, height); renderer.setSize(width, height);
uniforms.iResolution.value = [width * renderer.dpr, height * renderer.dpr]; uniforms.iResolution.value = [width * renderer.dpr, height * renderer.dpr];
} }
window.addEventListener("resize", resize); window.addEventListener("resize", resize);
resize(); resize();
function animate(time) { function animate(time) {
uniforms.iTime.value = time * 0.001; uniforms.iTime.value = time * 0.001;
renderer.render({ scene: mesh }); renderer.render({ scene: mesh });
requestAnimationFrame(animate);
}
requestAnimationFrame(animate); requestAnimationFrame(animate);
}
requestAnimationFrame(animate);
function initLiquidButtons() { function initLiquidButtons() {
const borderWidth = 0.16; const borderWidth = 0.16;
const brightness = 35; const brightness = 35;
const opacity = 0.55; const opacity = 0.55;
const blur = 4; const blur = 4;
const displace = 1.2; const displace = 1.2;
const borderRadius = 9999; const borderRadius = 9999;
const distortionScale = -380; const distortionScale = -380;
const redOffset = -25; const redOffset = -25;
const greenOffset = 0; const greenOffset = 0;
const blueOffset = 25; const blueOffset = 25;
const xChannel = "R"; const xChannel = "R";
const yChannel = "G"; const yChannel = "G";
const mixBlendMode = "screen"; const mixBlendMode = "screen";
document.querySelectorAll(".liquid-glass-btn").forEach((btn, index) => { document.querySelectorAll(".liquid-glass-btn").forEach((btn, index) => {
const filterId = `glass-filter-${index + 1}`; const filterId = `glass-filter-${index + 1}`;
btn.style.setProperty("--filter-id", `url(#${filterId})`); btn.style.setProperty("--filter-id", `url(#${filterId})`);
const feImage = btn.querySelector(".fe-image"); const feImage = btn.querySelector(".fe-image");
const redChannel = btn.querySelector(".redchannel"); const redChannel = btn.querySelector(".redchannel");
const greenChannel = btn.querySelector(".greenchannel"); const greenChannel = btn.querySelector(".greenchannel");
const blueChannel = btn.querySelector(".bluechannel"); const blueChannel = btn.querySelector(".bluechannel");
const gaussianBlur = btn.querySelector(".gaussianBlur"); const gaussianBlur = btn.querySelector(".gaussianBlur");
function generateDisplacementMap() { function generateDisplacementMap() {
const rect = btn.getBoundingClientRect(); const rect = btn.getBoundingClientRect();
const actualWidth = rect.width || 140; const actualWidth = rect.width || 140;
const actualHeight = rect.height || 48; const actualHeight = rect.height || 48;
const svgContent = ` const svgContent = `
<svg viewBox="0 0 ${actualWidth} ${actualHeight}" xmlns="http://www.w3.org/2000/svg"> <svg viewBox="0 0 ${actualWidth} ${actualHeight}" xmlns="http://www.w3.org/2000/svg">
<defs> <defs>
<linearGradient id="red-grad-${index}" x1="100%" y1="0%" x2="0%" y2="0%"> <linearGradient id="red-grad-${index}" x1="100%" y1="0%" x2="0%" y2="0%">
@@ -516,36 +478,38 @@ void main() {
<rect width="${actualWidth}" height="${actualHeight}" rx="${borderRadius}" fill="url(#blue-grad-${index})" style="mix-blend-mode:${mixBlendMode}"/> <rect width="${actualWidth}" height="${actualHeight}" rx="${borderRadius}" fill="url(#blue-grad-${index})" style="mix-blend-mode:${mixBlendMode}"/>
</svg> </svg>
`; `;
return "data:image/svg+xml," + encodeURIComponent(svgContent); return "data:image/svg+xml," + encodeURIComponent(svgContent);
} }
function update() { function update() {
feImage.setAttribute("href", generateDisplacementMap()); feImage.setAttribute("href", generateDisplacementMap());
redChannel.setAttribute("scale", distortionScale + redOffset); redChannel.setAttribute("scale", distortionScale + redOffset);
greenChannel.setAttribute("scale", distortionScale + greenOffset); greenChannel.setAttribute("scale", distortionScale + greenOffset);
blueChannel.setAttribute("scale", distortionScale + blueOffset); blueChannel.setAttribute("scale", distortionScale + blueOffset);
[redChannel, greenChannel, blueChannel].forEach((ch) => { [redChannel, greenChannel, blueChannel].forEach((ch) => {
ch.setAttribute("xChannelSelector", xChannel); ch.setAttribute("xChannelSelector", xChannel);
ch.setAttribute("yChannelSelector", yChannel); ch.setAttribute("yChannelSelector", yChannel);
}); });
gaussianBlur.setAttribute("stdDeviation", displace); gaussianBlur.setAttribute("stdDeviation", displace);
} }
update(); update();
btn.classList.remove("glass-surface--fallback"); btn.classList.remove("glass-surface--fallback");
btn.classList.add("glass-surface--svg"); btn.classList.add("glass-surface--svg");
const observer = new ResizeObserver(() => setTimeout(update, 0)); const observer = new ResizeObserver(() => setTimeout(update, 0));
observer.observe(btn); observer.observe(btn);
}); });
}
initLiquidButtons();
} }
});
initLiquidButtons();
}
</script> </script>
<script> <script>
const statusEl = document.getElementById("status-message"); const statusEl = document.getElementById("status-message");
const debugBox = document.getElementById("debug-log-box");
const progressTrack = document.getElementById("progress-track"); const progressTrack = document.getElementById("progress-track");
const progressFill = document.getElementById("progress-fill"); const progressFill = document.getElementById("progress-fill");
const actionsEl = document.getElementById("update-actions"); const actionsEl = document.getElementById("update-actions");
@@ -570,20 +534,24 @@ void main() {
}); });
} }
const launchActionsEl = document.getElementById("launch-actions"); function showDebug(msg) {
const btnLaunch = document.getElementById("btn-launch-vyla"); if (!debugBox) return;
let readyUrl = null; debugBox.style.display = "block";
debugBox.textContent = msg;
btnLaunch.addEventListener("click", () => { }
if (readyUrl) {
setStatus("Launching...");
window.location.href = readyUrl;
}
});
async function initTauriEvents() { async function initTauriEvents() {
const eventApi = window.__TAURI__?.event || window.__TAURI_INTERNALS__; let eventApi = null;
if (!eventApi || typeof eventApi.listen !== 'function') {
if (window.__TAURI__?.event && typeof window.__TAURI__.event.listen === 'function') {
eventApi = window.__TAURI__.event;
} else if (window.__TAURI_INTERNALS__ && typeof window.__TAURI_INTERNALS__.listen === 'function') {
eventApi = window.__TAURI_INTERNALS__;
} else if (window.__TAURI__ && typeof window.__TAURI__.listen === 'function') {
eventApi = window.__TAURI__;
}
if (!eventApi) {
setTimeout(initTauriEvents, 50); setTimeout(initTauriEvents, 50);
return; return;
} }
@@ -601,7 +569,9 @@ void main() {
if (progressTrack) progressTrack.style.display = "block"; if (progressTrack) progressTrack.style.display = "block";
const percent = data.percent || 0; const percent = data.percent || 0;
if (progressFill) progressFill.style.width = percent + "%"; if (progressFill) progressFill.style.width = percent + "%";
setStatus(`Downloading update... ${percent}%`); if (!currentStatusText.startsWith("Downloading update...")) {
setStatus("Downloading update...");
}
} }
}); });
@@ -616,20 +586,15 @@ void main() {
eventApi.listen("ready", (e) => { eventApi.listen("ready", (e) => {
const data = e.payload || e; const data = e.payload || e;
if (data && data.url) { if (data && data.url) {
readyUrl = data.url; setStatus("Launching...");
if (progressTrack) progressTrack.style.display = "none";
if (actionsEl) actionsEl.style.display = "none";
if (statusEl) statusEl.innerHTML = "";
currentStatusText = "";
if (launchActionsEl) launchActionsEl.style.display = "flex";
} }
}); });
eventApi.listen("error", (e) => { eventApi.listen("error", (e) => {
const data = e.payload || e; const data = e.payload || e;
if (data && data.message) { const msg = data && data.message ? data.message : JSON.stringify(data);
setStatus(`Error: ${data.message}`, "#ef4444"); setStatus("Runtime Error", "#fca5a5");
} showDebug(msg);
}); });
} }

View File

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