mirror of
https://git.sanhost.net/sanasol/hytale-f2p
synced 2026-02-26 17:31:48 -03:00
Compare commits
8 Commits
v2.1.3-tes
...
fix/steamd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc664afa52 | ||
|
|
2efecd168f | ||
|
|
225bc662b3 | ||
|
|
8ef13c5ee1 | ||
|
|
778ed11f87 | ||
|
|
24a919588e | ||
|
|
219b50a214 | ||
|
|
4c059f0a6b |
40
.github/ISSUE_TEMPLATE/support_request.yml
vendored
40
.github/ISSUE_TEMPLATE/support_request.yml
vendored
@@ -1,22 +1,8 @@
|
||||
name: Support Request
|
||||
description: Request help or support
|
||||
title: "[SUPPORT] <ADD YOUR TITLE HERE>"
|
||||
title: "[SUPPORT] "
|
||||
labels: ["support"]
|
||||
body:
|
||||
- type: dropdown
|
||||
id: acknowledge
|
||||
attributes:
|
||||
label: Checklist
|
||||
options:
|
||||
- label: I have read the README.md before asking Support Request.
|
||||
required: true
|
||||
- label: I have read the TROUBLESHOOTING.md before asking Support Request.
|
||||
required: true
|
||||
- label: I have added title before submitting this Support Request.
|
||||
required: true
|
||||
- label: I acknowledge that my Support Request will not be responded as quick as in Discord Open-A-Ticket, I prefer this way.
|
||||
required: true
|
||||
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
@@ -38,7 +24,7 @@ body:
|
||||
attributes:
|
||||
label: Context
|
||||
description: Provide any relevant context or background information.
|
||||
placeholder: "I've tried these steps, but got..."
|
||||
placeholder: "I've tried..., but got..."
|
||||
validations:
|
||||
required: true
|
||||
|
||||
@@ -51,17 +37,12 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
- type: input
|
||||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: What version are you using?
|
||||
options:
|
||||
- v2.1.2
|
||||
- v2.1.1
|
||||
- v2.1.0
|
||||
- v2.0.11
|
||||
- v2.0.2
|
||||
placeholder: "e.g. v2.0.11 stable/pre-release"
|
||||
validations:
|
||||
required: true
|
||||
|
||||
@@ -71,12 +52,13 @@ body:
|
||||
label: Platform
|
||||
description: What platform are you using?
|
||||
options:
|
||||
- Windows 11 x64
|
||||
- Windows 10 x64
|
||||
- macOS ARM64 (Apple Silicon)
|
||||
- Linux x64 Ubuntu/Debian-based
|
||||
- Linux x64 Fedora/RHEL-based
|
||||
- Linux x64 Arch-based
|
||||
- Windows 10
|
||||
- Windows 11
|
||||
- macOS (Apple Silicon)
|
||||
- macOS (Intel)
|
||||
- Linux Ubuntu/Debian-based
|
||||
- Linux Fedora/RHEL-based
|
||||
- Linux Arch-based
|
||||
validations:
|
||||
required: true
|
||||
|
||||
|
||||
80
.github/workflows/release.yml
vendored
80
.github/workflows/release.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
node-version: '22'
|
||||
cache: 'npm'
|
||||
- run: npm ci
|
||||
|
||||
|
||||
- name: Build Windows Packages
|
||||
run: npx electron-builder --win --publish never
|
||||
- uses: actions/upload-artifact@v4
|
||||
@@ -40,14 +40,6 @@ jobs:
|
||||
- run: npm ci
|
||||
|
||||
- name: Build macOS Packages
|
||||
env:
|
||||
# Code signing
|
||||
CSC_LINK: ${{ secrets.CSC_LINK }}
|
||||
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
|
||||
# Notarization
|
||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
||||
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
|
||||
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
||||
run: npx electron-builder --mac --publish never
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -65,7 +57,7 @@ jobs:
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libarchive-tools
|
||||
|
||||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22'
|
||||
@@ -94,7 +86,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
||||
- name: Install base packages
|
||||
run: |
|
||||
pacman -Syu --noconfirm
|
||||
@@ -131,39 +123,26 @@ jobs:
|
||||
*.src.tar.zst
|
||||
.SRCINFO
|
||||
|
||||
# Create release with Windows, Linux, Arch (fast builds)
|
||||
release:
|
||||
needs: [build-windows, build-linux, build-arch]
|
||||
needs: [build-windows, build-macos, build-linux, build-arch]
|
||||
runs-on: ubuntu-latest
|
||||
if: |
|
||||
startsWith(github.ref, 'refs/tags/v') ||
|
||||
github.ref == 'refs/heads/main' ||
|
||||
startsWith(github.ref, 'refs/tags/v') ||
|
||||
github.ref == 'refs/heads/main' ||
|
||||
github.event_name == 'workflow_dispatch'
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
# FIX: './package.json' Module Not Found in `Get version` step
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Download Windows artifacts
|
||||
- name: Download all artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: windows-builds
|
||||
path: artifacts/windows-builds
|
||||
|
||||
- name: Download Linux artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: linux-builds
|
||||
path: artifacts/linux-builds
|
||||
|
||||
- name: Download Arch artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: arch-package
|
||||
path: artifacts/arch-package
|
||||
path: artifacts
|
||||
|
||||
- name: Display structure of downloaded files
|
||||
run: ls -R artifacts
|
||||
@@ -176,43 +155,18 @@ jobs:
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ github.ref_name }}
|
||||
# If it's a tag, use the tag.
|
||||
# tag_name: ${{ github.ref_type == 'tag' && github.ref_name || format('v{0}.r{1}', steps.pkg_version.outputs.VERSION, github.run_number) }}
|
||||
# If it's the 'release' branch, use 'v2.0.2-beta.r42'
|
||||
# name: ${{ github.ref_type == 'tag' && github.ref_name || format('v{0}-beta.r{1}', steps.pkg_version.outputs.VERSION, github.run_number) }}
|
||||
files: |
|
||||
artifacts/arch-package/*.pkg.tar.zst
|
||||
artifacts/arch-package/*.src.tar.zst
|
||||
artifacts/arch-package/.SRCINFO
|
||||
artifacts/linux-builds/*
|
||||
artifacts/windows-builds/*
|
||||
artifacts/linux-builds/**/*
|
||||
artifacts/windows-builds/**/*
|
||||
artifacts/macos-builds/**/*
|
||||
generate_release_notes: true
|
||||
draft: true
|
||||
prerelease: false
|
||||
|
||||
# Upload macOS builds separately (slow due to notarization)
|
||||
release-macos:
|
||||
needs: [build-macos, release]
|
||||
runs-on: ubuntu-latest
|
||||
if: |
|
||||
startsWith(github.ref, 'refs/tags/v') ||
|
||||
github.ref == 'refs/heads/main' ||
|
||||
github.event_name == 'workflow_dispatch'
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- name: Download macOS artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: macos-builds
|
||||
path: artifacts/macos-builds
|
||||
|
||||
- name: Display macOS files
|
||||
run: ls -R artifacts
|
||||
|
||||
- name: Upload macOS to Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ github.ref_name }}
|
||||
files: |
|
||||
artifacts/macos-builds/*
|
||||
draft: true
|
||||
prerelease: false
|
||||
|
||||
|
||||
@@ -882,7 +882,7 @@
|
||||
<script src="js/i18n.js"></script>
|
||||
<script type="module" src="js/settings.js"></script>
|
||||
<script type="module" src="js/update.js"></script>
|
||||
<!-- updater.js disabled - using update.js instead which has skip button and macOS handling -->
|
||||
<script src="js/updater.js"></script>
|
||||
</body>
|
||||
|
||||
|
||||
|
||||
@@ -72,11 +72,8 @@ export async function installGame() {
|
||||
setTimeout(() => {
|
||||
window.LauncherUI.hideProgress();
|
||||
window.LauncherUI.showLauncherOrInstall(true);
|
||||
// Sync player name to both launcher and settings inputs
|
||||
const playerNameInput = document.getElementById('playerName');
|
||||
if (playerNameInput) playerNameInput.value = playerName;
|
||||
const settingsPlayerName = document.getElementById('settingsPlayerName');
|
||||
if (settingsPlayerName) settingsPlayerName.value = playerName;
|
||||
resetInstallButton();
|
||||
}, 2000);
|
||||
}
|
||||
@@ -128,11 +125,8 @@ function simulateInstallation(playerName) {
|
||||
setTimeout(() => {
|
||||
window.LauncherUI.hideProgress();
|
||||
window.LauncherUI.showLauncherOrInstall(true);
|
||||
// Sync player name to both launcher and settings inputs
|
||||
const playerNameInput = document.getElementById('playerName');
|
||||
if (playerNameInput) playerNameInput.value = playerName;
|
||||
const settingsPlayerName = document.getElementById('settingsPlayerName');
|
||||
if (settingsPlayerName) settingsPlayerName.value = playerName;
|
||||
resetInstallButton();
|
||||
}, 2000);
|
||||
}
|
||||
@@ -252,3 +246,9 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||
setupInstallation();
|
||||
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() {
|
||||
console.log('🔧 ClientUpdateManager initializing...');
|
||||
window.electronAPI.onUpdatePopup((updateInfo) => {
|
||||
this.showUpdatePopup(updateInfo);
|
||||
});
|
||||
|
||||
// Listen for electron-updater events from main.js
|
||||
// This is the primary update trigger - main.js checks for updates on startup
|
||||
// Listen for electron-updater events
|
||||
window.electronAPI.onUpdateAvailable((updateInfo) => {
|
||||
console.log('📥 update-available event received:', updateInfo);
|
||||
this.showUpdatePopup(updateInfo);
|
||||
});
|
||||
|
||||
@@ -20,30 +20,18 @@ class ClientUpdateManager {
|
||||
});
|
||||
|
||||
window.electronAPI.onUpdateDownloaded((updateInfo) => {
|
||||
console.log('📦 update-downloaded event received:', updateInfo);
|
||||
this.showUpdateDownloaded(updateInfo);
|
||||
});
|
||||
|
||||
window.electronAPI.onUpdateError((errorInfo) => {
|
||||
console.log('❌ update-error event received:', errorInfo);
|
||||
this.handleUpdateError(errorInfo);
|
||||
});
|
||||
|
||||
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.
|
||||
this.checkForUpdatesOnDemand();
|
||||
}
|
||||
|
||||
showUpdatePopup(updateInfo) {
|
||||
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;
|
||||
}
|
||||
if (this.updatePopupVisible) return;
|
||||
|
||||
this.updatePopupVisible = true;
|
||||
|
||||
@@ -104,10 +92,7 @@ class ClientUpdateManager {
|
||||
</div>
|
||||
|
||||
<div class="update-popup-footer">
|
||||
<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>
|
||||
This popup cannot be closed until you update the launcher
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -128,43 +113,16 @@ class ClientUpdateManager {
|
||||
installBtn.addEventListener('click', async (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
|
||||
installBtn.disabled = true;
|
||||
installBtn.innerHTML = '<i class="fas fa-spinner fa-spin" style="margin-right: 0.5rem;"></i>Installing...';
|
||||
|
||||
|
||||
try {
|
||||
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) {
|
||||
console.error('❌ Error installing update:', error);
|
||||
installBtn.disabled = false;
|
||||
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:';
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -180,15 +138,10 @@ class ClientUpdateManager {
|
||||
|
||||
try {
|
||||
await window.electronAPI.openDownloadPage();
|
||||
console.log('✅ Download page opened');
|
||||
|
||||
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);
|
||||
|
||||
console.log('✅ Download page opened, launcher will close...');
|
||||
|
||||
downloadBtn.innerHTML = '<i class="fas fa-check" style="margin-right: 0.5rem;"></i>Launcher closing...';
|
||||
|
||||
} catch (error) {
|
||||
console.error('❌ Error opening download page:', error);
|
||||
downloadBtn.disabled = false;
|
||||
@@ -208,39 +161,9 @@ 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');
|
||||
}
|
||||
|
||||
closeUpdatePopup() {
|
||||
const overlay = document.getElementById('update-popup-overlay');
|
||||
if (overlay) {
|
||||
overlay.remove();
|
||||
}
|
||||
this.updatePopupVisible = false;
|
||||
this.unblockInterface();
|
||||
}
|
||||
|
||||
updateDownloadProgress(progress) {
|
||||
const progressBar = document.getElementById('update-progress-bar');
|
||||
const progressPercent = document.getElementById('update-progress-percent');
|
||||
@@ -274,96 +197,35 @@ class ClientUpdateManager {
|
||||
const statusText = document.getElementById('update-status-text');
|
||||
const progressContainer = document.getElementById('update-progress-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');
|
||||
|
||||
// Remove breathing/pulse animation when download is complete
|
||||
if (popupContainer) {
|
||||
popupContainer.classList.remove('update-popup-pulse');
|
||||
if (statusText) {
|
||||
statusText.textContent = 'Update downloaded! Ready to install.';
|
||||
}
|
||||
|
||||
if (progressContainer) {
|
||||
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) {
|
||||
buttonsContainer.style.display = 'block';
|
||||
}
|
||||
|
||||
// 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);
|
||||
console.log('✅ Update downloaded, ready to install');
|
||||
}
|
||||
|
||||
handleUpdateError(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 (errorInfo.requiresManualDownload) {
|
||||
this.showManualDownloadRequired(errorInfo);
|
||||
return; // Don't do anything else, showManualDownloadRequired handles everything
|
||||
}
|
||||
|
||||
|
||||
// For non-critical errors, just show error message without changing status
|
||||
const errorMessage = document.getElementById('update-error-message');
|
||||
const errorText = document.getElementById('update-error-text');
|
||||
|
||||
|
||||
if (errorMessage && errorText) {
|
||||
let message = errorInfo.message || 'An error occurred during the update process.';
|
||||
if (errorInfo.isMacSigningError) {
|
||||
@@ -427,16 +289,6 @@ class ClientUpdateManager {
|
||||
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');
|
||||
}
|
||||
|
||||
@@ -448,35 +300,13 @@ class ClientUpdateManager {
|
||||
|
||||
document.body.classList.add('no-select');
|
||||
|
||||
// Store bound functions so we can remove them later
|
||||
this._boundBlockKeyEvents = this.blockKeyEvents.bind(this);
|
||||
this._boundBlockContextMenu = this.blockContextMenu.bind(this);
|
||||
|
||||
document.addEventListener('keydown', this._boundBlockKeyEvents, true);
|
||||
document.addEventListener('contextmenu', this._boundBlockContextMenu, true);
|
||||
|
||||
document.addEventListener('keydown', this.blockKeyEvents.bind(this), true);
|
||||
|
||||
document.addEventListener('contextmenu', this.blockContextMenu.bind(this), true);
|
||||
|
||||
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) {
|
||||
if (event.target.closest('#update-popup-overlay')) {
|
||||
if ((event.key === 'Enter' || event.key === ' ') &&
|
||||
|
||||
60
README.md
60
README.md
@@ -4,10 +4,9 @@
|
||||
<h1>🎮 Hytale F2P Launcher 🚀</h1>
|
||||
<h2>💻 Cross-Platform Multiplayer 🖥️</h2>
|
||||
<h3>Available for Windows 🪟, macOS 🍎, and Linux 🐧</h3>
|
||||
<p><small>An unofficial cross-platform launcher for Hytale with automatic updates and multiplayer support!</small></p>
|
||||
<p><small>An unofficial cross-platform launcher for Hytale with automatic updates and multiplayer support (all OS supported)</small></p>
|
||||
</header>
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||
@@ -119,9 +118,9 @@
|
||||
<tr>
|
||||
<td><b>🖥️ OS</b></td>
|
||||
<td colspan="3" align="center">
|
||||
Windows 10/11 (64-bit X64) | Linux (x64) | macOS (ARM64/Apple Silicon)
|
||||
Windows 10/11 (64-bit; X64/ARM64) | Linux (x64/ARM64) | macOS (Apple Silicon only)
|
||||
<br />
|
||||
<small><i>⚠️ Note: ARM64 (Windows & Linux), macOS (x86/Intel) <b>are not supported!</b> ⚠️</i></small>
|
||||
<small><i>⚠️ Note: macOS Intel (x86) is not yet supported <sup><a href="#fn1" id="ref1">1</a></sup></i></small>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -132,7 +131,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>🧠 RAM</b></td>
|
||||
<td>8GB (dGPU) / 12GB (iGPU)<sup><a href="#fn1" id="ref1">1</a></sup></td>
|
||||
<td>8GB (dGPU)<sup><a href="#fn1" id="ref2">2</a></sup> /<br>12GB (iGPU)<sup><a href="#fn1" id="ref3">3</a></sup></td>
|
||||
<td>16 GB</td>
|
||||
<td>32 GB</td>
|
||||
</tr>
|
||||
@@ -157,19 +156,19 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<p id="fn1"><sup>Note 1</sup> Using Discrete/Dedicated GPU (dGPU) must have 8 GB RAM minimum, while using Integrated GPU (iGPU) must have 12 GB RAM.</p>
|
||||
<p id="fn1"><sup>Note 1</sup> Hytale did not provide game files for macOS Intel, yet.</p>
|
||||
<p id="fn2"><sup>Note 2</sup> Using Discrete/Dedicated GPU (dGPU) must have 8 GB RAM minimum.</p>
|
||||
<p id="fn3"><sup>Note 3</sup> Using Integrated GPU (dGPU) must have 12 GB RAM minimum.</p>
|
||||
|
||||
> [!WARNING]
|
||||
> Our launcher has **not yet** supported Offline Mode (playing Hytale without internet).
|
||||
> We will surely add the feature as soon as possible. Kindly wait for the update.
|
||||
|
||||
---
|
||||
|
||||
### 🪟 Windows Prequisites
|
||||
* **
|
||||
* **Java JDK 25:**
|
||||
* [Oracle](https://www.oracle.com/java/technologies/downloads/#jdk25-windows)
|
||||
* [Adoptium](https://adoptium.net/temurin/releases/?version=25)
|
||||
* [Oracle](https://www.oracle.com/java/technologies/downloads/#jdk25-windows), **no** support for Windows ARM64 in both version 25 and 21.
|
||||
* [Adoptium](https://adoptium.net/temurin/releases/?version=25), has Windows ARM64 support in version 21 only.
|
||||
* [Microsoft](https://learn.microsoft.com/en-us/java/openjdk/download), has Windows ARM64 support in version 25.
|
||||
* Download from any vendor if your OS is not Windows with ARM64 architecture.
|
||||
* **Latest Visual Studio Redist:**
|
||||
* Download via [Microsoft Visual C++ Redistributable](https://aka.ms/vc14/vc_redist.x64.exe)
|
||||
* Or [All-in-One by Techpowerup](https://www.techpowerup.com/download/visual-c-redistributable-runtime-package-all-in-one/)
|
||||
@@ -179,9 +178,9 @@
|
||||
> [!WARNING]
|
||||
> Ubuntu-based Distro like ZorinOS or Pop!_OS or Linux Mint would encounter issues due to UbuntuLTS environment, [check this Discord post](https://discord.com/channels/1462260103951421493/1463662398501027973).
|
||||
|
||||
* Make sure you have already installed newest **GPU driver** especially proprietary NVIDIA, consult your distro docs or wiki.
|
||||
* Also make sure that your GPU can be connected to EGL, try checking it first (again, consult your distro docs or wiki) before installing Hytale game via our launcher.
|
||||
* Install `libpng` package to avoid `SDL3_Image` error:
|
||||
* Make sure you have already installed newest **GPU driver**, consult your distro docs or wiki.
|
||||
|
||||
* Install `libpng` package to avoid SDL3_Image error:
|
||||
* `libpng16-16 libpng-dev` for Ubuntu/Debian-based Distro
|
||||
* `libpng libpng-devel` for Fedora/RHEL-based Distro
|
||||
* `libpng` for Arch-based Distro
|
||||
@@ -195,12 +194,11 @@
|
||||
1. **Prerequisites:** Ensure you have installed all [**Windows Prerequisites**](https://github.com/amiayweb/Hytale-F2P/tree/main?tab=readme-ov-file#-windows-prequisites) listed above.
|
||||
2. **Download:** Get the latest `Hytale-F2P-Launcher.exe` from the [**Releases**](https://github.com/amiayweb/Hytale-F2P/releases/latest/) page.
|
||||
3. **SmartScreen Note:** Since the executable is currently unsigned, Windows may show a "Windows protected your PC" popup.
|
||||
* Click **More info**, then click **Run anyway**.
|
||||
* Click **More info**.
|
||||
* Click **Run anyway**.
|
||||
4. **Launch:** Once installed, you can launch the app directly from your Desktop or the Start menu.
|
||||
5. **Whitelist in Windows Firewall** [#192](https://github.com/amiayweb/Hytale-F2P/issues/192#issuecomment-3803042908)
|
||||
* Open the Windows Start Menu and search for `Allow an app through Windows Firewall`
|
||||
* Click "Change settings" (you may need Admin privileges) and Locate `HytaleClient.exe` in the list.
|
||||
* Ensure both the Private and Public checkboxes are checked. Click OK to save.
|
||||
|
||||
---
|
||||
|
||||
### 🐧 Linux Installation
|
||||
|
||||
@@ -245,6 +243,8 @@
|
||||
* **Desktop Entry:** After installing via `.rpm`, `.deb`, or `.pkg.tar.zst`, the launcher should automatically appear in your App Library/Grid.
|
||||
* Missing libxcrypt.so.1: Install `libxcrypt-compat` using your package manager
|
||||
|
||||
---
|
||||
|
||||
### 🍎 macOS Installation
|
||||
|
||||
> [!NOTE]
|
||||
@@ -272,9 +272,9 @@ The `.zip` version is useful for users who prefer a portable installation or nee
|
||||
|
||||
---
|
||||
|
||||
# 📢 How to Host a Server
|
||||
# How to Host a Server
|
||||
|
||||
## 🌐 Host your Singleplayer Server (Online-Play Feature)
|
||||
## Host your Singleplayer Server (Online-Play Feature)
|
||||
|
||||
> [!NOTE]
|
||||
> You have to play the game to host the server. See Dedicated Server section below if you want to host it without you playing as the host.
|
||||
@@ -283,29 +283,23 @@ The `.zip` version is useful for users who prefer a portable installation or nee
|
||||
2. Pause the game (Esc) > select Online Play > Turn on `Allow Other Players to Join` > Set password if needed > Press `Save`.
|
||||
3. Check the status `Connected via STUN` or `Connected via UPnP`.
|
||||
|
||||
## 🖧 Host a Dedicated Server
|
||||
## Dedicated Server
|
||||
|
||||
> [!NOTE]
|
||||
> If you already have the patched `HytaleServer.jar` in `HytaleF2P/{release/pre-release}/package/game/latest/Server`, you can use it to host local dedicated server.
|
||||
> If you have already `HytaleServer.jar` in `HytaleF2P/{release/pre-release}/package/game/latest/Server`, you can use it to host local dedicated server.
|
||||
|
||||
> [!TIP]
|
||||
> Use services like Playit.gg, Tailscale, Radmin VPN to share UDP connection if setting up router as an admin is not possible.
|
||||
|
||||
> [!WARNING]
|
||||
> `Hytale-F2P-Server.rar` file is needed to set up a server on non-playing hardware (such as VPS/server hosting). Linux ARM64 is supported for server only.
|
||||
> `Hytale-F2P-Server.rar` file is needed to set up a server on non-playing hardware (such as VPS/server hosting).
|
||||
|
||||
> [!IMPORTANT]
|
||||
> See detailed information of setting up a server here: [SERVER.md](SERVER.md). Download the latest patched JAR, the patched RAR, or the SH/BAT scripts from channel `#open-public-server` in our Discord Server.
|
||||
> See detailed information of setting up a server here: [SERVER.md](SERVER.md)
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Troubleshooting
|
||||
|
||||
See [TROUBLESHOOTING.md](TROUBLESHOOTING.md) for detailed Troubleshooting guide.
|
||||
|
||||
---
|
||||
|
||||
## 🔨 Building from Source
|
||||
## 🛠️ Building from Source
|
||||
|
||||
See [BUILD.md](docs/BUILD.md) for comprehensive build instructions.
|
||||
|
||||
|
||||
@@ -24,6 +24,57 @@ try {
|
||||
|
||||
const execAsync = promisify(exec);
|
||||
|
||||
/**
|
||||
* Try to auto-install jemalloc on Linux using pkexec (graphical sudo)
|
||||
* Returns true if installation was successful
|
||||
*/
|
||||
async function tryInstallJemalloc() {
|
||||
console.log('Linux: Attempting to auto-install jemalloc...');
|
||||
|
||||
// Detect package manager and get install command
|
||||
let installCmd = null;
|
||||
try {
|
||||
await execAsync('which pacman');
|
||||
installCmd = 'pacman -S --noconfirm jemalloc';
|
||||
} catch (e) {
|
||||
try {
|
||||
await execAsync('which apt');
|
||||
installCmd = 'apt install -y libjemalloc2';
|
||||
} catch (e2) {
|
||||
try {
|
||||
await execAsync('which dnf');
|
||||
installCmd = 'dnf install -y jemalloc';
|
||||
} catch (e3) {
|
||||
console.log('Linux: Could not detect package manager for auto-install');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Try pkexec first (graphical sudo), fall back to sudo
|
||||
const sudoCommands = ['pkexec', 'sudo'];
|
||||
for (const sudoCmd of sudoCommands) {
|
||||
try {
|
||||
await execAsync(`which ${sudoCmd}`);
|
||||
console.log(`Linux: Installing jemalloc with: ${sudoCmd} ${installCmd}`);
|
||||
await execAsync(`${sudoCmd} ${installCmd}`, { timeout: 120000 });
|
||||
console.log('Linux: jemalloc installed successfully');
|
||||
return true;
|
||||
} catch (e) {
|
||||
if (e.killed) {
|
||||
console.log('Linux: Install timed out');
|
||||
} else if (e.code === 126 || e.code === 127) {
|
||||
continue;
|
||||
} else {
|
||||
console.log(`Linux: Install failed with ${sudoCmd}: ${e.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Linux: Auto-install failed, manual installation required');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Fetch tokens from the auth server (properly signed with server's Ed25519 key)
|
||||
async function fetchAuthTokens(uuid, name) {
|
||||
const authServerUrl = getAuthServerUrl();
|
||||
@@ -285,53 +336,62 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
||||
const gpuEnv = setupGpuEnvironment(gpuPreference);
|
||||
Object.assign(env, gpuEnv);
|
||||
|
||||
// Linux: Replace bundled libzstd.so with system version to fix glibc 2.41+ crash
|
||||
// The bundled libzstd causes "free(): invalid pointer" on Steam Deck / Ubuntu LTS
|
||||
if (process.platform === 'linux' && process.env.HYTALE_NO_LIBZSTD_FIX !== '1') {
|
||||
const clientDir = path.dirname(clientPath);
|
||||
const bundledLibzstd = path.join(clientDir, 'libzstd.so');
|
||||
const backupLibzstd = path.join(clientDir, 'libzstd.so.bundled');
|
||||
// Linux: Use jemalloc to fix "free(): invalid pointer" crash on glibc 2.41+ (Steam Deck, Ubuntu LTS)
|
||||
// Root cause: glibc 2.41 has stricter heap validation that catches a pre-existing race condition
|
||||
if (process.platform === 'linux') {
|
||||
if (process.env.HYTALE_NO_JEMALLOC !== '1') {
|
||||
const jemallocPaths = [
|
||||
'/usr/lib/libjemalloc.so.2', // Arch Linux, Steam Deck
|
||||
'/usr/lib/x86_64-linux-gnu/libjemalloc.so.2', // Debian/Ubuntu
|
||||
'/usr/lib64/libjemalloc.so.2', // Fedora/RHEL
|
||||
'/usr/lib/libjemalloc.so', // Generic fallback
|
||||
'/usr/lib/x86_64-linux-gnu/libjemalloc.so', // Debian/Ubuntu fallback
|
||||
'/usr/lib64/libjemalloc.so' // Fedora/RHEL fallback
|
||||
];
|
||||
|
||||
// Common system libzstd paths
|
||||
const systemLibzstdPaths = [
|
||||
'/usr/lib/libzstd.so.1', // Arch Linux, Steam Deck
|
||||
'/usr/lib/x86_64-linux-gnu/libzstd.so.1', // Debian/Ubuntu
|
||||
'/usr/lib64/libzstd.so.1' // Fedora/RHEL
|
||||
];
|
||||
let jemalloc = null;
|
||||
for (const p of jemallocPaths) {
|
||||
if (fs.existsSync(p)) {
|
||||
jemalloc = p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
let systemLibzstd = null;
|
||||
for (const p of systemLibzstdPaths) {
|
||||
if (fs.existsSync(p)) {
|
||||
systemLibzstd = p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (jemalloc) {
|
||||
env.LD_PRELOAD = jemalloc + (env.LD_PRELOAD ? ':' + env.LD_PRELOAD : '');
|
||||
console.log(`Linux: Using jemalloc allocator for stability (${jemalloc})`);
|
||||
} else {
|
||||
// Try auto-install
|
||||
if (process.env.HYTALE_AUTO_INSTALL_JEMALLOC !== '0') {
|
||||
const installed = await tryInstallJemalloc();
|
||||
if (installed) {
|
||||
for (const p of jemallocPaths) {
|
||||
if (fs.existsSync(p)) {
|
||||
jemalloc = p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (jemalloc) {
|
||||
env.LD_PRELOAD = jemalloc + (env.LD_PRELOAD ? ':' + env.LD_PRELOAD : '');
|
||||
console.log(`Linux: Using jemalloc after auto-install (${jemalloc})`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (systemLibzstd && fs.existsSync(bundledLibzstd)) {
|
||||
try {
|
||||
const stats = fs.lstatSync(bundledLibzstd);
|
||||
if (!jemalloc) {
|
||||
env.MALLOC_CHECK_ = '0';
|
||||
console.log('Linux: jemalloc not found - install with: sudo pacman -S jemalloc (Arch) or sudo apt install libjemalloc2 (Debian/Ubuntu)');
|
||||
console.log('Linux: Using fallback MALLOC_CHECK_=0 (may still crash on glibc 2.41+)');
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log('Linux: jemalloc disabled by HYTALE_NO_JEMALLOC=1');
|
||||
}
|
||||
}
|
||||
|
||||
// Only replace if it's not already a symlink to system version
|
||||
if (!stats.isSymbolicLink()) {
|
||||
// Backup bundled version
|
||||
if (!fs.existsSync(backupLibzstd)) {
|
||||
fs.renameSync(bundledLibzstd, backupLibzstd);
|
||||
console.log(`Linux: Backed up bundled libzstd.so`);
|
||||
} else {
|
||||
fs.unlinkSync(bundledLibzstd);
|
||||
}
|
||||
|
||||
// Create symlink to system version
|
||||
fs.symlinkSync(systemLibzstd, bundledLibzstd);
|
||||
console.log(`Linux: Linked libzstd.so to system version (${systemLibzstd}) for glibc 2.41+ compatibility`);
|
||||
} else {
|
||||
const linkTarget = fs.readlinkSync(bundledLibzstd);
|
||||
console.log(`Linux: libzstd.so already linked to ${linkTarget}`);
|
||||
}
|
||||
} catch (libzstdError) {
|
||||
console.warn(`Linux: Could not replace libzstd.so: ${libzstdError.message}`);
|
||||
}
|
||||
}
|
||||
// Debug: log LD_PRELOAD before spawn
|
||||
if (process.platform === 'linux') {
|
||||
console.log(`Linux: LD_PRELOAD = ${env.LD_PRELOAD || '(not set)'}`);
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -346,7 +406,19 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
||||
spawnOptions.windowsHide = true;
|
||||
}
|
||||
|
||||
const child = spawn(clientPath, args, spawnOptions);
|
||||
let child;
|
||||
|
||||
// Linux: Use shell with inline LD_PRELOAD for maximum compatibility
|
||||
if (process.platform === 'linux' && env.LD_PRELOAD) {
|
||||
const quotedArgs = args.map(a => `"${a.replace(/"/g, '\\"')}"`).join(' ');
|
||||
const shellCmd = `LD_PRELOAD="${env.LD_PRELOAD}" "${clientPath}" ${quotedArgs}`;
|
||||
console.log(`Linux: Launching via shell with LD_PRELOAD`);
|
||||
|
||||
spawnOptions.shell = '/bin/bash';
|
||||
child = spawn(shellCmd, [], spawnOptions);
|
||||
} else {
|
||||
child = spawn(clientPath, args, spawnOptions);
|
||||
}
|
||||
|
||||
console.log(`Game process started with PID: ${child.pid}`);
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const crypto = require('crypto');
|
||||
const AdmZip = require('adm-zip');
|
||||
const { execSync, spawn } = require('child_process');
|
||||
const { getJavaExec, getBundledJavaPath } = require('../managers/javaManager');
|
||||
const { JRE_DIR } = require('../core/paths');
|
||||
|
||||
// Domain configuration
|
||||
const ORIGINAL_DOMAIN = 'hytale.com';
|
||||
@@ -21,13 +26,15 @@ function getTargetDomain() {
|
||||
const DEFAULT_NEW_DOMAIN = 'auth.sanasol.ws';
|
||||
|
||||
/**
|
||||
* Patches HytaleClient binary to replace hytale.com with custom domain
|
||||
* Server patching is done via pre-patched JAR download from CDN
|
||||
* Patches HytaleClient and HytaleServer binaries to replace hytale.com with custom domain
|
||||
* This allows the game to connect to a custom authentication server
|
||||
*
|
||||
* Supports domains from 4 to 16 characters:
|
||||
* - All F2P traffic routes to single endpoint: https://{domain} (no subdomains)
|
||||
* - Domains <= 10 chars: Direct replacement, subdomains stripped
|
||||
* - Domains 11-16 chars: Split mode - first 6 chars replace subdomain prefix, rest replaces domain
|
||||
*
|
||||
* Official hytale.com keeps original subdomain behavior (sessions., account-data., etc.)
|
||||
*/
|
||||
class ClientPatcher {
|
||||
constructor() {
|
||||
@@ -54,6 +61,7 @@ class ClientPatcher {
|
||||
|
||||
/**
|
||||
* Calculate the domain patching strategy based on length
|
||||
* @returns {object} Strategy with mainDomain and subdomainPrefix
|
||||
*/
|
||||
getDomainStrategy(domain) {
|
||||
if (domain.length <= 10) {
|
||||
@@ -77,10 +85,12 @@ class ClientPatcher {
|
||||
|
||||
/**
|
||||
* Convert a string to the length-prefixed byte format used by the client
|
||||
* Format: [length byte] [00 00 00 padding] [char1] [00] [char2] [00] ... [lastChar]
|
||||
*/
|
||||
stringToLengthPrefixed(str) {
|
||||
const length = str.length;
|
||||
const result = Buffer.alloc(4 + length + (length - 1));
|
||||
|
||||
result[0] = length;
|
||||
result[1] = 0x00;
|
||||
result[2] = 0x00;
|
||||
@@ -93,6 +103,7 @@ class ClientPatcher {
|
||||
result[pos++] = 0x00;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -107,6 +118,13 @@ class ClientPatcher {
|
||||
return buf;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a string to UTF-8 bytes (how Java stores strings)
|
||||
*/
|
||||
stringToUtf8(str) {
|
||||
return Buffer.from(str, 'utf8');
|
||||
}
|
||||
|
||||
/**
|
||||
* Find all occurrences of a pattern in a buffer
|
||||
*/
|
||||
@@ -124,6 +142,7 @@ class ClientPatcher {
|
||||
|
||||
/**
|
||||
* Replace bytes in buffer - only overwrites the length of new bytes
|
||||
* Does NOT null-pad to avoid corrupting adjacent data
|
||||
*/
|
||||
replaceBytes(buffer, oldBytes, newBytes) {
|
||||
let count = 0;
|
||||
@@ -135,7 +154,9 @@ class ClientPatcher {
|
||||
}
|
||||
|
||||
const positions = this.findAllOccurrences(result, oldBytes);
|
||||
|
||||
for (const pos of positions) {
|
||||
// Only overwrite the length of the new bytes - don't null-fill!
|
||||
newBytes.copy(result, pos);
|
||||
count++;
|
||||
}
|
||||
@@ -144,12 +165,37 @@ class ClientPatcher {
|
||||
}
|
||||
|
||||
/**
|
||||
* Smart domain replacement that handles both null-terminated and non-null-terminated strings
|
||||
* UTF-8 domain replacement for Java JAR files
|
||||
*/
|
||||
findAndReplaceDomainUtf8(data, oldDomain, newDomain) {
|
||||
let count = 0;
|
||||
const result = Buffer.from(data);
|
||||
|
||||
const oldUtf8 = this.stringToUtf8(oldDomain);
|
||||
const newUtf8 = this.stringToUtf8(newDomain);
|
||||
|
||||
const positions = this.findAllOccurrences(result, oldUtf8);
|
||||
|
||||
for (const pos of positions) {
|
||||
newUtf8.copy(result, pos);
|
||||
count++;
|
||||
}
|
||||
|
||||
return { buffer: result, count };
|
||||
}
|
||||
|
||||
/**
|
||||
* Smart domain replacement for .NET AOT binaries
|
||||
*/
|
||||
findAndReplaceDomainSmart(data, oldDomain, newDomain) {
|
||||
let count = 0;
|
||||
const result = Buffer.from(data);
|
||||
|
||||
if (newDomain.length > oldDomain.length) {
|
||||
console.warn(` Warning: New domain longer than old, skipping smart replacement`);
|
||||
return { buffer: result, count: 0 };
|
||||
}
|
||||
|
||||
const oldUtf16NoLast = this.stringToUtf16LE(oldDomain.slice(0, -1));
|
||||
const newUtf16NoLast = this.stringToUtf16LE(newDomain.slice(0, -1));
|
||||
|
||||
@@ -165,17 +211,9 @@ class ClientPatcher {
|
||||
const lastCharFirstByte = result[lastCharPos];
|
||||
|
||||
if (lastCharFirstByte === oldLastCharByte) {
|
||||
// Only overwrite, don't null-fill
|
||||
newUtf16NoLast.copy(result, pos);
|
||||
result[lastCharPos] = newLastCharByte;
|
||||
|
||||
if (lastCharPos + 1 < result.length) {
|
||||
const secondByte = result[lastCharPos + 1];
|
||||
if (secondByte === 0x00) {
|
||||
console.log(` Patched UTF-16LE occurrence at offset 0x${pos.toString(16)}`);
|
||||
} else {
|
||||
console.log(` Patched length-prefixed occurrence at offset 0x${pos.toString(16)} (metadata: 0x${secondByte.toString(16)})`);
|
||||
}
|
||||
}
|
||||
count++;
|
||||
}
|
||||
}
|
||||
@@ -193,24 +231,10 @@ class ClientPatcher {
|
||||
|
||||
console.log(` Patching strategy: ${strategy.description}`);
|
||||
|
||||
// 1. Patch telemetry/sentry URL
|
||||
const oldSentry = 'https://ca900df42fcf57d4dd8401a86ddd7da2@sentry.hytale.com/2';
|
||||
const newSentry = `${protocol}t@${domain}/2`;
|
||||
// ULTRA-MINIMAL PATCHING - only domain, no subdomain patches
|
||||
console.log(` Ultra-minimal mode: only patching main domain`);
|
||||
|
||||
console.log(` Patching sentry: ${oldSentry.slice(0, 30)}... -> ${newSentry}`);
|
||||
const sentryResult = this.replaceBytes(
|
||||
result,
|
||||
this.stringToLengthPrefixed(oldSentry),
|
||||
this.stringToLengthPrefixed(newSentry)
|
||||
);
|
||||
result = sentryResult.buffer;
|
||||
if (sentryResult.count > 0) {
|
||||
console.log(` Replaced ${sentryResult.count} sentry occurrence(s)`);
|
||||
totalCount += sentryResult.count;
|
||||
}
|
||||
|
||||
// 2. Patch main domain
|
||||
console.log(` Patching domain: ${ORIGINAL_DOMAIN} -> ${strategy.mainDomain}`);
|
||||
// Only patch main domain (hytale.com -> mainDomain)
|
||||
const domainResult = this.replaceBytes(
|
||||
result,
|
||||
this.stringToLengthPrefixed(ORIGINAL_DOMAIN),
|
||||
@@ -218,125 +242,48 @@ class ClientPatcher {
|
||||
);
|
||||
result = domainResult.buffer;
|
||||
if (domainResult.count > 0) {
|
||||
console.log(` Replaced ${domainResult.count} domain occurrence(s)`);
|
||||
console.log(` Patched ${domainResult.count} domain occurrence(s)`);
|
||||
totalCount += domainResult.count;
|
||||
}
|
||||
|
||||
// 3. Patch subdomain prefixes
|
||||
const subdomains = ['https://tools.', 'https://sessions.', 'https://account-data.', 'https://telemetry.'];
|
||||
const newSubdomainPrefix = protocol + strategy.subdomainPrefix;
|
||||
|
||||
for (const sub of subdomains) {
|
||||
console.log(` Patching subdomain: ${sub} -> ${newSubdomainPrefix}`);
|
||||
const subResult = this.replaceBytes(
|
||||
result,
|
||||
this.stringToLengthPrefixed(sub),
|
||||
this.stringToLengthPrefixed(newSubdomainPrefix)
|
||||
);
|
||||
result = subResult.buffer;
|
||||
if (subResult.count > 0) {
|
||||
console.log(` Replaced ${subResult.count} occurrence(s)`);
|
||||
totalCount += subResult.count;
|
||||
}
|
||||
}
|
||||
// Skip ALL subdomain patches - let them stay as sessions.hytale.com etc
|
||||
console.log(` Skipping all subdomain patches (ultra-minimal mode)`);
|
||||
|
||||
return { buffer: result, count: totalCount };
|
||||
}
|
||||
|
||||
/**
|
||||
* Patch Discord invite URLs
|
||||
* Check if the client binary has already been patched
|
||||
*/
|
||||
patchDiscordUrl(data) {
|
||||
let count = 0;
|
||||
const result = Buffer.from(data);
|
||||
|
||||
const oldUrl = '.gg/hytale';
|
||||
const newUrl = '.gg/MHkEjepMQ7';
|
||||
|
||||
const lpResult = this.replaceBytes(
|
||||
result,
|
||||
this.stringToLengthPrefixed(oldUrl),
|
||||
this.stringToLengthPrefixed(newUrl)
|
||||
);
|
||||
|
||||
if (lpResult.count > 0) {
|
||||
return { buffer: lpResult.buffer, count: lpResult.count };
|
||||
}
|
||||
|
||||
// Fallback to UTF-16LE
|
||||
const oldUtf16 = this.stringToUtf16LE(oldUrl);
|
||||
const newUtf16 = this.stringToUtf16LE(newUrl);
|
||||
|
||||
const positions = this.findAllOccurrences(result, oldUtf16);
|
||||
for (const pos of positions) {
|
||||
newUtf16.copy(result, pos);
|
||||
count++;
|
||||
}
|
||||
|
||||
return { buffer: result, count };
|
||||
}
|
||||
|
||||
/**
|
||||
* Check patch status of client binary
|
||||
*/
|
||||
getPatchStatus(clientPath) {
|
||||
isPatchedAlready(clientPath) {
|
||||
const newDomain = this.getNewDomain();
|
||||
const patchFlagFile = clientPath + this.patchedFlag;
|
||||
|
||||
if (fs.existsSync(patchFlagFile)) {
|
||||
try {
|
||||
const flagData = JSON.parse(fs.readFileSync(patchFlagFile, 'utf8'));
|
||||
const currentDomain = flagData.targetDomain;
|
||||
|
||||
if (currentDomain === newDomain) {
|
||||
if (flagData.targetDomain === newDomain) {
|
||||
// Verify the binary actually contains the patched domain
|
||||
const data = fs.readFileSync(clientPath);
|
||||
const strategy = this.getDomainStrategy(newDomain);
|
||||
const domainPattern = this.stringToLengthPrefixed(strategy.mainDomain);
|
||||
|
||||
if (data.includes(domainPattern)) {
|
||||
return { patched: true, currentDomain, needsRestore: false };
|
||||
return true;
|
||||
} else {
|
||||
console.log(' Flag exists but binary not patched (was updated?), needs re-patching...');
|
||||
return { patched: false, currentDomain: null, needsRestore: false };
|
||||
console.log(' Flag exists but binary not patched (was updated?), re-patching...');
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
console.log(` Currently patched for "${currentDomain}", need to change to "${newDomain}"`);
|
||||
return { patched: false, currentDomain, needsRestore: true };
|
||||
}
|
||||
} catch (e) {
|
||||
// Flag file corrupt
|
||||
}
|
||||
}
|
||||
return { patched: false, currentDomain: null, needsRestore: false };
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if client is already patched (backward compat)
|
||||
*/
|
||||
isPatchedAlready(clientPath) {
|
||||
return this.getPatchStatus(clientPath).patched;
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore client from backup
|
||||
*/
|
||||
restoreFromBackup(clientPath) {
|
||||
const backupPath = clientPath + '.original';
|
||||
if (fs.existsSync(backupPath)) {
|
||||
console.log(' Restoring original binary from backup for re-patching...');
|
||||
fs.copyFileSync(backupPath, clientPath);
|
||||
const patchFlagFile = clientPath + this.patchedFlag;
|
||||
if (fs.existsSync(patchFlagFile)) {
|
||||
fs.unlinkSync(patchFlagFile);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
console.warn(' No backup found to restore - will try patching anyway');
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark client as patched
|
||||
* Mark the client as patched
|
||||
*/
|
||||
markAsPatched(clientPath) {
|
||||
const newDomain = this.getNewDomain();
|
||||
@@ -349,46 +296,40 @@ class ClientPatcher {
|
||||
patchMode: strategy.mode,
|
||||
mainDomain: strategy.mainDomain,
|
||||
subdomainPrefix: strategy.subdomainPrefix,
|
||||
patcherVersion: '2.1.0',
|
||||
verified: 'binary_contents'
|
||||
patcherVersion: '2.1.0'
|
||||
};
|
||||
fs.writeFileSync(patchFlagFile, JSON.stringify(flagData, null, 2));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create backup of original client binary
|
||||
* Create a backup of the original client binary
|
||||
*/
|
||||
backupClient(clientPath) {
|
||||
const backupPath = clientPath + '.original';
|
||||
try {
|
||||
if (!fs.existsSync(backupPath)) {
|
||||
console.log(` Creating backup at ${path.basename(backupPath)}`);
|
||||
fs.copyFileSync(clientPath, backupPath);
|
||||
return backupPath;
|
||||
}
|
||||
|
||||
const currentSize = fs.statSync(clientPath).size;
|
||||
const backupSize = fs.statSync(backupPath).size;
|
||||
|
||||
if (currentSize !== backupSize) {
|
||||
const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
|
||||
const oldBackupPath = `${clientPath}.original.${timestamp}`;
|
||||
console.log(` File updated, archiving old backup to ${path.basename(oldBackupPath)}`);
|
||||
fs.renameSync(backupPath, oldBackupPath);
|
||||
fs.copyFileSync(clientPath, backupPath);
|
||||
return backupPath;
|
||||
}
|
||||
|
||||
console.log(' Backup already exists');
|
||||
if (!fs.existsSync(backupPath)) {
|
||||
console.log(` Creating backup at ${path.basename(backupPath)}`);
|
||||
fs.copyFileSync(clientPath, backupPath);
|
||||
return backupPath;
|
||||
} catch (e) {
|
||||
console.error(` Failed to create backup: ${e.message}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
const currentSize = fs.statSync(clientPath).size;
|
||||
const backupSize = fs.statSync(backupPath).size;
|
||||
|
||||
if (currentSize !== backupSize) {
|
||||
const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
|
||||
const oldBackupPath = `${clientPath}.original.${timestamp}`;
|
||||
console.log(` File updated, archiving old backup to ${path.basename(oldBackupPath)}`);
|
||||
fs.renameSync(backupPath, oldBackupPath);
|
||||
fs.copyFileSync(clientPath, backupPath);
|
||||
return backupPath;
|
||||
}
|
||||
|
||||
console.log(' Backup already exists');
|
||||
return backupPath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore original client binary
|
||||
* Restore the original client binary from backup
|
||||
*/
|
||||
restoreClient(clientPath) {
|
||||
const backupPath = clientPath + '.original';
|
||||
@@ -416,10 +357,6 @@ class ClientPatcher {
|
||||
console.log(`Target: ${clientPath}`);
|
||||
console.log(`Domain: ${newDomain} (${newDomain.length} chars)`);
|
||||
console.log(`Mode: ${strategy.mode}`);
|
||||
if (strategy.mode === 'split') {
|
||||
console.log(` Subdomain prefix: ${strategy.subdomainPrefix}`);
|
||||
console.log(` Main domain: ${strategy.mainDomain}`);
|
||||
}
|
||||
|
||||
if (!fs.existsSync(clientPath)) {
|
||||
const error = `Client binary not found: ${clientPath}`;
|
||||
@@ -427,26 +364,16 @@ class ClientPatcher {
|
||||
return { success: false, error };
|
||||
}
|
||||
|
||||
const patchStatus = this.getPatchStatus(clientPath);
|
||||
|
||||
if (patchStatus.patched) {
|
||||
if (this.isPatchedAlready(clientPath)) {
|
||||
console.log(`Client already patched for ${newDomain}, skipping`);
|
||||
if (progressCallback) progressCallback('Client already patched', 100);
|
||||
return { success: true, alreadyPatched: true, patchCount: 0 };
|
||||
}
|
||||
|
||||
if (patchStatus.needsRestore) {
|
||||
if (progressCallback) progressCallback('Restoring original for domain change...', 5);
|
||||
this.restoreFromBackup(clientPath);
|
||||
}
|
||||
|
||||
if (progressCallback) progressCallback('Preparing to patch client...', 10);
|
||||
|
||||
console.log('Creating backup...');
|
||||
const backupResult = this.backupClient(clientPath);
|
||||
if (!backupResult) {
|
||||
console.warn(' Could not create backup - proceeding without backup');
|
||||
}
|
||||
this.backupClient(clientPath);
|
||||
|
||||
if (progressCallback) progressCallback('Reading client binary...', 20);
|
||||
|
||||
@@ -456,15 +383,12 @@ class ClientPatcher {
|
||||
|
||||
if (progressCallback) progressCallback('Patching domain references...', 50);
|
||||
|
||||
console.log('Applying domain patches (length-prefixed format)...');
|
||||
console.log('Applying domain patches...');
|
||||
const { buffer: patchedData, count } = this.applyDomainPatches(data, newDomain);
|
||||
|
||||
console.log('Patching Discord URLs...');
|
||||
const { buffer: finalData, count: discordCount } = this.patchDiscordUrl(patchedData);
|
||||
|
||||
if (count === 0 && discordCount === 0) {
|
||||
if (count === 0) {
|
||||
// Try legacy UTF-16LE format
|
||||
console.log('No occurrences found - trying legacy UTF-16LE format...');
|
||||
|
||||
const legacyResult = this.findAndReplaceDomainSmart(data, ORIGINAL_DOMAIN, strategy.mainDomain);
|
||||
if (legacyResult.count > 0) {
|
||||
console.log(`Found ${legacyResult.count} occurrences with legacy format`);
|
||||
@@ -473,65 +397,31 @@ class ClientPatcher {
|
||||
return { success: true, patchCount: legacyResult.count, format: 'legacy' };
|
||||
}
|
||||
|
||||
console.log('No occurrences found - binary may already be modified or has different format');
|
||||
console.log('No occurrences found - binary may already be modified');
|
||||
return { success: true, patchCount: 0, warning: 'No occurrences found' };
|
||||
}
|
||||
|
||||
if (progressCallback) progressCallback('Writing patched binary...', 80);
|
||||
|
||||
console.log('Writing patched binary...');
|
||||
fs.writeFileSync(clientPath, finalData);
|
||||
|
||||
fs.writeFileSync(clientPath, patchedData);
|
||||
this.markAsPatched(clientPath);
|
||||
|
||||
if (progressCallback) progressCallback('Patching complete', 100);
|
||||
|
||||
console.log(`Successfully patched ${count} domain occurrences and ${discordCount} Discord URLs`);
|
||||
console.log(`Successfully patched ${count} occurrences`);
|
||||
console.log('=== Patching Complete ===');
|
||||
|
||||
return { success: true, patchCount: count + discordCount };
|
||||
return { success: true, patchCount: count };
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if server JAR contains DualAuth classes (was patched)
|
||||
* Patch the server JAR by downloading pre-patched version
|
||||
*/
|
||||
serverJarContainsDualAuth(serverPath) {
|
||||
try {
|
||||
const data = fs.readFileSync(serverPath);
|
||||
// Check for DualAuthContext class signature in JAR
|
||||
const signature = Buffer.from('DualAuthContext', 'utf8');
|
||||
return data.includes(signature);
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate downloaded file is not corrupt/partial
|
||||
* Server JAR should be at least 50MB
|
||||
*/
|
||||
validateServerJarSize(serverPath) {
|
||||
try {
|
||||
const stats = fs.statSync(serverPath);
|
||||
const minSize = 50 * 1024 * 1024; // 50MB minimum
|
||||
if (stats.size < minSize) {
|
||||
console.error(` Downloaded JAR too small: ${(stats.size / 1024 / 1024).toFixed(2)} MB (expected >50MB)`);
|
||||
return false;
|
||||
}
|
||||
console.log(` Downloaded size: ${(stats.size / 1024 / 1024).toFixed(2)} MB`);
|
||||
return true;
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Patch server JAR by downloading pre-patched version from CDN
|
||||
*/
|
||||
async patchServer(serverPath, progressCallback) {
|
||||
async patchServer(serverPath, progressCallback, javaPath = null) {
|
||||
const newDomain = this.getNewDomain();
|
||||
|
||||
console.log('=== Server Patcher (Pre-patched Download) ===');
|
||||
console.log('=== Server Patcher ===');
|
||||
console.log(`Target: ${serverPath}`);
|
||||
console.log(`Domain: ${newDomain}`);
|
||||
|
||||
@@ -541,67 +431,26 @@ class ClientPatcher {
|
||||
return { success: false, error };
|
||||
}
|
||||
|
||||
// Check if already patched
|
||||
const patchFlagFile = serverPath + '.dualauth_patched';
|
||||
let needsRestore = false;
|
||||
|
||||
if (fs.existsSync(patchFlagFile)) {
|
||||
try {
|
||||
const flagData = JSON.parse(fs.readFileSync(patchFlagFile, 'utf8'));
|
||||
if (flagData.domain === newDomain) {
|
||||
// Verify JAR actually contains DualAuth classes (game may have auto-updated)
|
||||
if (this.serverJarContainsDualAuth(serverPath)) {
|
||||
console.log(`Server already patched for ${newDomain}, skipping`);
|
||||
if (progressCallback) progressCallback('Server already patched', 100);
|
||||
return { success: true, alreadyPatched: true };
|
||||
} else {
|
||||
console.log(' Flag exists but JAR not patched (was auto-updated?), will re-download...');
|
||||
// Delete stale flag file
|
||||
try { fs.unlinkSync(patchFlagFile); } catch (e) { /* ignore */ }
|
||||
}
|
||||
} else {
|
||||
console.log(`Server patched for "${flagData.domain}", need to change to "${newDomain}"`);
|
||||
needsRestore = true;
|
||||
console.log(`Server already patched for ${newDomain}, skipping`);
|
||||
if (progressCallback) progressCallback('Server already patched', 100);
|
||||
return { success: true, alreadyPatched: true };
|
||||
}
|
||||
} catch (e) {
|
||||
// Flag file corrupt, re-patch
|
||||
console.log(' Flag file corrupt, will re-download');
|
||||
try { fs.unlinkSync(patchFlagFile); } catch (e) { /* ignore */ }
|
||||
// Re-patch
|
||||
}
|
||||
}
|
||||
|
||||
// Restore backup if patched for different domain
|
||||
if (needsRestore) {
|
||||
const backupPath = serverPath + '.original';
|
||||
if (fs.existsSync(backupPath)) {
|
||||
if (progressCallback) progressCallback('Restoring original for domain change...', 5);
|
||||
console.log('Restoring original JAR from backup for re-patching...');
|
||||
fs.copyFileSync(backupPath, serverPath);
|
||||
if (fs.existsSync(patchFlagFile)) {
|
||||
fs.unlinkSync(patchFlagFile);
|
||||
}
|
||||
} else {
|
||||
console.warn(' No backup found to restore - will download fresh patched JAR');
|
||||
}
|
||||
}
|
||||
|
||||
// Create backup
|
||||
if (progressCallback) progressCallback('Creating backup...', 10);
|
||||
console.log('Creating backup...');
|
||||
const backupResult = this.backupClient(serverPath);
|
||||
if (!backupResult) {
|
||||
console.warn(' Could not create backup - proceeding without backup');
|
||||
}
|
||||
this.backupClient(serverPath);
|
||||
|
||||
// Only support standard domain (auth.sanasol.ws) via pre-patched download
|
||||
if (newDomain !== 'auth.sanasol.ws' && newDomain !== 'sanasol.ws') {
|
||||
console.error(`Domain "${newDomain}" requires DualAuthPatcher - only auth.sanasol.ws is supported via pre-patched download`);
|
||||
return { success: false, error: `Unsupported domain: ${newDomain}. Only auth.sanasol.ws is supported.` };
|
||||
}
|
||||
|
||||
// Download pre-patched JAR
|
||||
if (progressCallback) progressCallback('Downloading patched server JAR...', 30);
|
||||
console.log('Downloading pre-patched HytaleServer.jar...');
|
||||
console.log('Downloading pre-patched HytaleServer.jar');
|
||||
|
||||
try {
|
||||
const https = require('https');
|
||||
@@ -615,7 +464,7 @@ class ClientPatcher {
|
||||
}
|
||||
|
||||
if (response.statusCode !== 200) {
|
||||
reject(new Error(`Failed to download: HTTP ${response.statusCode}`));
|
||||
reject(new Error(`HTTP ${response.statusCode}`));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -646,42 +495,11 @@ class ClientPatcher {
|
||||
|
||||
console.log(' Download successful');
|
||||
|
||||
// Verify downloaded JAR size and contents
|
||||
if (progressCallback) progressCallback('Verifying downloaded JAR...', 95);
|
||||
|
||||
if (!this.validateServerJarSize(serverPath)) {
|
||||
console.error('Downloaded JAR appears corrupt or incomplete');
|
||||
|
||||
// Restore backup on verification failure
|
||||
const backupPath = serverPath + '.original';
|
||||
if (fs.existsSync(backupPath)) {
|
||||
fs.copyFileSync(backupPath, serverPath);
|
||||
console.log('Restored backup after verification failure');
|
||||
}
|
||||
|
||||
return { success: false, error: 'Downloaded JAR verification failed - file too small (corrupt/partial download)' };
|
||||
}
|
||||
|
||||
if (!this.serverJarContainsDualAuth(serverPath)) {
|
||||
console.error('Downloaded JAR does not contain DualAuth classes - invalid or corrupt download');
|
||||
|
||||
// Restore backup on verification failure
|
||||
const backupPath = serverPath + '.original';
|
||||
if (fs.existsSync(backupPath)) {
|
||||
fs.copyFileSync(backupPath, serverPath);
|
||||
console.log('Restored backup after verification failure');
|
||||
}
|
||||
|
||||
return { success: false, error: 'Downloaded JAR verification failed - missing DualAuth classes' };
|
||||
}
|
||||
console.log(' Verification successful - DualAuth classes present');
|
||||
|
||||
// Mark as patched
|
||||
fs.writeFileSync(patchFlagFile, JSON.stringify({
|
||||
domain: newDomain,
|
||||
patchedAt: new Date().toISOString(),
|
||||
patcher: 'PrePatchedDownload',
|
||||
source: 'https://download.sanasol.ws/download/HytaleServer.jar'
|
||||
source: url
|
||||
}));
|
||||
|
||||
if (progressCallback) progressCallback('Server patching complete', 100);
|
||||
@@ -691,7 +509,6 @@ class ClientPatcher {
|
||||
} catch (downloadError) {
|
||||
console.error(`Failed to download patched JAR: ${downloadError.message}`);
|
||||
|
||||
// Restore backup on failure
|
||||
const backupPath = serverPath + '.original';
|
||||
if (fs.existsSync(backupPath)) {
|
||||
fs.copyFileSync(backupPath, serverPath);
|
||||
@@ -703,7 +520,40 @@ class ClientPatcher {
|
||||
}
|
||||
|
||||
/**
|
||||
* Find client binary path based on platform
|
||||
* Find Java executable
|
||||
*/
|
||||
findJava() {
|
||||
try {
|
||||
const bundled = getBundledJavaPath(JRE_DIR);
|
||||
if (bundled && fs.existsSync(bundled)) {
|
||||
return bundled;
|
||||
}
|
||||
} catch (e) {}
|
||||
|
||||
try {
|
||||
const javaExec = getJavaExec(JRE_DIR);
|
||||
if (javaExec && fs.existsSync(javaExec)) {
|
||||
return javaExec;
|
||||
}
|
||||
} catch (e) {}
|
||||
|
||||
if (process.env.JAVA_HOME) {
|
||||
const javaBin = path.join(process.env.JAVA_HOME, 'bin', process.platform === 'win32' ? 'java.exe' : 'java');
|
||||
if (fs.existsSync(javaBin)) {
|
||||
return javaBin;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
execSync('java -version 2>&1', { encoding: 'utf8' });
|
||||
return 'java';
|
||||
} catch (e) {}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the client binary path based on platform
|
||||
*/
|
||||
findClientPath(gameDir) {
|
||||
const candidates = [];
|
||||
@@ -725,9 +575,6 @@ class ClientPatcher {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find server JAR path
|
||||
*/
|
||||
findServerPath(gameDir) {
|
||||
const candidates = [
|
||||
path.join(gameDir, 'Server', 'HytaleServer.jar'),
|
||||
@@ -756,9 +603,7 @@ class ClientPatcher {
|
||||
if (clientPath) {
|
||||
if (progressCallback) progressCallback('Patching client binary...', 10);
|
||||
results.client = await this.patchClient(clientPath, (msg, pct) => {
|
||||
if (progressCallback) {
|
||||
progressCallback(`Client: ${msg}`, pct ? pct / 2 : null);
|
||||
}
|
||||
if (progressCallback) progressCallback(`Client: ${msg}`, pct ? pct / 2 : null);
|
||||
});
|
||||
} else {
|
||||
console.warn('Could not find HytaleClient binary');
|
||||
@@ -769,10 +614,8 @@ class ClientPatcher {
|
||||
if (serverPath) {
|
||||
if (progressCallback) progressCallback('Patching server JAR...', 50);
|
||||
results.server = await this.patchServer(serverPath, (msg, pct) => {
|
||||
if (progressCallback) {
|
||||
progressCallback(`Server: ${msg}`, pct ? 50 + pct / 2 : null);
|
||||
}
|
||||
});
|
||||
if (progressCallback) progressCallback(`Server: ${msg}`, pct ? 50 + pct / 2 : null);
|
||||
}, javaPath);
|
||||
} else {
|
||||
console.warn('Could not find HytaleServer.jar');
|
||||
results.server = { success: false, error: 'Server JAR not found' };
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
<?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>com.apple.security.cs.allow-jit</key>
|
||||
<true/>
|
||||
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
||||
<true/>
|
||||
<key>com.apple.security.cs.disable-library-validation</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.server</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -1,10 +1,10 @@
|
||||
# Steam Deck / Ubuntu LTS Crash Investigation
|
||||
|
||||
## Status: SOLVED
|
||||
## Status: UNSOLVED
|
||||
|
||||
**Last updated:** 2026-01-27
|
||||
|
||||
**Solution:** Replace bundled `libzstd.so` with system version.
|
||||
No stable solution found. jemalloc helps occasionally but crashes still occur randomly.
|
||||
|
||||
---
|
||||
|
||||
@@ -30,81 +30,96 @@ The crash occurs after successful authentication, specifically right after "Fini
|
||||
- Windows
|
||||
- Older Arch Linux (glibc < 2.41)
|
||||
|
||||
---
|
||||
|
||||
## Root Cause
|
||||
|
||||
The **bundled `libzstd.so`** in the game client is incompatible with glibc 2.41's stricter heap validation. When the game decompresses assets using this library, it triggers heap corruption detected by glibc 2.41.
|
||||
|
||||
The crash occurs in `libzstd.so` during `free()` after "Finished handling RequiredAssets" (asset decompression).
|
||||
**Critical Finding:** The UNPATCHED original binary works fine on Steam Deck. The crash is caused by ANY binary patching.
|
||||
|
||||
---
|
||||
|
||||
## Solution
|
||||
|
||||
Replace the bundled `libzstd.so` with the system's `libzstd.so.1`.
|
||||
|
||||
### Automatic (Launcher)
|
||||
|
||||
The launcher automatically detects and replaces `libzstd.so` on Linux systems. No manual action needed.
|
||||
|
||||
### Manual
|
||||
|
||||
```bash
|
||||
cd ~/.hytalef2p/release/package/game/latest/Client
|
||||
|
||||
# Backup bundled version
|
||||
mv libzstd.so libzstd.so.bundled
|
||||
|
||||
# Link to system version
|
||||
# Steam Deck / Arch Linux:
|
||||
ln -s /usr/lib/libzstd.so.1 libzstd.so
|
||||
|
||||
# Debian / Ubuntu:
|
||||
ln -s /usr/lib/x86_64-linux-gnu/libzstd.so.1 libzstd.so
|
||||
|
||||
# Fedora / RHEL:
|
||||
ln -s /usr/lib64/libzstd.so.1 libzstd.so
|
||||
```
|
||||
|
||||
### Restore Original
|
||||
|
||||
```bash
|
||||
cd ~/.hytalef2p/release/package/game/latest/Client
|
||||
rm libzstd.so
|
||||
mv libzstd.so.bundled libzstd.so
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Why This Works
|
||||
|
||||
1. The bundled `libzstd.so` was likely compiled with different allocator settings or an older toolchain
|
||||
2. glibc 2.41 has stricter heap validation that catches invalid memory operations
|
||||
3. The system `libzstd.so.1` is compiled with the system's glibc and uses compatible memory allocation patterns
|
||||
4. By using the system library, we avoid the incompatibility entirely
|
||||
|
||||
---
|
||||
|
||||
## Previous Investigation (for reference)
|
||||
|
||||
### What Was Tried Before Finding Solution
|
||||
## What Was Tried (All Failed)
|
||||
|
||||
### Memory Allocators
|
||||
| Approach | Result |
|
||||
|----------|--------|
|
||||
| jemalloc allocator | Worked ~30% of time, not stable |
|
||||
| GLIBC_TUNABLES | No effect |
|
||||
| taskset (CPU pinning) | Single core too slow |
|
||||
| nice/chrt (scheduling) | No effect |
|
||||
| Various patching approaches | All crashed |
|
||||
| `LD_PRELOAD=/usr/lib/libjemalloc.so.2` | Works randomly (3/10 times), not stable |
|
||||
| `MALLOC_CHECK_=0` | No effect |
|
||||
| `MALLOC_PERTURB_=255` | No effect |
|
||||
| `GLIBC_TUNABLES=glibc.malloc.tcache_count=0` | No effect |
|
||||
|
||||
### Key Insight
|
||||
### Process/Scheduling
|
||||
| Approach | Result |
|
||||
|----------|--------|
|
||||
| `taskset -c 0` (single core) | Game too slow, stuck at connecting |
|
||||
| `taskset -c 0,1` or `0-3` | Still crashes |
|
||||
| `nice -n 19` | No effect |
|
||||
| `chrt --idle 0` | No effect |
|
||||
| `strace -f` | No effect |
|
||||
|
||||
The crash was in `libzstd.so`, not in our patched code. The patching just changed timing enough to expose the libzstd incompatibility more frequently.
|
||||
### Linker/Loading
|
||||
| Approach | Result |
|
||||
|----------|--------|
|
||||
| `LD_BIND_NOW=1` | No effect |
|
||||
| Wrapper script with LD_PRELOAD | No effect |
|
||||
| Shell spawn with inline LD_PRELOAD | No effect |
|
||||
|
||||
### Patching Variations
|
||||
| Approach | Result |
|
||||
|----------|--------|
|
||||
| Null-padding after replacement | Crashes (made it worse) |
|
||||
| No null-padding (develop behavior) | Still crashes |
|
||||
| Minimal patches (3 instead of 6) | Still crashes |
|
||||
| Ultra-minimal (1 patch - domain only) | Still crashes |
|
||||
| Skip sentry patch | Still crashes |
|
||||
| Skip subdomain patches | Still crashes |
|
||||
|
||||
**Key Finding:** Even patching just 1 string (main domain only) causes the crash.
|
||||
|
||||
---
|
||||
|
||||
## GDB Stack Trace (Historical)
|
||||
## String Occurrences Found
|
||||
|
||||
### Length-Prefixed Format
|
||||
Found by default patcher mode:
|
||||
|
||||
| Offset | Content | Notes |
|
||||
|--------|---------|-------|
|
||||
| 0x1bc5d63 | `hytale.com` | **Surrounded by x86 code!** |
|
||||
|
||||
### UTF-16LE Format (3 occurrences)
|
||||
| Offset | Content |
|
||||
|--------|---------|
|
||||
| 0x1bc5ad7 | `sentry.hytale.com/...` |
|
||||
| 0x1bc5b3f | `https://hytale.com/help...` |
|
||||
| 0x1bc5bc9 | `store.hytale.com/?...` |
|
||||
|
||||
---
|
||||
|
||||
## Binary Analysis
|
||||
|
||||
When patching with length-prefixed mode:
|
||||
|
||||
```
|
||||
< 01bc5d60: 5933 b80a 0000 0068 0079 0074 0061 006c Y3.....h.y.t.a.l
|
||||
< 01bc5d70: 0065 002e 0063 006f 006d 8933 8807 0000 .e...c.o.m.3....
|
||||
---
|
||||
> 01bc5d60: 5933 b80a 0000 0073 0061 006e 0061 0073 Y3.....s.a.n.a.s
|
||||
> 01bc5d70: 006f 006c 002e 0077 0073 8933 8807 0000 .o.l...w.s.3....
|
||||
```
|
||||
|
||||
**Structure:**
|
||||
```
|
||||
5933 b8 | 0a000000 | h.y.t.a.l.e...c.o.m | 8933 8807 0000
|
||||
???????? | len=10 | string content | mov [rbx],esi?
|
||||
```
|
||||
|
||||
- `5933 b8` before string - could be code or metadata
|
||||
- `0a 00 00 00` - .NET length prefix (10 characters)
|
||||
- String content in UTF-16LE
|
||||
- `89 33` after - this is `mov [rbx], esi` in x86-64!
|
||||
|
||||
**The string is embedded near executable code, not in a clean data section.**
|
||||
|
||||
---
|
||||
|
||||
## GDB Stack Trace
|
||||
|
||||
```
|
||||
#0 0x00007ffff7d3f5a4 in ?? () from /usr/lib/libc.so.6
|
||||
@@ -112,12 +127,105 @@ The crash was in `libzstd.so`, not in our patched code. The patching just change
|
||||
#2 abort () from /usr/lib/libc.so.6
|
||||
#3-#4 ?? () from /usr/lib/libc.so.6
|
||||
#5 free () from /usr/lib/libc.so.6
|
||||
#6 ?? () from libzstd.so <-- CRASH POINT (bundled library)
|
||||
#6 ?? () from libzstd.so <-- CRASH POINT
|
||||
#7-#24 HytaleClient code (asset decompression)
|
||||
```
|
||||
|
||||
Crash occurs in `libzstd.so` during `free()` after "Finished handling RequiredAssets".
|
||||
|
||||
---
|
||||
|
||||
## Hypotheses
|
||||
|
||||
### 1. .NET AOT String Metadata (Most Likely)
|
||||
.NET AOT may have precomputed hashes, checksums, or relocation info for strings. Modifying string content breaks internal consistency, causing memory corruption when the runtime tries to use related data structures.
|
||||
|
||||
### 2. Code/Data Interleaving
|
||||
The strings are embedded near x86 code (`89 33` = `mov [rbx], esi`). .NET AOT may use relative offsets that get invalidated when we modify nearby bytes.
|
||||
|
||||
### 3. Binary Checksums
|
||||
The binary may have integrity checks for certain sections that we're invalidating by patching.
|
||||
|
||||
### 4. Timing-Dependent Race Condition
|
||||
The fact that it works randomly (~30% of the time with jemalloc) suggests a race condition that's affected by:
|
||||
- Memory layout changes from patching
|
||||
- Allocator behavior differences
|
||||
- CPU scheduling
|
||||
|
||||
---
|
||||
|
||||
## Valgrind Results (Misleading)
|
||||
|
||||
- Valgrind showed NO memory corruption errors
|
||||
- Game ran successfully under Valgrind (slower execution)
|
||||
- This suggested jemalloc would fix it, but it doesn't consistently work
|
||||
|
||||
The slowdown from Valgrind likely masks the race condition timing.
|
||||
|
||||
---
|
||||
|
||||
## Current Launcher Implementation
|
||||
|
||||
The launcher attempts:
|
||||
1. Auto-detect jemalloc at common paths
|
||||
2. Auto-install jemalloc via pkexec if not found
|
||||
3. Launch game with `LD_PRELOAD` via shell command
|
||||
|
||||
But this doesn't provide stable results.
|
||||
|
||||
---
|
||||
|
||||
## Potential Alternative Approaches (Not Yet Tried)
|
||||
|
||||
### 1. LD_PRELOAD Network Hooking
|
||||
Instead of patching the binary, hook `getaddrinfo()` / `connect()` to redirect network calls at runtime. No binary modification needed.
|
||||
|
||||
### 2. Local Proxy + Certificate
|
||||
Run a local HTTPS proxy that intercepts hytale.com traffic and redirects to custom server. Requires installing a custom CA certificate.
|
||||
|
||||
### 3. DNS + iptables Redirect
|
||||
Use local DNS to resolve hytale.com to localhost, then iptables to redirect to actual custom server. Requires root/sudo.
|
||||
|
||||
### 4. Container with Older glibc
|
||||
Run the game in a container with glibc < 2.41 where the stricter validation doesn't exist.
|
||||
|
||||
### 5. Different Patching Location
|
||||
Find strings in a pure data section rather than code-adjacent areas.
|
||||
|
||||
---
|
||||
|
||||
## Files Reference
|
||||
|
||||
**Binary:** `HytaleClient` (ELF 64-bit, ~39.9 MB)
|
||||
|
||||
**Branch:** `fix/steamdeck-jemalloc-crash`
|
||||
|
||||
---
|
||||
|
||||
## Install jemalloc (Partial Mitigation)
|
||||
|
||||
jemalloc may help in some cases (~30% success rate):
|
||||
|
||||
```bash
|
||||
# Steam Deck / Arch Linux
|
||||
sudo pacman -S jemalloc
|
||||
|
||||
# Ubuntu / Debian
|
||||
sudo apt install libjemalloc2
|
||||
|
||||
# Fedora / RHEL
|
||||
sudo dnf install jemalloc
|
||||
```
|
||||
|
||||
The launcher automatically uses jemalloc if found. To disable:
|
||||
```bash
|
||||
HYTALE_NO_JEMALLOC=1 npm start
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Branch
|
||||
## Conclusion
|
||||
|
||||
`fix/steamdeck-libzstd`
|
||||
**No stable solution found.** The binary patching approach may be fundamentally incompatible with glibc 2.41's stricter heap validation when modifying .NET AOT compiled binaries.
|
||||
|
||||
Alternative approaches (network hooking, proxy, container) may be required for reliable Steam Deck / Ubuntu LTS support.
|
||||
|
||||
@@ -1,65 +1,95 @@
|
||||
# Steam Deck / Linux Crash Fix
|
||||
|
||||
## SOLUTION: Use system libzstd
|
||||
## SOLUTION: Use jemalloc ✓
|
||||
|
||||
The crash is caused by the bundled `libzstd.so` being incompatible with glibc 2.41's stricter heap validation.
|
||||
The crash is caused by glibc 2.41's stricter heap validation. Using jemalloc as the memory allocator fixes the issue.
|
||||
|
||||
### Automatic Fix
|
||||
|
||||
The launcher automatically replaces `libzstd.so` with the system version. No manual action needed.
|
||||
|
||||
### Manual Fix
|
||||
### Install jemalloc
|
||||
|
||||
```bash
|
||||
cd ~/.hytalef2p/release/package/game/latest/Client
|
||||
# Steam Deck / Arch Linux
|
||||
sudo pacman -S jemalloc
|
||||
|
||||
# Backup and replace
|
||||
mv libzstd.so libzstd.so.bundled
|
||||
ln -s /usr/lib/libzstd.so.1 libzstd.so
|
||||
# Ubuntu / Debian
|
||||
sudo apt install libjemalloc2
|
||||
|
||||
# Fedora / RHEL
|
||||
sudo dnf install jemalloc
|
||||
```
|
||||
|
||||
### Restore Original
|
||||
### Launcher Auto-Detection
|
||||
|
||||
The launcher automatically uses jemalloc when installed. No manual configuration needed.
|
||||
|
||||
To disable (for testing):
|
||||
```bash
|
||||
HYTALE_NO_JEMALLOC=1 npm start
|
||||
```
|
||||
|
||||
### Manual Launch with jemalloc
|
||||
|
||||
```bash
|
||||
cd ~/.hytalef2p/release/package/game/latest/Client
|
||||
rm libzstd.so
|
||||
mv libzstd.so.bundled libzstd.so
|
||||
cd ~/.hytalef2p/release/package/game/latest
|
||||
|
||||
LD_PRELOAD=/usr/lib/libjemalloc.so.2 ./Client/HytaleClient --app-dir /home/deck/.hytalef2p/release/package/game/latest --java-exec /home/deck/.hytalef2p/release/package/jre/latest/bin/java --auth-mode authenticated --uuid YOUR_UUID --name Player --identity-token YOUR_TOKEN --session-token YOUR_TOKEN --user-dir /home/deck/.hytalesaves
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Debug Commands (for troubleshooting)
|
||||
|
||||
### Check libzstd Status
|
||||
|
||||
### Base Command
|
||||
```bash
|
||||
# Check if symlinked
|
||||
ls -la ~/.hytalef2p/release/package/game/latest/Client/libzstd.so
|
||||
cd ~/.hytalef2p/release/package/game/latest
|
||||
```
|
||||
|
||||
# Find system libzstd
|
||||
find /usr/lib -name "libzstd.so*"
|
||||
### GDB Stack Trace (for crash analysis)
|
||||
```bash
|
||||
gdb -ex "run --app-dir ..." ./Client/HytaleClient
|
||||
|
||||
# After crash:
|
||||
bt
|
||||
bt full
|
||||
info registers
|
||||
quit
|
||||
```
|
||||
|
||||
### Test glibc tunables (alternative fixes that didn't work reliably)
|
||||
|
||||
**Disable tcache:**
|
||||
```bash
|
||||
GLIBC_TUNABLES=glibc.malloc.tcache_count=0 ./Client/HytaleClient ...
|
||||
```
|
||||
|
||||
**Disable heap validation:**
|
||||
```bash
|
||||
MALLOC_CHECK_=0 ./Client/HytaleClient ...
|
||||
```
|
||||
|
||||
### Binary Validation
|
||||
|
||||
```bash
|
||||
file ~/.hytalef2p/release/package/game/latest/Client/HytaleClient
|
||||
ldd ~/.hytalef2p/release/package/game/latest/Client/HytaleClient
|
||||
```
|
||||
|
||||
### Restore Client Binary
|
||||
|
||||
### Hex Dump Commands
|
||||
```bash
|
||||
cd ~/.hytalef2p/release/package/game/latest/Client
|
||||
cp HytaleClient.original HytaleClient
|
||||
rm -f HytaleClient.patched_custom
|
||||
# Search for hytale.com UTF-16LE
|
||||
xxd ~/.hytalef2p/release/package/game/latest/Client/HytaleClient.original | grep "6800 7900 7400 6100 6c00 6500 2e00 6300 6f00 6d00"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Environment Variables
|
||||
## Test Different Patch Modes
|
||||
|
||||
| Variable | Description | Example |
|
||||
|----------|-------------|---------|
|
||||
| `HYTALE_AUTH_DOMAIN` | Custom auth domain | `auth.sanasol.ws` |
|
||||
| `HYTALE_NO_LIBZSTD_FIX` | Disable libzstd replacement | `1` |
|
||||
```bash
|
||||
# Restore original
|
||||
cp ~/.hytalef2p/release/package/game/latest/Client/HytaleClient.original ~/.hytalef2p/release/package/game/latest/Client/HytaleClient
|
||||
rm ~/.hytalef2p/release/package/game/latest/Client/HytaleClient.patched_custom
|
||||
|
||||
# Test UTF-16LE mode
|
||||
HYTALE_PATCH_MODE=utf16le HYTALE_AUTH_DOMAIN=sanasol.ws npm start
|
||||
|
||||
# Test length-prefixed mode (default)
|
||||
HYTALE_AUTH_DOMAIN=sanasol.ws npm start
|
||||
```
|
||||
|
||||
66
main.js
66
main.js
@@ -176,8 +176,7 @@ function createWindow() {
|
||||
initDiscordRPC();
|
||||
|
||||
// Configure and initialize electron-updater
|
||||
// Enable auto-download so updates start immediately when available
|
||||
autoUpdater.autoDownload = true;
|
||||
autoUpdater.autoDownload = false;
|
||||
autoUpdater.autoInstallOnAppQuit = true;
|
||||
|
||||
autoUpdater.on('checking-for-update', () => {
|
||||
@@ -202,20 +201,6 @@ function createWindow() {
|
||||
|
||||
autoUpdater.on('error', (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) => {
|
||||
@@ -233,10 +218,7 @@ function createWindow() {
|
||||
console.log('Update downloaded:', info.version);
|
||||
if (mainWindow && !mainWindow.isDestroyed()) {
|
||||
mainWindow.webContents.send('update-downloaded', {
|
||||
version: info.version,
|
||||
platform: process.platform,
|
||||
// macOS auto-install often fails on unsigned apps
|
||||
autoInstallSupported: process.platform !== 'darwin'
|
||||
version: info.version
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -877,17 +859,6 @@ 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 () => {
|
||||
try {
|
||||
const { getResolvedAppDir, loadVersionBranch } = require('./backend/launcher');
|
||||
@@ -1115,37 +1086,8 @@ ipcMain.handle('download-update', async () => {
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.handle('install-update', async () => {
|
||||
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('install-update', () => {
|
||||
autoUpdater.quitAndInstall(false, true);
|
||||
});
|
||||
|
||||
ipcMain.handle('get-launcher-version', () => {
|
||||
|
||||
5
package-lock.json
generated
5
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "hytale-f2p-launcher",
|
||||
"version": "2.1.2",
|
||||
"version": "2.1.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "hytale-f2p-launcher",
|
||||
"version": "2.1.2",
|
||||
"version": "2.1.1",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"adm-zip": "^0.5.10",
|
||||
@@ -19,7 +19,6 @@
|
||||
"uuid": "^9.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron/notarize": "^2.5.0",
|
||||
"electron": "^40.0.0",
|
||||
"electron-builder": "^26.4.0"
|
||||
}
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
},
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@electron/notarize": "^2.5.0",
|
||||
"electron": "^40.0.0",
|
||||
"electron-builder": "^26.4.0"
|
||||
},
|
||||
@@ -132,13 +131,8 @@
|
||||
}
|
||||
],
|
||||
"icon": "build/icon.icns",
|
||||
"category": "public.app-category.games",
|
||||
"hardenedRuntime": true,
|
||||
"gatekeeperAssess": false,
|
||||
"entitlements": "build/entitlements.mac.plist",
|
||||
"entitlementsInherit": "build/entitlements.mac.plist"
|
||||
"category": "public.app-category.games"
|
||||
},
|
||||
"afterSign": "scripts/notarize.js",
|
||||
"nsis": {
|
||||
"oneClick": false,
|
||||
"allowToChangeInstallationDirectory": true,
|
||||
|
||||
13
preload.js
13
preload.js
@@ -24,7 +24,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
saveCloseLauncher: (enabled) => ipcRenderer.invoke('save-close-launcher', enabled),
|
||||
loadCloseLauncher: () => ipcRenderer.invoke('load-close-launcher'),
|
||||
|
||||
// Hardware Acceleration
|
||||
// Harwadre Acceleration
|
||||
saveLauncherHardwareAcceleration: (enabled) => ipcRenderer.invoke('save-launcher-hw-accel', enabled),
|
||||
loadLauncherHardwareAcceleration: () => ipcRenderer.invoke('load-launcher-hw-accel'),
|
||||
|
||||
@@ -50,7 +50,14 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
selectModFiles: () => ipcRenderer.invoke('select-mod-files'),
|
||||
copyModFile: (sourcePath, modsPath) => ipcRenderer.invoke('copy-mod-file', sourcePath, modsPath),
|
||||
onProgressUpdate: (callback) => {
|
||||
ipcRenderer.on('progress-update', (event, data) => callback(data));
|
||||
ipcRenderer.on('progress-update', (event, data) => {
|
||||
// Ensure data includes retry state if available
|
||||
if (data && typeof data === 'object') {
|
||||
callback(data);
|
||||
} else {
|
||||
callback(data);
|
||||
}
|
||||
});
|
||||
},
|
||||
onProgressComplete: (callback) => {
|
||||
ipcRenderer.on('progress-complete', () => callback());
|
||||
@@ -62,6 +69,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
ipcRenderer.on('installation-end', () => callback());
|
||||
},
|
||||
getUserId: () => ipcRenderer.invoke('get-user-id'),
|
||||
checkForUpdates: () => ipcRenderer.invoke('check-for-updates'),
|
||||
openDownloadPage: () => ipcRenderer.invoke('open-download-page'),
|
||||
getUpdateInfo: () => ipcRenderer.invoke('get-update-info'),
|
||||
onUpdatePopup: (callback) => {
|
||||
@@ -118,7 +126,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
checkForUpdates: () => ipcRenderer.invoke('check-for-updates'),
|
||||
downloadUpdate: () => ipcRenderer.invoke('download-update'),
|
||||
installUpdate: () => ipcRenderer.invoke('install-update'),
|
||||
quitAndInstallUpdate: () => ipcRenderer.invoke('install-update'), // Alias for update.js compatibility
|
||||
getLauncherVersion: () => ipcRenderer.invoke('get-launcher-version'),
|
||||
onUpdateAvailable: (callback) => {
|
||||
ipcRenderer.on('update-available', (event, data) => callback(data));
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
console.log('[Notarize] Script loaded');
|
||||
|
||||
let notarize;
|
||||
try {
|
||||
notarize = require('@electron/notarize').notarize;
|
||||
console.log('[Notarize] @electron/notarize loaded successfully');
|
||||
} catch (err) {
|
||||
console.error('[Notarize] Failed to load @electron/notarize:', err.message);
|
||||
throw err;
|
||||
}
|
||||
|
||||
const path = require('path');
|
||||
|
||||
exports.default = async function notarizing(context) {
|
||||
console.log('[Notarize] afterSign hook called');
|
||||
console.log('[Notarize] Context:', JSON.stringify({
|
||||
platform: context.electronPlatformName,
|
||||
appOutDir: context.appOutDir,
|
||||
outDir: context.outDir
|
||||
}, null, 2));
|
||||
|
||||
const { electronPlatformName, appOutDir } = context;
|
||||
|
||||
// Only notarize macOS builds
|
||||
if (electronPlatformName !== 'darwin') {
|
||||
console.log('[Notarize] Skipping: not macOS');
|
||||
return;
|
||||
}
|
||||
|
||||
// Check credentials
|
||||
const hasAppleId = !!process.env.APPLE_ID;
|
||||
const hasPassword = !!process.env.APPLE_APP_SPECIFIC_PASSWORD;
|
||||
const hasTeamId = !!process.env.APPLE_TEAM_ID;
|
||||
|
||||
console.log('[Notarize] Credentials check:', { hasAppleId, hasPassword, hasTeamId });
|
||||
|
||||
if (!hasAppleId || !hasPassword || !hasTeamId) {
|
||||
console.log('[Notarize] Skipping: missing credentials');
|
||||
return;
|
||||
}
|
||||
|
||||
const appName = context.packager.appInfo.productFilename;
|
||||
const appPath = path.join(appOutDir, `${appName}.app`);
|
||||
|
||||
console.log('[Notarize] Starting notarization...');
|
||||
console.log('[Notarize] App path:', appPath);
|
||||
console.log('[Notarize] Team ID:', process.env.APPLE_TEAM_ID);
|
||||
|
||||
try {
|
||||
await notarize({
|
||||
appPath,
|
||||
appleId: process.env.APPLE_ID,
|
||||
appleIdPassword: process.env.APPLE_APP_SPECIFIC_PASSWORD,
|
||||
teamId: process.env.APPLE_TEAM_ID,
|
||||
});
|
||||
console.log('[Notarize] Notarization complete!');
|
||||
} catch (error) {
|
||||
console.error('[Notarize] Notarization failed:', error.message);
|
||||
console.error('[Notarize] Full error:', error);
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user