mirror of
https://git.sanhost.net/sanasol/hytale-f2p.git
synced 2026-02-25 22:31:46 -03:00
fix: improve update system UX and macOS compatibility
Update System Improvements: - Fix duplicate update popups by disabling legacy updater.js - Add skip button to update popup (shows after 30s, on error, or after download) - Add macOS-specific handling with manual download as primary option - Add missing open-download-page IPC handler - Add missing unblockInterface() method to properly clean up after popup close - Add quitAndInstallUpdate alias in preload for compatibility - Remove pulse animation when download completes - Fix manual download button to show correct status and close popup - Sync player name to settings input after first install Client Patcher Cleanup: - Remove server patching code (server uses pre-patched JAR from CDN) - Simplify to client-only patching - Remove unused imports (crypto, AdmZip, execSync, spawn, javaManager) - Remove unused methods (stringToUtf8, findAndReplaceDomainUtf8) - Move localhost dev code to backup file for reference Code Quality Fixes: - Fix duplicate DOMContentLoaded handlers in install.js - Fix duplicate checkForUpdates definition in preload.js - Fix redundant if/else in onProgressUpdate callback - Fix typo "Harwadre" -> "Hardware" in preload.js Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -882,7 +882,7 @@
|
|||||||
<script src="js/i18n.js"></script>
|
<script src="js/i18n.js"></script>
|
||||||
<script type="module" src="js/settings.js"></script>
|
<script type="module" src="js/settings.js"></script>
|
||||||
<script type="module" src="js/update.js"></script>
|
<script type="module" src="js/update.js"></script>
|
||||||
<script src="js/updater.js"></script>
|
<!-- updater.js disabled - using update.js instead which has skip button and macOS handling -->
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -72,8 +72,11 @@ export async function installGame() {
|
|||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.LauncherUI.hideProgress();
|
window.LauncherUI.hideProgress();
|
||||||
window.LauncherUI.showLauncherOrInstall(true);
|
window.LauncherUI.showLauncherOrInstall(true);
|
||||||
|
// Sync player name to both launcher and settings inputs
|
||||||
const playerNameInput = document.getElementById('playerName');
|
const playerNameInput = document.getElementById('playerName');
|
||||||
if (playerNameInput) playerNameInput.value = playerName;
|
if (playerNameInput) playerNameInput.value = playerName;
|
||||||
|
const settingsPlayerName = document.getElementById('settingsPlayerName');
|
||||||
|
if (settingsPlayerName) settingsPlayerName.value = playerName;
|
||||||
resetInstallButton();
|
resetInstallButton();
|
||||||
}, 2000);
|
}, 2000);
|
||||||
}
|
}
|
||||||
@@ -125,8 +128,11 @@ function simulateInstallation(playerName) {
|
|||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.LauncherUI.hideProgress();
|
window.LauncherUI.hideProgress();
|
||||||
window.LauncherUI.showLauncherOrInstall(true);
|
window.LauncherUI.showLauncherOrInstall(true);
|
||||||
|
// Sync player name to both launcher and settings inputs
|
||||||
const playerNameInput = document.getElementById('playerName');
|
const playerNameInput = document.getElementById('playerName');
|
||||||
if (playerNameInput) playerNameInput.value = playerName;
|
if (playerNameInput) playerNameInput.value = playerName;
|
||||||
|
const settingsPlayerName = document.getElementById('settingsPlayerName');
|
||||||
|
if (settingsPlayerName) settingsPlayerName.value = playerName;
|
||||||
resetInstallButton();
|
resetInstallButton();
|
||||||
}, 2000);
|
}, 2000);
|
||||||
}
|
}
|
||||||
@@ -246,9 +252,3 @@ document.addEventListener('DOMContentLoaded', async () => {
|
|||||||
setupInstallation();
|
setupInstallation();
|
||||||
await checkGameStatusAndShowInterface();
|
await checkGameStatusAndShowInterface();
|
||||||
});
|
});
|
||||||
window.browseInstallPath = browseInstallPath;
|
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', async () => {
|
|
||||||
setupInstallation();
|
|
||||||
await checkGameStatusAndShowInterface();
|
|
||||||
});
|
|
||||||
|
|||||||
216
GUI/js/update.js
216
GUI/js/update.js
@@ -6,12 +6,12 @@ class ClientUpdateManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
window.electronAPI.onUpdatePopup((updateInfo) => {
|
console.log('🔧 ClientUpdateManager initializing...');
|
||||||
this.showUpdatePopup(updateInfo);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Listen for electron-updater events
|
// Listen for electron-updater events from main.js
|
||||||
|
// This is the primary update trigger - main.js checks for updates on startup
|
||||||
window.electronAPI.onUpdateAvailable((updateInfo) => {
|
window.electronAPI.onUpdateAvailable((updateInfo) => {
|
||||||
|
console.log('📥 update-available event received:', updateInfo);
|
||||||
this.showUpdatePopup(updateInfo);
|
this.showUpdatePopup(updateInfo);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -20,18 +20,30 @@ class ClientUpdateManager {
|
|||||||
});
|
});
|
||||||
|
|
||||||
window.electronAPI.onUpdateDownloaded((updateInfo) => {
|
window.electronAPI.onUpdateDownloaded((updateInfo) => {
|
||||||
|
console.log('📦 update-downloaded event received:', updateInfo);
|
||||||
this.showUpdateDownloaded(updateInfo);
|
this.showUpdateDownloaded(updateInfo);
|
||||||
});
|
});
|
||||||
|
|
||||||
window.electronAPI.onUpdateError((errorInfo) => {
|
window.electronAPI.onUpdateError((errorInfo) => {
|
||||||
|
console.log('❌ update-error event received:', errorInfo);
|
||||||
this.handleUpdateError(errorInfo);
|
this.handleUpdateError(errorInfo);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.checkForUpdatesOnDemand();
|
console.log('✅ ClientUpdateManager initialized');
|
||||||
|
|
||||||
|
// Note: Don't call checkForUpdatesOnDemand() here - main.js already checks
|
||||||
|
// for updates after 3 seconds and sends 'update-available' event.
|
||||||
|
// Calling it here would cause duplicate popups.
|
||||||
}
|
}
|
||||||
|
|
||||||
showUpdatePopup(updateInfo) {
|
showUpdatePopup(updateInfo) {
|
||||||
if (this.updatePopupVisible) return;
|
console.log('🔔 showUpdatePopup called, updatePopupVisible:', this.updatePopupVisible);
|
||||||
|
|
||||||
|
// Check if popup already exists in DOM (extra safety)
|
||||||
|
if (this.updatePopupVisible || document.getElementById('update-popup-overlay')) {
|
||||||
|
console.log('⚠️ Update popup already visible, skipping');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.updatePopupVisible = true;
|
this.updatePopupVisible = true;
|
||||||
|
|
||||||
@@ -92,7 +104,10 @@ class ClientUpdateManager {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="update-popup-footer">
|
<div class="update-popup-footer">
|
||||||
This popup cannot be closed until you update the launcher
|
<span id="update-footer-text">Downloading update...</span>
|
||||||
|
<button id="update-skip-btn" class="update-skip-btn" style="display: none; margin-top: 0.5rem; background: transparent; border: 1px solid rgba(255,255,255,0.2); color: #9ca3af; padding: 0.5rem 1rem; border-radius: 0.25rem; cursor: pointer; font-size: 0.75rem;">
|
||||||
|
Skip for now (not recommended)
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -113,16 +128,43 @@ class ClientUpdateManager {
|
|||||||
installBtn.addEventListener('click', async (e) => {
|
installBtn.addEventListener('click', async (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
installBtn.disabled = true;
|
installBtn.disabled = true;
|
||||||
installBtn.innerHTML = '<i class="fas fa-spinner fa-spin" style="margin-right: 0.5rem;"></i>Installing...';
|
installBtn.innerHTML = '<i class="fas fa-spinner fa-spin" style="margin-right: 0.5rem;"></i>Installing...';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await window.electronAPI.quitAndInstallUpdate();
|
await window.electronAPI.quitAndInstallUpdate();
|
||||||
|
|
||||||
|
// If we're still here after 5 seconds, the install probably failed
|
||||||
|
setTimeout(() => {
|
||||||
|
console.log('⚠️ Install may have failed - showing skip option');
|
||||||
|
installBtn.disabled = false;
|
||||||
|
installBtn.innerHTML = '<i class="fas fa-check" style="margin-right: 0.5rem;"></i>Try Again';
|
||||||
|
|
||||||
|
// Show skip button
|
||||||
|
const skipBtn = document.getElementById('update-skip-btn');
|
||||||
|
const footerText = document.getElementById('update-footer-text');
|
||||||
|
if (skipBtn) {
|
||||||
|
skipBtn.style.display = 'inline-block';
|
||||||
|
if (footerText) {
|
||||||
|
footerText.textContent = 'Install not working? Skip for now:';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 5000);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('❌ Error installing update:', error);
|
console.error('❌ Error installing update:', error);
|
||||||
installBtn.disabled = false;
|
installBtn.disabled = false;
|
||||||
installBtn.innerHTML = '<i class="fas fa-check" style="margin-right: 0.5rem;"></i>Install & Restart';
|
installBtn.innerHTML = '<i class="fas fa-check" style="margin-right: 0.5rem;"></i>Install & Restart';
|
||||||
|
|
||||||
|
// Show skip button on error
|
||||||
|
const skipBtn = document.getElementById('update-skip-btn');
|
||||||
|
const footerText = document.getElementById('update-footer-text');
|
||||||
|
if (skipBtn) {
|
||||||
|
skipBtn.style.display = 'inline-block';
|
||||||
|
if (footerText) {
|
||||||
|
footerText.textContent = 'Install failed. Skip for now:';
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -138,10 +180,15 @@ class ClientUpdateManager {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await window.electronAPI.openDownloadPage();
|
await window.electronAPI.openDownloadPage();
|
||||||
console.log('✅ Download page opened, launcher will close...');
|
console.log('✅ Download page opened');
|
||||||
|
|
||||||
downloadBtn.innerHTML = '<i class="fas fa-check" style="margin-right: 0.5rem;"></i>Launcher closing...';
|
downloadBtn.innerHTML = '<i class="fas fa-check" style="margin-right: 0.5rem;"></i>Opened in browser';
|
||||||
|
|
||||||
|
// Close the popup after opening download page
|
||||||
|
setTimeout(() => {
|
||||||
|
this.closeUpdatePopup();
|
||||||
|
}, 1500);
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('❌ Error opening download page:', error);
|
console.error('❌ Error opening download page:', error);
|
||||||
downloadBtn.disabled = false;
|
downloadBtn.disabled = false;
|
||||||
@@ -161,9 +208,39 @@ class ClientUpdateManager {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Show skip button after 30 seconds as fallback (in case update is stuck)
|
||||||
|
setTimeout(() => {
|
||||||
|
const skipBtn = document.getElementById('update-skip-btn');
|
||||||
|
const footerText = document.getElementById('update-footer-text');
|
||||||
|
if (skipBtn) {
|
||||||
|
skipBtn.style.display = 'inline-block';
|
||||||
|
if (footerText) {
|
||||||
|
footerText.textContent = 'Update taking too long?';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 30000);
|
||||||
|
|
||||||
|
const skipBtn = document.getElementById('update-skip-btn');
|
||||||
|
if (skipBtn) {
|
||||||
|
skipBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
this.closeUpdatePopup();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
console.log('🔔 Update popup displayed with new style');
|
console.log('🔔 Update popup displayed with new style');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
closeUpdatePopup() {
|
||||||
|
const overlay = document.getElementById('update-popup-overlay');
|
||||||
|
if (overlay) {
|
||||||
|
overlay.remove();
|
||||||
|
}
|
||||||
|
this.updatePopupVisible = false;
|
||||||
|
this.unblockInterface();
|
||||||
|
}
|
||||||
|
|
||||||
updateDownloadProgress(progress) {
|
updateDownloadProgress(progress) {
|
||||||
const progressBar = document.getElementById('update-progress-bar');
|
const progressBar = document.getElementById('update-progress-bar');
|
||||||
const progressPercent = document.getElementById('update-progress-percent');
|
const progressPercent = document.getElementById('update-progress-percent');
|
||||||
@@ -197,35 +274,96 @@ class ClientUpdateManager {
|
|||||||
const statusText = document.getElementById('update-status-text');
|
const statusText = document.getElementById('update-status-text');
|
||||||
const progressContainer = document.getElementById('update-progress-container');
|
const progressContainer = document.getElementById('update-progress-container');
|
||||||
const buttonsContainer = document.getElementById('update-buttons-container');
|
const buttonsContainer = document.getElementById('update-buttons-container');
|
||||||
|
const installBtn = document.getElementById('update-install-btn');
|
||||||
|
const downloadBtn = document.getElementById('update-download-btn');
|
||||||
|
const skipBtn = document.getElementById('update-skip-btn');
|
||||||
|
const footerText = document.getElementById('update-footer-text');
|
||||||
|
const popupContainer = document.querySelector('.update-popup-container');
|
||||||
|
|
||||||
if (statusText) {
|
// Remove breathing/pulse animation when download is complete
|
||||||
statusText.textContent = 'Update downloaded! Ready to install.';
|
if (popupContainer) {
|
||||||
|
popupContainer.classList.remove('update-popup-pulse');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (progressContainer) {
|
if (progressContainer) {
|
||||||
progressContainer.style.display = 'none';
|
progressContainer.style.display = 'none';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Use platform info from main process if available, fallback to browser detection
|
||||||
|
const autoInstallSupported = updateInfo.autoInstallSupported !== undefined
|
||||||
|
? updateInfo.autoInstallSupported
|
||||||
|
: navigator.platform.toUpperCase().indexOf('MAC') < 0;
|
||||||
|
|
||||||
|
if (!autoInstallSupported) {
|
||||||
|
// macOS: Show manual download as primary since auto-update doesn't work
|
||||||
|
if (statusText) {
|
||||||
|
statusText.textContent = 'Update downloaded but auto-install may not work on macOS.';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (installBtn) {
|
||||||
|
// Still show install button but as secondary option
|
||||||
|
installBtn.classList.add('update-download-btn-secondary');
|
||||||
|
installBtn.innerHTML = '<i class="fas fa-check" style="margin-right: 0.5rem;"></i>Try Install & Restart';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (downloadBtn) {
|
||||||
|
// Make manual download primary
|
||||||
|
downloadBtn.classList.remove('update-download-btn-secondary');
|
||||||
|
downloadBtn.innerHTML = '<i class="fas fa-external-link-alt" style="margin-right: 0.5rem;"></i>Download Manually (Recommended)';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (footerText) {
|
||||||
|
footerText.textContent = 'Auto-install often fails on macOS:';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Windows/Linux: Auto-install should work
|
||||||
|
if (statusText) {
|
||||||
|
statusText.textContent = 'Update downloaded! Ready to install.';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (footerText) {
|
||||||
|
footerText.textContent = 'Click to install the update:';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (buttonsContainer) {
|
if (buttonsContainer) {
|
||||||
buttonsContainer.style.display = 'block';
|
buttonsContainer.style.display = 'block';
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('✅ Update downloaded, ready to install');
|
// Always show skip button in downloaded state
|
||||||
|
if (skipBtn) {
|
||||||
|
skipBtn.style.display = 'inline-block';
|
||||||
|
console.log('✅ Skip button made visible');
|
||||||
|
} else {
|
||||||
|
console.error('❌ Skip button not found in DOM!');
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('✅ Update downloaded, ready to install. autoInstallSupported:', autoInstallSupported);
|
||||||
}
|
}
|
||||||
|
|
||||||
handleUpdateError(errorInfo) {
|
handleUpdateError(errorInfo) {
|
||||||
console.error('Update error:', errorInfo);
|
console.error('Update error:', errorInfo);
|
||||||
|
|
||||||
|
// Show skip button immediately on any error
|
||||||
|
const skipBtn = document.getElementById('update-skip-btn');
|
||||||
|
const footerText = document.getElementById('update-footer-text');
|
||||||
|
if (skipBtn) {
|
||||||
|
skipBtn.style.display = 'inline-block';
|
||||||
|
if (footerText) {
|
||||||
|
footerText.textContent = 'Update failed. You can skip for now.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If manual download is required, update the UI (this will handle status text)
|
// If manual download is required, update the UI (this will handle status text)
|
||||||
if (errorInfo.requiresManualDownload) {
|
if (errorInfo.requiresManualDownload) {
|
||||||
this.showManualDownloadRequired(errorInfo);
|
this.showManualDownloadRequired(errorInfo);
|
||||||
return; // Don't do anything else, showManualDownloadRequired handles everything
|
return; // Don't do anything else, showManualDownloadRequired handles everything
|
||||||
}
|
}
|
||||||
|
|
||||||
// For non-critical errors, just show error message without changing status
|
// For non-critical errors, just show error message without changing status
|
||||||
const errorMessage = document.getElementById('update-error-message');
|
const errorMessage = document.getElementById('update-error-message');
|
||||||
const errorText = document.getElementById('update-error-text');
|
const errorText = document.getElementById('update-error-text');
|
||||||
|
|
||||||
if (errorMessage && errorText) {
|
if (errorMessage && errorText) {
|
||||||
let message = errorInfo.message || 'An error occurred during the update process.';
|
let message = errorInfo.message || 'An error occurred during the update process.';
|
||||||
if (errorInfo.isMacSigningError) {
|
if (errorInfo.isMacSigningError) {
|
||||||
@@ -289,6 +427,16 @@ class ClientUpdateManager {
|
|||||||
buttonsContainer.style.display = 'block';
|
buttonsContainer.style.display = 'block';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Show skip button for manual download errors
|
||||||
|
const skipBtn = document.getElementById('update-skip-btn');
|
||||||
|
const footerText = document.getElementById('update-footer-text');
|
||||||
|
if (skipBtn) {
|
||||||
|
skipBtn.style.display = 'inline-block';
|
||||||
|
if (footerText) {
|
||||||
|
footerText.textContent = 'Or continue without updating:';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
console.log('⚠️ Manual download required due to update error');
|
console.log('⚠️ Manual download required due to update error');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -300,13 +448,35 @@ class ClientUpdateManager {
|
|||||||
|
|
||||||
document.body.classList.add('no-select');
|
document.body.classList.add('no-select');
|
||||||
|
|
||||||
document.addEventListener('keydown', this.blockKeyEvents.bind(this), true);
|
// Store bound functions so we can remove them later
|
||||||
|
this._boundBlockKeyEvents = this.blockKeyEvents.bind(this);
|
||||||
document.addEventListener('contextmenu', this.blockContextMenu.bind(this), true);
|
this._boundBlockContextMenu = this.blockContextMenu.bind(this);
|
||||||
|
|
||||||
|
document.addEventListener('keydown', this._boundBlockKeyEvents, true);
|
||||||
|
document.addEventListener('contextmenu', this._boundBlockContextMenu, true);
|
||||||
|
|
||||||
console.log('🚫 Interface blocked for update');
|
console.log('🚫 Interface blocked for update');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unblockInterface() {
|
||||||
|
const mainContent = document.querySelector('.flex.w-full.h-screen');
|
||||||
|
if (mainContent) {
|
||||||
|
mainContent.classList.remove('interface-blocked');
|
||||||
|
}
|
||||||
|
|
||||||
|
document.body.classList.remove('no-select');
|
||||||
|
|
||||||
|
// Remove event listeners
|
||||||
|
if (this._boundBlockKeyEvents) {
|
||||||
|
document.removeEventListener('keydown', this._boundBlockKeyEvents, true);
|
||||||
|
}
|
||||||
|
if (this._boundBlockContextMenu) {
|
||||||
|
document.removeEventListener('contextmenu', this._boundBlockContextMenu, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('✅ Interface unblocked');
|
||||||
|
}
|
||||||
|
|
||||||
blockKeyEvents(event) {
|
blockKeyEvents(event) {
|
||||||
if (event.target.closest('#update-popup-overlay')) {
|
if (event.target.closest('#update-popup-overlay')) {
|
||||||
if ((event.key === 'Enter' || event.key === ' ') &&
|
if ((event.key === 'Enter' || event.key === ' ') &&
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
66
main.js
66
main.js
@@ -176,7 +176,8 @@ function createWindow() {
|
|||||||
initDiscordRPC();
|
initDiscordRPC();
|
||||||
|
|
||||||
// Configure and initialize electron-updater
|
// Configure and initialize electron-updater
|
||||||
autoUpdater.autoDownload = false;
|
// Enable auto-download so updates start immediately when available
|
||||||
|
autoUpdater.autoDownload = true;
|
||||||
autoUpdater.autoInstallOnAppQuit = true;
|
autoUpdater.autoInstallOnAppQuit = true;
|
||||||
|
|
||||||
autoUpdater.on('checking-for-update', () => {
|
autoUpdater.on('checking-for-update', () => {
|
||||||
@@ -201,6 +202,20 @@ function createWindow() {
|
|||||||
|
|
||||||
autoUpdater.on('error', (err) => {
|
autoUpdater.on('error', (err) => {
|
||||||
console.error('Error in auto-updater:', err);
|
console.error('Error in auto-updater:', err);
|
||||||
|
|
||||||
|
// Handle macOS code signing errors - requires manual download
|
||||||
|
if (mainWindow && !mainWindow.isDestroyed()) {
|
||||||
|
const isMacSigningError = process.platform === 'darwin' &&
|
||||||
|
(err.code === 'ERR_UPDATER_INVALID_SIGNATURE' ||
|
||||||
|
err.message.includes('signature') ||
|
||||||
|
err.message.includes('code sign'));
|
||||||
|
|
||||||
|
mainWindow.webContents.send('update-error', {
|
||||||
|
message: err.message,
|
||||||
|
isMacSigningError: isMacSigningError,
|
||||||
|
requiresManualDownload: isMacSigningError || process.platform === 'darwin'
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
autoUpdater.on('download-progress', (progressObj) => {
|
autoUpdater.on('download-progress', (progressObj) => {
|
||||||
@@ -218,7 +233,10 @@ function createWindow() {
|
|||||||
console.log('Update downloaded:', info.version);
|
console.log('Update downloaded:', info.version);
|
||||||
if (mainWindow && !mainWindow.isDestroyed()) {
|
if (mainWindow && !mainWindow.isDestroyed()) {
|
||||||
mainWindow.webContents.send('update-downloaded', {
|
mainWindow.webContents.send('update-downloaded', {
|
||||||
version: info.version
|
version: info.version,
|
||||||
|
platform: process.platform,
|
||||||
|
// macOS auto-install often fails on unsigned apps
|
||||||
|
autoInstallSupported: process.platform !== 'darwin'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -859,6 +877,17 @@ ipcMain.handle('open-external', async (event, url) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ipcMain.handle('open-download-page', async () => {
|
||||||
|
try {
|
||||||
|
// Open GitHub releases page for manual download
|
||||||
|
await shell.openExternal('https://github.com/amiayweb/Hytale-F2P/releases/latest');
|
||||||
|
return { success: true };
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to open download page:', error);
|
||||||
|
return { success: false, error: error.message };
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
ipcMain.handle('open-game-location', async () => {
|
ipcMain.handle('open-game-location', async () => {
|
||||||
try {
|
try {
|
||||||
const { getResolvedAppDir, loadVersionBranch } = require('./backend/launcher');
|
const { getResolvedAppDir, loadVersionBranch } = require('./backend/launcher');
|
||||||
@@ -1086,8 +1115,37 @@ ipcMain.handle('download-update', async () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.handle('install-update', () => {
|
ipcMain.handle('install-update', async () => {
|
||||||
autoUpdater.quitAndInstall(false, true);
|
console.log('[AutoUpdater] Installing update...');
|
||||||
|
|
||||||
|
// On macOS, quitAndInstall often fails silently
|
||||||
|
// Use a more aggressive approach
|
||||||
|
if (process.platform === 'darwin') {
|
||||||
|
console.log('[AutoUpdater] macOS detected, using force quit approach');
|
||||||
|
// Give user feedback that something is happening
|
||||||
|
if (mainWindow && !mainWindow.isDestroyed()) {
|
||||||
|
mainWindow.webContents.send('update-installing');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Small delay to show the "Installing..." state
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 500));
|
||||||
|
|
||||||
|
try {
|
||||||
|
autoUpdater.quitAndInstall(false, true);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('[AutoUpdater] quitAndInstall failed:', err);
|
||||||
|
// Force quit the app - the update should install on next launch
|
||||||
|
app.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If quitAndInstall didn't work, force exit after a delay
|
||||||
|
setTimeout(() => {
|
||||||
|
console.log('[AutoUpdater] Force exiting app...');
|
||||||
|
app.exit(0);
|
||||||
|
}, 2000);
|
||||||
|
} else {
|
||||||
|
autoUpdater.quitAndInstall(false, true);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.handle('get-launcher-version', () => {
|
ipcMain.handle('get-launcher-version', () => {
|
||||||
|
|||||||
13
preload.js
13
preload.js
@@ -24,7 +24,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
|||||||
saveCloseLauncher: (enabled) => ipcRenderer.invoke('save-close-launcher', enabled),
|
saveCloseLauncher: (enabled) => ipcRenderer.invoke('save-close-launcher', enabled),
|
||||||
loadCloseLauncher: () => ipcRenderer.invoke('load-close-launcher'),
|
loadCloseLauncher: () => ipcRenderer.invoke('load-close-launcher'),
|
||||||
|
|
||||||
// Harwadre Acceleration
|
// Hardware Acceleration
|
||||||
saveLauncherHardwareAcceleration: (enabled) => ipcRenderer.invoke('save-launcher-hw-accel', enabled),
|
saveLauncherHardwareAcceleration: (enabled) => ipcRenderer.invoke('save-launcher-hw-accel', enabled),
|
||||||
loadLauncherHardwareAcceleration: () => ipcRenderer.invoke('load-launcher-hw-accel'),
|
loadLauncherHardwareAcceleration: () => ipcRenderer.invoke('load-launcher-hw-accel'),
|
||||||
|
|
||||||
@@ -50,14 +50,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
|||||||
selectModFiles: () => ipcRenderer.invoke('select-mod-files'),
|
selectModFiles: () => ipcRenderer.invoke('select-mod-files'),
|
||||||
copyModFile: (sourcePath, modsPath) => ipcRenderer.invoke('copy-mod-file', sourcePath, modsPath),
|
copyModFile: (sourcePath, modsPath) => ipcRenderer.invoke('copy-mod-file', sourcePath, modsPath),
|
||||||
onProgressUpdate: (callback) => {
|
onProgressUpdate: (callback) => {
|
||||||
ipcRenderer.on('progress-update', (event, data) => {
|
ipcRenderer.on('progress-update', (event, data) => callback(data));
|
||||||
// Ensure data includes retry state if available
|
|
||||||
if (data && typeof data === 'object') {
|
|
||||||
callback(data);
|
|
||||||
} else {
|
|
||||||
callback(data);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
onProgressComplete: (callback) => {
|
onProgressComplete: (callback) => {
|
||||||
ipcRenderer.on('progress-complete', () => callback());
|
ipcRenderer.on('progress-complete', () => callback());
|
||||||
@@ -69,7 +62,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
|||||||
ipcRenderer.on('installation-end', () => callback());
|
ipcRenderer.on('installation-end', () => callback());
|
||||||
},
|
},
|
||||||
getUserId: () => ipcRenderer.invoke('get-user-id'),
|
getUserId: () => ipcRenderer.invoke('get-user-id'),
|
||||||
checkForUpdates: () => ipcRenderer.invoke('check-for-updates'),
|
|
||||||
openDownloadPage: () => ipcRenderer.invoke('open-download-page'),
|
openDownloadPage: () => ipcRenderer.invoke('open-download-page'),
|
||||||
getUpdateInfo: () => ipcRenderer.invoke('get-update-info'),
|
getUpdateInfo: () => ipcRenderer.invoke('get-update-info'),
|
||||||
onUpdatePopup: (callback) => {
|
onUpdatePopup: (callback) => {
|
||||||
@@ -126,6 +118,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
|||||||
checkForUpdates: () => ipcRenderer.invoke('check-for-updates'),
|
checkForUpdates: () => ipcRenderer.invoke('check-for-updates'),
|
||||||
downloadUpdate: () => ipcRenderer.invoke('download-update'),
|
downloadUpdate: () => ipcRenderer.invoke('download-update'),
|
||||||
installUpdate: () => ipcRenderer.invoke('install-update'),
|
installUpdate: () => ipcRenderer.invoke('install-update'),
|
||||||
|
quitAndInstallUpdate: () => ipcRenderer.invoke('install-update'), // Alias for update.js compatibility
|
||||||
getLauncherVersion: () => ipcRenderer.invoke('get-launcher-version'),
|
getLauncherVersion: () => ipcRenderer.invoke('get-launcher-version'),
|
||||||
onUpdateAvailable: (callback) => {
|
onUpdateAvailable: (callback) => {
|
||||||
ipcRenderer.on('update-available', (event, data) => callback(data));
|
ipcRenderer.on('update-available', (event, data) => callback(data));
|
||||||
|
|||||||
Reference in New Issue
Block a user