mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-14 14:17:25 -05:00
Compare commits
43 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51951ac192 | ||
|
|
c131515209 | ||
|
|
b44f59f4b7 | ||
|
|
35087d24e8 | ||
| 2435ee51e6 | |||
| 59f4d9855f | |||
| 928b40230c | |||
| 59bc589a85 | |||
| 63809ba2af | |||
| 0918f8e8aa | |||
| 4d085c33e1 | |||
| e71e73d166 | |||
| d5e54939a8 | |||
| 76296cc7c2 | |||
| c416f17e81 | |||
| 2c4501fa5f | |||
| eca4d017de | |||
| 33727a79c5 | |||
| 99e45fd7ff | |||
| adf237dac0 | |||
| 23021d6524 | |||
| 97ba68bd97 | |||
| 2de96960d9 | |||
| 8fd8be0d05 | |||
| e3283fff45 | |||
| 64ed5981be | |||
| ba8266bd86 | |||
| bb39db0272 | |||
| d799da3d2a | |||
| f4aaf2fa7c | |||
| 8ce4edc251 | |||
| bef6fd2326 | |||
| 774f9a5e03 | |||
| 250e7972f2 | |||
| 5082d51ebc | |||
| ed66b894c1 | |||
| 11d6c346e8 | |||
| c986194e64 | |||
| 33e285953c | |||
| f46869f967 | |||
| b19e6b21c9 | |||
| c8ea2598b9 | |||
| e3257b8a3a |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -36,3 +36,5 @@ yarn-error.log*
|
|||||||
*.tmp
|
*.tmp
|
||||||
*.temp
|
*.temp
|
||||||
download-temp.zip
|
download-temp.zip
|
||||||
|
|
||||||
|
.env
|
||||||
3
DOCUEMENTATION/FIXES.md
Normal file
3
DOCUEMENTATION/FIXES.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
If someone get's a Webview2 error, they need to download the WebView2Loader.dll and drag it in bin
|
||||||
|
|
||||||
|
bin\WebView2Loader.dll
|
||||||
47
LICENSE
Normal file
47
LICENSE
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
Vyla Home Attribution License (VHAL) v1.0
|
||||||
|
|
||||||
|
Copyright (c) 2026 Vyla Entertainment
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy of the Vyla Home source code and associated documentation (the “Software”), to use, copy, modify, merge, publish, and distribute the Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1. Attribution
|
||||||
|
|
||||||
|
Any public distribution, publication, derivative work, modified version, or substantial use of the Software must provide clear and visible credit to Vyla Entertainment and Vyla Home.
|
||||||
|
|
||||||
|
The attribution must substantially state:
|
||||||
|
|
||||||
|
“Based on Vyla Home by Vyla Entertainment”
|
||||||
|
|
||||||
|
The attribution must appear in a location reasonably visible to users of the Software, such as an About page, credits section, documentation, repository, application information page, or other comparable location.
|
||||||
|
|
||||||
|
2. Preservation of License
|
||||||
|
|
||||||
|
Copies or substantial portions of the Software must include a copy of this license and the original copyright notice.
|
||||||
|
|
||||||
|
3. Modified Versions
|
||||||
|
|
||||||
|
Modified versions may be created and distributed under different terms, provided that the attribution requirements of Section 1 and the preservation requirements of Section 2 remain in effect.
|
||||||
|
|
||||||
|
4. No Implication of Endorsement
|
||||||
|
|
||||||
|
Use of the Software does not grant permission to imply that Vyla Entertainment endorses, sponsors, or officially supports any modified version or derivative work unless Vyla Entertainment has provided explicit written permission.
|
||||||
|
|
||||||
|
5. Trademarks
|
||||||
|
|
||||||
|
This license does not grant permission to use the Vyla Entertainment or Vyla Home names, logos, trademarks, service marks, or other branding except as necessary to satisfy the attribution requirement of this license.
|
||||||
|
|
||||||
|
6. Commercial Use
|
||||||
|
|
||||||
|
Commercial use, sale, and distribution of the Software and derivative works are permitted, provided that all applicable requirements of this license are satisfied.
|
||||||
|
|
||||||
|
7. No Warranty
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT.
|
||||||
|
|
||||||
|
IN NO EVENT SHALL VYLA ENTERTAINMENT OR THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
8. Acceptance
|
||||||
|
|
||||||
|
By using, copying, modifying, publishing, or distributing the Software, you agree to the terms of this license.
|
||||||
|
|
||||||
|
If any provision of this license is found to be unenforceable, the remaining provisions shall remain in effect.
|
||||||
38
README.md
38
README.md
@@ -1,30 +1,24 @@
|
|||||||
# Vyla Home Engine
|
# Vyla Home
|
||||||
|
|
||||||
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.
|
A desktop application that provides a fast, secure, and private way to access the Vyla media ecosystem. Vyla Home runs everything locally on your computer, giving you quick access to streaming services without relying on external servers.
|
||||||
|
|
||||||
## Architecture & Security
|
## What It Does
|
||||||
|
|
||||||
Vyla Home is designed around complete local isolation to maximize speed, privacy, and reliability:
|
Vyla Home is a native desktop app that:
|
||||||
|
|
||||||
- **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.
|
- **Runs locally** - All services run on your computer for maximum privacy and speed
|
||||||
- **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.
|
- **Manages streaming services** - Handles authentication and streaming APIs automatically
|
||||||
- **Cryptographic Obfuscation**: Client configurations and credentials are secured on-disk via hardware-derived AES-256-GCM encryption.
|
- **Updates automatically** - Keeps itself up to date with the latest features and fixes
|
||||||
- **Automated Integrity Patching**: Payloads are dynamically verified using SHA-256 checksums and patched in-memory via C-level buffer scans.
|
- **Works offline** - Core functionality doesn't require constant internet connectivity
|
||||||
|
- **Keeps your data secure** - Your credentials and settings are encrypted and stored locally
|
||||||
|
|
||||||
## Build Requirements
|
## How It Works
|
||||||
|
|
||||||
- [Rust](https://www.rust-lang.org/) (Latest Stable)
|
When you launch Vyla Home, it:
|
||||||
- [Node.js](https://nodejs.org/) (v20+ LTS)
|
|
||||||
- Tauri CLI (`npm install -g @tauri-apps/cli`)
|
|
||||||
|
|
||||||
## Compilation
|
1. Starts the necessary background services (media player server)
|
||||||
|
2. Loads your saved settings and credentials (encrypted for security)
|
||||||
|
3. Checks for updates and installs them if available
|
||||||
|
4. Opens the user interface in a secure, embedded browser window
|
||||||
|
|
||||||
The build pipeline has been optimized with Fat LTO and aggressive panic aborts to generate the smallest possible binary footprint.
|
Everything happens on your machine - your data never leaves your computer except when communicating directly with streaming services.
|
||||||
|
|
||||||
```bash
|
|
||||||
npm install
|
|
||||||
|
|
||||||
npm run build:payload
|
|
||||||
|
|
||||||
npm run build
|
|
||||||
```
|
|
||||||
@@ -5,7 +5,7 @@ const AdmZip = require('adm-zip');
|
|||||||
const { execSync } = require('child_process');
|
const { execSync } = require('child_process');
|
||||||
|
|
||||||
const BUILD_DIR = path.join(__dirname, 'dist-build');
|
const BUILD_DIR = path.join(__dirname, 'dist-build');
|
||||||
const REPOS = ['frontend', 'player', 'auth-proxy', 'stream-api'];
|
const REPOS = ['frontend', 'player'];
|
||||||
|
|
||||||
const TEMP_EXTRACT_DIR = path.join(__dirname, 'temp-validation-extract');
|
const TEMP_EXTRACT_DIR = path.join(__dirname, 'temp-validation-extract');
|
||||||
|
|
||||||
@@ -14,8 +14,6 @@ const GITLAB_GROUP = 'vyla-entertainment';
|
|||||||
const REPO_CONFIG = {
|
const REPO_CONFIG = {
|
||||||
'frontend': { name: 'frontend', branch: 'main' },
|
'frontend': { name: 'frontend', branch: 'main' },
|
||||||
'player': { name: 'player', branch: 'main' },
|
'player': { name: 'player', branch: 'main' },
|
||||||
'auth-proxy': { name: 'auth-proxy', branch: 'main' },
|
|
||||||
'stream-api': { name: 'stream-api', branch: 'main' },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const clonedRepos = new Set();
|
const clonedRepos = new Set();
|
||||||
@@ -174,9 +172,6 @@ function validatePayload(zipPath) {
|
|||||||
zip.extractAllTo(TEMP_EXTRACT_DIR, true);
|
zip.extractAllTo(TEMP_EXTRACT_DIR, true);
|
||||||
|
|
||||||
const requiredFiles = [
|
const requiredFiles = [
|
||||||
'player/index.html',
|
|
||||||
'auth-proxy/server.js',
|
|
||||||
'stream-api/server.js',
|
|
||||||
'frontend/index.html'
|
'frontend/index.html'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
BIN
build/white_favicon.png
Normal file
BIN
build/white_favicon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 223 KiB |
@@ -1,16 +1,5 @@
|
|||||||
{
|
{
|
||||||
"player": {
|
"player": {
|
||||||
"TMDB_KEY": "YOUR_TMDB_KEY_HERE",
|
"TMDB_KEY": "YOUR_TMDB_KEY_HERE"
|
||||||
"API_KEY": "YOUR_API_KEY_HERE"
|
|
||||||
},
|
|
||||||
"auth-proxy": {
|
|
||||||
"VITE_API_KEY": "YOUR_VITE_API_KEY_HERE",
|
|
||||||
"PROXY_VITE_API_KEY": "YOUR_PROXY_VITE_API_KEY_HERE"
|
|
||||||
},
|
|
||||||
"stream-api": {
|
|
||||||
"TMDB_API_KEY": "YOUR_TMDB_API_KEY_HERE",
|
|
||||||
"GA_MEASUREMENT_ID": "YOUR_GA_MEASUREMENT_ID_HERE",
|
|
||||||
"GA_API_SECRET": "YOUR_GA_API_SECRET_HERE",
|
|
||||||
"TOKEN_SECRET": "YOUR_TOKEN_SECRET_HERE"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,20 +1,5 @@
|
|||||||
{
|
{
|
||||||
"player": {
|
"player": {
|
||||||
"PORT": "3001",
|
"PORT": "3000"
|
||||||
"BASE_URL": "http://localhost:7860",
|
|
||||||
"BYPASS_AUTH": "true"
|
|
||||||
},
|
|
||||||
"auth-proxy": {
|
|
||||||
"PORT": "3000",
|
|
||||||
"VITE_BASE_URL": "http://localhost:7860",
|
|
||||||
"DEV_BYPASS_AUTH": "true"
|
|
||||||
},
|
|
||||||
"stream-api": {
|
|
||||||
"PORT": "7860",
|
|
||||||
"PROXY_URL": "https://txt.primebox.workers.dev",
|
|
||||||
"PROXY_STREAMS": "true",
|
|
||||||
"ENABLE_DEBUG_ROUTE": "true",
|
|
||||||
"BYPASS_AUTH": "true",
|
|
||||||
"TOKEN_SECRET": "vyla_default_secure_token_secret_local_dev_32chars"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,40 +2,17 @@
|
|||||||
"frontend": [
|
"frontend": [
|
||||||
{
|
{
|
||||||
"find": "https://player.vyla.cc",
|
"find": "https://player.vyla.cc",
|
||||||
"replace": "http://localhost:3001"
|
"replace": "http://localhost:3000"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"find": "http://player.vyla.cc",
|
"find": "http://player.vyla.cc",
|
||||||
"replace": "http://localhost:3001"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"find": "https://api.vyla.cc",
|
|
||||||
"replace": "http://localhost:7860"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"find": "https://auth.vyla.cc",
|
|
||||||
"replace": "http://localhost:3000"
|
"replace": "http://localhost:3000"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"player": [
|
"player": [
|
||||||
{
|
|
||||||
"find": "https://api.vyla.cc",
|
|
||||||
"replace": "http://localhost:7860"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"find": "https://auth.vyla.cc",
|
|
||||||
"replace": "http://localhost:3000"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"find": "https://player.vyla.cc",
|
"find": "https://player.vyla.cc",
|
||||||
"replace": "http://localhost:4890"
|
"replace": "http://localhost:4890"
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
"auth-proxy": [
|
|
||||||
{
|
|
||||||
"find": "https://player.vyla.cc",
|
|
||||||
"replace": "http://localhost:3001"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"stream-api": []
|
|
||||||
}
|
}
|
||||||
@@ -4,9 +4,7 @@ const path = require('path');
|
|||||||
|
|
||||||
const REPOS = {
|
const REPOS = {
|
||||||
frontend: { branch: 'main' },
|
frontend: { branch: 'main' },
|
||||||
player: { branch: 'main' },
|
player: { branch: 'main' }
|
||||||
'stream-api': { branch: 'main' },
|
|
||||||
'auth-proxy': { branch: 'main' }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const GITLAB_GROUP = 'vyla-entertainment';
|
const GITLAB_GROUP = 'vyla-entertainment';
|
||||||
|
|||||||
230
main.js
230
main.js
@@ -34,8 +34,7 @@ debugLog("--- Node.js Process Started ---");
|
|||||||
let serviceManager;
|
let serviceManager;
|
||||||
let expressApp;
|
let expressApp;
|
||||||
let expressServer;
|
let expressServer;
|
||||||
let playerExpressApp;
|
let updateDecisionHandler = null;
|
||||||
let playerExpressServer;
|
|
||||||
|
|
||||||
debugLog(`AppData Dir: ${APPDATA_DIR}`);
|
debugLog(`AppData Dir: ${APPDATA_DIR}`);
|
||||||
|
|
||||||
@@ -86,12 +85,25 @@ cmdApp.use((req, res, next) => {
|
|||||||
if (req.method === 'OPTIONS') return res.sendStatus(200);
|
if (req.method === 'OPTIONS') return res.sendStatus(200);
|
||||||
next();
|
next();
|
||||||
});
|
});
|
||||||
|
cmdApp.all('/update/:choice', (req, res) => {
|
||||||
|
const c = String(req.params.choice).toLowerCase();
|
||||||
|
if (updateDecisionHandler) {
|
||||||
|
if (c === 'yes' || c === 'true' || c === 'install') updateDecisionHandler(true);
|
||||||
|
if (c === 'no' || c === 'false' || c === 'skip') updateDecisionHandler(false);
|
||||||
|
}
|
||||||
|
res.sendStatus(200);
|
||||||
|
});
|
||||||
cmdApp.get('/__tauri_cmd/:cmd', (req, res) => {
|
cmdApp.get('/__tauri_cmd/:cmd', (req, res) => {
|
||||||
|
const cmd = req.params.cmd;
|
||||||
|
if (updateDecisionHandler) {
|
||||||
|
if (cmd === 'update_yes' || cmd === 'update_install') updateDecisionHandler(true);
|
||||||
|
if (cmd === 'update_no' || cmd === 'update_skip') updateDecisionHandler(false);
|
||||||
|
}
|
||||||
debugLog(`[CMD-SERVER:4892] Command received: ${req.params.cmd} (window: ${req.query.window || 'main'})`);
|
debugLog(`[CMD-SERVER:4892] Command received: ${req.params.cmd} (window: ${req.query.window || 'main'})`);
|
||||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
||||||
res.sendStatus(200);
|
res.sendStatus(200);
|
||||||
});
|
});
|
||||||
cmdApp.listen(4892, '127.0.0.1', () => debugLog("[CMD-SERVER] Dedicated command server listening on 127.0.0.1:4892"));
|
cmdApp.listen(4892, '127.0.0.1', () => debugLog("[CMD-SERVER] Dedicated command server listening on port 4892"));
|
||||||
|
|
||||||
process.stdin.resume();
|
process.stdin.resume();
|
||||||
process.stdin.on('end', () => {
|
process.stdin.on('end', () => {
|
||||||
@@ -212,58 +224,85 @@ async function start() {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
sendToTauri('status', { message: 'Inspecting local workspace and installed files...' });
|
sendToTauri('status', { message: 'Inspecting local workspace and installed files...' });
|
||||||
let isFirstRun = !patcher.verifyExtraction();
|
let isFirstRun = false;
|
||||||
let localVersion = patcher.getCurrentVersion();
|
let localVersion = '0.0.0';
|
||||||
let localSha = patcher.getCurrentSha();
|
let localSha = 'force-update-sha';
|
||||||
debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}, Local SHA: ${localSha}`);
|
debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}, Local SHA: ${localSha}`);
|
||||||
|
|
||||||
const localZipPath = path.join(__dirname, 'update-payload.zip');
|
function findLocalZip() {
|
||||||
const localManifestPath = path.join(__dirname, 'manifest.json');
|
const searchRoots = [__dirname, process.cwd(), path.join(__dirname, '../../..')];
|
||||||
|
for (const root of searchRoots) {
|
||||||
|
let cur = root;
|
||||||
|
for (let i = 0; i < 6; i++) {
|
||||||
|
try {
|
||||||
|
const zp = path.join(cur, 'update-payload.zip');
|
||||||
|
if (fs.existsSync(zp)) {
|
||||||
|
const mp = path.join(cur, 'manifest.json');
|
||||||
|
return { zipPath: zp, manifestPath: fs.existsSync(mp) ? mp : null };
|
||||||
|
}
|
||||||
|
const parent = path.dirname(cur);
|
||||||
|
if (parent === cur) break;
|
||||||
|
cur = parent;
|
||||||
|
} catch (e) { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
let localZipPath = null;
|
||||||
|
let localManifestPath = null;
|
||||||
let localZipManifest = null;
|
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;
|
||||||
try {
|
try {
|
||||||
debugLog("Fetching updates from updateClient...");
|
debugLog("Fetching updates from updateClient...");
|
||||||
release = await updateClient.checkForUpdates();
|
release = await updateClient.checkForUpdates();
|
||||||
debugLog(`Update check finished. Found: ${release ? release.version : 'None'}`);
|
debugLog(`Update check finished. Found: ${release ? release.version : 'None'}`);
|
||||||
|
|
||||||
|
let appPkgVer = '0.0.0';
|
||||||
|
try {
|
||||||
|
appPkgVer = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8')).version || '0.0.0';
|
||||||
|
} catch (e) { }
|
||||||
|
|
||||||
|
if (release && release.version) {
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
debugLog(`Update check failed (offline?): ${e.message}`);
|
debugLog(`Update check failed (offline?): ${e.message}`);
|
||||||
sendToTauri('status', { message: `Update server check skipped (${e.message})` });
|
sendToTauri('status', { message: `Update server check skipped (${e.message})` });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const normalizeVer = (v) => (v || '').toString().replace(/^v/, '').trim();
|
||||||
|
|
||||||
if (release) {
|
if (release) {
|
||||||
const hasUpdate = release.version !== localVersion || (release.sha256 && release.sha256 !== localSha);
|
const isNewerSha = release.sha256 && localSha && release.sha256 !== localSha;
|
||||||
|
const isDifferentVer = normalizeVer(release.version) !== normalizeVer(localVersion);
|
||||||
|
const hasUpdate = (isDifferentVer || isNewerSha) && !localZipPath;
|
||||||
|
|
||||||
if (isFirstRun) {
|
if (isFirstRun) {
|
||||||
debugLog("First run. Installing remote build...");
|
debugLog("First run with no local payload. Installing remote build...");
|
||||||
sendToTauri('status', { message: 'First run detected. Preparing initial installation...' });
|
sendToTauri('status', { message: 'First run detected. Preparing initial installation...' });
|
||||||
await installBuild(release);
|
await installBuild(release);
|
||||||
} else if (hasUpdate) {
|
} else if (hasUpdate) {
|
||||||
|
|
||||||
debugLog("Update available. Prompting user...");
|
debugLog("Update available. Prompting user...");
|
||||||
sendToTauri('status', { message: `New update available (${release.version}). Awaiting confirmation...` });
|
sendToTauri('status', { message: `New update available (${release.version}).` });
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
require('child_process').spawnSync('powershell.exe', [
|
||||||
|
'-NoProfile', '-NonInteractive', '-Command',
|
||||||
|
`Get-NetTCPConnection -LocalPort 4891 -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force }`
|
||||||
|
], { stdio: 'ignore', windowsHide: true });
|
||||||
|
} else {
|
||||||
|
require('child_process').spawnSync('fuser', ['-k', '-9', `4891/tcp`], { stdio: 'ignore' });
|
||||||
|
}
|
||||||
|
} catch (e) { }
|
||||||
|
|
||||||
const tempApp = express();
|
const tempApp = express();
|
||||||
let userDecision = null;
|
let userDecision = null;
|
||||||
|
updateDecisionHandler = (val) => { userDecision = val; };
|
||||||
|
|
||||||
tempApp.use((req, res, next) => {
|
tempApp.use((req, res, next) => {
|
||||||
res.header('Access-Control-Allow-Origin', '*');
|
res.header('Access-Control-Allow-Origin', '*');
|
||||||
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
|
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
|
||||||
@@ -274,20 +313,45 @@ async function start() {
|
|||||||
tempApp.get('/update/info', (req, res) => {
|
tempApp.get('/update/info', (req, res) => {
|
||||||
res.json({ available: true, current: localVersion, latest: release.version });
|
res.json({ available: true, current: localVersion, latest: release.version });
|
||||||
});
|
});
|
||||||
tempApp.post('/update/yes', (req, res) => { userDecision = true; res.sendStatus(200); });
|
const handleYes = (req, res) => { debugLog("tempApp received YES"); userDecision = true; res.sendStatus(200); };
|
||||||
tempApp.post('/update/no', (req, res) => { userDecision = false; res.sendStatus(200); });
|
const handleNo = (req, res) => { debugLog("tempApp received NO"); userDecision = false; res.sendStatus(200); };
|
||||||
|
|
||||||
|
tempApp.all('/update/yes', handleYes);
|
||||||
|
tempApp.all('/update/install', handleYes);
|
||||||
|
tempApp.all('/update/no', handleNo);
|
||||||
|
tempApp.all('/update/skip', handleNo);
|
||||||
|
tempApp.all('/update/:choice', (req, res) => {
|
||||||
|
const c = String(req.params.choice || '').toLowerCase();
|
||||||
|
if (c === 'yes' || c === 'install' || c === 'true') userDecision = true;
|
||||||
|
if (c === 'no' || c === 'skip' || c === 'false') userDecision = false;
|
||||||
|
res.sendStatus(200);
|
||||||
|
});
|
||||||
|
|
||||||
const tempServer = await new Promise((resolve) => {
|
const tempServer = await new Promise((resolve) => {
|
||||||
const s = tempApp.listen(4891, '127.0.0.1', () => resolve(s));
|
const s = tempApp.listen(4891, '127.0.0.1', () => resolve(s));
|
||||||
|
s.on('error', (err) => {
|
||||||
|
debugLog(`Update server bind error: ${err.message}`);
|
||||||
|
resolve(null);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
||||||
|
|
||||||
|
let waitLoops = 0;
|
||||||
while (userDecision === null) {
|
while (userDecision === null) {
|
||||||
|
if (waitLoops > 24000) {
|
||||||
|
debugLog("Update decision timed out after 10 minutes, defaulting to skip.");
|
||||||
|
userDecision = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
waitLoops++;
|
||||||
await new Promise(r => setTimeout(r, 25));
|
await new Promise(r => setTimeout(r, 25));
|
||||||
}
|
}
|
||||||
|
|
||||||
await new Promise((resolve) => tempServer.close(resolve));
|
updateDecisionHandler = null;
|
||||||
|
if (tempServer) {
|
||||||
|
tempServer.close();
|
||||||
|
}
|
||||||
|
|
||||||
if (userDecision) {
|
if (userDecision) {
|
||||||
debugLog("User accepted update.");
|
debugLog("User accepted update.");
|
||||||
@@ -327,91 +391,39 @@ async function start() {
|
|||||||
|
|
||||||
sendToTauri('status', { message: 'Validating critical components...' });
|
sendToTauri('status', { message: 'Validating critical components...' });
|
||||||
if (!patcher.verifyExtraction()) {
|
if (!patcher.verifyExtraction()) {
|
||||||
throw new Error('No application files found. Check your internet connection and try again.');
|
throw new Error('No application files found. Ensure you ran "npm run build:payload" and the extraction succeeded.');
|
||||||
}
|
}
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Loading encrypted credentials...' });
|
sendToTauri('status', { message: 'Loading encrypted credentials...' });
|
||||||
serviceManager.credentialManager.loadCredentials();
|
serviceManager.credentialManager.loadCredentials();
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Starting background services (auth-proxy, stream-api)...' });
|
sendToTauri('status', { message: 'Installing dependencies...' });
|
||||||
|
const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
||||||
|
const frontendDir = path.join(APPDATA_DIR, 'frontend');
|
||||||
|
if (fs.existsSync(path.join(frontendDir, 'package.json'))) {
|
||||||
|
const { spawnSync } = require('child_process');
|
||||||
|
spawnSync(npmCmd, ['install'], {
|
||||||
|
cwd: frontendDir,
|
||||||
|
stdio: 'ignore',
|
||||||
|
windowsHide: true,
|
||||||
|
shell: process.platform === 'win32'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
sendToTauri('status', { message: 'Starting services (player, frontend)...' });
|
||||||
await serviceManager.startServices([
|
await serviceManager.startServices([
|
||||||
{ name: 'auth-proxy', relativeDir: 'auth-proxy' },
|
{ name: 'player', relativeDir: 'player', startScript: 'server.js' },
|
||||||
{ name: 'stream-api', relativeDir: 'stream-api' },
|
{ name: 'frontend', relativeDir: 'frontend', startScript: 'server.js' }
|
||||||
]);
|
]);
|
||||||
debugLog("Backend services spawn requested.");
|
debugLog("Backend services spawn requested.");
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Binding player web server on port 3001...' });
|
sendToTauri('status', { message: 'Waiting for microservices to bind...' });
|
||||||
const playerDir = path.join(APPDATA_DIR, 'player');
|
await serviceManager.waitForPorts([3000, 4890]);
|
||||||
playerExpressApp = express();
|
debugLog("Ports 3000 and 4890 are ready.");
|
||||||
playerExpressApp.use((req, res, next) => {
|
|
||||||
res.header('Access-Control-Allow-Origin', '*');
|
|
||||||
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
|
|
||||||
res.header('Access-Control-Allow-Headers', '*');
|
|
||||||
if (req.method === 'OPTIONS') return res.sendStatus(200);
|
|
||||||
next();
|
|
||||||
});
|
|
||||||
playerExpressApp.get('/__tauri_cmd/:cmd', (req, res) => {
|
|
||||||
debugLog(`[PLAYER-SERVER:3001] Command received: ${req.params.cmd} (window: ${req.query.window || 'main'})`);
|
|
||||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
|
||||||
res.sendStatus(200);
|
|
||||||
});
|
|
||||||
playerExpressApp.use(sameTabNavMiddleware(playerDir));
|
|
||||||
playerExpressApp.use(express.static(playerDir, {
|
|
||||||
etag: false,
|
|
||||||
setHeaders: (res) => {
|
|
||||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
playerExpressApp.get('*', (req, res) => {
|
|
||||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
|
||||||
res.sendFile(path.join(playerDir, 'index.html'));
|
|
||||||
});
|
|
||||||
playerExpressServer = playerExpressApp.listen(3001, '127.0.0.1');
|
|
||||||
debugLog("Player Express running on 3001");
|
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Waiting for microservices to bind ports (3000, 3001, 7860)...' });
|
sendToTauri('status', { message: 'All backend services running and healthy.' });
|
||||||
await serviceManager.waitForPorts([3000, 3001, 7860]);
|
debugLog("Sending READY to Tauri.");
|
||||||
debugLog("Ports 3000, 3001, 7860 are ready.");
|
sendToTauri('ready', { url: 'http://127.0.0.1:4890' });
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Binding UI server on port 4890...' });
|
|
||||||
const frontendDir = path.join(APPDATA_DIR, 'frontend');
|
|
||||||
expressApp = express();
|
|
||||||
expressApp.use((req, res, next) => {
|
|
||||||
res.header('Access-Control-Allow-Origin', '*');
|
|
||||||
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
|
|
||||||
res.header('Access-Control-Allow-Headers', '*');
|
|
||||||
if (req.method === 'OPTIONS') return res.sendStatus(200);
|
|
||||||
next();
|
|
||||||
});
|
|
||||||
expressApp.get('/__tauri_cmd/:cmd', (req, res) => {
|
|
||||||
debugLog(`[FRONTEND-SERVER:4890] Command received: ${req.params.cmd} (window: ${req.query.window || 'main'})`);
|
|
||||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
|
||||||
res.sendStatus(200);
|
|
||||||
});
|
|
||||||
|
|
||||||
expressApp.use(sameTabNavMiddleware(frontendDir));
|
|
||||||
expressApp.use(express.static(frontendDir, {
|
|
||||||
etag: false,
|
|
||||||
setHeaders: (res) => {
|
|
||||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
expressApp.get('*', (req, res) => {
|
|
||||||
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
|
||||||
res.sendFile(path.join(frontendDir, 'index.html'));
|
|
||||||
});
|
|
||||||
|
|
||||||
const FRONTEND_PORT = 4890;
|
|
||||||
expressApp.use('/build', express.static(path.join(__dirname, 'build')));
|
|
||||||
if (playerExpressApp) {
|
|
||||||
playerExpressApp.use('/build', express.static(path.join(__dirname, 'build')));
|
|
||||||
}
|
|
||||||
|
|
||||||
expressServer = expressApp.listen(FRONTEND_PORT, '127.0.0.1', () => {
|
|
||||||
sendToTauri('status', { message: 'All backend services running and healthy.' });
|
|
||||||
debugLog("Frontend Express running on 4890. Sending READY to Tauri.");
|
|
||||||
sendToTauri('ready', { url: `http://localhost:${FRONTEND_PORT}` });
|
|
||||||
});
|
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
debugLog(`Fatal Start Error: ${error.message}`);
|
debugLog(`Fatal Start Error: ${error.message}`);
|
||||||
|
|||||||
12
package.json
12
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vyla-home",
|
"name": "vyla-home",
|
||||||
"version": "1.1.25",
|
"version": "1.1.45",
|
||||||
"description": "Vyla Home Desktop App Launcher",
|
"description": "Vyla Home Desktop App Launcher",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -11,11 +11,11 @@
|
|||||||
"release:full": "node release.js --installer"
|
"release:full": "node release.js --installer"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.0.0",
|
"@tauri-apps/api": "^2.12.1",
|
||||||
"@tauri-apps/plugin-opener": "^2.0.0",
|
"@tauri-apps/plugin-opener": "^2.7.0",
|
||||||
"@tauri-apps/plugin-process": "^2.0.0",
|
"@tauri-apps/plugin-process": "^2.4.0",
|
||||||
"@tauri-apps/plugin-shell": "^2.0.0",
|
"@tauri-apps/plugin-shell": "^2.4.0",
|
||||||
"@vyla-entertainment/sdk": "^1.11.0",
|
"@vyla-entertainment/sdk": "^1.18.0",
|
||||||
"adm-zip": "^0.6.0",
|
"adm-zip": "^0.6.0",
|
||||||
"express": "^4.19.2"
|
"express": "^4.19.2"
|
||||||
},
|
},
|
||||||
|
|||||||
41
patcher.js
41
patcher.js
@@ -84,8 +84,25 @@ class Patcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
extractZipPayload(zipPath) {
|
extractZipPayload(zipPath) {
|
||||||
|
const AdmZip = require('adm-zip');
|
||||||
const zip = new AdmZip(zipPath);
|
const zip = new AdmZip(zipPath);
|
||||||
|
const entries = zip.getEntries();
|
||||||
|
|
||||||
|
if (!entries || entries.length === 0) {
|
||||||
|
throw new Error('Downloaded archive is empty, invalid, or truncated.');
|
||||||
|
}
|
||||||
|
|
||||||
zip.extractAllTo(this.appDataPath, true);
|
zip.extractAllTo(this.appDataPath, true);
|
||||||
|
|
||||||
|
const testPath = path.join(this.appDataPath, 'frontend', 'index.html');
|
||||||
|
if (!fs.existsSync(testPath)) {
|
||||||
|
const { execSync } = require('child_process');
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
execSync(`powershell.exe -NoProfile -NonInteractive -Command "Expand-Archive -Path '${zipPath}' -DestinationPath '${this.appDataPath}' -Force"`, { windowsHide: true });
|
||||||
|
} else {
|
||||||
|
execSync(`unzip -o "${zipPath}" -d "${this.appDataPath}"`);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
verifyChecksum(zipPath, expectedSha256) {
|
verifyChecksum(zipPath, expectedSha256) {
|
||||||
@@ -99,10 +116,8 @@ class Patcher {
|
|||||||
|
|
||||||
verifyExtraction() {
|
verifyExtraction() {
|
||||||
const requiredFiles = [
|
const requiredFiles = [
|
||||||
'player/index.html',
|
'frontend/server.js',
|
||||||
'auth-proxy/server.js',
|
'player/server.js'
|
||||||
'stream-api/server.js',
|
|
||||||
'frontend/index.html'
|
|
||||||
];
|
];
|
||||||
|
|
||||||
for (const file of requiredFiles) {
|
for (const file of requiredFiles) {
|
||||||
@@ -114,12 +129,16 @@ class Patcher {
|
|||||||
if (stat.size === 0) {
|
if (stat.size === 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
const sampleSize = Math.min(stat.size, 4096);
|
try {
|
||||||
const fd = fs.openSync(fullPath, 'r');
|
const sampleSize = Math.min(stat.size, 4096);
|
||||||
const buffer = Buffer.alloc(sampleSize);
|
const fd = fs.openSync(fullPath, 'r');
|
||||||
fs.readSync(fd, buffer, 0, sampleSize, 0);
|
const buffer = Buffer.alloc(sampleSize);
|
||||||
fs.closeSync(fd);
|
fs.readSync(fd, buffer, 0, sampleSize, 0);
|
||||||
if (buffer.every(byte => byte === 0)) {
|
fs.closeSync(fd);
|
||||||
|
if (buffer.every(byte => byte === 0)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -155,7 +174,7 @@ class Patcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
applyPatches(replacements) {
|
applyPatches(replacements) {
|
||||||
const targetDirs = ['frontend', 'player', 'auth-proxy', 'stream-api'];
|
const targetDirs = ['frontend', 'player'];
|
||||||
for (const dirName of targetDirs) {
|
for (const dirName of targetDirs) {
|
||||||
const dirPath = path.join(this.appDataPath, dirName);
|
const dirPath = path.join(this.appDataPath, dirName);
|
||||||
if (!fs.existsSync(dirPath)) continue;
|
if (!fs.existsSync(dirPath)) continue;
|
||||||
|
|||||||
@@ -40,18 +40,22 @@ class ServiceManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let tokenSecret = process.env.TOKEN_SECRET ||
|
let tokenSecret = process.env.TOKEN_SECRET ||
|
||||||
process.env.STREAM_API_TOKEN_SECRET ||
|
this.credentialManager.getCredential('player', 'TOKEN_SECRET');
|
||||||
this.credentialManager.getCredential('stream-api', 'TOKEN_SECRET');
|
|
||||||
|
|
||||||
if (!tokenSecret || tokenSecret.length < 32) {
|
if (!tokenSecret || tokenSecret.length < 32) {
|
||||||
tokenSecret = require('crypto').randomBytes(32).toString('hex');
|
tokenSecret = require('crypto').randomBytes(32).toString('hex');
|
||||||
this.credentialManager.setCredential('stream-api', 'TOKEN_SECRET', tokenSecret);
|
this.credentialManager.setCredential('player', 'TOKEN_SECRET', tokenSecret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const defaultPorts = {
|
||||||
|
player: 3000,
|
||||||
|
frontend: 4890
|
||||||
|
};
|
||||||
|
|
||||||
const env = {
|
const env = {
|
||||||
...process.env,
|
...process.env,
|
||||||
|
PORT: (this.envConfig[name] && this.envConfig[name].PORT) || defaultPorts[name] || process.env.PORT || 3000,
|
||||||
TOKEN_SECRET: tokenSecret,
|
TOKEN_SECRET: tokenSecret,
|
||||||
STREAM_API_TOKEN_SECRET: tokenSecret,
|
|
||||||
...(this.envConfig[name] || {}),
|
...(this.envConfig[name] || {}),
|
||||||
...(this.credentialManager.getServiceCredentials(name) || {})
|
...(this.credentialManager.getServiceCredentials(name) || {})
|
||||||
};
|
};
|
||||||
|
|||||||
475
src-tauri/Cargo.lock
generated
475
src-tauri/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.1.25"
|
version = "1.1.45"
|
||||||
description = "Vyla Home Desktop App Launcher"
|
description = "Vyla Home Desktop App Launcher"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
@@ -16,6 +16,9 @@ serde = { version = "1", features = ["derive"] }
|
|||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
|
|
||||||
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
|
objc2 = "0.5"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
opt-level = 3
|
opt-level = 3
|
||||||
lto = true
|
lto = true
|
||||||
|
|||||||
@@ -6,16 +6,8 @@
|
|||||||
<dict>
|
<dict>
|
||||||
<key>NSAllowsLocalNetworking</key>
|
<key>NSAllowsLocalNetworking</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>NSExceptionDomains</key>
|
<key>NSAllowsArbitraryLoads</key>
|
||||||
<dict>
|
<true/>
|
||||||
<key>localhost</key>
|
|
||||||
<dict>
|
|
||||||
<key>NSExceptionAllowsInsecureHTTPLoads</key>
|
|
||||||
<true/>
|
|
||||||
<key>NSIncludesSubdomains</key>
|
|
||||||
<false/>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
@@ -16,5 +16,17 @@ fn main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let node_path = std::path::Path::new("../bin/node");
|
||||||
|
if node_path.exists() {
|
||||||
|
let _ = std::fs::set_permissions(
|
||||||
|
node_path,
|
||||||
|
std::fs::Permissions::from_mode(0o755),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tauri_build::build();
|
tauri_build::build();
|
||||||
}
|
}
|
||||||
File diff suppressed because one or more lines are too long
@@ -626,6 +626,12 @@
|
|||||||
"const": "core:app:allow-default-window-icon",
|
"const": "core:app:allow-default-window-icon",
|
||||||
"markdownDescription": "Enables the default_window_icon command without any pre-configured scope."
|
"markdownDescription": "Enables the default_window_icon command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Enables the exit command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:app:allow-exit",
|
||||||
|
"markdownDescription": "Enables the exit command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Enables the fetch_data_store_identifiers command without any pre-configured scope.",
|
"description": "Enables the fetch_data_store_identifiers command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -716,6 +722,12 @@
|
|||||||
"const": "core:app:deny-default-window-icon",
|
"const": "core:app:deny-default-window-icon",
|
||||||
"markdownDescription": "Denies the default_window_icon command without any pre-configured scope."
|
"markdownDescription": "Denies the default_window_icon command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Denies the exit command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:app:deny-exit",
|
||||||
|
"markdownDescription": "Denies the exit command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Denies the fetch_data_store_identifiers command without any pre-configured scope.",
|
"description": "Denies the fetch_data_store_identifiers command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -1976,6 +1988,12 @@
|
|||||||
"const": "core:window:allow-set-fullscreen",
|
"const": "core:window:allow-set-fullscreen",
|
||||||
"markdownDescription": "Enables the set_fullscreen command without any pre-configured scope."
|
"markdownDescription": "Enables the set_fullscreen command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Enables the set_fullscreen_on_monitor command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:window:allow-set-fullscreen-on-monitor",
|
||||||
|
"markdownDescription": "Enables the set_fullscreen_on_monitor command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Enables the set_icon command without any pre-configured scope.",
|
"description": "Enables the set_icon command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -2444,6 +2462,12 @@
|
|||||||
"const": "core:window:deny-set-fullscreen",
|
"const": "core:window:deny-set-fullscreen",
|
||||||
"markdownDescription": "Denies the set_fullscreen command without any pre-configured scope."
|
"markdownDescription": "Denies the set_fullscreen command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Denies the set_fullscreen_on_monitor command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:window:deny-set-fullscreen-on-monitor",
|
||||||
|
"markdownDescription": "Denies the set_fullscreen_on_monitor command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Denies the set_icon command without any pre-configured scope.",
|
"description": "Denies the set_icon command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
|
|||||||
@@ -626,6 +626,12 @@
|
|||||||
"const": "core:app:allow-default-window-icon",
|
"const": "core:app:allow-default-window-icon",
|
||||||
"markdownDescription": "Enables the default_window_icon command without any pre-configured scope."
|
"markdownDescription": "Enables the default_window_icon command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Enables the exit command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:app:allow-exit",
|
||||||
|
"markdownDescription": "Enables the exit command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Enables the fetch_data_store_identifiers command without any pre-configured scope.",
|
"description": "Enables the fetch_data_store_identifiers command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -716,6 +722,12 @@
|
|||||||
"const": "core:app:deny-default-window-icon",
|
"const": "core:app:deny-default-window-icon",
|
||||||
"markdownDescription": "Denies the default_window_icon command without any pre-configured scope."
|
"markdownDescription": "Denies the default_window_icon command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Denies the exit command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:app:deny-exit",
|
||||||
|
"markdownDescription": "Denies the exit command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Denies the fetch_data_store_identifiers command without any pre-configured scope.",
|
"description": "Denies the fetch_data_store_identifiers command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -1976,6 +1988,12 @@
|
|||||||
"const": "core:window:allow-set-fullscreen",
|
"const": "core:window:allow-set-fullscreen",
|
||||||
"markdownDescription": "Enables the set_fullscreen command without any pre-configured scope."
|
"markdownDescription": "Enables the set_fullscreen command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Enables the set_fullscreen_on_monitor command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:window:allow-set-fullscreen-on-monitor",
|
||||||
|
"markdownDescription": "Enables the set_fullscreen_on_monitor command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Enables the set_icon command without any pre-configured scope.",
|
"description": "Enables the set_icon command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -2444,6 +2462,12 @@
|
|||||||
"const": "core:window:deny-set-fullscreen",
|
"const": "core:window:deny-set-fullscreen",
|
||||||
"markdownDescription": "Denies the set_fullscreen command without any pre-configured scope."
|
"markdownDescription": "Denies the set_fullscreen command without any pre-configured scope."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Denies the set_fullscreen_on_monitor command without any pre-configured scope.",
|
||||||
|
"type": "string",
|
||||||
|
"const": "core:window:deny-set-fullscreen-on-monitor",
|
||||||
|
"markdownDescription": "Denies the set_fullscreen_on_monitor command without any pre-configured scope."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Denies the set_icon command without any pre-configured scope.",
|
"description": "Denies the set_icon command without any pre-configured scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
|
|||||||
@@ -7,11 +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).join("vyla-home").join("vyla-home-files").join("logs")
|
std::path::PathBuf::from(app_data)
|
||||||
|
.join("vyla-home")
|
||||||
|
.join("vyla-home-files")
|
||||||
|
.join("logs")
|
||||||
} else if let Ok(home) = std::env::var("HOME") {
|
} else if let Ok(home) = std::env::var("HOME") {
|
||||||
std::path::PathBuf::from(home).join("Library").join("Logs").join("VylaHome")
|
std::path::PathBuf::from(home)
|
||||||
|
.join("Library")
|
||||||
|
.join("Logs")
|
||||||
|
.join("VylaHome")
|
||||||
} 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).join(".vyla-home").join("logs")
|
std::path::PathBuf::from(user_profile)
|
||||||
|
.join(".vyla-home")
|
||||||
|
.join("logs")
|
||||||
} else {
|
} else {
|
||||||
std::env::temp_dir().join("vyla-home-logs")
|
std::env::temp_dir().join("vyla-home-logs")
|
||||||
};
|
};
|
||||||
@@ -19,7 +27,11 @@ fn debug_log(msg: &str) {
|
|||||||
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().create(true).append(true).open(&log_path) {
|
if let Ok(mut file) = std::fs::OpenOptions::new()
|
||||||
|
.create(true)
|
||||||
|
.append(true)
|
||||||
|
.open(&log_path)
|
||||||
|
{
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
let _ = writeln!(file, "[RUST] {}", msg);
|
let _ = writeln!(file, "[RUST] {}", msg);
|
||||||
}
|
}
|
||||||
@@ -109,6 +121,7 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
|
|||||||
if node_exe.exists() {
|
if node_exe.exists() {
|
||||||
return Some(clean_path(&node_exe));
|
return Some(clean_path(&node_exe));
|
||||||
}
|
}
|
||||||
|
|
||||||
let node = p.join("node");
|
let node = p.join("node");
|
||||||
if node.exists() {
|
if node.exists() {
|
||||||
return Some(clean_path(&node));
|
return Some(clean_path(&node));
|
||||||
@@ -166,7 +179,6 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
|
|||||||
resource_dir.join("_up_").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 {
|
||||||
if candidate.exists() {
|
if candidate.exists() {
|
||||||
let root_dir = candidate.parent().unwrap();
|
let root_dir = candidate.parent().unwrap();
|
||||||
@@ -183,7 +195,34 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
|
|||||||
(clean_path(&candidate), clean_path(&dir))
|
(clean_path(&candidate), clean_path(&dir))
|
||||||
}
|
}
|
||||||
|
|
||||||
const LINK_HANDLER_SCRIPT: &str = r##"
|
const LINK_HANDLER_SCRIPT: &str =
|
||||||
|
r##"
|
||||||
|
|
||||||
|
window.vylaHome = {
|
||||||
|
sendUpdateChoice: function(choice) {
|
||||||
|
var action = choice ? 'yes' : 'no';
|
||||||
|
[4891, 4892].forEach(function(port) {
|
||||||
|
['127.0.0.1', 'localhost'].forEach(function(host) {
|
||||||
|
fetch('http://' + host + ':' + port + '/update/' + action, { method: 'POST' }).catch(function() {});
|
||||||
|
fetch('http://' + host + ':' + port + '/update/' + action, { method: 'GET' }).catch(function() {});
|
||||||
|
fetch('http://' + host + ':' + port + '/__tauri_cmd/update_' + action, { method: 'GET' }).catch(function() {});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener('click', function(e) {
|
||||||
|
var el = e.target.closest('button, a, .btn');
|
||||||
|
if (!el) return;
|
||||||
|
var text = (el.innerText || el.textContent || '').toLowerCase();
|
||||||
|
var id = (el.id || '').toLowerCase();
|
||||||
|
if (id.includes('install') || id.includes('update-yes') || text.includes('install update')) {
|
||||||
|
window.vylaHome.sendUpdateChoice(true);
|
||||||
|
} else if (id.includes('skip') || id.includes('update-no') || text.includes('skip')) {
|
||||||
|
window.vylaHome.sendUpdateChoice(false);
|
||||||
|
}
|
||||||
|
}, true);
|
||||||
|
|
||||||
function doInvoke(cmd, args) {
|
function doInvoke(cmd, args) {
|
||||||
if (window.__TAURI__ && window.__TAURI__.core) {
|
if (window.__TAURI__ && window.__TAURI__.core) {
|
||||||
return window.__TAURI__.core.invoke(cmd, args || {});
|
return window.__TAURI__.core.invoke(cmd, args || {});
|
||||||
@@ -230,113 +269,11 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
|||||||
}, true);
|
}, true);
|
||||||
|
|
||||||
function injectLiquidNavBar() {
|
function injectLiquidNavBar() {
|
||||||
if (document.getElementById('vyla-floating-nav')) return;
|
if (document.getElementById('tauri-custom-titlebar')) return;
|
||||||
if (!document.body) return;
|
if (!document.body) return;
|
||||||
|
|
||||||
const style = document.createElement('style');
|
const style = document.createElement('style');
|
||||||
style.innerHTML = `
|
style.innerHTML = `
|
||||||
#vyla-floating-nav {
|
|
||||||
position: fixed !important;
|
|
||||||
top: 12px !important;
|
|
||||||
left: 12px !important;
|
|
||||||
z-index: 2147483647 !important;
|
|
||||||
height: 42px !important;
|
|
||||||
width: 42px !important;
|
|
||||||
border-radius: 9999px !important;
|
|
||||||
display: flex !important;
|
|
||||||
align-items: center !important;
|
|
||||||
background: rgba(255, 255, 255, 0.04) !important;
|
|
||||||
backdrop-filter: blur(16px) saturate(1.8) contrast(1.1) !important;
|
|
||||||
-webkit-backdrop-filter: blur(16px) saturate(1.8) contrast(1.1) !important;
|
|
||||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.45) !important;
|
|
||||||
transition: width 0.3s cubic-bezier(0.16, 1, 0.3, 1), padding 0.3s cubic-bezier(0.16, 1, 0.3, 1) !important;
|
|
||||||
overflow: hidden !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
user-select: none !important;
|
|
||||||
pointer-events: auto !important;
|
|
||||||
-webkit-app-region: no-drag !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#vyla-floating-nav:hover {
|
|
||||||
width: 82px !important;
|
|
||||||
padding-right: 6px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vyla-nav-logo-wrap {
|
|
||||||
width: 42px !important;
|
|
||||||
min-width: 42px !important;
|
|
||||||
height: 42px !important;
|
|
||||||
display: flex !important;
|
|
||||||
align-items: center !important;
|
|
||||||
justify-content: center !important;
|
|
||||||
cursor: pointer !important;
|
|
||||||
border-radius: 9999px !important;
|
|
||||||
position: relative !important;
|
|
||||||
z-index: 2147483647 !important;
|
|
||||||
pointer-events: auto !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vyla-nav-logo-wrap img {
|
|
||||||
width: 26px !important;
|
|
||||||
height: 26px !important;
|
|
||||||
min-width: 26px !important;
|
|
||||||
min-height: 26px !important;
|
|
||||||
object-fit: contain !important;
|
|
||||||
pointer-events: none !important;
|
|
||||||
display: block !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vyla-nav-links {
|
|
||||||
display: flex !important;
|
|
||||||
align-items: center !important;
|
|
||||||
gap: 4px !important;
|
|
||||||
opacity: 0 !important;
|
|
||||||
transform: translateX(-6px) !important;
|
|
||||||
transition: opacity 0.2s ease, transform 0.25s cubic-bezier(0.16, 1, 0.3, 1) !important;
|
|
||||||
pointer-events: none !important;
|
|
||||||
position: relative !important;
|
|
||||||
z-index: 2 !important;
|
|
||||||
margin-left: 2px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#vyla-floating-nav:hover .vyla-nav-links {
|
|
||||||
opacity: 1 !important;
|
|
||||||
transform: translateX(0) !important;
|
|
||||||
pointer-events: auto !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vyla-nav-btn {
|
|
||||||
width: 32px !important;
|
|
||||||
min-width: 32px !important;
|
|
||||||
height: 32px !important;
|
|
||||||
border-radius: 9999px !important;
|
|
||||||
border: none !important;
|
|
||||||
outline: none !important;
|
|
||||||
background: transparent !important;
|
|
||||||
box-shadow: none !important;
|
|
||||||
color: #ffffff !important;
|
|
||||||
display: flex !important;
|
|
||||||
align-items: center !important;
|
|
||||||
justify-content: center !important;
|
|
||||||
cursor: pointer !important;
|
|
||||||
transition: transform 0.15s ease, opacity 0.2s ease !important;
|
|
||||||
opacity: 0.85 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vyla-nav-btn:hover {
|
|
||||||
opacity: 1 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vyla-nav-btn svg {
|
|
||||||
width: 20px !important;
|
|
||||||
height: 20px !important;
|
|
||||||
fill: #ffffff !important;
|
|
||||||
pointer-events: none !important;
|
|
||||||
display: block !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#tauri-custom-titlebar {
|
#tauri-custom-titlebar {
|
||||||
position: fixed !important;
|
position: fixed !important;
|
||||||
top: 0 !important;
|
top: 0 !important;
|
||||||
@@ -393,38 +330,6 @@ const LINK_HANDLER_SCRIPT: &str = r##"
|
|||||||
`;
|
`;
|
||||||
document.head.appendChild(style);
|
document.head.appendChild(style);
|
||||||
|
|
||||||
const nav = document.createElement('div');
|
|
||||||
nav.id = 'vyla-floating-nav';
|
|
||||||
nav.innerHTML = `
|
|
||||||
<div class="vyla-nav-logo-wrap" title="Go to Home">
|
|
||||||
<img src="https://gitlab.com/vyla-entertainment/home-frontend/-/raw/main/assets/images/icons/logo_white.png" alt="Logo" />
|
|
||||||
</div>
|
|
||||||
<div class="vyla-nav-links">
|
|
||||||
<button class="vyla-nav-btn" id="vyla-btn-discord" title="Discord Community">
|
|
||||||
<svg viewBox="0 0 127.14 96.36"><path d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,45.91,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,45.91,96.12,53,91.08,65.69,84.69,65.69Z"/></svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
document.body.appendChild(nav);
|
|
||||||
|
|
||||||
const logoBtn = nav.querySelector('.vyla-nav-logo-wrap');
|
|
||||||
if (logoBtn) {
|
|
||||||
logoBtn.onclick = (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
window.location.href = 'http://localhost:4890';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const btnDiscord = nav.querySelector('#vyla-btn-discord');
|
|
||||||
if (btnDiscord) {
|
|
||||||
btnDiscord.onclick = (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
openExternalUrl('https://discord.gg/5eqRhKeywG');
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const tb = document.createElement('div');
|
const tb = document.createElement('div');
|
||||||
tb.id = 'tauri-custom-titlebar';
|
tb.id = 'tauri-custom-titlebar';
|
||||||
tb.innerHTML = `
|
tb.innerHTML = `
|
||||||
@@ -455,11 +360,12 @@ 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();
|
||||||
}
|
}
|
||||||
|
|
||||||
const navObserver = new MutationObserver(() => {
|
const navObserver = new MutationObserver(() => {
|
||||||
if (!document.getElementById('vyla-floating-nav')) {
|
if (!document.getElementById('vyla-floating-nav')) {
|
||||||
injectLiquidNavBar();
|
injectLiquidNavBar();
|
||||||
@@ -503,9 +409,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") {
|
||||||
@@ -578,6 +484,123 @@ fn get_logo_base64(app: tauri::AppHandle) -> Result<String, String> {
|
|||||||
Err("icon_white.png not found".to_string())
|
Err("icon_white.png not found".to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn handle_tauri_cmd(w: &tauri::WebviewWindow, msg: &BackendMessage) {
|
||||||
|
let window_label = msg
|
||||||
|
.data
|
||||||
|
.get("window")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("main");
|
||||||
|
|
||||||
|
debug_log(&format!("[MAIN-DEBUG] Finding window by label: {}", window_label));
|
||||||
|
|
||||||
|
let cmd_window = match w.app_handle().get_webview_window(window_label) {
|
||||||
|
Some(win) => win,
|
||||||
|
None => {
|
||||||
|
debug_log(&format!("[TAURI-CMD] Window '{}' NOT FOUND!", window_label));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let cmd = match msg.data.get("cmd").and_then(|c| c.as_str()) {
|
||||||
|
Some(c) => c,
|
||||||
|
None => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
debug_log(&format!("[TAURI-CMD] Executing action: {}", cmd));
|
||||||
|
|
||||||
|
match cmd {
|
||||||
|
"win_minimize" => {
|
||||||
|
let res = cmd_window.minimize();
|
||||||
|
debug_log(&format!("[TAURI-CMD] Minimize result: {:?}", res));
|
||||||
|
}
|
||||||
|
"win_maximize" => {
|
||||||
|
let is_max = cmd_window.is_maximized().unwrap_or(false);
|
||||||
|
debug_log(&format!("[TAURI-CMD] Currently maximized: {}", is_max));
|
||||||
|
let res = if is_max {
|
||||||
|
cmd_window.unmaximize()
|
||||||
|
} else {
|
||||||
|
cmd_window.maximize()
|
||||||
|
};
|
||||||
|
debug_log(&format!("[TAURI-CMD] Maximize/Unmaximize result: {:?}", res));
|
||||||
|
}
|
||||||
|
"win_close" => {
|
||||||
|
let res = cmd_window.close();
|
||||||
|
debug_log(&format!("[TAURI-CMD] Close result: {:?}", res));
|
||||||
|
}
|
||||||
|
"win_drag" => {
|
||||||
|
let res = cmd_window.start_dragging();
|
||||||
|
debug_log(&format!("[TAURI-CMD] Drag result: {:?}", res));
|
||||||
|
}
|
||||||
|
"open_new_window" => {
|
||||||
|
debug_log("[TAURI-CMD-DEBUG] open_new_window command received");
|
||||||
|
debug_log(&format!(
|
||||||
|
"[TAURI-CMD-DEBUG] Full message data: {}",
|
||||||
|
serde_json::to_string(&msg.data).unwrap_or_default()
|
||||||
|
));
|
||||||
|
|
||||||
|
let url = match msg.data.get("url").and_then(|u| u.as_str()) {
|
||||||
|
Some(u) => u.to_string(),
|
||||||
|
None => {
|
||||||
|
debug_log("[TAURI-CMD-DEBUG] ERROR: No URL found in message data");
|
||||||
|
debug_log(&format!(
|
||||||
|
"[TAURI-CMD-DEBUG] Available keys: {:?}",
|
||||||
|
msg.data.as_object().map(|o| o.keys().collect::<Vec<_>>())
|
||||||
|
));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
debug_log(&format!("[TAURI-CMD-DEBUG] URL extracted: {}", url));
|
||||||
|
debug_log(&format!("[TAURI-CMD-DEBUG] URL length: {}", url.len()));
|
||||||
|
debug_log("[TAURI-CMD-DEBUG] Attempting to dispatch to main thread");
|
||||||
|
|
||||||
|
let app_handle = w.app_handle().clone();
|
||||||
|
let closure_handle = app_handle.clone();
|
||||||
|
|
||||||
|
match app_handle.run_on_main_thread(move || {
|
||||||
|
debug_log("[TAURI-CMD-DEBUG] Now on main thread, calling open_new_window");
|
||||||
|
match open_new_window(closure_handle, url) {
|
||||||
|
Ok(_) => debug_log("[TAURI-CMD-DEBUG] open_new_window succeeded"),
|
||||||
|
Err(e) => debug_log(&format!("[TAURI-CMD-DEBUG] open_new_window error: {}", e)),
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
Ok(_) => debug_log("[TAURI-CMD-DEBUG] Main thread dispatch succeeded"),
|
||||||
|
Err(e) => debug_log(&format!("[TAURI-CMD-DEBUG] Main thread dispatch failed: {}", e)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle_ready(w: &tauri::WebviewWindow, msg: &BackendMessage) {
|
||||||
|
let url_str = match msg.data.get("url").and_then(|u| u.as_str()) {
|
||||||
|
Some(u) => u,
|
||||||
|
None => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
let url_parsed = match url_str.parse::<tauri::Url>() {
|
||||||
|
Ok(u) => u,
|
||||||
|
Err(_) => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
{
|
||||||
|
use objc2::msg_send;
|
||||||
|
use objc2::runtime::AnyObject;
|
||||||
|
debug_log("Attempting with_webview on ready event");
|
||||||
|
let result = w.with_webview(|webview| unsafe {
|
||||||
|
debug_log("Inside with_webview closure");
|
||||||
|
let wk_webview = webview.inner() as *mut AnyObject;
|
||||||
|
let config: *mut AnyObject = msg_send![wk_webview, configuration];
|
||||||
|
let _: () = msg_send![config, setUpgradeKnownHostsToHTTPS: false];
|
||||||
|
debug_log("setUpgradeKnownHostsToHTTPS set to false");
|
||||||
|
});
|
||||||
|
debug_log(&format!("with_webview result: {:?}", result));
|
||||||
|
}
|
||||||
|
|
||||||
|
let _ = w.navigate(url_parsed);
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
debug_log("=== Vyla Home Executable Started ===");
|
debug_log("=== Vyla Home Executable Started ===");
|
||||||
|
|
||||||
@@ -603,7 +626,7 @@ fn main() {
|
|||||||
std::path::PathBuf::from(appdata_env)
|
std::path::PathBuf::from(appdata_env)
|
||||||
.join("vyla-home")
|
.join("vyla-home")
|
||||||
.join("vyla-home-files")
|
.join("vyla-home-files")
|
||||||
} else if let Ok(home) = std::env::var("HOME") {
|
} else if let Ok(home) = std::env::var("HOME") {
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
let base = std::path::PathBuf::from(&home)
|
let base = std::path::PathBuf::from(&home)
|
||||||
.join("Library")
|
.join("Library")
|
||||||
@@ -619,34 +642,7 @@ fn main() {
|
|||||||
app_data.join("vyla-home-files")
|
app_data.join("vyla-home-files")
|
||||||
};
|
};
|
||||||
|
|
||||||
let version_file = vyla_files.join("version.json");
|
let _ = std::fs::create_dir_all(&vyla_files);
|
||||||
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")
|
||||||
@@ -660,6 +656,7 @@ fn main() {
|
|||||||
|
|
||||||
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...");
|
debug_log("Searching for node binary...");
|
||||||
|
|
||||||
let node_bin = match find_node_binary(app) {
|
let node_bin = match find_node_binary(app) {
|
||||||
Some(bin) => {
|
Some(bin) => {
|
||||||
debug_log(&format!("Found node binary: {}", bin));
|
debug_log(&format!("Found node binary: {}", bin));
|
||||||
@@ -675,7 +672,6 @@ fn main() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let vyla_files_str = clean_path(&vyla_files);
|
let vyla_files_str = clean_path(&vyla_files);
|
||||||
|
|
||||||
std::thread::sleep(std::time::Duration::from_millis(400));
|
std::thread::sleep(std::time::Duration::from_millis(400));
|
||||||
|
|
||||||
let mut cmd = Command::new(&node_bin);
|
let mut cmd = Command::new(&node_bin);
|
||||||
@@ -700,6 +696,7 @@ fn main() {
|
|||||||
"Node child process spawned successfully, PID: {}",
|
"Node child process spawned successfully, PID: {}",
|
||||||
child.id()
|
child.id()
|
||||||
));
|
));
|
||||||
|
|
||||||
if let Some(stderr) = child.stderr.take() {
|
if let Some(stderr) = child.stderr.take() {
|
||||||
let w = window.clone();
|
let w = window.clone();
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
@@ -707,8 +704,14 @@ fn main() {
|
|||||||
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") {
|
if line.contains("Error")
|
||||||
let _ = w.emit("error", serde_json::json!({ "message": format!("Backend failed: {}", line) }));
|
|| line.contains("Exception")
|
||||||
|
|| line.contains("MODULE_NOT_FOUND")
|
||||||
|
{
|
||||||
|
let _ = w.emit(
|
||||||
|
"error",
|
||||||
|
serde_json::json!({ "message": format!("Backend failed: {}", line) }),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -721,144 +724,27 @@ fn main() {
|
|||||||
let reader = BufReader::new(stdout);
|
let reader = BufReader::new(stdout);
|
||||||
for line in reader.lines().flatten() {
|
for line in reader.lines().flatten() {
|
||||||
debug_log(&format!("[NODE STDOUT] {}", line));
|
debug_log(&format!("[NODE STDOUT] {}", line));
|
||||||
if let Ok(msg) = serde_json::from_str::<BackendMessage>(&line) {
|
|
||||||
debug_log(&format!("[MAIN-DEBUG] Received event: {}", msg.event));
|
|
||||||
debug_log(&format!(
|
|
||||||
"[MAIN-DEBUG] Event data: {}",
|
|
||||||
serde_json::to_string(&msg.data).unwrap_or_default()
|
|
||||||
));
|
|
||||||
if msg.event == "tauri-cmd" {
|
|
||||||
let window_label = msg
|
|
||||||
.data
|
|
||||||
.get("window")
|
|
||||||
.and_then(|val| val.as_str())
|
|
||||||
.unwrap_or("main");
|
|
||||||
debug_log(&format!(
|
|
||||||
"[MAIN-DEBUG] Finding window by label: {}",
|
|
||||||
window_label
|
|
||||||
));
|
|
||||||
|
|
||||||
if let Some(cmd_window) =
|
let msg = match serde_json::from_str::<BackendMessage>(&line) {
|
||||||
w.app_handle().get_webview_window(window_label)
|
Ok(m) => m,
|
||||||
{
|
Err(_) => {
|
||||||
if let Some(cmd) =
|
if !line.trim().is_empty() {
|
||||||
msg.data.get("cmd").and_then(|c| c.as_str())
|
debug_log(&format!("[NODE RAW] {}", line));
|
||||||
{
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD] Executing action: {}",
|
|
||||||
cmd
|
|
||||||
));
|
|
||||||
match cmd {
|
|
||||||
"win_minimize" => {
|
|
||||||
let res = cmd_window.minimize();
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD] Minimize result: {:?}",
|
|
||||||
res
|
|
||||||
));
|
|
||||||
}
|
|
||||||
"win_maximize" => {
|
|
||||||
let is_max = cmd_window
|
|
||||||
.is_maximized()
|
|
||||||
.unwrap_or(false);
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD] Currently maximized: {}",
|
|
||||||
is_max
|
|
||||||
));
|
|
||||||
let res = if is_max {
|
|
||||||
cmd_window.unmaximize()
|
|
||||||
} else {
|
|
||||||
cmd_window.maximize()
|
|
||||||
};
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD] Maximize/Unmaximize result: {:?}",
|
|
||||||
res
|
|
||||||
));
|
|
||||||
}
|
|
||||||
"win_close" => {
|
|
||||||
let res = cmd_window.close();
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD] Close result: {:?}",
|
|
||||||
res
|
|
||||||
));
|
|
||||||
}
|
|
||||||
"win_drag" => {
|
|
||||||
let res = cmd_window.start_dragging();
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD] Drag result: {:?}",
|
|
||||||
res
|
|
||||||
));
|
|
||||||
}
|
|
||||||
"open_new_window" => {
|
|
||||||
debug_log("[TAURI-CMD-DEBUG] open_new_window command received");
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD-DEBUG] Full message data: {}",
|
|
||||||
serde_json::to_string(&msg.data)
|
|
||||||
.unwrap_or_default()
|
|
||||||
));
|
|
||||||
if let Some(url) = msg
|
|
||||||
.data
|
|
||||||
.get("url")
|
|
||||||
.and_then(|u| u.as_str())
|
|
||||||
{
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD-DEBUG] URL extracted: {}",
|
|
||||||
url
|
|
||||||
));
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD-DEBUG] URL length: {}",
|
|
||||||
url.len()
|
|
||||||
));
|
|
||||||
debug_log("[TAURI-CMD-DEBUG] Attempting to dispatch to main thread");
|
|
||||||
let app_handle = w.app_handle().clone();
|
|
||||||
let closure_handle = app_handle.clone();
|
|
||||||
let url_owned = url.to_string();
|
|
||||||
let dispatch_result = app_handle
|
|
||||||
.run_on_main_thread(move || {
|
|
||||||
debug_log("[TAURI-CMD-DEBUG] Now on main thread, calling open_new_window");
|
|
||||||
match open_new_window(
|
|
||||||
closure_handle,
|
|
||||||
url_owned,
|
|
||||||
) {
|
|
||||||
Ok(_) => {
|
|
||||||
debug_log("[TAURI-CMD-DEBUG] open_new_window succeeded");
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD-DEBUG] open_new_window error: {}",
|
|
||||||
e
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
match dispatch_result {
|
|
||||||
Ok(_) => debug_log(
|
|
||||||
"[TAURI-CMD-DEBUG] Main thread dispatch succeeded",
|
|
||||||
),
|
|
||||||
Err(e) => debug_log(&format!(
|
|
||||||
"[TAURI-CMD-DEBUG] Main thread dispatch failed: {}",
|
|
||||||
e
|
|
||||||
)),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
debug_log("[TAURI-CMD-DEBUG] ERROR: No URL found in message data");
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD-DEBUG] Available keys: {:?}",
|
|
||||||
msg.data
|
|
||||||
.as_object()
|
|
||||||
.map(|o| o.keys().collect::<Vec<_>>())
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
debug_log(&format!(
|
|
||||||
"[TAURI-CMD] Window '{}' NOT FOUND!",
|
|
||||||
window_label
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
} else {
|
continue;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
debug_log(&format!("[MAIN-DEBUG] Received event: {}", msg.event));
|
||||||
|
debug_log(&format!(
|
||||||
|
"[MAIN-DEBUG] Event data: {}",
|
||||||
|
serde_json::to_string(&msg.data).unwrap_or_default()
|
||||||
|
));
|
||||||
|
|
||||||
|
match msg.event.as_str() {
|
||||||
|
"tauri-cmd" => handle_tauri_cmd(&w, &msg),
|
||||||
|
"ready" => handle_ready(&w, &msg),
|
||||||
|
_ => {
|
||||||
let _ = w.emit(&msg.event, msg.data.clone());
|
let _ = w.emit(&msg.event, msg.data.clone());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -884,7 +770,7 @@ fn main() {
|
|||||||
|
|
||||||
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();
|
||||||
|
|||||||
@@ -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.25",
|
"version": "1.1.45",
|
||||||
"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": "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:"
|
"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": {
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
],
|
],
|
||||||
"macOS": {
|
"macOS": {
|
||||||
"exceptionDomain": "localhost",
|
"exceptionDomain": "localhost",
|
||||||
"infoPlist": "../Info.plist"
|
"infoPlist": "Info.plist"
|
||||||
},
|
},
|
||||||
"windows": {
|
"windows": {
|
||||||
"webviewInstallMode": {
|
"webviewInstallMode": {
|
||||||
|
|||||||
@@ -196,7 +196,7 @@
|
|||||||
<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"
|
<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;">
|
style="display: none; width: 100%; max-height: 180px; overflow-y: auto; background: rgba(255, 50, 50, 0.12); border-radius: 15px; 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>
|
||||||
<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>
|
||||||
@@ -516,6 +516,9 @@ void main() {
|
|||||||
const btnYes = document.getElementById("btn-update-yes");
|
const btnYes = document.getElementById("btn-update-yes");
|
||||||
const btnNo = document.getElementById("btn-update-no");
|
const btnNo = document.getElementById("btn-update-no");
|
||||||
|
|
||||||
|
if (actionsEl) actionsEl.style.display = "none";
|
||||||
|
if (progressTrack) progressTrack.style.display = "none";
|
||||||
|
|
||||||
let currentStatusText = "";
|
let currentStatusText = "";
|
||||||
|
|
||||||
function setStatus(text, color = "rgba(255, 255, 255, 0.85)") {
|
function setStatus(text, color = "rgba(255, 255, 255, 0.85)") {
|
||||||
@@ -567,17 +570,18 @@ void main() {
|
|||||||
const data = e.payload || e;
|
const data = e.payload || e;
|
||||||
if (data) {
|
if (data) {
|
||||||
if (progressTrack) progressTrack.style.display = "block";
|
if (progressTrack) progressTrack.style.display = "block";
|
||||||
const percent = data.percent || 0;
|
if (progressFill && data.percent !== undefined) {
|
||||||
if (progressFill) progressFill.style.width = percent + "%";
|
progressFill.style.width = `${data.percent}%`;
|
||||||
if (!currentStatusText.startsWith("Downloading update...")) {
|
|
||||||
setStatus("Downloading update...");
|
|
||||||
}
|
}
|
||||||
|
if (actionsEl) actionsEl.style.display = "none";
|
||||||
|
setStatus(`Downloading update... ${data.percent !== undefined ? data.percent + '%' : ''}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
eventApi.listen("update-available", (e) => {
|
eventApi.listen("update-available", (e) => {
|
||||||
const data = e.payload || e;
|
const data = e.payload || e;
|
||||||
if (data) {
|
if (data && data.latest) {
|
||||||
|
if (progressTrack) progressTrack.style.display = "none";
|
||||||
setStatus(`Update Available: ${data.latest} (Current: ${data.current})`);
|
setStatus(`Update Available: ${data.latest} (Current: ${data.current})`);
|
||||||
if (actionsEl) actionsEl.style.display = "flex";
|
if (actionsEl) actionsEl.style.display = "flex";
|
||||||
}
|
}
|
||||||
@@ -586,8 +590,9 @@ 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) {
|
||||||
|
if (progressTrack) progressTrack.style.display = "none";
|
||||||
|
if (actionsEl) actionsEl.style.display = "none";
|
||||||
setStatus("Launching...");
|
setStatus("Launching...");
|
||||||
window.location.replace(data.url);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -602,7 +607,10 @@ void main() {
|
|||||||
btnYes.addEventListener("click", () => {
|
btnYes.addEventListener("click", () => {
|
||||||
if (actionsEl) actionsEl.style.display = "none";
|
if (actionsEl) actionsEl.style.display = "none";
|
||||||
setStatus("Starting update installation...");
|
setStatus("Starting update installation...");
|
||||||
fetch("http://127.0.0.1:4891/update/yes", { method: "POST" }).catch(() => { });
|
fetch("http://127.0.0.1:4891/update/yes", { method: "POST" }).catch((err) => {
|
||||||
|
setStatus("Failed to reach update service. Retrying...", "#fca5a5");
|
||||||
|
showDebug(err.message);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
btnNo.addEventListener("click", () => {
|
btnNo.addEventListener("click", () => {
|
||||||
|
|||||||
@@ -136,7 +136,14 @@ class UpdateClient {
|
|||||||
});
|
});
|
||||||
|
|
||||||
file.on('finish', () => {
|
file.on('finish', () => {
|
||||||
file.close(resolve);
|
file.close(() => {
|
||||||
|
if (totalSize && downloadedSize < totalSize) {
|
||||||
|
fs.unlink(destPath, () => { });
|
||||||
|
reject(new Error(`Download truncated: Received ${downloadedSize} of ${totalSize} bytes. Connection dropped prematurely.`));
|
||||||
|
} else {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
file.on('error', (err) => {
|
file.on('error', (err) => {
|
||||||
@@ -150,10 +157,10 @@ class UpdateClient {
|
|||||||
reject(err);
|
reject(err);
|
||||||
});
|
});
|
||||||
|
|
||||||
req.setTimeout(120000, () => {
|
req.setTimeout(900000, () => {
|
||||||
req.destroy();
|
req.destroy();
|
||||||
fs.unlink(destPath, () => { });
|
fs.unlink(destPath, () => { });
|
||||||
reject(new Error('Download timeout'));
|
reject(new Error('Download timeout (15 minutes reached)'));
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user