mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-13 21:57:21 -05:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 97ba68bd97 | |||
| 2de96960d9 | |||
| 8fd8be0d05 | |||
| e3283fff45 | |||
| 64ed5981be | |||
| ba8266bd86 | |||
| bb39db0272 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -35,4 +35,6 @@ yarn-error.log*
|
||||
|
||||
*.tmp
|
||||
*.temp
|
||||
download-temp.zip
|
||||
download-temp.zip
|
||||
|
||||
.env
|
||||
@@ -172,7 +172,6 @@ function validatePayload(zipPath) {
|
||||
zip.extractAllTo(TEMP_EXTRACT_DIR, true);
|
||||
|
||||
const requiredFiles = [
|
||||
'player/server.js',
|
||||
'frontend/index.html'
|
||||
];
|
||||
|
||||
|
||||
83
main.js
83
main.js
@@ -34,6 +34,7 @@ debugLog("--- Node.js Process Started ---");
|
||||
let serviceManager;
|
||||
let expressApp;
|
||||
let expressServer;
|
||||
let updateDecisionHandler = null;
|
||||
|
||||
debugLog(`AppData Dir: ${APPDATA_DIR}`);
|
||||
|
||||
@@ -84,12 +85,25 @@ cmdApp.use((req, res, next) => {
|
||||
if (req.method === 'OPTIONS') return res.sendStatus(200);
|
||||
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) => {
|
||||
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'})`);
|
||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
||||
res.sendStatus(200);
|
||||
});
|
||||
cmdApp.listen(4892, '127.0.0.1', () => debugLog("[CMD-SERVER] Dedicated command server listening on 127.0.0.1:4892"));
|
||||
cmdApp.listen(4892, () => debugLog("[CMD-SERVER] Dedicated command server listening on port 4892"));
|
||||
|
||||
process.stdin.resume();
|
||||
process.stdin.on('end', () => {
|
||||
@@ -216,18 +230,20 @@ async function start() {
|
||||
debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}, Local SHA: ${localSha}`);
|
||||
|
||||
function findLocalZip() {
|
||||
const searchRoots = [__dirname, process.cwd()];
|
||||
const searchRoots = [__dirname, process.cwd(), path.join(__dirname, '../../..')];
|
||||
for (const root of searchRoots) {
|
||||
let cur = root;
|
||||
for (let i = 0; i < 6; i++) {
|
||||
const zp = path.join(cur, 'update-payload.zip');
|
||||
if (fs.existsSync(zp)) {
|
||||
const mp = path.join(cur, 'manifest.json');
|
||||
return { zipPath: zp, manifestPath: fs.existsSync(mp) ? mp : null };
|
||||
}
|
||||
const parent = path.dirname(cur);
|
||||
if (parent === cur) break;
|
||||
cur = parent;
|
||||
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;
|
||||
@@ -309,8 +325,21 @@ async function start() {
|
||||
debugLog("Update available. Prompting user...");
|
||||
sendToTauri('status', { message: `New update available (${release.version}). Awaiting confirmation...` });
|
||||
|
||||
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();
|
||||
let userDecision = null;
|
||||
updateDecisionHandler = (val) => { userDecision = val; };
|
||||
|
||||
tempApp.use((req, res, next) => {
|
||||
res.header('Access-Control-Allow-Origin', '*');
|
||||
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
|
||||
@@ -321,20 +350,44 @@ async function start() {
|
||||
tempApp.get('/update/info', (req, res) => {
|
||||
res.json({ available: true, current: localVersion, latest: release.version });
|
||||
});
|
||||
tempApp.post('/update/yes', (req, res) => { userDecision = true; res.sendStatus(200); });
|
||||
tempApp.post('/update/no', (req, res) => { userDecision = false; res.sendStatus(200); });
|
||||
const handleYes = (req, res) => { userDecision = true; res.sendStatus(200); };
|
||||
const handleNo = (req, res) => { 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 s = tempApp.listen(4891, '127.0.0.1', () => resolve(s));
|
||||
const s = tempApp.listen(4891, () => resolve(s));
|
||||
s.on('error', (err) => {
|
||||
debugLog(`Update server bind error: ${err.message}`);
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
|
||||
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
||||
|
||||
let waitLoops = 0;
|
||||
while (userDecision === null) {
|
||||
if (!tempServer && waitLoops > 400) {
|
||||
userDecision = false;
|
||||
break;
|
||||
}
|
||||
waitLoops++;
|
||||
await new Promise(r => setTimeout(r, 25));
|
||||
}
|
||||
|
||||
await new Promise((resolve) => tempServer.close(resolve));
|
||||
updateDecisionHandler = null;
|
||||
if (tempServer) {
|
||||
tempServer.close();
|
||||
}
|
||||
|
||||
if (userDecision) {
|
||||
debugLog("User accepted update.");
|
||||
@@ -374,7 +427,7 @@ async function start() {
|
||||
|
||||
sendToTauri('status', { message: 'Validating critical components...' });
|
||||
if (!patcher.verifyExtraction()) {
|
||||
throw new Error('No application files found. Ensure you run "npm run build:payload" to generate the local development payload.');
|
||||
throw new Error('No application files found. Ensure you ran "npm run build:payload" and the extraction succeeded.');
|
||||
}
|
||||
|
||||
sendToTauri('status', { message: 'Loading encrypted credentials...' });
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vyla-home",
|
||||
"version": "1.1.33",
|
||||
"version": "1.1.37",
|
||||
"description": "Vyla Home Desktop App Launcher",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
@@ -15,7 +15,7 @@
|
||||
"@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",
|
||||
"@vyla-entertainment/sdk": "^1.12.0",
|
||||
"adm-zip": "^0.6.0",
|
||||
"express": "^4.19.2"
|
||||
},
|
||||
|
||||
37
patcher.js
37
patcher.js
@@ -84,8 +84,25 @@ class Patcher {
|
||||
}
|
||||
|
||||
extractZipPayload(zipPath) {
|
||||
const AdmZip = require('adm-zip');
|
||||
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);
|
||||
|
||||
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) {
|
||||
@@ -99,8 +116,8 @@ class Patcher {
|
||||
|
||||
verifyExtraction() {
|
||||
const requiredFiles = [
|
||||
'player/server.js',
|
||||
'frontend/index.html'
|
||||
'frontend/index.html',
|
||||
'player/server.js'
|
||||
];
|
||||
|
||||
for (const file of requiredFiles) {
|
||||
@@ -112,12 +129,16 @@ class Patcher {
|
||||
if (stat.size === 0) {
|
||||
return false;
|
||||
}
|
||||
const sampleSize = Math.min(stat.size, 4096);
|
||||
const fd = fs.openSync(fullPath, 'r');
|
||||
const buffer = Buffer.alloc(sampleSize);
|
||||
fs.readSync(fd, buffer, 0, sampleSize, 0);
|
||||
fs.closeSync(fd);
|
||||
if (buffer.every(byte => byte === 0)) {
|
||||
try {
|
||||
const sampleSize = Math.min(stat.size, 4096);
|
||||
const fd = fs.openSync(fullPath, 'r');
|
||||
const buffer = Buffer.alloc(sampleSize);
|
||||
fs.readSync(fd, buffer, 0, sampleSize, 0);
|
||||
fs.closeSync(fd);
|
||||
if (buffer.every(byte => byte === 0)) {
|
||||
return false;
|
||||
}
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
2
src-tauri/Cargo.lock
generated
2
src-tauri/Cargo.lock
generated
@@ -4238,7 +4238,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "vyla-home"
|
||||
version = "1.1.33"
|
||||
version = "1.1.37"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"objc2 0.5.2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "vyla-home"
|
||||
version = "1.1.33"
|
||||
version = "1.1.37"
|
||||
description = "Vyla Home Desktop App Launcher"
|
||||
edition = "2021"
|
||||
|
||||
|
||||
@@ -195,7 +195,34 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
|
||||
(clean_path(&candidate), clean_path(&dir))
|
||||
}
|
||||
|
||||
const LINK_HANDLER_SCRIPT: &str = r##"
|
||||
const LINK_HANDLER_SCRIPT: &str =
|
||||
r##"
|
||||
|
||||
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) {
|
||||
if (window.__TAURI__ && window.__TAURI__.core) {
|
||||
return window.__TAURI__.core.invoke(cmd, args || {});
|
||||
@@ -831,7 +858,12 @@ fn main() {
|
||||
|
||||
let msg = match serde_json::from_str::<BackendMessage>(&line) {
|
||||
Ok(m) => m,
|
||||
Err(_) => continue,
|
||||
Err(_) => {
|
||||
if !line.trim().is_empty() {
|
||||
debug_log(&format!("[NODE RAW] {}", line));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
debug_log(&format!("[MAIN-DEBUG] Received event: {}", msg.event));
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "Vyla Home",
|
||||
"version": "1.1.33",
|
||||
"version": "1.1.37",
|
||||
"identifier": "com.vyla.home",
|
||||
"build": {
|
||||
"frontendDist": "../ui"
|
||||
|
||||
@@ -136,7 +136,14 @@ class UpdateClient {
|
||||
});
|
||||
|
||||
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) => {
|
||||
@@ -150,10 +157,10 @@ class UpdateClient {
|
||||
reject(err);
|
||||
});
|
||||
|
||||
req.setTimeout(120000, () => {
|
||||
req.setTimeout(900000, () => {
|
||||
req.destroy();
|
||||
fs.unlink(destPath, () => { });
|
||||
reject(new Error('Download timeout'));
|
||||
reject(new Error('Download timeout (15 minutes reached)'));
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user