Compare commits

..

11 Commits

11 changed files with 198 additions and 37 deletions

4
.gitignore vendored
View File

@@ -35,4 +35,6 @@ yarn-error.log*
*.tmp
*.temp
download-temp.zip
download-temp.zip
.env

47
LICENSE Normal file
View 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.

View File

@@ -172,7 +172,6 @@ function validatePayload(zipPath) {
zip.extractAllTo(TEMP_EXTRACT_DIR, true);
const requiredFiles = [
'player/server.js',
'frontend/index.html'
];

85
main.js
View File

@@ -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, '127.0.0.1', () => 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) => { debugLog("tempApp received YES"); userDecision = true; 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 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 });
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...' });
@@ -427,10 +480,10 @@ async function start() {
const FRONTEND_PORT = 4890;
expressApp.use('/build', express.static(path.join(__dirname, 'build')));
expressServer = expressApp.listen(FRONTEND_PORT, () => {
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}` });
sendToTauri('ready', { url: `http://127.0.0.1:${FRONTEND_PORT}` });
});
} catch (error) {

View File

@@ -1,6 +1,6 @@
{
"name": "vyla-home",
"version": "1.1.33",
"version": "1.1.38",
"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"
},

View File

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

@@ -4238,7 +4238,7 @@ dependencies = [
[[package]]
name = "vyla-home"
version = "1.1.33"
version = "1.1.38"
dependencies = [
"base64 0.22.1",
"objc2 0.5.2",

View File

@@ -1,6 +1,6 @@
[package]
name = "vyla-home"
version = "1.1.33"
version = "1.1.38"
description = "Vyla Home Desktop App Launcher"
edition = "2021"

View File

@@ -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 || {});
@@ -421,7 +448,7 @@ const LINK_HANDLER_SCRIPT: &str = r##"
logoBtn.onclick = (e) => {
e.preventDefault();
e.stopPropagation();
window.location.href = 'http://localhost:4890';
window.location.href = 'http://127.0.0.1:4890';
};
}
@@ -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));

View File

@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "Vyla Home",
"version": "1.1.33",
"version": "1.1.38",
"identifier": "com.vyla.home",
"build": {
"frontendDist": "../ui"

View File

@@ -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)'));
});
};