mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-21 17:45:40 -05:00
fixed updater not showing
This commit is contained in:
14
main.js
14
main.js
@@ -128,14 +128,24 @@ async function start() {
|
|||||||
await installBuild(release);
|
await installBuild(release);
|
||||||
} else if (hasUpdate) {
|
} else if (hasUpdate) {
|
||||||
debugLog("Update available. Prompting user...");
|
debugLog("Update available. Prompting user...");
|
||||||
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
|
||||||
|
|
||||||
const tempApp = express();
|
const tempApp = express();
|
||||||
let userDecision = null;
|
let userDecision = null;
|
||||||
|
tempApp.use((req, res, next) => {
|
||||||
|
res.header('Access-Control-Allow-Origin', '*');
|
||||||
|
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
|
||||||
|
res.header('Access-Control-Allow-Headers', '*');
|
||||||
|
if (req.method === 'OPTIONS') return res.sendStatus(200);
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
tempApp.get('/update/info', (req, res) => {
|
||||||
|
res.json({ available: true, current: localVersion, latest: release.version });
|
||||||
|
});
|
||||||
tempApp.post('/update/yes', (req, res) => { userDecision = true; res.sendStatus(200); });
|
tempApp.post('/update/yes', (req, res) => { userDecision = true; res.sendStatus(200); });
|
||||||
tempApp.post('/update/no', (req, res) => { userDecision = false; res.sendStatus(200); });
|
tempApp.post('/update/no', (req, res) => { userDecision = false; res.sendStatus(200); });
|
||||||
const tempServer = tempApp.listen(4891, '127.0.0.1');
|
const tempServer = tempApp.listen(4891, '127.0.0.1');
|
||||||
|
|
||||||
|
sendToTauri('update-available', { current: localVersion, latest: release.version });
|
||||||
|
|
||||||
while (userDecision === null) {
|
while (userDecision === null) {
|
||||||
await new Promise(r => setTimeout(r, 500));
|
await new Promise(r => setTimeout(r, 500));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vyla-home",
|
"name": "vyla-home",
|
||||||
"version": "1.0.3",
|
"version": "1.0.4",
|
||||||
"description": "Vyla Home Desktop App Launcher",
|
"description": "Vyla Home Desktop App Launcher",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
2
src-tauri/Cargo.lock
generated
2
src-tauri/Cargo.lock
generated
@@ -4222,7 +4222,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.0.3"
|
version = "1.0.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.0.3"
|
version = "1.0.4"
|
||||||
description = "Vyla Home Desktop App Launcher"
|
description = "Vyla Home Desktop App Launcher"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/schema.json",
|
"$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/schema.json",
|
||||||
"productName": "Vyla Home",
|
"productName": "Vyla Home",
|
||||||
"version": "1.0.3",
|
"version": "1.0.4",
|
||||||
"identifier": "com.vyla.home",
|
"identifier": "com.vyla.home",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../ui"
|
"frontendDist": "../ui"
|
||||||
|
|||||||
@@ -681,21 +681,27 @@
|
|||||||
viewElement.classList.add('active');
|
viewElement.classList.add('active');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (window.__TAURI__ && window.__TAURI__.event) {
|
function setupTauriListeners() {
|
||||||
window.__TAURI__.event.listen('update-available', (e) => {
|
const eventApi = window.__TAURI__?.event || window.__TAURI_INTERNALS__;
|
||||||
|
if (!eventApi || typeof eventApi.listen !== 'function') {
|
||||||
|
setTimeout(setupTauriListeners, 200);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
eventApi.listen('update-available', (e) => {
|
||||||
if (e.payload) {
|
if (e.payload) {
|
||||||
document.getElementById('update-msg').textContent = `Version ${e.payload.latest} is available (Current: ${e.payload.current}).`;
|
document.getElementById('update-msg').textContent = `Version ${e.payload.latest} is available (Current: ${e.payload.current}).`;
|
||||||
showView(viewUpdate);
|
showView(viewUpdate);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
window.__TAURI__.event.listen('status', (e) => {
|
eventApi.listen('status', (e) => {
|
||||||
if (e.payload && e.payload.message) {
|
if (e.payload && e.payload.message) {
|
||||||
statusMsg.textContent = e.payload.message;
|
statusMsg.textContent = e.payload.message;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
window.__TAURI__.event.listen('download-progress', (e) => {
|
eventApi.listen('download-progress', (e) => {
|
||||||
if (e.payload) {
|
if (e.payload) {
|
||||||
statusMsg.textContent = `Downloading update: ${e.payload.percent}%`;
|
statusMsg.textContent = `Downloading update: ${e.payload.percent}%`;
|
||||||
progressWrap.style.display = 'block';
|
progressWrap.style.display = 'block';
|
||||||
@@ -703,27 +709,43 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
window.__TAURI__.event.listen('error', (e) => {
|
eventApi.listen('error', (e) => {
|
||||||
if (e.payload && e.payload.message) {
|
if (e.payload && e.payload.message) {
|
||||||
errorMsg.textContent = e.payload.message;
|
errorMsg.textContent = e.payload.message;
|
||||||
showView(viewError);
|
showView(viewError);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
window.__TAURI__.event.listen('ready', (e) => {
|
eventApi.listen('ready', (e) => {
|
||||||
if (e.payload && e.payload.url) {
|
if (e.payload && e.payload.url) {
|
||||||
window.location.href = e.payload.url;
|
window.location.href = e.payload.url;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
setupTauriListeners();
|
||||||
|
|
||||||
|
function checkUpdateApi() {
|
||||||
|
fetch('http://127.0.0.1:4891/update/info')
|
||||||
|
.then(r => r.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data && data.available) {
|
||||||
|
document.getElementById('update-msg').textContent = `Version ${data.latest} is available (Current: ${data.current}).`;
|
||||||
|
showView(viewUpdate);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => { });
|
||||||
|
}
|
||||||
|
const updateInterval = setInterval(checkUpdateApi, 500);
|
||||||
|
|
||||||
function installUpdate() {
|
function installUpdate() {
|
||||||
|
clearInterval(updateInterval);
|
||||||
fetch('http://127.0.0.1:4891/update/yes', { method: 'POST' }).catch(() => { });
|
fetch('http://127.0.0.1:4891/update/yes', { method: 'POST' }).catch(() => { });
|
||||||
statusMsg.textContent = 'Starting update...';
|
statusMsg.textContent = 'Starting update...';
|
||||||
showView(viewLoader);
|
showView(viewLoader);
|
||||||
}
|
}
|
||||||
|
|
||||||
function skipUpdate() {
|
function skipUpdate() {
|
||||||
|
clearInterval(updateInterval);
|
||||||
fetch('http://127.0.0.1:4891/update/no', { method: 'POST' }).catch(() => { });
|
fetch('http://127.0.0.1:4891/update/no', { method: 'POST' }).catch(() => { });
|
||||||
statusMsg.textContent = 'Continuing to app...';
|
statusMsg.textContent = 'Continuing to app...';
|
||||||
showView(viewLoader);
|
showView(viewLoader);
|
||||||
|
|||||||
Reference in New Issue
Block a user