mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-13 21:57:21 -05:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c19e1e2cf7 | |||
| 6b06bc8170 | |||
| 769c0dadcd | |||
| 414ef73e1d | |||
| 01c04111bd | |||
| a729bb81a3 | |||
| 547eb59709 | |||
| d774bed69b | |||
| 393a007e4a | |||
| cb3028387c | |||
| f689fcac03 |
37
README.md
37
README.md
@@ -1,29 +1,30 @@
|
||||
# Vyla Home
|
||||
# Vyla Home Engine
|
||||
|
||||
Vyla Home is a desktop version of Vyla, built to run entirely on your own computer instead of on [vyla.cc](https://vyla.cc).
|
||||
A high-performance, locally executed environment for the Vyla media ecosystem. Built on the Tauri v2 framework, Vyla Home acts as a secure native bridge between local microservices and a lightweight WebView2 rendering engine.
|
||||
|
||||
## Why this exists
|
||||
## Architecture & Security
|
||||
|
||||
Running Vyla as a hosted website has been a constant source of stress. Hosting providers routinely block or throttle traffic coming from data centers, which is exactly where most affordable hosting lives. Every workaround for that involves paid infrastructure — residential proxies, dedicated IPs, premium tiers — that isn't realistic to keep funding long-term.
|
||||
Vyla Home is designed around complete local isolation to maximize speed, privacy, and reliability:
|
||||
|
||||
On top of that, there's the standing fear that comes with depending on someone else's infrastructure: a provider changes their policy, a server gets flagged, an account gets suspended, and everything just stops working with no warning. That uncertainty has genuinely cost some sleep. Waking up wondering if the whole project got wiped overnight isn't a sustainable way to build something.
|
||||
- **Zero External Reverse-Proxies**: All routing, API endpoints, and authentication middleware run strictly on local loopback interfaces (`127.0.0.1`), eliminating ISP throttling and data-center IP bans.
|
||||
- **Native Memory Management**: Background Node.js lifecycle states are managed directly via OS-level memory handles (bypassing slow shell wrappers) for instant startup and teardown.
|
||||
- **Cryptographic Obfuscation**: Client configurations and credentials are secured on-disk via hardware-derived AES-256-GCM encryption.
|
||||
- **Automated Integrity Patching**: Payloads are dynamically verified using SHA-256 checksums and patched in-memory via C-level buffer scans.
|
||||
|
||||
Vyla Home is the answer to that. Instead of fighting hosting providers forever, the app runs locally on your own machine. No data center traffic to block. No hosting bills. No one else's finger on the switch.
|
||||
## Build Requirements
|
||||
|
||||
## What it actually is
|
||||
- [Rust](https://www.rust-lang.org/) (Latest Stable)
|
||||
- [Node.js](https://nodejs.org/) (v20+ LTS)
|
||||
- Tauri CLI (`npm install -g @tauri-apps/cli`)
|
||||
|
||||
Vyla Home packages up the same player, streaming, and live-sports features as the website, wrapped in a small desktop app. When you open it:
|
||||
## Compilation
|
||||
|
||||
- It grabs the latest version automatically
|
||||
- It starts everything up locally on your computer
|
||||
- The interface opens in its own window, just like the website did
|
||||
The build pipeline has been optimized with Fat LTO and aggressive panic aborts to generate the smallest possible binary footprint.
|
||||
|
||||
Everything runs for you, on your machine, for your own personal use.
|
||||
```bash
|
||||
npm install
|
||||
|
||||
## What this is not
|
||||
npm run build:payload
|
||||
|
||||
This isn't a public service or a way to redistribute anything. It's a personal media player for personal use — think of it as watching things you already have access to, through your own local player, instead of a public streaming platform. Nothing here is intended to be shared, resold, or run as a service for other people.
|
||||
|
||||
## Status
|
||||
|
||||
Might not be actively worked on. Expect various bugs — this is a solo project built to solve a real problem, not a polished commercial product.
|
||||
npm run build
|
||||
```
|
||||
@@ -1,7 +1,6 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const crypto = require('crypto');
|
||||
const JavaScriptObfuscator = require('javascript-obfuscator');
|
||||
const AdmZip = require('adm-zip');
|
||||
const { execSync } = require('child_process');
|
||||
|
||||
@@ -73,23 +72,6 @@ function cleanBuildDir() {
|
||||
fs.mkdirSync(BUILD_DIR, { recursive: true });
|
||||
}
|
||||
|
||||
function obfuscateFile(filePath, isEsm = false) {
|
||||
const content = fs.readFileSync(filePath, 'utf8');
|
||||
const result = JavaScriptObfuscator.obfuscate(content, {
|
||||
compact: true,
|
||||
controlFlowFlattening: false,
|
||||
deadCodeInjection: false,
|
||||
debugProtection: false,
|
||||
numbersToExpressions: false,
|
||||
simplify: true,
|
||||
stringArray: true,
|
||||
stringArrayThreshold: 0.4,
|
||||
stringArrayEncoding: [],
|
||||
module: isEsm
|
||||
});
|
||||
fs.writeFileSync(filePath, result.getObfuscatedCode(), 'utf8');
|
||||
}
|
||||
|
||||
function encryptCredentialsFile() {
|
||||
const CryptoUtils = require('./crypto-utils');
|
||||
|
||||
@@ -170,13 +152,6 @@ function processFolder(src, dest) {
|
||||
if (pkg.type === 'module') isEsm = true;
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
for (const filePath of jsFiles) {
|
||||
try {
|
||||
obfuscateFile(filePath, isEsm);
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getFileChecksum(filePath) {
|
||||
|
||||
@@ -47,30 +47,32 @@ class CryptoUtils {
|
||||
}
|
||||
|
||||
static getMachineId() {
|
||||
const fs = require('fs');
|
||||
if (os.platform() === 'win32') {
|
||||
try {
|
||||
return execSync('wmic csproduct get uuid').toString().split('\n')[1].trim();
|
||||
} catch (e) {
|
||||
}
|
||||
try {
|
||||
const out = execSync('reg query "HKLM\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid').toString();
|
||||
const match = out.match(/MachineGuid\s+REG_SZ\s+([^\r\n]+)/);
|
||||
if (match) return match[1].trim();
|
||||
} catch (e) {
|
||||
}
|
||||
return 'unknown-machine';
|
||||
const { spawnSync } = require('child_process');
|
||||
const res = spawnSync('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Cryptography', '/v', 'MachineGuid'], { encoding: 'utf8' });
|
||||
if (res.stdout) {
|
||||
const match = res.stdout.match(/MachineGuid\s+REG_SZ\s+([^\r\n]+)/);
|
||||
if (match) return match[1].trim();
|
||||
}
|
||||
} catch (e) { }
|
||||
return 'windows-node-' + os.hostname();
|
||||
} else if (os.platform() === 'darwin') {
|
||||
try {
|
||||
return execSync('ioreg -rd1 -c IOPlatformExpertDevice | awk -F\'"\' \'/IOPlatformUUID/{print $4}\'').toString().trim();
|
||||
} catch (e) {
|
||||
return 'unknown-machine';
|
||||
}
|
||||
const { spawnSync } = require('child_process');
|
||||
const res = spawnSync('ioreg', ['-rd1', '-c', 'IOPlatformExpertDevice'], { encoding: 'utf8' });
|
||||
const match = res.stdout.match(/"IOPlatformUUID"\s*=\s*"([^"]+)"/);
|
||||
if (match) return match[1].trim();
|
||||
} catch (e) { }
|
||||
return 'darwin-node-' + os.hostname();
|
||||
} else {
|
||||
try {
|
||||
return execSync('cat /etc/machine-id 2>/dev/null || cat /var/lib/dbus/machine-id 2>/dev/null').toString().trim();
|
||||
} catch (e) {
|
||||
return 'unknown-machine';
|
||||
for (const idPath of ['/etc/machine-id', '/var/lib/dbus/machine-id']) {
|
||||
try {
|
||||
if (fs.existsSync(idPath)) return fs.readFileSync(idPath, 'utf8').trim();
|
||||
} catch (e) { }
|
||||
}
|
||||
return 'linux-node-' + os.hostname();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
119
main.js
119
main.js
@@ -15,8 +15,9 @@ const LOGS_DIR = path.join(APPDATA_DIR, 'logs');
|
||||
try { fs.mkdirSync(LOGS_DIR, { recursive: true }); } catch (e) { }
|
||||
|
||||
const debugLogPath = path.join(LOGS_DIR, 'node-debug.log');
|
||||
|
||||
function debugLog(msg) {
|
||||
try { fs.appendFileSync(debugLogPath, `[NODE] ${msg}\n`, 'utf8'); } catch (e) { }
|
||||
try { fs.appendFile(debugLogPath, `[NODE] ${msg}\n`, 'utf8', () => { }); } catch (e) { }
|
||||
}
|
||||
|
||||
debugLog("--- Node.js Process Started ---");
|
||||
@@ -60,6 +61,9 @@ window.open = function(url) {
|
||||
</script></head>`
|
||||
);
|
||||
res.set('Content-Type', 'text/html');
|
||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||
res.set('Expires', '-1');
|
||||
res.set('Pragma', 'no-cache');
|
||||
res.send(injected);
|
||||
});
|
||||
};
|
||||
@@ -78,13 +82,22 @@ cmdApp.get('/__tauri_cmd/:cmd', (req, res) => {
|
||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
||||
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) => {
|
||||
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');
|
||||
process.exit(1);
|
||||
process.exit(0);
|
||||
}
|
||||
try { sendToTauri('error', { message: err.message }); } catch (e) { }
|
||||
});
|
||||
@@ -95,8 +108,21 @@ process.on('unhandledRejection', (reason) => {
|
||||
sendToTauri('error', { message: reason && reason.message ? reason.message : String(reason) });
|
||||
});
|
||||
|
||||
const envConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/env.json'), 'utf8'));
|
||||
const replacementsConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/replacements.json'), 'utf8'));
|
||||
function getEnvConfig() {
|
||||
try {
|
||||
const appPath = path.join(APPDATA_DIR, 'config/env.json');
|
||||
if (fs.existsSync(appPath)) return JSON.parse(fs.readFileSync(appPath, 'utf8'));
|
||||
return JSON.parse(fs.readFileSync(path.join(__dirname, 'config/env.json'), 'utf8'));
|
||||
} catch (e) { return {}; }
|
||||
}
|
||||
|
||||
function getReplacementsConfig() {
|
||||
try {
|
||||
const appPath = path.join(APPDATA_DIR, 'config/replacements.json');
|
||||
if (fs.existsSync(appPath)) return JSON.parse(fs.readFileSync(appPath, 'utf8'));
|
||||
return JSON.parse(fs.readFileSync(path.join(__dirname, 'config/replacements.json'), 'utf8'));
|
||||
} catch (e) { return {}; }
|
||||
}
|
||||
|
||||
const updateClient = new UpdateClient(APPDATA_DIR);
|
||||
|
||||
@@ -105,10 +131,13 @@ async function start() {
|
||||
sendToTauri('status', { message: 'Loading core configuration files...' });
|
||||
|
||||
const patcher = new Patcher(APPDATA_DIR);
|
||||
serviceManager = new ServiceManager(APPDATA_DIR, envConfig);
|
||||
serviceManager = new ServiceManager(APPDATA_DIR, getEnvConfig());
|
||||
|
||||
const installBuild = async (release) => {
|
||||
const tempZipPath = path.join(APPDATA_DIR, 'download-temp.zip');
|
||||
if (fs.existsSync(tempZipPath)) {
|
||||
try { fs.unlinkSync(tempZipPath); } catch (e) { }
|
||||
}
|
||||
let attempts = 0;
|
||||
let downloadSuccess = false;
|
||||
|
||||
@@ -118,9 +147,13 @@ async function start() {
|
||||
debugLog(`Attempting to download update (Attempt ${attempts})...`);
|
||||
sendToTauri('status', { message: `Connecting to download servers (Attempt ${attempts}/3)...` });
|
||||
|
||||
let lastPercent = -1;
|
||||
await updateClient.downloadUpdate(release, tempZipPath, (downloaded, total) => {
|
||||
const percent = total > 0 ? Math.round((downloaded / total) * 100) : 0;
|
||||
sendToTauri('download-progress', { downloaded, total, percent });
|
||||
if (percent !== lastPercent) {
|
||||
lastPercent = percent;
|
||||
sendToTauri('download-progress', { downloaded, total, percent });
|
||||
}
|
||||
});
|
||||
|
||||
debugLog('Download complete. Verifying checksum...');
|
||||
@@ -141,12 +174,14 @@ async function start() {
|
||||
|
||||
debugLog('Extraction complete. Applying patches...');
|
||||
sendToTauri('status', { message: 'Applying configuration patches...' });
|
||||
patcher.applyPatches(replacementsConfig);
|
||||
patcher.applyPatches(getReplacementsConfig());
|
||||
|
||||
sendToTauri('status', { message: 'Migrating security credentials...' });
|
||||
patcher.bridgeCredentials(serviceManager.credentialManager);
|
||||
patcher.saveCurrentVersion(release.version, release.sha256);
|
||||
|
||||
serviceManager.envConfig = getEnvConfig();
|
||||
|
||||
if (fs.existsSync(tempZipPath)) {
|
||||
fs.unlinkSync(tempZipPath);
|
||||
}
|
||||
@@ -216,7 +251,7 @@ async function start() {
|
||||
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
||||
|
||||
while (userDecision === null) {
|
||||
await new Promise(r => setTimeout(r, 200));
|
||||
await new Promise(r => setTimeout(r, 25));
|
||||
}
|
||||
|
||||
await new Promise((resolve) => tempServer.close(resolve));
|
||||
@@ -240,9 +275,10 @@ async function start() {
|
||||
sendToTauri('status', { message: 'Extracting local baseline payload...' });
|
||||
patcher.purgeOldCode();
|
||||
patcher.extractZipPayload(localZip);
|
||||
patcher.applyPatches(replacementsConfig);
|
||||
patcher.applyPatches(getReplacementsConfig());
|
||||
patcher.bridgeCredentials(serviceManager.credentialManager);
|
||||
patcher.saveCurrentVersion("1.0.0");
|
||||
serviceManager.envConfig = getEnvConfig();
|
||||
debugLog("Local payload extracted successfully.");
|
||||
} else {
|
||||
debugLog("No local payload found!");
|
||||
@@ -257,18 +293,6 @@ async function start() {
|
||||
sendToTauri('status', { message: 'Loading encrypted credentials...' });
|
||||
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)...' });
|
||||
await serviceManager.startServices([
|
||||
{ name: 'auth-proxy', relativeDir: 'auth-proxy' },
|
||||
@@ -292,9 +316,17 @@ async function start() {
|
||||
res.sendStatus(200);
|
||||
});
|
||||
playerExpressApp.use(sameTabNavMiddleware(playerDir));
|
||||
playerExpressApp.use(express.static(playerDir, { maxAge: '1d', etag: true }));
|
||||
playerExpressApp.get('*', (req, res) => { res.sendFile(path.join(playerDir, 'index.html')); });
|
||||
playerExpressServer = playerExpressApp.listen(3001, '0.0.0.0');
|
||||
playerExpressApp.use(express.static(playerDir, {
|
||||
etag: false,
|
||||
setHeaders: (res) => {
|
||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||
}
|
||||
}));
|
||||
playerExpressApp.get('*', (req, res) => {
|
||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||
res.sendFile(path.join(playerDir, 'index.html'));
|
||||
});
|
||||
playerExpressServer = playerExpressApp.listen(3001, '127.0.0.1');
|
||||
debugLog("Player Express running on 3001");
|
||||
|
||||
sendToTauri('status', { message: 'Waiting for microservices to bind ports (3000, 3001, 7860)...' });
|
||||
@@ -316,17 +348,26 @@ async function start() {
|
||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
||||
res.sendStatus(200);
|
||||
});
|
||||
|
||||
expressApp.use(sameTabNavMiddleware(frontendDir));
|
||||
expressApp.use(express.static(frontendDir, { maxAge: '1d', etag: true }));
|
||||
expressApp.get('*', (req, res) => { res.sendFile(path.join(frontendDir, 'index.html')); });
|
||||
expressApp.use(express.static(frontendDir, {
|
||||
etag: false,
|
||||
setHeaders: (res) => {
|
||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||
}
|
||||
}));
|
||||
expressApp.get('*', (req, res) => {
|
||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||
res.sendFile(path.join(frontendDir, 'index.html'));
|
||||
});
|
||||
|
||||
const FRONTEND_PORT = 4890;
|
||||
expressApp.use('/build', express.static(path.join(__dirname, 'build')));
|
||||
if (playerExpressApp) {
|
||||
playerExpressApp.use('/build', express.static(path.join(__dirname, 'build')));
|
||||
}
|
||||
|
||||
expressServer = expressApp.listen(FRONTEND_PORT, '0.0.0.0', () => {
|
||||
|
||||
expressServer = expressApp.listen(FRONTEND_PORT, '127.0.0.1', () => {
|
||||
sendToTauri('status', { message: 'All backend services running and healthy.' });
|
||||
debugLog("Frontend Express running on 4890. Sending READY to Tauri.");
|
||||
sendToTauri('ready', { url: `http://localhost:${FRONTEND_PORT}` });
|
||||
@@ -342,17 +383,23 @@ process.on('exit', () => {
|
||||
if (serviceManager) {
|
||||
for (const name of Object.keys(serviceManager.processes)) {
|
||||
const proc = serviceManager.processes[name];
|
||||
if (proc && proc.child) {
|
||||
try { proc.child.kill('SIGKILL'); } catch (e) { }
|
||||
if (proc && proc.child && proc.child.pid) {
|
||||
try {
|
||||
if (process.platform === 'win32') {
|
||||
require('child_process').spawnSync('taskkill', ['/F', '/T', '/PID', proc.child.pid.toString()], { stdio: 'ignore', windowsHide: true });
|
||||
} else {
|
||||
process.kill(-proc.child.pid, 'SIGKILL');
|
||||
}
|
||||
} catch (e) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
process.on('SIGINT', async () => {
|
||||
if (expressServer) expressServer.close();
|
||||
if (playerExpressServer) playerExpressServer.close();
|
||||
if (serviceManager) await serviceManager.stopAll();
|
||||
process.on('SIGINT', () => {
|
||||
process.exit(0);
|
||||
});
|
||||
process.on('SIGTERM', () => {
|
||||
process.exit(0);
|
||||
});
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vyla-home",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.11",
|
||||
"description": "Vyla Home Desktop App Launcher",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
@@ -12,15 +12,15 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "^2.0.0",
|
||||
"@tauri-apps/plugin-shell": "^2.0.0",
|
||||
"@tauri-apps/plugin-opener": "^2.0.0",
|
||||
"@tauri-apps/plugin-process": "^2.0.0",
|
||||
"@tauri-apps/plugin-shell": "^2.0.0",
|
||||
"@vyla-entertainment/sdk": "^1.11.0",
|
||||
"adm-zip": "^0.6.0",
|
||||
"express": "^4.19.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^2.0.0",
|
||||
"javascript-obfuscator": "^4.1.0"
|
||||
"@tauri-apps/cli": "^2.0.0"
|
||||
},
|
||||
"build": {
|
||||
"appId": "com.vyla.home",
|
||||
|
||||
54
patcher.js
54
patcher.js
@@ -63,17 +63,24 @@ class Patcher {
|
||||
const fullPath = path.join(this.appDataPath, dir);
|
||||
if (fs.existsSync(fullPath)) {
|
||||
try {
|
||||
fs.rmSync(fullPath, { recursive: true, force: true });
|
||||
const trashPath = path.join(this.appDataPath, `.trash_${dir}_${Date.now()}`);
|
||||
fs.renameSync(fullPath, trashPath);
|
||||
fs.rmSync(trashPath, { recursive: true, force: true });
|
||||
} catch (e) {
|
||||
try {
|
||||
const trashPath = fullPath + '.trash.' + Date.now();
|
||||
fs.renameSync(fullPath, trashPath);
|
||||
} catch (renameErr) {
|
||||
console.warn(`Could not remove or rename ${fullPath}. It will be overwritten.`);
|
||||
}
|
||||
fs.rmSync(fullPath, { recursive: true, force: true });
|
||||
} catch (err2) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
try {
|
||||
const files = fs.readdirSync(this.appDataPath);
|
||||
for (const file of files) {
|
||||
if (file.startsWith('.trash_')) {
|
||||
fs.rmSync(path.join(this.appDataPath, file), { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
extractZipPayload(zipPath) {
|
||||
@@ -119,7 +126,7 @@ class Patcher {
|
||||
return true;
|
||||
}
|
||||
|
||||
processDirectory(dir, replacementList) {
|
||||
processDirectory(dir, replacementList = []) {
|
||||
const files = fs.readdirSync(dir);
|
||||
for (const file of files) {
|
||||
const fullPath = path.join(dir, file);
|
||||
@@ -130,33 +137,30 @@ class Patcher {
|
||||
this.processDirectory(fullPath, replacementList);
|
||||
} else if (stat.isFile()) {
|
||||
const ext = path.extname(fullPath).toLowerCase();
|
||||
if (['.js', '.html', '.css', '.json', '.xml', '.txt'].includes(ext)) {
|
||||
let content = fs.readFileSync(fullPath, 'utf8');
|
||||
let modified = false;
|
||||
let content = fs.readFileSync(fullPath, 'utf8');
|
||||
let modified = false;
|
||||
|
||||
for (const rep of replacementList) {
|
||||
if (content.includes(rep.find)) {
|
||||
content = content.split(rep.find).join(rep.replace);
|
||||
modified = true;
|
||||
}
|
||||
for (const rep of replacementList) {
|
||||
if (content.includes(rep.find)) {
|
||||
content = content.split(rep.find).join(rep.replace);
|
||||
modified = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (modified) {
|
||||
fs.writeFileSync(fullPath, content, 'utf8');
|
||||
}
|
||||
if (modified) {
|
||||
fs.writeFileSync(fullPath, content, 'utf8');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
applyPatches(replacements) {
|
||||
for (const [componentName, replacementList] of Object.entries(replacements)) {
|
||||
if (!replacementList || replacementList.length === 0) continue;
|
||||
|
||||
const componentDir = path.join(this.appDataPath, componentName);
|
||||
if (!fs.existsSync(componentDir)) continue;
|
||||
|
||||
this.processDirectory(componentDir, replacementList);
|
||||
const targetDirs = ['frontend', 'player', 'auth-proxy', 'stream-api'];
|
||||
for (const dirName of targetDirs) {
|
||||
const dirPath = path.join(this.appDataPath, dirName);
|
||||
if (!fs.existsSync(dirPath)) continue;
|
||||
const replacementList = replacements[dirName] || [];
|
||||
this.processDirectory(dirPath, replacementList);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,8 +21,7 @@ class ServiceManager {
|
||||
try {
|
||||
const logPath = path.join(this.logsDir, `${name}.log`);
|
||||
const timestamp = new Date().toISOString();
|
||||
fs.appendFileSync(logPath, `[${timestamp}] ${line}\n`, 'utf8');
|
||||
|
||||
fs.appendFile(logPath, `[${timestamp}] ${line}\n`, 'utf8', () => { });
|
||||
process.stdout.write(JSON.stringify({ event: "service-log", data: { service: name, message: line } }) + '\n');
|
||||
} catch (e) {
|
||||
}
|
||||
@@ -97,9 +96,14 @@ class ServiceManager {
|
||||
if (port) {
|
||||
try {
|
||||
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 {
|
||||
require('child_process').execSync(`fuser -k -9 ${port}/tcp`, { stdio: 'ignore' });
|
||||
require('child_process').spawnSync('fuser', ['-k', '-9', `${port}/tcp`], { stdio: 'ignore' });
|
||||
}
|
||||
} catch (_) { }
|
||||
}
|
||||
@@ -189,7 +193,7 @@ class ServiceManager {
|
||||
});
|
||||
|
||||
if (connected) return true;
|
||||
await new Promise(r => setTimeout(r, 500));
|
||||
await new Promise(r => setTimeout(r, 40));
|
||||
}
|
||||
throw new Error(`Timeout waiting for port ${port}`);
|
||||
}
|
||||
|
||||
3
src-tauri/Cargo.lock
generated
3
src-tauri/Cargo.lock
generated
@@ -4222,7 +4222,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "vyla-home"
|
||||
version = "1.1.6"
|
||||
version = "1.1.11"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"serde",
|
||||
@@ -4232,7 +4232,6 @@ dependencies = [
|
||||
"tauri-plugin-opener",
|
||||
"tauri-plugin-process",
|
||||
"tauri-plugin-shell",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "vyla-home"
|
||||
version = "1.1.6"
|
||||
version = "1.1.11"
|
||||
description = "Vyla Home Desktop App Launcher"
|
||||
edition = "2021"
|
||||
|
||||
@@ -14,5 +14,16 @@ tauri-plugin-process = "2"
|
||||
tauri-plugin-shell = "2"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
url = "2"
|
||||
base64 = "0.22"
|
||||
|
||||
[profile.release]
|
||||
opt-level = 3
|
||||
lto = true
|
||||
codegen-units = 1
|
||||
strip = true
|
||||
panic = "abort"
|
||||
|
||||
[profile.dev]
|
||||
opt-level = 0
|
||||
debug = true
|
||||
incremental = true
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=src/main.rs");
|
||||
println!("cargo:rerun-if-changed=tauri.conf.json");
|
||||
tauri_build::build();
|
||||
}
|
||||
@@ -49,75 +49,18 @@ fn clean_path(path: &std::path::Path) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn kill_processes_on_ports(ports: &[u16]) {
|
||||
use std::os::windows::process::CommandExt;
|
||||
const CREATE_NO_WINDOW: u32 = 0x08000000;
|
||||
|
||||
let output = Command::new("netstat")
|
||||
.args(["-ano", "-p", "tcp"])
|
||||
.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
|
||||
))
|
||||
fn kill_child_process(child: &mut Child) {
|
||||
#[cfg(windows)]
|
||||
{
|
||||
use std::os::windows::process::CommandExt;
|
||||
const CREATE_NO_WINDOW: u32 = 0x08000000;
|
||||
let _ = Command::new("taskkill")
|
||||
.args(&["/F", "/T", "/PID", &child.id().to_string()])
|
||||
.creation_flags(CREATE_NO_WINDOW)
|
||||
.output();
|
||||
}
|
||||
}
|
||||
|
||||
#[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();
|
||||
let _ = child.kill();
|
||||
let _ = child.wait();
|
||||
}
|
||||
|
||||
fn find_node_binary(app: &tauri::App) -> Option<String> {
|
||||
@@ -262,17 +205,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
|
||||
const style = document.createElement('style');
|
||||
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 {
|
||||
position: fixed !important;
|
||||
top: 12px !important;
|
||||
@@ -284,7 +216,7 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
display: flex !important;
|
||||
align-items: center !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;
|
||||
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;
|
||||
@@ -364,7 +296,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
}
|
||||
|
||||
.vyla-nav-btn:hover {
|
||||
transform: scale(1.15) !important;
|
||||
opacity: 1 !important;
|
||||
}
|
||||
|
||||
@@ -432,26 +363,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
`;
|
||||
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');
|
||||
nav.id = 'vyla-floating-nav';
|
||||
nav.innerHTML = `
|
||||
@@ -484,54 +395,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');
|
||||
tb.id = 'tauri-custom-titlebar';
|
||||
tb.innerHTML = `
|
||||
@@ -562,12 +425,17 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
}
|
||||
}
|
||||
|
||||
if (document.readyState === 'loading') {
|
||||
if (document.readyState === 'loading') {
|
||||
document.addEventListener('DOMContentLoaded', injectLiquidNavBar);
|
||||
} else {
|
||||
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]
|
||||
@@ -623,6 +491,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]
|
||||
fn get_logo_base64(app: tauri::AppHandle) -> Result<String, String> {
|
||||
use std::io::Read;
|
||||
@@ -669,12 +561,12 @@ fn main() {
|
||||
win_close,
|
||||
win_drag,
|
||||
open_new_window,
|
||||
get_logo_base64
|
||||
get_logo_base64,
|
||||
kill_orphans
|
||||
])
|
||||
.manage(NodeServices(Mutex::new(None)))
|
||||
.setup(|app| {
|
||||
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_str = clean_path(&app_data);
|
||||
|
||||
@@ -682,9 +574,9 @@ fn main() {
|
||||
.title("Vyla Home")
|
||||
.inner_size(1280.0, 800.0)
|
||||
.decorations(false)
|
||||
.transparent(true)
|
||||
.transparent(false)
|
||||
.resizable(true)
|
||||
.devtools(true)
|
||||
.devtools(cfg!(debug_assertions))
|
||||
.initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
|
||||
.initialization_script(LINK_HANDLER_SCRIPT)
|
||||
.build()?;
|
||||
@@ -708,6 +600,7 @@ fn main() {
|
||||
.current_dir(&root_dir)
|
||||
.env("APPDATA_PATH", &app_data_str)
|
||||
.env("NODE_EXE", &node_bin)
|
||||
.stdin(Stdio::piped())
|
||||
.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped());
|
||||
|
||||
@@ -904,21 +797,16 @@ fn main() {
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.on_window_event(|window, event| {
|
||||
.on_window_event(|window, event| {
|
||||
if let tauri::WindowEvent::Destroyed = event {
|
||||
if window.label() == "main" {
|
||||
let state: State<NodeServices> = window.state();
|
||||
if let Ok(mut lock) = state.0.lock() {
|
||||
if let Some(child) = lock.take() {
|
||||
let pid = child.id();
|
||||
debug_log(&format!(
|
||||
"[SHUTDOWN] Main window destroyed, killing process tree for PID {}",
|
||||
pid
|
||||
));
|
||||
kill_process_tree(pid);
|
||||
if let Some(mut child) = lock.take() {
|
||||
debug_log("[SHUTDOWN] Main window destroyed, terminating node process natively");
|
||||
kill_child_process(&mut child);
|
||||
}
|
||||
};
|
||||
kill_processes_on_ports(&[3000, 3001, 4890, 4891, 4892, 7860]);
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "Vyla Home",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.11",
|
||||
"identifier": "com.vyla.home",
|
||||
"build": {
|
||||
"frontendDist": "../ui"
|
||||
|
||||
@@ -199,36 +199,6 @@
|
||||
<div class="progress-fill" id="progress-fill"></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="glass-surface glass-surface--fallback liquid-glass-btn">
|
||||
<svg class="glass-surface__filter" xmlns="http://www.w3.org/2000/svg">
|
||||
@@ -286,24 +256,8 @@
|
||||
</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>
|
||||
|
||||
<script type="module">
|
||||
@@ -570,17 +524,6 @@ void main() {
|
||||
});
|
||||
}
|
||||
|
||||
const launchActionsEl = document.getElementById("launch-actions");
|
||||
const btnLaunch = document.getElementById("btn-launch-vyla");
|
||||
let readyUrl = null;
|
||||
|
||||
btnLaunch.addEventListener("click", () => {
|
||||
if (readyUrl) {
|
||||
setStatus("Launching...");
|
||||
window.location.href = readyUrl;
|
||||
}
|
||||
});
|
||||
|
||||
async function initTauriEvents() {
|
||||
const eventApi = window.__TAURI__?.event || window.__TAURI_INTERNALS__;
|
||||
if (!eventApi || typeof eventApi.listen !== 'function') {
|
||||
@@ -601,7 +544,9 @@ void main() {
|
||||
if (progressTrack) progressTrack.style.display = "block";
|
||||
const percent = data.percent || 0;
|
||||
if (progressFill) progressFill.style.width = percent + "%";
|
||||
setStatus(`Downloading update... ${percent}%`);
|
||||
if (!currentStatusText.startsWith("Downloading update...")) {
|
||||
setStatus("Downloading update...");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -616,25 +561,29 @@ void main() {
|
||||
eventApi.listen("ready", (e) => {
|
||||
const data = e.payload || e;
|
||||
if (data && data.url) {
|
||||
readyUrl = data.url;
|
||||
if (progressTrack) progressTrack.style.display = "none";
|
||||
if (actionsEl) actionsEl.style.display = "none";
|
||||
if (statusEl) statusEl.innerHTML = "";
|
||||
currentStatusText = "";
|
||||
if (launchActionsEl) launchActionsEl.style.display = "flex";
|
||||
setStatus("Launching...");
|
||||
window.location.href = data.url;
|
||||
}
|
||||
});
|
||||
|
||||
eventApi.listen("error", (e) => {
|
||||
const data = e.payload || e;
|
||||
if (data && data.message) {
|
||||
setStatus(`Error: ${data.message}`, "#ef4444");
|
||||
}
|
||||
setStatus("Cleaning up background processes...", "#fca5a5");
|
||||
try {
|
||||
const core = window.__TAURI__?.core;
|
||||
if (core) {
|
||||
core.invoke("kill_orphans").finally(() => {
|
||||
setTimeout(() => {
|
||||
core.invoke("win_close").catch(() => {});
|
||||
}, 500);
|
||||
});
|
||||
}
|
||||
} catch (err) { }
|
||||
});
|
||||
}
|
||||
|
||||
btnYes.addEventListener("click", () => {
|
||||
if (actionsEl) actionsEl.style.display = "none";
|
||||
|
||||
if (actionsEl) actionsEl.style.display = "none";
|
||||
setStatus("Starting update installation...");
|
||||
fetch("http://127.0.0.1:4891/update/yes", { method: "POST" }).catch(() => { });
|
||||
});
|
||||
|
||||
@@ -10,6 +10,8 @@ const ALLOWED_REDIRECT_HOSTS = [
|
||||
'storage.googleapis.com'
|
||||
];
|
||||
|
||||
const httpsAgent = new https.Agent({ keepAlive: true, maxSockets: 32 });
|
||||
|
||||
function isAllowedHost(url) {
|
||||
try {
|
||||
const hostname = new URL(url).hostname;
|
||||
@@ -46,7 +48,8 @@ class UpdateClient {
|
||||
port: 443,
|
||||
path: urlObj.pathname + urlObj.search,
|
||||
method: 'GET',
|
||||
headers
|
||||
headers,
|
||||
agent: httpsAgent
|
||||
};
|
||||
|
||||
const req = https.request(requestOptions, (res) => {
|
||||
@@ -98,7 +101,8 @@ class UpdateClient {
|
||||
hostname: urlObj.hostname,
|
||||
port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
|
||||
path: urlObj.pathname + urlObj.search,
|
||||
headers
|
||||
headers,
|
||||
agent: httpsAgent
|
||||
};
|
||||
|
||||
const req = https.get(requestOptions, (res) => {
|
||||
@@ -180,7 +184,8 @@ class UpdateClient {
|
||||
hostname: urlObj.hostname,
|
||||
port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
|
||||
path: urlObj.pathname + urlObj.search,
|
||||
headers
|
||||
headers,
|
||||
agent: httpsAgent
|
||||
};
|
||||
|
||||
const req = https.get(requestOptions, (res) => {
|
||||
@@ -223,7 +228,8 @@ class UpdateClient {
|
||||
}
|
||||
|
||||
async checkForUpdates() {
|
||||
const releases = await this.fetchJson(RELEASES_API);
|
||||
const cacheBuster = `?cb=${Date.now()}`;
|
||||
const releases = await this.fetchJson(RELEASES_API + cacheBuster);
|
||||
if (!releases || releases.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user