mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-14 14:17:25 -05:00
Compare commits
62 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 11d6c346e8 | |||
| c986194e64 | |||
| 33e285953c | |||
| f46869f967 | |||
| b19e6b21c9 | |||
| c8ea2598b9 | |||
| e3257b8a3a | |||
| fbb5a4437d | |||
| dbaab9a00e | |||
| fc49bb93a7 | |||
| 9229f0c2dd | |||
| 843abf7df4 | |||
| 27fda0430b | |||
| 8b49d679bd | |||
| 62883b3180 | |||
| 3c6ae0125b | |||
| be0810ea6d | |||
| dff55060e7 | |||
| df767b5ffc | |||
| 1b70c6784a | |||
| e25e1c93f9 | |||
| 4c708ad97c | |||
| b81a4e044b | |||
| f6aa2daa01 | |||
| e03eb38adc | |||
| 2b690b47c1 | |||
| dffbdb92a5 | |||
| 45d6515f2e | |||
| a3e6a278fe | |||
| 7ffc20ee48 | |||
| ddf3abb314 | |||
| ec50c4e07f | |||
| 49b2a7622b | |||
| b8e474cb92 | |||
| 8b29c9e3c7 | |||
| 5dab61b359 | |||
| eab843aa16 | |||
| b757f741b7 | |||
| 5f4c47a07c | |||
| 32677c9fb2 | |||
| 7eab57cfd9 | |||
| c8fc7da64d | |||
| 88c1824bf7 | |||
| a50cb2b6b8 | |||
| 971eae4af1 | |||
| 1400d538f3 | |||
| b1d01d94da | |||
| 9d7e218ff6 | |||
| c19e1e2cf7 | |||
| 6b06bc8170 | |||
| 769c0dadcd | |||
| 414ef73e1d | |||
| 01c04111bd | |||
| a729bb81a3 | |||
| 547eb59709 | |||
| d774bed69b | |||
| 393a007e4a | |||
| cb3028387c | |||
| f689fcac03 | |||
| b1d949ada2 | |||
| 1f48bb3815 | |||
| dfb0893316 |
1
DOCUEMENTATION/CLEAR.bash
Normal file
1
DOCUEMENTATION/CLEAR.bash
Normal file
@@ -0,0 +1 @@
|
|||||||
|
bash -c 'pkill -9 -x node 2>/dev/null; pkill -9 -x "Vyla Home" 2>/dev/null; pkill -9 -x "vyla-home" 2>/dev/null; rm -rf "$HOME/Library/Application Support/com.vyla.home" "$HOME/Library/Application Support/vyla-home" "$HOME/Library/Application Support/Vyla Home" "$HOME/Library/Caches/com.vyla.home" "$HOME/Library/Caches/vyla-home" "$HOME/Library/Caches/Vyla Home" "$HOME/Library/WebKit/com.vyla.home" "$HOME/Library/WebKit/vyla-home" "$HOME/Library/WebKit/Vyla Home" "$HOME/Library/Logs/Vyla Home" "$HOME/Library/Preferences/com.vyla.home.plist" "$HOME/.vyla-home" "/Applications/Vyla Home.app" "/Applications/vyla-home.app" "$HOME/Applications/Vyla Home.app" "$HOME/Applications/vyla-home.app" "src-tauri/target" "dist-build" "temp-validation-extract" "dist" "frontend" "player" "auth-proxy" "stream-api" "logs" "*.log" "download-temp.zip" "update-payload.zip" "manifest.json" "validation-report.json" "config/encrypted-credentials.json" "config/credentials.json"; echo "Vyla Home cleanup complete."'
|
||||||
@@ -16,4 +16,10 @@ To release it, run:
|
|||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
npm run release:full
|
npm run release:full
|
||||||
|
```
|
||||||
|
|
||||||
|
Fixing os error 32
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
Stop-Process -Name "vyla-home", "node", "cargo" -Force -ErrorAction SilentlyContinue
|
||||||
```
|
```
|
||||||
37
README.md
37
README.md
@@ -1,29 +1,30 @@
|
|||||||
# Vyla Home
|
# Vyla Home Engine
|
||||||
|
|
||||||
Vyla Home is a desktop version of Vyla, built to run entirely on your own computer instead of on [vyla.cc](https://vyla.cc).
|
A high-performance, locally executed environment for the Vyla media ecosystem. Built on the Tauri v2 framework, Vyla Home acts as a secure native bridge between local microservices and a lightweight WebView2 rendering engine.
|
||||||
|
|
||||||
## Why this exists
|
## Architecture & Security
|
||||||
|
|
||||||
Running Vyla as a hosted website has been a constant source of stress. Hosting providers routinely block or throttle traffic coming from data centers, which is exactly where most affordable hosting lives. Every workaround for that involves paid infrastructure — residential proxies, dedicated IPs, premium tiers — that isn't realistic to keep funding long-term.
|
Vyla Home is designed around complete local isolation to maximize speed, privacy, and reliability:
|
||||||
|
|
||||||
On top of that, there's the standing fear that comes with depending on someone else's infrastructure: a provider changes their policy, a server gets flagged, an account gets suspended, and everything just stops working with no warning. That uncertainty has genuinely cost some sleep. Waking up wondering if the whole project got wiped overnight isn't a sustainable way to build something.
|
- **Zero External Reverse-Proxies**: All routing, API endpoints, and authentication middleware run strictly on local loopback interfaces (`127.0.0.1`), eliminating ISP throttling and data-center IP bans.
|
||||||
|
- **Native Memory Management**: Background Node.js lifecycle states are managed directly via OS-level memory handles (bypassing slow shell wrappers) for instant startup and teardown.
|
||||||
|
- **Cryptographic Obfuscation**: Client configurations and credentials are secured on-disk via hardware-derived AES-256-GCM encryption.
|
||||||
|
- **Automated Integrity Patching**: Payloads are dynamically verified using SHA-256 checksums and patched in-memory via C-level buffer scans.
|
||||||
|
|
||||||
Vyla Home is the answer to that. Instead of fighting hosting providers forever, the app runs locally on your own machine. No data center traffic to block. No hosting bills. No one else's finger on the switch.
|
## Build Requirements
|
||||||
|
|
||||||
## What it actually is
|
- [Rust](https://www.rust-lang.org/) (Latest Stable)
|
||||||
|
- [Node.js](https://nodejs.org/) (v20+ LTS)
|
||||||
|
- Tauri CLI (`npm install -g @tauri-apps/cli`)
|
||||||
|
|
||||||
Vyla Home packages up the same player, streaming, and live-sports features as the website, wrapped in a small desktop app. When you open it:
|
## Compilation
|
||||||
|
|
||||||
- It grabs the latest version automatically
|
The build pipeline has been optimized with Fat LTO and aggressive panic aborts to generate the smallest possible binary footprint.
|
||||||
- It starts everything up locally on your computer
|
|
||||||
- The interface opens in its own window, just like the website did
|
|
||||||
|
|
||||||
Everything runs for you, on your machine, for your own personal use.
|
```bash
|
||||||
|
npm install
|
||||||
|
|
||||||
## What this is not
|
npm run build:payload
|
||||||
|
|
||||||
This isn't a public service or a way to redistribute anything. It's a personal media player for personal use — think of it as watching things you already have access to, through your own local player, instead of a public streaming platform. Nothing here is intended to be shared, resold, or run as a service for other people.
|
npm run build
|
||||||
|
```
|
||||||
## Status
|
|
||||||
|
|
||||||
Might not be actively worked on. Expect various bugs — this is a solo project built to solve a real problem, not a polished commercial product.
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const JavaScriptObfuscator = require('javascript-obfuscator');
|
|
||||||
const AdmZip = require('adm-zip');
|
const AdmZip = require('adm-zip');
|
||||||
const { execSync } = require('child_process');
|
const { execSync } = require('child_process');
|
||||||
|
|
||||||
@@ -19,18 +18,23 @@ const REPO_CONFIG = {
|
|||||||
'stream-api': { name: 'stream-api', branch: 'main' },
|
'stream-api': { name: 'stream-api', branch: 'main' },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const clonedRepos = new Set();
|
||||||
|
|
||||||
function clonePrivateRepo(repoConfig, targetDir) {
|
function clonePrivateRepo(repoConfig, targetDir) {
|
||||||
const repoUrl = `https://gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
|
if (fs.existsSync(targetDir)) {
|
||||||
|
console.log(`Removing stale ${repoConfig.name} before fresh clone...`);
|
||||||
|
fs.rmSync(targetDir, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
const token = process.env.GITLAB_TOKEN || process.env.VYLA_GITLAB_TOKEN;
|
||||||
|
const auth = token ? `oauth2:${token}@` : '';
|
||||||
|
const repoUrl = `https://${auth}gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (fs.existsSync(targetDir)) {
|
|
||||||
fs.rmSync(targetDir, { recursive: true, force: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, {
|
execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, {
|
||||||
stdio: 'inherit'
|
stdio: 'inherit'
|
||||||
});
|
});
|
||||||
|
clonedRepos.add(repoConfig.name);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new Error(`Failed to clone ${repoConfig.name}: ${error.message}`);
|
throw new Error(`Failed to clone ${repoConfig.name}: ${error.message}`);
|
||||||
}
|
}
|
||||||
@@ -71,23 +75,6 @@ function cleanBuildDir() {
|
|||||||
fs.mkdirSync(BUILD_DIR, { recursive: true });
|
fs.mkdirSync(BUILD_DIR, { recursive: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
function obfuscateFile(filePath, isEsm = false) {
|
|
||||||
const content = fs.readFileSync(filePath, 'utf8');
|
|
||||||
const result = JavaScriptObfuscator.obfuscate(content, {
|
|
||||||
compact: true,
|
|
||||||
controlFlowFlattening: false,
|
|
||||||
deadCodeInjection: false,
|
|
||||||
debugProtection: false,
|
|
||||||
numbersToExpressions: false,
|
|
||||||
simplify: true,
|
|
||||||
stringArray: true,
|
|
||||||
stringArrayThreshold: 0.4,
|
|
||||||
stringArrayEncoding: [],
|
|
||||||
module: isEsm
|
|
||||||
});
|
|
||||||
fs.writeFileSync(filePath, result.getObfuscatedCode(), 'utf8');
|
|
||||||
}
|
|
||||||
|
|
||||||
function encryptCredentialsFile() {
|
function encryptCredentialsFile() {
|
||||||
const CryptoUtils = require('./crypto-utils');
|
const CryptoUtils = require('./crypto-utils');
|
||||||
|
|
||||||
@@ -168,13 +155,6 @@ function processFolder(src, dest) {
|
|||||||
if (pkg.type === 'module') isEsm = true;
|
if (pkg.type === 'module') isEsm = true;
|
||||||
} catch (e) { }
|
} catch (e) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const filePath of jsFiles) {
|
|
||||||
try {
|
|
||||||
obfuscateFile(filePath, isEsm);
|
|
||||||
} catch (e) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function getFileChecksum(filePath) {
|
function getFileChecksum(filePath) {
|
||||||
@@ -332,6 +312,9 @@ async function build() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const zipPath = path.join(__dirname, 'update-payload.zip');
|
const zipPath = path.join(__dirname, 'update-payload.zip');
|
||||||
|
if (fs.existsSync(zipPath)) {
|
||||||
|
fs.rmSync(zipPath, { force: true });
|
||||||
|
}
|
||||||
zip.writeZip(zipPath);
|
zip.writeZip(zipPath);
|
||||||
|
|
||||||
const checksum = validatePayload(zipPath);
|
const checksum = validatePayload(zipPath);
|
||||||
@@ -352,9 +335,11 @@ async function build() {
|
|||||||
fs.writeFileSync(path.join(__dirname, 'manifest.json'), JSON.stringify(manifest, null, 2), 'utf8');
|
fs.writeFileSync(path.join(__dirname, 'manifest.json'), JSON.stringify(manifest, null, 2), 'utf8');
|
||||||
|
|
||||||
for (const repo of REPOS) {
|
for (const repo of REPOS) {
|
||||||
const repoPath = path.join(__dirname, repo);
|
if (clonedRepos.has(repo)) {
|
||||||
if (fs.existsSync(repoPath)) {
|
const repoPath = path.join(__dirname, repo);
|
||||||
fs.rmSync(repoPath, { recursive: true, force: true });
|
if (fs.existsSync(repoPath)) {
|
||||||
|
fs.rmSync(repoPath, { recursive: true, force: true });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
46
codemagic.yaml
Normal file
46
codemagic.yaml
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
workflows:
|
||||||
|
macos-release:
|
||||||
|
name: Build macOS Release
|
||||||
|
max_build_duration: 60
|
||||||
|
instance_type: mac_mini_m2
|
||||||
|
environment:
|
||||||
|
groups:
|
||||||
|
- gitlab_credentials
|
||||||
|
node: 22.14.0
|
||||||
|
cache:
|
||||||
|
cache_paths:
|
||||||
|
- $HOME/.cargo/registry
|
||||||
|
- $HOME/.cargo/git
|
||||||
|
- src-tauri/target
|
||||||
|
scripts:
|
||||||
|
- name: Setup Rust toolchain
|
||||||
|
script: |
|
||||||
|
if ! command -v cargo &> /dev/null; then
|
||||||
|
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
||||||
|
fi
|
||||||
|
- name: Install dependencies
|
||||||
|
script: |
|
||||||
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
npm install
|
||||||
|
- name: Build & Publish macOS Release
|
||||||
|
script: |
|
||||||
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
PACKAGE_VERSION=$(node -p "require('./package.json').version")
|
||||||
|
node release.js --installer --tag="v$PACKAGE_VERSION"
|
||||||
|
- name: Verify bundled node permissions
|
||||||
|
script: |
|
||||||
|
if [ -f "bin/node" ]; then
|
||||||
|
chmod +x bin/node
|
||||||
|
xattr -cr bin/node || true
|
||||||
|
ls -la bin/node
|
||||||
|
file bin/node
|
||||||
|
fi
|
||||||
|
APP_NODE=$(find src-tauri/target/release/bundle -name "node" -path "*bin*" 2>/dev/null | head -1)
|
||||||
|
if [ -n "$APP_NODE" ]; then
|
||||||
|
chmod +x "$APP_NODE"
|
||||||
|
xattr -cr "$APP_NODE" || true
|
||||||
|
ls -la "$APP_NODE"
|
||||||
|
fi
|
||||||
|
artifacts:
|
||||||
|
- src-tauri/target/release/bundle/dmg/*.dmg
|
||||||
|
- src-tauri/target/release/bundle/macos/*.app
|
||||||
@@ -47,30 +47,32 @@ class CryptoUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static getMachineId() {
|
static getMachineId() {
|
||||||
|
const fs = require('fs');
|
||||||
if (os.platform() === 'win32') {
|
if (os.platform() === 'win32') {
|
||||||
try {
|
try {
|
||||||
return execSync('wmic csproduct get uuid').toString().split('\n')[1].trim();
|
const { spawnSync } = require('child_process');
|
||||||
} catch (e) {
|
const res = spawnSync('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Cryptography', '/v', 'MachineGuid'], { encoding: 'utf8' });
|
||||||
}
|
if (res.stdout) {
|
||||||
try {
|
const match = res.stdout.match(/MachineGuid\s+REG_SZ\s+([^\r\n]+)/);
|
||||||
const out = execSync('reg query "HKLM\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid').toString();
|
if (match) return match[1].trim();
|
||||||
const match = out.match(/MachineGuid\s+REG_SZ\s+([^\r\n]+)/);
|
}
|
||||||
if (match) return match[1].trim();
|
} catch (e) { }
|
||||||
} catch (e) {
|
return 'windows-node-' + os.hostname();
|
||||||
}
|
|
||||||
return 'unknown-machine';
|
|
||||||
} else if (os.platform() === 'darwin') {
|
} else if (os.platform() === 'darwin') {
|
||||||
try {
|
try {
|
||||||
return execSync('ioreg -rd1 -c IOPlatformExpertDevice | awk -F\'"\' \'/IOPlatformUUID/{print $4}\'').toString().trim();
|
const { spawnSync } = require('child_process');
|
||||||
} catch (e) {
|
const res = spawnSync('ioreg', ['-rd1', '-c', 'IOPlatformExpertDevice'], { encoding: 'utf8' });
|
||||||
return 'unknown-machine';
|
const match = res.stdout.match(/"IOPlatformUUID"\s*=\s*"([^"]+)"/);
|
||||||
}
|
if (match) return match[1].trim();
|
||||||
|
} catch (e) { }
|
||||||
|
return 'darwin-node-' + os.hostname();
|
||||||
} else {
|
} else {
|
||||||
try {
|
for (const idPath of ['/etc/machine-id', '/var/lib/dbus/machine-id']) {
|
||||||
return execSync('cat /etc/machine-id 2>/dev/null || cat /var/lib/dbus/machine-id 2>/dev/null').toString().trim();
|
try {
|
||||||
} catch (e) {
|
if (fs.existsSync(idPath)) return fs.readFileSync(idPath, 'utf8').trim();
|
||||||
return 'unknown-machine';
|
} catch (e) { }
|
||||||
}
|
}
|
||||||
|
return 'linux-node-' + os.hostname();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
209
main.js
209
main.js
@@ -6,17 +6,27 @@ const ServiceManager = require('./service-manager');
|
|||||||
const Patcher = require('./patcher');
|
const Patcher = require('./patcher');
|
||||||
const UpdateClient = require('./update-client');
|
const UpdateClient = require('./update-client');
|
||||||
|
|
||||||
const defaultAppData = path.join(os.homedir(), 'AppData', 'Roaming', 'vyla-home', 'vyla-home-files');
|
function getDefaultAppData() {
|
||||||
|
if (process.platform === 'darwin') {
|
||||||
|
return path.join(os.homedir(), 'Library', 'Application Support', 'vyla-home', 'vyla-home-files');
|
||||||
|
}
|
||||||
|
if (process.platform === 'linux') {
|
||||||
|
return path.join(os.homedir(), '.local', 'share', 'vyla-home', 'vyla-home-files');
|
||||||
|
}
|
||||||
|
return path.join(os.homedir(), 'AppData', 'Roaming', 'vyla-home', 'vyla-home-files');
|
||||||
|
}
|
||||||
|
|
||||||
const APPDATA_DIR = (process.env.APPDATA_PATH && !process.env.APPDATA_PATH.includes('com.vyla.home'))
|
const APPDATA_DIR = (process.env.APPDATA_PATH && !process.env.APPDATA_PATH.includes('com.vyla.home'))
|
||||||
? process.env.APPDATA_PATH
|
? process.env.APPDATA_PATH
|
||||||
: defaultAppData;
|
: getDefaultAppData();
|
||||||
|
|
||||||
const LOGS_DIR = path.join(APPDATA_DIR, 'logs');
|
const LOGS_DIR = path.join(APPDATA_DIR, 'logs');
|
||||||
try { fs.mkdirSync(LOGS_DIR, { recursive: true }); } catch (e) { }
|
try { fs.mkdirSync(LOGS_DIR, { recursive: true }); } catch (e) { }
|
||||||
|
|
||||||
const debugLogPath = path.join(LOGS_DIR, 'node-debug.log');
|
const debugLogPath = path.join(LOGS_DIR, 'node-debug.log');
|
||||||
|
|
||||||
function debugLog(msg) {
|
function debugLog(msg) {
|
||||||
try { fs.appendFileSync(debugLogPath, `[NODE] ${msg}\n`, 'utf8'); } catch (e) { }
|
try { fs.appendFile(debugLogPath, `[NODE] ${msg}\n`, 'utf8', () => { }); } catch (e) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
debugLog("--- Node.js Process Started ---");
|
debugLog("--- Node.js Process Started ---");
|
||||||
@@ -60,6 +70,9 @@ window.open = function(url) {
|
|||||||
</script></head>`
|
</script></head>`
|
||||||
);
|
);
|
||||||
res.set('Content-Type', 'text/html');
|
res.set('Content-Type', 'text/html');
|
||||||
|
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||||
|
res.set('Expires', '-1');
|
||||||
|
res.set('Pragma', 'no-cache');
|
||||||
res.send(injected);
|
res.send(injected);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -78,13 +91,22 @@ cmdApp.get('/__tauri_cmd/:cmd', (req, res) => {
|
|||||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
||||||
res.sendStatus(200);
|
res.sendStatus(200);
|
||||||
});
|
});
|
||||||
cmdApp.listen(4892, '0.0.0.0', () => debugLog("[CMD-SERVER] Dedicated command server listening on 0.0.0.0:4892"));
|
cmdApp.listen(4892, '127.0.0.1', () => debugLog("[CMD-SERVER] Dedicated command server listening on 127.0.0.1:4892"));
|
||||||
|
|
||||||
|
process.stdin.resume();
|
||||||
|
process.stdin.on('end', () => {
|
||||||
|
debugLog('stdin closed - parent died. Self-terminating...');
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
process.stdin.on('error', () => {
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
process.on('uncaughtException', (err) => {
|
process.on('uncaughtException', (err) => {
|
||||||
debugLog(`CRITICAL UNCAUGHT EXCEPTION: ${err.stack || err.message}`);
|
debugLog(`CRITICAL UNCAUGHT EXCEPTION: ${err.stack || err.message}`);
|
||||||
if (err.code === 'EPIPE') {
|
if (err.code === 'EPIPE' || err.code === 'EOF') {
|
||||||
debugLog('Pipe to parent closed - parent process gone, exiting');
|
debugLog('Pipe to parent closed - parent process gone, exiting');
|
||||||
process.exit(1);
|
process.exit(0);
|
||||||
}
|
}
|
||||||
try { sendToTauri('error', { message: err.message }); } catch (e) { }
|
try { sendToTauri('error', { message: err.message }); } catch (e) { }
|
||||||
});
|
});
|
||||||
@@ -95,19 +117,36 @@ process.on('unhandledRejection', (reason) => {
|
|||||||
sendToTauri('error', { message: reason && reason.message ? reason.message : String(reason) });
|
sendToTauri('error', { message: reason && reason.message ? reason.message : String(reason) });
|
||||||
});
|
});
|
||||||
|
|
||||||
const envConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/env.json'), 'utf8'));
|
function getEnvConfig() {
|
||||||
const replacementsConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/replacements.json'), 'utf8'));
|
try {
|
||||||
|
const appPath = path.join(APPDATA_DIR, 'config/env.json');
|
||||||
|
if (fs.existsSync(appPath)) return JSON.parse(fs.readFileSync(appPath, 'utf8'));
|
||||||
|
return JSON.parse(fs.readFileSync(path.join(__dirname, 'config/env.json'), 'utf8'));
|
||||||
|
} catch (e) { return {}; }
|
||||||
|
}
|
||||||
|
|
||||||
|
function getReplacementsConfig() {
|
||||||
|
try {
|
||||||
|
const appPath = path.join(APPDATA_DIR, 'config/replacements.json');
|
||||||
|
if (fs.existsSync(appPath)) return JSON.parse(fs.readFileSync(appPath, 'utf8'));
|
||||||
|
return JSON.parse(fs.readFileSync(path.join(__dirname, 'config/replacements.json'), 'utf8'));
|
||||||
|
} catch (e) { return {}; }
|
||||||
|
}
|
||||||
|
|
||||||
const updateClient = new UpdateClient(APPDATA_DIR);
|
const updateClient = new UpdateClient(APPDATA_DIR);
|
||||||
|
|
||||||
async function start() {
|
async function start() {
|
||||||
debugLog("Inside start() function");
|
debugLog("Inside start() function");
|
||||||
sendToTauri('status', { message: 'Initializing patcher...' });
|
sendToTauri('status', { message: 'Loading core configuration files...' });
|
||||||
|
|
||||||
const patcher = new Patcher(APPDATA_DIR);
|
const patcher = new Patcher(APPDATA_DIR);
|
||||||
serviceManager = new ServiceManager(APPDATA_DIR, envConfig);
|
serviceManager = new ServiceManager(APPDATA_DIR, getEnvConfig());
|
||||||
|
|
||||||
const installBuild = async (release) => {
|
const installBuild = async (release) => {
|
||||||
const tempZipPath = path.join(APPDATA_DIR, 'download-temp.zip');
|
const tempZipPath = path.join(APPDATA_DIR, 'download-temp.zip');
|
||||||
|
if (fs.existsSync(tempZipPath)) {
|
||||||
|
try { fs.unlinkSync(tempZipPath); } catch (e) { }
|
||||||
|
}
|
||||||
let attempts = 0;
|
let attempts = 0;
|
||||||
let downloadSuccess = false;
|
let downloadSuccess = false;
|
||||||
|
|
||||||
@@ -115,34 +154,43 @@ async function start() {
|
|||||||
attempts++;
|
attempts++;
|
||||||
try {
|
try {
|
||||||
debugLog(`Attempting to download update (Attempt ${attempts})...`);
|
debugLog(`Attempting to download update (Attempt ${attempts})...`);
|
||||||
sendToTauri('status', { message: `Downloading update (Attempt ${attempts}/3)...` });
|
sendToTauri('status', { message: `Connecting to download servers (Attempt ${attempts}/3)...` });
|
||||||
|
|
||||||
|
let lastPercent = -1;
|
||||||
await updateClient.downloadUpdate(release, tempZipPath, (downloaded, total) => {
|
await updateClient.downloadUpdate(release, tempZipPath, (downloaded, total) => {
|
||||||
const percent = total > 0 ? Math.round((downloaded / total) * 100) : 0;
|
const percent = total > 0 ? Math.round((downloaded / total) * 100) : 0;
|
||||||
sendToTauri('download-progress', { downloaded, total, percent });
|
if (percent !== lastPercent) {
|
||||||
|
lastPercent = percent;
|
||||||
|
sendToTauri('download-progress', { downloaded, total, percent });
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
debugLog('Download complete. Verifying checksum...');
|
debugLog('Download complete. Verifying checksum...');
|
||||||
sendToTauri('status', { message: 'Verifying payload checksum...' });
|
sendToTauri('status', { message: 'Verifying SHA-256 integrity...' });
|
||||||
if (!patcher.verifyChecksum(tempZipPath, release.sha256)) {
|
if (!patcher.verifyChecksum(tempZipPath, release.sha256)) {
|
||||||
throw new Error('SHA-256 checksum verification failed.');
|
throw new Error('SHA-256 checksum verification failed.');
|
||||||
}
|
}
|
||||||
|
|
||||||
debugLog('Checksum verified. Extracting...');
|
debugLog('Checksum verified. Extracting...');
|
||||||
sendToTauri('status', { message: 'Extracting update files...' });
|
sendToTauri('status', { message: 'Unpacking update archive...' });
|
||||||
patcher.purgeOldCode();
|
patcher.purgeOldCode();
|
||||||
patcher.extractZipPayload(tempZipPath);
|
patcher.extractZipPayload(tempZipPath);
|
||||||
|
|
||||||
|
sendToTauri('status', { message: 'Verifying file integrity...' });
|
||||||
if (!patcher.verifyExtraction()) {
|
if (!patcher.verifyExtraction()) {
|
||||||
throw new Error('Extraction verification failed: critical startup files missing.');
|
throw new Error('Extraction verification failed: critical startup files missing.');
|
||||||
}
|
}
|
||||||
|
|
||||||
debugLog('Extraction complete. Applying patches...');
|
debugLog('Extraction complete. Applying patches...');
|
||||||
sendToTauri('status', { message: 'Applying patches & configuring...' });
|
sendToTauri('status', { message: 'Applying configuration patches...' });
|
||||||
patcher.applyPatches(replacementsConfig);
|
patcher.applyPatches(getReplacementsConfig());
|
||||||
|
|
||||||
|
sendToTauri('status', { message: 'Migrating security credentials...' });
|
||||||
patcher.bridgeCredentials(serviceManager.credentialManager);
|
patcher.bridgeCredentials(serviceManager.credentialManager);
|
||||||
patcher.saveCurrentVersion(release.version, release.sha256);
|
patcher.saveCurrentVersion(release.version, release.sha256);
|
||||||
|
|
||||||
|
serviceManager.envConfig = getEnvConfig();
|
||||||
|
|
||||||
if (fs.existsSync(tempZipPath)) {
|
if (fs.existsSync(tempZipPath)) {
|
||||||
fs.unlinkSync(tempZipPath);
|
fs.unlinkSync(tempZipPath);
|
||||||
}
|
}
|
||||||
@@ -150,6 +198,7 @@ async function start() {
|
|||||||
debugLog('Update installed successfully!');
|
debugLog('Update installed successfully!');
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
debugLog(`Download/Install error on attempt ${attempts}: ${err.message}`);
|
debugLog(`Download/Install error on attempt ${attempts}: ${err.message}`);
|
||||||
|
sendToTauri('status', { message: `Install error: ${err.message}. Retrying...` });
|
||||||
if (fs.existsSync(tempZipPath)) {
|
if (fs.existsSync(tempZipPath)) {
|
||||||
try { fs.unlinkSync(tempZipPath); } catch (e) { }
|
try { fs.unlinkSync(tempZipPath); } catch (e) { }
|
||||||
}
|
}
|
||||||
@@ -162,12 +211,37 @@ async function start() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const isFirstRun = !patcher.verifyExtraction();
|
sendToTauri('status', { message: 'Inspecting local workspace and installed files...' });
|
||||||
const localVersion = patcher.getCurrentVersion();
|
let isFirstRun = !patcher.verifyExtraction();
|
||||||
const localSha = patcher.getCurrentSha();
|
let localVersion = patcher.getCurrentVersion();
|
||||||
debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}`);
|
let localSha = patcher.getCurrentSha();
|
||||||
|
debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}, Local SHA: ${localSha}`);
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Checking for updates...' });
|
const localZipPath = path.join(__dirname, 'update-payload.zip');
|
||||||
|
const localManifestPath = path.join(__dirname, 'manifest.json');
|
||||||
|
let localZipManifest = null;
|
||||||
|
|
||||||
|
if (fs.existsSync(localZipPath) && fs.existsSync(localManifestPath)) {
|
||||||
|
try { localZipManifest = JSON.parse(fs.readFileSync(localManifestPath, 'utf8')); } catch (e) { }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (localZipManifest && (isFirstRun || localZipManifest.sha256 !== localSha)) {
|
||||||
|
debugLog("New local payload detected! Applying local build...");
|
||||||
|
sendToTauri('status', { message: 'Extracting local development payload...' });
|
||||||
|
patcher.purgeOldCode();
|
||||||
|
patcher.extractZipPayload(localZipPath);
|
||||||
|
patcher.applyPatches(getReplacementsConfig());
|
||||||
|
patcher.bridgeCredentials(serviceManager.credentialManager);
|
||||||
|
patcher.saveCurrentVersion(localZipManifest.version, localZipManifest.sha256);
|
||||||
|
serviceManager.envConfig = getEnvConfig();
|
||||||
|
|
||||||
|
isFirstRun = false;
|
||||||
|
localVersion = localZipManifest.version;
|
||||||
|
localSha = localZipManifest.sha256;
|
||||||
|
debugLog("Local payload applied successfully.");
|
||||||
|
}
|
||||||
|
|
||||||
|
sendToTauri('status', { message: 'Connecting to update servers...' });
|
||||||
let release = null;
|
let release = null;
|
||||||
try {
|
try {
|
||||||
debugLog("Fetching updates from updateClient...");
|
debugLog("Fetching updates from updateClient...");
|
||||||
@@ -175,15 +249,19 @@ async function start() {
|
|||||||
debugLog(`Update check finished. Found: ${release ? release.version : 'None'}`);
|
debugLog(`Update check finished. Found: ${release ? release.version : 'None'}`);
|
||||||
} 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})` });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (release) {
|
if (release) {
|
||||||
const hasUpdate = release.version !== localVersion || (release.sha256 && release.sha256 !== localSha);
|
const hasUpdate = release.version !== localVersion || (release.sha256 && release.sha256 !== localSha);
|
||||||
if (isFirstRun) {
|
if (isFirstRun) {
|
||||||
debugLog("First run. Installing remote build...");
|
debugLog("First run. Installing remote build...");
|
||||||
|
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...` });
|
||||||
|
|
||||||
const tempApp = express();
|
const tempApp = express();
|
||||||
let userDecision = null;
|
let userDecision = null;
|
||||||
tempApp.use((req, res, next) => {
|
tempApp.use((req, res, next) => {
|
||||||
@@ -206,7 +284,7 @@ async function start() {
|
|||||||
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
||||||
|
|
||||||
while (userDecision === null) {
|
while (userDecision === null) {
|
||||||
await new Promise(r => setTimeout(r, 200));
|
await new Promise(r => setTimeout(r, 25));
|
||||||
}
|
}
|
||||||
|
|
||||||
await new Promise((resolve) => tempServer.close(resolve));
|
await new Promise((resolve) => tempServer.close(resolve));
|
||||||
@@ -216,40 +294,53 @@ async function start() {
|
|||||||
await installBuild(release);
|
await installBuild(release);
|
||||||
} else {
|
} else {
|
||||||
debugLog("User skipped update.");
|
debugLog("User skipped update.");
|
||||||
|
sendToTauri('status', { message: 'Update skipped. Continuing startup...' });
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
debugLog("Already on the latest version.");
|
debugLog("Already on the latest version.");
|
||||||
|
sendToTauri('status', { message: 'Up to date.' });
|
||||||
}
|
}
|
||||||
} else if (isFirstRun) {
|
} else if (isFirstRun) {
|
||||||
debugLog("No remote release found, but it's the first run. Looking for local update-payload.zip...");
|
debugLog("No remote release found, but it's the first run. Looking for local update-payload.zip...");
|
||||||
|
sendToTauri('status', { message: 'Looking for local payload archive...' });
|
||||||
const localZip = path.join(__dirname, 'update-payload.zip');
|
const localZip = path.join(__dirname, 'update-payload.zip');
|
||||||
if (fs.existsSync(localZip)) {
|
if (fs.existsSync(localZip)) {
|
||||||
sendToTauri('status', { message: 'Extracting initial local payload...' });
|
sendToTauri('status', { message: 'Extracting local baseline payload...' });
|
||||||
patcher.purgeOldCode();
|
patcher.purgeOldCode();
|
||||||
patcher.extractZipPayload(localZip);
|
patcher.extractZipPayload(localZip);
|
||||||
patcher.applyPatches(replacementsConfig);
|
patcher.applyPatches(getReplacementsConfig());
|
||||||
patcher.bridgeCredentials(serviceManager.credentialManager);
|
patcher.bridgeCredentials(serviceManager.credentialManager);
|
||||||
patcher.saveCurrentVersion("1.0.0");
|
|
||||||
|
let ver = "1.0.0";
|
||||||
|
try {
|
||||||
|
const man = JSON.parse(fs.readFileSync(path.join(__dirname, 'manifest.json'), 'utf8'));
|
||||||
|
ver = man.version || ver;
|
||||||
|
} catch (e) { }
|
||||||
|
|
||||||
|
patcher.saveCurrentVersion(ver);
|
||||||
|
serviceManager.envConfig = getEnvConfig();
|
||||||
debugLog("Local payload extracted successfully.");
|
debugLog("Local payload extracted successfully.");
|
||||||
} else {
|
} else {
|
||||||
debugLog("No local payload found!");
|
debugLog("No local payload found!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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. Check your internet connection and try again.');
|
||||||
}
|
}
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Loading credentials...' });
|
sendToTauri('status', { message: 'Loading encrypted credentials...' });
|
||||||
serviceManager.credentialManager.loadCredentials();
|
serviceManager.credentialManager.loadCredentials();
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Starting backend services...' });
|
sendToTauri('status', { message: 'Starting background services (auth-proxy, stream-api)...' });
|
||||||
await serviceManager.startServices([
|
await serviceManager.startServices([
|
||||||
{ name: 'auth-proxy', relativeDir: 'auth-proxy' },
|
{ name: 'auth-proxy', relativeDir: 'auth-proxy' },
|
||||||
{ name: 'stream-api', relativeDir: 'stream-api' },
|
{ name: 'stream-api', relativeDir: 'stream-api' },
|
||||||
]);
|
]);
|
||||||
debugLog("Backend services spawn requested.");
|
debugLog("Backend services spawn requested.");
|
||||||
|
|
||||||
|
sendToTauri('status', { message: 'Binding player web server on port 3001...' });
|
||||||
const playerDir = path.join(APPDATA_DIR, 'player');
|
const playerDir = path.join(APPDATA_DIR, 'player');
|
||||||
playerExpressApp = express();
|
playerExpressApp = express();
|
||||||
playerExpressApp.use((req, res, next) => {
|
playerExpressApp.use((req, res, next) => {
|
||||||
@@ -265,15 +356,24 @@ async function start() {
|
|||||||
res.sendStatus(200);
|
res.sendStatus(200);
|
||||||
});
|
});
|
||||||
playerExpressApp.use(sameTabNavMiddleware(playerDir));
|
playerExpressApp.use(sameTabNavMiddleware(playerDir));
|
||||||
playerExpressApp.use(express.static(playerDir, { maxAge: '1d', etag: true }));
|
playerExpressApp.use(express.static(playerDir, {
|
||||||
playerExpressApp.get('*', (req, res) => { res.sendFile(path.join(playerDir, 'index.html')); });
|
etag: false,
|
||||||
playerExpressServer = playerExpressApp.listen(3001, '0.0.0.0');
|
setHeaders: (res) => {
|
||||||
|
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
playerExpressApp.get('*', (req, res) => {
|
||||||
|
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||||
|
res.sendFile(path.join(playerDir, 'index.html'));
|
||||||
|
});
|
||||||
|
playerExpressServer = playerExpressApp.listen(3001, '127.0.0.1');
|
||||||
debugLog("Player Express running on 3001");
|
debugLog("Player Express running on 3001");
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Waiting for ports 3000, 3001, 7860...' });
|
sendToTauri('status', { message: 'Waiting for microservices to bind ports (3000, 3001, 7860)...' });
|
||||||
await serviceManager.waitForPorts([3000, 3001, 7860]);
|
await serviceManager.waitForPorts([3000, 3001, 7860]);
|
||||||
debugLog("Ports 3000, 3001, 7860 are ready.");
|
debugLog("Ports 3000, 3001, 7860 are ready.");
|
||||||
|
|
||||||
|
sendToTauri('status', { message: 'Binding UI server on port 4890...' });
|
||||||
const frontendDir = path.join(APPDATA_DIR, 'frontend');
|
const frontendDir = path.join(APPDATA_DIR, 'frontend');
|
||||||
expressApp = express();
|
expressApp = express();
|
||||||
expressApp.use((req, res, next) => {
|
expressApp.use((req, res, next) => {
|
||||||
@@ -288,14 +388,35 @@ async function start() {
|
|||||||
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
sendToTauri('tauri-cmd', { cmd: req.params.cmd, url: req.query.url, window: req.query.window });
|
||||||
res.sendStatus(200);
|
res.sendStatus(200);
|
||||||
});
|
});
|
||||||
|
|
||||||
expressApp.use(sameTabNavMiddleware(frontendDir));
|
expressApp.use(sameTabNavMiddleware(frontendDir));
|
||||||
expressApp.use(express.static(frontendDir, { maxAge: '1d', etag: true }));
|
expressApp.use(express.static(frontendDir, {
|
||||||
expressApp.get('*', (req, res) => { res.sendFile(path.join(frontendDir, 'index.html')); });
|
etag: false,
|
||||||
|
setHeaders: (res) => {
|
||||||
|
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
expressApp.use(express.static(path.join(frontendDir, 'src'), {
|
||||||
|
etag: false,
|
||||||
|
setHeaders: (res) => {
|
||||||
|
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
expressApp.get('*', (req, res) => {
|
||||||
|
res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
|
||||||
|
res.sendFile(path.join(frontendDir, 'index.html'));
|
||||||
|
});
|
||||||
|
|
||||||
const FRONTEND_PORT = 4890;
|
const FRONTEND_PORT = 4890;
|
||||||
expressServer = expressApp.listen(FRONTEND_PORT, '0.0.0.0', () => {
|
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.");
|
debugLog("Frontend Express running on 4890. Sending READY to Tauri.");
|
||||||
sendToTauri('ready', { url: `http://localhost:${FRONTEND_PORT}` });
|
sendToTauri('ready', { url: `http://127.0.0.1:${FRONTEND_PORT}` });
|
||||||
});
|
});
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -308,17 +429,23 @@ process.on('exit', () => {
|
|||||||
if (serviceManager) {
|
if (serviceManager) {
|
||||||
for (const name of Object.keys(serviceManager.processes)) {
|
for (const name of Object.keys(serviceManager.processes)) {
|
||||||
const proc = serviceManager.processes[name];
|
const proc = serviceManager.processes[name];
|
||||||
if (proc && proc.child) {
|
if (proc && proc.child && proc.child.pid) {
|
||||||
try { proc.child.kill('SIGKILL'); } catch (e) { }
|
try {
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
require('child_process').spawnSync('taskkill', ['/F', '/T', '/PID', proc.child.pid.toString()], { stdio: 'ignore', windowsHide: true });
|
||||||
|
} else {
|
||||||
|
process.kill(-proc.child.pid, 'SIGKILL');
|
||||||
|
}
|
||||||
|
} catch (e) { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('SIGINT', async () => {
|
process.on('SIGINT', () => {
|
||||||
if (expressServer) expressServer.close();
|
process.exit(0);
|
||||||
if (playerExpressServer) playerExpressServer.close();
|
});
|
||||||
if (serviceManager) await serviceManager.stopAll();
|
process.on('SIGTERM', () => {
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
10
package.json
10
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vyla-home",
|
"name": "vyla-home",
|
||||||
"version": "1.1.4",
|
"version": "1.1.29",
|
||||||
"description": "Vyla Home Desktop App Launcher",
|
"description": "Vyla Home Desktop App Launcher",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -12,15 +12,15 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.0.0",
|
"@tauri-apps/api": "^2.0.0",
|
||||||
"@tauri-apps/plugin-shell": "^2.0.0",
|
"@tauri-apps/plugin-opener": "^2.0.0",
|
||||||
"@tauri-apps/plugin-process": "^2.0.0",
|
"@tauri-apps/plugin-process": "^2.0.0",
|
||||||
"@vyla-entertainment/sdk": "^1.10.0",
|
"@tauri-apps/plugin-shell": "^2.0.0",
|
||||||
|
"@vyla-entertainment/sdk": "^1.11.0",
|
||||||
"adm-zip": "^0.6.0",
|
"adm-zip": "^0.6.0",
|
||||||
"express": "^4.19.2"
|
"express": "^4.19.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tauri-apps/cli": "^2.0.0",
|
"@tauri-apps/cli": "^2.0.0"
|
||||||
"javascript-obfuscator": "^4.1.0"
|
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
"appId": "com.vyla.home",
|
"appId": "com.vyla.home",
|
||||||
|
|||||||
54
patcher.js
54
patcher.js
@@ -63,17 +63,24 @@ class Patcher {
|
|||||||
const fullPath = path.join(this.appDataPath, dir);
|
const fullPath = path.join(this.appDataPath, dir);
|
||||||
if (fs.existsSync(fullPath)) {
|
if (fs.existsSync(fullPath)) {
|
||||||
try {
|
try {
|
||||||
fs.rmSync(fullPath, { recursive: true, force: true });
|
const trashPath = path.join(this.appDataPath, `.trash_${dir}_${Date.now()}`);
|
||||||
|
fs.renameSync(fullPath, trashPath);
|
||||||
|
fs.rmSync(trashPath, { recursive: true, force: true });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
try {
|
try {
|
||||||
const trashPath = fullPath + '.trash.' + Date.now();
|
fs.rmSync(fullPath, { recursive: true, force: true });
|
||||||
fs.renameSync(fullPath, trashPath);
|
} catch (err2) { }
|
||||||
} catch (renameErr) {
|
|
||||||
console.warn(`Could not remove or rename ${fullPath}. It will be overwritten.`);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
const files = fs.readdirSync(this.appDataPath);
|
||||||
|
for (const file of files) {
|
||||||
|
if (file.startsWith('.trash_')) {
|
||||||
|
fs.rmSync(path.join(this.appDataPath, file), { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
extractZipPayload(zipPath) {
|
extractZipPayload(zipPath) {
|
||||||
@@ -119,7 +126,7 @@ class Patcher {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
processDirectory(dir, replacementList) {
|
processDirectory(dir, replacementList = []) {
|
||||||
const files = fs.readdirSync(dir);
|
const files = fs.readdirSync(dir);
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
const fullPath = path.join(dir, file);
|
const fullPath = path.join(dir, file);
|
||||||
@@ -130,33 +137,30 @@ class Patcher {
|
|||||||
this.processDirectory(fullPath, replacementList);
|
this.processDirectory(fullPath, replacementList);
|
||||||
} else if (stat.isFile()) {
|
} else if (stat.isFile()) {
|
||||||
const ext = path.extname(fullPath).toLowerCase();
|
const ext = path.extname(fullPath).toLowerCase();
|
||||||
if (['.js', '.html', '.css', '.json', '.xml', '.txt'].includes(ext)) {
|
let content = fs.readFileSync(fullPath, 'utf8');
|
||||||
let content = fs.readFileSync(fullPath, 'utf8');
|
let modified = false;
|
||||||
let modified = false;
|
|
||||||
|
|
||||||
for (const rep of replacementList) {
|
for (const rep of replacementList) {
|
||||||
if (content.includes(rep.find)) {
|
if (content.includes(rep.find)) {
|
||||||
content = content.split(rep.find).join(rep.replace);
|
content = content.split(rep.find).join(rep.replace);
|
||||||
modified = true;
|
modified = true;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (modified) {
|
if (modified) {
|
||||||
fs.writeFileSync(fullPath, content, 'utf8');
|
fs.writeFileSync(fullPath, content, 'utf8');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
applyPatches(replacements) {
|
applyPatches(replacements) {
|
||||||
for (const [componentName, replacementList] of Object.entries(replacements)) {
|
const targetDirs = ['frontend', 'player', 'auth-proxy', 'stream-api'];
|
||||||
if (!replacementList || replacementList.length === 0) continue;
|
for (const dirName of targetDirs) {
|
||||||
|
const dirPath = path.join(this.appDataPath, dirName);
|
||||||
const componentDir = path.join(this.appDataPath, componentName);
|
if (!fs.existsSync(dirPath)) continue;
|
||||||
if (!fs.existsSync(componentDir)) continue;
|
const replacementList = replacements[dirName] || [];
|
||||||
|
this.processDirectory(dirPath, replacementList);
|
||||||
this.processDirectory(componentDir, replacementList);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
217
release.js
217
release.js
@@ -78,57 +78,82 @@ function uploadFileToGitLabPackage(filePath, packageName, version, fileName) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createGitLabRelease(tag, releaseLinks) {
|
function createGitLabRelease(tag, releaseLinks) {
|
||||||
const sendRequest = (method, path) => {
|
const sendRequest = (method, reqPath, data = null) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let currentRef = 'main';
|
const options = {
|
||||||
try {
|
|
||||||
currentRef = execSync('git rev-parse HEAD').toString().trim();
|
|
||||||
} catch (e) { }
|
|
||||||
|
|
||||||
const postData = JSON.stringify({
|
|
||||||
name: `Vyla Home Release ${tag}`,
|
|
||||||
tag_name: tag,
|
|
||||||
ref: currentRef,
|
|
||||||
description: `Automated local release ${tag}`,
|
|
||||||
assets: {
|
|
||||||
links: releaseLinks
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const req = https.request({
|
|
||||||
hostname: 'gitlab.com',
|
hostname: 'gitlab.com',
|
||||||
port: 443,
|
port: 443,
|
||||||
path: path,
|
path: reqPath,
|
||||||
method: method,
|
method: method,
|
||||||
headers: {
|
headers: {
|
||||||
'PRIVATE-TOKEN': TOKEN,
|
'PRIVATE-TOKEN': TOKEN,
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json'
|
||||||
'Content-Length': Buffer.byteLength(postData)
|
|
||||||
}
|
}
|
||||||
}, (res) => {
|
};
|
||||||
|
let postData = '';
|
||||||
|
if (data) {
|
||||||
|
postData = JSON.stringify(data);
|
||||||
|
options.headers['Content-Length'] = Buffer.byteLength(postData);
|
||||||
|
}
|
||||||
|
|
||||||
|
const req = https.request(options, (res) => {
|
||||||
let body = '';
|
let body = '';
|
||||||
res.on('data', chunk => body += chunk);
|
res.on('data', chunk => body += chunk);
|
||||||
res.on('end', () => {
|
res.on('end', () => {
|
||||||
if (res.statusCode === 200 || res.statusCode === 201) {
|
if (res.statusCode >= 200 && res.statusCode < 300) {
|
||||||
resolve(JSON.parse(body));
|
try { resolve(body ? JSON.parse(body) : {}); } catch (e) { resolve({}); }
|
||||||
} else if (res.statusCode === 409 && method === 'POST') {
|
|
||||||
console.log(`Release ${tag} already exists, updating assets...`);
|
|
||||||
sendRequest('PUT', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}`)
|
|
||||||
.then(resolve)
|
|
||||||
.catch(reject);
|
|
||||||
} else {
|
} else {
|
||||||
reject(new Error(`Failed to publish release (HTTP ${res.statusCode}): ${body}`));
|
reject(new Error(`HTTP ${res.statusCode}: ${body}`));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
req.on('error', reject);
|
req.on('error', reject);
|
||||||
req.write(postData);
|
if (data) req.write(postData);
|
||||||
req.end();
|
req.end();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`);
|
let currentRef = 'main';
|
||||||
|
try {
|
||||||
|
currentRef = execSync('git rev-parse HEAD').toString().trim();
|
||||||
|
} catch (e) { }
|
||||||
|
|
||||||
|
const releaseData = {
|
||||||
|
name: `Vyla Home Release ${tag}`,
|
||||||
|
tag_name: tag,
|
||||||
|
ref: currentRef,
|
||||||
|
description: `Automated Multi-Platform Release ${tag}`,
|
||||||
|
assets: {
|
||||||
|
links: releaseLinks
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, releaseData)
|
||||||
|
.catch(err => {
|
||||||
|
if (err.message.includes('HTTP 409')) {
|
||||||
|
console.log(`[CI Sync] Release ${tag} already exists. Appending our OS-specific files to it...`);
|
||||||
|
let promiseChain = Promise.resolve();
|
||||||
|
|
||||||
|
for (const link of releaseLinks) {
|
||||||
|
promiseChain = promiseChain.then(() => {
|
||||||
|
return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}/assets/links`, {
|
||||||
|
name: link.name,
|
||||||
|
url: link.url,
|
||||||
|
link_type: link.link_type
|
||||||
|
}).catch(e => {
|
||||||
|
if (e.message.includes('already been taken') || e.message.includes('HTTP 409') || e.message.includes('HTTP 400')) {
|
||||||
|
console.log(`[CI Sync] Asset link '${link.name}' is already attached. Skipping.`);
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return promiseChain.then(() => ({ name: `Vyla Home Release ${tag}`, tag_name: tag }));
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
@@ -155,7 +180,6 @@ async function main() {
|
|||||||
if (isFullBuild) {
|
if (isFullBuild) {
|
||||||
console.log('Ensuring bundled Node.js runtime...');
|
console.log('Ensuring bundled Node.js runtime...');
|
||||||
await ensureBundledNode();
|
await ensureBundledNode();
|
||||||
|
|
||||||
await ensureWebView2Loader();
|
await ensureWebView2Loader();
|
||||||
|
|
||||||
const bundleDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle');
|
const bundleDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle');
|
||||||
@@ -163,30 +187,44 @@ async function main() {
|
|||||||
fs.rmSync(bundleDir, { recursive: true, force: true });
|
fs.rmSync(bundleDir, { recursive: true, force: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('Compiling Windows Tauri installer locally...');
|
console.log('Compiling native Tauri application...');
|
||||||
execSync('npm run build', {
|
execSync('npm run build', { stdio: 'inherit' });
|
||||||
stdio: 'inherit'
|
|
||||||
});
|
|
||||||
|
|
||||||
const nsisDir = path.join(__dirname, 'src-tauri/target/release/bundle/nsis');
|
const targetVersion = version.startsWith('v') ? version.substring(1) : version;
|
||||||
if (fs.existsSync(nsisDir)) {
|
|
||||||
const targetVersion = version.startsWith('v') ? version.substring(1) : version;
|
|
||||||
const files = fs.readdirSync(nsisDir).filter(f => f.endsWith('.exe') && f.includes(targetVersion));
|
|
||||||
|
|
||||||
if (files.length > 0) {
|
if (process.platform === 'win32') {
|
||||||
const originalName = files[0];
|
const nsisDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle', 'nsis');
|
||||||
installerPath = path.join(nsisDir, originalName);
|
if (fs.existsSync(nsisDir)) {
|
||||||
installerUploadName = originalName.replace(/\s+/g, '-');
|
const files = fs.readdirSync(nsisDir).filter(f => f.endsWith('.exe') && f.includes(targetVersion));
|
||||||
|
if (files.length > 0) {
|
||||||
|
installerPath = path.join(nsisDir, files[0]);
|
||||||
|
installerUploadName = files[0].replace(/\s+/g, '-');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const dmgDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle', 'dmg');
|
||||||
|
console.log(`Checking for Mac installer in: ${dmgDir}`);
|
||||||
|
if (fs.existsSync(dmgDir)) {
|
||||||
|
const files = fs.readdirSync(dmgDir).filter(f => f.endsWith('.dmg') && f.includes(targetVersion));
|
||||||
|
if (files.length > 0) {
|
||||||
|
installerPath = path.join(dmgDir, files[0]);
|
||||||
|
installerUploadName = files[0].replace(/\s+/g, '-');
|
||||||
|
console.log(`Found Mac installer: ${installerUploadName}`);
|
||||||
|
} else {
|
||||||
|
console.log(`[WARNING] No .dmg found containing version ${targetVersion}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('[2/4] Uploading artifacts to GitLab Package Registry...');
|
console.log('[2/4] Uploading artifacts to GitLab Package Registry...');
|
||||||
|
const timestamp = Date.now();
|
||||||
|
|
||||||
console.log('Uploading update-payload.zip...');
|
console.log('Uploading update-payload.zip...');
|
||||||
const payloadUrl = await uploadFileToGitLabPackage(payloadPath, 'vyla-home', version, 'update-payload.zip');
|
const payloadUrl = await uploadFileToGitLabPackage(payloadPath, 'vyla-home', version, `update-payload-${timestamp}.zip`);
|
||||||
|
|
||||||
console.log('Uploading manifest.json...');
|
console.log('Uploading manifest.json...');
|
||||||
const manifestUrl = await uploadFileToGitLabPackage(manifestPath, 'vyla-home', version, 'manifest.json');
|
const manifestUrl = await uploadFileToGitLabPackage(manifestPath, 'vyla-home', version, `manifest-${timestamp}.json`);
|
||||||
|
|
||||||
const releaseLinks = [
|
const releaseLinks = [
|
||||||
{ name: 'update-payload.zip', url: payloadUrl, link_type: 'other' },
|
{ name: 'update-payload.zip', url: payloadUrl, link_type: 'other' },
|
||||||
@@ -195,18 +233,25 @@ async function main() {
|
|||||||
|
|
||||||
if (installerPath && installerUploadName) {
|
if (installerPath && installerUploadName) {
|
||||||
console.log(`Uploading installer ${installerUploadName}...`);
|
console.log(`Uploading installer ${installerUploadName}...`);
|
||||||
const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUploadName);
|
const ext = path.extname(installerUploadName);
|
||||||
|
const installerUnique = installerUploadName.replace(ext, `-${timestamp}${ext}`);
|
||||||
|
const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUnique);
|
||||||
releaseLinks.push({ name: installerUploadName, url: installerUrl, link_type: 'package' });
|
releaseLinks.push({ name: installerUploadName, url: installerUrl, link_type: 'package' });
|
||||||
|
} else {
|
||||||
|
console.log(`[WARNING] No installer was selected for upload! (isFullBuild: ${isFullBuild})`);
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('[3/4] Publishing GitLab Release...');
|
console.log('[3/4] Publishing GitLab Release...');
|
||||||
const release = await createGitLabRelease(version, releaseLinks);
|
await createGitLabRelease(version, releaseLinks);
|
||||||
console.log(`[4/4] Release successfully created: ${release.name} (${release.tag_name})`);
|
console.log(`[4/4] Release process successfully completed for ${version}!`);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensureBundledNode() {
|
function ensureBundledNode() {
|
||||||
|
const os = require('os');
|
||||||
const binDir = path.join(__dirname, 'bin');
|
const binDir = path.join(__dirname, 'bin');
|
||||||
const nodeExePath = path.join(binDir, 'node.exe');
|
const isWin = os.platform() === 'win32';
|
||||||
|
const nodeExeName = isWin ? 'node.exe' : 'node';
|
||||||
|
const nodeExePath = path.join(binDir, nodeExeName);
|
||||||
|
|
||||||
const nodeVersion = 'v22.14.0';
|
const nodeVersion = 'v22.14.0';
|
||||||
const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`);
|
const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`);
|
||||||
@@ -218,35 +263,65 @@ function ensureBundledNode() {
|
|||||||
fs.mkdirSync(binDir, { recursive: true });
|
fs.mkdirSync(binDir, { recursive: true });
|
||||||
console.log(`Downloading standalone Node.js ${nodeVersion} runtime for bundling...`);
|
console.log(`Downloading standalone Node.js ${nodeVersion} runtime for bundling...`);
|
||||||
|
|
||||||
const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const fileStream = fs.createWriteStream(nodeExePath);
|
const download = (url, dest, cb) => {
|
||||||
https.get(nodeUrl, (res) => {
|
https.get(url, (res) => {
|
||||||
if (res.statusCode === 302 || res.statusCode === 301) {
|
if (res.statusCode === 302 || res.statusCode === 301) {
|
||||||
https.get(res.headers.location, (redirectRes) => {
|
return download(res.headers.location, dest, cb);
|
||||||
redirectRes.pipe(fileStream);
|
}
|
||||||
fileStream.on('finish', () => {
|
const fileStream = fs.createWriteStream(dest);
|
||||||
fileStream.close();
|
res.pipe(fileStream);
|
||||||
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
fileStream.on('finish', () => {
|
||||||
resolve();
|
fileStream.close();
|
||||||
});
|
cb();
|
||||||
}).on('error', reject);
|
});
|
||||||
return;
|
}).on('error', reject);
|
||||||
}
|
};
|
||||||
res.pipe(fileStream);
|
|
||||||
fileStream.on('finish', () => {
|
if (isWin) {
|
||||||
fileStream.close();
|
const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
|
||||||
|
download(nodeUrl, nodeExePath, () => {
|
||||||
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
}).on('error', (err) => {
|
} else {
|
||||||
try { fs.unlinkSync(nodeExePath); } catch (e) { }
|
const arch = os.arch() === 'arm64' ? 'arm64' : 'x64';
|
||||||
reject(err);
|
const platform = os.platform() === 'darwin' ? 'darwin' : 'linux';
|
||||||
});
|
const tarName = `node-${nodeVersion}-${platform}-${arch}`;
|
||||||
|
const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/${tarName}.tar.gz`;
|
||||||
|
const tarPath = path.join(binDir, 'node.tar.gz');
|
||||||
|
|
||||||
|
download(nodeUrl, tarPath, () => {
|
||||||
|
try {
|
||||||
|
execSync(`tar -xzf node.tar.gz ${tarName}/bin/node`, { cwd: binDir });
|
||||||
|
|
||||||
|
const extractedNode = path.join(binDir, tarName, 'bin', 'node');
|
||||||
|
const finalNode = path.join(binDir, 'node');
|
||||||
|
|
||||||
|
fs.renameSync(extractedNode, finalNode);
|
||||||
|
fs.rmSync(path.join(binDir, tarName), { recursive: true, force: true });
|
||||||
|
fs.unlinkSync(tarPath);
|
||||||
|
|
||||||
|
fs.chmodSync(finalNode, 0o755);
|
||||||
|
|
||||||
|
try {
|
||||||
|
execSync(`xattr -d com.apple.quarantine "${finalNode}"`);
|
||||||
|
} catch (_) { }
|
||||||
|
|
||||||
|
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
||||||
|
resolve();
|
||||||
|
} catch (e) {
|
||||||
|
reject(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensureWebView2Loader() {
|
function ensureWebView2Loader() {
|
||||||
|
const os = require('os');
|
||||||
|
if (os.platform() !== 'win32') return Promise.resolve();
|
||||||
|
|
||||||
const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release');
|
const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release');
|
||||||
const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll');
|
const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll');
|
||||||
fs.mkdirSync(releaseDir, { recursive: true });
|
fs.mkdirSync(releaseDir, { recursive: true });
|
||||||
|
|||||||
@@ -21,8 +21,7 @@ class ServiceManager {
|
|||||||
try {
|
try {
|
||||||
const logPath = path.join(this.logsDir, `${name}.log`);
|
const logPath = path.join(this.logsDir, `${name}.log`);
|
||||||
const timestamp = new Date().toISOString();
|
const timestamp = new Date().toISOString();
|
||||||
fs.appendFileSync(logPath, `[${timestamp}] ${line}\n`, 'utf8');
|
fs.appendFile(logPath, `[${timestamp}] ${line}\n`, 'utf8', () => { });
|
||||||
|
|
||||||
process.stdout.write(JSON.stringify({ event: "service-log", data: { service: name, message: line } }) + '\n');
|
process.stdout.write(JSON.stringify({ event: "service-log", data: { service: name, message: line } }) + '\n');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
}
|
}
|
||||||
@@ -90,6 +89,25 @@ class ServiceManager {
|
|||||||
child.stderr.on('data', (data) => {
|
child.stderr.on('data', (data) => {
|
||||||
const text = data.toString().trim();
|
const text = data.toString().trim();
|
||||||
this.logToFile(name, `STDERR: ${text}`);
|
this.logToFile(name, `STDERR: ${text}`);
|
||||||
|
|
||||||
|
if (text.includes('EADDRINUSE')) {
|
||||||
|
const match = text.match(/:(\d+)/);
|
||||||
|
const port = match ? match[1] : null;
|
||||||
|
if (port) {
|
||||||
|
try {
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
require('child_process').spawnSync('powershell.exe', [
|
||||||
|
'-NoProfile',
|
||||||
|
'-NonInteractive',
|
||||||
|
'-Command',
|
||||||
|
`Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force }`
|
||||||
|
], { stdio: 'ignore', windowsHide: true });
|
||||||
|
} else {
|
||||||
|
require('child_process').spawnSync('fuser', ['-k', '-9', `${port}/tcp`], { stdio: 'ignore' });
|
||||||
|
}
|
||||||
|
} catch (_) { }
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
child.on('exit', (code, signal) => {
|
child.on('exit', (code, signal) => {
|
||||||
@@ -111,7 +129,7 @@ class ServiceManager {
|
|||||||
this.startService(name, relativeDir, startScript).catch(err => {
|
this.startService(name, relativeDir, startScript).catch(err => {
|
||||||
this.logToFile(name, `Failed to restart: ${err.message}`);
|
this.logToFile(name, `Failed to restart: ${err.message}`);
|
||||||
});
|
});
|
||||||
}, 3000);
|
}, 1500);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -175,7 +193,7 @@ class ServiceManager {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (connected) return true;
|
if (connected) return true;
|
||||||
await new Promise(r => setTimeout(r, 500));
|
await new Promise(r => setTimeout(r, 40));
|
||||||
}
|
}
|
||||||
throw new Error(`Timeout waiting for port ${port}`);
|
throw new Error(`Timeout waiting for port ${port}`);
|
||||||
}
|
}
|
||||||
|
|||||||
71
src-tauri/Cargo.lock
generated
71
src-tauri/Cargo.lock
generated
@@ -270,7 +270,7 @@ version = "0.6.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
|
checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -762,7 +762,7 @@ dependencies = [
|
|||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"block2",
|
"block2",
|
||||||
"libc",
|
"libc",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2079,7 +2079,7 @@ dependencies = [
|
|||||||
"dpi",
|
"dpi",
|
||||||
"gtk",
|
"gtk",
|
||||||
"keyboard-types",
|
"keyboard-types",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
@@ -2157,6 +2157,22 @@ dependencies = [
|
|||||||
"syn 2.0.119",
|
"syn 2.0.119",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc-sys"
|
||||||
|
version = "0.3.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2"
|
||||||
|
version = "0.5.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
|
||||||
|
dependencies = [
|
||||||
|
"objc-sys",
|
||||||
|
"objc2-encode",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "objc2"
|
name = "objc2"
|
||||||
version = "0.6.4"
|
version = "0.6.4"
|
||||||
@@ -2175,7 +2191,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"block2",
|
"block2",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
@@ -2187,7 +2203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
|
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2197,7 +2213,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
|
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2209,7 +2225,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"dispatch2",
|
"dispatch2",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2220,7 +2236,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"dispatch2",
|
"dispatch2",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-io-surface",
|
"objc2-io-surface",
|
||||||
]
|
]
|
||||||
@@ -2231,7 +2247,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
|
checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2241,7 +2257,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
|
checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2252,7 +2268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
|
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-core-graphics",
|
"objc2-core-graphics",
|
||||||
]
|
]
|
||||||
@@ -2280,7 +2296,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"block2",
|
"block2",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2291,7 +2307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
|
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2302,7 +2318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
|
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
@@ -2315,7 +2331,7 @@ checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"block2",
|
"block2",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-cloud-kit",
|
"objc2-cloud-kit",
|
||||||
"objc2-core-data",
|
"objc2-core-data",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
@@ -2334,7 +2350,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
|
checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2346,7 +2362,7 @@ checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"block2",
|
"block2",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
@@ -3211,7 +3227,7 @@ dependencies = [
|
|||||||
"bytemuck",
|
"bytemuck",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"ndk",
|
"ndk",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-core-graphics",
|
"objc2-core-graphics",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
@@ -3385,7 +3401,7 @@ dependencies = [
|
|||||||
"log",
|
"log",
|
||||||
"ndk",
|
"ndk",
|
||||||
"ndk-sys",
|
"ndk-sys",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
"objc2-ui-kit",
|
"objc2-ui-kit",
|
||||||
@@ -3441,7 +3457,7 @@ dependencies = [
|
|||||||
"log",
|
"log",
|
||||||
"mime",
|
"mime",
|
||||||
"muda",
|
"muda",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
"objc2-ui-kit",
|
"objc2-ui-kit",
|
||||||
@@ -3612,7 +3628,7 @@ dependencies = [
|
|||||||
"gtk",
|
"gtk",
|
||||||
"http",
|
"http",
|
||||||
"jni",
|
"jni",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-ui-kit",
|
"objc2-ui-kit",
|
||||||
"objc2-web-kit",
|
"objc2-web-kit",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
@@ -3636,7 +3652,7 @@ dependencies = [
|
|||||||
"http",
|
"http",
|
||||||
"jni",
|
"jni",
|
||||||
"log",
|
"log",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
@@ -4051,7 +4067,7 @@ dependencies = [
|
|||||||
"dirs",
|
"dirs",
|
||||||
"libappindicator",
|
"libappindicator",
|
||||||
"muda",
|
"muda",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-core-graphics",
|
"objc2-core-graphics",
|
||||||
@@ -4222,8 +4238,10 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.1.4"
|
version = "1.1.29"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"base64 0.22.1",
|
||||||
|
"objc2 0.5.2",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"tauri",
|
"tauri",
|
||||||
@@ -4231,7 +4249,6 @@ dependencies = [
|
|||||||
"tauri-plugin-opener",
|
"tauri-plugin-opener",
|
||||||
"tauri-plugin-process",
|
"tauri-plugin-process",
|
||||||
"tauri-plugin-shell",
|
"tauri-plugin-shell",
|
||||||
"url",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4475,7 +4492,7 @@ version = "0.6.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
|
checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
@@ -4930,7 +4947,7 @@ dependencies = [
|
|||||||
"jni",
|
"jni",
|
||||||
"libc",
|
"libc",
|
||||||
"ndk",
|
"ndk",
|
||||||
"objc2",
|
"objc2 0.6.4",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.1.4"
|
version = "1.1.29"
|
||||||
description = "Vyla Home Desktop App Launcher"
|
description = "Vyla Home Desktop App Launcher"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
@@ -14,4 +14,19 @@ tauri-plugin-process = "2"
|
|||||||
tauri-plugin-shell = "2"
|
tauri-plugin-shell = "2"
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
url = "2"
|
base64 = "0.22"
|
||||||
|
|
||||||
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
|
objc2 = "0.5"
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
opt-level = 3
|
||||||
|
lto = true
|
||||||
|
codegen-units = 1
|
||||||
|
strip = true
|
||||||
|
panic = "abort"
|
||||||
|
|
||||||
|
[profile.dev]
|
||||||
|
opt-level = 0
|
||||||
|
debug = true
|
||||||
|
incremental = true
|
||||||
|
|||||||
13
src-tauri/Info.plist
Normal file
13
src-tauri/Info.plist
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>NSAppTransportSecurity</key>
|
||||||
|
<dict>
|
||||||
|
<key>NSAllowsLocalNetworking</key>
|
||||||
|
<true/>
|
||||||
|
<key>NSAllowsArbitraryLoads</key>
|
||||||
|
<true/>
|
||||||
|
</dict>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
@@ -1,3 +1,32 @@
|
|||||||
fn main() {
|
fn main() {
|
||||||
|
println!("cargo:rerun-if-changed=src/main.rs");
|
||||||
|
println!("cargo:rerun-if-changed=tauri.conf.json");
|
||||||
|
|
||||||
|
if std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "windows" {
|
||||||
|
if let (Ok(manifest_dir), Ok(out_dir)) = (std::env::var("CARGO_MANIFEST_DIR"), std::env::var("OUT_DIR")) {
|
||||||
|
let mut target_dir = std::path::PathBuf::from(out_dir);
|
||||||
|
target_dir.pop();
|
||||||
|
target_dir.pop();
|
||||||
|
target_dir.pop();
|
||||||
|
let dll_src = std::path::Path::new(&manifest_dir).join("WebView2Loader.dll");
|
||||||
|
let dll_dest = target_dir.join("WebView2Loader.dll");
|
||||||
|
if dll_src.exists() {
|
||||||
|
let _ = std::fs::copy(dll_src, dll_dest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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();
|
||||||
}
|
}
|
||||||
@@ -7,17 +7,31 @@ 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") {
|
||||||
|
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::path::PathBuf::from("logs")
|
std::env::temp_dir().join("vyla-home-logs")
|
||||||
};
|
};
|
||||||
|
|
||||||
let _ = std::fs::create_dir_all(&log_dir);
|
let _ = std::fs::create_dir_all(&log_dir);
|
||||||
let log_path = log_dir.join("rust-debug.log");
|
let log_path = log_dir.join("rust-debug.log");
|
||||||
|
|
||||||
if let Ok(mut file) = std::fs::OpenOptions::new().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);
|
||||||
}
|
}
|
||||||
@@ -40,47 +54,39 @@ fn clean_path(path: &std::path::Path) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
fn kill_child_process(child: &mut Child) {
|
||||||
fn kill_process_tree(pid: u32) {
|
#[cfg(windows)]
|
||||||
use std::os::windows::process::CommandExt;
|
{
|
||||||
const CREATE_NO_WINDOW: u32 = 0x08000000;
|
use std::os::windows::process::CommandExt;
|
||||||
let result = Command::new("taskkill")
|
const CREATE_NO_WINDOW: u32 = 0x08000000;
|
||||||
.args(["/PID", &pid.to_string(), "/T", "/F"])
|
let _ = Command::new("taskkill")
|
||||||
.creation_flags(CREATE_NO_WINDOW)
|
.args(&["/F", "/T", "/PID", &child.id().to_string()])
|
||||||
.output();
|
.creation_flags(CREATE_NO_WINDOW)
|
||||||
match result {
|
.output();
|
||||||
Ok(output) => debug_log(&format!(
|
|
||||||
"[KILL-TREE] taskkill on PID {} -> status: {}, stdout: {}, stderr: {}",
|
|
||||||
pid,
|
|
||||||
output.status,
|
|
||||||
String::from_utf8_lossy(&output.stdout).trim(),
|
|
||||||
String::from_utf8_lossy(&output.stderr).trim()
|
|
||||||
)),
|
|
||||||
Err(e) => debug_log(&format!("[KILL-TREE] taskkill failed to spawn for PID {}: {}", pid, e)),
|
|
||||||
}
|
}
|
||||||
}
|
let _ = child.kill();
|
||||||
|
let _ = child.wait();
|
||||||
#[cfg(not(windows))]
|
|
||||||
fn kill_process_tree(pid: u32) {
|
|
||||||
unsafe {
|
|
||||||
libc_kill_pgid(pid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
|
||||||
unsafe fn libc_kill_pgid(pid: u32) {
|
|
||||||
let _ = Command::new("kill")
|
|
||||||
.args(["-9", &format!("-{}", pid)])
|
|
||||||
.output();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn find_node_binary(app: &tauri::App) -> Option<String> {
|
fn find_node_binary(app: &tauri::App) -> Option<String> {
|
||||||
if let Ok(resource_dir) = app.path().resource_dir() {
|
if let Ok(resource_dir) = app.path().resource_dir() {
|
||||||
|
#[cfg(windows)]
|
||||||
let candidates = [
|
let candidates = [
|
||||||
resource_dir.join("bin").join("node.exe"),
|
resource_dir.join("bin").join("node.exe"),
|
||||||
resource_dir.join("node.exe"),
|
resource_dir.join("node.exe"),
|
||||||
resource_dir.join("_up_").join("bin").join("node.exe"),
|
resource_dir.join("_up_").join("bin").join("node.exe"),
|
||||||
resource_dir.join("_up_").join("node.exe"),
|
resource_dir.join("_up_").join("node.exe"),
|
||||||
|
resource_dir.join("up").join("bin").join("node.exe"),
|
||||||
|
resource_dir.join("up").join("node.exe"),
|
||||||
|
];
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
let candidates = [
|
||||||
|
resource_dir.join("bin").join("node"),
|
||||||
|
resource_dir.join("node"),
|
||||||
|
resource_dir.join("_up_").join("bin").join("node"),
|
||||||
|
resource_dir.join("_up_").join("node"),
|
||||||
|
resource_dir.join("up").join("bin").join("node"),
|
||||||
|
resource_dir.join("up").join("node"),
|
||||||
];
|
];
|
||||||
for candidate in candidates {
|
for candidate in candidates {
|
||||||
if candidate.exists() {
|
if candidate.exists() {
|
||||||
@@ -93,9 +99,13 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
|
|||||||
if let Some(parent) = exe_path.parent() {
|
if let Some(parent) = exe_path.parent() {
|
||||||
let candidates = [
|
let candidates = [
|
||||||
parent.join("bin").join("node.exe"),
|
parent.join("bin").join("node.exe"),
|
||||||
|
parent.join("bin").join("node"),
|
||||||
parent.join("node.exe"),
|
parent.join("node.exe"),
|
||||||
|
parent.join("node"),
|
||||||
parent.join("resources").join("bin").join("node.exe"),
|
parent.join("resources").join("bin").join("node.exe"),
|
||||||
|
parent.join("resources").join("bin").join("node"),
|
||||||
parent.join("resources").join("node.exe"),
|
parent.join("resources").join("node.exe"),
|
||||||
|
parent.join("resources").join("node"),
|
||||||
];
|
];
|
||||||
for candidate in candidates {
|
for candidate in candidates {
|
||||||
if candidate.exists() {
|
if candidate.exists() {
|
||||||
@@ -107,9 +117,14 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
|
|||||||
|
|
||||||
if let Ok(path_var) = std::env::var("PATH") {
|
if let Ok(path_var) = std::env::var("PATH") {
|
||||||
for p in std::env::split_paths(&path_var) {
|
for p in std::env::split_paths(&path_var) {
|
||||||
let candidate = p.join("node.exe");
|
let node_exe = p.join("node.exe");
|
||||||
if candidate.exists() {
|
if node_exe.exists() {
|
||||||
return Some(clean_path(&candidate));
|
return Some(clean_path(&node_exe));
|
||||||
|
}
|
||||||
|
|
||||||
|
let node = p.join("node");
|
||||||
|
if node.exists() {
|
||||||
|
return Some(clean_path(&node));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -138,6 +153,22 @@ fn find_node_binary(app: &tauri::App) -> Option<String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let default_paths = [
|
||||||
|
"/usr/local/bin/node",
|
||||||
|
"/usr/bin/node",
|
||||||
|
"/opt/homebrew/bin/node",
|
||||||
|
"/opt/local/bin/node",
|
||||||
|
];
|
||||||
|
for path in default_paths {
|
||||||
|
let candidate = std::path::Path::new(path);
|
||||||
|
if candidate.exists() {
|
||||||
|
return Some(clean_path(candidate));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,8 +177,8 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
|
|||||||
let candidates = vec![
|
let candidates = vec![
|
||||||
resource_dir.join("main.js"),
|
resource_dir.join("main.js"),
|
||||||
resource_dir.join("_up_").join("main.js"),
|
resource_dir.join("_up_").join("main.js"),
|
||||||
|
resource_dir.join("up").join("main.js"),
|
||||||
];
|
];
|
||||||
|
|
||||||
for candidate in candidates {
|
for candidate in candidates {
|
||||||
if candidate.exists() {
|
if candidate.exists() {
|
||||||
let root_dir = candidate.parent().unwrap();
|
let root_dir = candidate.parent().unwrap();
|
||||||
@@ -164,11 +195,12 @@ 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##"
|
||||||
function doInvoke(cmd, args) {
|
function doInvoke(cmd, args) {
|
||||||
if (window.__TAURI__ && window.__TAURI__.core) {
|
if (window.__TAURI__ && window.__TAURI__.core) {
|
||||||
window.__TAURI__.core.invoke(cmd, args || {});
|
return window.__TAURI__.core.invoke(cmd, args || {});
|
||||||
}
|
}
|
||||||
|
return Promise.resolve(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
function minimizeWindow() { doInvoke('win_minimize'); }
|
function minimizeWindow() { doInvoke('win_minimize'); }
|
||||||
@@ -176,6 +208,16 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
function closeWindow() { doInvoke('win_close'); }
|
function closeWindow() { doInvoke('win_close'); }
|
||||||
function dragWindow() { doInvoke('win_drag'); }
|
function dragWindow() { doInvoke('win_drag'); }
|
||||||
|
|
||||||
|
function openExternalUrl(url) {
|
||||||
|
if (window.__TAURI__ && window.__TAURI__.opener) {
|
||||||
|
window.__TAURI__.opener.openUrl(url);
|
||||||
|
} else if (window.__TAURI__ && window.__TAURI__.shell) {
|
||||||
|
window.__TAURI__.shell.open(url);
|
||||||
|
} else {
|
||||||
|
window.open(url, '_blank');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
window.open = function(url, target, features) {
|
window.open = function(url, target, features) {
|
||||||
doInvoke('open_new_window', { url: url });
|
doInvoke('open_new_window', { url: url });
|
||||||
return null;
|
return null;
|
||||||
@@ -185,6 +227,13 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
const a = e.target.closest('a');
|
const a = e.target.closest('a');
|
||||||
if (!a || !a.href) return;
|
if (!a || !a.href) return;
|
||||||
|
|
||||||
|
if (a.href.includes('discord.gg') || a.href.includes('discord.com')) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
openExternalUrl(a.href);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (a.target === '_blank' || e.ctrlKey || e.metaKey || e.button === 1) {
|
if (a.target === '_blank' || e.ctrlKey || e.metaKey || e.button === 1) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
@@ -192,16 +241,111 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
}
|
}
|
||||||
}, true);
|
}, true);
|
||||||
|
|
||||||
function injectTitlebar() {
|
function injectLiquidNavBar() {
|
||||||
if (document.getElementById('tauri-custom-titlebar')) {
|
if (document.getElementById('vyla-floating-nav')) return;
|
||||||
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;
|
||||||
@@ -210,7 +354,7 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
height: 32px !important;
|
height: 32px !important;
|
||||||
max-height: 32px !important;
|
max-height: 32px !important;
|
||||||
display: flex !important;
|
display: flex !important;
|
||||||
justify-content: space-between !important;
|
justify-content: flex-end !important;
|
||||||
align-items: center !important;
|
align-items: center !important;
|
||||||
z-index: 2147483647 !important;
|
z-index: 2147483647 !important;
|
||||||
background: transparent !important;
|
background: transparent !important;
|
||||||
@@ -219,13 +363,15 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tauri-drag-region {
|
.tauri-drag-region {
|
||||||
flex: 1 !important;
|
position: absolute !important;
|
||||||
|
inset: 0 !important;
|
||||||
height: 32px !important;
|
height: 32px !important;
|
||||||
margin-left: 100px !important;
|
|
||||||
cursor: default !important;
|
cursor: default !important;
|
||||||
pointer-events: auto !important;
|
pointer-events: auto !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tauri-window-controls {
|
.tauri-window-controls {
|
||||||
display: flex !important;
|
display: flex !important;
|
||||||
height: 32px !important;
|
height: 32px !important;
|
||||||
@@ -234,13 +380,12 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
pointer-events: auto !important;
|
pointer-events: auto !important;
|
||||||
z-index: 2147483648 !important;
|
z-index: 2147483648 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
button.tauri-btn {
|
button.tauri-btn {
|
||||||
width: 46px !important;
|
width: 46px !important;
|
||||||
min-width: 46px !important;
|
min-width: 46px !important;
|
||||||
max-width: 46px !important;
|
max-width: 46px !important;
|
||||||
height: 32px !important;
|
height: 32px !important;
|
||||||
min-height: 32px !important;
|
|
||||||
max-height: 32px !important;
|
|
||||||
background: transparent !important;
|
background: transparent !important;
|
||||||
border: none !important;
|
border: none !important;
|
||||||
color: #ffffff !important;
|
color: #ffffff !important;
|
||||||
@@ -249,22 +394,46 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
justify-content: center !important;
|
justify-content: center !important;
|
||||||
cursor: pointer !important;
|
cursor: pointer !important;
|
||||||
outline: none !important;
|
outline: none !important;
|
||||||
padding: 0 !important;
|
|
||||||
margin: 0 !important;
|
|
||||||
border-radius: 0 !important;
|
|
||||||
box-shadow: none !important;
|
|
||||||
appearance: none !important;
|
|
||||||
opacity: 1 !important;
|
|
||||||
transform: none !important;
|
|
||||||
pointer-events: auto !important;
|
|
||||||
user-select: none !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
button.tauri-btn:hover { background: rgba(255, 255, 255, 0.2) !important; }
|
button.tauri-btn:hover { background: rgba(255, 255, 255, 0.2) !important; }
|
||||||
button#tauri-btn-close:hover { background: #e81123 !important; color: #ffffff !important; }
|
button#tauri-btn-close:hover { background: #e81123 !important; color: #ffffff !important; }
|
||||||
button.tauri-btn svg { width: 10px !important; height: 10px !important; fill: currentColor !important; pointer-events: none !important; display: block !important; }
|
button.tauri-btn svg { width: 10px !important; height: 10px !important; fill: currentColor !important; pointer-events: none !important; }
|
||||||
`;
|
`;
|
||||||
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 = `
|
||||||
@@ -275,7 +444,6 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
<button class="tauri-btn" id="tauri-btn-close" title="Close"><svg viewBox="0 0 10 10"><path d="M10,1.4L8.6,0L5,3.6L1.4,0L0,1.4L3.6,5L0,8.6L1.4,10L5,6.4L8.6,10L10,8.6L6.4,5L10,1.4z"/></svg></button>
|
<button class="tauri-btn" id="tauri-btn-close" title="Close"><svg viewBox="0 0 10 10"><path d="M10,1.4L8.6,0L5,3.6L1.4,0L0,1.4L3.6,5L0,8.6L1.4,10L5,6.4L8.6,10L10,8.6L6.4,5L10,1.4z"/></svg></button>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
document.body.appendChild(tb);
|
document.body.appendChild(tb);
|
||||||
|
|
||||||
const btnMin = tb.querySelector('#tauri-btn-min');
|
const btnMin = tb.querySelector('#tauri-btn-min');
|
||||||
@@ -295,18 +463,20 @@ const LINK_HANDLER_SCRIPT: &str = r#"
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
injectTitlebar();
|
|
||||||
setInterval(injectTitlebar, 1000);
|
|
||||||
|
|
||||||
if (document.readyState === 'loading') {
|
if (document.readyState === 'loading') {
|
||||||
document.addEventListener('DOMContentLoaded', injectTitlebar);
|
document.addEventListener('DOMContentLoaded', injectLiquidNavBar);
|
||||||
} else {
|
} else {
|
||||||
injectTitlebar();
|
injectLiquidNavBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
window.addEventListener('load', injectTitlebar);
|
const navObserver = new MutationObserver(() => {
|
||||||
"#;
|
if (!document.getElementById('vyla-floating-nav')) {
|
||||||
|
injectLiquidNavBar();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
navObserver.observe(document.documentElement, { childList: true, subtree: true });
|
||||||
|
"##;
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn win_minimize(window: tauri::Window) -> Result<(), String> {
|
fn win_minimize(window: tauri::Window) -> Result<(), String> {
|
||||||
@@ -343,14 +513,17 @@ 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") {
|
||||||
window
|
window
|
||||||
.eval(&format!("window.location.href = '{}';", final_url.replace('\'', "\\'")))
|
.eval(&format!(
|
||||||
|
"window.location.href = '{}';",
|
||||||
|
final_url.replace('\'', "\\'")
|
||||||
|
))
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
Ok(())
|
Ok(())
|
||||||
} else {
|
} else {
|
||||||
@@ -358,6 +531,180 @@ fn open_new_window(app: tauri::AppHandle, url: String) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn kill_orphans() -> Result<(), String> {
|
||||||
|
debug_log("[KILL] User requested orphan process kill");
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use std::os::windows::process::CommandExt;
|
||||||
|
const CREATE_NO_WINDOW: u32 = 0x08000000;
|
||||||
|
let _ = std::process::Command::new("taskkill")
|
||||||
|
.args(&["/F", "/T", "/IM", "node.exe"])
|
||||||
|
.creation_flags(CREATE_NO_WINDOW)
|
||||||
|
.output();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
let _ = std::process::Command::new("pkill")
|
||||||
|
.args(&["-9", "-f", "node"])
|
||||||
|
.output();
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn get_logo_base64(app: tauri::AppHandle) -> Result<String, String> {
|
||||||
|
use std::io::Read;
|
||||||
|
let mut candidate_paths = Vec::new();
|
||||||
|
|
||||||
|
if let Ok(res_dir) = app.path().resource_dir() {
|
||||||
|
candidate_paths.push(res_dir.join("build").join("icon_white.png"));
|
||||||
|
candidate_paths.push(res_dir.join("_up_").join("build").join("icon_white.png"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Ok(mut cur) = std::env::current_dir() {
|
||||||
|
candidate_paths.push(cur.join("build").join("icon_white.png"));
|
||||||
|
if cur.ends_with("src-tauri") {
|
||||||
|
cur.pop();
|
||||||
|
candidate_paths.push(cur.join("build").join("icon_white.png"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for path in candidate_paths {
|
||||||
|
if path.exists() {
|
||||||
|
if let Ok(mut file) = std::fs::File::open(&path) {
|
||||||
|
let mut buffer = Vec::new();
|
||||||
|
if file.read_to_end(&mut buffer).is_ok() {
|
||||||
|
use base64::Engine;
|
||||||
|
return Ok(base64::engine::general_purpose::STANDARD.encode(buffer));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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 ===");
|
||||||
|
|
||||||
@@ -370,44 +717,103 @@ fn main() {
|
|||||||
win_maximize,
|
win_maximize,
|
||||||
win_close,
|
win_close,
|
||||||
win_drag,
|
win_drag,
|
||||||
open_new_window
|
open_new_window,
|
||||||
|
get_logo_base64,
|
||||||
|
kill_orphans
|
||||||
])
|
])
|
||||||
.manage(NodeServices(Mutex::new(None)))
|
.manage(NodeServices(Mutex::new(None)))
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
debug_log("Tauri setup started");
|
debug_log("Tauri setup started");
|
||||||
let app_data = app.path().app_data_dir().unwrap_or_default();
|
let app_data = app.path().app_data_dir().unwrap_or_default();
|
||||||
let app_data_str = clean_path(&app_data);
|
|
||||||
|
|
||||||
let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
|
let vyla_files = if let Ok(appdata_env) = std::env::var("APPDATA") {
|
||||||
.title("Vyla Home")
|
std::path::PathBuf::from(appdata_env)
|
||||||
.inner_size(1280.0, 800.0)
|
.join("vyla-home")
|
||||||
.decorations(false)
|
.join("vyla-home-files")
|
||||||
.transparent(true)
|
} else if let Ok(home) = std::env::var("HOME") {
|
||||||
.resizable(true)
|
#[cfg(target_os = "macos")]
|
||||||
.devtools(true)
|
let base = std::path::PathBuf::from(&home)
|
||||||
.initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
|
.join("Library")
|
||||||
.initialization_script(LINK_HANDLER_SCRIPT)
|
.join("Application Support");
|
||||||
.build()?;
|
#[cfg(target_os = "linux")]
|
||||||
|
let base = std::path::PathBuf::from(&home)
|
||||||
|
.join(".local")
|
||||||
|
.join("share");
|
||||||
|
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
|
||||||
|
let base = app_data.clone();
|
||||||
|
base.join("vyla-home").join("vyla-home-files")
|
||||||
|
} else {
|
||||||
|
app_data.join("vyla-home-files")
|
||||||
|
};
|
||||||
|
|
||||||
|
let version_file = vyla_files.join("version.json");
|
||||||
|
let current_app_version = app.package_info().version.to_string();
|
||||||
|
let mut version_mismatch = false;
|
||||||
|
|
||||||
|
if version_file.exists() {
|
||||||
|
if let Ok(content) = std::fs::read_to_string(&version_file) {
|
||||||
|
if let Ok(json) = serde_json::from_str::<serde_json::Value>(&content) {
|
||||||
|
if let Some(version) = json.get("version").and_then(|v| v.as_str()) {
|
||||||
|
if version != current_app_version {
|
||||||
|
version_mismatch = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
version_mismatch = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
version_mismatch = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if version_mismatch {
|
||||||
|
debug_log(&format!(
|
||||||
|
"App version updated to {}. Cleaning old files.",
|
||||||
|
current_app_version
|
||||||
|
));
|
||||||
|
let dirs_to_remove = ["frontend", "player", "stream-api", "auth-proxy", "config"];
|
||||||
|
for d in dirs_to_remove {
|
||||||
|
let _ = std::fs::remove_dir_all(vyla_files.join(d));
|
||||||
|
}
|
||||||
|
let _ = std::fs::remove_file(&version_file);
|
||||||
|
}
|
||||||
|
|
||||||
|
let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
|
||||||
|
.title("Vyla Home")
|
||||||
|
.inner_size(1280.0, 800.0)
|
||||||
|
.decorations(false)
|
||||||
|
.resizable(true)
|
||||||
|
.devtools(true)
|
||||||
|
.initialization_script("window.__VYLA_WINDOW_LABEL = 'main';")
|
||||||
|
.initialization_script(LINK_HANDLER_SCRIPT)
|
||||||
|
.build()?;
|
||||||
|
|
||||||
let (main_js, root_dir) = resolve_script_and_root(app);
|
let (main_js, root_dir) = resolve_script_and_root(app);
|
||||||
|
debug_log("Searching for node binary...");
|
||||||
|
|
||||||
let node_bin = match find_node_binary(app) {
|
let node_bin = match find_node_binary(app) {
|
||||||
Some(bin) => bin,
|
Some(bin) => {
|
||||||
|
debug_log(&format!("Found node binary: {}", bin));
|
||||||
|
bin
|
||||||
|
}
|
||||||
None => {
|
None => {
|
||||||
let _ = window.emit(
|
debug_log("FATAL: No node binary found in bundle or PATH.");
|
||||||
"error",
|
std::thread::sleep(std::time::Duration::from_millis(600));
|
||||||
serde_json::json!({
|
let _ = window.eval("document.getElementById('status-message').textContent='Error: Node runtime missing. Please reinstall.';");
|
||||||
"message": "Node.js runtime not found. Please ensure Node.js is installed or bundled correctly."
|
let _ = window.eval("var b=document.getElementById('debug-log-box');b.style.display='block';b.textContent='Node binary not found. bin/node missing from app bundle or not executable.';");
|
||||||
}),
|
|
||||||
);
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let vyla_files_str = clean_path(&vyla_files);
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(400));
|
||||||
|
|
||||||
let mut cmd = Command::new(&node_bin);
|
let mut cmd = Command::new(&node_bin);
|
||||||
cmd.arg(&main_js)
|
cmd.arg(&main_js)
|
||||||
.current_dir(&root_dir)
|
.current_dir(&root_dir)
|
||||||
.env("APPDATA_PATH", &app_data_str)
|
.env("APPDATA_PATH", &vyla_files_str)
|
||||||
.env("NODE_EXE", &node_bin)
|
.env("NODE_EXE", &node_bin)
|
||||||
|
.stdin(Stdio::piped())
|
||||||
.stdout(Stdio::piped())
|
.stdout(Stdio::piped())
|
||||||
.stderr(Stdio::piped());
|
.stderr(Stdio::piped());
|
||||||
|
|
||||||
@@ -420,13 +826,27 @@ let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html"
|
|||||||
|
|
||||||
match cmd.spawn() {
|
match cmd.spawn() {
|
||||||
Ok(mut child) => {
|
Ok(mut child) => {
|
||||||
debug_log(&format!("Node child process spawned successfully, PID: {}", child.id()));
|
debug_log(&format!(
|
||||||
|
"Node child process spawned successfully, PID: {}",
|
||||||
|
child.id()
|
||||||
|
));
|
||||||
|
|
||||||
if let Some(stderr) = child.stderr.take() {
|
if let Some(stderr) = child.stderr.take() {
|
||||||
|
let w = window.clone();
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
use std::io::{BufRead, BufReader};
|
use std::io::{BufRead, BufReader};
|
||||||
let reader = BufReader::new(stderr);
|
let reader = BufReader::new(stderr);
|
||||||
for line in reader.lines().flatten() {
|
for line in reader.lines().flatten() {
|
||||||
debug_log(&format!("[NODE STDERR] {}", line));
|
debug_log(&format!("[NODE STDERR] {}", line));
|
||||||
|
if line.contains("Error")
|
||||||
|
|| line.contains("Exception")
|
||||||
|
|| line.contains("MODULE_NOT_FOUND")
|
||||||
|
{
|
||||||
|
let _ = w.emit(
|
||||||
|
"error",
|
||||||
|
serde_json::json!({ "message": format!("Backend failed: {}", line) }),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -438,78 +858,23 @@ let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html"
|
|||||||
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) = w.app_handle().get_webview_window(window_label) {
|
let msg = match serde_json::from_str::<BackendMessage>(&line) {
|
||||||
if let Some(cmd) = msg.data.get("cmd").and_then(|c| c.as_str()) {
|
Ok(m) => m,
|
||||||
debug_log(&format!("[TAURI-CMD] Executing action: {}", cmd));
|
Err(_) => continue,
|
||||||
match cmd {
|
};
|
||||||
"win_minimize" => {
|
|
||||||
let res = cmd_window.minimize();
|
debug_log(&format!("[MAIN-DEBUG] Received event: {}", msg.event));
|
||||||
debug_log(&format!("[TAURI-CMD] Minimize result: {:?}", res));
|
debug_log(&format!(
|
||||||
},
|
"[MAIN-DEBUG] Event data: {}",
|
||||||
"win_maximize" => {
|
serde_json::to_string(&msg.data).unwrap_or_default()
|
||||||
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() };
|
match msg.event.as_str() {
|
||||||
debug_log(&format!("[TAURI-CMD] Maximize/Unmaximize result: {:?}", res));
|
"tauri-cmd" => handle_tauri_cmd(&w, &msg),
|
||||||
},
|
"ready" => handle_ready(&w, &msg),
|
||||||
"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 {
|
|
||||||
let _ = w.emit(&msg.event, msg.data.clone());
|
let _ = w.emit(&msg.event, msg.data.clone());
|
||||||
if msg.event == "ready" {
|
|
||||||
if let Some(url) = msg.data.get("url").and_then(|u| u.as_str()) {
|
|
||||||
let _ = w.eval(&format!("window.location.href = '{}';", url));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -523,7 +888,12 @@ let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html"
|
|||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
debug_log(&format!("Failed to spawn node: {}", e));
|
debug_log(&format!("Failed to spawn node: {}", e));
|
||||||
let _ = window.emit("error", serde_json::json!({ "message": format!("Failed to launch backend runtime: {}", e) }));
|
let emsg = format!("Failed to spawn node: {}", e);
|
||||||
|
let js = format!(
|
||||||
|
"document.getElementById('status-message').textContent='Spawn Error';var b=document.getElementById('debug-log-box');b.style.display='block';b.textContent={};",
|
||||||
|
serde_json::to_string(&emsg).unwrap_or_default()
|
||||||
|
);
|
||||||
|
let _ = window.eval(&js);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -534,10 +904,9 @@ let window = WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html"
|
|||||||
if window.label() == "main" {
|
if window.label() == "main" {
|
||||||
let state: State<NodeServices> = window.state();
|
let state: State<NodeServices> = window.state();
|
||||||
if let Ok(mut lock) = state.0.lock() {
|
if let Ok(mut lock) = state.0.lock() {
|
||||||
if let Some(child) = lock.take() {
|
if let Some(mut child) = lock.take() {
|
||||||
let pid = child.id();
|
debug_log("[SHUTDOWN] Main window destroyed, terminating node process natively");
|
||||||
debug_log(&format!("[SHUTDOWN] Main window destroyed, killing process tree for PID {}", pid));
|
kill_child_process(&mut child);
|
||||||
kill_process_tree(pid);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.4",
|
"version": "1.1.29",
|
||||||
"identifier": "com.vyla.home",
|
"identifier": "com.vyla.home",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../ui"
|
"frontendDist": "../ui"
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
"app": {
|
"app": {
|
||||||
"withGlobalTauri": true,
|
"withGlobalTauri": true,
|
||||||
"security": {
|
"security": {
|
||||||
"csp": null
|
"csp": "default-src 'self' http://localhost:4890 http://127.0.0.1:4890; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:4890 http://127.0.0.1:4890 https://esm.sh; style-src 'self' 'unsafe-inline' http://localhost:4890 http://127.0.0.1:4890; img-src 'self' data: https: http://localhost:4890 http://127.0.0.1:4890; font-src 'self' data: http://localhost:4890 http://127.0.0.1:4890; connect-src 'self' http://localhost: http://127.0.0.1:"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
@@ -22,6 +22,10 @@
|
|||||||
"icons/icon.icns",
|
"icons/icon.icns",
|
||||||
"icons/icon.ico"
|
"icons/icon.ico"
|
||||||
],
|
],
|
||||||
|
"macOS": {
|
||||||
|
"exceptionDomain": "localhost",
|
||||||
|
"infoPlist": "Info.plist"
|
||||||
|
},
|
||||||
"windows": {
|
"windows": {
|
||||||
"webviewInstallMode": {
|
"webviewInstallMode": {
|
||||||
"type": "downloadBootstrapper"
|
"type": "downloadBootstrapper"
|
||||||
@@ -29,8 +33,9 @@
|
|||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
"WebView2Loader.dll",
|
"WebView2Loader.dll",
|
||||||
"../bin/*",
|
"../bin/**/*",
|
||||||
"../main.js",
|
"../main.js",
|
||||||
|
"../preload.js",
|
||||||
"../service-manager.js",
|
"../service-manager.js",
|
||||||
"../patcher.js",
|
"../patcher.js",
|
||||||
"../crypto-utils.js",
|
"../crypto-utils.js",
|
||||||
|
|||||||
1215
ui/index.html
1215
ui/index.html
File diff suppressed because it is too large
Load Diff
@@ -10,6 +10,8 @@ const ALLOWED_REDIRECT_HOSTS = [
|
|||||||
'storage.googleapis.com'
|
'storage.googleapis.com'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const httpsAgent = new https.Agent({ keepAlive: true, maxSockets: 32 });
|
||||||
|
|
||||||
function isAllowedHost(url) {
|
function isAllowedHost(url) {
|
||||||
try {
|
try {
|
||||||
const hostname = new URL(url).hostname;
|
const hostname = new URL(url).hostname;
|
||||||
@@ -46,7 +48,8 @@ class UpdateClient {
|
|||||||
port: 443,
|
port: 443,
|
||||||
path: urlObj.pathname + urlObj.search,
|
path: urlObj.pathname + urlObj.search,
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
headers
|
headers,
|
||||||
|
agent: httpsAgent
|
||||||
};
|
};
|
||||||
|
|
||||||
const req = https.request(requestOptions, (res) => {
|
const req = https.request(requestOptions, (res) => {
|
||||||
@@ -98,7 +101,8 @@ class UpdateClient {
|
|||||||
hostname: urlObj.hostname,
|
hostname: urlObj.hostname,
|
||||||
port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
|
port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
|
||||||
path: urlObj.pathname + urlObj.search,
|
path: urlObj.pathname + urlObj.search,
|
||||||
headers
|
headers,
|
||||||
|
agent: httpsAgent
|
||||||
};
|
};
|
||||||
|
|
||||||
const req = https.get(requestOptions, (res) => {
|
const req = https.get(requestOptions, (res) => {
|
||||||
@@ -180,7 +184,8 @@ class UpdateClient {
|
|||||||
hostname: urlObj.hostname,
|
hostname: urlObj.hostname,
|
||||||
port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
|
port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
|
||||||
path: urlObj.pathname + urlObj.search,
|
path: urlObj.pathname + urlObj.search,
|
||||||
headers
|
headers,
|
||||||
|
agent: httpsAgent
|
||||||
};
|
};
|
||||||
|
|
||||||
const req = https.get(requestOptions, (res) => {
|
const req = https.get(requestOptions, (res) => {
|
||||||
@@ -223,7 +228,8 @@ class UpdateClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async checkForUpdates() {
|
async checkForUpdates() {
|
||||||
const releases = await this.fetchJson(RELEASES_API);
|
const cacheBuster = `?cb=${Date.now()}`;
|
||||||
|
const releases = await this.fetchJson(RELEASES_API + cacheBuster);
|
||||||
if (!releases || releases.length === 0) {
|
if (!releases || releases.length === 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user