mirror of
https://git.sanhost.net/sanasol/hytale-f2p
synced 2026-02-26 10:31:47 -03:00
Compare commits
4 Commits
a63e026700
...
fix/uuid-p
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14dcf3dac3 | ||
|
|
34a3e40bd2 | ||
|
|
d15f2e2ceb | ||
|
|
74f99d0aaf |
@@ -1,2 +0,0 @@
|
||||
HF2P_SECRET_KEY=YOUR_KEY_HERE
|
||||
HF2P_PROXY_URL=YOUR_PROXY
|
||||
4
.github/CODE_OF_CONDUCT.md
vendored
4
.github/CODE_OF_CONDUCT.md
vendored
@@ -36,7 +36,7 @@ This Code of Conduct applies within all community spaces, and also applies when
|
||||
|
||||
## Enforcement
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [Discord Server, message Founders/Devs](https://discord.gg/Fhbb9Yk5WW). All complaints will be reviewed and investigated promptly and fairly.
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
|
||||
|
||||
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
|
||||
|
||||
@@ -80,4 +80,4 @@ For answers to common questions about this code of conduct, see the FAQ at [http
|
||||
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
|
||||
[Mozilla CoC]: https://github.com/mozilla/diversity
|
||||
[FAQ]: https://www.contributor-covenant.org/faq
|
||||
[translations]: https://www.contributor-covenant.org/translations
|
||||
[translations]: https://www.contributor-covenant.org/translations
|
||||
14
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
14
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@@ -1,6 +1,6 @@
|
||||
name: Bug Report
|
||||
description: Create a report to help us improve
|
||||
title: "[BUG] <Insert Bug Title Here>"
|
||||
title: "[BUG] "
|
||||
labels: ["bug"]
|
||||
body:
|
||||
- type: markdown
|
||||
@@ -51,7 +51,7 @@ body:
|
||||
attributes:
|
||||
label: Version
|
||||
description: What version of the launcher are you running?
|
||||
placeholder: "e.g. \"v2.2.1\""
|
||||
placeholder: "e.g. \"v2.2.0 stable\""
|
||||
validations:
|
||||
required: true
|
||||
|
||||
@@ -59,9 +59,7 @@ body:
|
||||
id: hardwarespec
|
||||
attributes:
|
||||
label: Hardware Specification
|
||||
description: |
|
||||
Tell us your CPU, iGPU, dGPU, VRAM, and RAM information.
|
||||
(Use N/A if you think this is not correlated with the bug)
|
||||
description: Tell us your CPU, iGPU, dGPU, VRAM, and RAM information.
|
||||
placeholder: "CPU: Intel i9-14900K 6.0 GHz | GPU: NVIDIA RTX 4090 24 GB VRAM | RAM: 32 GB"
|
||||
validations:
|
||||
required: true
|
||||
@@ -74,9 +72,9 @@ body:
|
||||
options:
|
||||
- Windows 11/10
|
||||
- macOS (Apple Silicon, M1/M2/M3)
|
||||
- Linux Ubuntu/Debian-based (Linux Mint, Pop!_OS, Zorin OS, etc.)
|
||||
- Linux Fedora/RHEL-based (Fedora, Bazzite, CentOS, etc.)
|
||||
- Linux Arch-based (Steamdeck, CachyOS, ArchLinux, etc.)
|
||||
- Linux Ubuntu/Debian-based (Linux Mint, Pop!_OS, etc.)
|
||||
- Linux Fedora/RHEL-based (Fedora, CentOS, etc.)
|
||||
- Linux Arch-based (Steamdeck, CachyOS, etc.)
|
||||
validations:
|
||||
required: true
|
||||
|
||||
|
||||
3
.github/ISSUE_TEMPLATE/support_request.yml
vendored
3
.github/ISSUE_TEMPLATE/support_request.yml
vendored
@@ -22,7 +22,7 @@ body:
|
||||
value: |
|
||||
If you need help or support with using the launcher, please fill out this support request.
|
||||
Provide as much detail as possible so we can assist you effectively.
|
||||
**Need a quick assistance?** Please Open-A-Ticket in our [Discord Server](https://discord.gg/Fhbb9Yk5WW)!
|
||||
**Need a quick assistance?** Please Open-A-Ticket in our [Discord Server](https://discord.gg/gME8rUy3MB)!
|
||||
|
||||
- type: textarea
|
||||
id: question
|
||||
@@ -63,7 +63,6 @@ body:
|
||||
label: Version
|
||||
description: What launcher version are you using?
|
||||
options:
|
||||
- v2.2.1
|
||||
- v2.2.0
|
||||
- v2.1.1
|
||||
- v2.1.0
|
||||
|
||||
204
.github/workflows/release.yml
vendored
204
.github/workflows/release.yml
vendored
@@ -6,117 +6,165 @@ on:
|
||||
- 'v*'
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
# Domain for small API calls (goes through Cloudflare - fine for <100MB)
|
||||
FORGEJO_API: https://git.sanhost.net/api/v1
|
||||
# Direct upload URL (bypasses Cloudflare for large files) - set in repo secrets
|
||||
FORGEJO_UPLOAD: ${{ secrets.FORGEJO_UPLOAD_URL }}
|
||||
|
||||
jobs:
|
||||
create-release:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Create Draft Release
|
||||
run: |
|
||||
curl -s -X POST "${FORGEJO_API}/repos/${GITHUB_REPOSITORY}/releases" \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"tag_name\":\"${{ github.ref_name }}\",\"name\":\"${{ github.ref_name }}\",\"body\":\"Release ${{ github.ref_name }}\",\"draft\":true,\"prerelease\":false}" \
|
||||
-o release.json
|
||||
cat release.json
|
||||
echo "RELEASE_ID=$(cat release.json | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')" >> $GITHUB_ENV
|
||||
|
||||
build-windows:
|
||||
needs: [create-release]
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Wine for cross-compilation
|
||||
run: |
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo mkdir -pm755 /etc/apt/keyrings
|
||||
sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
|
||||
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --install-recommends winehq-stable
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22'
|
||||
cache: 'npm'
|
||||
- run: npm ci
|
||||
|
||||
|
||||
- name: Build Windows Packages
|
||||
run: npx electron-builder --win --publish never --config.npmRebuild=false
|
||||
|
||||
- name: Upload to Release
|
||||
run: |
|
||||
RELEASE_ID=$(curl -s "${FORGEJO_API}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ github.ref_name }}" \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
||||
for file in dist/*.exe dist/*.exe.blockmap dist/latest.yml; do
|
||||
[ -f "$file" ] || continue
|
||||
echo "Uploading $file..."
|
||||
curl -s --max-time 600 -X POST "${FORGEJO_UPLOAD}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=$(basename $file)" \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
|
||||
-F "attachment=@${file}" || echo "Failed to upload $file"
|
||||
done
|
||||
run: npx electron-builder --win --publish never
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: windows-builds
|
||||
path: |
|
||||
dist/*.exe
|
||||
dist/*.exe.blockmap
|
||||
dist/latest.yml
|
||||
|
||||
build-macos:
|
||||
needs: [create-release]
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22'
|
||||
cache: 'npm'
|
||||
- run: npm ci
|
||||
|
||||
- name: Build macOS Packages
|
||||
env:
|
||||
CSC_LINK: ${{ secrets.CSC_LINK }}
|
||||
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
|
||||
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
|
||||
|
||||
- name: Upload to Release
|
||||
run: |
|
||||
RELEASE_ID=$(curl -s "${FORGEJO_API}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ github.ref_name }}" \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
||||
for file in dist/*.dmg dist/*.zip dist/*.blockmap dist/latest-mac.yml; do
|
||||
[ -f "$file" ] || continue
|
||||
echo "Uploading $file..."
|
||||
curl -s --max-time 600 -X POST "${FORGEJO_UPLOAD}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=$(basename $file)" \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
|
||||
-F "attachment=@${file}" || echo "Failed to upload $file"
|
||||
done
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: macos-builds
|
||||
path: |
|
||||
dist/*.dmg
|
||||
dist/*.zip
|
||||
dist/latest-mac.yml
|
||||
|
||||
build-linux:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [create-release]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install build dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libarchive-tools rpm
|
||||
|
||||
sudo apt-get install -y libarchive-tools
|
||||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22'
|
||||
cache: 'npm'
|
||||
- run: npm ci
|
||||
|
||||
- name: Build Linux Packages
|
||||
run: npx electron-builder --linux AppImage deb rpm pacman --publish never
|
||||
|
||||
- name: Upload to Release
|
||||
run: |
|
||||
RELEASE_ID=$(curl -s "${FORGEJO_API}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ github.ref_name }}" \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
||||
for file in dist/*.AppImage dist/*.AppImage.blockmap dist/*.deb dist/*.rpm dist/*.pacman dist/latest-linux.yml; do
|
||||
[ -f "$file" ] || continue
|
||||
echo "Uploading $file..."
|
||||
curl -s --max-time 600 -X POST "${FORGEJO_UPLOAD}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=$(basename $file)" \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
|
||||
-F "attachment=@${file}" || echo "Failed to upload $file"
|
||||
done
|
||||
npx electron-builder --linux AppImage deb rpm --publish never
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: linux-builds
|
||||
path: |
|
||||
dist/*.AppImage
|
||||
dist/*.AppImage.blockmap
|
||||
dist/*.deb
|
||||
dist/*.rpm
|
||||
dist/latest-linux.yml
|
||||
|
||||
build-arch:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: archlinux:latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Install base packages
|
||||
run: |
|
||||
pacman -Syu --noconfirm
|
||||
pacman -S --noconfirm \
|
||||
base-devel \
|
||||
git \
|
||||
nodejs \
|
||||
npm \
|
||||
rpm-tools \
|
||||
libxcrypt-compat
|
||||
|
||||
- name: Create build user
|
||||
run: |
|
||||
useradd -m builder
|
||||
echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
||||
|
||||
- name: Fix Permissions
|
||||
run: chown -R builder:builder .
|
||||
|
||||
- name: Build Arch Package
|
||||
run: |
|
||||
sudo -u builder bash << 'EOF'
|
||||
set -e
|
||||
makepkg --printsrcinfo > .SRCINFO
|
||||
makepkg -s --noconfirm
|
||||
EOF
|
||||
|
||||
- name: Fix permissions for upload
|
||||
if: always()
|
||||
run: |
|
||||
sudo chown -R $(id -u):$(id -g) .
|
||||
|
||||
- name: Upload Arch Package
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: arch-package
|
||||
path: |
|
||||
*.pkg.tar.zst
|
||||
.SRCINFO
|
||||
include-hidden-files: true
|
||||
|
||||
release:
|
||||
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' ||
|
||||
github.event_name == 'workflow_dispatch'
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Download all artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: artifacts
|
||||
|
||||
- name: Display structure of downloaded files
|
||||
run: ls -R artifacts
|
||||
|
||||
- name: Get version from package.json
|
||||
id: pkg_version
|
||||
run: echo "VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ github.ref_name }}
|
||||
files: |
|
||||
artifacts/arch-package/*.pkg.tar.zst
|
||||
artifacts/arch-package/*.src.tar.zst
|
||||
artifacts/arch-package/.SRCINFO
|
||||
artifacts/linux-builds/**/*
|
||||
artifacts/windows-builds/**/*
|
||||
artifacts/macos-builds/**/*
|
||||
generate_release_notes: true
|
||||
draft: true
|
||||
prerelease: false
|
||||
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -17,9 +17,6 @@ dist/
|
||||
# Project Specific: Downloaded patcher (from hytale-auth-server)
|
||||
backend/patcher/
|
||||
|
||||
# Private docs (local only)
|
||||
docs/PATCH_CDN_INFRASTRUCTURE.md
|
||||
|
||||
# macOS Specific
|
||||
.DS_Store
|
||||
*.zst.DS_Store
|
||||
|
||||
@@ -8,10 +8,9 @@
|
||||
<link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300;400;500;600;700&family=JetBrains+Mono:wght@400;500;600;700&family=Noto+Sans+Arabic:wght@300;400;500;600;700&display=swap"
|
||||
href="https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300;400;500;600;700&family=JetBrains+Mono:wght@400;500;600;700&display=swap"
|
||||
rel="stylesheet">
|
||||
<link rel="stylesheet" href="style.css">
|
||||
<link rel="stylesheet" href="style-RTL.css">
|
||||
</head>
|
||||
|
||||
<body class="bg-black text-white overflow-hidden font-sans select-none" tabindex="-1">
|
||||
@@ -218,16 +217,32 @@
|
||||
</div>
|
||||
|
||||
<div id="featured-page" class="page">
|
||||
<div class="featured-container">
|
||||
<div class="featured-header">
|
||||
<h2 class="featured-title">
|
||||
<i class="fas fa-star mr-2"></i>
|
||||
<span>FEATURED SERVERS</span>
|
||||
</h2>
|
||||
<div class="featured-layout">
|
||||
<div class="featured-left">
|
||||
<div class="featured-header">
|
||||
<h2 class="featured-title">
|
||||
<i class="fas fa-star mr-2"></i>
|
||||
<span>FEATURED SERVERS</span>
|
||||
</h2>
|
||||
</div>
|
||||
<div id="featuredServersList" class="featured-list">
|
||||
<div class="loading-spinner">
|
||||
<i class="fas fa-spinner fa-spin fa-2x"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="featuredServersList" class="featured-list">
|
||||
<div class="loading-spinner">
|
||||
<i class="fas fa-spinner fa-spin fa-2x"></i>
|
||||
|
||||
<div class="featured-right">
|
||||
<div class="featured-header">
|
||||
<h2 class="featured-title">
|
||||
<i class="fas fa-server mr-2"></i>
|
||||
<span>HF2P SERVERS</span>
|
||||
</h2>
|
||||
</div>
|
||||
<div id="myServersList" class="featured-list">
|
||||
<div class="loading-spinner">
|
||||
<i class="fas fa-spinner fa-spin fa-2x"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -731,7 +746,6 @@
|
||||
|
||||
<div class="version-display-bottom">
|
||||
<i class="fas fa-code-branch"></i>
|
||||
<span id="launcherVersion"></span>
|
||||
</div>
|
||||
|
||||
<footer class="fixed bottom-0 left-0 right-0 z-50 bg-black/80 backdrop-blur-sm px-4 py-2">
|
||||
|
||||
@@ -15,6 +15,7 @@ function escapeHtml(text) {
|
||||
*/
|
||||
async function loadFeaturedServers() {
|
||||
const featuredContainer = document.getElementById('featuredServersList');
|
||||
const myServersContainer = document.getElementById('myServersList');
|
||||
|
||||
try {
|
||||
console.log('[FeaturedServers] Fetching from', FEATURED_SERVERS_API);
|
||||
@@ -53,15 +54,6 @@ async function loadFeaturedServers() {
|
||||
const escapedName = escapeHtml(server.Name || 'Unknown Server');
|
||||
const escapedAddress = escapeHtml(server.Address || '');
|
||||
const bannerUrl = server.img_Banner || 'https://via.placeholder.com/400x240/1e293b/ffffff?text=Server+Banner';
|
||||
const discordUrl = server.discord || '';
|
||||
|
||||
// Build Discord button HTML if discord link exists
|
||||
const discordButton = discordUrl ? `
|
||||
<button class="server-discord-btn" onclick="openServerDiscord('${discordUrl}')">
|
||||
<i class="fab fa-discord"></i>
|
||||
<span>Discord</span>
|
||||
</button>
|
||||
` : '';
|
||||
|
||||
return `
|
||||
<div class="featured-server-card">
|
||||
@@ -75,13 +67,10 @@ async function loadFeaturedServers() {
|
||||
<h3 class="featured-server-name">${escapedName}</h3>
|
||||
<div class="featured-server-address">
|
||||
<span class="server-address-text">${escapedAddress}</span>
|
||||
<div class="server-action-buttons">
|
||||
<button class="copy-address-btn" onclick="copyServerAddress('${escapedAddress}', this)">
|
||||
<i class="fas fa-copy"></i>
|
||||
<span>Copy</span>
|
||||
</button>
|
||||
${discordButton}
|
||||
</div>
|
||||
<button class="copy-address-btn" onclick="copyServerAddress('${escapedAddress}', this)">
|
||||
<i class="fas fa-copy"></i>
|
||||
<span>Copy</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -91,6 +80,13 @@ async function loadFeaturedServers() {
|
||||
featuredContainer.innerHTML = featuredHTML;
|
||||
}
|
||||
|
||||
// Show "Coming Soon" for my servers
|
||||
myServersContainer.innerHTML = `
|
||||
<div style="display: flex; align-items: center; justify-content: center; height: 100%; color: #94a3b8; font-size: 1.2rem;">
|
||||
<p>Coming Soon</p>
|
||||
</div>
|
||||
`;
|
||||
|
||||
} catch (error) {
|
||||
console.error('[FeaturedServers] Error loading servers:', error);
|
||||
featuredContainer.innerHTML = `
|
||||
@@ -100,6 +96,11 @@ async function loadFeaturedServers() {
|
||||
<p style="font-size: 0.9rem; color: #64748b;">${error.message}</p>
|
||||
</div>
|
||||
`;
|
||||
myServersContainer.innerHTML = `
|
||||
<div style="display: flex; align-items: center; justify-content: center; height: 100%; color: #94a3b8; font-size: 1.2rem;">
|
||||
<p>Coming Soon</p>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,22 +151,6 @@ async function copyServerAddress(address, button) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Open server Discord in external browser
|
||||
*/
|
||||
function openServerDiscord(discordUrl) {
|
||||
try {
|
||||
console.log('[FeaturedServers] Opening Discord:', discordUrl);
|
||||
if (window.electronAPI && window.electronAPI.openExternal) {
|
||||
window.electronAPI.openExternal(discordUrl);
|
||||
} else {
|
||||
window.open(discordUrl, '_blank');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[FeaturedServers] Failed to open Discord link:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// Load featured servers when the featured page becomes visible
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const observer = new MutationObserver((mutations) => {
|
||||
|
||||
@@ -12,18 +12,9 @@ const i18n = (() => {
|
||||
{ code: 'ru-RU', name: 'Russian (Russia)' },
|
||||
{ code: 'sv-SE', name: 'Swedish (Sweden)' },
|
||||
{ code: 'tr-TR', name: 'Turkish (Turkey)' },
|
||||
{ code: 'id-ID', name: 'Indonesian (Indonesia)' },
|
||||
{ code: 'ar-SA', name: 'Arabic (Saudi Arabia)' }
|
||||
{ code: 'id-ID', name: 'Indonesian (Indonesia)' }
|
||||
];
|
||||
|
||||
// RTL languages
|
||||
const rtlLanguages = ['ar-SA'];
|
||||
|
||||
// Check if current language is RTL
|
||||
function isRTL() {
|
||||
return rtlLanguages.includes(currentLang);
|
||||
}
|
||||
|
||||
// Load single language file
|
||||
async function loadLanguage(lang) {
|
||||
if (translations[lang]) return true;
|
||||
@@ -82,24 +73,6 @@ const i18n = (() => {
|
||||
const key = el.getAttribute('data-i18n-title');
|
||||
el.title = t(key);
|
||||
});
|
||||
// Update RTL layout
|
||||
updateRTL();
|
||||
}
|
||||
|
||||
// Update RTL layout
|
||||
function updateRTL() {
|
||||
const html = document.documentElement;
|
||||
const body = document.body;
|
||||
|
||||
if (isRTL()) {
|
||||
html.setAttribute('dir', 'rtl');
|
||||
html.setAttribute('lang', currentLang);
|
||||
body.classList.add('rtl');
|
||||
} else {
|
||||
html.removeAttribute('dir');
|
||||
html.setAttribute('lang', currentLang);
|
||||
body.classList.remove('rtl');
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize - load saved language only
|
||||
@@ -115,8 +88,7 @@ const i18n = (() => {
|
||||
t,
|
||||
setLanguage,
|
||||
getAvailableLanguages: () => availableLanguages,
|
||||
getCurrentLanguage: () => currentLang,
|
||||
isRTL
|
||||
getCurrentLanguage: () => currentLang
|
||||
};
|
||||
})();
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ window.closeDiscordPopup = function() {
|
||||
};
|
||||
|
||||
window.joinDiscord = async function() {
|
||||
await window.electronAPI?.openExternal('https://discord.gg/Fhbb9Yk5WW');
|
||||
await window.electronAPI?.openExternal('https://discord.gg/hf2pdc');
|
||||
|
||||
try {
|
||||
await window.electronAPI?.saveConfig({ discordPopup: true });
|
||||
|
||||
@@ -1103,7 +1103,7 @@ function getRetryContextMessage() {
|
||||
}
|
||||
|
||||
window.openDiscordExternal = function() {
|
||||
window.electronAPI?.openExternal('https://discord.gg/Fhbb9Yk5WW');
|
||||
window.electronAPI?.openExternal('https://discord.gg/hf2pdc');
|
||||
};
|
||||
|
||||
window.toggleMaximize = toggleMaximize;
|
||||
|
||||
@@ -1,257 +0,0 @@
|
||||
{
|
||||
"nav": {
|
||||
"play": "لعب",
|
||||
"mods": "المودات",
|
||||
"news": "الأخبار",
|
||||
"chat": "دردشة اللاعبين",
|
||||
"settings": "الإعدادات"
|
||||
},
|
||||
"header": {
|
||||
"playersLabel": "اللاعبون:",
|
||||
"manageProfiles": "إدارة الملفات الشخصية",
|
||||
"defaultProfile": "الافتراضي"
|
||||
},
|
||||
"install": {
|
||||
"title": "مشغل اللعب المجاني",
|
||||
"playerName": "اسم اللاعب",
|
||||
"playerNamePlaceholder": "أدخل اسمك",
|
||||
"gameBranch": "إصدار اللعبة",
|
||||
"releaseVersion": "إصدار نهائي (مستقر)",
|
||||
"preReleaseVersion": "إصدار تجريبي (تجريبي)",
|
||||
"customInstallation": "تثبيت مخصص",
|
||||
"installationFolder": "مجلد التثبيت",
|
||||
"pathPlaceholder": "الموقع الافتراضي",
|
||||
"browse": "تصفح",
|
||||
"installButton": "تثبيت HYTALE",
|
||||
"installing": "جاري التثبيت..."
|
||||
},
|
||||
"play": {
|
||||
"ready": "جاهز للعب",
|
||||
"subtitle": "شغل Hytale وابدأ المغامرة",
|
||||
"playButton": "لعب HYTALE",
|
||||
"latestNews": "آخر الأخبار",
|
||||
"viewAll": "عرض الكل",
|
||||
"checking": "جاري التحقق...",
|
||||
"play": "بدء"
|
||||
},
|
||||
"mods": {
|
||||
"searchPlaceholder": "البحث عن مودات...",
|
||||
"myMods": "موداتي",
|
||||
"previous": "السابق",
|
||||
"next": "التالي",
|
||||
"page": "صفحة",
|
||||
"of": "من",
|
||||
"modalTitle": "موداتي",
|
||||
"noModsFound": "لم يتم العثور على مودات",
|
||||
"noModsFoundDesc": "حاول تعديل معايير البحث",
|
||||
"noModsInstalled": "لا توجد مودات مثبتة",
|
||||
"noModsInstalledDesc": "أضف مودات من CurseForge أو استورد ملفات محلية",
|
||||
"view": "عرض",
|
||||
"install": "تثبيت",
|
||||
"installed": "مثبت",
|
||||
"enable": "تفعيل",
|
||||
"disable": "تعطيل",
|
||||
"active": "نشط",
|
||||
"disabled": "معطل",
|
||||
"delete": "حذف المود",
|
||||
"noDescription": "لا يوجد وصف متاح",
|
||||
"confirmDelete": "هل أنت متأكد أنك تريد حذف \"{name}\"؟",
|
||||
"confirmDeleteDesc": "لا يمكن التراجع عن هذا الإجراء.",
|
||||
"confirmDeletion": "تأكيد الحذف",
|
||||
"apiKeyRequired": "مطلوب مفتاح API",
|
||||
"apiKeyRequiredDesc": "مطلوب مفتاح CurseForge API لتصفح المودات"
|
||||
},
|
||||
"news": {
|
||||
"title": "كل الأخبار",
|
||||
"readMore": "اقرأ المزيد"
|
||||
},
|
||||
"chat": {
|
||||
"title": "دردشة اللاعبين",
|
||||
"pickColor": "اللون",
|
||||
"inputPlaceholder": "اكتب رسالتك...",
|
||||
"send": "إرسال",
|
||||
"online": "متصل",
|
||||
"charCounter": "{current}/{max}",
|
||||
"secureChat": "دردشة آمنة - الروابط محجوبة",
|
||||
"joinChat": "انضمام للدردشة",
|
||||
"chooseUsername": "اختر اسم مستخدم للانضمام إلى دردشة اللاعبين",
|
||||
"username": "اسم المستخدم",
|
||||
"usernamePlaceholder": "أدخل اسم المستخدم...",
|
||||
"usernameHint": "3-20 حرفاً، حروف، أرقام، و - و _ فقط",
|
||||
"joinButton": "انضمام",
|
||||
"colorModal": {
|
||||
"title": "تخصيص لون اسم المستخدم",
|
||||
"chooseSolid": "اختر لوناً ثابتاً:",
|
||||
"customColor": "لون مخصص:",
|
||||
"preview": "معاينة:",
|
||||
"previewUsername": "اسم المستخدم",
|
||||
"apply": "تطبيق اللون"
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"title": "الإعدادات",
|
||||
"java": "بيئة تشغيل جافا",
|
||||
"useCustomJava": "استخدام مسار جافا مخصص",
|
||||
"javaDescription": "تجاوز بيئة جافا المرفقة واستخدام تثبيت خاص بك",
|
||||
"javaPath": "مسار ملف جافا التنفيذي",
|
||||
"javaPathPlaceholder": "اختر مسار جافا...",
|
||||
"javaBrowse": "تصفح",
|
||||
"javaHint": "اختر مجلد تثبيت جافا (يدعم ويندوز، ماك، ولينكس)",
|
||||
"discord": "تكامل ديسكورد",
|
||||
"enableRPC": "تفعيل نشاط ديسكورد (Rich Presence)",
|
||||
"discordDescription": "إظهار نشاط المشغل الخاص بك على ديسكورد",
|
||||
"game": "خيارات اللعبة",
|
||||
"playerName": "اسم اللاعب",
|
||||
"playerNamePlaceholder": "أدخل اسم اللاعب",
|
||||
"playerNameHint": "سيتم استخدام هذا الاسم داخل اللعبة (1-16 حرفاً)",
|
||||
"openGameLocation": "فتح موقع اللعبة",
|
||||
"openGameLocationDesc": "فتح مجلد تثبيت اللعبة",
|
||||
"account": "إدارة UUID اللاعب",
|
||||
"currentUUID": "الـ UUID الحالي",
|
||||
"uuidPlaceholder": "جاري تحميل UUID...",
|
||||
"copyUUID": "نسخ UUID",
|
||||
"regenerateUUID": "إعادة إنشاء UUID",
|
||||
"uuidHint": "معرف اللاعب الفريد الخاص بك لهذا الاسم",
|
||||
"manageUUIDs": "إدارة جميع الـ UUIDs",
|
||||
"manageUUIDsDesc": "عرض وإدارة جميع معرفات اللاعبين",
|
||||
"language": "اللغة",
|
||||
"selectLanguage": "اختر اللغة",
|
||||
"repairGame": "إصلاح اللعبة",
|
||||
"reinstallGame": "إعادة تثبيت ملفات اللعبة (يحفظ البيانات)",
|
||||
"gpuPreference": "تفضيل معالج الرسوميات (GPU)",
|
||||
"gpuHint": "ميزة للمحمول فقط؛ اضبطها على Integrated إذا كنت تستخدم كمبيوتر مكتبي",
|
||||
"gpuAuto": "تلقائي",
|
||||
"gpuIntegrated": "مدمج",
|
||||
"gpuDedicated": "منفصل",
|
||||
"logs": "سجلات النظام",
|
||||
"logsCopy": "نسخ",
|
||||
"logsRefresh": "تحديث",
|
||||
"logsFolder": "فتح المجلد",
|
||||
"logsLoading": "جاري تحميل السجلات...",
|
||||
"closeLauncher": "سلوك المشغل",
|
||||
"closeOnStart": "إغلاق المشغل عند بدء اللعبة",
|
||||
"closeOnStartDescription": "إغلاق المشغل تلقائياً بعد تشغيل Hytale",
|
||||
"hwAccel": "تسريع الأجهزة (Hardware Acceleration)",
|
||||
"hwAccelDescription": "تفعيل تسريع الأجهزة للمشغل",
|
||||
"gameBranch": "فرع اللعبة",
|
||||
"branchRelease": "إصدار نهائي",
|
||||
"branchPreRelease": "إصدار تجريبي",
|
||||
"branchHint": "التبديل بين الإصدار المستقر والإصدار التجريبي",
|
||||
"branchWarning": "تغيير الفرع سيؤدي إلى تحميل وتثبيت نسخة مختلفة من اللعبة",
|
||||
"branchSwitching": "جاري التبديل إلى {branch}...",
|
||||
"branchSwitched": "تم التبديل إلى {branch} بنجاح!",
|
||||
"installRequired": "التثبيت مطلوب",
|
||||
"branchInstallConfirm": "سيتم تثبيت اللعبة لفرع {branch}. هل تريد الاستمرار؟"
|
||||
},
|
||||
"uuid": {
|
||||
"modalTitle": "إدارة UUID",
|
||||
"currentUserUUID": "UUID المستخدم الحالي",
|
||||
"allPlayerUUIDs": "جميع معرفات UUID للاعبين",
|
||||
"generateNew": "إنشاء UUID جديد",
|
||||
"loadingUUIDs": "جاري تحميل الـ UUIDs...",
|
||||
"setCustomUUID": "تعيين UUID مخصص",
|
||||
"customPlaceholder": "أدخل UUID مخصص (الصيغة: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx)",
|
||||
"setUUID": "تعيين UUID",
|
||||
"warning": "تحذير: تعيين UUID مخصص سيغير هوية اللاعب الحالية",
|
||||
"copyTooltip": "نسخ UUID",
|
||||
"regenerateTooltip": "إنشاء UUID جديد"
|
||||
},
|
||||
"profiles": {
|
||||
"modalTitle": "إدارة الملفات الشخصية",
|
||||
"newProfilePlaceholder": "اسم الملف الشخصي الجديد",
|
||||
"createProfile": "إنشاء ملف شخصي"
|
||||
},
|
||||
"discord": {
|
||||
"notificationText": "انضم إلى مجتمعنا على ديسكورد!",
|
||||
"joinButton": "انضم إلى ديسكورد"
|
||||
},
|
||||
"common": {
|
||||
"confirm": "تأكيد",
|
||||
"cancel": "إلغاء",
|
||||
"save": "حفظ",
|
||||
"close": "إغلاق",
|
||||
"delete": "حذف",
|
||||
"edit": "تعديل",
|
||||
"loading": "جاري التحميل...",
|
||||
"apply": "تطبيق",
|
||||
"install": "تثبيت"
|
||||
},
|
||||
"notifications": {
|
||||
"gameDataNotFound": "خطأ: لم يتم العثور على بيانات اللعبة",
|
||||
"gameUpdatedSuccess": "تم تحديث اللعبة بنجاح! 🎉",
|
||||
"updateFailed": "فشل التحديث: {error}",
|
||||
"updateError": "خطأ في التحديث: {error}",
|
||||
"discordEnabled": "تم تفعيل نشاط ديسكورد",
|
||||
"discordDisabled": "تم تعطيل نشاط ديسكورد",
|
||||
"discordSaveFailed": "فشل حفظ إعدادات ديسكورد",
|
||||
"playerNameRequired": "يرجى إدخال اسم لاعب صالح",
|
||||
"playerNameSaved": "تم حفظ اسم اللاعب بنجاح",
|
||||
"playerNameSaveFailed": "فشل حفظ اسم اللاعب",
|
||||
"uuidCopied": "تم نسخ الـ UUID إلى الحافظة!",
|
||||
"uuidCopyFailed": "فشل نسخ الـ UUID",
|
||||
"uuidRegenNotAvailable": "إعادة إنشاء UUID غير متاحة",
|
||||
"uuidRegenFailed": "فشل إعادة إنشاء الـ UUID",
|
||||
"uuidGenerated": "تم إنشاء UUID جديد بنجاح!",
|
||||
"uuidGeneratedShort": "تم إنشاء UUID جديد!",
|
||||
"uuidGenerateFailed": "فشل إنشاء UUID جديد",
|
||||
"uuidRequired": "يرجى إدخال UUID",
|
||||
"uuidInvalidFormat": "صيغة UUID غير صالحة",
|
||||
"uuidSetFailed": "فشل تعيين الـ UUID المخصص",
|
||||
"uuidSetSuccess": "تم تعيين الـ UUID المخصص بنجاح!",
|
||||
"uuidDeleteFailed": "فشل حذف الـ UUID",
|
||||
"uuidDeleteSuccess": "تم حذف الـ UUID بنجاح!",
|
||||
"modsDownloading": "جاري تحميل {name}...",
|
||||
"modsTogglingMod": "جاري تبديل حالة المود...",
|
||||
"modsDeletingMod": "جاري حذف المود...",
|
||||
"modsLoadingMods": "جاري تحميل المودات من CurseForge...",
|
||||
"modsInstalledSuccess": "تم تثبيت {name} بنجاح! 🎉",
|
||||
"modsDeletedSuccess": "تم حذف {name} بنجاح",
|
||||
"modsDownloadFailed": "فشل تحميل المود: {error}",
|
||||
"modsToggleFailed": "فشل تبديل المود: {error}",
|
||||
"modsDeleteFailed": "فشل حذف المود: {error}",
|
||||
"modsModNotFound": "لم يتم العثور على معلومات المود",
|
||||
"hwAccelSaved": "تم حفظ إعداد تسريع الأجهزة",
|
||||
"hwAccelSaveFailed": "فشل حفظ إعداد تسريع الأجهزة",
|
||||
"noUsername": "لم يتم تهيئة اسم مستخدم. يرجى حفظ اسم المستخدم أولاً.",
|
||||
"switchUsernameSuccess": "تم التبديل إلى المستخدم \"{username}\" بنجاح!",
|
||||
"switchUsernameFailed": "فشل تبديل اسم المستخدم",
|
||||
"playerNameTooLong": "يجب أن يكون اسم اللاعب 16 حرفاً أو أقل"
|
||||
},
|
||||
"confirm": {
|
||||
"defaultTitle": "تأكيد الإجراء",
|
||||
"regenerateUuidTitle": "إنشاء UUID جديد",
|
||||
"regenerateUuidMessage": "هل أنت متأكد أنك تريد إنشاء UUID جديد؟ سيؤدي ذلك إلى تغيير هوية اللاعب الخاصة بك.",
|
||||
"regenerateUuidButton": "إنشاء",
|
||||
"setCustomUuidTitle": "تعيين UUID مخصص",
|
||||
"setCustomUuidMessage": "هل أنت متأكد أنك تريد تعيين هذا الـ UUID المخصص؟ سيؤدي ذلك إلى تغيير هوية اللاعب الخاصة بك.",
|
||||
"setCustomUuidButton": "تعيين UUID",
|
||||
"deleteUuidTitle": "حذف UUID",
|
||||
"deleteUuidMessage": "هل أنت متأكد أنك تريد حذف الـ UUID الخاص بـ \"{username}\"؟ لا يمكن التراجع عن هذا الإجراء.",
|
||||
"deleteUuidButton": "حذف",
|
||||
"uninstallGameTitle": "إلغاء تثبيت اللعبة",
|
||||
"uninstallGameMessage": "هل أنت متأكد أنك تريد إلغاء تثبيت Hytale؟ سيتم حذف جميع ملفات اللعبة.",
|
||||
"uninstallGameButton": "إلغاء التثبيت",
|
||||
"switchUsernameTitle": "تبديل الهوية",
|
||||
"switchUsernameMessage": "التبديل إلى اسم المستخدم \"{username}\"؟ سيؤدي هذا إلى تغيير هوية اللاعب الحالية.",
|
||||
"switchUsernameButton": "تبديل"
|
||||
},
|
||||
"progress": {
|
||||
"initializing": "جاري التهيئة...",
|
||||
"downloading": "جاري التحميل...",
|
||||
"installing": "جاري التثبيت...",
|
||||
"extracting": "جاري الاستخراج...",
|
||||
"verifying": "جاري التحقق...",
|
||||
"switchingProfile": "جاري تبديل الملف الشخصي...",
|
||||
"profileSwitched": "تم تبديل الملف الشخصي!",
|
||||
"startingGame": "جاري بدء اللعبة...",
|
||||
"launching": "جاري التشغيل...",
|
||||
"uninstallingGame": "جاري إلغاء تثبيت اللعبة...",
|
||||
"gameUninstalled": "تم إلغاء تثبيت اللعبة بنجاح!",
|
||||
"uninstallFailed": "فشل إلغاء التثبيت: {error}",
|
||||
"startingUpdate": "جاري بدء تحديث اللعبة الإجباري...",
|
||||
"installationComplete": "تم اكتمال التثبيت بنجاح!",
|
||||
"installationFailed": "فشل التثبيت: {error}",
|
||||
"installingGameFiles": "جاري تثبيت ملفات اللعبة...",
|
||||
"installComplete": "اكتمل التثبيت!"
|
||||
}
|
||||
}
|
||||
@@ -22,13 +22,13 @@
|
||||
"installationFolder": "Kurulum Klasörü",
|
||||
"pathPlaceholder": "Varsayılan konum",
|
||||
"browse": "Gözat",
|
||||
"installButton": "HYTALE KUR",
|
||||
"installButton": "HYTALE KURU",
|
||||
"installing": "KURULUYOR..."
|
||||
},
|
||||
"play": {
|
||||
"ready": "OYNAMAYA HAZIR",
|
||||
"subtitle": "Hytale'ı başlat ve maceraya başla",
|
||||
"playButton": "HYTALE'I OYNA",
|
||||
"subtitle": "Hytale'i başlat ve maceraya başla",
|
||||
"playButton": "HYTALE'YI OYNA",
|
||||
"latestNews": "SON HABERLER",
|
||||
"viewAll": "HEPSINI GÖR",
|
||||
"checking": "KONTROL EDİLİYOR...",
|
||||
@@ -47,13 +47,13 @@
|
||||
"noModsInstalled": "Hiçbir Mod Kurulu Değil",
|
||||
"noModsInstalledDesc": "CurseForge'dan modlar ekleyin veya yerel dosyalar içe aktarın",
|
||||
"view": "GÖR",
|
||||
"install": "KUR",
|
||||
"install": "KURU",
|
||||
"installed": "KURULU",
|
||||
"enable": "AÇ",
|
||||
"disable": "KAPAT",
|
||||
"enable": "ETKİNLEŞTİR",
|
||||
"disable": "DEĞİ",
|
||||
"active": "AKTİF",
|
||||
"disabled": "DEVREDIŞI",
|
||||
"delete": "Modu sil",
|
||||
"disabled": "DEĞİ",
|
||||
"delete": "Modı sil",
|
||||
"noDescription": "Açıklama yok",
|
||||
"confirmDelete": "\"{name}\" öğesini silmek istediğinizden emin misiniz?",
|
||||
"confirmDeleteDesc": "Bu işlem geri alınamaz.",
|
||||
@@ -67,7 +67,7 @@
|
||||
},
|
||||
"chat": {
|
||||
"title": "OYUNCU SOHBETI",
|
||||
"pickColor": "Renk Seç",
|
||||
"pickColor": "Renk",
|
||||
"inputPlaceholder": "Mesajınızı yazın...",
|
||||
"send": "Gönder",
|
||||
"online": "çevrimiçi",
|
||||
@@ -116,7 +116,7 @@
|
||||
"manageUUIDsDesc": "Tüm oyuncu UUID'lerini görüntüleyin ve yönetin",
|
||||
"language": "Dil",
|
||||
"selectLanguage": "Dil Seçin",
|
||||
"repairGame": "Oyunu Düzelt",
|
||||
"repairGame": "Oyunu Onarı",
|
||||
"reinstallGame": "Oyun dosyalarını yeniden kur (veri korur)",
|
||||
"gpuPreference": "GPU Tercihi",
|
||||
"gpuHint": "Sadece dizüstü bilgisayarlarda bulunan bir özellik; PC'de kullanılıyorsa Entegre olarak ayarlayın.",
|
||||
@@ -254,5 +254,4 @@
|
||||
"installingGameFiles": "Oyun dosyaları kuruluyor...",
|
||||
"installComplete": "Kurulum tamamlandı!"
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,209 +0,0 @@
|
||||
body.rtl {
|
||||
direction: rtl;
|
||||
font-family: 'Noto Sans Arabic', 'Space Grotesk', sans-serif;
|
||||
}
|
||||
|
||||
body.rtl .sidebar {
|
||||
right: 0;
|
||||
left: auto;
|
||||
border-right: none;
|
||||
border-left: 1px solid rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
body.rtl .nav-item.active::before {
|
||||
right: -8px;
|
||||
left: auto;
|
||||
border-radius: 4px 0 0 4px;
|
||||
}
|
||||
|
||||
body.rtl .nav-tooltip {
|
||||
right: 100%;
|
||||
left: auto;
|
||||
margin-right: 0.5rem;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
body.rtl .nav-item:hover .nav-tooltip {
|
||||
transform: translateX(-8px);
|
||||
}
|
||||
|
||||
|
||||
body.rtl .main-content {
|
||||
margin-right: 80px;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
/* Header Layout*/
|
||||
|
||||
body.rtl .players-counter {
|
||||
order: 2;
|
||||
margin-left: 1.5rem;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
body.rtl .profile-selector {
|
||||
order: -1;
|
||||
}
|
||||
|
||||
body.rtl .window-controls {
|
||||
order: 3;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
body.rtl .profile-dropdown {
|
||||
right: auto;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
body.rtl .form-group {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
body.rtl .radio-label,
|
||||
body.rtl .checkbox-group {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
body.rtl .form-input {
|
||||
border-radius: 0 8px 8px 0;
|
||||
}
|
||||
|
||||
|
||||
body.rtl .mods-pagination {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
body.rtl .pagination-btn:first-child i {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
body.rtl .pagination-btn:last-child i {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
/* UUID Display */
|
||||
|
||||
body.rtl .uuid-display-container {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
body.rtl .uuid-btn {
|
||||
border-radius: 0 8px 8px 0;
|
||||
}
|
||||
|
||||
body.rtl .uuid-input {
|
||||
border-radius: 8px 0 0 8px;
|
||||
}
|
||||
|
||||
|
||||
body.rtl .segmented-control {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
/* Mod Grid Layout */
|
||||
body.rtl .mods-search {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
body.rtl .mods-search-container {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
body.rtl .mods-actions {
|
||||
order: -1;
|
||||
}
|
||||
|
||||
body.rtl .mod-card {
|
||||
direction: rtl;
|
||||
}
|
||||
|
||||
body.rtl .installed-mod-card {
|
||||
direction: rtl;
|
||||
}
|
||||
|
||||
body.rtl .installed-mod-card .mod-info {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
body.rtl .mods-header {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
body.rtl .news-section .news-header {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
/* Settings Layout */
|
||||
|
||||
body.rtl .settings-option {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
body.rtl .settings-input-group {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
body.rtl .settings-input {
|
||||
border-radius: 0 8px 8px 0;
|
||||
}
|
||||
|
||||
body.rtl .settings-section-title i {
|
||||
margin-right: 0;
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
|
||||
body.rtl .settings-hint i {
|
||||
margin-right: 0;
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
|
||||
body.rtl .custom-options,
|
||||
body.rtl .custom-java-options {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
body.rtl .checkbox-content {
|
||||
margin-right: 2rem;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
body.rtl .btn-content {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/* Icons & Transformations */
|
||||
|
||||
body.rtl .news-title i {
|
||||
padding-left: 0.5rem;
|
||||
}
|
||||
body.rtl .uuid-modal-title i {
|
||||
padding-left: 0.5rem;
|
||||
}
|
||||
body.rtl .mods-modal-title i {
|
||||
padding-left: 0.5rem;
|
||||
}
|
||||
|
||||
body.rtl .view-all-btn i,
|
||||
body.rtl .sidebar-nav div i,
|
||||
body.rtl .logs-header i,
|
||||
body.rtl .home-play-button i {
|
||||
transform: scaleX(-1);
|
||||
}
|
||||
|
||||
body.rtl .play-title i {
|
||||
transform: scaleX(-1);
|
||||
padding-right: 0.5rem;
|
||||
}
|
||||
|
||||
|
||||
body.rtl .logs-terminal {
|
||||
direction: ltr;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
body.rtl .version-display-bottom {
|
||||
right: auto;
|
||||
left: 1rem;
|
||||
}
|
||||
@@ -1005,12 +1005,20 @@ body {
|
||||
}
|
||||
|
||||
/* Featured Servers Styles */
|
||||
.featured-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.featured-layout {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 2rem;
|
||||
height: calc(100vh - 180px);
|
||||
overflow: hidden;
|
||||
padding: 0 2rem;
|
||||
}
|
||||
|
||||
.featured-left,
|
||||
.featured-right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.featured-header {
|
||||
@@ -1066,8 +1074,8 @@ body {
|
||||
transition: all 0.3s ease;
|
||||
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
|
||||
display: grid;
|
||||
grid-template-columns: 300px 1fr;
|
||||
min-height: 180px;
|
||||
grid-template-columns: 200px 1fr;
|
||||
min-height: 120px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
@@ -1078,24 +1086,24 @@ body {
|
||||
}
|
||||
|
||||
.featured-server-banner {
|
||||
width: 300px;
|
||||
width: 200px;
|
||||
height: 100%;
|
||||
min-height: 180px;
|
||||
min-height: 120px;
|
||||
object-fit: cover;
|
||||
background: linear-gradient(135deg, #1e293b, #334155);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.featured-server-content {
|
||||
padding: 1.5rem 2rem;
|
||||
padding: 1.25rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
gap: 1rem;
|
||||
gap: 0.75rem;
|
||||
}
|
||||
|
||||
.featured-server-name {
|
||||
font-size: 1.35rem;
|
||||
font-size: 1.15rem;
|
||||
font-weight: 600;
|
||||
color: white;
|
||||
line-height: 1.4;
|
||||
@@ -1110,40 +1118,27 @@ body {
|
||||
padding: 0.625rem 1rem;
|
||||
border-radius: 6px;
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.server-address-text {
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
color: #94a3b8;
|
||||
font-size: 0.9rem;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.server-action-buttons {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.copy-address-btn {
|
||||
background: linear-gradient(135deg, #9333ea, #7c3aed);
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 0.5rem 0.875rem;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
font-size: 0.8125rem;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
transition: all 0.2s ease;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.375rem;
|
||||
gap: 0.5rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
@@ -1160,31 +1155,6 @@ body {
|
||||
background: linear-gradient(135deg, #10b981, #059669);
|
||||
}
|
||||
|
||||
.server-discord-btn {
|
||||
background: linear-gradient(135deg, #5865F2, #4752C4);
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 0.5rem 0.875rem;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 500;
|
||||
transition: all 0.2s ease;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.375rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.server-discord-btn:hover {
|
||||
background: linear-gradient(135deg, #4752C4, #3c45a5);
|
||||
transform: scale(1.05);
|
||||
}
|
||||
|
||||
.server-discord-btn:active {
|
||||
transform: scale(0.95);
|
||||
}
|
||||
|
||||
.loading-spinner {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
2
PKGBUILD
2
PKGBUILD
@@ -2,7 +2,7 @@
|
||||
# Maintainer: Fazri Gading <fazrigading@gmail.com>
|
||||
# This PKGBUILD is for Github Releases
|
||||
pkgname=Hytale-F2P
|
||||
pkgver=2.2.1
|
||||
pkgver=2.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="Hytale-F2P - unofficial Hytale Launcher for free to play with multiplayer support"
|
||||
arch=('x86_64')
|
||||
|
||||
72
README.md
72
README.md
@@ -7,18 +7,19 @@
|
||||
<p><small>An unofficial cross-platform launcher for Hytale with automatic updates and multiplayer support!</small></p>
|
||||
</header>
|
||||
|
||||
[](https://github.com/amiayweb/Hytale-F2P/releases)
|
||||
[](https://github.com/amiayweb/Hytale-F2P/releases)
|
||||
[](https://github.com/amiayweb/Hytale-F2P/releases)
|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
[](https://github.com/amiayweb/Hytale-F2P/stargazers)
|
||||
[](https://github.com/amiayweb/Hytale-F2P/network/members)
|
||||
[](https://github.com/amiayweb/Hytale-F2P/issues)
|
||||

|
||||
[](https://github.com/amiayweb/Hytale-F2P/stargazers)
|
||||
[](https://github.com/amiayweb/Hytale-F2P/network/members)
|
||||
|
||||
### ⚠️ **WARNING: READ [QUICK START](#-quick-start) before Downloading & Installing the Launcher!** ⚠️
|
||||
⭐ **If you find this project useful, please give it a STAR!** ⭐
|
||||
|
||||
#### 🛑 **Found a problem? [Join the HF2P Discord](https://discord.gg/Fhbb9Yk5WW) and head to `#-⚠️-community-help`** 🛑
|
||||
### ⚠️ **READ [QUICK START](README.md#-quick-start) before Downloading & Installing the Launcher!** ⚠️
|
||||
|
||||
#### 🛑 **Found a problem? Join the Discord and Select #Open-A-Ticket!: https://discord.gg/gME8rUy3MB** 🛑
|
||||
|
||||
<p>
|
||||
👍 If you like the project, <b>feel free to support us via Buy Me a Coffee!</b> ☕<br>
|
||||
@@ -29,15 +30,9 @@
|
||||
<img src="https://media3.giphy.com/media/v1.Y2lkPTc5MGI3NjExem14OW1tanN3eHlyYmR4NW1sYmJkOTZmbmJxejdjZXB6MXY5cW12MSZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9cw/TDQOtnWgsBx99cNoyH/giphy.gif" width="120">
|
||||
</a>
|
||||
|
||||
|
||||
⭐ **If you find this project useful, please give it a STAR!** ⭐
|
||||
|
||||
[](https://www.star-history.com/#amiayweb/Hytale-F2P&type=date&legend=top-left)
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
## 📸 Screenshots
|
||||
|
||||
<div align="center">
|
||||
@@ -172,17 +167,17 @@
|
||||
### 🪟 Windows Prequisites
|
||||
* **Java JDK 25:**
|
||||
* [Oracle](https://www.oracle.com/java/technologies/downloads/#jdk25-windows)
|
||||
* or [Alt 1: Adoptium](https://adoptium.net/temurin/releases/?version=25)
|
||||
* or [Alt 2: Microsoft](https://learn.microsoft.com/en-us/java/openjdk/download).
|
||||
* [Adoptium](https://adoptium.net/temurin/releases/?version=25)
|
||||
* [Microsoft](https://learn.microsoft.com/en-us/java/openjdk/download), has Windows ARM64 support in version 25.
|
||||
* **Latest Visual Studio Redist:**
|
||||
* Download via [All-in-One by Techpowerup](https://www.techpowerup.com/download/visual-c-redistributable-runtime-package-all-in-one/)
|
||||
* Or [Microsoft Visual C++ Redistributable](https://aka.ms/vc14/vc_redist.x64.exe)
|
||||
* 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/)
|
||||
|
||||
### 🐧 Linux Prequisites
|
||||
|
||||
* 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.
|
||||
* [Not needed in update v2.2.0+] Install `libpng` package to avoid `SDL3_Image` error:
|
||||
* 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
|
||||
@@ -277,8 +272,8 @@ The `.zip` version is useful for users who prefer a portable installation or nee
|
||||
|
||||
1. Open your Singleplayer World
|
||||
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 UPnP`, it means you can use the Invite Codes for your friends.
|
||||
4. If your friends can't connect to your hosted Online-Play feature OR if it's showing `"Restricted (no UPnP)`, please follow the Tailscale/Playit.gg/Radmin tutorial in [SERVER.md](SERVER.md).
|
||||
3. Check the status `Connected via UPnP`.
|
||||
4. If your friends can't connect to your hosted Online-Play feature, please follow **Local Dedicated Server** tutorial.
|
||||
|
||||
## 🖧 Host a Dedicated Server
|
||||
|
||||
@@ -289,10 +284,10 @@ The `.zip` version is useful for users who prefer a portable installation or nee
|
||||
> Use services like Playit.gg, Tailscale, Radmin VPN to share UDP connection if setting up router as an admin is not possible.
|
||||
|
||||
> [!WARNING]
|
||||
> `HytaleServer.rar` file is needed to set up a server on non-playing hardware (such as VPS/server hosting). Additional: **Linux ARM64** is supported for server only, not client.
|
||||
> `Hytale-F2P-Server.rar` file is needed to set up a server on non-playing hardware (such as VPS/server hosting). Additional: **Linux ARM64** is supported for server only, not client.
|
||||
|
||||
> [!IMPORTANT]
|
||||
> See detailed information of setting up a server here: [SERVER.md](SERVER.md).
|
||||
> 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.
|
||||
|
||||
---
|
||||
|
||||
@@ -310,17 +305,7 @@ See [BUILD.md](docs/BUILD.md) for comprehensive build instructions.
|
||||
|
||||
## 📋 Changelog
|
||||
|
||||
### 🆕 v2.2.1
|
||||
- 👚 **Avatar Not Saving Bug Fix:** FINALLY, the long-awaited avatar saves is now working! 🙌 Show off your avatar skin in our Discord `#-media` text channel! 👀
|
||||
- 🚀 **HytaleClient Fails to Launch and Persists in Task Manager Bug Fix:** Major bug fix for all affected Windows users! No more ghost processes of `HytaleClient.exe` in Task Manager! And no more launch fail, that's hella one of an achievement 🔥 (If problem persists please create issue on Github 😢)
|
||||
- 🚦 **EPERM Bug Fix in 'Repair Game' Button:** Repair game will not produce Error Permission (EPERM) any more.
|
||||
- 🚨 **'Server Failed to Boot' Bug Fix:** Happy news for internet-limited countries (e.g. 🇷🇺 Russia, 🇹🇷 Turkey, 🇧🇷 Brazil, etc.)! The launcher now using proxy to access our patched JAR & check game version release status!🎉 Make sure you're already allow the `HytaleClient.exe` on Public & Private Windows Firewall 😉!
|
||||
- ⚡ **GPU Detection System Enhancements:** The detection system will now detect your GPU with `CimInstance` instead of `WmicObject`, which deprecated for most Windows 11 updates. Also, it's show how much your VRAM on each iGPU and dGPU! 🔍
|
||||
- ⚠️ **Failed to Deserialize Packets Bug Fix:** Shared `libzstd` library didn't get detected in Fedora/Bazzite/RHEL-based Linux Distros due to incorrect checking library order. 📑
|
||||
- 📟 **UUID Persistence Bug Fix:** Correlates to the avatar not saving bug, this fixes the persistence UUID when changing username. 🔖
|
||||
- 🌐 **Turkish Translation Fix:** 🇹🇷 Turkey players should feel at home now. 🏠
|
||||
|
||||
### 🔄 v2.2.0
|
||||
### 🆕 v2.2.0
|
||||
- 🔃 **Game Patches Auto-Update Improvement:** No need to install 1.5GB for every updates! Game updates now reduced to almost **~90%** (Hytale Game Update 3 to 4 only take ~150MB).
|
||||
- 🩹 **Improved Patch System Pre-Release JAR:** In previous version, only Release JAR could be patched. Now it also can be used for Pre-Release JAR!
|
||||
- 🔗 **Fix Mods Manager Issue:** Mods now can be downloaded seamlessly from the launcher, use Profiles to install your preferred mod. It will also automatically copy from selected `Profile/<profilename>` to the `Mods` folder.
|
||||
@@ -450,12 +435,23 @@ See [BUILD.md](docs/BUILD.md) for comprehensive build instructions.
|
||||
|
||||
---
|
||||
|
||||
## 📞 Contact Information
|
||||
## 📊 GitHub Stats
|
||||
|
||||
<div align="center">
|
||||
|
||||
**Questions? Ads? Collaboration? Endorsement? Other business-related?**
|
||||
Message the founders at https://discord.gg/Fhbb9Yk5WW
|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
</div>
|
||||
|
||||
|
||||
## 📞 Support
|
||||
|
||||
<div align="center">
|
||||
|
||||
**Need help?** Join us: https://discord.gg/gME8rUy3MB
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
131
SERVER.md
131
SERVER.md
@@ -2,20 +2,19 @@
|
||||
|
||||
Play with friends online! This guide covers both easy in-game hosting and advanced dedicated server setup.
|
||||
|
||||
### **DOWNLOAD SERVER FILES (JAR/RAR/SCRIPTS) HERE: https://discord.gg/Fhbb9Yk5WW**
|
||||
### **DOWNLOAD SERVER FILES (JAR/RAR/SCRIPTS) HERE: https://discord.gg/MEyWUxt77m**
|
||||
|
||||
**Table of Contents**
|
||||
|
||||
* [\[NEW!\] Play Online with Official Accounts 🆕](#new-play-online-with-official-accounts-)
|
||||
* ["Server" Term and Definition](#server-term-and-definiton)
|
||||
* [Server Directory Location](#server-directory-location)
|
||||
* [A. Host Your Singleplayer World](#a-host-your-singleplayer-world)
|
||||
* [1. Using Online-Play Feature In-Game Invite Code](#1-using-online-play-feature--in-game-invite-code)
|
||||
* [A. Online Play Feature](#a-online-play-feature)
|
||||
* [1. Host Your Singleplayer World using In-Game Invite Code](#1-host-your-singleplayer-world-using-in-game-invite-code)
|
||||
* [Common Issues (UPnP/NAT/STUN) on Online Play](#common-issues-upnpnatstun-on-online-play)
|
||||
* [2. Using Tailscale](#2-using-tailscale)
|
||||
* [3. Using Radmin VPN](#3-using-radmin-vpn)
|
||||
* [2. Host Your Singleplayer World using Tailscale](#2-host-your-singleplayer-world-using-tailscale)
|
||||
* [B. Local Dedicated Server](#b-local-dedicated-server)
|
||||
* [1. Using Playit.gg (Recommended) ✅](#1-using-playitgg-recommended-)
|
||||
* [2. Using Radmin VPN](#2-using-radmin-vpn)
|
||||
* [C. 24/7 Dedicated Server (Advanced)](#c-247-dedicated-server-advanced)
|
||||
* [Step 1: Get the Files Ready](#step-1-get-the-files-ready)
|
||||
* [Step 2: Place HytaleServer.jar in the Server directory](#step-2-place-hytaleserverjar-in-the-server-directory)
|
||||
@@ -33,69 +32,6 @@ Play with friends online! This guide covers both easy in-game hosting and advanc
|
||||
* [10. Getting Help](#10-getting-help)
|
||||
---
|
||||
|
||||
<div align='center'>
|
||||
<h3>
|
||||
<b>
|
||||
Do you want to create Hytale Game Server with EASY SETUP, AFFORDABLE PRICE, AND 24/7 SUPPORT?
|
||||
</b>
|
||||
</h3>
|
||||
<h2>
|
||||
<b>
|
||||
<a href="https://cloudnord.net/hytale-server-hosting">CLOUDNORD</a> is the ANSWER! HF2P Server is available!
|
||||
</b>
|
||||
</h2>
|
||||
|
||||
</div>
|
||||
|
||||
**CloudNord's Hytale, Minecraft, and Game Hosting** is at the core of our Server Hosting business. Join our Gaming community and experience our large choice of premium game servers, we’ve got you covered with super high-performance hardware, fantastic support options, and powerful server hosting to build and explore your worlds without limits!
|
||||
|
||||
**Order your Hytale, Minecraft, or other game servers today!**
|
||||
Choose Java Edition, Bedrock Edition, Cross-Play, or any of our additional supported games.
|
||||
Enjoy **20% OFF** all new game servers, **available now for a limited time!** Don’t miss out.
|
||||
|
||||
### **CloudNord key hosting features include:**
|
||||
- Instant Server Setup ⚡
|
||||
- High Performance Game Servers 🚀
|
||||
- Game DDoS Protection 🛡️
|
||||
- Intelligent Game Backups 🧠
|
||||
- Quick Modpack Installer 🔧
|
||||
- Quick Plugin & Mod Installer 🧰
|
||||
- Full File Access 🗃️
|
||||
- 24/7 Support 📞 🏪
|
||||
- Powerful Game Control Server Panel 💪
|
||||
|
||||
### **Check Us Out:**
|
||||
* 👉 CloudNord Website: https://cloudnord.net/hytalef2p
|
||||
* 👉 CloudNord Discord: https://discord.gg/TYxGrmUz4Y
|
||||
* 👉 CloudNord Reviews: https://www.trustpilot.com/review/cloudnord.net?page=2&stars=5
|
||||
|
||||
---
|
||||
|
||||
### [NEW!] Play Online with Official Accounts 🆕
|
||||
|
||||
**Documentations:**
|
||||
* [Hytale-Server-Docker by Sanasol](https://github.com/sanasol/hytale-server-docker/tree/main?tab=readme-ov-file#dual-authentication)
|
||||
|
||||
**Requirements:**
|
||||
* Using the patched HytaleServer.jar
|
||||
* Has Official Account with Purchased status on Official Hytale Website.
|
||||
* This official account holder can be the server hoster or one of the players.
|
||||
|
||||
**Steps:**
|
||||
1. Running the patched HytaleServer.jar with either [B. Local Dedicated Server](#b-local-dedicated-server) or [C. 24/7 Dedicated Server (Advanced)](#c-247-dedicated-server-advanced) successfully.
|
||||
2. On the server's console/terminal/CMD, server admin **MUST RUN THIS EACH BOOT** to allow players with Official Hytale game license to connect on the server:
|
||||
```
|
||||
/auth logout
|
||||
/auth persistence Encrypted
|
||||
/auth login device
|
||||
```
|
||||
3. Server console will show instructions, an URL and a code; these will be revoked after 10 minutes if not authorized.
|
||||
4. The server hoster can open the URL directly to browser by holding Ctrl then Click on it, or copy and send it to the player with official account.
|
||||
5. Once it authorized, the official accounts can join server with F2P players.
|
||||
6. If you want to modify anything, look at the [Hytale-Server-Docker](https://github.com/sanasol/hytale-server-docker/) above, give the repo a STAR too.
|
||||
|
||||
---
|
||||
|
||||
### "Server" Term and Definiton
|
||||
|
||||
"HytaleServer.jar", which called as "Server", functions as the place of authentication of the client that supposed to go to Hytale Official Authentication System but we managed our way to redirect it on our service (Thanks to Sanasol), handling approximately thousands of players worldwide to play this game for free.
|
||||
@@ -105,15 +41,14 @@ Kindly support us via [our Buy Me a Coffee link](https://buymeacoffee.com/hf2p)
|
||||
|
||||
### Server Directory Location
|
||||
|
||||
Here are the directory locations of Server folder if you have installed it on default instalation location:
|
||||
Here are the directory locations of Server folder if you have installed
|
||||
- **Windows:** `%localappdata%\HytaleF2P\release\package\game\latest\Server`
|
||||
- **macOS:** `~/Library/Application Support/HytaleF2P/release/package/game/latest/Server`
|
||||
- **Linux:** `~/.hytalef2p/release/package/game/latest/Server`
|
||||
|
||||
> [!NOTE]
|
||||
> This location only exists if the user installed the game using our launcher.
|
||||
> The `Server` folder needed to auth the HytaleClient to play Hytale in Singleplayer/Multiplayer for now.
|
||||
> (We planned to add offline mode in later version of our launcher).
|
||||
> This location only exists if the user installed the game using our launcher. The `Server` folder needed to auth the HytaleClient to play Hytale online
|
||||
> (for now; we planned to add offline mode in later version of our launcher).
|
||||
|
||||
> [!IMPORTANT]
|
||||
> Hosting a dedicated Hytale server will not need the exact similar tree. You can put it anywhere, as long as the directory has `Assets.zip` which
|
||||
@@ -129,7 +64,6 @@ Terms and conditions applies.
|
||||
## 1. Using Online-Play Feature / In-Game Invite Code
|
||||
|
||||
The easiest way to play with friends - no manual server setup required!
|
||||
|
||||
*The game automatically handles networking using UPnP/STUN/NAT traversal.*
|
||||
|
||||
**For Online Play to work, you need:**
|
||||
@@ -178,7 +112,6 @@ Warning: Your network configuration may prevent other players from connecting.
|
||||
</details>
|
||||
|
||||
<details><summary><b>b. "UPnP Failed" or "Port Mapping Failed" Warning</b></summary>
|
||||
|
||||
**Check your router:**
|
||||
1. Log into router admin panel (usually `192.168.1.1` or `192.168.0.1`)
|
||||
2. Find UPnP settings (often under "Advanced" or "NAT")
|
||||
@@ -190,8 +123,7 @@ Warning: Your network configuration may prevent other players from connecting.
|
||||
- See "Port Forwarding" or "Workarounds or NAT/CGNAT" sections below
|
||||
</details>
|
||||
|
||||
<details><summary><b>c. "Connected via STUN", "Strict NAT" or "Symmetric NAT" Warning</b></summary>
|
||||
|
||||
<details><summary><b>c. "Strict NAT" or "Symmetric NAT" Warning</b></summary>
|
||||
Some routers have restrictive NAT that blocks peer connections.
|
||||
|
||||
**Try:**
|
||||
@@ -201,7 +133,6 @@ Some routers have restrictive NAT that blocks peer connections.
|
||||
</details>
|
||||
|
||||
## 2. Using Tailscale
|
||||
|
||||
Tailscale creates mesh VPN service that streamlines connecting devices and services securely across different networks. And **works crossplatform!!**
|
||||
|
||||
1. All members are required to download [Tailscale](https://tailscale.com/download) on your device.
|
||||
@@ -217,17 +148,6 @@ Tailscale creates mesh VPN service that streamlines connecting devices and servi
|
||||
* Use the new share code to connect
|
||||
* To test your connection, ping the host's ipv4 mentioned in Tailscale
|
||||
|
||||
## 3. Using Radmin VPN
|
||||
|
||||
Creates a virtual LAN - all players need to install it:
|
||||
|
||||
1. Download [Radmin VPN](https://www.radmin-vpn.com/) - All players install it
|
||||
2. One person create a room/network, others join with network name/password
|
||||
3. Host joined the world, others will connect to it.
|
||||
4. Open Hytale Game > Servers > Add Servers > Direct Connect > Type IP Address of the Host from Radmin.
|
||||
|
||||
These options bypass all NAT/CGNAT issues. But for **Windows machines only!**
|
||||
|
||||
---
|
||||
|
||||
# B. Local Dedicated Server
|
||||
@@ -246,13 +166,12 @@ Free tunneling service - only the host needs to install it:
|
||||
* Linux:
|
||||
* Right-click file > Properties > Turn on 'Executable as a Program' | or `chmod +x playit-linux-amd64` on terminal
|
||||
* Run by double-clicking the file or `./playit-linux-amd64` via terminal
|
||||
5. Open the URL/link by `Ctrl+Click` it. If unable, select the URL, then Right-Click to Copy (`Ctrl+Shift+C` for Linux) then Paste the URL into your browser to link it with your created account.
|
||||
6. Once it done, download the `run_server_with_tokens (1)` script file (`.BAT` for Windows, `.SH` for Linux) from our Discord server > channel `#open-public-server`
|
||||
7. Put the script file to the `Server` folder in `HytaleF2P` directory (`%localappdata%\HytaleF2P\release\package\game\latest\Server`)
|
||||
8. Rename the script file to `run_server_with_tokens` to make it easier if you run it with Terminal, then do Method A or B.
|
||||
9. If you put it in `Server` folder in `HytaleF2P` launcher, change `ASSETS_PATH="${ASSETS_PATH:-./Assets.zip}"` inside the script to be `ASSETS_PATH="${ASSETS_PATH:-../Assets.zip}"`. NOTICE THE `./` and `../` DIFFERENCE.
|
||||
10. Copy the `Assets.zip` from the `%localappdata%\HytaleF2P\release\package\game\latest\` folder to the `Server\` folder. (TIP: You can use Symlink of that file to reduce disk usage!)
|
||||
11. Double-click the .BAT file to host your server, wait until it shows:
|
||||
5. Open the URL/link by `Ctrl+Click` it. If unable, select the URL, then Right-Click to Copy (`Ctrl+Shift+C` for Linux) then Paste the URL into your browser to link it with your created account.
|
||||
6. **WARNING: Do not close the terminal if you are still playing or hosting the server**
|
||||
7. Once it done, download the `run_server_with_tokens` script file (`.BAT` for Windows, `.SH` for Linux) from our Discord server > channel `#open-public-server`
|
||||
8. Put the script file to the `Server` folder in `HytaleF2P` directory (`%localappdata%\HytaleF2P\release\package\game\latest\Server`)
|
||||
9. Copy the `Assets.zip` from the `%localappdata%\HytaleF2P\release\package\game\latest\` folder to the `Server\` folder. (TIP: You can use Symlink of that file to reduce disk usage!)
|
||||
10. Double-click the .BAT file to host your server, wait until it shows:
|
||||
```
|
||||
===================================================
|
||||
Hytale Server Booted! [Multiplayer, Fresh Universe]
|
||||
@@ -261,12 +180,16 @@ Hytale Server Booted! [Multiplayer, Fresh Universe]
|
||||
11. Connect to the server by go to `Servers` in your game client, press `Add Server`, type `localhost` in the address box, use any name for your server.
|
||||
12. Send the public address in Step 3 to your friends.
|
||||
|
||||
> [!CAUTION]
|
||||
> Do not close the Playit.gg Terminal OR HytaleServer Terminal if you are still playing or hosting the server.
|
||||
## 2. Using Radmin VPN
|
||||
|
||||
## 2. Using Tailscale [DRAFT]
|
||||
Creates a virtual LAN - all players need to install it:
|
||||
|
||||
Tailscale
|
||||
1. Download [Radmin VPN](https://www.radmin-vpn.com/) - All players install it
|
||||
2. One person create a room/network, others join with network name/password
|
||||
3. Host joined the world, others will connect to it.
|
||||
4. Open Hytale Game > Servers > Add Servers > Direct Connect > Type IP Address of the Host from Radmin.
|
||||
|
||||
These options bypass all NAT/CGNAT issues. But for **Windows machines only!**
|
||||
|
||||
---
|
||||
|
||||
@@ -305,12 +228,12 @@ For 24/7 servers, custom configurations, or hosting on a VPS/dedicated machine.
|
||||
|
||||
**Windows:**
|
||||
```batch
|
||||
run_server_with_token.bat
|
||||
run_server.bat
|
||||
```
|
||||
|
||||
**macOS / Linux:**
|
||||
```bash
|
||||
./run_server_with_token.sh
|
||||
./run_server.sh
|
||||
```
|
||||
|
||||
---
|
||||
@@ -579,7 +502,3 @@ See [Docker documentation](https://github.com/Hybrowse/hytale-server-docker) for
|
||||
- [Hybrowse Docker Image](https://github.com/Hybrowse/hytale-server-docker)
|
||||
- Auth Server: sanasol.ws
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Hytale F2P Launcher - Troubleshooting Guide
|
||||
|
||||
This guide covers common issues and their solutions. If your issue isn't listed here, please check [existing issues](https://github.com/amiayweb/Hytale-F2P/issues) or join our [Discord](https://discord.gg/Fhbb9Yk5WW).
|
||||
This guide covers common issues and their solutions. If your issue isn't listed here, please check [existing issues](https://github.com/amiayweb/Hytale-F2P/issues) or join our [Discord](https://discord.gg/gME8rUy3MB).
|
||||
|
||||
---
|
||||
|
||||
@@ -437,7 +437,7 @@ Game sessions have a 10-hour TTL. This is by design for security.
|
||||
If your issue isn't resolved by this guide:
|
||||
|
||||
1. **Check existing issues:** [GitHub Issues](https://github.com/amiayweb/Hytale-F2P/issues)
|
||||
2. **Join Discord:** [discord.gg/Fhbb9Yk5WW](https://discord.gg/Fhbb9Yk5WW)
|
||||
2. **Join Discord:** [discord.gg/gME8rUy3MB](https://discord.gg/gME8rUy3MB)
|
||||
3. **Open a new issue** with:
|
||||
- Your operating system and version
|
||||
- Launcher version
|
||||
|
||||
@@ -4,10 +4,6 @@ const logger = require('./logger');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const os = require('os');
|
||||
const https = require('https');
|
||||
|
||||
const FORGEJO_API = 'https://git.sanhost.net/api/v1';
|
||||
const FORGEJO_REPO = 'sanasol/hytale-f2p';
|
||||
|
||||
class AppUpdater {
|
||||
constructor(mainWindow) {
|
||||
@@ -18,34 +14,6 @@ class AppUpdater {
|
||||
this.setupAutoUpdater();
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch the latest non-draft release tag from Forgejo and set the feed URL
|
||||
*/
|
||||
async _resolveUpdateUrl() {
|
||||
return new Promise((resolve, reject) => {
|
||||
https.get(`${FORGEJO_API}/repos/${FORGEJO_REPO}/releases?limit=5`, (res) => {
|
||||
let data = '';
|
||||
res.on('data', (chunk) => data += chunk);
|
||||
res.on('end', () => {
|
||||
try {
|
||||
const releases = JSON.parse(data);
|
||||
const latest = releases.find(r => !r.draft && !r.prerelease);
|
||||
if (latest) {
|
||||
const url = `https://git.sanhost.net/${FORGEJO_REPO}/releases/download/${latest.tag_name}`;
|
||||
console.log(`Auto-update URL resolved to: ${url}`);
|
||||
autoUpdater.setFeedURL({ provider: 'generic', url });
|
||||
resolve(url);
|
||||
} else {
|
||||
reject(new Error('No published release found'));
|
||||
}
|
||||
} catch (e) {
|
||||
reject(e);
|
||||
}
|
||||
});
|
||||
}).on('error', reject);
|
||||
});
|
||||
}
|
||||
|
||||
setupAutoUpdater() {
|
||||
|
||||
// Configure logger for electron-updater
|
||||
@@ -248,10 +216,8 @@ class AppUpdater {
|
||||
}
|
||||
|
||||
checkForUpdatesAndNotify() {
|
||||
// Resolve latest release URL then check for updates
|
||||
this._resolveUpdateUrl().catch(err => {
|
||||
console.warn('Failed to resolve update URL:', err.message);
|
||||
}).then(() => autoUpdater.checkForUpdatesAndNotify()).catch(err => {
|
||||
// Check for updates and notify if available
|
||||
autoUpdater.checkForUpdatesAndNotify().catch(err => {
|
||||
console.error('Failed to check for updates:', err);
|
||||
|
||||
// Network errors are not critical - just log and continue
|
||||
@@ -279,10 +245,8 @@ class AppUpdater {
|
||||
}
|
||||
|
||||
checkForUpdates() {
|
||||
// Manual check - resolve latest release URL first
|
||||
return this._resolveUpdateUrl().catch(err => {
|
||||
console.warn('Failed to resolve update URL:', err.message);
|
||||
}).then(() => autoUpdater.checkForUpdates()).catch(err => {
|
||||
// Manual check for updates (returns promise)
|
||||
return autoUpdater.checkForUpdates().catch(err => {
|
||||
console.error('Failed to check for updates:', err);
|
||||
|
||||
// Network errors are not critical - just return no update available
|
||||
|
||||
@@ -54,7 +54,6 @@ function getAppDir() {
|
||||
const CONFIG_FILE = path.join(getAppDir(), 'config.json');
|
||||
const CONFIG_BACKUP = path.join(getAppDir(), 'config.json.bak');
|
||||
const CONFIG_TEMP = path.join(getAppDir(), 'config.json.tmp');
|
||||
const UUID_STORE_FILE = path.join(getAppDir(), 'uuid-store.json');
|
||||
|
||||
// =============================================================================
|
||||
// CONFIG VALIDATION
|
||||
@@ -153,22 +152,6 @@ function saveConfig(update) {
|
||||
|
||||
// Load current config
|
||||
const currentConfig = loadConfig();
|
||||
|
||||
// SAFETY: If config file exists on disk but loadConfig() returned empty,
|
||||
// something is wrong (file locked, corrupted, etc.). Refuse to save
|
||||
// because merging with {} would wipe all existing data (userUuids, username, etc.)
|
||||
if (Object.keys(currentConfig).length === 0 && fs.existsSync(CONFIG_FILE)) {
|
||||
const fileSize = fs.statSync(CONFIG_FILE).size;
|
||||
if (fileSize > 2) { // More than just "{}"
|
||||
console.error(`[Config] REFUSING to save — loaded empty but file exists (${fileSize} bytes). Retrying load...`);
|
||||
// Wait and retry the load
|
||||
const delay = attempt * 200;
|
||||
const start = Date.now();
|
||||
while (Date.now() - start < delay) { /* busy wait */ }
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
const newConfig = { ...currentConfig, ...update };
|
||||
const data = JSON.stringify(newConfig, null, 2);
|
||||
|
||||
@@ -255,18 +238,11 @@ function saveUsername(username) {
|
||||
// Check if we're actually changing the username (case-insensitive comparison)
|
||||
const isRename = currentName && currentName.toLowerCase() !== newName.toLowerCase();
|
||||
|
||||
// Also update UUID store (source of truth)
|
||||
migrateUuidStoreIfNeeded();
|
||||
const uuidStore = loadUuidStore();
|
||||
|
||||
if (isRename) {
|
||||
// Find the UUID for the current username
|
||||
const currentKey = Object.keys(userUuids).find(
|
||||
k => k.toLowerCase() === currentName.toLowerCase()
|
||||
);
|
||||
const currentStoreKey = Object.keys(uuidStore).find(
|
||||
k => k.toLowerCase() === currentName.toLowerCase()
|
||||
);
|
||||
|
||||
if (currentKey && userUuids[currentKey]) {
|
||||
// Check if target username already exists (would be a different identity)
|
||||
@@ -282,9 +258,6 @@ function saveUsername(username) {
|
||||
const uuid = userUuids[currentKey];
|
||||
delete userUuids[currentKey];
|
||||
userUuids[newName] = uuid;
|
||||
// Same in UUID store
|
||||
if (currentStoreKey) delete uuidStore[currentStoreKey];
|
||||
uuidStore[newName] = uuid;
|
||||
console.log(`[Config] Renamed identity: "${currentKey}" → "${newName}" (UUID preserved: ${uuid})`);
|
||||
}
|
||||
}
|
||||
@@ -297,20 +270,11 @@ function saveUsername(username) {
|
||||
const uuid = userUuids[currentKey];
|
||||
delete userUuids[currentKey];
|
||||
userUuids[newName] = uuid;
|
||||
// Same in UUID store
|
||||
const storeKey = Object.keys(uuidStore).find(k => k.toLowerCase() === currentName.toLowerCase());
|
||||
if (storeKey) {
|
||||
delete uuidStore[storeKey];
|
||||
uuidStore[newName] = uuid;
|
||||
}
|
||||
console.log(`[Config] Updated username case: "${currentKey}" → "${newName}"`);
|
||||
}
|
||||
}
|
||||
|
||||
// Save UUID store
|
||||
saveUuidStore(uuidStore);
|
||||
|
||||
// Save both username and updated userUuids to config
|
||||
// Save both username and updated userUuids
|
||||
saveConfig({ username: newName, userUuids });
|
||||
console.log(`[Config] Username saved: "${newName}"`);
|
||||
return newName;
|
||||
@@ -346,7 +310,6 @@ function hasUsername() {
|
||||
|
||||
// =============================================================================
|
||||
// UUID MANAGEMENT - Persistent and safe
|
||||
// Uses separate uuid-store.json as source of truth (survives config.json corruption)
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
@@ -357,55 +320,10 @@ function normalizeUsername(username) {
|
||||
return username.trim().toLowerCase();
|
||||
}
|
||||
|
||||
/**
|
||||
* Load UUID store from separate file (independent of config.json)
|
||||
*/
|
||||
function loadUuidStore() {
|
||||
try {
|
||||
if (fs.existsSync(UUID_STORE_FILE)) {
|
||||
const data = fs.readFileSync(UUID_STORE_FILE, 'utf8');
|
||||
if (data.trim()) {
|
||||
return JSON.parse(data);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('[UUID Store] Failed to load:', err.message);
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
/**
|
||||
* Save UUID store to separate file (atomic write)
|
||||
*/
|
||||
function saveUuidStore(store) {
|
||||
try {
|
||||
const dir = path.dirname(UUID_STORE_FILE);
|
||||
if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
|
||||
const tmpFile = UUID_STORE_FILE + '.tmp';
|
||||
fs.writeFileSync(tmpFile, JSON.stringify(store, null, 2), 'utf8');
|
||||
fs.renameSync(tmpFile, UUID_STORE_FILE);
|
||||
} catch (err) {
|
||||
console.error('[UUID Store] Failed to save:', err.message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* One-time migration: copy userUuids from config.json to uuid-store.json
|
||||
*/
|
||||
function migrateUuidStoreIfNeeded() {
|
||||
if (fs.existsSync(UUID_STORE_FILE)) return; // Already migrated
|
||||
const config = loadConfig();
|
||||
if (config.userUuids && Object.keys(config.userUuids).length > 0) {
|
||||
console.log('[UUID Store] Migrating', Object.keys(config.userUuids).length, 'UUIDs from config.json');
|
||||
saveUuidStore(config.userUuids);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get UUID for a username
|
||||
* Source of truth: uuid-store.json (separate from config.json)
|
||||
* Also writes to config.json for backward compatibility
|
||||
* Creates new UUID only if user doesn't exist in EITHER store
|
||||
* Creates new UUID only if user explicitly doesn't exist
|
||||
* Uses case-insensitive lookup to prevent duplicates, but preserves original case for display
|
||||
*/
|
||||
function getUuidForUser(username) {
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
@@ -417,69 +335,32 @@ function getUuidForUser(username) {
|
||||
const displayName = username.trim();
|
||||
const normalizedLookup = displayName.toLowerCase();
|
||||
|
||||
// Ensure UUID store exists (one-time migration from config.json)
|
||||
migrateUuidStoreIfNeeded();
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
// 1. Check UUID store first (source of truth)
|
||||
const uuidStore = loadUuidStore();
|
||||
const storeKey = Object.keys(uuidStore).find(k => k.toLowerCase() === normalizedLookup);
|
||||
// Case-insensitive lookup - find existing key regardless of case
|
||||
const existingKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
|
||||
if (storeKey) {
|
||||
const existingUuid = uuidStore[storeKey];
|
||||
if (existingKey) {
|
||||
// Found existing - return UUID, update display name if case changed
|
||||
const existingUuid = userUuids[existingKey];
|
||||
|
||||
// Update case if needed
|
||||
if (storeKey !== displayName) {
|
||||
console.log(`[UUID Store] Updating username case: "${storeKey}" → "${displayName}"`);
|
||||
delete uuidStore[storeKey];
|
||||
uuidStore[displayName] = existingUuid;
|
||||
saveUuidStore(uuidStore);
|
||||
// If user typed different case, update the key to new case (preserving UUID)
|
||||
if (existingKey !== displayName) {
|
||||
console.log(`[Config] Updating username case: "${existingKey}" → "${displayName}"`);
|
||||
delete userUuids[existingKey];
|
||||
userUuids[displayName] = existingUuid;
|
||||
saveConfig({ userUuids });
|
||||
}
|
||||
|
||||
// Sync to config.json (backward compat, non-critical)
|
||||
try {
|
||||
const config = loadConfig();
|
||||
const configUuids = config.userUuids || {};
|
||||
const configKey = Object.keys(configUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (!configKey || configUuids[configKey] !== existingUuid) {
|
||||
if (configKey) delete configUuids[configKey];
|
||||
configUuids[displayName] = existingUuid;
|
||||
saveConfig({ userUuids: configUuids });
|
||||
}
|
||||
} catch (e) {
|
||||
// Non-critical — UUID store is the source of truth
|
||||
}
|
||||
|
||||
console.log(`[UUID] ${displayName} → ${existingUuid} (from uuid-store)`);
|
||||
return existingUuid;
|
||||
}
|
||||
|
||||
// 2. Fallback: check config.json (recovery if uuid-store.json was lost)
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
const configKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
|
||||
if (configKey) {
|
||||
const recoveredUuid = userUuids[configKey];
|
||||
console.warn(`[UUID] RECOVERED "${displayName}" → ${recoveredUuid} from config.json (uuid-store was missing)`);
|
||||
|
||||
// Save to UUID store
|
||||
uuidStore[displayName] = recoveredUuid;
|
||||
saveUuidStore(uuidStore);
|
||||
|
||||
return recoveredUuid;
|
||||
}
|
||||
|
||||
// 3. New user — generate UUID, save to BOTH stores
|
||||
// Create new UUID for new user - store with original case
|
||||
const newUuid = uuidv4();
|
||||
console.log(`[UUID] NEW user "${displayName}" → ${newUuid}`);
|
||||
|
||||
// Save to UUID store (source of truth)
|
||||
uuidStore[displayName] = newUuid;
|
||||
saveUuidStore(uuidStore);
|
||||
|
||||
// Save to config.json (backward compat)
|
||||
userUuids[displayName] = newUuid;
|
||||
saveConfig({ userUuids });
|
||||
console.log(`[Config] Created new UUID for "${displayName}": ${newUuid}`);
|
||||
|
||||
return newUuid;
|
||||
}
|
||||
@@ -499,26 +380,22 @@ function getCurrentUuid() {
|
||||
* Get all UUID mappings (raw object)
|
||||
*/
|
||||
function getAllUuidMappings() {
|
||||
migrateUuidStoreIfNeeded();
|
||||
const uuidStore = loadUuidStore();
|
||||
// Fallback to config if uuid-store is empty
|
||||
if (Object.keys(uuidStore).length === 0) {
|
||||
const config = loadConfig();
|
||||
return config.userUuids || {};
|
||||
}
|
||||
return uuidStore;
|
||||
const config = loadConfig();
|
||||
return config.userUuids || {};
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all UUID mappings as array with current user flag
|
||||
*/
|
||||
function getAllUuidMappingsArray() {
|
||||
const allMappings = getAllUuidMappings();
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
const currentUsername = loadUsername();
|
||||
// Case-insensitive comparison for isCurrent
|
||||
const normalizedCurrent = currentUsername ? currentUsername.toLowerCase() : null;
|
||||
|
||||
return Object.entries(allMappings).map(([username, uuid]) => ({
|
||||
username,
|
||||
return Object.entries(userUuids).map(([username, uuid]) => ({
|
||||
username, // Original case preserved
|
||||
uuid,
|
||||
isCurrent: username.toLowerCase() === normalizedCurrent
|
||||
}));
|
||||
@@ -542,20 +419,16 @@ function setUuidForUser(username, uuid) {
|
||||
|
||||
const displayName = username.trim();
|
||||
const normalizedLookup = displayName.toLowerCase();
|
||||
|
||||
// 1. Update UUID store (source of truth)
|
||||
migrateUuidStoreIfNeeded();
|
||||
const uuidStore = loadUuidStore();
|
||||
const storeKey = Object.keys(uuidStore).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (storeKey) delete uuidStore[storeKey];
|
||||
uuidStore[displayName] = uuid;
|
||||
saveUuidStore(uuidStore);
|
||||
|
||||
// 2. Update config.json (backward compat)
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
// Remove any existing entry with same name (case-insensitive)
|
||||
const existingKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (existingKey) delete userUuids[existingKey];
|
||||
if (existingKey) {
|
||||
delete userUuids[existingKey];
|
||||
}
|
||||
|
||||
// Store with original case
|
||||
userUuids[displayName] = uuid;
|
||||
saveConfig({ userUuids });
|
||||
|
||||
@@ -581,30 +454,20 @@ function deleteUuidForUser(username) {
|
||||
}
|
||||
|
||||
const normalizedLookup = username.trim().toLowerCase();
|
||||
let deleted = false;
|
||||
|
||||
// 1. Delete from UUID store (source of truth)
|
||||
migrateUuidStoreIfNeeded();
|
||||
const uuidStore = loadUuidStore();
|
||||
const storeKey = Object.keys(uuidStore).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (storeKey) {
|
||||
delete uuidStore[storeKey];
|
||||
saveUuidStore(uuidStore);
|
||||
deleted = true;
|
||||
}
|
||||
|
||||
// 2. Delete from config.json (backward compat)
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
// Case-insensitive lookup
|
||||
const existingKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
|
||||
if (existingKey) {
|
||||
delete userUuids[existingKey];
|
||||
saveConfig({ userUuids });
|
||||
deleted = true;
|
||||
console.log(`[Config] UUID deleted for "${username}"`);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (deleted) console.log(`[Config] UUID deleted for "${username}"`);
|
||||
return deleted;
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -925,6 +788,5 @@ module.exports = {
|
||||
loadVersionBranch,
|
||||
|
||||
// Constants
|
||||
CONFIG_FILE,
|
||||
UUID_STORE_FILE
|
||||
CONFIG_FILE
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
const FORCE_CLEAN_INSTALL_VERSION = false;
|
||||
const CLEAN_INSTALL_TEST_VERSION = 'v4';
|
||||
const CLEAN_INSTALL_TEST_VERSION = '4.pwr';
|
||||
|
||||
module.exports = {
|
||||
FORCE_CLEAN_INSTALL_VERSION,
|
||||
|
||||
@@ -3,7 +3,7 @@ const path = require('path');
|
||||
const { execFile } = require('child_process');
|
||||
const { downloadFile, retryDownload } = require('../utils/fileManager');
|
||||
const { getOS, getArch } = require('../utils/platformUtils');
|
||||
const { validateChecksum, extractVersionDetails, getInstalledClientVersion, getUpdatePlan, extractVersionNumber, getAllMirrorUrls, getPatchesBaseUrl } = require('../services/versionManager');
|
||||
const { validateChecksum, extractVersionDetails, canUseDifferentialUpdate, needsIntermediatePatches, getInstalledClientVersion } = require('../services/versionManager');
|
||||
const { installButler } = require('./butlerManager');
|
||||
const { GAME_DIR, CACHE_DIR, TOOLS_DIR } = require('../core/paths');
|
||||
const { saveVersionClient } = require('../core/config');
|
||||
@@ -30,63 +30,16 @@ async function acquireGameArchive(downloadUrl, targetPath, checksum, progressCal
|
||||
}
|
||||
|
||||
console.log(`Downloading game archive from: ${downloadUrl}`);
|
||||
|
||||
// Try primary URL first, then mirror URLs on timeout/connection failure
|
||||
const mirrors = await getAllMirrorUrls();
|
||||
const primaryBase = await getPatchesBaseUrl();
|
||||
const urlsToTry = [downloadUrl];
|
||||
|
||||
// Build mirror URLs by replacing the base URL
|
||||
for (const mirror of mirrors) {
|
||||
if (mirror !== primaryBase && downloadUrl.startsWith(primaryBase)) {
|
||||
const mirrorUrl = downloadUrl.replace(primaryBase, mirror);
|
||||
if (!urlsToTry.includes(mirrorUrl)) {
|
||||
urlsToTry.push(mirrorUrl);
|
||||
}
|
||||
|
||||
try {
|
||||
if (allowRetry) {
|
||||
await retryDownload(downloadUrl, targetPath, progressCallback);
|
||||
} else {
|
||||
await downloadFile(downloadUrl, targetPath, progressCallback);
|
||||
}
|
||||
}
|
||||
|
||||
let lastError;
|
||||
for (let i = 0; i < urlsToTry.length; i++) {
|
||||
const url = urlsToTry[i];
|
||||
try {
|
||||
if (i > 0) {
|
||||
console.log(`[Download] Trying mirror ${i}: ${url}`);
|
||||
if (progressCallback) {
|
||||
progressCallback(`Trying alternative mirror (${i}/${urlsToTry.length - 1})...`, 0, null, null, null);
|
||||
}
|
||||
// Clean up partial download from previous attempt
|
||||
if (fs.existsSync(targetPath)) {
|
||||
try { fs.unlinkSync(targetPath); } catch (e) {}
|
||||
}
|
||||
}
|
||||
if (allowRetry) {
|
||||
await retryDownload(url, targetPath, progressCallback);
|
||||
} else {
|
||||
await downloadFile(url, targetPath, progressCallback);
|
||||
}
|
||||
lastError = null;
|
||||
break; // Success
|
||||
} catch (error) {
|
||||
lastError = error;
|
||||
const isConnectionError = error.message && (
|
||||
error.message.includes('ETIMEDOUT') ||
|
||||
error.message.includes('ECONNREFUSED') ||
|
||||
error.message.includes('ECONNABORTED') ||
|
||||
error.message.includes('timeout')
|
||||
);
|
||||
if (isConnectionError && i < urlsToTry.length - 1) {
|
||||
console.warn(`[Download] Connection failed (${error.message}), will try mirror...`);
|
||||
continue;
|
||||
}
|
||||
// Non-connection error or last mirror — throw
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (lastError) {
|
||||
const enhancedError = new Error(`Archive download failed: ${lastError.message}`);
|
||||
enhancedError.originalError = lastError;
|
||||
} catch (error) {
|
||||
const enhancedError = new Error(`Archive download failed: ${error.message}`);
|
||||
enhancedError.originalError = error;
|
||||
enhancedError.downloadUrl = downloadUrl;
|
||||
enhancedError.targetPath = targetPath;
|
||||
throw enhancedError;
|
||||
@@ -150,13 +103,13 @@ async function deployGameArchive(archivePath, destinationDir, toolsDir, progress
|
||||
if (error) {
|
||||
const cleanStderr = stderr.replace(/[\u2714\u2716\u2713\u2717\u26A0\uD83D[\uDC00-\uDFFF]]/g, '').trim();
|
||||
const cleanStdout = stdout.replace(/[\u2714\u2716\u2713\u2717\u26A0\uD83D[\uDC00-\uDFFF]]/g, '').trim();
|
||||
|
||||
|
||||
if (cleanStderr) console.error('Deployment stderr:', cleanStderr);
|
||||
if (cleanStdout) console.error('Deployment stdout:', cleanStdout);
|
||||
|
||||
|
||||
const errorText = (stderr + ' ' + error.message).toLowerCase();
|
||||
let message = 'Game deployment failed';
|
||||
|
||||
|
||||
if (errorText.includes('unexpected eof')) {
|
||||
message = 'Corrupted archive detected. Please retry download.';
|
||||
if (fs.existsSync(archivePath)) {
|
||||
@@ -203,20 +156,20 @@ async function performIntelligentUpdate(targetVersion, branch = 'release', progr
|
||||
console.log(`Initiating intelligent update to version ${targetVersion}`);
|
||||
|
||||
const currentVersion = getInstalledClientVersion();
|
||||
const currentBuild = extractVersionNumber(currentVersion) || 0;
|
||||
const targetBuild = extractVersionNumber(targetVersion);
|
||||
console.log(`Current build: ${currentBuild}, Target build: ${targetBuild}, Branch: ${branch}`);
|
||||
console.log(`Current version: ${currentVersion || 'none (clean install)'}`);
|
||||
console.log(`Target version: ${targetVersion}`);
|
||||
console.log(`Branch: ${branch}`);
|
||||
|
||||
// For non-release branches, always do full install
|
||||
if (branch !== 'release') {
|
||||
console.log('Pre-release branch detected - forcing full archive download');
|
||||
console.log(`Pre-release branch detected - forcing full archive download`);
|
||||
const versionDetails = await extractVersionDetails(targetVersion, branch);
|
||||
const archivePath = path.join(cacheDir, `${branch}_0_to_${targetBuild}.pwr`);
|
||||
|
||||
const archiveName = path.basename(versionDetails.fullUrl);
|
||||
const archivePath = path.join(cacheDir, `${branch}_${archiveName}`);
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback('Downloading full game archive (pre-release)...', 0, null, null, null);
|
||||
}
|
||||
|
||||
|
||||
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
||||
saveVersionClient(targetVersion);
|
||||
@@ -224,16 +177,16 @@ async function performIntelligentUpdate(targetVersion, branch = 'release', progr
|
||||
return;
|
||||
}
|
||||
|
||||
// Clean install (no current version)
|
||||
if (currentBuild === 0) {
|
||||
if (!currentVersion) {
|
||||
console.log('No existing installation detected - downloading full archive');
|
||||
const versionDetails = await extractVersionDetails(targetVersion, branch);
|
||||
const archivePath = path.join(cacheDir, `${branch}_0_to_${targetBuild}.pwr`);
|
||||
|
||||
const archiveName = path.basename(versionDetails.fullUrl);
|
||||
const archivePath = path.join(cacheDir, `${branch}_${archiveName}`);
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback(`Downloading full game archive (first install - v${targetBuild})...`, 0, null, null, null);
|
||||
progressCallback(`Downloading full game archive (first install - v${targetVersion})...`, 0, null, null, null);
|
||||
}
|
||||
|
||||
|
||||
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
||||
saveVersionClient(targetVersion);
|
||||
@@ -241,67 +194,59 @@ async function performIntelligentUpdate(targetVersion, branch = 'release', progr
|
||||
return;
|
||||
}
|
||||
|
||||
// Already at target
|
||||
if (currentBuild >= targetBuild) {
|
||||
console.log('Already at target version or newer');
|
||||
const patchesToApply = needsIntermediatePatches(currentVersion, targetVersion);
|
||||
|
||||
if (patchesToApply.length === 0) {
|
||||
console.log('Already at target version or invalid version sequence');
|
||||
return;
|
||||
}
|
||||
|
||||
// Use mirror's update plan for optimal patch routing
|
||||
try {
|
||||
const plan = await getUpdatePlan(currentBuild, targetBuild, branch);
|
||||
|
||||
console.log(`Applying ${plan.steps.length} patch(es): ${plan.steps.map(s => `${s.from}\u2192${s.to}`).join(' + ')}`);
|
||||
|
||||
for (let i = 0; i < plan.steps.length; i++) {
|
||||
const step = plan.steps[i];
|
||||
const stepName = `${step.from}_to_${step.to}`;
|
||||
const archivePath = path.join(cacheDir, `${branch}_${stepName}.pwr`);
|
||||
const isDifferential = step.from !== 0;
|
||||
console.log(`Applying ${patchesToApply.length} differential patch(es): ${patchesToApply.join(' -> ')}`);
|
||||
|
||||
for (let i = 0; i < patchesToApply.length; i++) {
|
||||
const patchVersion = patchesToApply[i];
|
||||
const versionDetails = await extractVersionDetails(patchVersion, branch);
|
||||
|
||||
const canDifferential = canUseDifferentialUpdate(getInstalledClientVersion(), versionDetails);
|
||||
|
||||
if (!canDifferential || !versionDetails.differentialUrl) {
|
||||
console.log(`WARNING: Differential patch not available for ${patchVersion}, using full archive`);
|
||||
const archiveName = path.basename(versionDetails.fullUrl);
|
||||
const archivePath = path.join(cacheDir, `${branch}_${archiveName}`);
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback(`Downloading patch ${i + 1}/${plan.steps.length}: ${stepName}...`, 0, null, null, null);
|
||||
progressCallback(`Downloading full archive for ${patchVersion} (${i + 1}/${patchesToApply.length})...`, 0, null, null, null);
|
||||
}
|
||||
|
||||
await acquireGameArchive(step.url, archivePath, null, progressCallback);
|
||||
|
||||
|
||||
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
||||
} else {
|
||||
console.log(`Applying differential patch: ${versionDetails.sourceVersion} -> ${patchVersion}`);
|
||||
const archiveName = path.basename(versionDetails.differentialUrl);
|
||||
const archivePath = path.join(cacheDir, `${branch}_patch_${archiveName}`);
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback(`Applying patch ${i + 1}/${plan.steps.length}: ${stepName}...`, 50, null, null, null);
|
||||
progressCallback(`Applying patch ${i + 1}/${patchesToApply.length}: ${patchVersion}...`, 0, null, null, null);
|
||||
}
|
||||
|
||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, isDifferential);
|
||||
|
||||
// Clean up patch file
|
||||
|
||||
await acquireGameArchive(versionDetails.differentialUrl, archivePath, versionDetails.checksum, progressCallback);
|
||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, true);
|
||||
|
||||
if (fs.existsSync(archivePath)) {
|
||||
try {
|
||||
fs.unlinkSync(archivePath);
|
||||
console.log(`Cleaned up: ${stepName}.pwr`);
|
||||
console.log(`Cleaned up patch file: ${archiveName}`);
|
||||
} catch (cleanupErr) {
|
||||
console.warn(`Failed to cleanup: ${cleanupErr.message}`);
|
||||
console.warn(`Failed to cleanup patch file: ${cleanupErr.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
saveVersionClient(`v${step.to}`);
|
||||
console.log(`Patch ${stepName} applied (${i + 1}/${plan.steps.length})`);
|
||||
}
|
||||
|
||||
console.log(`Update completed. Version ${targetVersion} is now installed.`);
|
||||
} catch (planError) {
|
||||
console.error('Update plan failed:', planError.message);
|
||||
console.log('Falling back to full archive download');
|
||||
|
||||
// Fallback: full install
|
||||
const versionDetails = await extractVersionDetails(targetVersion, branch);
|
||||
const archivePath = path.join(cacheDir, `${branch}_0_to_${targetBuild}.pwr`);
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback(`Downloading full game archive (fallback)...`, 0, null, null, null);
|
||||
}
|
||||
|
||||
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
||||
saveVersionClient(targetVersion);
|
||||
|
||||
saveVersionClient(patchVersion);
|
||||
console.log(`Patch ${patchVersion} applied successfully (${i + 1}/${patchesToApply.length})`);
|
||||
}
|
||||
|
||||
console.log(`Update completed successfully. Version ${targetVersion} is now installed.`);
|
||||
}
|
||||
|
||||
async function ensureGameInstalled(targetVersion, branch = 'release', progressCallback, gameDir = GAME_DIR, cacheDir = CACHE_DIR, toolsDir = TOOLS_DIR) {
|
||||
|
||||
@@ -61,39 +61,12 @@ async function fetchAuthTokens(uuid, name) {
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
const identityToken = data.IdentityToken || data.identityToken;
|
||||
const sessionToken = data.SessionToken || data.sessionToken;
|
||||
|
||||
// Verify the identity token has the correct username
|
||||
// This catches cases where the auth server defaults to "Player"
|
||||
try {
|
||||
const parts = identityToken.split('.');
|
||||
if (parts.length >= 2) {
|
||||
const payload = JSON.parse(Buffer.from(parts[1], 'base64url').toString());
|
||||
if (payload.username && payload.username !== name && name !== 'Player') {
|
||||
console.warn(`[Auth] Token username mismatch: token has "${payload.username}", expected "${name}". Retrying...`);
|
||||
// Retry once with explicit name
|
||||
const retryResponse = await fetch(`${authServerUrl}/game-session/child`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ uuid: uuid, name: name, scopes: ['hytale:server', 'hytale:client'] })
|
||||
});
|
||||
if (retryResponse.ok) {
|
||||
const retryData = await retryResponse.json();
|
||||
console.log('[Auth] Retry successful');
|
||||
return {
|
||||
identityToken: retryData.IdentityToken || retryData.identityToken,
|
||||
sessionToken: retryData.SessionToken || retryData.sessionToken
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (verifyErr) {
|
||||
console.warn('[Auth] Token verification skipped:', verifyErr.message);
|
||||
}
|
||||
|
||||
console.log('Auth tokens received from server');
|
||||
return { identityToken, sessionToken };
|
||||
|
||||
return {
|
||||
identityToken: data.IdentityToken || data.identityToken,
|
||||
sessionToken: data.SessionToken || data.sessionToken
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch auth tokens:', error.message);
|
||||
// Fallback to local generation if server unavailable
|
||||
@@ -144,20 +117,6 @@ function generateLocalTokens(uuid, name) {
|
||||
}
|
||||
|
||||
async function launchGame(playerNameOverride = null, progressCallback, javaPathOverride, installPathOverride, gpuPreference = 'auto', branchOverride = null) {
|
||||
// ==========================================================================
|
||||
// CACHE INVALIDATION: Clear proxyClient module cache to force fresh .env load
|
||||
// This prevents stale cached values from affecting multiple launch attempts
|
||||
// ==========================================================================
|
||||
try {
|
||||
const proxyClientPath = require.resolve('../utils/proxyClient');
|
||||
if (require.cache[proxyClientPath]) {
|
||||
delete require.cache[proxyClientPath];
|
||||
console.log('[Launcher] Cleared proxyClient cache for fresh .env load');
|
||||
}
|
||||
} catch (cacheErr) {
|
||||
console.warn('[Launcher] Could not clear proxyClient cache:', cacheErr.message);
|
||||
}
|
||||
|
||||
// ==========================================================================
|
||||
// STEP 1: Validate player identity FIRST (before any other operations)
|
||||
// ==========================================================================
|
||||
@@ -250,7 +209,6 @@ async function launchGame(playerNameOverride = null, progressCallback, javaPathO
|
||||
}
|
||||
|
||||
const uuid = getUuidForUser(playerName);
|
||||
console.log(`[Launcher] UUID for "${playerName}": ${uuid} (verify this stays constant across launches)`);
|
||||
|
||||
// Fetch tokens from auth server
|
||||
if (progressCallback) {
|
||||
@@ -280,8 +238,8 @@ async function launchGame(playerNameOverride = null, progressCallback, javaPathO
|
||||
if (patchResult.client) {
|
||||
console.log(` Client: ${patchResult.client.patchCount || 0} occurrences`);
|
||||
}
|
||||
if (patchResult.agent) {
|
||||
console.log(` Agent: ${patchResult.agent.alreadyExists ? 'already present' : patchResult.agent.success ? 'downloaded' : 'failed'}`);
|
||||
if (patchResult.server) {
|
||||
console.log(` Server: ${patchResult.server.patchCount || 0} occurrences`);
|
||||
}
|
||||
} else {
|
||||
console.warn('Game patching failed:', patchResult.error);
|
||||
@@ -381,12 +339,14 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
||||
console.log('Starting game...');
|
||||
console.log(`Command: "${clientPath}" ${args.join(' ')}`);
|
||||
|
||||
const env = { ...process.env };
|
||||
const env = { ...process.env };
|
||||
|
||||
const waylandEnv = setupWaylandEnvironment();
|
||||
Object.assign(env, waylandEnv);
|
||||
|
||||
const gpuEnv = setupGpuEnvironment(gpuPreference);
|
||||
Object.assign(env, gpuEnv);
|
||||
|
||||
const waylandEnv = setupWaylandEnvironment();
|
||||
Object.assign(env, waylandEnv);
|
||||
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') {
|
||||
@@ -396,9 +356,9 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
||||
|
||||
// Common system libzstd paths
|
||||
const systemLibzstdPaths = [
|
||||
'/usr/lib64/libzstd.so.1', // Fedora/RHEL
|
||||
'/usr/lib/libzstd.so.1', // Arch Linux, Steam Deck
|
||||
'/usr/lib/x86_64-linux-gnu/libzstd.so.1' // Debian/Ubuntu
|
||||
'/usr/lib/x86_64-linux-gnu/libzstd.so.1', // Debian/Ubuntu
|
||||
'/usr/lib64/libzstd.so.1' // Fedora/RHEL
|
||||
];
|
||||
|
||||
let systemLibzstd = null;
|
||||
@@ -436,17 +396,6 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
||||
}
|
||||
}
|
||||
|
||||
// DualAuth Agent: Set JAVA_TOOL_OPTIONS so java picks up -javaagent: flag
|
||||
// This enables runtime auth patching without modifying the server JAR
|
||||
const agentJar = path.join(gameLatest, 'Server', 'dualauth-agent.jar');
|
||||
if (fs.existsSync(agentJar)) {
|
||||
const agentFlag = `-javaagent:"${agentJar}"`;
|
||||
env.JAVA_TOOL_OPTIONS = env.JAVA_TOOL_OPTIONS
|
||||
? `${env.JAVA_TOOL_OPTIONS} ${agentFlag}`
|
||||
: agentFlag;
|
||||
console.log('DualAuth Agent: enabled via JAVA_TOOL_OPTIONS');
|
||||
}
|
||||
|
||||
try {
|
||||
let spawnOptions = {
|
||||
stdio: ['ignore', 'pipe', 'pipe'],
|
||||
@@ -461,35 +410,23 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
||||
|
||||
const child = spawn(clientPath, args, spawnOptions);
|
||||
|
||||
// Release process reference immediately so it's truly independent
|
||||
// This works on all platforms (Windows, macOS, Linux)
|
||||
child.unref();
|
||||
|
||||
console.log(`Game process started with PID: ${child.pid}`);
|
||||
|
||||
let hasExited = false;
|
||||
let outputReceived = false;
|
||||
let launchCheckTimeout;
|
||||
|
||||
if (child.stdout) {
|
||||
child.stdout.on('data', (data) => {
|
||||
outputReceived = true;
|
||||
const msg = data.toString().trim();
|
||||
console.log(`Game output: ${msg}`);
|
||||
});
|
||||
}
|
||||
child.stdout.on('data', (data) => {
|
||||
outputReceived = true;
|
||||
console.log(`Game output: ${data.toString().trim()}`);
|
||||
});
|
||||
|
||||
if (child.stderr) {
|
||||
child.stderr.on('data', (data) => {
|
||||
outputReceived = true;
|
||||
const msg = data.toString().trim();
|
||||
console.error(`Game error: ${msg}`);
|
||||
});
|
||||
}
|
||||
child.stderr.on('data', (data) => {
|
||||
outputReceived = true;
|
||||
console.error(`Game error: ${data.toString().trim()}`);
|
||||
});
|
||||
|
||||
child.on('error', (error) => {
|
||||
hasExited = true;
|
||||
clearTimeout(launchCheckTimeout);
|
||||
console.error(`Failed to start game process: ${error.message}`);
|
||||
if (progressCallback) {
|
||||
progressCallback(`Failed to start game: ${error.message}`, -1, null, null, null);
|
||||
@@ -498,30 +435,30 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
||||
|
||||
child.on('exit', (code, signal) => {
|
||||
hasExited = true;
|
||||
clearTimeout(launchCheckTimeout);
|
||||
|
||||
if (code !== null) {
|
||||
console.log(`Game process exited with code ${code}`);
|
||||
if (code !== 0) {
|
||||
console.error(`[Launcher] Game crashed or exited with error code ${code}`);
|
||||
if (progressCallback) {
|
||||
progressCallback(`Game exited with error code ${code}`, -1, null, null, null);
|
||||
}
|
||||
if (code !== 0 && progressCallback) {
|
||||
progressCallback(`Game exited with error code ${code}`, -1, null, null, null);
|
||||
}
|
||||
} else if (signal) {
|
||||
console.log(`Game process terminated by signal ${signal}`);
|
||||
}
|
||||
});
|
||||
|
||||
// Process is detached and unref'd - it runs independently from the launcher
|
||||
// We cannot reliably detect if the game window actually appears from here,
|
||||
// so we report success after spawning. stdout/stderr logging above provides debugging info.
|
||||
console.log('Game process spawned and detached successfully');
|
||||
if (progressCallback) {
|
||||
progressCallback('Game launched successfully', 100, null, null, null);
|
||||
}
|
||||
// Monitor game process status in background
|
||||
setTimeout(() => {
|
||||
if (!hasExited) {
|
||||
console.log('Game appears to be running successfully');
|
||||
child.unref();
|
||||
if (progressCallback) {
|
||||
progressCallback('Game launched successfully', 100, null, null, null);
|
||||
}
|
||||
} else if (!outputReceived) {
|
||||
console.warn('Game process exited immediately with no output - possible issue with game files or dependencies');
|
||||
}
|
||||
}, 3000);
|
||||
|
||||
// Return immediately after spawn
|
||||
// Return immediately, don't wait for setTimeout
|
||||
return { success: true, installed: true, launched: true, pid: child.pid };
|
||||
} catch (spawnError) {
|
||||
console.error(`Error spawning game process: ${spawnError.message}`);
|
||||
|
||||
@@ -1,70 +1,18 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const { execFile, exec } = require('child_process');
|
||||
const { promisify } = require('util');
|
||||
const { execFile } = require('child_process');
|
||||
const { getResolvedAppDir, findClientPath, findUserDataPath, findUserDataRecursive, GAME_DIR, CACHE_DIR, TOOLS_DIR } = require('../core/paths');
|
||||
const { getOS, getArch } = require('../utils/platformUtils');
|
||||
const { downloadFile, retryDownload, retryStalledDownload, MAX_AUTOMATIC_STALL_RETRIES } = require('../utils/fileManager');
|
||||
const { getLatestClientVersion, getInstalledClientVersion, getUpdatePlan, extractVersionNumber } = require('../services/versionManager');
|
||||
const { getLatestClientVersion, getInstalledClientVersion } = require('../services/versionManager');
|
||||
const { FORCE_CLEAN_INSTALL_VERSION, CLEAN_INSTALL_TEST_VERSION } = require('../core/testConfig');
|
||||
const { installButler } = require('./butlerManager');
|
||||
const { downloadAndReplaceHomePageUI, downloadAndReplaceLogo } = require('./uiFileManager');
|
||||
const { saveUsername, saveInstallPath, loadJavaPath, CONFIG_FILE, loadConfig, loadVersionBranch, saveVersionClient, loadVersionClient } = require('../core/config');
|
||||
const { resolveJavaPath, detectSystemJava, downloadJRE, getJavaExec, getBundledJavaPath } = require('./javaManager');
|
||||
const { getUserDataPath, migrateUserDataToCentralized } = require('../utils/userDataMigration');
|
||||
const userDataBackup = require('../utils/userDataBackup');
|
||||
|
||||
const execAsync = promisify(exec);
|
||||
|
||||
// Helper function to check if game processes are running
|
||||
async function isGameRunning() {
|
||||
try {
|
||||
let command;
|
||||
if (process.platform === 'win32') {
|
||||
// On Windows, check for HytaleClient.exe processes
|
||||
command = 'tasklist /FI "IMAGENAME eq HytaleClient.exe" /NH';
|
||||
} else if (process.platform === 'darwin') {
|
||||
// On macOS, check for HytaleClient processes
|
||||
command = 'pgrep -f HytaleClient';
|
||||
} else {
|
||||
// On Linux, check for HytaleClient processes
|
||||
command = 'pgrep -f HytaleClient';
|
||||
}
|
||||
|
||||
const { stdout } = await execAsync(command);
|
||||
return stdout.trim().length > 0;
|
||||
} catch (error) {
|
||||
// If command fails, assume no processes are running
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Helper function to safely remove directory with retry logic
|
||||
async function safeRemoveDirectory(dirPath, maxRetries = 3) {
|
||||
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
||||
try {
|
||||
if (fs.existsSync(dirPath)) {
|
||||
fs.rmSync(dirPath, { recursive: true, force: true });
|
||||
console.log(`Successfully removed directory: ${dirPath}`);
|
||||
}
|
||||
return; // Success, exit the loop
|
||||
} catch (error) {
|
||||
console.warn(`Attempt ${attempt}/${maxRetries} failed to remove ${dirPath}: ${error.message}`);
|
||||
|
||||
if (attempt < maxRetries) {
|
||||
// Wait before retrying (exponential backoff)
|
||||
const delay = Math.min(1000 * Math.pow(2, attempt - 1), 5000);
|
||||
console.log(`Waiting ${delay}ms before retry...`);
|
||||
await new Promise(resolve => setTimeout(resolve, delay));
|
||||
} else {
|
||||
// Last attempt failed, throw the error
|
||||
throw new Error(`Failed to remove directory ${dirPath} after ${maxRetries} attempts: ${error.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function downloadPWR(branch = 'release', fileName = 'v8', progressCallback, cacheDir = CACHE_DIR, manualRetry = false, directUrl = null, expectedSize = null) {
|
||||
async function downloadPWR(branch = 'release', fileName = '7.pwr', progressCallback, cacheDir = CACHE_DIR, manualRetry = false) {
|
||||
const osName = getOS();
|
||||
const arch = getArch();
|
||||
|
||||
@@ -72,69 +20,28 @@ async function downloadPWR(branch = 'release', fileName = 'v8', progressCallback
|
||||
throw new Error('Hytale x86_64 Intel Mac Support has not been released yet. Please check back later.');
|
||||
}
|
||||
|
||||
let url;
|
||||
|
||||
if (directUrl) {
|
||||
url = directUrl;
|
||||
console.log(`[DownloadPWR] Using direct URL: ${url}`);
|
||||
} else {
|
||||
const { getPWRUrl } = require('../services/versionManager');
|
||||
try {
|
||||
console.log(`[DownloadPWR] Fetching mirror URL for branch: ${branch}, version: ${fileName}`);
|
||||
url = await getPWRUrl(branch, fileName);
|
||||
console.log(`[DownloadPWR] Mirror URL: ${url}`);
|
||||
} catch (error) {
|
||||
console.error(`[DownloadPWR] Failed to get mirror URL: ${error.message}`);
|
||||
const { getPatchesBaseUrl } = require('../services/versionManager');
|
||||
const baseUrl = await getPatchesBaseUrl();
|
||||
url = `${baseUrl}/${osName}/${arch}/${branch}/0_to_${extractVersionNumber(fileName)}.pwr`;
|
||||
console.log(`[DownloadPWR] Fallback URL: ${url}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Look up expected file size from manifest if not provided
|
||||
if (!expectedSize) {
|
||||
try {
|
||||
const { fetchMirrorManifest } = require('../services/versionManager');
|
||||
const manifest = await fetchMirrorManifest();
|
||||
// Try to match: "0_to_11" format or "v11" format
|
||||
const versionMatch = fileName.match(/^(\d+)_to_(\d+)$/);
|
||||
let manifestKey;
|
||||
if (versionMatch) {
|
||||
manifestKey = `${osName}/${arch}/${branch}/${fileName}.pwr`;
|
||||
} else {
|
||||
const buildNum = extractVersionNumber(fileName);
|
||||
manifestKey = `${osName}/${arch}/${branch}/0_to_${buildNum}.pwr`;
|
||||
}
|
||||
if (manifest.files[manifestKey]) {
|
||||
expectedSize = manifest.files[manifestKey].size;
|
||||
console.log(`[PWR] Expected size from manifest: ${(expectedSize / 1024 / 1024).toFixed(2)} MB`);
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(`[PWR] Could not fetch expected size from manifest: ${e.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
const dest = path.join(cacheDir, `${branch}_${fileName}.pwr`);
|
||||
const url = `https://game-patches.hytale.com/patches/${osName}/${arch}/${branch}/0/${fileName}`;
|
||||
const dest = path.join(cacheDir, `${branch}_${fileName}`);
|
||||
|
||||
// Check if file exists and validate it
|
||||
if (fs.existsSync(dest) && !manualRetry) {
|
||||
console.log('PWR file found in cache:', dest);
|
||||
|
||||
// Validate file size (PWR files should be > 1MB and >= 1.5GB for complete downloads)
|
||||
const stats = fs.statSync(dest);
|
||||
if (stats.size > 1024 * 1024) {
|
||||
// Validate against expected size - reject if file is truncated (< 99% of expected)
|
||||
if (expectedSize && stats.size < expectedSize * 0.99) {
|
||||
console.log(`[PWR] Cached file truncated: ${(stats.size / 1024 / 1024).toFixed(2)} MB, expected ${(expectedSize / 1024 / 1024).toFixed(2)} MB. Deleting and re-downloading.`);
|
||||
fs.unlinkSync(dest);
|
||||
} else {
|
||||
console.log(`[PWR] Using cached file: ${dest} (${(stats.size / 1024 / 1024).toFixed(2)} MB)`);
|
||||
return dest;
|
||||
}
|
||||
} else {
|
||||
console.log(`[PWR] Cached file too small (${stats.size} bytes), re-downloading`);
|
||||
if (stats.size < 1024 * 1024) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check if file is under 1.5 GB (incomplete download)
|
||||
const sizeInMB = stats.size / 1024 / 1024;
|
||||
if (sizeInMB < 1500) {
|
||||
console.log(`[PWR Validation] File appears incomplete: ${sizeInMB.toFixed(2)} MB < 1.5 GB`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`[DownloadPWR] Downloading from: ${url}`);
|
||||
console.log('Fetching PWR patch file:', url);
|
||||
|
||||
try {
|
||||
if (manualRetry) {
|
||||
@@ -160,7 +67,7 @@ async function downloadPWR(branch = 'release', fileName = 'v8', progressCallback
|
||||
const retryStats = fs.statSync(dest);
|
||||
console.log(`PWR file downloaded (auto-retry), size: ${(retryStats.size / 1024 / 1024).toFixed(2)} MB`);
|
||||
|
||||
if (!validatePWRFile(dest, expectedSize)) {
|
||||
if (!validatePWRFile(dest)) {
|
||||
console.log(`[PWR Validation] PWR file validation failed after auto-retry, deleting corrupted file: ${dest}`);
|
||||
fs.unlinkSync(dest);
|
||||
throw new Error('Downloaded PWR file is corrupted or invalid after automatic retry. Please retry manually');
|
||||
@@ -210,8 +117,8 @@ async function downloadPWR(branch = 'release', fileName = 'v8', progressCallback
|
||||
// Enhanced PWR file validation
|
||||
const stats = fs.statSync(dest);
|
||||
console.log(`PWR file downloaded, size: ${(stats.size / 1024 / 1024).toFixed(2)} MB`);
|
||||
|
||||
if (!validatePWRFile(dest, expectedSize)) {
|
||||
|
||||
if (!validatePWRFile(dest)) {
|
||||
console.log(`[PWR Validation] PWR file validation failed, deleting corrupted file: ${dest}`);
|
||||
fs.unlinkSync(dest);
|
||||
throw new Error('Downloaded PWR file is corrupted or invalid. Please retry');
|
||||
@@ -229,7 +136,7 @@ async function retryPWRDownload(branch, fileName, progressCallback, cacheDir = C
|
||||
return await downloadPWR(branch, fileName, progressCallback, cacheDir, true);
|
||||
}
|
||||
|
||||
async function applyPWR(pwrFile, progressCallback, gameDir = GAME_DIR, toolsDir = TOOLS_DIR, branch = 'release', cacheDir = CACHE_DIR, skipExistingCheck = false) {
|
||||
async function applyPWR(pwrFile, progressCallback, gameDir = GAME_DIR, toolsDir = TOOLS_DIR, branch = 'release', cacheDir = CACHE_DIR) {
|
||||
console.log(`[Butler] Starting PWR application with:`);
|
||||
console.log(`[Butler] - PWR file: ${pwrFile}`);
|
||||
console.log(`[Butler] - Staging dir: ${path.join(gameDir, 'staging-temp')}`);
|
||||
@@ -253,12 +160,11 @@ async function applyPWR(pwrFile, progressCallback, gameDir = GAME_DIR, toolsDir
|
||||
const gameLatest = gameDir;
|
||||
const stagingDir = path.join(gameLatest, 'staging-temp');
|
||||
|
||||
if (!skipExistingCheck) {
|
||||
const clientPath = findClientPath(gameLatest);
|
||||
if (clientPath) {
|
||||
console.log('Game files detected, skipping patch installation.');
|
||||
return;
|
||||
}
|
||||
const clientPath = findClientPath(gameLatest);
|
||||
|
||||
if (clientPath) {
|
||||
console.log('Game files detected, skipping patch installation.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Validate and prepare directories
|
||||
@@ -439,119 +345,58 @@ async function updateGameFiles(newVersion, progressCallback, gameDir = GAME_DIR,
|
||||
}
|
||||
console.log(`Updating game files to version: ${newVersion} (branch: ${branch})`);
|
||||
|
||||
// Determine update strategy: intermediate patches vs full reinstall
|
||||
const currentVersion = loadVersionClient();
|
||||
const currentBuild = extractVersionNumber(currentVersion) || 0;
|
||||
const targetBuild = extractVersionNumber(newVersion);
|
||||
tempUpdateDir = path.join(gameDir, '..', 'temp_update');
|
||||
|
||||
let useIntermediatePatches = false;
|
||||
let updatePlan = null;
|
||||
if (fs.existsSync(tempUpdateDir)) {
|
||||
fs.rmSync(tempUpdateDir, { recursive: true, force: true });
|
||||
}
|
||||
fs.mkdirSync(tempUpdateDir, { recursive: true });
|
||||
|
||||
if (currentBuild > 0 && currentBuild < targetBuild) {
|
||||
try {
|
||||
updatePlan = await getUpdatePlan(currentBuild, targetBuild, branch);
|
||||
useIntermediatePatches = !updatePlan.isFullInstall;
|
||||
if (useIntermediatePatches) {
|
||||
const totalMB = (updatePlan.totalSize / 1024 / 1024).toFixed(0);
|
||||
console.log(`[UpdateGameFiles] Using intermediate patches: ${updatePlan.steps.map(s => `${s.from}\u2192${s.to}`).join(' + ')} (${totalMB} MB)`);
|
||||
}
|
||||
} catch (planError) {
|
||||
console.warn('[UpdateGameFiles] Could not get update plan, falling back to full install:', planError.message);
|
||||
}
|
||||
if (progressCallback) {
|
||||
progressCallback('Downloading new game version...', 20, null, null, null);
|
||||
}
|
||||
|
||||
if (useIntermediatePatches && updatePlan) {
|
||||
// Apply intermediate patches directly to game dir
|
||||
for (let i = 0; i < updatePlan.steps.length; i++) {
|
||||
const step = updatePlan.steps[i];
|
||||
const stepName = `${step.from}_to_${step.to}`;
|
||||
const pwrFile = await downloadPWR(branch, newVersion, progressCallback, cacheDir);
|
||||
|
||||
if (progressCallback) {
|
||||
const progress = 20 + Math.round((i / updatePlan.steps.length) * 60);
|
||||
progressCallback(`Downloading patch ${i + 1}/${updatePlan.steps.length} (${stepName})...`, progress, null, null, null);
|
||||
}
|
||||
if (progressCallback) {
|
||||
progressCallback('Extracting new files...', 60, null, null, null);
|
||||
}
|
||||
|
||||
const pwrFile = await downloadPWR(branch, stepName, progressCallback, cacheDir, false, step.url, step.size);
|
||||
await applyPWR(pwrFile, progressCallback, tempUpdateDir, toolsDir, branch, cacheDir);
|
||||
// Delete PWR file from cache after successful update
|
||||
try {
|
||||
if (fs.existsSync(pwrFile)) {
|
||||
fs.unlinkSync(pwrFile);
|
||||
console.log('[UpdateGameFiles] PWR file deleted from cache after successful update:', pwrFile);
|
||||
}
|
||||
} catch (delErr) {
|
||||
console.warn('[UpdateGameFiles] Failed to delete PWR file from cache:', delErr.message);
|
||||
}
|
||||
if (progressCallback) {
|
||||
progressCallback('Replacing game files...', 80, null, null, null);
|
||||
}
|
||||
|
||||
if (!pwrFile) {
|
||||
throw new Error(`Failed to download patch ${stepName}`);
|
||||
}
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback(`Applying patch ${i + 1}/${updatePlan.steps.length} (${stepName})...`, null, null, null, null);
|
||||
}
|
||||
|
||||
await applyPWR(pwrFile, progressCallback, gameDir, toolsDir, branch, cacheDir, true);
|
||||
|
||||
// Clean up PWR file from cache
|
||||
if (fs.existsSync(gameDir)) {
|
||||
console.log('Removing old game files...');
|
||||
let retries = 3;
|
||||
while (retries > 0) {
|
||||
try {
|
||||
if (fs.existsSync(pwrFile)) {
|
||||
fs.unlinkSync(pwrFile);
|
||||
}
|
||||
} catch (delErr) {
|
||||
console.warn('[UpdateGameFiles] Failed to delete PWR from cache:', delErr.message);
|
||||
}
|
||||
|
||||
// Save intermediate version so we can resume if interrupted
|
||||
saveVersionClient(`v${step.to}`);
|
||||
console.log(`[UpdateGameFiles] Applied patch ${stepName} (${i + 1}/${updatePlan.steps.length})`);
|
||||
}
|
||||
} else {
|
||||
// Full install: download 0->target, apply to temp dir, swap
|
||||
tempUpdateDir = path.join(gameDir, '..', 'temp_update');
|
||||
|
||||
if (fs.existsSync(tempUpdateDir)) {
|
||||
fs.rmSync(tempUpdateDir, { recursive: true, force: true });
|
||||
}
|
||||
fs.mkdirSync(tempUpdateDir, { recursive: true });
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback('Downloading new game version...', 20, null, null, null);
|
||||
}
|
||||
|
||||
const pwrFile = await downloadPWR(branch, newVersion, progressCallback, cacheDir);
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback('Extracting new files...', 60, null, null, null);
|
||||
}
|
||||
|
||||
await applyPWR(pwrFile, progressCallback, tempUpdateDir, toolsDir, branch, cacheDir);
|
||||
|
||||
try {
|
||||
if (fs.existsSync(pwrFile)) {
|
||||
fs.unlinkSync(pwrFile);
|
||||
console.log('[UpdateGameFiles] PWR file deleted from cache after successful update:', pwrFile);
|
||||
}
|
||||
} catch (delErr) {
|
||||
console.warn('[UpdateGameFiles] Failed to delete PWR file from cache:', delErr.message);
|
||||
}
|
||||
|
||||
if (progressCallback) {
|
||||
progressCallback('Replacing game files...', 80, null, null, null);
|
||||
}
|
||||
|
||||
if (fs.existsSync(gameDir)) {
|
||||
console.log('Removing old game files...');
|
||||
let retries = 3;
|
||||
while (retries > 0) {
|
||||
try {
|
||||
fs.rmSync(gameDir, { recursive: true, force: true });
|
||||
break;
|
||||
} catch (err) {
|
||||
if ((err.code === 'EPERM' || err.code === 'EBUSY') && retries > 0) {
|
||||
retries--;
|
||||
console.log(`[UpdateGameFiles] Removal failed with ${err.code}, retrying in 1s... (${retries} retries left)`);
|
||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
fs.rmSync(gameDir, { recursive: true, force: true });
|
||||
break;
|
||||
} catch (err) {
|
||||
if ((err.code === 'EPERM' || err.code === 'EBUSY') && retries > 0) {
|
||||
retries--;
|
||||
console.log(`[UpdateGameFiles] Removal failed with ${err.code}, retrying in 1s... (${retries} retries left)`);
|
||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fs.renameSync(tempUpdateDir, gameDir);
|
||||
}
|
||||
|
||||
fs.renameSync(tempUpdateDir, gameDir);
|
||||
|
||||
const homeUIResult = await downloadAndReplaceHomePageUI(gameDir, progressCallback);
|
||||
console.log('HomePage.ui update result after update:', homeUIResult);
|
||||
|
||||
@@ -744,14 +589,8 @@ async function uninstallGame() {
|
||||
throw new Error('Game is not installed');
|
||||
}
|
||||
|
||||
// Check if game is running before attempting to delete files
|
||||
const gameRunning = await isGameRunning();
|
||||
if (gameRunning) {
|
||||
throw new Error('Cannot uninstall game while it is running. Please close the game first.');
|
||||
}
|
||||
|
||||
try {
|
||||
await safeRemoveDirectory(appDir);
|
||||
fs.rmSync(appDir, { recursive: true, force: true });
|
||||
console.log('Game uninstalled successfully - removed entire HytaleF2P folder');
|
||||
|
||||
if (fs.existsSync(CONFIG_FILE)) {
|
||||
@@ -833,31 +672,14 @@ async function repairGame(progressCallback, branchOverride = null) {
|
||||
progressCallback('Removing old game files...', 30, null, null, null);
|
||||
}
|
||||
|
||||
// Check if game is running before attempting to delete files
|
||||
const gameRunning = await isGameRunning();
|
||||
if (gameRunning) {
|
||||
console.warn('[RepairGame] Game appears to be running. This may cause permission errors during repair.');
|
||||
console.log('[RepairGame] Please close the game before repairing, or wait for the repair to complete.');
|
||||
}
|
||||
|
||||
// Delete Game and Cache Directory with retry logic
|
||||
// Delete Game and Cache Directory
|
||||
console.log('Removing corrupted game files...');
|
||||
try {
|
||||
await safeRemoveDirectory(gameDir);
|
||||
} catch (error) {
|
||||
console.error(`[RepairGame] Failed to remove game directory: ${error.message}`);
|
||||
throw new Error(`Cannot repair game: ${error.message}. Please ensure the game is not running and try again.`);
|
||||
}
|
||||
fs.rmSync(gameDir, { recursive: true, force: true });
|
||||
|
||||
const cacheDir = path.join(appDir, 'cache');
|
||||
if (fs.existsSync(cacheDir)) {
|
||||
console.log('Clearing cache directory...');
|
||||
try {
|
||||
await safeRemoveDirectory(cacheDir);
|
||||
} catch (error) {
|
||||
console.warn(`[RepairGame] Failed to clear cache directory: ${error.message}`);
|
||||
// Don't throw here, cache cleanup is not critical
|
||||
}
|
||||
fs.rmSync(cacheDir, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
console.log('Reinstalling game files...');
|
||||
@@ -921,30 +743,36 @@ function validateGameDirectory(gameDir, stagingDir) {
|
||||
}
|
||||
|
||||
// Enhanced PWR file validation
|
||||
// Accepts intermediate patches (50+ MB) and full installs (1.5+ GB)
|
||||
function validatePWRFile(filePath, expectedSize = null) {
|
||||
function validatePWRFile(filePath) {
|
||||
try {
|
||||
if (!fs.existsSync(filePath)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
const stats = fs.statSync(filePath);
|
||||
const sizeInMB = stats.size / 1024 / 1024;
|
||||
|
||||
// PWR files should be at least 1 MB
|
||||
|
||||
if (stats.size < 1024 * 1024) {
|
||||
console.log(`[PWR Validation] File too small: ${sizeInMB.toFixed(2)} MB`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Validate against expected size if known (reject if < 99% of expected)
|
||||
if (expectedSize && stats.size < expectedSize * 0.99) {
|
||||
const expectedMB = expectedSize / 1024 / 1024;
|
||||
console.log(`[PWR Validation] File truncated: ${sizeInMB.toFixed(2)} MB, expected ${expectedMB.toFixed(2)} MB`);
|
||||
|
||||
// Check if file is under 1.5 GB (incomplete download)
|
||||
if (sizeInMB < 1500) {
|
||||
console.log(`[PWR Validation] File appears incomplete: ${sizeInMB.toFixed(2)} MB < 1.5 GB`);
|
||||
return false;
|
||||
}
|
||||
|
||||
console.log(`[PWR Validation] File size: ${sizeInMB.toFixed(2)} MB - OK`);
|
||||
|
||||
// Basic file header validation (PWR files should have specific headers)
|
||||
const buffer = fs.readFileSync(filePath, { start: 0, end: 20 });
|
||||
if (buffer.length < 10) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check for common PWR magic bytes or patterns
|
||||
// This is a basic check - could be enhanced with actual PWR format specification
|
||||
const header = buffer.toString('hex', 0, 10);
|
||||
console.log(`[PWR Validation] File header: ${header}`);
|
||||
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error(`[PWR Validation] Error:`, error.message);
|
||||
|
||||
@@ -340,70 +340,36 @@ async function extractJRE(archivePath, destDir) {
|
||||
}
|
||||
|
||||
function extractZip(zipPath, dest) {
|
||||
try {
|
||||
const zip = new AdmZip(zipPath);
|
||||
const entries = zip.getEntries();
|
||||
const zip = new AdmZip(zipPath);
|
||||
const entries = zip.getEntries();
|
||||
|
||||
for (const entry of entries) {
|
||||
const entryPath = path.join(dest, entry.entryName);
|
||||
for (const entry of entries) {
|
||||
const entryPath = path.join(dest, entry.entryName);
|
||||
|
||||
const resolvedPath = path.resolve(entryPath);
|
||||
const resolvedDest = path.resolve(dest);
|
||||
if (!resolvedPath.startsWith(resolvedDest)) {
|
||||
throw new Error(`Invalid file path detected: ${entryPath}`);
|
||||
}
|
||||
|
||||
// Security check: prevent zip slip attacks
|
||||
const resolvedPath = path.resolve(entryPath);
|
||||
const resolvedDest = path.resolve(dest);
|
||||
if (!resolvedPath.startsWith(resolvedDest)) {
|
||||
throw new Error(`Invalid file path detected: ${entryPath}`);
|
||||
}
|
||||
|
||||
try {
|
||||
if (entry.isDirectory) {
|
||||
fs.mkdirSync(entryPath, { recursive: true });
|
||||
} else {
|
||||
// Ensure parent directory exists
|
||||
const parentDir = path.dirname(entryPath);
|
||||
fs.mkdirSync(parentDir, { recursive: true });
|
||||
|
||||
// Get file data and write it
|
||||
const data = entry.getData();
|
||||
if (!data) {
|
||||
console.warn(`Warning: No data for file ${entry.entryName}, skipping`);
|
||||
continue;
|
||||
}
|
||||
|
||||
fs.writeFileSync(entryPath, data);
|
||||
|
||||
// Set permissions on non-Windows platforms
|
||||
if (process.platform !== 'win32') {
|
||||
try {
|
||||
const mode = entry.header.attr >>> 16;
|
||||
if (mode > 0) {
|
||||
fs.chmodSync(entryPath, mode);
|
||||
}
|
||||
} catch (chmodError) {
|
||||
console.warn(`Warning: Could not set permissions for ${entryPath}: ${chmodError.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (entryError) {
|
||||
console.error(`Error extracting ${entry.entryName}: ${entryError.message}`);
|
||||
// Continue with other entries rather than failing completely
|
||||
continue;
|
||||
if (entry.isDirectory) {
|
||||
fs.mkdirSync(entryPath, { recursive: true });
|
||||
} else {
|
||||
fs.mkdirSync(path.dirname(entryPath), { recursive: true });
|
||||
fs.writeFileSync(entryPath, entry.getData());
|
||||
if (process.platform !== 'win32') {
|
||||
fs.chmodSync(entryPath, entry.header.attr >>> 16);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
throw new Error(`Failed to extract ZIP archive: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
function extractTarGz(tarGzPath, dest) {
|
||||
try {
|
||||
return tar.extract({
|
||||
file: tarGzPath,
|
||||
cwd: dest,
|
||||
strip: 0
|
||||
});
|
||||
} catch (error) {
|
||||
throw new Error(`Failed to extract TAR.GZ archive: ${error.message}`);
|
||||
}
|
||||
return tar.extract({
|
||||
file: tarGzPath,
|
||||
cwd: dest,
|
||||
strip: 0
|
||||
});
|
||||
}
|
||||
|
||||
function flattenJREDir(jreLatest) {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const { downloadFile, findHomePageUIPath, findLogoPath } = require('../utils/fileManager');
|
||||
const { smartRequest } = require('../utils/proxyClient');
|
||||
|
||||
async function downloadAndReplaceHomePageUI(gameDir, progressCallback) {
|
||||
try {
|
||||
@@ -14,8 +13,7 @@ async function downloadAndReplaceHomePageUI(gameDir, progressCallback) {
|
||||
const homeUIUrl = 'https://files.hytalef2p.com/api/HomeUI';
|
||||
const tempHomePath = path.join(path.dirname(gameDir), 'HomePage_temp.ui');
|
||||
|
||||
const response = await smartRequest(homeUIUrl, { responseType: 'arraybuffer' });
|
||||
fs.writeFileSync(tempHomePath, response.data);
|
||||
await downloadFile(homeUIUrl, tempHomePath);
|
||||
|
||||
const existingHomePath = findHomePageUIPath(gameDir);
|
||||
|
||||
@@ -68,8 +66,7 @@ async function downloadAndReplaceLogo(gameDir, progressCallback) {
|
||||
const logoUrl = 'https://files.hytalef2p.com/api/Logo';
|
||||
const tempLogoPath = path.join(path.dirname(gameDir), 'Logo@2x_temp.png');
|
||||
|
||||
const response = await smartRequest(logoUrl, { responseType: 'arraybuffer' });
|
||||
fs.writeFileSync(tempLogoPath, response.data);
|
||||
await downloadFile(logoUrl, tempLogoPath);
|
||||
|
||||
const existingLogoPath = findLogoPath(gameDir);
|
||||
|
||||
|
||||
@@ -1,500 +1,134 @@
|
||||
const axios = require('axios');
|
||||
const crypto = require('crypto');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const { getOS, getArch } = require('../utils/platformUtils');
|
||||
|
||||
// Patches base URL fetched dynamically via multi-source fallback chain
|
||||
const AUTH_DOMAIN = process.env.HYTALE_AUTH_DOMAIN || 'auth.sanasol.ws';
|
||||
const PATCHES_CONFIG_SOURCES = [
|
||||
{ type: 'http', url: `https://${AUTH_DOMAIN}/api/patches-config`, name: 'primary' },
|
||||
{ type: 'http', url: 'https://htdwnldsan.top/patches-config', name: 'backup-1' },
|
||||
{ type: 'http', url: 'https://dl1.htdwnldsan.top/patches-config', name: 'backup-2' },
|
||||
{ type: 'doh', name: '_patches.htdwnldsan.top', name_label: 'dns-txt' },
|
||||
];
|
||||
const HARDCODED_FALLBACK = 'https://dl.vboro.de/patches';
|
||||
|
||||
// Alternative mirrors (non-Cloudflare) for regions where CF is blocked
|
||||
const NON_CF_MIRRORS = [
|
||||
'https://dl1.htdwnldsan.top',
|
||||
'https://htdwnldsan.top/patches',
|
||||
];
|
||||
|
||||
// Fallback: latest known build number if manifest is unreachable
|
||||
const FALLBACK_LATEST_BUILD = 11;
|
||||
|
||||
let patchesBaseUrl = null;
|
||||
let patchesConfigTime = 0;
|
||||
const PATCHES_CONFIG_CACHE_DURATION = 300000; // 5 minutes
|
||||
|
||||
let manifestCache = null;
|
||||
let manifestCacheTime = 0;
|
||||
const MANIFEST_CACHE_DURATION = 60000; // 1 minute
|
||||
|
||||
// Disk cache path for patches URL (survives restarts)
|
||||
function getDiskCachePath() {
|
||||
const os = require('os');
|
||||
const home = os.homedir();
|
||||
let appDir;
|
||||
if (process.platform === 'win32') {
|
||||
appDir = path.join(home, 'AppData', 'Local', 'HytaleF2P');
|
||||
} else if (process.platform === 'darwin') {
|
||||
appDir = path.join(home, 'Library', 'Application Support', 'HytaleF2P');
|
||||
} else {
|
||||
appDir = path.join(home, '.hytalef2p');
|
||||
}
|
||||
return path.join(appDir, 'patches-url-cache.json');
|
||||
}
|
||||
|
||||
function saveDiskCache(url) {
|
||||
try {
|
||||
const cachePath = getDiskCachePath();
|
||||
const dir = path.dirname(cachePath);
|
||||
if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
|
||||
fs.writeFileSync(cachePath, JSON.stringify({ patches_url: url, ts: Date.now() }), 'utf8');
|
||||
} catch (e) {
|
||||
// Non-critical, ignore
|
||||
}
|
||||
}
|
||||
|
||||
function loadDiskCache() {
|
||||
try {
|
||||
const cachePath = getDiskCachePath();
|
||||
if (fs.existsSync(cachePath)) {
|
||||
const data = JSON.parse(fs.readFileSync(cachePath, 'utf8'));
|
||||
if (data && data.patches_url) return data.patches_url;
|
||||
}
|
||||
} catch (e) {
|
||||
// Non-critical, ignore
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch patches URL from a single HTTP config endpoint
|
||||
*/
|
||||
async function fetchFromHttp(url) {
|
||||
const response = await axios.get(url, {
|
||||
timeout: 8000,
|
||||
headers: { 'User-Agent': 'Hytale-F2P-Launcher' }
|
||||
});
|
||||
if (response.data && response.data.patches_url) {
|
||||
return response.data.patches_url.replace(/\/+$/, '');
|
||||
}
|
||||
throw new Error('Invalid response');
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch patches URL from DNS TXT record via DNS-over-HTTPS
|
||||
*/
|
||||
async function fetchFromDoh(recordName) {
|
||||
const dohEndpoints = [
|
||||
{ url: 'https://dns.google/resolve', params: { name: recordName, type: 'TXT' } },
|
||||
{ url: 'https://cloudflare-dns.com/dns-query', params: { name: recordName, type: 'TXT' }, headers: { 'Accept': 'application/dns-json' } },
|
||||
];
|
||||
|
||||
for (const endpoint of dohEndpoints) {
|
||||
try {
|
||||
const response = await axios.get(endpoint.url, {
|
||||
params: endpoint.params,
|
||||
headers: { 'User-Agent': 'Hytale-F2P-Launcher', ...(endpoint.headers || {}) },
|
||||
timeout: 5000
|
||||
});
|
||||
const answers = response.data && response.data.Answer;
|
||||
if (answers && answers.length > 0) {
|
||||
// TXT records are quoted, strip quotes
|
||||
const txt = answers[0].data.replace(/^"|"$/g, '');
|
||||
if (txt.startsWith('http')) return txt.replace(/\/+$/, '');
|
||||
}
|
||||
} catch (e) {
|
||||
// Try next DoH endpoint
|
||||
}
|
||||
}
|
||||
throw new Error('All DoH endpoints failed');
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch patches base URL with hardened multi-source fallback chain:
|
||||
* 1. Memory cache (5 min)
|
||||
* 2. HTTP: auth.sanasol.ws (primary)
|
||||
* 3. HTTP: htdwnldsan.top (backup, different host/domain/registrar)
|
||||
* 4. DNS TXT: _patches.htdwnldsan.top via DoH (different protocol layer)
|
||||
* 5. Disk cache (survives restarts, never expires)
|
||||
* 6. Hardcoded fallback URL (last resort)
|
||||
*/
|
||||
async function getPatchesBaseUrl() {
|
||||
const now = Date.now();
|
||||
|
||||
// 1. Memory cache
|
||||
if (patchesBaseUrl && (now - patchesConfigTime) < PATCHES_CONFIG_CACHE_DURATION) {
|
||||
return patchesBaseUrl;
|
||||
}
|
||||
|
||||
// 2-4. Try all sources: HTTP endpoints first, then DoH
|
||||
for (const source of PATCHES_CONFIG_SOURCES) {
|
||||
try {
|
||||
let url;
|
||||
if (source.type === 'http') {
|
||||
console.log(`[Mirror] Trying ${source.name}: ${source.url}`);
|
||||
url = await fetchFromHttp(source.url);
|
||||
} else if (source.type === 'doh') {
|
||||
console.log(`[Mirror] Trying ${source.name_label}: ${source.name}`);
|
||||
url = await fetchFromDoh(source.name);
|
||||
}
|
||||
if (url) {
|
||||
patchesBaseUrl = url;
|
||||
patchesConfigTime = now;
|
||||
saveDiskCache(url);
|
||||
console.log(`[Mirror] Patches URL (via ${source.name || source.name_label}): ${url}`);
|
||||
return url;
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn(`[Mirror] ${source.name || source.name_label} failed: ${e.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 5. Stale memory cache (any age)
|
||||
if (patchesBaseUrl) {
|
||||
console.log('[Mirror] All sources failed, using stale memory cache:', patchesBaseUrl);
|
||||
return patchesBaseUrl;
|
||||
}
|
||||
|
||||
// 6. Disk cache (survives restarts)
|
||||
const diskUrl = loadDiskCache();
|
||||
if (diskUrl) {
|
||||
patchesBaseUrl = diskUrl;
|
||||
console.log('[Mirror] All sources failed, using disk cache:', diskUrl);
|
||||
return diskUrl;
|
||||
}
|
||||
|
||||
// 7. Hardcoded fallback
|
||||
console.warn('[Mirror] All sources + caches exhausted, using hardcoded fallback:', HARDCODED_FALLBACK);
|
||||
patchesBaseUrl = HARDCODED_FALLBACK;
|
||||
return HARDCODED_FALLBACK;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all available mirror base URLs (primary + non-Cloudflare fallbacks)
|
||||
* Used by download logic to retry on different mirrors when primary is blocked
|
||||
*/
|
||||
async function getAllMirrorUrls() {
|
||||
const primary = await getPatchesBaseUrl();
|
||||
// Deduplicate: don't include mirrors that match primary
|
||||
const mirrors = NON_CF_MIRRORS.filter(m => m !== primary);
|
||||
return [primary, ...mirrors];
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch the mirror manifest — tries primary URL first, then non-Cloudflare mirrors
|
||||
*/
|
||||
async function fetchMirrorManifest() {
|
||||
const now = Date.now();
|
||||
|
||||
if (manifestCache && (now - manifestCacheTime) < MANIFEST_CACHE_DURATION) {
|
||||
console.log('[Mirror] Using cached manifest');
|
||||
return manifestCache;
|
||||
}
|
||||
|
||||
const mirrors = await getAllMirrorUrls();
|
||||
|
||||
for (let i = 0; i < mirrors.length; i++) {
|
||||
const baseUrl = mirrors[i];
|
||||
const manifestUrl = `${baseUrl}/manifest.json`;
|
||||
try {
|
||||
console.log(`[Mirror] Fetching manifest from: ${manifestUrl}`);
|
||||
const response = await axios.get(manifestUrl, {
|
||||
timeout: 15000,
|
||||
maxRedirects: 5,
|
||||
headers: { 'User-Agent': 'Hytale-F2P-Launcher' }
|
||||
});
|
||||
|
||||
if (response.data && response.data.files) {
|
||||
manifestCache = response.data;
|
||||
manifestCacheTime = now;
|
||||
// If a non-primary mirror worked, switch to it for downloads too
|
||||
if (i > 0) {
|
||||
console.log(`[Mirror] Primary unreachable, switching to mirror: ${baseUrl}`);
|
||||
patchesBaseUrl = baseUrl;
|
||||
patchesConfigTime = now;
|
||||
saveDiskCache(baseUrl);
|
||||
}
|
||||
console.log('[Mirror] Manifest fetched successfully');
|
||||
return response.data;
|
||||
}
|
||||
throw new Error('Invalid manifest structure');
|
||||
} catch (error) {
|
||||
const isTimeout = error.code === 'ETIMEDOUT' || error.code === 'ECONNABORTED' || error.message.includes('timeout');
|
||||
console.error(`[Mirror] Error fetching manifest from ${baseUrl}: ${error.message}${isTimeout ? ' (Cloudflare may be blocked)' : ''}`);
|
||||
if (i < mirrors.length - 1) {
|
||||
console.log(`[Mirror] Trying next mirror...`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// All mirrors failed — use cached manifest if available
|
||||
if (manifestCache) {
|
||||
console.log('[Mirror] All mirrors failed, using expired cache');
|
||||
return manifestCache;
|
||||
}
|
||||
throw new Error('All mirrors failed and no cached manifest available');
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse manifest to get available patches for current platform
|
||||
* Returns array of { from, to, key, size }
|
||||
*/
|
||||
function getPlatformPatches(manifest, branch = 'release') {
|
||||
const os = getOS();
|
||||
const arch = getArch();
|
||||
const prefix = `${os}/${arch}/${branch}/`;
|
||||
const patches = [];
|
||||
|
||||
for (const [key, info] of Object.entries(manifest.files)) {
|
||||
if (key.startsWith(prefix) && key.endsWith('.pwr')) {
|
||||
const filename = key.slice(prefix.length, -4); // e.g., "0_to_11"
|
||||
const match = filename.match(/^(\d+)_to_(\d+)$/);
|
||||
if (match) {
|
||||
patches.push({
|
||||
from: parseInt(match[1]),
|
||||
to: parseInt(match[2]),
|
||||
key,
|
||||
size: info.size
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return patches;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find optimal patch path using BFS with download size minimization
|
||||
* Returns array of { from, to, url, size, key } steps, or null if no path found
|
||||
*/
|
||||
async function findOptimalPatchPath(currentBuild, targetBuild, patches) {
|
||||
if (currentBuild >= targetBuild) return [];
|
||||
|
||||
const baseUrl = await getPatchesBaseUrl();
|
||||
const edges = {};
|
||||
for (const patch of patches) {
|
||||
if (!edges[patch.from]) edges[patch.from] = [];
|
||||
edges[patch.from].push(patch);
|
||||
}
|
||||
|
||||
const queue = [{ build: currentBuild, path: [], totalSize: 0 }];
|
||||
let bestPath = null;
|
||||
let bestSize = Infinity;
|
||||
|
||||
while (queue.length > 0) {
|
||||
const { build, path, totalSize } = queue.shift();
|
||||
|
||||
if (build === targetBuild) {
|
||||
if (totalSize < bestSize) {
|
||||
bestPath = path;
|
||||
bestSize = totalSize;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (totalSize >= bestSize) continue;
|
||||
|
||||
const nextEdges = edges[build] || [];
|
||||
for (const edge of nextEdges) {
|
||||
if (edge.to <= build || edge.to > targetBuild) continue;
|
||||
if (path.some(p => p.to === edge.to)) continue;
|
||||
|
||||
queue.push({
|
||||
build: edge.to,
|
||||
path: [...path, {
|
||||
from: edge.from,
|
||||
to: edge.to,
|
||||
url: `${baseUrl}/${edge.key}`,
|
||||
size: edge.size,
|
||||
key: edge.key
|
||||
}],
|
||||
totalSize: totalSize + edge.size
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return bestPath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the optimal update plan from currentBuild to targetBuild
|
||||
* Returns { steps: [{from, to, url, size}], totalSize, isFullInstall }
|
||||
*/
|
||||
async function getUpdatePlan(currentBuild, targetBuild, branch = 'release') {
|
||||
const manifest = await fetchMirrorManifest();
|
||||
const patches = getPlatformPatches(manifest, branch);
|
||||
|
||||
// Try optimal path
|
||||
const steps = await findOptimalPatchPath(currentBuild, targetBuild, patches);
|
||||
|
||||
if (steps && steps.length > 0) {
|
||||
const totalSize = steps.reduce((sum, s) => sum + s.size, 0);
|
||||
console.log(`[Mirror] Update plan: ${steps.map(s => `${s.from}\u2192${s.to}`).join(' + ')} (${(totalSize / 1024 / 1024).toFixed(0)} MB)`);
|
||||
return { steps, totalSize, isFullInstall: steps.length === 1 && steps[0].from === 0 };
|
||||
}
|
||||
|
||||
// Fallback: full install 0 -> target
|
||||
const fullPatch = patches.find(p => p.from === 0 && p.to === targetBuild);
|
||||
if (fullPatch) {
|
||||
const baseUrl = await getPatchesBaseUrl();
|
||||
const step = {
|
||||
from: 0,
|
||||
to: targetBuild,
|
||||
url: `${baseUrl}/${fullPatch.key}`,
|
||||
size: fullPatch.size,
|
||||
key: fullPatch.key
|
||||
};
|
||||
console.log(`[Mirror] Full install: 0\u2192${targetBuild} (${(fullPatch.size / 1024 / 1024).toFixed(0)} MB)`);
|
||||
return { steps: [step], totalSize: fullPatch.size, isFullInstall: true };
|
||||
}
|
||||
|
||||
throw new Error(`No patch path found from build ${currentBuild} to ${targetBuild} for ${getOS()}/${getArch()}`);
|
||||
}
|
||||
const BASE_PATCH_URL = 'https://game-patches.hytale.com/patches';
|
||||
const MANIFEST_API = 'https://files.hytalef2p.com/api/patch_manifest';
|
||||
|
||||
async function getLatestClientVersion(branch = 'release') {
|
||||
try {
|
||||
console.log(`[Mirror] Fetching latest client version (branch: ${branch})...`);
|
||||
const manifest = await fetchMirrorManifest();
|
||||
const patches = getPlatformPatches(manifest, branch);
|
||||
console.log(`Fetching latest client version from API (branch: ${branch})...`);
|
||||
const response = await axios.get('https://files.hytalef2p.com/api/version_client', {
|
||||
params: { branch },
|
||||
timeout: 40000,
|
||||
headers: {
|
||||
'User-Agent': 'Hytale-F2P-Launcher'
|
||||
}
|
||||
});
|
||||
|
||||
if (patches.length === 0) {
|
||||
console.log(`[Mirror] No patches for branch '${branch}', using fallback`);
|
||||
return `v${FALLBACK_LATEST_BUILD}`;
|
||||
}
|
||||
|
||||
const latestBuild = Math.max(...patches.map(p => p.to));
|
||||
console.log(`[Mirror] Latest client version: v${latestBuild}`);
|
||||
return `v${latestBuild}`;
|
||||
} catch (error) {
|
||||
console.error('[Mirror] Error:', error.message);
|
||||
return `v${FALLBACK_LATEST_BUILD}`;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get PWR download URL for fresh install (0 -> target)
|
||||
* Backward-compatible with old getPWRUrlFromNewAPI signature
|
||||
* Checks mirror first, then constructs URL for the branch
|
||||
*/
|
||||
async function getPWRUrl(branch = 'release', version = 'v11') {
|
||||
const targetBuild = extractVersionNumber(version);
|
||||
const os = getOS();
|
||||
const arch = getArch();
|
||||
|
||||
try {
|
||||
const manifest = await fetchMirrorManifest();
|
||||
const patches = getPlatformPatches(manifest, branch);
|
||||
const fullPatch = patches.find(p => p.from === 0 && p.to === targetBuild);
|
||||
|
||||
if (fullPatch) {
|
||||
const baseUrl = await getPatchesBaseUrl();
|
||||
const url = `${baseUrl}/${fullPatch.key}`;
|
||||
console.log(`[Mirror] PWR URL: ${url}`);
|
||||
return url;
|
||||
}
|
||||
|
||||
if (patches.length > 0) {
|
||||
// Branch exists in mirror but no full patch for this target - construct URL
|
||||
console.log(`[Mirror] No 0->${targetBuild} patch found, constructing URL`);
|
||||
if (response.data && response.data.client_version) {
|
||||
const version = response.data.client_version;
|
||||
console.log(`Latest client version for ${branch}: ${version}`);
|
||||
return version;
|
||||
} else {
|
||||
console.log(`[Mirror] Branch '${branch}' not in mirror, constructing URL`);
|
||||
console.log('Warning: Invalid API response, falling back to latest known version (7.pwr)');
|
||||
return '7.pwr';
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[Mirror] Error getting PWR URL:', error.message);
|
||||
console.error('Error fetching client version:', error.message);
|
||||
console.log('Warning: API unavailable, falling back to latest known version (7.pwr)');
|
||||
return '7.pwr';
|
||||
}
|
||||
|
||||
// Construct mirror URL (will work if patch was uploaded but manifest is stale)
|
||||
const baseUrl = await getPatchesBaseUrl();
|
||||
return `${baseUrl}/${os}/${arch}/${branch}/0_to_${targetBuild}.pwr`;
|
||||
}
|
||||
|
||||
// Backward-compatible alias
|
||||
const getPWRUrlFromNewAPI = getPWRUrl;
|
||||
|
||||
// Utility function to extract version number
|
||||
// Supports: "7.pwr", "v8", "v8-windows-amd64.pwr", "5_to_10", etc.
|
||||
function extractVersionNumber(version) {
|
||||
if (!version) return 0;
|
||||
|
||||
// New format: "v8" or "v8-xxx.pwr"
|
||||
const vMatch = version.match(/v(\d+)/);
|
||||
if (vMatch) return parseInt(vMatch[1]);
|
||||
|
||||
// Old format: "7.pwr"
|
||||
const pwrMatch = version.match(/(\d+)\.pwr/);
|
||||
if (pwrMatch) return parseInt(pwrMatch[1]);
|
||||
|
||||
// Fallback
|
||||
const num = parseInt(version);
|
||||
return isNaN(num) ? 0 : num;
|
||||
}
|
||||
|
||||
async function buildArchiveUrl(buildNumber, branch = 'release') {
|
||||
const baseUrl = await getPatchesBaseUrl();
|
||||
function buildArchiveUrl(buildNumber, branch = 'release') {
|
||||
const os = getOS();
|
||||
const arch = getArch();
|
||||
return `${baseUrl}/${os}/${arch}/${branch}/0_to_${buildNumber}.pwr`;
|
||||
return `${BASE_PATCH_URL}/${os}/${arch}/${branch}/0/${buildNumber}.pwr`;
|
||||
}
|
||||
|
||||
async function checkArchiveExists(buildNumber, branch = 'release') {
|
||||
const url = await buildArchiveUrl(buildNumber, branch);
|
||||
const url = buildArchiveUrl(buildNumber, branch);
|
||||
try {
|
||||
const response = await axios.head(url, { timeout: 10000 });
|
||||
return response.status === 200;
|
||||
} catch {
|
||||
} catch (error) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function discoverAvailableVersions(latestKnown, branch = 'release') {
|
||||
async function discoverAvailableVersions(latestKnown, branch = 'release', maxProbe = 50) {
|
||||
const available = [];
|
||||
const latest = parseInt(latestKnown.replace('.pwr', ''));
|
||||
|
||||
for (let i = latest; i >= Math.max(1, latest - maxProbe); i--) {
|
||||
const exists = await checkArchiveExists(i, branch);
|
||||
if (exists) {
|
||||
available.push(`${i}.pwr`);
|
||||
}
|
||||
}
|
||||
|
||||
return available;
|
||||
}
|
||||
|
||||
async function fetchPatchManifest(branch = 'release') {
|
||||
try {
|
||||
const manifest = await fetchMirrorManifest();
|
||||
const patches = getPlatformPatches(manifest, branch);
|
||||
const versions = [...new Set(patches.map(p => p.to))].sort((a, b) => b - a);
|
||||
return versions.map(v => `${v}.pwr`);
|
||||
} catch {
|
||||
return [];
|
||||
const os = getOS();
|
||||
const arch = getArch();
|
||||
const response = await axios.get(MANIFEST_API, {
|
||||
params: { branch, os, arch },
|
||||
timeout: 10000
|
||||
});
|
||||
return response.data.patches || {};
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch patch manifest:', error.message);
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
async function extractVersionDetails(targetVersion, branch = 'release') {
|
||||
const buildNumber = extractVersionNumber(targetVersion);
|
||||
const fullUrl = await buildArchiveUrl(buildNumber, branch);
|
||||
|
||||
const buildNumber = parseInt(targetVersion.replace('.pwr', ''));
|
||||
const previousBuild = buildNumber - 1;
|
||||
|
||||
const manifest = await fetchPatchManifest(branch);
|
||||
const patchInfo = manifest[buildNumber];
|
||||
|
||||
return {
|
||||
version: targetVersion,
|
||||
buildNumber,
|
||||
buildNumber: buildNumber,
|
||||
buildName: `HYTALE-Build-${buildNumber}`,
|
||||
fullUrl,
|
||||
differentialUrl: null,
|
||||
checksum: null,
|
||||
sourceVersion: null,
|
||||
isDifferential: false,
|
||||
releaseNotes: null
|
||||
fullUrl: patchInfo?.original_url || buildArchiveUrl(buildNumber, branch),
|
||||
differentialUrl: patchInfo?.patch_url || null,
|
||||
checksum: patchInfo?.patch_hash || null,
|
||||
sourceVersion: patchInfo?.from ? `${patchInfo.from}.pwr` : (previousBuild > 0 ? `${previousBuild}.pwr` : null),
|
||||
isDifferential: !!patchInfo?.proper_patch,
|
||||
releaseNotes: patchInfo?.patch_note || null
|
||||
};
|
||||
}
|
||||
|
||||
function canUseDifferentialUpdate() {
|
||||
// Differential updates are now handled via getUpdatePlan()
|
||||
return false;
|
||||
function canUseDifferentialUpdate(currentVersion, targetDetails) {
|
||||
if (!targetDetails) return false;
|
||||
if (!targetDetails.differentialUrl) return false;
|
||||
if (!targetDetails.isDifferential) return false;
|
||||
|
||||
if (!currentVersion) return false;
|
||||
|
||||
const currentBuild = parseInt(currentVersion.replace('.pwr', ''));
|
||||
const expectedSource = parseInt(targetDetails.sourceVersion?.replace('.pwr', '') || '0');
|
||||
|
||||
return currentBuild === expectedSource;
|
||||
}
|
||||
|
||||
function needsIntermediatePatches(currentVersion, targetVersion) {
|
||||
if (!currentVersion) return [];
|
||||
const current = extractVersionNumber(currentVersion);
|
||||
const target = extractVersionNumber(targetVersion);
|
||||
if (current >= target) return [];
|
||||
return [targetVersion];
|
||||
|
||||
const current = parseInt(currentVersion.replace('.pwr', ''));
|
||||
const target = parseInt(targetVersion.replace('.pwr', ''));
|
||||
|
||||
const intermediates = [];
|
||||
for (let i = current + 1; i <= target; i++) {
|
||||
intermediates.push(`${i}.pwr`);
|
||||
}
|
||||
|
||||
return intermediates;
|
||||
}
|
||||
|
||||
async function computeFileChecksum(filePath) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const hash = crypto.createHash('sha256');
|
||||
const stream = fs.createReadStream(filePath);
|
||||
|
||||
stream.on('data', data => hash.update(data));
|
||||
stream.on('end', () => resolve(hash.digest('hex')));
|
||||
stream.on('error', reject);
|
||||
@@ -503,6 +137,7 @@ async function computeFileChecksum(filePath) {
|
||||
|
||||
async function validateChecksum(filePath, expectedChecksum) {
|
||||
if (!expectedChecksum) return true;
|
||||
|
||||
const actualChecksum = await computeFileChecksum(filePath);
|
||||
return actualChecksum === expectedChecksum;
|
||||
}
|
||||
@@ -511,7 +146,7 @@ function getInstalledClientVersion() {
|
||||
try {
|
||||
const { loadVersionClient } = require('../core/config');
|
||||
return loadVersionClient();
|
||||
} catch {
|
||||
} catch (err) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -526,14 +161,5 @@ module.exports = {
|
||||
needsIntermediatePatches,
|
||||
computeFileChecksum,
|
||||
validateChecksum,
|
||||
getInstalledClientVersion,
|
||||
fetchMirrorManifest,
|
||||
getPWRUrl,
|
||||
getPWRUrlFromNewAPI,
|
||||
getUpdatePlan,
|
||||
extractVersionNumber,
|
||||
getPlatformPatches,
|
||||
findOptimalPatchPath,
|
||||
getPatchesBaseUrl,
|
||||
getAllMirrorUrls
|
||||
getInstalledClientVersion
|
||||
};
|
||||
|
||||
@@ -1,18 +1,11 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const { smartDownloadStream } = require('./proxyClient');
|
||||
|
||||
// Domain configuration
|
||||
const ORIGINAL_DOMAIN = 'hytale.com';
|
||||
const MIN_DOMAIN_LENGTH = 4;
|
||||
const MAX_DOMAIN_LENGTH = 16;
|
||||
|
||||
// DualAuth ByteBuddy Agent (runtime class transformation, no JAR modification)
|
||||
const DUALAUTH_AGENT_URL = 'https://github.com/sanasol/hytale-auth-server/releases/latest/download/dualauth-agent.jar';
|
||||
const DUALAUTH_AGENT_VERSION_API = 'https://api.github.com/repos/sanasol/hytale-auth-server/releases/latest';
|
||||
const DUALAUTH_AGENT_FILENAME = 'dualauth-agent.jar';
|
||||
const DUALAUTH_AGENT_VERSION_FILE = 'dualauth-agent.version';
|
||||
|
||||
function getTargetDomain() {
|
||||
if (process.env.HYTALE_AUTH_DOMAIN) {
|
||||
return process.env.HYTALE_AUTH_DOMAIN;
|
||||
@@ -29,7 +22,7 @@ const DEFAULT_NEW_DOMAIN = 'auth.sanasol.ws';
|
||||
|
||||
/**
|
||||
* Patches HytaleClient binary to replace hytale.com with custom domain
|
||||
* Server auth is handled by DualAuth ByteBuddy Agent (-javaagent: flag)
|
||||
* Server patching is done via pre-patched JAR download from CDN
|
||||
*
|
||||
* Supports domains from 4 to 16 characters:
|
||||
* - All F2P traffic routes to single endpoint: https://{domain} (no subdomains)
|
||||
@@ -500,144 +493,227 @@ class ClientPatcher {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the path to the DualAuth Agent JAR in a directory
|
||||
* Check if server JAR contains DualAuth classes (was patched)
|
||||
*/
|
||||
getAgentPath(dir) {
|
||||
return path.join(dir, DUALAUTH_AGENT_FILENAME);
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Download DualAuth ByteBuddy Agent (replaces old pre-patched JAR approach)
|
||||
* The agent provides runtime class transformation via -javaagent: flag
|
||||
* No server JAR modification needed - original JAR stays pristine
|
||||
* Validate downloaded file is not corrupt/partial
|
||||
* Server JAR should be at least 50MB
|
||||
*/
|
||||
async ensureAgentAvailable(serverDir, progressCallback) {
|
||||
const agentPath = this.getAgentPath(serverDir);
|
||||
const versionPath = path.join(serverDir, DUALAUTH_AGENT_VERSION_FILE);
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
console.log('=== DualAuth Agent (ByteBuddy) ===');
|
||||
console.log(`Target: ${agentPath}`);
|
||||
/**
|
||||
* Patch server JAR by downloading pre-patched version from CDN
|
||||
*/
|
||||
async patchServer(serverPath, progressCallback, branch = 'release') {
|
||||
const newDomain = this.getNewDomain();
|
||||
|
||||
// Check local version and whether file exists
|
||||
let localVersion = null;
|
||||
let agentExists = false;
|
||||
if (fs.existsSync(agentPath)) {
|
||||
console.log('=== Server Patcher (Pre-patched Download) ===');
|
||||
console.log(`Target: ${serverPath}`);
|
||||
console.log(`Branch: ${branch}`);
|
||||
console.log(`Domain: ${newDomain}`);
|
||||
|
||||
if (!fs.existsSync(serverPath)) {
|
||||
const error = `Server JAR not found: ${serverPath}`;
|
||||
console.error(error);
|
||||
return { success: false, error };
|
||||
}
|
||||
|
||||
// Check if already patched
|
||||
const patchFlagFile = serverPath + '.dualauth_patched';
|
||||
let needsRestore = false;
|
||||
|
||||
if (fs.existsSync(patchFlagFile)) {
|
||||
try {
|
||||
const stats = fs.statSync(agentPath);
|
||||
if (stats.size > 1024) {
|
||||
agentExists = true;
|
||||
if (fs.existsSync(versionPath)) {
|
||||
localVersion = fs.readFileSync(versionPath, 'utf8').trim();
|
||||
const flagData = JSON.parse(fs.readFileSync(patchFlagFile, 'utf8'));
|
||||
if (flagData.domain === newDomain && flagData.branch === branch) {
|
||||
// Verify JAR actually contains DualAuth classes (game may have auto-updated)
|
||||
if (this.serverJarContainsDualAuth(serverPath)) {
|
||||
console.log(`Server already patched for ${newDomain} (${branch}), 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('Agent file appears corrupt, re-downloading...');
|
||||
fs.unlinkSync(agentPath);
|
||||
console.log(`Server patched for "${flagData.domain}" (${flagData.branch}), need to change to "${newDomain}" (${branch})`);
|
||||
needsRestore = true;
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('Could not check agent file:', e.message);
|
||||
// Flag file corrupt, re-patch
|
||||
console.log(' Flag file corrupt, will re-download');
|
||||
try { fs.unlinkSync(patchFlagFile); } catch (e) { /* ignore */ }
|
||||
}
|
||||
}
|
||||
|
||||
// Check for updates from GitHub
|
||||
let remoteVersion = null;
|
||||
let needsDownload = !agentExists;
|
||||
if (agentExists) {
|
||||
try {
|
||||
if (progressCallback) progressCallback('Checking for agent updates...', 5);
|
||||
const axios = require('axios');
|
||||
const resp = await axios.get(DUALAUTH_AGENT_VERSION_API, {
|
||||
timeout: 5000,
|
||||
headers: { 'Accept': 'application/vnd.github.v3+json' }
|
||||
});
|
||||
remoteVersion = resp.data.tag_name; // e.g. "v1.1.10"
|
||||
if (localVersion && localVersion === remoteVersion) {
|
||||
console.log(`DualAuth Agent up to date (${localVersion})`);
|
||||
if (progressCallback) progressCallback('DualAuth Agent ready', 100);
|
||||
return { success: true, agentPath, alreadyExists: true, version: localVersion };
|
||||
}
|
||||
console.log(`Agent update available: ${localVersion || 'unknown'} → ${remoteVersion}`);
|
||||
needsDownload = true;
|
||||
} catch (e) {
|
||||
// GitHub API failed - use existing agent if available
|
||||
console.warn(`Could not check for updates: ${e.message}`);
|
||||
if (agentExists) {
|
||||
console.log(`Using existing agent (${localVersion || 'unknown version'})`);
|
||||
if (progressCallback) progressCallback('DualAuth Agent ready', 100);
|
||||
return { success: true, agentPath, alreadyExists: true, version: localVersion };
|
||||
// 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');
|
||||
}
|
||||
}
|
||||
|
||||
if (!needsDownload) {
|
||||
if (progressCallback) progressCallback('DualAuth Agent ready', 100);
|
||||
return { success: true, agentPath, alreadyExists: true, version: localVersion };
|
||||
// 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');
|
||||
}
|
||||
|
||||
// Download agent from GitHub releases
|
||||
const action = agentExists ? 'Updating' : 'Downloading';
|
||||
if (progressCallback) progressCallback(`${action} DualAuth Agent...`, 20);
|
||||
console.log(`${action} from: ${DUALAUTH_AGENT_URL}`);
|
||||
// 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...');
|
||||
|
||||
try {
|
||||
// Ensure server directory exists
|
||||
if (!fs.existsSync(serverDir)) {
|
||||
fs.mkdirSync(serverDir, { recursive: true });
|
||||
const https = require('https');
|
||||
|
||||
// Use different URL for pre-release vs release
|
||||
let url;
|
||||
if (branch === 'pre-release') {
|
||||
url = 'https://patcher.authbp.xyz/download/patched_prerelease';
|
||||
console.log(' Using pre-release patched server from:', url);
|
||||
} else {
|
||||
url = 'https://patcher.authbp.xyz/download/patched_release';
|
||||
console.log(' Using release patched server from:', url);
|
||||
}
|
||||
|
||||
const tmpPath = agentPath + '.tmp';
|
||||
const file = fs.createWriteStream(tmpPath);
|
||||
|
||||
const stream = await smartDownloadStream(DUALAUTH_AGENT_URL, (chunk, downloadedBytes, total) => {
|
||||
if (progressCallback && total) {
|
||||
const percent = 20 + Math.floor((downloadedBytes / total) * 70);
|
||||
progressCallback(`${action} agent... ${(downloadedBytes / 1024).toFixed(0)} KB`, percent);
|
||||
}
|
||||
});
|
||||
|
||||
stream.pipe(file);
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
file.on('finish', () => { file.close(); resolve(); });
|
||||
file.on('error', reject);
|
||||
stream.on('error', reject);
|
||||
const handleResponse = (response) => {
|
||||
if (response.statusCode === 302 || response.statusCode === 301) {
|
||||
https.get(response.headers.location, handleResponse).on('error', reject);
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.statusCode !== 200) {
|
||||
reject(new Error(`Failed to download: HTTP ${response.statusCode}`));
|
||||
return;
|
||||
}
|
||||
|
||||
const file = fs.createWriteStream(serverPath);
|
||||
const totalSize = parseInt(response.headers['content-length'], 10);
|
||||
let downloaded = 0;
|
||||
|
||||
response.on('data', (chunk) => {
|
||||
downloaded += chunk.length;
|
||||
if (progressCallback && totalSize) {
|
||||
const percent = 30 + Math.floor((downloaded / totalSize) * 60);
|
||||
progressCallback(`Downloading... ${(downloaded / 1024 / 1024).toFixed(2)} MB`, percent);
|
||||
}
|
||||
});
|
||||
|
||||
response.pipe(file);
|
||||
file.on('finish', () => {
|
||||
file.close();
|
||||
resolve();
|
||||
});
|
||||
};
|
||||
|
||||
https.get(url, handleResponse).on('error', (err) => {
|
||||
fs.unlink(serverPath, () => {});
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
|
||||
// Verify download
|
||||
const stats = fs.statSync(tmpPath);
|
||||
if (stats.size < 1024) {
|
||||
fs.unlinkSync(tmpPath);
|
||||
const error = 'Downloaded agent too small (corrupt or failed download)';
|
||||
console.error(error);
|
||||
return { success: false, error };
|
||||
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)' };
|
||||
}
|
||||
|
||||
// Atomic move
|
||||
if (fs.existsSync(agentPath)) {
|
||||
fs.unlinkSync(agentPath);
|
||||
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' };
|
||||
}
|
||||
fs.renameSync(tmpPath, agentPath);
|
||||
console.log(' Verification successful - DualAuth classes present');
|
||||
|
||||
// Save version
|
||||
const version = remoteVersion || 'unknown';
|
||||
fs.writeFileSync(versionPath, version, 'utf8');
|
||||
// Mark as patched
|
||||
const sourceUrl = branch === 'pre-release'
|
||||
? 'https://patcher.authbp.xyz/download/patched_prerelease'
|
||||
: 'https://patcher.authbp.xyz/download/patched_release';
|
||||
|
||||
fs.writeFileSync(patchFlagFile, JSON.stringify({
|
||||
domain: newDomain,
|
||||
branch: branch,
|
||||
patchedAt: new Date().toISOString(),
|
||||
patcher: 'PrePatchedDownload',
|
||||
source: sourceUrl
|
||||
}));
|
||||
|
||||
console.log(`DualAuth Agent ${agentExists ? 'updated' : 'downloaded'} (${(stats.size / 1024).toFixed(0)} KB, ${version})`);
|
||||
if (progressCallback) progressCallback('DualAuth Agent ready', 100);
|
||||
return { success: true, agentPath, updated: agentExists, version };
|
||||
if (progressCallback) progressCallback('Server patching complete', 100);
|
||||
console.log('=== Server Patching Complete ===');
|
||||
return { success: true, patchCount: 1 };
|
||||
|
||||
} catch (downloadError) {
|
||||
console.error(`Failed to download DualAuth Agent: ${downloadError.message}`);
|
||||
// Clean up temp file
|
||||
const tmpPath = agentPath + '.tmp';
|
||||
if (fs.existsSync(tmpPath)) {
|
||||
try { fs.unlinkSync(tmpPath); } catch (e) { /* ignore */ }
|
||||
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);
|
||||
console.log('Restored backup after download failure');
|
||||
}
|
||||
// If we had an existing agent, still use it
|
||||
if (agentExists) {
|
||||
console.log('Using existing agent despite update failure');
|
||||
return { success: true, agentPath, alreadyExists: true, version: localVersion };
|
||||
}
|
||||
return { success: false, error: downloadError.message };
|
||||
|
||||
return { success: false, error: `Failed to download patched server: ${downloadError.message}` };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -682,12 +758,12 @@ class ClientPatcher {
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure client is patched and DualAuth Agent is available before launching
|
||||
* Ensure both client and server are patched before launching
|
||||
*/
|
||||
async ensureClientPatched(gameDir, progressCallback, javaPath = null, branch = 'release') {
|
||||
const results = {
|
||||
client: null,
|
||||
agent: null,
|
||||
server: null,
|
||||
success: true
|
||||
};
|
||||
|
||||
@@ -704,23 +780,22 @@ class ClientPatcher {
|
||||
results.client = { success: false, error: 'Client binary not found' };
|
||||
}
|
||||
|
||||
// Download DualAuth ByteBuddy Agent (runtime patching, no JAR modification)
|
||||
const serverDir = path.join(gameDir, 'Server');
|
||||
if (fs.existsSync(serverDir)) {
|
||||
if (progressCallback) progressCallback('Checking DualAuth Agent...', 50);
|
||||
results.agent = await this.ensureAgentAvailable(serverDir, (msg, pct) => {
|
||||
const serverPath = this.findServerPath(gameDir);
|
||||
if (serverPath) {
|
||||
if (progressCallback) progressCallback('Patching server JAR...', 50);
|
||||
results.server = await this.patchServer(serverPath, (msg, pct) => {
|
||||
if (progressCallback) {
|
||||
progressCallback(`Agent: ${msg}`, pct ? 50 + pct / 2 : null);
|
||||
progressCallback(`Server: ${msg}`, pct ? 50 + pct / 2 : null);
|
||||
}
|
||||
});
|
||||
}, branch);
|
||||
} else {
|
||||
console.warn('Server directory not found, skipping agent download');
|
||||
results.agent = { success: true, skipped: true };
|
||||
console.warn('Could not find HytaleServer.jar');
|
||||
results.server = { success: false, error: 'Server JAR not found' };
|
||||
}
|
||||
|
||||
results.success = (results.client && results.client.success) || (results.agent && results.agent.success);
|
||||
results.alreadyPatched = (results.client && results.client.alreadyPatched) && (results.agent && results.agent.alreadyExists);
|
||||
results.patchCount = results.client ? results.client.patchCount || 0 : 0;
|
||||
results.success = (results.client && results.client.success) || (results.server && results.server.success);
|
||||
results.alreadyPatched = (results.client && results.client.alreadyPatched) && (results.server && results.server.alreadyPatched);
|
||||
results.patchCount = (results.client ? results.client.patchCount || 0 : 0) + (results.server ? results.server.patchCount || 0 : 0);
|
||||
|
||||
if (progressCallback) progressCallback('Patching complete', 100);
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
const { execSync, spawnSync } = require('child_process');
|
||||
const { execSync } = require('child_process');
|
||||
const fs = require('fs');
|
||||
|
||||
function getOS() {
|
||||
@@ -116,454 +116,117 @@ function detectGpu() {
|
||||
}
|
||||
|
||||
function detectGpuLinux() {
|
||||
let output = '';
|
||||
try {
|
||||
output = execSync('lspci -nn | grep -E "VGA|3D"', { encoding: 'utf8' });
|
||||
} catch (e) {
|
||||
return { mode: 'integrated', vendor: 'intel', integratedName: 'Unknown', dedicatedName: null };
|
||||
}
|
||||
|
||||
const output = execSync('lspci -nn | grep \'VGA\\|3D\'', { encoding: 'utf8' });
|
||||
const lines = output.split('\n').filter(line => line.trim());
|
||||
|
||||
let gpus = {
|
||||
integrated: [],
|
||||
dedicated: []
|
||||
};
|
||||
let integratedName = null;
|
||||
let dedicatedName = null;
|
||||
let hasNvidia = false;
|
||||
let hasAmd = false;
|
||||
|
||||
for (const line of lines) {
|
||||
// Example: 01:00.0 VGA compatible controller [0300]: NVIDIA Corporation TU116 [GeForce GTX 1660 Ti] [10de:2182] (rev a1)
|
||||
|
||||
// Matches all content inside [...]
|
||||
const brackets = line.match(/\[([^\]]+)\]/g);
|
||||
|
||||
let name = line; // fallback
|
||||
let vendorId = '';
|
||||
|
||||
if (brackets && brackets.length >= 2) {
|
||||
const idBracket = brackets.find(b => b.includes(':')); // [10de:2182]
|
||||
if (idBracket) {
|
||||
vendorId = idBracket.replace(/[\[\]]/g, '').split(':')[0].toLowerCase();
|
||||
|
||||
// The bracket before the ID bracket is usually the model name.
|
||||
const idIndex = brackets.indexOf(idBracket);
|
||||
if (idIndex > 0) {
|
||||
name = brackets[idIndex - 1].replace(/[\[\]]/g, '');
|
||||
}
|
||||
if (line.includes('VGA') || line.includes('3D')) {
|
||||
const match = line.match(/\[([^\]]+)\]/g);
|
||||
let modelName = null;
|
||||
if (match && match.length >= 2) {
|
||||
modelName = match[1].slice(1, -1);
|
||||
}
|
||||
} else if (brackets && brackets.length === 1) {
|
||||
name = brackets[0].replace(/[\[\]]/g, '');
|
||||
}
|
||||
|
||||
// Clean name
|
||||
name = name.trim();
|
||||
const lowerName = name.toLowerCase();
|
||||
const lowerLine = line.toLowerCase();
|
||||
|
||||
// Vendor detection
|
||||
const isNvidia = lowerLine.includes('nvidia') || vendorId === '10de';
|
||||
const isAmd = lowerLine.includes('amd') || lowerLine.includes('radeon') || vendorId === '1002';
|
||||
const isIntel = lowerLine.includes('intel') || vendorId === '8086';
|
||||
|
||||
// Intel Arc detection
|
||||
const isIntelArc = isIntel && (lowerName.includes('arc') || lowerName.includes('a770') || lowerName.includes('a750') || lowerName.includes('a380'));
|
||||
|
||||
let vendor = 'unknown';
|
||||
if (isNvidia) vendor = 'nvidia';
|
||||
else if (isAmd) vendor = 'amd';
|
||||
else if (isIntel) vendor = 'intel';
|
||||
|
||||
let vramMb = 0;
|
||||
|
||||
// VRAM Detection Logic
|
||||
if (isNvidia) {
|
||||
try {
|
||||
// Try nvidia-smi
|
||||
const smiOutput = execSync('nvidia-smi --query-gpu=memory.total --format=csv,noheader,nounits', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
|
||||
const vramVal = parseInt(smiOutput.split('\n')[0]); // Take first if multiple
|
||||
if (!isNaN(vramVal)) {
|
||||
vramMb = vramVal;
|
||||
}
|
||||
} catch (err) {
|
||||
// failed
|
||||
if (line.includes('10de:') || line.toLowerCase().includes('nvidia')) {
|
||||
hasNvidia = true;
|
||||
dedicatedName = "NVIDIA " + modelName || 'NVIDIA GPU';
|
||||
console.log('Detected NVIDIA GPU:', dedicatedName);
|
||||
} else if (line.includes('1002:') || line.toLowerCase().includes('amd') || line.toLowerCase().includes('radeon')) {
|
||||
hasAmd = true;
|
||||
dedicatedName = "AMD " + modelName || 'AMD GPU';
|
||||
console.log('Detected AMD GPU:', dedicatedName);
|
||||
} else if (line.includes('8086:') || line.toLowerCase().includes('intel')) {
|
||||
integratedName = "Intel " + modelName || 'Intel GPU';
|
||||
console.log('Detected Intel GPU:', integratedName);
|
||||
}
|
||||
} else if (isAmd) {
|
||||
// Try /sys/class/drm/card*/device/mem_info_vram_total
|
||||
// This is a bit heuristical, we need to match the card.
|
||||
// But usually checking any card with AMD vendor in /sys is a good guess if we just want "the AMD GPU vram".
|
||||
try {
|
||||
const cards = fs.readdirSync('/sys/class/drm').filter(c => c.startsWith('card') && !c.includes('-'));
|
||||
for (const card of cards) {
|
||||
try {
|
||||
const vendorFile = fs.readFileSync(`/sys/class/drm/${card}/device/vendor`, 'utf8').trim();
|
||||
if (vendorFile === '0x1002') { // AMD vendor ID
|
||||
const vramBytes = fs.readFileSync(`/sys/class/drm/${card}/device/mem_info_vram_total`, 'utf8').trim();
|
||||
vramMb = Math.round(parseInt(vramBytes) / (1024 * 1024));
|
||||
if (vramMb > 0) break;
|
||||
}
|
||||
} catch (e2) {}
|
||||
}
|
||||
} catch (err) {}
|
||||
} else if (isIntel) {
|
||||
// Try lspci -v to get prefetchable memory (stolen/dedicated aperture)
|
||||
try {
|
||||
// Extract slot from line, e.g. "00:02.0"
|
||||
const slot = line.split(' ')[0];
|
||||
if (slot && /^[0-9a-f:.]+$/.test(slot)) {
|
||||
const verbose = execSync(`lspci -v -s ${slot}`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
|
||||
const vLines = verbose.split('\n');
|
||||
for (const vLine of vLines) {
|
||||
// Match "Memory at ... (..., prefetchable) [size=256M]"
|
||||
// Must ensure it is prefetchable and NOT non-prefetchable
|
||||
if (vLine.includes('prefetchable') && !vLine.includes('non-prefetchable')) {
|
||||
const match = vLine.match(/size=([0-9]+)([KMGT])/);
|
||||
if (match) {
|
||||
let size = parseInt(match[1]);
|
||||
const unit = match[2];
|
||||
if (unit === 'G') size *= 1024;
|
||||
else if (unit === 'K') size /= 1024;
|
||||
// M is default
|
||||
if (size > 0) {
|
||||
vramMb = size;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
const gpuInfo = {
|
||||
name: name,
|
||||
vendor: vendor,
|
||||
vram: vramMb
|
||||
};
|
||||
|
||||
if (isNvidia || isAmd || isIntelArc) {
|
||||
gpus.dedicated.push(gpuInfo);
|
||||
} else if (isIntel) {
|
||||
gpus.integrated.push(gpuInfo);
|
||||
} else {
|
||||
// Unknown vendor or other, fallback to integrated list to be safe
|
||||
gpus.integrated.push(gpuInfo);
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: Attempt to get Integrated VRAM via glxinfo if it's STILL 0 (common for Intel iGPUs if lspci failed)
|
||||
// glxinfo -B usually reports the active renderer's "Video memory" which includes shared memory for iGPUs.
|
||||
if (gpus.integrated.length > 0 && gpus.integrated[0].vram === 0) {
|
||||
try {
|
||||
const glxOut = execSync('glxinfo -B', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
|
||||
const lines = glxOut.split('\n');
|
||||
let glxVendor = '';
|
||||
let glxMem = 0;
|
||||
|
||||
for (const line of lines) {
|
||||
const trim = line.trim();
|
||||
if (trim.startsWith('Device:')) {
|
||||
const lower = trim.toLowerCase();
|
||||
if (lower.includes('intel')) glxVendor = 'intel';
|
||||
else if (lower.includes('nvidia')) glxVendor = 'nvidia';
|
||||
else if (lower.includes('amd') || lower.includes('ati')) glxVendor = 'amd';
|
||||
} else if (trim.startsWith('Video memory:')) {
|
||||
// Example: "Video memory: 15861MB"
|
||||
const memStr = trim.split(':')[1].replace('MB', '').trim();
|
||||
glxMem = parseInt(memStr, 10);
|
||||
}
|
||||
}
|
||||
|
||||
// If glxinfo reports Intel and we have an Intel integrated GPU, update it
|
||||
// We check vendor match to ensure we don't accidentally assign Nvidia VRAM to Intel if user is running on dGPU
|
||||
if (glxVendor === 'intel' && gpus.integrated[0].vendor === 'intel' && glxMem > 0) {
|
||||
gpus.integrated[0].vram = glxMem;
|
||||
}
|
||||
} catch (err) {
|
||||
// glxinfo missing or failed, ignore
|
||||
}
|
||||
if (hasNvidia) {
|
||||
return { mode: 'dedicated', vendor: 'nvidia', integratedName: integratedName || 'Intel GPU', dedicatedName };
|
||||
} else if (hasAmd) {
|
||||
return { mode: 'dedicated', vendor: 'amd', integratedName: integratedName || 'Intel GPU', dedicatedName };
|
||||
} else {
|
||||
return { mode: 'integrated', vendor: 'intel', integratedName: integratedName || 'Intel GPU', dedicatedName: null };
|
||||
}
|
||||
|
||||
const primaryDedicated = gpus.dedicated[0] || null;
|
||||
const primaryIntegrated = gpus.integrated[0] || { name: 'Intel GPU', vram: 0 };
|
||||
|
||||
return {
|
||||
mode: primaryDedicated ? 'dedicated' : 'integrated',
|
||||
vendor: primaryDedicated ? primaryDedicated.vendor : (gpus.integrated[0] ? gpus.integrated[0].vendor : 'intel'),
|
||||
integratedName: primaryIntegrated.name,
|
||||
dedicatedName: primaryDedicated ? primaryDedicated.name : null,
|
||||
dedicatedVram: primaryDedicated ? primaryDedicated.vram : 0,
|
||||
integratedVram: primaryIntegrated.vram
|
||||
};
|
||||
}
|
||||
|
||||
function detectGpuWindows() {
|
||||
let output = '';
|
||||
let commandUsed = 'cim'; // Track which command succeeded
|
||||
const POWERSHELL_TIMEOUT = 5000; // 5 second timeout to prevent hanging
|
||||
const output = execSync('wmic path win32_VideoController get name', { encoding: 'utf8' });
|
||||
const lines = output.split('\n').map(line => line.trim()).filter(line => line && line !== 'Name');
|
||||
|
||||
try {
|
||||
// Use spawnSync with explicit timeout instead of execSync to avoid ghost processes
|
||||
// Fetch Name and AdapterRAM (VRAM in bytes)
|
||||
const result = spawnSync('powershell.exe', [
|
||||
'-NoProfile',
|
||||
'-ExecutionPolicy', 'Bypass',
|
||||
'-Command',
|
||||
'Get-CimInstance Win32_VideoController | Select-Object Name, AdapterRAM | ConvertTo-Csv -NoTypeInformation'
|
||||
], {
|
||||
encoding: 'utf8',
|
||||
timeout: POWERSHELL_TIMEOUT,
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
windowsHide: true
|
||||
});
|
||||
|
||||
if (result.error) {
|
||||
throw result.error;
|
||||
}
|
||||
|
||||
if (result.status === 0 && result.stdout) {
|
||||
output = result.stdout;
|
||||
} else {
|
||||
throw new Error(`PowerShell returned status ${result.status || result.signal}`);
|
||||
}
|
||||
} catch (e) {
|
||||
try {
|
||||
// Fallback to Get-WmiObject (Older PowerShell)
|
||||
commandUsed = 'wmi';
|
||||
const result = spawnSync('powershell.exe', [
|
||||
'-NoProfile',
|
||||
'-ExecutionPolicy', 'Bypass',
|
||||
'-Command',
|
||||
'Get-WmiObject Win32_VideoController | Select-Object Name, AdapterRAM | ConvertTo-Csv -NoTypeInformation'
|
||||
], {
|
||||
encoding: 'utf8',
|
||||
timeout: POWERSHELL_TIMEOUT,
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
windowsHide: true
|
||||
});
|
||||
|
||||
if (result.error) {
|
||||
throw result.error;
|
||||
}
|
||||
|
||||
if (result.status === 0 && result.stdout) {
|
||||
output = result.stdout;
|
||||
} else {
|
||||
throw new Error(`PowerShell WMI returned status ${result.status || result.signal}`);
|
||||
}
|
||||
} catch (e2) {
|
||||
// Fallback to wmic (Deprecated, often missing on newer Windows)
|
||||
// Note: This fallback likely won't provide VRAM in the same reliable CSV format easily,
|
||||
// so we stick to just getting the Name to at least allow the app to launch.
|
||||
try {
|
||||
commandUsed = 'wmic';
|
||||
const result = spawnSync('wmic.exe', ['path', 'win32_VideoController', 'get', 'name'], {
|
||||
encoding: 'utf8',
|
||||
timeout: POWERSHELL_TIMEOUT,
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
windowsHide: true
|
||||
});
|
||||
|
||||
if (result.error) {
|
||||
throw result.error;
|
||||
}
|
||||
|
||||
if (result.status === 0 && result.stdout) {
|
||||
output = result.stdout;
|
||||
} else {
|
||||
throw new Error(`wmic returned status ${result.status || result.signal}`);
|
||||
}
|
||||
} catch (err) {
|
||||
console.warn('All Windows GPU detection methods failed:', err.message);
|
||||
return { mode: 'unknown', vendor: 'none', integratedName: null, dedicatedName: null };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Parse lines.
|
||||
// PowerShell CSV output (Get-CimInstance/Get-WmiObject) usually looks like:
|
||||
// "Name","AdapterRAM"
|
||||
// "NVIDIA GeForce RTX 3060","12884901888"
|
||||
//
|
||||
// WMIC output is just plain text lines with the name (if we used the wmic command above).
|
||||
|
||||
const lines = output.split(/\r?\n/).filter(l => l.trim().length > 0);
|
||||
|
||||
let gpus = {
|
||||
integrated: [],
|
||||
dedicated: []
|
||||
};
|
||||
let integratedName = null;
|
||||
let dedicatedName = null;
|
||||
let hasNvidia = false;
|
||||
let hasAmd = false;
|
||||
|
||||
for (const line of lines) {
|
||||
// Skip header lines
|
||||
if (line.toLowerCase().includes('name') && (line.includes('AdapterRAM') || commandUsed === 'wmic')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
let name = '';
|
||||
let vramBytes = 0;
|
||||
|
||||
if (commandUsed === 'wmic') {
|
||||
name = line.trim();
|
||||
} else {
|
||||
// Parse CSV: "Name","AdapterRAM"
|
||||
// Simple regex to handle potential quotes.
|
||||
// This assumes simple CSV structure from ConvertTo-Csv.
|
||||
const parts = line.split(',');
|
||||
// Remove surrounding quotes if present
|
||||
const rawName = parts[0] ? parts[0].replace(/^"|"$/g, '') : '';
|
||||
const rawRam = parts[1] ? parts[1].replace(/^"|"$/g, '') : '0';
|
||||
|
||||
name = rawName.trim();
|
||||
vramBytes = parseInt(rawRam, 10) || 0;
|
||||
}
|
||||
|
||||
if (!name) continue;
|
||||
|
||||
const lowerName = name.toLowerCase();
|
||||
const vramMb = Math.round(vramBytes / (1024 * 1024));
|
||||
|
||||
// Logic for dGPU detection; added isIntelArc check
|
||||
const isNvidia = lowerName.includes('nvidia');
|
||||
const isAmd = lowerName.includes('amd') || lowerName.includes('radeon');
|
||||
const isIntelArc = lowerName.includes('arc') && lowerName.includes('intel');
|
||||
|
||||
const gpuInfo = {
|
||||
name: name,
|
||||
vendor: isNvidia ? 'nvidia' : (isAmd ? 'amd' : (isIntelArc ? 'intel' : 'unknown')),
|
||||
vram: vramMb
|
||||
};
|
||||
|
||||
if (isNvidia || isAmd || isIntelArc) {
|
||||
gpus.dedicated.push(gpuInfo);
|
||||
} else if (lowerName.includes('intel') || lowerName.includes('iris') || lowerName.includes('uhd')) {
|
||||
gpus.integrated.push(gpuInfo);
|
||||
} else {
|
||||
// Fallback: If unknown vendor but high VRAM (> 512MB), treat as dedicated?
|
||||
// Or just assume integrated if generic "Microsoft Basic Display Adapter" etc.
|
||||
// For now, if we can't identify it as dedicated vendor, put in integrated/other.
|
||||
gpus.integrated.push(gpuInfo);
|
||||
const lowerLine = line.toLowerCase();
|
||||
if (lowerLine.includes('nvidia')) {
|
||||
hasNvidia = true;
|
||||
dedicatedName = line;
|
||||
console.log('Detected NVIDIA GPU:', dedicatedName);
|
||||
} else if (lowerLine.includes('amd') || lowerLine.includes('radeon')) {
|
||||
hasAmd = true;
|
||||
dedicatedName = line;
|
||||
console.log('Detected AMD GPU:', dedicatedName);
|
||||
} else if (lowerLine.includes('intel')) {
|
||||
integratedName = line;
|
||||
console.log('Detected Intel GPU:', integratedName);
|
||||
}
|
||||
}
|
||||
|
||||
const primaryDedicated = gpus.dedicated[0] || null;
|
||||
const primaryIntegrated = gpus.integrated[0] || { name: 'Intel GPU', vram: 0 };
|
||||
|
||||
return {
|
||||
mode: primaryDedicated ? 'dedicated' : 'integrated',
|
||||
vendor: primaryDedicated ? primaryDedicated.vendor : 'intel', // Default to intel if only integrated found
|
||||
integratedName: primaryIntegrated.name,
|
||||
dedicatedName: primaryDedicated ? primaryDedicated.name : null,
|
||||
// Add VRAM info if available (mostly for debug or UI)
|
||||
dedicatedVram: primaryDedicated ? primaryDedicated.vram : 0,
|
||||
integratedVram: primaryIntegrated.vram
|
||||
};
|
||||
if (hasNvidia) {
|
||||
return { mode: 'dedicated', vendor: 'nvidia', integratedName: integratedName || 'Intel GPU', dedicatedName };
|
||||
} else if (hasAmd) {
|
||||
return { mode: 'dedicated', vendor: 'amd', integratedName: integratedName || 'Intel GPU', dedicatedName };
|
||||
} else {
|
||||
return { mode: 'integrated', vendor: 'intel', integratedName: integratedName || 'Intel GPU', dedicatedName: null };
|
||||
}
|
||||
}
|
||||
|
||||
function detectGpuMac() {
|
||||
let output = '';
|
||||
try {
|
||||
output = execSync('system_profiler SPDisplaysDataType', { encoding: 'utf8' });
|
||||
} catch (e) {
|
||||
return { mode: 'integrated', vendor: 'intel', integratedName: 'Unknown', dedicatedName: null };
|
||||
}
|
||||
|
||||
const output = execSync('system_profiler SPDisplaysDataType', { encoding: 'utf8' });
|
||||
const lines = output.split('\n');
|
||||
let gpus = {
|
||||
integrated: [],
|
||||
dedicated: []
|
||||
};
|
||||
|
||||
let currentGpu = null;
|
||||
let integratedName = null;
|
||||
let dedicatedName = null;
|
||||
let hasNvidia = false;
|
||||
let hasAmd = false;
|
||||
|
||||
for (const line of lines) {
|
||||
const trimmed = line.trim();
|
||||
|
||||
// New block starts with "Chipset Model:"
|
||||
if (trimmed.startsWith('Chipset Model:')) {
|
||||
if (currentGpu) {
|
||||
// Push previous
|
||||
categorizeMacGpu(currentGpu, gpus);
|
||||
}
|
||||
currentGpu = {
|
||||
name: trimmed.split(':')[1].trim(),
|
||||
vendor: 'unknown',
|
||||
vram: 0
|
||||
};
|
||||
} else if (currentGpu) {
|
||||
if (trimmed.startsWith('VRAM (Total):') || trimmed.startsWith('VRAM (Dynamic, Max):')) {
|
||||
// Parse VRAM: "1.5 GB" or "1536 MB"
|
||||
const valParts = trimmed.split(':')[1].trim().split(' ');
|
||||
let val = parseFloat(valParts[0]);
|
||||
if (valParts[1] && valParts[1].toUpperCase() === 'GB') {
|
||||
val = val * 1024;
|
||||
}
|
||||
currentGpu.vram = Math.round(val);
|
||||
} else if (trimmed.startsWith('Vendor:') || trimmed.startsWith('Vendor Name:')) {
|
||||
// "Vendor: NVIDIA (0x10de)"
|
||||
const v = trimmed.split(':')[1].toLowerCase();
|
||||
if (v.includes('nvidia')) currentGpu.vendor = 'nvidia';
|
||||
else if (v.includes('amd') || v.includes('ati')) currentGpu.vendor = 'amd';
|
||||
else if (v.includes('intel')) currentGpu.vendor = 'intel';
|
||||
else if (v.includes('apple')) currentGpu.vendor = 'apple';
|
||||
if (line.includes('Chipset Model:')) {
|
||||
const gpuName = line.split('Chipset Model:')[1].trim();
|
||||
const lowerGpu = gpuName.toLowerCase();
|
||||
if (lowerGpu.includes('nvidia')) {
|
||||
hasNvidia = true;
|
||||
dedicatedName = gpuName;
|
||||
console.log('Detected NVIDIA GPU:', dedicatedName);
|
||||
} else if (lowerGpu.includes('amd') || lowerGpu.includes('radeon')) {
|
||||
hasAmd = true;
|
||||
dedicatedName = gpuName;
|
||||
console.log('Detected AMD GPU:', dedicatedName);
|
||||
} else if (lowerGpu.includes('intel') || lowerGpu.includes('iris') || lowerGpu.includes('uhd')) {
|
||||
integratedName = gpuName;
|
||||
console.log('Detected Intel GPU:', integratedName);
|
||||
} else if (!dedicatedName && !integratedName) {
|
||||
// Fallback for Apple Silicon or other
|
||||
integratedName = gpuName;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Push last one
|
||||
if (currentGpu) {
|
||||
categorizeMacGpu(currentGpu, gpus);
|
||||
}
|
||||
|
||||
// If we have an Apple Silicon GPU (vendor=apple) but VRAM is 0, fetch system memory as it is unified.
|
||||
gpus.dedicated.forEach(gpu => {
|
||||
if (gpu.vendor === 'apple' && gpu.vram === 0) {
|
||||
try {
|
||||
const memSize = execSync('sysctl -n hw.memsize', { encoding: 'utf8' }).trim();
|
||||
// memSize is in bytes
|
||||
const memMb = Math.round(parseInt(memSize, 10) / (1024 * 1024));
|
||||
if (memMb > 0) gpu.vram = memMb;
|
||||
} catch (err) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const primaryDedicated = gpus.dedicated[0] || null;
|
||||
const primaryIntegrated = gpus.integrated[0] || { name: 'Integrated GPU', vram: 0 };
|
||||
|
||||
return {
|
||||
mode: primaryDedicated ? 'dedicated' : 'integrated',
|
||||
vendor: primaryDedicated ? primaryDedicated.vendor : (gpus.integrated[0] ? gpus.integrated[0].vendor : 'intel'),
|
||||
integratedName: primaryIntegrated.name,
|
||||
dedicatedName: primaryDedicated ? primaryDedicated.name : null,
|
||||
dedicatedVram: primaryDedicated ? primaryDedicated.vram : 0,
|
||||
integratedVram: primaryIntegrated.vram
|
||||
};
|
||||
}
|
||||
|
||||
function categorizeMacGpu(gpu, gpus) {
|
||||
const lowerName = gpu.name.toLowerCase();
|
||||
|
||||
// Refine vendor if still unknown
|
||||
if (gpu.vendor === 'unknown') {
|
||||
if (lowerName.includes('nvidia')) gpu.vendor = 'nvidia';
|
||||
else if (lowerName.includes('amd') || lowerName.includes('radeon')) gpu.vendor = 'amd';
|
||||
else if (lowerName.includes('intel')) gpu.vendor = 'intel';
|
||||
else if (lowerName.includes('apple') || lowerName.includes('m1') || lowerName.includes('m2') || lowerName.includes('m3')) gpu.vendor = 'apple';
|
||||
}
|
||||
|
||||
const isNvidia = gpu.vendor === 'nvidia';
|
||||
const isAmd = gpu.vendor === 'amd';
|
||||
const isApple = gpu.vendor === 'apple';
|
||||
|
||||
// Per user request, "project is not meant for Intel Mac (x86)",
|
||||
// so we treat Apple Silicon as the primary "dedicated-like" GPU for this app's context.
|
||||
|
||||
if (isNvidia || isAmd || isApple) {
|
||||
gpus.dedicated.push(gpu);
|
||||
if (hasNvidia) {
|
||||
return { mode: 'dedicated', vendor: 'nvidia', integratedName: integratedName || 'Integrated GPU', dedicatedName };
|
||||
} else if (hasAmd) {
|
||||
return { mode: 'dedicated', vendor: 'amd', integratedName: integratedName || 'Integrated GPU', dedicatedName };
|
||||
} else {
|
||||
// Intel or unknown
|
||||
gpus.integrated.push(gpu);
|
||||
return { mode: 'integrated', vendor: 'intel', integratedName: integratedName || 'Integrated GPU', dedicatedName: null };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -604,108 +267,11 @@ function setupGpuEnvironment(gpuPreference) {
|
||||
return envVars;
|
||||
}
|
||||
|
||||
function getSystemType() {
|
||||
const platform = getOS();
|
||||
try {
|
||||
if (platform === 'linux') return getSystemTypeLinux();
|
||||
if (platform === 'windows') return getSystemTypeWindows();
|
||||
if (platform === 'darwin') return getSystemTypeMac();
|
||||
return 'desktop'; // Default to desktop if unknown
|
||||
} catch (err) {
|
||||
console.warn('Failed to detect system type, defaulting to desktop:', err.message);
|
||||
return 'desktop';
|
||||
}
|
||||
}
|
||||
|
||||
function getSystemTypeLinux() {
|
||||
try {
|
||||
// Try reliable DMI check first
|
||||
if (fs.existsSync('/sys/class/dmi/id/chassis_type')) {
|
||||
const type = parseInt(fs.readFileSync('/sys/class/dmi/id/chassis_type', 'utf8').trim());
|
||||
// 8=Portable, 9=Laptop, 10=Notebook, 11=Hand Held, 12=Docking Station, 14=Sub Notebook
|
||||
if ([8, 9, 10, 11, 12, 14, 31, 32].includes(type)) {
|
||||
return 'laptop';
|
||||
}
|
||||
}
|
||||
// Fallback to chassis_id for some systems? Usually chassis_type is enough.
|
||||
return 'desktop';
|
||||
} catch (e) {
|
||||
return 'desktop';
|
||||
}
|
||||
}
|
||||
|
||||
function getSystemTypeWindows() {
|
||||
const POWERSHELL_TIMEOUT = 5000; // 5 second timeout
|
||||
|
||||
try {
|
||||
// Use spawnSync instead of execSync to avoid ghost processes
|
||||
const result = spawnSync('powershell.exe', [
|
||||
'-NoProfile',
|
||||
'-ExecutionPolicy', 'Bypass',
|
||||
'-Command',
|
||||
'Get-CimInstance Win32_SystemEnclosure | Select-Object -ExpandProperty ChassisTypes'
|
||||
], {
|
||||
encoding: 'utf8',
|
||||
timeout: POWERSHELL_TIMEOUT,
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
windowsHide: true
|
||||
});
|
||||
|
||||
if (result.error || result.status !== 0) {
|
||||
throw new Error(`PowerShell failed: ${result.error?.message || result.signal}`);
|
||||
}
|
||||
|
||||
const output = (result.stdout || '').trim();
|
||||
// Output might be a single number or array.
|
||||
// Clean it up
|
||||
const types = output.split(/\s+/).map(t => parseInt(t)).filter(n => !isNaN(n));
|
||||
|
||||
// Laptop codes: 8, 9, 10, 11, 12, 14, 31, 32
|
||||
const laptopCodes = [8, 9, 10, 11, 12, 14, 31, 32];
|
||||
|
||||
for (const t of types) {
|
||||
if (laptopCodes.includes(t)) return 'laptop';
|
||||
}
|
||||
return 'desktop';
|
||||
} catch (e) {
|
||||
// Fallback wmic
|
||||
try {
|
||||
const result = spawnSync('wmic.exe', ['path', 'win32_systemenclosure', 'get', 'chassistypes'], {
|
||||
encoding: 'utf8',
|
||||
timeout: POWERSHELL_TIMEOUT,
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
windowsHide: true
|
||||
});
|
||||
|
||||
if (result.status === 0 && result.stdout) {
|
||||
const output = result.stdout.trim();
|
||||
if (output.includes('8') || output.includes('9') || output.includes('10') || output.includes('14')) {
|
||||
return 'laptop';
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.warn('System type detection failed:', err.message);
|
||||
}
|
||||
return 'desktop';
|
||||
}
|
||||
}
|
||||
|
||||
function getSystemTypeMac() {
|
||||
try {
|
||||
const model = execSync('sysctl -n hw.model', { encoding: 'utf8' }).trim().toLowerCase();
|
||||
if (model.includes('book')) return 'laptop';
|
||||
return 'desktop';
|
||||
} catch (e) {
|
||||
return 'desktop';
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getOS,
|
||||
getArch,
|
||||
isWaylandSession,
|
||||
setupWaylandEnvironment,
|
||||
detectGpu,
|
||||
setupGpuEnvironment,
|
||||
getSystemType
|
||||
setupGpuEnvironment
|
||||
};
|
||||
|
||||
@@ -1,426 +0,0 @@
|
||||
const crypto = require('crypto');
|
||||
const axios = require('axios');
|
||||
const https = require('https');
|
||||
const { PassThrough } = require('stream');
|
||||
|
||||
const PROXY_URL = process.env.HF2P_PROXY_URL || 'your_proxy_url_here';
|
||||
const SECRET_KEY = process.env.HF2P_SECRET_KEY || 'your_secret_key_here_for_jwt';
|
||||
const USE_DIRECT_FALLBACK = process.env.HF2P_USE_FALLBACK !== 'false';
|
||||
const DIRECT_TIMEOUT = 7000; // 7 seconds timeout
|
||||
|
||||
console.log('[ProxyClient] Initialized with proxy URL:', PROXY_URL ? 'YES' : 'NO');
|
||||
console.log('[ProxyClient] Secret key configured:', SECRET_KEY ? 'YES' : 'NO');
|
||||
console.log('[ProxyClient] Direct connection fallback:', USE_DIRECT_FALLBACK ? 'ENABLED' : 'DISABLED');
|
||||
console.log('[ProxyClient] Direct timeout before fallback:', DIRECT_TIMEOUT / 1000, 'seconds');
|
||||
|
||||
function generateToken() {
|
||||
const timestamp = Date.now().toString();
|
||||
const hash = crypto
|
||||
.createHmac('sha256', SECRET_KEY)
|
||||
.update(timestamp)
|
||||
.digest('hex');
|
||||
const token = `${timestamp}:${hash}`;
|
||||
console.log('[ProxyClient] Generated auth token:', token.substring(0, 20) + '...');
|
||||
return token;
|
||||
}
|
||||
|
||||
// Direct request without proxy
|
||||
async function directRequest(url, options = {}) {
|
||||
console.log('[ProxyClient] Attempting direct request (no proxy)');
|
||||
console.log('[ProxyClient] Direct URL:', url);
|
||||
|
||||
const timeoutMs = options.timeout || DIRECT_TIMEOUT;
|
||||
const controller = new AbortController();
|
||||
|
||||
const timeoutId = setTimeout(() => {
|
||||
console.warn('[ProxyClient] TIMEOUT! Aborting direct request after', timeoutMs, 'ms');
|
||||
controller.abort();
|
||||
}, timeoutMs);
|
||||
|
||||
try {
|
||||
const config = {
|
||||
method: options.method || 'GET',
|
||||
url: url,
|
||||
headers: options.headers || {},
|
||||
timeout: timeoutMs,
|
||||
responseType: options.responseType,
|
||||
signal: controller.signal
|
||||
};
|
||||
|
||||
const response = await axios(config);
|
||||
clearTimeout(timeoutId);
|
||||
return response;
|
||||
} catch (error) {
|
||||
clearTimeout(timeoutId);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// Proxy request (original function)
|
||||
async function proxyRequest(url, options = {}) {
|
||||
console.log('[ProxyClient] Starting proxy request');
|
||||
console.log('[ProxyClient] Original URL:', url);
|
||||
console.log('[ProxyClient] Options:', JSON.stringify(options, null, 2));
|
||||
|
||||
try {
|
||||
const token = generateToken();
|
||||
const urlObj = new URL(url);
|
||||
const targetUrl = `${urlObj.protocol}//${urlObj.host}`;
|
||||
|
||||
console.log('[ProxyClient] Parsed URL components:');
|
||||
console.log(' - Protocol:', urlObj.protocol);
|
||||
console.log(' - Host:', urlObj.host);
|
||||
console.log(' - Pathname:', urlObj.pathname);
|
||||
console.log(' - Search:', urlObj.search);
|
||||
console.log(' - Target URL:', targetUrl);
|
||||
|
||||
const proxyEndpoint = `${PROXY_URL}/proxy${urlObj.pathname}${urlObj.search}`;
|
||||
console.log('[ProxyClient] Proxy endpoint:', proxyEndpoint);
|
||||
|
||||
const config = {
|
||||
method: options.method || 'GET',
|
||||
url: proxyEndpoint,
|
||||
headers: {
|
||||
'X-Auth-Token': token,
|
||||
'X-Target-URL': targetUrl,
|
||||
...(options.headers || {})
|
||||
},
|
||||
timeout: options.timeout || 30000,
|
||||
responseType: options.responseType
|
||||
};
|
||||
|
||||
console.log('[ProxyClient] Request config:', JSON.stringify({
|
||||
method: config.method,
|
||||
url: config.url,
|
||||
headers: config.headers,
|
||||
timeout: config.timeout,
|
||||
responseType: config.responseType
|
||||
}, null, 2));
|
||||
|
||||
const response = await axios(config);
|
||||
console.log('[ProxyClient] Response received - Status:', response.status);
|
||||
console.log('[ProxyClient] Response headers:', JSON.stringify(response.headers, null, 2));
|
||||
|
||||
return response;
|
||||
} catch (error) {
|
||||
console.error('[ProxyClient] Request failed!');
|
||||
console.error('[ProxyClient] Error type:', error.constructor.name);
|
||||
console.error('[ProxyClient] Error message:', error.message);
|
||||
if (error.response) {
|
||||
console.error('[ProxyClient] Response status:', error.response.status);
|
||||
console.error('[ProxyClient] Response data:', error.response.data);
|
||||
console.error('[ProxyClient] Response headers:', error.response.headers);
|
||||
}
|
||||
if (error.config) {
|
||||
console.error('[ProxyClient] Failed request URL:', error.config.url);
|
||||
console.error('[ProxyClient] Failed request headers:', error.config.headers);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// Smart request with automatic fallback
|
||||
async function smartRequest(url, options = {}) {
|
||||
if (!USE_DIRECT_FALLBACK) {
|
||||
console.log('[ProxyClient] Fallback disabled, using proxy directly');
|
||||
return proxyRequest(url, options);
|
||||
}
|
||||
|
||||
console.log('[ProxyClient] Smart request with fallback enabled');
|
||||
console.log('[ProxyClient] Direct timeout configured:', DIRECT_TIMEOUT, 'ms');
|
||||
|
||||
const directStartTime = Date.now();
|
||||
try {
|
||||
console.log('[ProxyClient] [ATTEMPT 1/2] Trying direct connection first...');
|
||||
const response = await directRequest(url, options);
|
||||
const directDuration = Date.now() - directStartTime;
|
||||
console.log('[ProxyClient] [SUCCESS] Direct connection successful in', directDuration, 'ms');
|
||||
return response;
|
||||
} catch (directError) {
|
||||
const directDuration = Date.now() - directStartTime;
|
||||
console.warn('[ProxyClient] [FAILED] Direct connection failed after', directDuration, 'ms');
|
||||
console.warn('[ProxyClient] Error message:', directError.message);
|
||||
console.warn('[ProxyClient] Error code:', directError.code);
|
||||
|
||||
// Always fallback to proxy on any error
|
||||
console.log('[ProxyClient] Attempting proxy fallback for all errors...');
|
||||
|
||||
if (true) {
|
||||
console.log('[ProxyClient] [ATTEMPT 2/2] Falling back to proxy connection...');
|
||||
try {
|
||||
const proxyStartTime = Date.now();
|
||||
const response = await proxyRequest(url, options);
|
||||
const proxyDuration = Date.now() - proxyStartTime;
|
||||
console.log('[ProxyClient] [SUCCESS] Proxy connection successful in', proxyDuration, 'ms');
|
||||
return response;
|
||||
} catch (proxyError) {
|
||||
console.error('[ProxyClient] [FAILED] Both direct and proxy connections failed!');
|
||||
console.error('[ProxyClient] Direct error:', directError.message);
|
||||
console.error('[ProxyClient] Proxy error:', proxyError.message);
|
||||
throw proxyError;
|
||||
}
|
||||
} else {
|
||||
console.log('[ProxyClient] [SKIP] Direct error not related to connectivity, not falling back');
|
||||
throw directError;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Direct download stream without proxy
|
||||
function directDownloadStream(url, onData) {
|
||||
console.log('[ProxyClient] Starting direct download stream (no proxy)');
|
||||
console.log('[ProxyClient] Direct download URL:', url);
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
try {
|
||||
const urlObj = new URL(url);
|
||||
const protocol = urlObj.protocol === 'https:' ? https : require('http');
|
||||
|
||||
const options = {
|
||||
hostname: urlObj.hostname,
|
||||
port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
|
||||
path: urlObj.pathname + urlObj.search,
|
||||
method: 'GET',
|
||||
timeout: DIRECT_TIMEOUT
|
||||
};
|
||||
|
||||
const handleResponse = (response) => {
|
||||
if (response.statusCode === 302 || response.statusCode === 301) {
|
||||
const redirectUrl = response.headers.location;
|
||||
console.log('[ProxyClient] Direct redirect to:', redirectUrl);
|
||||
directDownloadStream(redirectUrl, onData).then(resolve).catch(reject);
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.statusCode !== 200) {
|
||||
reject(new Error(`Direct HTTP ${response.statusCode}`));
|
||||
return;
|
||||
}
|
||||
|
||||
if (onData) {
|
||||
const totalSize = parseInt(response.headers['content-length'], 10);
|
||||
let downloaded = 0;
|
||||
const passThrough = new PassThrough();
|
||||
|
||||
response.on('data', (chunk) => {
|
||||
downloaded += chunk.length;
|
||||
onData(chunk, downloaded, totalSize);
|
||||
});
|
||||
|
||||
response.pipe(passThrough);
|
||||
resolve(passThrough);
|
||||
} else {
|
||||
resolve(response);
|
||||
}
|
||||
};
|
||||
|
||||
const req = protocol.get(options, handleResponse);
|
||||
|
||||
req.on('error', (error) => {
|
||||
console.error('[ProxyClient] Direct download error:', error.message);
|
||||
reject(error);
|
||||
});
|
||||
|
||||
req.on('timeout', () => {
|
||||
console.warn('[ProxyClient] TIMEOUT! Direct download timed out after', DIRECT_TIMEOUT, 'ms');
|
||||
req.destroy();
|
||||
const timeoutError = new Error('ETIMEDOUT: Direct connection timeout');
|
||||
timeoutError.code = 'ETIMEDOUT';
|
||||
reject(timeoutError);
|
||||
});
|
||||
|
||||
|
||||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function getProxyDownloadStream(url, onData) {
|
||||
console.log('[ProxyClient] Starting download stream');
|
||||
console.log('[ProxyClient] Download URL:', url);
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
try {
|
||||
const token = generateToken();
|
||||
const urlObj = new URL(url);
|
||||
const targetUrl = `${urlObj.protocol}//${urlObj.host}`;
|
||||
|
||||
console.log('[ProxyClient] Download URL parsed:');
|
||||
console.log(' - Protocol:', urlObj.protocol);
|
||||
console.log(' - Host:', urlObj.host);
|
||||
console.log(' - Hostname:', urlObj.hostname);
|
||||
console.log(' - Port:', urlObj.port);
|
||||
console.log(' - Pathname:', urlObj.pathname);
|
||||
console.log(' - Search:', urlObj.search);
|
||||
console.log(' - Target URL:', targetUrl);
|
||||
|
||||
const proxyUrl = new URL(PROXY_URL);
|
||||
const requestPath = `/proxy${urlObj.pathname}${urlObj.search}`;
|
||||
|
||||
console.log('[ProxyClient] Proxy configuration:');
|
||||
console.log(' - Proxy URL:', PROXY_URL);
|
||||
console.log(' - Proxy protocol:', proxyUrl.protocol);
|
||||
console.log(' - Proxy hostname:', proxyUrl.hostname);
|
||||
console.log(' - Proxy port:', proxyUrl.port);
|
||||
console.log(' - Request path:', requestPath);
|
||||
|
||||
const options = {
|
||||
hostname: proxyUrl.hostname,
|
||||
port: proxyUrl.port || (proxyUrl.protocol === 'https:' ? 443 : 80),
|
||||
path: requestPath,
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'X-Auth-Token': token,
|
||||
'X-Target-URL': targetUrl
|
||||
}
|
||||
};
|
||||
|
||||
console.log('[ProxyClient] HTTP request options:', JSON.stringify(options, null, 2));
|
||||
|
||||
const protocol = proxyUrl.protocol === 'https:' ? https : require('http');
|
||||
console.log('[ProxyClient] Using protocol:', proxyUrl.protocol);
|
||||
|
||||
const handleResponse = (response) => {
|
||||
console.log('[ProxyClient] Response received - Status:', response.statusCode);
|
||||
console.log('[ProxyClient] Response headers:', JSON.stringify(response.headers, null, 2));
|
||||
|
||||
if (response.statusCode === 302 || response.statusCode === 301) {
|
||||
const redirectUrl = response.headers.location;
|
||||
console.log('[ProxyClient] Redirect detected to:', redirectUrl);
|
||||
|
||||
if (redirectUrl.startsWith('http')) {
|
||||
console.log('[ProxyClient] Following redirect...');
|
||||
getProxyDownloadStream(redirectUrl, onData).then(resolve).catch(reject);
|
||||
} else {
|
||||
console.error('[ProxyClient] Invalid redirect URL:', redirectUrl);
|
||||
reject(new Error(`Invalid redirect: ${redirectUrl}`));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.statusCode !== 200) {
|
||||
console.error('[ProxyClient] Unexpected status code:', response.statusCode);
|
||||
console.error('[ProxyClient] Response message:', response.statusMessage);
|
||||
reject(new Error(`HTTP ${response.statusCode}`));
|
||||
return;
|
||||
}
|
||||
|
||||
if (onData) {
|
||||
const totalSize = parseInt(response.headers['content-length'], 10);
|
||||
console.log('[ProxyClient] Download starting - Total size:', totalSize, 'bytes');
|
||||
|
||||
let downloaded = 0;
|
||||
const passThrough = new PassThrough();
|
||||
|
||||
response.on('data', (chunk) => {
|
||||
downloaded += chunk.length;
|
||||
const progress = ((downloaded / totalSize) * 100).toFixed(2);
|
||||
onData(chunk, downloaded, totalSize);
|
||||
});
|
||||
|
||||
response.on('end', () => {
|
||||
console.log('[ProxyClient] Download completed -', downloaded, 'bytes received');
|
||||
});
|
||||
|
||||
response.on('error', (error) => {
|
||||
console.error('[ProxyClient] Response stream error:', error.message);
|
||||
});
|
||||
|
||||
response.pipe(passThrough);
|
||||
console.log('[ProxyClient] Stream piped to PassThrough');
|
||||
resolve(passThrough);
|
||||
} else {
|
||||
console.log('[ProxyClient] Returning raw response stream (no progress callback)');
|
||||
resolve(response);
|
||||
}
|
||||
};
|
||||
|
||||
const request = protocol.get(options, handleResponse);
|
||||
|
||||
request.on('error', (error) => {
|
||||
console.error('[ProxyClient] HTTP request error!');
|
||||
console.error('[ProxyClient] Error type:', error.constructor.name);
|
||||
console.error('[ProxyClient] Error message:', error.message);
|
||||
console.error('[ProxyClient] Error code:', error.code);
|
||||
console.error('[ProxyClient] Error stack:', error.stack);
|
||||
reject(error);
|
||||
});
|
||||
|
||||
console.log('[ProxyClient] HTTP request sent');
|
||||
|
||||
} catch (error) {
|
||||
console.error('[ProxyClient] Exception in getProxyDownloadStream!');
|
||||
console.error('[ProxyClient] Error type:', error.constructor.name);
|
||||
console.error('[ProxyClient] Error message:', error.message);
|
||||
console.error('[ProxyClient] Error stack:', error.stack);
|
||||
reject(error);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Smart download stream with automatic fallback
|
||||
function smartDownloadStream(url, onData) {
|
||||
if (!USE_DIRECT_FALLBACK) {
|
||||
console.log('[ProxyClient] Fallback disabled, using proxy stream directly');
|
||||
return getProxyDownloadStream(url, onData);
|
||||
}
|
||||
|
||||
console.log('[ProxyClient] Smart download stream with fallback enabled');
|
||||
console.log('[ProxyClient] Direct timeout configured:', DIRECT_TIMEOUT, 'ms');
|
||||
|
||||
return new Promise(async (resolve, reject) => {
|
||||
const directStartTime = Date.now();
|
||||
try {
|
||||
console.log('[ProxyClient] [DOWNLOAD 1/2] Trying direct download first...');
|
||||
const stream = await directDownloadStream(url, onData);
|
||||
const directDuration = Date.now() - directStartTime;
|
||||
console.log('[ProxyClient] [SUCCESS] Direct download stream established in', directDuration, 'ms');
|
||||
resolve(stream);
|
||||
} catch (directError) {
|
||||
const directDuration = Date.now() - directStartTime;
|
||||
console.warn('[ProxyClient] [FAILED] Direct download failed after', directDuration, 'ms');
|
||||
console.warn('[ProxyClient] Error message:', directError.message);
|
||||
console.warn('[ProxyClient] Error code:', directError.code);
|
||||
|
||||
// Always fallback to proxy on any error
|
||||
console.log('[ProxyClient] Attempting proxy fallback for all download errors...');
|
||||
|
||||
if (true) {
|
||||
console.log('[ProxyClient] [DOWNLOAD 2/2] Falling back to proxy download...');
|
||||
try {
|
||||
const proxyStartTime = Date.now();
|
||||
const stream = await getProxyDownloadStream(url, onData);
|
||||
const proxyDuration = Date.now() - proxyStartTime;
|
||||
console.log('[ProxyClient] [SUCCESS] Proxy download stream established in', proxyDuration, 'ms');
|
||||
resolve(stream);
|
||||
} catch (proxyError) {
|
||||
console.error('[ProxyClient] [FAILED] Both direct and proxy downloads failed!');
|
||||
console.error('[ProxyClient] Direct error:', directError.message);
|
||||
console.error('[ProxyClient] Proxy error:', proxyError.message);
|
||||
reject(proxyError);
|
||||
}
|
||||
} else {
|
||||
console.log('[ProxyClient] [SKIP] Direct error not related to connectivity, not falling back');
|
||||
reject(directError);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
// Recommended: Smart functions with automatic fallback
|
||||
smartRequest,
|
||||
smartDownloadStream,
|
||||
|
||||
// Legacy: Direct proxy functions (for manual control)
|
||||
proxyRequest,
|
||||
getProxyDownloadStream,
|
||||
|
||||
// Direct functions (no proxy)
|
||||
directRequest,
|
||||
directDownloadStream,
|
||||
|
||||
// Utilities
|
||||
generateToken
|
||||
};
|
||||
@@ -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,2 +1,3 @@
|
||||
provider: generic
|
||||
url: https://git.sanhost.net/sanasol/hytale-f2p/releases/download/latest
|
||||
provider: github
|
||||
owner: amiayweb # Change to your own GitHub username
|
||||
repo: Hytale-F2P
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
# Ghost Process Root Cause Analysis & Fix
|
||||
|
||||
## Problem Summary
|
||||
The Task Manager was freezing after the launcher (Hytale-F2P) ran. This was caused by **ghost/zombie PowerShell processes** spawned on Windows that were not being properly cleaned up.
|
||||
|
||||
## Root Cause
|
||||
|
||||
### Location
|
||||
**File:** `backend/utils/platformUtils.js`
|
||||
|
||||
**Functions affected:**
|
||||
1. `detectGpuWindows()` - Called during app startup and game launch
|
||||
2. `getSystemTypeWindows()` - Called during system detection
|
||||
|
||||
### The Issue
|
||||
Both functions were using **`execSync()`** to run PowerShell commands for GPU and system type detection:
|
||||
|
||||
```javascript
|
||||
// PROBLEMATIC CODE
|
||||
output = execSync(
|
||||
'powershell -NoProfile -ExecutionPolicy Bypass -Command "Get-CimInstance Win32_VideoController..."',
|
||||
{ encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
|
||||
);
|
||||
```
|
||||
|
||||
#### Why This Causes Ghost Processes
|
||||
|
||||
1. **execSync spawns a shell process** - On Windows, `execSync` with a string command spawns `cmd.exe` which then launches `powershell.exe`
|
||||
2. **PowerShell inherits stdio settings** - The `stdio: ['ignore', 'pipe', 'ignore']` doesn't fully detach the PowerShell subprocess
|
||||
3. **Process hierarchy issue** - Even though the Node.js process receives the output and continues, the PowerShell subprocess may remain as a child process
|
||||
4. **Windows job object limitation** - Node.js child_process doesn't always properly terminate all descendants on Windows
|
||||
5. **Multiple calls during initialization** - GPU detection runs:
|
||||
- During app startup (line 1057 in main.js)
|
||||
- During game launch (in gameLauncher.js)
|
||||
- During settings UI rendering
|
||||
|
||||
Each call can spawn 2-3 PowerShell processes, and if the app spawns multiple game instances or restarts, these accumulate
|
||||
|
||||
### Call Stack
|
||||
1. `main.js` app startup → calls `detectGpu()`
|
||||
2. `gameLauncher.js` on launch → calls `setupGpuEnvironment()` → calls `detectGpu()`
|
||||
3. Multiple PowerShell processes spawn but aren't cleaned up properly
|
||||
4. Task Manager accumulates these ghost processes and becomes unresponsive
|
||||
|
||||
## The Solution
|
||||
|
||||
Replace `execSync()` with `spawnSync()` and add explicit timeouts:
|
||||
|
||||
### Key Changes
|
||||
|
||||
#### 1. Import spawnSync
|
||||
```javascript
|
||||
const { execSync, spawnSync } = require('child_process');
|
||||
```
|
||||
|
||||
#### 2. Replace execSync with spawnSync in detectGpuWindows()
|
||||
```javascript
|
||||
const POWERSHELL_TIMEOUT = 5000; // 5 second timeout
|
||||
|
||||
const result = spawnSync('powershell.exe', [
|
||||
'-NoProfile',
|
||||
'-ExecutionPolicy', 'Bypass',
|
||||
'-Command',
|
||||
'Get-CimInstance Win32_VideoController | Select-Object Name, AdapterRAM | ConvertTo-Csv -NoTypeInformation'
|
||||
], {
|
||||
encoding: 'utf8',
|
||||
timeout: POWERSHELL_TIMEOUT,
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
windowsHide: true
|
||||
});
|
||||
```
|
||||
|
||||
#### 3. Apply same fix to getSystemTypeWindows()
|
||||
|
||||
### Why spawnSync Fixes This
|
||||
|
||||
1. **Direct process spawn** - `spawnSync()` directly spawns the executable without going through `cmd.exe`
|
||||
2. **Explicit timeout** - The `timeout` parameter ensures processes are forcibly terminated after 5 seconds
|
||||
3. **windowsHide: true** - Prevents PowerShell window flashing and better resource cleanup
|
||||
4. **Better cleanup** - Node.js has better control over process lifecycle with `spawnSync`
|
||||
5. **Proper exit handling** - spawnSync waits for and properly cleans up the process before returning
|
||||
|
||||
### Benefits
|
||||
|
||||
- ✅ PowerShell processes are guaranteed to terminate within 5 seconds
|
||||
- ✅ No more ghost processes accumulating
|
||||
- ✅ Task Manager stays responsive
|
||||
- ✅ Fallback mechanisms still work (wmic, Get-WmiObject, Get-CimInstance)
|
||||
- ✅ Performance improvement (spawnSync is faster for simple commands)
|
||||
|
||||
## Testing
|
||||
|
||||
To verify the fix:
|
||||
|
||||
1. **Before running the launcher**, open Task Manager and check for PowerShell processes (should be 0 or 1)
|
||||
2. **Start the launcher** and observe Task Manager - you should not see PowerShell processes accumulating
|
||||
3. **Launch the game** and check Task Manager - still no ghost PowerShell processes
|
||||
4. **Restart the launcher** multiple times - PowerShell process count should remain stable
|
||||
|
||||
Expected behavior: No PowerShell processes should remain after each operation completes.
|
||||
|
||||
## Files Modified
|
||||
|
||||
- **`backend/utils/platformUtils.js`**
|
||||
- Line 1: Added `spawnSync` import
|
||||
- Lines 300-380: Refactored `detectGpuWindows()`
|
||||
- Lines 599-643: Refactored `getSystemTypeWindows()`
|
||||
|
||||
## Performance Impact
|
||||
|
||||
- ⚡ **Faster execution** - `spawnSync` with argument arrays is faster than shell string parsing
|
||||
- 🎯 **More reliable** - Explicit timeout prevents indefinite hangs
|
||||
- 💾 **Lower memory usage** - Processes properly cleaned up instead of becoming zombies
|
||||
|
||||
## Additional Notes
|
||||
|
||||
The fix maintains backward compatibility:
|
||||
- All three GPU detection methods still work (Get-CimInstance → Get-WmiObject → wmic)
|
||||
- Error handling is preserved
|
||||
- System type detection (laptop vs desktop) still functions correctly
|
||||
- No changes to public API or external behavior
|
||||
@@ -1,83 +0,0 @@
|
||||
# Quick Fix Summary: Ghost Process Issue
|
||||
|
||||
## Problem
|
||||
Task Manager freezed after launcher runs due to accumulating ghost PowerShell processes.
|
||||
|
||||
## Root Cause
|
||||
**File:** `backend/utils/platformUtils.js`
|
||||
|
||||
Two functions used `execSync()` to run PowerShell commands:
|
||||
- `detectGpuWindows()` (GPU detection at startup & game launch)
|
||||
- `getSystemTypeWindows()` (system type detection)
|
||||
|
||||
`execSync()` on Windows spawns PowerShell processes that don't properly terminate → accumulate over time → freeze Task Manager.
|
||||
|
||||
## Solution Applied
|
||||
|
||||
### Changed From (❌ Wrong):
|
||||
```javascript
|
||||
output = execSync(
|
||||
'powershell -NoProfile -ExecutionPolicy Bypass -Command "Get-CimInstance..."',
|
||||
{ encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
|
||||
);
|
||||
```
|
||||
|
||||
### Changed To (✅ Correct):
|
||||
```javascript
|
||||
const result = spawnSync('powershell.exe', [
|
||||
'-NoProfile',
|
||||
'-ExecutionPolicy', 'Bypass',
|
||||
'-Command',
|
||||
'Get-CimInstance...'
|
||||
], {
|
||||
encoding: 'utf8',
|
||||
timeout: 5000, // 5 second timeout - processes killed if hung
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
windowsHide: true
|
||||
});
|
||||
```
|
||||
|
||||
## What Changed
|
||||
|
||||
| Aspect | Before | After |
|
||||
|--------|--------|-------|
|
||||
| **Method** | `execSync()` → shell string | `spawnSync()` → argument array |
|
||||
| **Process spawn** | Via cmd.exe → powershell.exe | Direct powershell.exe |
|
||||
| **Timeout** | None (can hang indefinitely) | 5 seconds (processes auto-killed) |
|
||||
| **Process cleanup** | Hit or miss | Guaranteed |
|
||||
| **Ghost processes** | ❌ Accumulate over time | ✅ Always terminate |
|
||||
| **Performance** | Slower (shell parsing) | Faster (direct spawn) |
|
||||
|
||||
## Why This Works
|
||||
|
||||
1. **spawnSync directly spawns PowerShell** without intermediate cmd.exe
|
||||
2. **timeout: 5000** forcibly kills any hung process after 5 seconds
|
||||
3. **windowsHide: true** prevents window flashing and improves cleanup
|
||||
4. **Node.js has better control** over process lifecycle with spawnSync
|
||||
|
||||
## Impact
|
||||
|
||||
- ✅ No more ghost PowerShell processes
|
||||
- ✅ Task Manager stays responsive
|
||||
- ✅ Launcher performance improved
|
||||
- ✅ Game launch unaffected (still works the same)
|
||||
- ✅ All fallback methods preserved (Get-WmiObject, wmic)
|
||||
|
||||
## Files Changed
|
||||
|
||||
Only one file modified: **`backend/utils/platformUtils.js`**
|
||||
- Import added for `spawnSync`
|
||||
- Two functions refactored with new approach
|
||||
- All error handling preserved
|
||||
|
||||
## Testing
|
||||
|
||||
After applying fix, verify no ghost processes appear in Task Manager:
|
||||
|
||||
```
|
||||
Before launch: PowerShell processes = 0 or 1
|
||||
During launch: PowerShell processes = 0 or 1
|
||||
After game closes: PowerShell processes = 0 or 1
|
||||
```
|
||||
|
||||
If processes keep accumulating, check Task Manager → Details tab → look for powershell.exe entries.
|
||||
@@ -1,159 +0,0 @@
|
||||
# Launcher Process Lifecycle & Cleanup Flow
|
||||
|
||||
## Shutdown Event Sequence
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────┐
|
||||
│ USER CLOSES LAUNCHER │
|
||||
└────────────────────────┬────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────┐
|
||||
│ mainWindow.on('closed') event │
|
||||
│ ✅ Cleanup Discord RPC │
|
||||
└────────────┬───────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────┐
|
||||
│ app.on('before-quit') event │
|
||||
│ ✅ Cleanup Discord RPC (again) │
|
||||
└────────────┬───────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────┐
|
||||
│ app.on('window-all-closed') │
|
||||
│ ✅ Call app.quit() │
|
||||
└────────────┬───────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────┐
|
||||
│ Node.js Process Exit │
|
||||
│ ✅ All resources released │
|
||||
└────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## Resource Cleanup Map
|
||||
|
||||
```
|
||||
DISCORD RPC
|
||||
├─ clearActivity() ← Stop Discord integration
|
||||
├─ destroy() ← Destroy client object
|
||||
└─ Set to null ← Remove reference
|
||||
|
||||
GAME PROCESS
|
||||
├─ spawn() with detached: true
|
||||
├─ Immediately unref() ← Remove from event loop
|
||||
└─ Launcher ignores game after spawn
|
||||
|
||||
DOWNLOAD STREAMS
|
||||
├─ Clear stalledTimeout ← Stop stall detection
|
||||
├─ Clear overallTimeout ← Stop overall timeout
|
||||
├─ Abort controller ← Stop stream
|
||||
├─ Destroy writer ← Stop file writing
|
||||
└─ Reject promise ← End download
|
||||
|
||||
MAIN WINDOW
|
||||
├─ Destroy window
|
||||
├─ Remove listeners
|
||||
└─ Free memory
|
||||
|
||||
ELECTRON APP
|
||||
├─ Close all windows
|
||||
└─ Exit process
|
||||
```
|
||||
|
||||
## Cleanup Verification Points
|
||||
|
||||
### ✅ What IS Being Cleaned Up
|
||||
|
||||
1. **Discord RPC Client**
|
||||
- Activity cleared before exit
|
||||
- Client destroyed
|
||||
- Reference nulled
|
||||
|
||||
2. **Download Operations**
|
||||
- Timeouts cleared (stalledTimeout, overallTimeout)
|
||||
- Stream aborted
|
||||
- Writer destroyed
|
||||
- Promise rejected/resolved
|
||||
|
||||
3. **Game Process**
|
||||
- Detached from launcher
|
||||
- Unrefed so launcher can exit
|
||||
- Independent process tree
|
||||
|
||||
4. **Event Listeners**
|
||||
- IPC handlers persist (normal - Electron's design)
|
||||
- Main window listeners removed
|
||||
- Auto-updater auto-cleanup
|
||||
|
||||
### ⚠️ Considerations
|
||||
|
||||
1. **Discord RPC called twice**
|
||||
- Line 174: When window closes
|
||||
- Line 438: When app is about to quit
|
||||
- → This is defensive programming (safe, not wasteful)
|
||||
|
||||
2. **Game Process Orphaned (By Design)**
|
||||
- Launcher doesn't track game process
|
||||
- Game can outlive launcher
|
||||
- On Windows: Process is detached, unref'd
|
||||
- → This is correct behavior for a launcher
|
||||
|
||||
3. **IPC Handlers Remain Registered**
|
||||
- Normal for Electron apps
|
||||
- Handlers removed when app exits anyway
|
||||
- → Not a resource leak
|
||||
|
||||
---
|
||||
|
||||
## Comparison: Before & After Ghost Process Fix
|
||||
|
||||
### Before Fix (PowerShell Issues Only)
|
||||
```
|
||||
Launcher Cleanup: ✅ Good
|
||||
PowerShell GPU Detection: ❌ Bad (ghost processes)
|
||||
Result: Task Manager frozen by PowerShell
|
||||
```
|
||||
|
||||
### After Fix (PowerShell Fixed)
|
||||
```
|
||||
Launcher Cleanup: ✅ Good
|
||||
PowerShell GPU Detection: ✅ Fixed (spawnSync with timeout)
|
||||
Result: No ghost processes accumulate
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Performance Metrics
|
||||
|
||||
### Memory Usage Pattern
|
||||
```
|
||||
Startup → 80-120 MB
|
||||
After Download → 150-200 MB
|
||||
After Cleanup → 80-120 MB (back to baseline)
|
||||
After Exit → Process released
|
||||
```
|
||||
|
||||
### Handle Leaks: None Detected
|
||||
- Discord RPC: Properly released
|
||||
- Streams: Properly closed
|
||||
- Timeouts: Properly cleared
|
||||
- Window: Properly destroyed
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
**Launcher Termination Quality: ✅ GOOD**
|
||||
|
||||
| Aspect | Status | Details |
|
||||
|--------|--------|---------|
|
||||
| Discord cleanup | ✅ | Called in 2 places (defensive) |
|
||||
| Game process | ✅ | Detached & unref'd |
|
||||
| Download cleanup | ✅ | All timeouts cleared |
|
||||
| Memory release | ✅ | Event handlers removed |
|
||||
| Handle leaks | ✅ | None detected |
|
||||
| **Overall** | **✅** | **Proper shutdown architecture** |
|
||||
|
||||
The launcher has **solid cleanup logic**. The ghost process issue was specific to PowerShell GPU detection, not the launcher's termination flow.
|
||||
@@ -1,273 +0,0 @@
|
||||
# Launcher Process Termination & Cleanup Analysis
|
||||
|
||||
## Overview
|
||||
This document analyzes how the Hytale-F2P launcher handles process cleanup, event termination, and resource deallocation during shutdown.
|
||||
|
||||
## Shutdown Flow
|
||||
|
||||
### 1. **Primary Termination Events** (main.js)
|
||||
|
||||
#### Event: `before-quit` (Line 438)
|
||||
```javascript
|
||||
app.on('before-quit', () => {
|
||||
console.log('=== LAUNCHER BEFORE QUIT ===');
|
||||
cleanupDiscordRPC();
|
||||
});
|
||||
```
|
||||
- Called by Electron before the app starts quitting
|
||||
- Ensures Discord RPC is properly disconnected and destroyed
|
||||
- Gives async cleanup a chance to run
|
||||
|
||||
#### Event: `window-all-closed` (Line 443)
|
||||
```javascript
|
||||
app.on('window-all-closed', () => {
|
||||
console.log('=== LAUNCHER CLOSING ===');
|
||||
app.quit();
|
||||
});
|
||||
```
|
||||
- Triggered when all Electron windows are closed
|
||||
- Initiates app.quit() to cleanly exit
|
||||
|
||||
#### Event: `closed` (Line 174)
|
||||
```javascript
|
||||
mainWindow.on('closed', () => {
|
||||
console.log('Main window closed, cleaning up Discord RPC...');
|
||||
cleanupDiscordRPC();
|
||||
});
|
||||
```
|
||||
- Called when the main window is actually destroyed
|
||||
- Additional Discord RPC cleanup as safety measure
|
||||
|
||||
---
|
||||
|
||||
## 2. **Discord RPC Cleanup** (Lines 59-89, 424-436)
|
||||
|
||||
### cleanupDiscordRPC() Function
|
||||
```javascript
|
||||
async function cleanupDiscordRPC() {
|
||||
if (!discordRPC) return;
|
||||
try {
|
||||
console.log('Cleaning up Discord RPC...');
|
||||
discordRPC.clearActivity();
|
||||
await new Promise(r => setTimeout(r, 100)); // Wait for clear to propagate
|
||||
discordRPC.destroy();
|
||||
console.log('Discord RPC cleaned up successfully');
|
||||
} catch (error) {
|
||||
console.log('Error cleaning up Discord RPC:', error.message);
|
||||
} finally {
|
||||
discordRPC = null; // Null out the reference
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**What it does:**
|
||||
1. Checks if Discord RPC is initialized
|
||||
2. Clears the current activity (disconnects from Discord)
|
||||
3. Waits 100ms for the clear to propagate
|
||||
4. Destroys the Discord RPC client
|
||||
5. Nulls out the reference to prevent memory leaks
|
||||
6. Error handling ensures cleanup doesn't crash the app
|
||||
|
||||
**Quality:** ✅ **Proper cleanup with error handling**
|
||||
|
||||
---
|
||||
|
||||
## 3. **Game Process Handling** (gameLauncher.js)
|
||||
|
||||
### Game Launch Process (Lines 356-403)
|
||||
|
||||
```javascript
|
||||
let spawnOptions = {
|
||||
stdio: ['ignore', 'pipe', 'pipe'],
|
||||
detached: false,
|
||||
env: env
|
||||
};
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
spawnOptions.shell = false;
|
||||
spawnOptions.windowsHide = true;
|
||||
spawnOptions.detached = true; // ← Game runs independently
|
||||
spawnOptions.stdio = 'ignore'; // ← Fully detach stdio
|
||||
}
|
||||
|
||||
const child = spawn(clientPath, args, spawnOptions);
|
||||
|
||||
// Windows: Release process reference immediately
|
||||
if (process.platform === 'win32') {
|
||||
child.unref(); // ← Allows Node.js to exit without waiting for game
|
||||
}
|
||||
```
|
||||
|
||||
**Critical Analysis:**
|
||||
- ✅ **Windows detached mode**: Game process is spawned detached and stdio is ignored
|
||||
- ✅ **child.unref()**: Removes the Node process from the event loop
|
||||
- ⚠️ **No event listeners**: Once detached, the launcher doesn't track the game process
|
||||
|
||||
**Potential Issue:**
|
||||
The game process is completely detached and unrefed, which is correct. However, if the game crashes and respawns (or multiple instances), these orphaned processes could accumulate.
|
||||
|
||||
---
|
||||
|
||||
## 4. **Download/File Transfer Cleanup** (fileManager.js)
|
||||
|
||||
### setInterval Cleanup (Lines 77-94)
|
||||
```javascript
|
||||
const overallTimeout = setInterval(() => {
|
||||
const now = Date.now();
|
||||
const timeSinceLastProgress = now - lastProgressTime;
|
||||
|
||||
if (timeSinceLastProgress > 900000 && hasReceivedData) {
|
||||
console.log('Download stalled for 15 minutes, aborting...');
|
||||
controller.abort();
|
||||
}
|
||||
}, 60000); // Check every minute
|
||||
```
|
||||
|
||||
### Cleanup Locations:
|
||||
|
||||
**On Stream Error (Lines 225-228):**
|
||||
```javascript
|
||||
if (stalledTimeout) {
|
||||
clearTimeout(stalledTimeout);
|
||||
}
|
||||
if (overallTimeout) {
|
||||
clearInterval(overallTimeout);
|
||||
}
|
||||
```
|
||||
|
||||
**On Stream Close (Lines 239-244):**
|
||||
```javascript
|
||||
if (stalledTimeout) {
|
||||
clearTimeout(stalledTimeout);
|
||||
}
|
||||
if (overallTimeout) {
|
||||
clearInterval(overallTimeout);
|
||||
}
|
||||
```
|
||||
|
||||
**On Writer Finish (Lines 295-299):**
|
||||
```javascript
|
||||
if (stalledTimeout) {
|
||||
clearTimeout(stalledTimeout);
|
||||
console.log('Cleared stall timeout after writer finished');
|
||||
}
|
||||
if (overallTimeout) {
|
||||
clearInterval(overallTimeout);
|
||||
console.log('Cleared overall timeout after writer finished');
|
||||
}
|
||||
```
|
||||
|
||||
**Quality:** ✅ **Proper cleanup with multiple safeguards**
|
||||
- Intervals are cleared in all exit paths
|
||||
- No orphaned setInterval/setTimeout calls
|
||||
|
||||
---
|
||||
|
||||
## 5. **Electron Auto-Updater** (Lines 184-237)
|
||||
|
||||
```javascript
|
||||
autoUpdater.autoDownload = true;
|
||||
autoUpdater.autoInstallOnAppQuit = true;
|
||||
|
||||
autoUpdater.on('update-downloaded', (info) => {
|
||||
// ...
|
||||
});
|
||||
```
|
||||
|
||||
**Auto-Updater Cleanup:** ✅
|
||||
- Electron handles auto-updater cleanup automatically
|
||||
- No explicit cleanup needed (Electron manages lifecycle)
|
||||
|
||||
---
|
||||
|
||||
## Summary: Process Termination Quality
|
||||
|
||||
| Component | Status | Notes |
|
||||
|-----------|--------|-------|
|
||||
| **Discord RPC** | ✅ **Good** | Properly destroyed with error handling |
|
||||
| **Main Window** | ✅ **Good** | Cleanup called on closed and before-quit |
|
||||
| **Game Process** | ✅ **Good** | Detached and unref'd on Windows |
|
||||
| **Download Intervals** | ✅ **Good** | Cleared in all exit paths |
|
||||
| **Event Listeners** | ⚠️ **Mixed** | Main listeners properly removed, but IPC handlers remain registered (normal) |
|
||||
| **Overall** | ✅ **Good** | Proper cleanup architecture |
|
||||
|
||||
---
|
||||
|
||||
## Potential Improvements
|
||||
|
||||
### 1. **Add Explicit Process Tracking (Optional)**
|
||||
Currently, the launcher doesn't track child processes. We could add:
|
||||
```javascript
|
||||
// Track all spawned processes for cleanup
|
||||
const childProcesses = new Set();
|
||||
|
||||
app.on('before-quit', () => {
|
||||
// Kill any remaining child processes
|
||||
for (const proc of childProcesses) {
|
||||
if (proc && !proc.killed) {
|
||||
proc.kill('SIGTERM');
|
||||
}
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
### 2. **Auto-Updater Resource Cleanup (Minor)**
|
||||
Add explicit cleanup for auto-updater listeners:
|
||||
```javascript
|
||||
app.on('before-quit', () => {
|
||||
autoUpdater.removeAllListeners();
|
||||
});
|
||||
```
|
||||
|
||||
### 3. **Graceful Shutdown Timeout (Safety)**
|
||||
Add a safety timeout to force exit if cleanup hangs:
|
||||
```javascript
|
||||
app.on('before-quit', () => {
|
||||
const forceExitTimeout = setTimeout(() => {
|
||||
console.warn('Cleanup timeout - forcing exit');
|
||||
process.exit(0);
|
||||
}, 5000); // 5 second max cleanup time
|
||||
});
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Relationship to Ghost Process Issue
|
||||
|
||||
### Previous Issue (PowerShell processes)
|
||||
- **Root cause**: Spawned PowerShell processes weren't cleaned up in `platformUtils.js`
|
||||
- **Fixed by**: Replacing `execSync()` with `spawnSync()` + timeouts
|
||||
|
||||
### Launcher Termination
|
||||
- **Status**: ✅ **No critical issues found**
|
||||
- **Discord RPC**: Properly cleaned up
|
||||
- **Game process**: Properly detached
|
||||
- **Intervals**: Properly cleared
|
||||
- **No memory leaks detected**
|
||||
|
||||
The launcher's termination flow is solid. The ghost process issue was specific to PowerShell process spawning during GPU detection, not the launcher's shutdown process.
|
||||
|
||||
---
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
To verify proper launcher termination:
|
||||
|
||||
- [ ] Start launcher → Close window → Check Task Manager for lingering processes
|
||||
- [ ] Start launcher → Launch game → Close launcher → Check for orphaned processes
|
||||
- [ ] Start launcher → Download something → Cancel mid-download → Check for setInterval processes
|
||||
- [ ] Disable Discord RPC → Start launcher → Close → No Discord processes remain
|
||||
- [ ] Check Windows Event Viewer → No unhandled exceptions on launcher exit
|
||||
- [ ] Multiple launch/close cycles → No memory growth in Task Manager
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
The Hytale-F2P launcher has **good shutdown hygiene**:
|
||||
- ✅ Discord RPC is properly cleaned
|
||||
- ✅ Game process is properly detached
|
||||
- ✅ Download intervals are properly cleared
|
||||
- ✅ Event handlers are properly registered
|
||||
|
||||
The ghost process issue was **not** caused by the launcher's termination logic, but by the PowerShell GPU detection functions, which has already been fixed.
|
||||
96
main.js
96
main.js
@@ -84,12 +84,12 @@ function setDiscordActivity() {
|
||||
largeImageText: 'Hytale F2P Launcher',
|
||||
buttons: [
|
||||
{
|
||||
label: 'Download',
|
||||
url: 'https://git.sanhost.net/sanasol/hytale-f2p/releases'
|
||||
label: 'GitHub',
|
||||
url: 'https://github.com/amiayweb/Hytale-F2P'
|
||||
},
|
||||
{
|
||||
label: 'Discord',
|
||||
url: 'https://discord.gg/Fhbb9Yk5WW'
|
||||
url: 'https://discord.gg/hf2pdc'
|
||||
}
|
||||
]
|
||||
});
|
||||
@@ -107,41 +107,9 @@ async function toggleDiscordRPC(enabled) {
|
||||
} else if (!enabled && discordRPC) {
|
||||
try {
|
||||
console.log('Disconnecting Discord RPC...');
|
||||
|
||||
// Check if Discord RPC is still connected before trying to use it
|
||||
if (discordRPC && discordRPC.transport && discordRPC.transport.socket) {
|
||||
// Add timeout to prevent hanging
|
||||
const clearActivityPromise = discordRPC.clearActivity();
|
||||
const timeoutPromise = new Promise((_, reject) =>
|
||||
setTimeout(() => reject(new Error('Discord RPC clearActivity timeout')), 1000)
|
||||
);
|
||||
|
||||
try {
|
||||
await Promise.race([clearActivityPromise, timeoutPromise]);
|
||||
await new Promise(r => setTimeout(r, 100));
|
||||
} catch (timeoutErr) {
|
||||
console.log('Discord RPC clearActivity timed out:', timeoutErr.message);
|
||||
}
|
||||
} else {
|
||||
console.log('Discord RPC already disconnected');
|
||||
}
|
||||
|
||||
// Destroy - wrap in try-catch to handle library errors
|
||||
if (discordRPC) {
|
||||
try {
|
||||
if (typeof discordRPC.destroy === 'function') {
|
||||
const destroyPromise = discordRPC.destroy();
|
||||
if (destroyPromise && typeof destroyPromise.catch === 'function') {
|
||||
destroyPromise.catch(err => {
|
||||
console.log('Discord RPC destroy error (ignored):', err.message);
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (destroyErr) {
|
||||
console.log('Error destroying Discord RPC (ignored):', destroyErr.message);
|
||||
}
|
||||
}
|
||||
|
||||
discordRPC.clearActivity();
|
||||
await new Promise(r => setTimeout(r, 100));
|
||||
discordRPC.destroy();
|
||||
console.log('Discord RPC disconnected successfully');
|
||||
} catch (error) {
|
||||
console.error('Error disconnecting Discord RPC:', error.message);
|
||||
@@ -456,43 +424,9 @@ async function cleanupDiscordRPC() {
|
||||
if (!discordRPC) return;
|
||||
try {
|
||||
console.log('Cleaning up Discord RPC...');
|
||||
|
||||
// Check if Discord RPC is still connected before trying to use it
|
||||
if (discordRPC && discordRPC.transport && discordRPC.transport.socket) {
|
||||
// Add timeout to prevent hanging if Discord is unresponsive
|
||||
const clearActivityPromise = discordRPC.clearActivity();
|
||||
const timeoutPromise = new Promise((_, reject) =>
|
||||
setTimeout(() => reject(new Error('Discord RPC clearActivity timeout')), 1000)
|
||||
);
|
||||
|
||||
try {
|
||||
await Promise.race([clearActivityPromise, timeoutPromise]);
|
||||
await new Promise(r => setTimeout(r, 100));
|
||||
} catch (timeoutErr) {
|
||||
console.log('Discord RPC clearActivity timed out, proceeding with cleanup:', timeoutErr.message);
|
||||
}
|
||||
} else {
|
||||
console.log('Discord RPC already disconnected, skipping clearActivity');
|
||||
}
|
||||
|
||||
// Destroy and cleanup - wrap in try-catch to handle library errors
|
||||
if (discordRPC) {
|
||||
try {
|
||||
if (typeof discordRPC.destroy === 'function') {
|
||||
// destroy() may return a promise that rejects, so handle it
|
||||
const destroyPromise = discordRPC.destroy();
|
||||
if (destroyPromise && typeof destroyPromise.catch === 'function') {
|
||||
// If it's a promise, catch any rejections silently
|
||||
destroyPromise.catch(err => {
|
||||
console.log('Discord RPC destroy error (ignored):', err.message);
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (destroyErr) {
|
||||
console.log('Error destroying Discord RPC client (ignored):', destroyErr.message);
|
||||
}
|
||||
}
|
||||
|
||||
discordRPC.clearActivity();
|
||||
await new Promise(r => setTimeout(r, 100));
|
||||
discordRPC.destroy();
|
||||
console.log('Discord RPC cleaned up successfully');
|
||||
} catch (error) {
|
||||
console.log('Error cleaning up Discord RPC:', error.message);
|
||||
@@ -627,7 +561,7 @@ ipcMain.handle('install-game', async (event, playerName, javaPath, installPath,
|
||||
console.log('[Main] Processing Butler error with retry context');
|
||||
errorData.retryData = {
|
||||
branch: error.branch || 'release',
|
||||
fileName: error.fileName || 'v8',
|
||||
fileName: error.fileName || '7.pwr',
|
||||
cacheDir: error.cacheDir
|
||||
};
|
||||
errorData.canRetry = error.canRetry !== false;
|
||||
@@ -647,7 +581,7 @@ ipcMain.handle('install-game', async (event, playerName, javaPath, installPath,
|
||||
console.log('[Main] Processing generic error, creating default retry data');
|
||||
errorData.retryData = {
|
||||
branch: 'release',
|
||||
fileName: 'v8'
|
||||
fileName: '7.pwr'
|
||||
};
|
||||
// For generic errors, assume it's retryable unless specified
|
||||
errorData.canRetry = error.canRetry !== false;
|
||||
@@ -887,7 +821,7 @@ ipcMain.handle('retry-download', async (event, retryData) => {
|
||||
console.log('[IPC] Invalid retry data, using PWR defaults');
|
||||
retryData = {
|
||||
branch: 'release',
|
||||
fileName: 'v8'
|
||||
fileName: '7.pwr'
|
||||
};
|
||||
}
|
||||
|
||||
@@ -921,7 +855,7 @@ ipcMain.handle('retry-download', async (event, retryData) => {
|
||||
} :
|
||||
{
|
||||
branch: retryData?.branch || 'release',
|
||||
fileName: retryData?.fileName || 'v8',
|
||||
fileName: retryData?.fileName || '7.pwr',
|
||||
cacheDir: retryData?.cacheDir
|
||||
};
|
||||
|
||||
@@ -964,8 +898,8 @@ ipcMain.handle('open-external', async (event, url) => {
|
||||
|
||||
ipcMain.handle('open-download-page', async () => {
|
||||
try {
|
||||
// Open Forgejo releases page for manual download
|
||||
await shell.openExternal('https://git.sanhost.net/sanasol/hytale-f2p/releases/latest');
|
||||
// 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);
|
||||
|
||||
13
package-lock.json
generated
13
package-lock.json
generated
@@ -14,7 +14,6 @@
|
||||
"discord-rpc": "^4.0.1",
|
||||
"dotenv": "^17.2.3",
|
||||
"electron-updater": "^6.7.3",
|
||||
"encoding": "^0.1.13",
|
||||
"fs-extra": "^11.3.3",
|
||||
"tar": "^7.5.7",
|
||||
"uuid": "^9.0.1"
|
||||
@@ -2150,16 +2149,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/encoding": {
|
||||
"version": "0.1.13",
|
||||
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
|
||||
"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"iconv-lite": "^0.6.2"
|
||||
}
|
||||
},
|
||||
"node_modules/end-of-stream": {
|
||||
"version": "1.4.5",
|
||||
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
|
||||
@@ -2834,6 +2823,7 @@
|
||||
"version": "0.6.3",
|
||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
|
||||
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
|
||||
"devOptional": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"safer-buffer": ">= 2.1.2 < 3.0.0"
|
||||
@@ -4057,6 +4047,7 @@
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
|
||||
"devOptional": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/sanitize-filename": {
|
||||
|
||||
18
package.json
18
package.json
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"name": "hytale-f2p-launcher",
|
||||
"version": "2.3.8",
|
||||
"version": "2.2.0",
|
||||
"description": "A modern, cross-platform launcher for Hytale with automatic updates and multi-client support",
|
||||
"homepage": "https://git.sanhost.net/sanasol/hytale-f2p",
|
||||
"homepage": "https://github.com/amiayweb/Hytale-F2P",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
@@ -26,7 +26,6 @@
|
||||
"electron",
|
||||
"auto-update",
|
||||
"mod-manager"
|
||||
|
||||
],
|
||||
"maintainers": [
|
||||
{
|
||||
@@ -53,7 +52,6 @@
|
||||
"axios": "^1.6.0",
|
||||
"discord-rpc": "^4.0.1",
|
||||
"dotenv": "^17.2.3",
|
||||
"encoding": "^0.1.13",
|
||||
"electron-updater": "^6.7.3",
|
||||
"fs-extra": "^11.3.3",
|
||||
"tar": "^7.5.7",
|
||||
@@ -104,12 +102,7 @@
|
||||
],
|
||||
"icon": "build/icon.icns",
|
||||
"artifactName": "${name}_${version}_${arch}.${ext}",
|
||||
"category": "public.app-category.games",
|
||||
"hardenedRuntime": true,
|
||||
"gatekeeperAssess": false,
|
||||
"entitlements": "build/entitlements.mac.plist",
|
||||
"entitlementsInherit": "build/entitlements.mac.plist",
|
||||
"notarize": true
|
||||
"category": "public.app-category.games"
|
||||
},
|
||||
"nsis": {
|
||||
"oneClick": false,
|
||||
@@ -118,8 +111,9 @@
|
||||
"createStartMenuShortcut": true
|
||||
},
|
||||
"publish": {
|
||||
"provider": "generic",
|
||||
"url": "https://git.sanhost.net/sanasol/hytale-f2p/releases/download/latest"
|
||||
"provider": "github",
|
||||
"owner": "amiayweb",
|
||||
"repo": "Hytale-F2P"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
118
server/README.md
118
server/README.md
@@ -1,118 +0,0 @@
|
||||
# Hytale F2P - Dedicated Server
|
||||
|
||||
Host your own Hytale server. The scripts handle everything automatically.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- **Java 25+** — [Windows installer](https://download.oracle.com/java/25/latest/jdk-25_windows-x64_bin.exe) | [Other platforms](https://adoptium.net/)
|
||||
- If you have the F2P launcher installed, its bundled Java will be used automatically
|
||||
- **Internet connection** for first launch (downloads ~3.5 GB of game files)
|
||||
- If you have the F2P launcher installed, game files are copied locally (no download needed)
|
||||
|
||||
## Video Guide
|
||||
|
||||
[](https://youtu.be/KvuXLH7SKvI)
|
||||
|
||||
## Quick Start
|
||||
|
||||
### Windows
|
||||
|
||||
1. Download `start.bat` to an empty folder
|
||||
2. Double-click `start.bat`
|
||||
3. Done — server starts on port **5520**
|
||||
|
||||
### Linux / macOS
|
||||
|
||||
```bash
|
||||
mkdir hytale-server && cd hytale-server
|
||||
curl -O https://raw.githubusercontent.com/amiayweb/Hytale-F2P/develop/server/start.sh
|
||||
chmod +x start.sh
|
||||
./start.sh
|
||||
```
|
||||
|
||||
## What the scripts do
|
||||
|
||||
1. Search for the F2P launcher install (default paths + custom `installPath` from config)
|
||||
2. Use bundled Java from the launcher, or fall back to system Java (25+ required)
|
||||
3. Copy game files from the launcher install if available
|
||||
4. Download missing files: `HytaleServer.jar` (~150 MB), `Assets.zip` (~3.3 GB), `dualauth-agent.jar` (~5 MB)
|
||||
5. Check for updates on every launch (server, assets, and agent)
|
||||
6. Generate a persistent server ID
|
||||
7. Fetch authentication tokens
|
||||
8. Start the server with dual-auth support
|
||||
|
||||
## Connecting
|
||||
|
||||
- **Same PC**: Connect to `localhost:5520` or `127.0.0.1:5520`
|
||||
- **LAN**: Connect to your local IP (e.g. `192.168.1.x:5520`)
|
||||
- **Internet**: Forward port `5520` (TCP + UDP) on your router, friends connect to your public IP
|
||||
|
||||
### No public IP? Use playit.gg (recommended)
|
||||
|
||||
If you're behind CGNAT or can't port forward, [playit.gg](https://playit.gg) gives you a public address for free:
|
||||
|
||||
1. Go to [playit.gg](https://playit.gg) and create an account
|
||||
2. Download and run the playit agent
|
||||
3. Create a tunnel — select **Hytale** as the game type, local port `5520`
|
||||
4. Share the generated address with friends (e.g. `something.joinplayit.gg:12345`)
|
||||
|
||||
### Other options
|
||||
|
||||
- [Radmin VPN](https://www.radmin-vpn.com/) — virtual LAN, all players must install it
|
||||
- [ZeroTier](https://www.zerotier.com/) — same idea, create a network, friends join and connect via VPN IP
|
||||
|
||||
## Configuration
|
||||
|
||||
Set environment variables before running the script:
|
||||
|
||||
| Variable | Default | Description |
|
||||
|----------|---------|-------------|
|
||||
| `SERVER_NAME` | `My Hytale Server` | Server name shown in listings |
|
||||
| `BIND_ADDRESS` | `0.0.0.0:5520` | IP and port to listen on |
|
||||
| `JVM_XMX` | *(Java default)* | Max memory (e.g. `4G`, `8G`) |
|
||||
| `JVM_XMS` | *(Java default)* | Initial memory |
|
||||
| `AUTH_MODE` | `authenticated` | Auth mode (`authenticated` or `none`) |
|
||||
| `HYTALE_AUTH_DOMAIN` | `auth.sanasol.ws` | Auth server domain |
|
||||
| `DOWNLOAD_BASE` | `https://download.sanasol.ws/download` | File download URL |
|
||||
|
||||
**Example (Linux):**
|
||||
```bash
|
||||
SERVER_NAME="Epic Server" JVM_XMX=4G ./start.sh
|
||||
```
|
||||
|
||||
**Example (Windows):**
|
||||
```cmd
|
||||
set SERVER_NAME=Epic Server
|
||||
set JVM_XMX=4G
|
||||
start.bat
|
||||
```
|
||||
|
||||
## Files created
|
||||
|
||||
```
|
||||
your-folder/
|
||||
├── start.sh / start.bat # Startup script
|
||||
├── HytaleServer.jar # Game server (auto-downloaded)
|
||||
├── Assets.zip # Game assets (auto-downloaded)
|
||||
├── dualauth-agent.jar # Auth agent (auto-downloaded)
|
||||
├── .server-id # Persistent server UUID
|
||||
├── .versions/ # Version tracking for auto-updates
|
||||
├── Server/ # Server data (created by server)
|
||||
│ ├── config.json
|
||||
│ └── worlds/
|
||||
└── UserData/ # Player saves
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
| Problem | Solution |
|
||||
|---------|----------|
|
||||
| `java not found` | Install the F2P launcher (includes Java) or install Java 25+ from [adoptium.net](https://adoptium.net/) |
|
||||
| Download fails | Check internet connection. Files can be downloaded manually from `https://download.sanasol.ws/download/` |
|
||||
| Port already in use | Change port: `BIND_ADDRESS=0.0.0.0:5521 ./start.sh` |
|
||||
| Out of memory | Set more RAM: `JVM_XMX=4G ./start.sh` |
|
||||
| Friends can't connect | Forward port 5520 (TCP+UDP) on your router, or use [playit.gg](https://playit.gg) if you can't port forward |
|
||||
|
||||
## Discord
|
||||
|
||||
Need help? Join the community: https://discord.gg/Fhbb9Yk5WW
|
||||
441
server/start.bat
441
server/start.bat
@@ -1,441 +0,0 @@
|
||||
@echo off
|
||||
setlocal enabledelayedexpansion
|
||||
|
||||
:: ============================================================
|
||||
:: Hytale F2P Dedicated Server - One-Click Starter
|
||||
:: ============================================================
|
||||
:: Just double-click this file to start your server!
|
||||
::
|
||||
:: The script will:
|
||||
:: 1. Look for game files and Java in your F2P launcher install
|
||||
:: 2. Auto-download anything missing
|
||||
:: 3. Auto-update server, assets, and agent on each launch
|
||||
:: 4. Fetch auth tokens and start the server
|
||||
:: ============================================================
|
||||
|
||||
:: Configuration (edit these or set as environment variables)
|
||||
if not defined HYTALE_AUTH_DOMAIN set "HYTALE_AUTH_DOMAIN=auth.sanasol.ws"
|
||||
if not defined AUTH_SERVER set "AUTH_SERVER=https://%HYTALE_AUTH_DOMAIN%"
|
||||
if not defined SERVER_NAME set "SERVER_NAME=My Hytale Server"
|
||||
if not defined ASSETS_PATH set "ASSETS_PATH=.\Assets.zip"
|
||||
if not defined BIND_ADDRESS set "BIND_ADDRESS=0.0.0.0:5520"
|
||||
if not defined AUTH_MODE set "AUTH_MODE=authenticated"
|
||||
if not defined DOWNLOAD_BASE set "DOWNLOAD_BASE=https://download.sanasol.ws/download"
|
||||
|
||||
:: File names
|
||||
set "AGENT_JAR=dualauth-agent.jar"
|
||||
set "SERVER_JAR=HytaleServer.jar"
|
||||
set "AGENT_URL=https://github.com/sanasol/hytale-auth-server/releases/latest/download/dualauth-agent.jar"
|
||||
set "AGENT_VERSION_API=https://api.github.com/repos/sanasol/hytale-auth-server/releases/latest"
|
||||
set "VERSION_DIR=.versions"
|
||||
|
||||
echo ============================================================
|
||||
echo Hytale F2P Dedicated Server
|
||||
echo ============================================================
|
||||
echo.
|
||||
|
||||
:: --- Prerequisite Checks ---
|
||||
|
||||
where curl >nul 2>&1
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] curl is required but not found
|
||||
echo [ERROR] curl comes with Windows 10+. Update Windows or install curl.
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
if not exist "%VERSION_DIR%" mkdir "%VERSION_DIR%"
|
||||
|
||||
:: --- Find Local F2P Launcher Install ---
|
||||
|
||||
set "F2P_DIR="
|
||||
set "F2P_BASE=%USERPROFILE%\AppData\Local\HytaleF2P"
|
||||
set "F2P_CONFIG=%F2P_BASE%\config.json"
|
||||
set "JAVA_CMD=java"
|
||||
|
||||
:: Check config.json for custom installPath
|
||||
set "F2P_CUSTOM_BASE="
|
||||
if exist "%F2P_CONFIG%" (
|
||||
for /f "delims=" %%p in ('powershell -Command "try { $c = Get-Content '%F2P_CONFIG%' | ConvertFrom-Json; if ($c.installPath) { $c.installPath.Trim() + '\HytaleF2P' } } catch {}" 2^>nul') do (
|
||||
set "F2P_CUSTOM_BASE=%%p"
|
||||
)
|
||||
)
|
||||
|
||||
:: Search for game files: custom path first, then default
|
||||
if defined F2P_CUSTOM_BASE (
|
||||
if exist "!F2P_CUSTOM_BASE!\release\package\game\latest" (
|
||||
set "F2P_DIR=!F2P_CUSTOM_BASE!\release\package\game\latest"
|
||||
) else if exist "!F2P_CUSTOM_BASE!\pre-release\package\game\latest" (
|
||||
set "F2P_DIR=!F2P_CUSTOM_BASE!\pre-release\package\game\latest"
|
||||
)
|
||||
)
|
||||
|
||||
if not defined F2P_DIR (
|
||||
if exist "%F2P_BASE%\release\package\game\latest" (
|
||||
set "F2P_DIR=%F2P_BASE%\release\package\game\latest"
|
||||
) else if exist "%F2P_BASE%\pre-release\package\game\latest" (
|
||||
set "F2P_DIR=%F2P_BASE%\pre-release\package\game\latest"
|
||||
)
|
||||
)
|
||||
|
||||
:: --- Find Java from F2P launcher ---
|
||||
|
||||
:: Check config.json for custom javaPath
|
||||
if exist "%F2P_CONFIG%" (
|
||||
for /f "delims=" %%j in ('powershell -Command "try { $c = Get-Content '%F2P_CONFIG%' | ConvertFrom-Json; if ($c.javaPath -and (Test-Path $c.javaPath)) { $c.javaPath.Trim() } } catch {}" 2^>nul') do (
|
||||
set "JAVA_CMD=%%j"
|
||||
echo [INFO] Found Java in F2P config: %%j
|
||||
)
|
||||
)
|
||||
|
||||
:: Check bundled JRE if no custom javaPath found
|
||||
if "!JAVA_CMD!"=="java" (
|
||||
set "F2P_JRE_BASE="
|
||||
if defined F2P_CUSTOM_BASE (
|
||||
if exist "!F2P_CUSTOM_BASE!\release\package\jre\latest\bin\java.exe" (
|
||||
set "F2P_JRE_BASE=!F2P_CUSTOM_BASE!\release\package\jre\latest"
|
||||
) else if exist "!F2P_CUSTOM_BASE!\pre-release\package\jre\latest\bin\java.exe" (
|
||||
set "F2P_JRE_BASE=!F2P_CUSTOM_BASE!\pre-release\package\jre\latest"
|
||||
)
|
||||
)
|
||||
if not defined F2P_JRE_BASE (
|
||||
if exist "%F2P_BASE%\release\package\jre\latest\bin\java.exe" (
|
||||
set "F2P_JRE_BASE=%F2P_BASE%\release\package\jre\latest"
|
||||
) else if exist "%F2P_BASE%\pre-release\package\jre\latest\bin\java.exe" (
|
||||
set "F2P_JRE_BASE=%F2P_BASE%\pre-release\package\jre\latest"
|
||||
)
|
||||
)
|
||||
if defined F2P_JRE_BASE (
|
||||
set "JAVA_CMD=!F2P_JRE_BASE!\bin\java.exe"
|
||||
echo [INFO] Found Java in F2P launcher: !JAVA_CMD!
|
||||
)
|
||||
)
|
||||
|
||||
:: Verify java exists
|
||||
"!JAVA_CMD!" -version >nul 2>&1
|
||||
if errorlevel 1 (
|
||||
where java >nul 2>&1
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] Java is not installed and no F2P launcher JRE found
|
||||
echo.
|
||||
echo Options:
|
||||
echo 1. Install the F2P launcher first ^(it includes Java^)
|
||||
echo 2. Download Java 25: https://download.oracle.com/java/25/latest/jdk-25_windows-x64_bin.exe
|
||||
echo.
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
set "JAVA_CMD=java"
|
||||
)
|
||||
|
||||
:: Check Java version
|
||||
for /f "tokens=3 delims= " %%v in ('"!JAVA_CMD!" -version 2^>^&1 ^| findstr /i "version"') do (
|
||||
set "JAVA_VER_RAW=%%~v"
|
||||
)
|
||||
if defined JAVA_VER_RAW (
|
||||
for /f "tokens=1 delims=." %%m in ("!JAVA_VER_RAW!") do set "JAVA_MAJOR=%%m"
|
||||
)
|
||||
|
||||
echo [INFO] Java: !JAVA_VER_RAW! ^(!JAVA_CMD!^)
|
||||
|
||||
if defined JAVA_MAJOR (
|
||||
if !JAVA_MAJOR! LSS 25 (
|
||||
echo [ERROR] Java !JAVA_MAJOR! detected. Java 25+ is REQUIRED.
|
||||
echo The DualAuth agent requires Java 25 ^(class file version 69^).
|
||||
echo.
|
||||
echo Download Java 25: https://download.oracle.com/java/25/latest/jdk-25_windows-x64_bin.exe
|
||||
echo.
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
)
|
||||
|
||||
:: --- Copy game files from F2P install ---
|
||||
|
||||
if defined F2P_DIR (
|
||||
echo [INFO] Found F2P launcher game files: !F2P_DIR!
|
||||
|
||||
if not exist "%SERVER_JAR%" (
|
||||
if exist "!F2P_DIR!\Server\HytaleServer.jar" (
|
||||
echo [INFO] Found HytaleServer.jar in F2P launcher
|
||||
echo [INFO] Copying from: !F2P_DIR!\Server\HytaleServer.jar
|
||||
copy "!F2P_DIR!\Server\HytaleServer.jar" "%SERVER_JAR%" >nul
|
||||
echo [INFO] Copied successfully
|
||||
)
|
||||
)
|
||||
|
||||
if not exist "%ASSETS_PATH%" (
|
||||
if exist "!F2P_DIR!\Assets.zip" (
|
||||
echo [INFO] Found Assets.zip in F2P launcher
|
||||
echo [INFO] Copying from: !F2P_DIR!\Assets.zip
|
||||
copy "!F2P_DIR!\Assets.zip" "%ASSETS_PATH%" >nul
|
||||
echo [INFO] Copied successfully
|
||||
)
|
||||
)
|
||||
|
||||
echo.
|
||||
) else (
|
||||
echo [INFO] No F2P launcher install found, will download files
|
||||
echo.
|
||||
)
|
||||
|
||||
:: --- Download / Update HytaleServer.jar ---
|
||||
|
||||
set "JAR_URL=%DOWNLOAD_BASE%/HytaleServer.jar"
|
||||
set "JAR_VERSION_FILE=%VERSION_DIR%\HytaleServer.jar.version"
|
||||
|
||||
if not exist "%SERVER_JAR%" (
|
||||
echo [INFO] HytaleServer.jar not found, downloading...
|
||||
echo [INFO] Expected size: ~150 MB
|
||||
curl -fL --progress-bar -o "%SERVER_JAR%.tmp" "%JAR_URL%" --connect-timeout 15 --max-time 3600
|
||||
if exist "%SERVER_JAR%.tmp" (
|
||||
move /y "%SERVER_JAR%.tmp" "%SERVER_JAR%" >nul
|
||||
echo [INFO] HytaleServer.jar downloaded
|
||||
for /f "delims=" %%h in ('powershell -Command "try { (Invoke-WebRequest -Uri '%JAR_URL%' -Method Head -UseBasicParsing).Headers['ETag'] } catch {}" 2^>nul') do (
|
||||
echo %%h>"%JAR_VERSION_FILE%"
|
||||
)
|
||||
) else (
|
||||
echo [ERROR] Failed to download HytaleServer.jar
|
||||
echo [ERROR] Check your internet connection
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
) else (
|
||||
echo [INFO] Checking for HytaleServer.jar updates...
|
||||
set "LOCAL_JAR_VER="
|
||||
if exist "%JAR_VERSION_FILE%" set /p LOCAL_JAR_VER=<"%JAR_VERSION_FILE%"
|
||||
|
||||
set "REMOTE_JAR_VER="
|
||||
for /f "delims=" %%h in ('powershell -Command "try { (Invoke-WebRequest -Uri '%JAR_URL%' -Method Head -UseBasicParsing -TimeoutSec 10).Headers['ETag'] } catch { '' }" 2^>nul') do (
|
||||
set "REMOTE_JAR_VER=%%h"
|
||||
)
|
||||
|
||||
if defined REMOTE_JAR_VER (
|
||||
if "!LOCAL_JAR_VER!"=="!REMOTE_JAR_VER!" (
|
||||
echo [INFO] HytaleServer.jar is up to date
|
||||
) else (
|
||||
echo [INFO] HytaleServer.jar update available, downloading...
|
||||
curl -fL --progress-bar -o "%SERVER_JAR%.tmp" "%JAR_URL%" --connect-timeout 15 --max-time 3600
|
||||
if exist "%SERVER_JAR%.tmp" (
|
||||
move /y "%SERVER_JAR%.tmp" "%SERVER_JAR%" >nul
|
||||
echo !REMOTE_JAR_VER!>"%JAR_VERSION_FILE%"
|
||||
echo [INFO] HytaleServer.jar updated
|
||||
) else (
|
||||
echo [WARN] Update failed, using existing HytaleServer.jar
|
||||
)
|
||||
)
|
||||
) else (
|
||||
echo [INFO] Could not check for updates, using existing HytaleServer.jar
|
||||
)
|
||||
)
|
||||
|
||||
:: --- Download / Update Assets.zip ---
|
||||
|
||||
set "ASSETS_URL=%DOWNLOAD_BASE%/Assets.zip"
|
||||
set "ASSETS_VERSION_FILE=%VERSION_DIR%\Assets.zip.version"
|
||||
|
||||
if not exist "%ASSETS_PATH%" (
|
||||
echo [INFO] Assets.zip not found, downloading...
|
||||
echo [INFO] Expected size: ~3.3 GB - this will take a while
|
||||
curl -fL --progress-bar -o "%ASSETS_PATH%.tmp" "%ASSETS_URL%" --connect-timeout 15 --max-time 7200
|
||||
if exist "%ASSETS_PATH%.tmp" (
|
||||
move /y "%ASSETS_PATH%.tmp" "%ASSETS_PATH%" >nul
|
||||
echo [INFO] Assets.zip downloaded
|
||||
for /f "delims=" %%h in ('powershell -Command "try { (Invoke-WebRequest -Uri '%ASSETS_URL%' -Method Head -UseBasicParsing).Headers['ETag'] } catch {}" 2^>nul') do (
|
||||
echo %%h>"%ASSETS_VERSION_FILE%"
|
||||
)
|
||||
) else (
|
||||
echo [ERROR] Failed to download Assets.zip
|
||||
echo [ERROR] Check your internet connection
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
) else (
|
||||
echo [INFO] Checking for Assets.zip updates...
|
||||
set "LOCAL_ASSETS_VER="
|
||||
if exist "%ASSETS_VERSION_FILE%" set /p LOCAL_ASSETS_VER=<"%ASSETS_VERSION_FILE%"
|
||||
|
||||
set "REMOTE_ASSETS_VER="
|
||||
for /f "delims=" %%h in ('powershell -Command "try { (Invoke-WebRequest -Uri '%ASSETS_URL%' -Method Head -UseBasicParsing -TimeoutSec 10).Headers['ETag'] } catch { '' }" 2^>nul') do (
|
||||
set "REMOTE_ASSETS_VER=%%h"
|
||||
)
|
||||
|
||||
if defined REMOTE_ASSETS_VER (
|
||||
if "!LOCAL_ASSETS_VER!"=="!REMOTE_ASSETS_VER!" (
|
||||
echo [INFO] Assets.zip is up to date
|
||||
) else (
|
||||
echo [INFO] Assets.zip update available, downloading...
|
||||
echo [INFO] This is a large file ^(~3.3 GB^), please be patient
|
||||
curl -fL --progress-bar -o "%ASSETS_PATH%.tmp" "%ASSETS_URL%" --connect-timeout 15 --max-time 7200
|
||||
if exist "%ASSETS_PATH%.tmp" (
|
||||
move /y "%ASSETS_PATH%.tmp" "%ASSETS_PATH%" >nul
|
||||
echo !REMOTE_ASSETS_VER!>"%ASSETS_VERSION_FILE%"
|
||||
echo [INFO] Assets.zip updated
|
||||
) else (
|
||||
echo [WARN] Update failed, using existing Assets.zip
|
||||
)
|
||||
)
|
||||
) else (
|
||||
echo [INFO] Could not check for updates, using existing Assets.zip
|
||||
)
|
||||
)
|
||||
|
||||
:: --- Download / Update DualAuth Agent ---
|
||||
|
||||
set "AGENT_VERSION_FILE=%VERSION_DIR%\dualauth-agent.jar.version"
|
||||
|
||||
if not exist "%AGENT_JAR%" (
|
||||
echo [INFO] Downloading DualAuth Agent...
|
||||
curl -fL -# -o "%AGENT_JAR%.tmp" "%AGENT_URL%" --connect-timeout 15 --max-time 120
|
||||
if exist "%AGENT_JAR%.tmp" (
|
||||
move /y "%AGENT_JAR%.tmp" "%AGENT_JAR%" >nul
|
||||
echo [INFO] DualAuth Agent downloaded
|
||||
for /f "delims=" %%v in ('powershell -Command "try { $r = Invoke-RestMethod -Uri '%AGENT_VERSION_API%' -TimeoutSec 10; $r.tag_name } catch { '' }" 2^>nul') do (
|
||||
echo %%v>"%AGENT_VERSION_FILE%"
|
||||
)
|
||||
) else (
|
||||
echo [ERROR] Failed to download DualAuth Agent
|
||||
echo [ERROR] Download manually: %AGENT_URL%
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
) else (
|
||||
echo [INFO] Checking for DualAuth Agent updates...
|
||||
set "LOCAL_AGENT_VER="
|
||||
if exist "%AGENT_VERSION_FILE%" set /p LOCAL_AGENT_VER=<"%AGENT_VERSION_FILE%"
|
||||
|
||||
set "REMOTE_AGENT_VER="
|
||||
for /f "delims=" %%v in ('powershell -Command "try { $r = Invoke-RestMethod -Uri '%AGENT_VERSION_API%' -TimeoutSec 10; $r.tag_name } catch { '' }" 2^>nul') do (
|
||||
set "REMOTE_AGENT_VER=%%v"
|
||||
)
|
||||
|
||||
if defined REMOTE_AGENT_VER (
|
||||
if "!LOCAL_AGENT_VER!"=="!REMOTE_AGENT_VER!" (
|
||||
echo [INFO] DualAuth Agent up to date ^(!LOCAL_AGENT_VER!^)
|
||||
) else (
|
||||
echo [INFO] Agent update: !LOCAL_AGENT_VER! -^> !REMOTE_AGENT_VER!
|
||||
curl -fL -# -o "%AGENT_JAR%.tmp" "%AGENT_URL%" --connect-timeout 15 --max-time 120
|
||||
if exist "%AGENT_JAR%.tmp" (
|
||||
move /y "%AGENT_JAR%.tmp" "%AGENT_JAR%" >nul
|
||||
echo !REMOTE_AGENT_VER!>"%AGENT_VERSION_FILE%"
|
||||
echo [INFO] DualAuth Agent updated
|
||||
) else (
|
||||
echo [WARN] Agent update failed, using existing
|
||||
)
|
||||
)
|
||||
) else (
|
||||
echo [INFO] Could not check agent updates, using existing
|
||||
)
|
||||
)
|
||||
|
||||
:: --- Final Checks ---
|
||||
|
||||
if not exist "%SERVER_JAR%" (
|
||||
echo [ERROR] HytaleServer.jar not found
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
if not exist "%ASSETS_PATH%" (
|
||||
echo [ERROR] Assets.zip not found
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
if not exist "%AGENT_JAR%" (
|
||||
echo [ERROR] dualauth-agent.jar not found
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
:: --- Generate or Load Server ID ---
|
||||
|
||||
set "SERVER_ID_FILE=.server-id"
|
||||
if exist "%SERVER_ID_FILE%" (
|
||||
set /p SERVER_ID=<"%SERVER_ID_FILE%"
|
||||
echo [INFO] Server ID: !SERVER_ID!
|
||||
) else (
|
||||
for /f "delims=" %%i in ('powershell -Command "[guid]::NewGuid().ToString()"') do set "SERVER_ID=%%i"
|
||||
echo !SERVER_ID!>"%SERVER_ID_FILE%"
|
||||
echo [INFO] Generated server ID: !SERVER_ID!
|
||||
)
|
||||
|
||||
:: --- Fetch Server Tokens ---
|
||||
|
||||
echo.
|
||||
echo [INFO] Fetching server tokens from %AUTH_SERVER%...
|
||||
|
||||
set "TEMP_RESPONSE=%TEMP%\hytale_auth_%RANDOM%.json"
|
||||
|
||||
curl -s -X POST "%AUTH_SERVER%/server/auto-auth" ^
|
||||
-H "Content-Type: application/json" ^
|
||||
-d "{\"server_id\": \"!SERVER_ID!\", \"server_name\": \"%SERVER_NAME%\"}" ^
|
||||
--connect-timeout 10 ^
|
||||
--max-time 30 ^
|
||||
-o "%TEMP_RESPONSE%" 2>nul
|
||||
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] Failed to connect to auth server at %AUTH_SERVER%
|
||||
del "%TEMP_RESPONSE%" 2>nul
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
findstr /C:"sessionToken" "%TEMP_RESPONSE%" >nul 2>&1
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] Invalid response from auth server:
|
||||
type "%TEMP_RESPONSE%"
|
||||
del "%TEMP_RESPONSE%" 2>nul
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
:: Extract tokens using PowerShell
|
||||
for /f "delims=" %%i in ('powershell -Command "$j = Get-Content '%TEMP_RESPONSE%' | ConvertFrom-Json; $j.sessionToken"') do set "SESSION_TOKEN=%%i"
|
||||
for /f "delims=" %%i in ('powershell -Command "$j = Get-Content '%TEMP_RESPONSE%' | ConvertFrom-Json; $j.identityToken"') do set "IDENTITY_TOKEN=%%i"
|
||||
|
||||
del "%TEMP_RESPONSE%" 2>nul
|
||||
|
||||
if "!SESSION_TOKEN!"=="" (
|
||||
echo [ERROR] Could not extract session token from response
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
if "!IDENTITY_TOKEN!"=="" (
|
||||
echo [ERROR] Could not extract identity token from response
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
echo [INFO] Tokens received successfully
|
||||
|
||||
:: --- Start Server ---
|
||||
|
||||
set "JAVA_ARGS="
|
||||
if defined JVM_XMS set "JAVA_ARGS=!JAVA_ARGS! -Xms%JVM_XMS%"
|
||||
if defined JVM_XMX set "JAVA_ARGS=!JAVA_ARGS! -Xmx%JVM_XMX%"
|
||||
|
||||
echo.
|
||||
echo ============================================================
|
||||
echo Starting Hytale Server
|
||||
echo Name: %SERVER_NAME%
|
||||
echo Bind: %BIND_ADDRESS%
|
||||
echo Java: !JAVA_CMD!
|
||||
echo Agent: %AGENT_JAR%
|
||||
echo ============================================================
|
||||
echo.
|
||||
|
||||
"!JAVA_CMD!" %JAVA_ARGS% -javaagent:"%AGENT_JAR%" -jar "%SERVER_JAR%" ^
|
||||
--assets "%ASSETS_PATH%" ^
|
||||
--bind "%BIND_ADDRESS%" ^
|
||||
--auth-mode "%AUTH_MODE%" ^
|
||||
--disable-sentry ^
|
||||
--session-token "!SESSION_TOKEN!" ^
|
||||
--identity-token "!IDENTITY_TOKEN!" ^
|
||||
%*
|
||||
|
||||
echo.
|
||||
echo ============================================================
|
||||
echo Server stopped. Exit code: %ERRORLEVEL%
|
||||
echo ============================================================
|
||||
pause
|
||||
|
||||
endlocal
|
||||
516
server/start.sh
516
server/start.sh
@@ -1,516 +0,0 @@
|
||||
#!/bin/bash
|
||||
# ============================================================
|
||||
# Hytale F2P Dedicated Server - One-Click Starter
|
||||
# ============================================================
|
||||
# Just run: ./start.sh
|
||||
#
|
||||
# The script will:
|
||||
# 1. Look for game files in your F2P launcher install
|
||||
# 2. Auto-download anything missing
|
||||
# 3. Auto-update server, assets, and agent on each launch
|
||||
# 4. Fetch auth tokens and start the server
|
||||
# ============================================================
|
||||
|
||||
set -e
|
||||
|
||||
# Configuration (edit these or set as environment variables)
|
||||
HYTALE_AUTH_DOMAIN="${HYTALE_AUTH_DOMAIN:-auth.sanasol.ws}"
|
||||
AUTH_SERVER="${AUTH_SERVER:-https://$HYTALE_AUTH_DOMAIN}"
|
||||
SERVER_NAME="${SERVER_NAME:-My Hytale Server}"
|
||||
BIND_ADDRESS="${BIND_ADDRESS:-0.0.0.0:5520}"
|
||||
AUTH_MODE="${AUTH_MODE:-authenticated}"
|
||||
|
||||
# Download URLs
|
||||
DOWNLOAD_BASE="${DOWNLOAD_BASE:-https://download.sanasol.ws/download}"
|
||||
AGENT_URL="https://github.com/sanasol/hytale-auth-server/releases/latest/download/dualauth-agent.jar"
|
||||
AGENT_VERSION_API="https://api.github.com/repos/sanasol/hytale-auth-server/releases/latest"
|
||||
|
||||
# File names (in current directory)
|
||||
AGENT_JAR="dualauth-agent.jar"
|
||||
SERVER_JAR="HytaleServer.jar"
|
||||
ASSETS_FILE="Assets.zip"
|
||||
ASSETS_PATH="${ASSETS_PATH:-./Assets.zip}"
|
||||
VERSION_DIR=".versions"
|
||||
|
||||
echo "============================================================"
|
||||
echo " Hytale F2P Dedicated Server"
|
||||
echo "============================================================"
|
||||
echo ""
|
||||
|
||||
# --- Prerequisite Checks ---
|
||||
|
||||
if ! command -v curl &>/dev/null; then
|
||||
echo "[ERROR] curl is required but not found"
|
||||
echo " Install: sudo apt install curl"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "$VERSION_DIR"
|
||||
|
||||
# --- Find Local F2P Launcher Install ---
|
||||
|
||||
get_f2p_default_dir() {
|
||||
case "$(uname -s)" in
|
||||
Darwin) echo "$HOME/Library/Application Support/HytaleF2P" ;;
|
||||
Linux) echo "$HOME/.hytalef2p" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Read a JSON string field from config.json using available tools
|
||||
read_config_field() {
|
||||
local config_file="$1" field="$2"
|
||||
if [ ! -f "$config_file" ]; then return 1; fi
|
||||
|
||||
if command -v python3 &>/dev/null; then
|
||||
python3 -c "
|
||||
import json
|
||||
try:
|
||||
c = json.load(open('$config_file'))
|
||||
v = c.get('$field', '').strip()
|
||||
if v: print(v)
|
||||
except: pass
|
||||
" 2>/dev/null
|
||||
elif command -v jq &>/dev/null; then
|
||||
jq -r ".$field // empty" "$config_file" 2>/dev/null
|
||||
else
|
||||
grep -o "\"$field\"[[:space:]]*:[[:space:]]*\"[^\"]*\"" "$config_file" 2>/dev/null | cut -d'"' -f4
|
||||
fi
|
||||
}
|
||||
|
||||
find_f2p_install() {
|
||||
local default_app_dir
|
||||
default_app_dir=$(get_f2p_default_dir) || return 1
|
||||
|
||||
local search_dirs=()
|
||||
|
||||
# Check config.json for custom installPath
|
||||
local config_file="$default_app_dir/config.json"
|
||||
local custom_path
|
||||
custom_path=$(read_config_field "$config_file" "installPath")
|
||||
if [ -n "$custom_path" ]; then
|
||||
local custom_f2p="$custom_path/HytaleF2P"
|
||||
if [ -d "$custom_f2p" ]; then
|
||||
search_dirs+=("$custom_f2p")
|
||||
fi
|
||||
fi
|
||||
|
||||
# Always also check default location
|
||||
search_dirs+=("$default_app_dir")
|
||||
|
||||
for base in "${search_dirs[@]}"; do
|
||||
for branch in "release" "pre-release"; do
|
||||
local game_dir="$base/$branch/package/game/latest"
|
||||
if [ -d "$game_dir" ]; then
|
||||
echo "$game_dir"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Find bundled JRE from F2P launcher install
|
||||
find_f2p_java() {
|
||||
local default_app_dir
|
||||
default_app_dir=$(get_f2p_default_dir) || return 1
|
||||
|
||||
local search_dirs=()
|
||||
|
||||
# Check config.json for custom javaPath first
|
||||
local config_file="$default_app_dir/config.json"
|
||||
local custom_java
|
||||
custom_java=$(read_config_field "$config_file" "javaPath")
|
||||
if [ -n "$custom_java" ] && [ -x "$custom_java" ]; then
|
||||
echo "$custom_java"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Check custom installPath
|
||||
local custom_path
|
||||
custom_path=$(read_config_field "$config_file" "installPath")
|
||||
if [ -n "$custom_path" ]; then
|
||||
local custom_f2p="$custom_path/HytaleF2P"
|
||||
[ -d "$custom_f2p" ] && search_dirs+=("$custom_f2p")
|
||||
fi
|
||||
|
||||
search_dirs+=("$default_app_dir")
|
||||
|
||||
for base in "${search_dirs[@]}"; do
|
||||
for branch in "release" "pre-release"; do
|
||||
local jre_dir="$base/$branch/package/jre/latest"
|
||||
# Standard path
|
||||
if [ -x "$jre_dir/bin/java" ]; then
|
||||
echo "$jre_dir/bin/java"
|
||||
return 0
|
||||
fi
|
||||
# macOS bundle path
|
||||
if [ -x "$jre_dir/Contents/Home/bin/java" ]; then
|
||||
echo "$jre_dir/Contents/Home/bin/java"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
copy_from_f2p() {
|
||||
local file="$1" local_path="$2" f2p_path="$3"
|
||||
|
||||
if [ -f "$local_path" ]; then
|
||||
return 1 # Already exists locally
|
||||
fi
|
||||
|
||||
if [ -f "$f2p_path" ]; then
|
||||
echo "[INFO] Found $file in F2P launcher install"
|
||||
echo "[INFO] Copying from: $f2p_path"
|
||||
cp "$f2p_path" "$local_path"
|
||||
echo "[INFO] Copied successfully"
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# --- Detect Java ---
|
||||
|
||||
JAVA_CMD="java"
|
||||
|
||||
# Try F2P bundled JRE first
|
||||
F2P_JAVA=$(find_f2p_java 2>/dev/null) || true
|
||||
if [ -n "$F2P_JAVA" ]; then
|
||||
echo "[INFO] Found Java in F2P launcher: $F2P_JAVA"
|
||||
JAVA_CMD="$F2P_JAVA"
|
||||
elif ! command -v java &>/dev/null; then
|
||||
echo "[ERROR] Java is not installed and no F2P launcher JRE found"
|
||||
echo ""
|
||||
echo " Options:"
|
||||
echo " 1. Install the F2P launcher first (it includes Java)"
|
||||
echo " 2. Install Java 25+ manually:"
|
||||
echo " Windows: https://download.oracle.com/java/25/latest/jdk-25_windows-x64_bin.exe"
|
||||
echo " macOS: brew install openjdk"
|
||||
echo " Ubuntu/Debian: sudo apt install openjdk-25-jre"
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Java version
|
||||
JAVA_FULL=$("$JAVA_CMD" -version 2>&1 | head -1)
|
||||
JAVA_VER=$(echo "$JAVA_FULL" | grep -oP '(?<=")\d+' 2>/dev/null || echo "$JAVA_FULL" | sed 's/.*"\([0-9]*\).*/\1/')
|
||||
echo "[INFO] Java: $JAVA_FULL"
|
||||
if [ -n "$JAVA_VER" ] && [ "$JAVA_VER" -lt 25 ] 2>/dev/null; then
|
||||
echo "[ERROR] Java $JAVA_VER detected. Java 25+ is REQUIRED."
|
||||
echo " The DualAuth agent requires Java 25 (class file version 69)."
|
||||
echo ""
|
||||
if [ -n "$F2P_JAVA" ]; then
|
||||
echo " Your F2P launcher JRE is outdated. Update the launcher to get a newer Java."
|
||||
else
|
||||
echo " Install Java 25+:"
|
||||
echo " Windows: https://download.oracle.com/java/25/latest/jdk-25_windows-x64_bin.exe"
|
||||
echo " macOS: brew install openjdk"
|
||||
echo " Ubuntu/Debian: sudo apt install openjdk-25-jre"
|
||||
fi
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- Find F2P Game Files ---
|
||||
|
||||
F2P_DIR=""
|
||||
if F2P_DIR=$(find_f2p_install 2>/dev/null); then
|
||||
echo "[INFO] Found F2P launcher game files: $F2P_DIR"
|
||||
|
||||
# Try to copy HytaleServer.jar from F2P install
|
||||
copy_from_f2p "HytaleServer.jar" "$SERVER_JAR" "$F2P_DIR/Server/HytaleServer.jar" || true
|
||||
|
||||
# Try to copy Assets.zip from F2P install
|
||||
copy_from_f2p "Assets.zip" "$ASSETS_PATH" "$F2P_DIR/Assets.zip" || true
|
||||
|
||||
echo ""
|
||||
else
|
||||
echo "[INFO] No F2P launcher install found, will download files"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# --- Download / Update Functions ---
|
||||
|
||||
get_remote_version() {
|
||||
local url="$1"
|
||||
local headers
|
||||
headers=$(curl -sI -L "$url" --connect-timeout 10 --max-time 15 2>/dev/null | tr -d '\r')
|
||||
local etag
|
||||
etag=$(echo "$headers" | grep -i "^etag:" | tail -1 | sed 's/^[^:]*: *//' | tr -d '"')
|
||||
if [ -n "$etag" ]; then printf '%s' "$etag"; return 0; fi
|
||||
local lastmod
|
||||
lastmod=$(echo "$headers" | grep -i "^last-modified:" | tail -1 | sed 's/^[^:]*: *//')
|
||||
if [ -n "$lastmod" ]; then printf '%s' "$lastmod"; return 0; fi
|
||||
local length
|
||||
length=$(echo "$headers" | grep -i "^content-length:" | tail -1 | sed 's/^[^:]*: *//')
|
||||
if [ -n "$length" ]; then printf 'size:%s' "$length"; return 0; fi
|
||||
return 1
|
||||
}
|
||||
|
||||
needs_update() {
|
||||
local url="$1" dest="$2" name="$3"
|
||||
local version_file="${VERSION_DIR}/${name}.version"
|
||||
|
||||
if [ ! -f "$dest" ]; then
|
||||
echo "[INFO] $name not found, will download"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "[INFO] Checking for $name updates..."
|
||||
local remote_version
|
||||
remote_version=$(get_remote_version "$url" 2>/dev/null) || true
|
||||
if [ -z "$remote_version" ]; then
|
||||
echo "[INFO] Could not check for updates, using existing $name"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local local_version=""
|
||||
[ -f "$version_file" ] && local_version=$(cat "$version_file" 2>/dev/null)
|
||||
|
||||
if [ "$remote_version" = "$local_version" ]; then
|
||||
echo "[INFO] $name is up to date"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ -n "$local_version" ]; then
|
||||
echo "[INFO] $name update available"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
save_version() {
|
||||
local url="$1" name="$2"
|
||||
local version_file="${VERSION_DIR}/${name}.version"
|
||||
local ver
|
||||
ver=$(get_remote_version "$url" 2>/dev/null) || true
|
||||
[ -n "$ver" ] && printf '%s\n' "$ver" > "$version_file"
|
||||
}
|
||||
|
||||
download_file() {
|
||||
local url="$1" dest="$2" name="$3" expected_mb="${4:-0}"
|
||||
local tmp="${dest}.tmp"
|
||||
|
||||
echo "[INFO] Downloading $name..."
|
||||
[ "$expected_mb" -gt 0 ] 2>/dev/null && echo "[INFO] Expected size: ~${expected_mb} MB"
|
||||
|
||||
for attempt in 1 2 3; do
|
||||
rm -f "$tmp" 2>/dev/null || true
|
||||
|
||||
if [ "$expected_mb" -gt 50 ] 2>/dev/null; then
|
||||
curl -fL --progress-bar -o "$tmp" "$url" --connect-timeout 15 --max-time 3600 2>&1
|
||||
else
|
||||
curl -fL -# -o "$tmp" "$url" --connect-timeout 15 --max-time 300 2>&1
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ] && [ -f "$tmp" ]; then
|
||||
local size
|
||||
size=$(stat -c%s "$tmp" 2>/dev/null || stat -f%z "$tmp" 2>/dev/null || echo 0)
|
||||
if [ "$size" -gt 1000 ]; then
|
||||
mv -f "$tmp" "$dest"
|
||||
local mb=$((size / 1024 / 1024))
|
||||
echo "[INFO] $name downloaded (${mb} MB)"
|
||||
return 0
|
||||
fi
|
||||
echo "[WARN] $name download too small (${size} bytes), retrying..."
|
||||
fi
|
||||
|
||||
echo "[WARN] Download attempt $attempt failed, retrying..."
|
||||
rm -f "$tmp" 2>/dev/null || true
|
||||
sleep 2
|
||||
done
|
||||
|
||||
echo "[ERROR] Failed to download $name after 3 attempts"
|
||||
rm -f "$tmp" 2>/dev/null || true
|
||||
return 1
|
||||
}
|
||||
|
||||
# --- Download / Update Server Files ---
|
||||
|
||||
# HytaleServer.jar
|
||||
JAR_URL="${DOWNLOAD_BASE}/HytaleServer.jar"
|
||||
if needs_update "$JAR_URL" "$SERVER_JAR" "HytaleServer.jar"; then
|
||||
if download_file "$JAR_URL" "$SERVER_JAR" "HytaleServer.jar" "150"; then
|
||||
save_version "$JAR_URL" "HytaleServer.jar"
|
||||
else
|
||||
if [ ! -f "$SERVER_JAR" ]; then
|
||||
echo "[ERROR] HytaleServer.jar is required. Check your internet connection."
|
||||
exit 1
|
||||
fi
|
||||
echo "[WARN] Update failed, using existing HytaleServer.jar"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Assets.zip
|
||||
ASSETS_URL="${DOWNLOAD_BASE}/Assets.zip"
|
||||
if needs_update "$ASSETS_URL" "$ASSETS_PATH" "Assets.zip"; then
|
||||
echo "[INFO] Assets.zip is large (~3.3 GB), this may take a while..."
|
||||
if download_file "$ASSETS_URL" "$ASSETS_PATH" "Assets.zip" "3300"; then
|
||||
save_version "$ASSETS_URL" "Assets.zip"
|
||||
else
|
||||
if [ ! -f "$ASSETS_PATH" ]; then
|
||||
echo "[ERROR] Assets.zip is required. Check your internet connection."
|
||||
exit 1
|
||||
fi
|
||||
echo "[WARN] Update failed, using existing Assets.zip"
|
||||
fi
|
||||
fi
|
||||
|
||||
# DualAuth Agent (uses GitHub releases API for version tracking)
|
||||
check_agent_update() {
|
||||
if [ -f "$AGENT_JAR" ]; then
|
||||
local agent_size
|
||||
agent_size=$(stat -c%s "$AGENT_JAR" 2>/dev/null || stat -f%z "$AGENT_JAR" 2>/dev/null || echo 0)
|
||||
if [ "$agent_size" -lt 10000 ]; then
|
||||
echo "[WARN] Agent JAR seems corrupt (${agent_size} bytes), re-downloading..."
|
||||
rm -f "$AGENT_JAR"
|
||||
return 0
|
||||
fi
|
||||
|
||||
local version_file="${VERSION_DIR}/${AGENT_JAR}.version"
|
||||
local local_version=""
|
||||
[ -f "$version_file" ] && local_version=$(cat "$version_file" 2>/dev/null)
|
||||
|
||||
echo "[INFO] Checking for DualAuth Agent updates..."
|
||||
local remote_version
|
||||
remote_version=$(curl -sf "$AGENT_VERSION_API" --connect-timeout 5 --max-time 10 2>/dev/null | grep -o '"tag_name":"[^"]*"' | cut -d'"' -f4)
|
||||
|
||||
if [ -n "$remote_version" ]; then
|
||||
if [ "$local_version" = "$remote_version" ]; then
|
||||
echo "[INFO] DualAuth Agent up to date ($local_version)"
|
||||
return 1
|
||||
else
|
||||
echo "[INFO] Agent update: ${local_version:-unknown} -> $remote_version"
|
||||
return 0
|
||||
fi
|
||||
else
|
||||
echo "[INFO] Could not check agent updates, using existing"
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
AGENT_REMOTE_VERSION=""
|
||||
if check_agent_update; then
|
||||
echo "[INFO] Downloading DualAuth Agent..."
|
||||
if curl -fL -# -o "${AGENT_JAR}.tmp" "$AGENT_URL" --connect-timeout 15 --max-time 120 2>&1 && [ -f "${AGENT_JAR}.tmp" ]; then
|
||||
dl_size=$(stat -c%s "${AGENT_JAR}.tmp" 2>/dev/null || stat -f%z "${AGENT_JAR}.tmp" 2>/dev/null || echo 0)
|
||||
if [ "$dl_size" -gt 10000 ]; then
|
||||
mv -f "${AGENT_JAR}.tmp" "$AGENT_JAR"
|
||||
AGENT_REMOTE_VERSION=$(curl -sf "$AGENT_VERSION_API" --connect-timeout 5 --max-time 10 2>/dev/null | grep -o '"tag_name":"[^"]*"' | cut -d'"' -f4)
|
||||
[ -n "$AGENT_REMOTE_VERSION" ] && printf '%s\n' "$AGENT_REMOTE_VERSION" > "${VERSION_DIR}/${AGENT_JAR}.version"
|
||||
echo "[INFO] DualAuth Agent ready (${AGENT_REMOTE_VERSION:-latest})"
|
||||
else
|
||||
echo "[WARN] Downloaded agent too small, discarding"
|
||||
rm -f "${AGENT_JAR}.tmp"
|
||||
fi
|
||||
else
|
||||
rm -f "${AGENT_JAR}.tmp" 2>/dev/null
|
||||
if [ -f "$AGENT_JAR" ]; then
|
||||
echo "[WARN] Agent update failed, using existing"
|
||||
else
|
||||
echo "[ERROR] Failed to download DualAuth Agent"
|
||||
echo "[ERROR] Download manually: $AGENT_URL"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# --- Final Checks ---
|
||||
|
||||
for required in "$SERVER_JAR" "$ASSETS_PATH" "$AGENT_JAR"; do
|
||||
if [ ! -f "$required" ]; then
|
||||
echo "[ERROR] Required file missing: $required"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# --- Generate Server ID ---
|
||||
|
||||
SERVER_ID_FILE=".server-id"
|
||||
if [ -f "$SERVER_ID_FILE" ]; then
|
||||
SERVER_ID=$(cat "$SERVER_ID_FILE")
|
||||
echo "[INFO] Server ID: $SERVER_ID"
|
||||
else
|
||||
SERVER_ID=$(cat /proc/sys/kernel/random/uuid 2>/dev/null || uuidgen 2>/dev/null || python3 -c "import uuid; print(uuid.uuid4())" 2>/dev/null)
|
||||
if [ -z "$SERVER_ID" ]; then
|
||||
echo "[ERROR] Could not generate UUID. Install uuidgen or python3."
|
||||
exit 1
|
||||
fi
|
||||
printf '%s' "$SERVER_ID" > "$SERVER_ID_FILE"
|
||||
echo "[INFO] Generated server ID: $SERVER_ID"
|
||||
fi
|
||||
|
||||
# --- Fetch Tokens ---
|
||||
|
||||
echo ""
|
||||
echo "[INFO] Fetching server tokens from $AUTH_SERVER..."
|
||||
|
||||
TEMP_RESPONSE=$(mktemp)
|
||||
curl -s -X POST "$AUTH_SERVER/server/auto-auth" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"server_id\": \"$SERVER_ID\", \"server_name\": \"$SERVER_NAME\"}" \
|
||||
--connect-timeout 10 \
|
||||
--max-time 30 \
|
||||
-o "$TEMP_RESPONSE"
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "[ERROR] Failed to connect to auth server at $AUTH_SERVER"
|
||||
rm -f "$TEMP_RESPONSE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! grep -q "sessionToken" "$TEMP_RESPONSE" 2>/dev/null; then
|
||||
echo "[ERROR] Invalid response from auth server:"
|
||||
cat "$TEMP_RESPONSE"
|
||||
rm -f "$TEMP_RESPONSE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extract tokens (python3 > jq > grep fallback)
|
||||
if command -v python3 &>/dev/null; then
|
||||
SESSION_TOKEN=$(python3 -c "import json,sys; print(json.load(open('$TEMP_RESPONSE'))['sessionToken'])")
|
||||
IDENTITY_TOKEN=$(python3 -c "import json,sys; print(json.load(open('$TEMP_RESPONSE'))['identityToken'])")
|
||||
elif command -v jq &>/dev/null; then
|
||||
SESSION_TOKEN=$(jq -r '.sessionToken' "$TEMP_RESPONSE")
|
||||
IDENTITY_TOKEN=$(jq -r '.identityToken' "$TEMP_RESPONSE")
|
||||
else
|
||||
SESSION_TOKEN=$(grep -o '"sessionToken":"[^"]*"' "$TEMP_RESPONSE" | cut -d'"' -f4)
|
||||
IDENTITY_TOKEN=$(grep -o '"identityToken":"[^"]*"' "$TEMP_RESPONSE" | cut -d'"' -f4)
|
||||
fi
|
||||
|
||||
rm -f "$TEMP_RESPONSE"
|
||||
|
||||
if [ -z "$SESSION_TOKEN" ] || [ -z "$IDENTITY_TOKEN" ]; then
|
||||
echo "[ERROR] Could not extract tokens from auth server response"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "[INFO] Tokens received successfully"
|
||||
|
||||
# --- Start Server ---
|
||||
|
||||
JAVA_ARGS=""
|
||||
[ -n "${JVM_XMS:-}" ] && JAVA_ARGS="$JAVA_ARGS -Xms$JVM_XMS"
|
||||
[ -n "${JVM_XMX:-}" ] && JAVA_ARGS="$JAVA_ARGS -Xmx$JVM_XMX"
|
||||
|
||||
echo ""
|
||||
echo "============================================================"
|
||||
echo " Starting Hytale Server"
|
||||
echo " Name: $SERVER_NAME"
|
||||
echo " Bind: $BIND_ADDRESS"
|
||||
echo " Agent: $AGENT_JAR"
|
||||
echo "============================================================"
|
||||
echo ""
|
||||
|
||||
exec "$JAVA_CMD" $JAVA_ARGS -javaagent:"$AGENT_JAR" -jar "$SERVER_JAR" \
|
||||
--assets "$ASSETS_PATH" \
|
||||
--bind "$BIND_ADDRESS" \
|
||||
--auth-mode "$AUTH_MODE" \
|
||||
--disable-sentry \
|
||||
--session-token "$SESSION_TOKEN" \
|
||||
--identity-token "$IDENTITY_TOKEN" \
|
||||
"$@"
|
||||
@@ -1,523 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
/**
|
||||
* UUID Persistence Tests
|
||||
*
|
||||
* Simulates the exact conditions that caused character data loss:
|
||||
* - Config file corruption during updates
|
||||
* - File locks making config temporarily unreadable
|
||||
* - Username re-entry after config wipe
|
||||
*
|
||||
* Run: node test-uuid-persistence.js
|
||||
*/
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const os = require('os');
|
||||
|
||||
// Use a temp directory so we don't mess with real config
|
||||
const TEST_DIR = path.join(os.tmpdir(), 'hytale-uuid-test-' + Date.now());
|
||||
const CONFIG_FILE = path.join(TEST_DIR, 'config.json');
|
||||
const CONFIG_BACKUP = path.join(TEST_DIR, 'config.json.bak');
|
||||
const CONFIG_TEMP = path.join(TEST_DIR, 'config.json.tmp');
|
||||
const UUID_STORE_FILE = path.join(TEST_DIR, 'uuid-store.json');
|
||||
|
||||
// Track test results
|
||||
let passed = 0;
|
||||
let failed = 0;
|
||||
const failures = [];
|
||||
|
||||
function assert(condition, message) {
|
||||
if (condition) {
|
||||
passed++;
|
||||
console.log(` ✓ ${message}`);
|
||||
} else {
|
||||
failed++;
|
||||
failures.push(message);
|
||||
console.log(` ✗ FAIL: ${message}`);
|
||||
}
|
||||
}
|
||||
|
||||
function assertEqual(actual, expected, message) {
|
||||
if (actual === expected) {
|
||||
passed++;
|
||||
console.log(` ✓ ${message}`);
|
||||
} else {
|
||||
failed++;
|
||||
failures.push(`${message} (expected: ${expected}, got: ${actual})`);
|
||||
console.log(` ✗ FAIL: ${message} (expected: "${expected}", got: "${actual}")`);
|
||||
}
|
||||
}
|
||||
|
||||
function cleanup() {
|
||||
try {
|
||||
if (fs.existsSync(TEST_DIR)) {
|
||||
fs.rmSync(TEST_DIR, { recursive: true });
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
function setup() {
|
||||
cleanup();
|
||||
fs.mkdirSync(TEST_DIR, { recursive: true });
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Inline the config functions so we can override paths
|
||||
// (We can't require config.js directly because it uses hardcoded getAppDir())
|
||||
// ============================================================================
|
||||
|
||||
function validateConfig(config) {
|
||||
if (!config || typeof config !== 'object') return false;
|
||||
if (config.userUuids !== undefined && typeof config.userUuids !== 'object') return false;
|
||||
if (config.username !== undefined && (typeof config.username !== 'string')) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
function loadConfig() {
|
||||
try {
|
||||
if (fs.existsSync(CONFIG_FILE)) {
|
||||
const data = fs.readFileSync(CONFIG_FILE, 'utf8');
|
||||
if (data.trim()) {
|
||||
const config = JSON.parse(data);
|
||||
if (validateConfig(config)) return config;
|
||||
console.warn('[Config] Primary config invalid structure, trying backup...');
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('[Config] Failed to load primary config:', err.message);
|
||||
}
|
||||
|
||||
try {
|
||||
if (fs.existsSync(CONFIG_BACKUP)) {
|
||||
const data = fs.readFileSync(CONFIG_BACKUP, 'utf8');
|
||||
if (data.trim()) {
|
||||
const config = JSON.parse(data);
|
||||
if (validateConfig(config)) {
|
||||
console.log('[Config] Recovered from backup successfully');
|
||||
try { fs.writeFileSync(CONFIG_FILE, data, 'utf8'); } catch (e) {}
|
||||
return config;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
function saveConfig(update) {
|
||||
const maxRetries = 3;
|
||||
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
||||
try {
|
||||
if (!fs.existsSync(TEST_DIR)) fs.mkdirSync(TEST_DIR, { recursive: true });
|
||||
|
||||
const currentConfig = loadConfig();
|
||||
|
||||
// SAFETY CHECK: refuse to save if file exists but loaded empty
|
||||
if (Object.keys(currentConfig).length === 0 && fs.existsSync(CONFIG_FILE)) {
|
||||
const fileSize = fs.statSync(CONFIG_FILE).size;
|
||||
if (fileSize > 2) {
|
||||
console.error(`[Config] REFUSING to save — loaded empty but file exists (${fileSize} bytes). Retrying...`);
|
||||
const delay = attempt * 50; // shorter delay for tests
|
||||
const start = Date.now();
|
||||
while (Date.now() - start < delay) {}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
const newConfig = { ...currentConfig, ...update };
|
||||
const data = JSON.stringify(newConfig, null, 2);
|
||||
|
||||
fs.writeFileSync(CONFIG_TEMP, data, 'utf8');
|
||||
const verification = JSON.parse(fs.readFileSync(CONFIG_TEMP, 'utf8'));
|
||||
if (!validateConfig(verification)) throw new Error('Validation failed');
|
||||
|
||||
if (fs.existsSync(CONFIG_FILE)) {
|
||||
try {
|
||||
const currentData = fs.readFileSync(CONFIG_FILE, 'utf8');
|
||||
if (currentData.trim()) fs.writeFileSync(CONFIG_BACKUP, currentData, 'utf8');
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
fs.renameSync(CONFIG_TEMP, CONFIG_FILE);
|
||||
return true;
|
||||
} catch (err) {
|
||||
try { if (fs.existsSync(CONFIG_TEMP)) fs.unlinkSync(CONFIG_TEMP); } catch (e) {}
|
||||
if (attempt >= maxRetries) throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function loadUuidStore() {
|
||||
try {
|
||||
if (fs.existsSync(UUID_STORE_FILE)) {
|
||||
const data = fs.readFileSync(UUID_STORE_FILE, 'utf8');
|
||||
if (data.trim()) return JSON.parse(data);
|
||||
}
|
||||
} catch (err) {}
|
||||
return {};
|
||||
}
|
||||
|
||||
function saveUuidStore(store) {
|
||||
const tmpFile = UUID_STORE_FILE + '.tmp';
|
||||
fs.writeFileSync(tmpFile, JSON.stringify(store, null, 2), 'utf8');
|
||||
fs.renameSync(tmpFile, UUID_STORE_FILE);
|
||||
}
|
||||
|
||||
function migrateUuidStoreIfNeeded() {
|
||||
if (fs.existsSync(UUID_STORE_FILE)) return;
|
||||
const config = loadConfig();
|
||||
if (config.userUuids && Object.keys(config.userUuids).length > 0) {
|
||||
console.log('[UUID Store] Migrating', Object.keys(config.userUuids).length, 'UUIDs');
|
||||
saveUuidStore(config.userUuids);
|
||||
}
|
||||
}
|
||||
|
||||
function getUuidForUser(username) {
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
if (!username || !username.trim()) throw new Error('Username required');
|
||||
|
||||
const displayName = username.trim();
|
||||
const normalizedLookup = displayName.toLowerCase();
|
||||
|
||||
migrateUuidStoreIfNeeded();
|
||||
|
||||
// 1. Check UUID store (source of truth)
|
||||
const uuidStore = loadUuidStore();
|
||||
const storeKey = Object.keys(uuidStore).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (storeKey) {
|
||||
const existingUuid = uuidStore[storeKey];
|
||||
if (storeKey !== displayName) {
|
||||
delete uuidStore[storeKey];
|
||||
uuidStore[displayName] = existingUuid;
|
||||
saveUuidStore(uuidStore);
|
||||
}
|
||||
// Sync to config (non-critical)
|
||||
try {
|
||||
const config = loadConfig();
|
||||
const configUuids = config.userUuids || {};
|
||||
const configKey = Object.keys(configUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (!configKey || configUuids[configKey] !== existingUuid) {
|
||||
if (configKey) delete configUuids[configKey];
|
||||
configUuids[displayName] = existingUuid;
|
||||
saveConfig({ userUuids: configUuids });
|
||||
}
|
||||
} catch (e) {}
|
||||
return existingUuid;
|
||||
}
|
||||
|
||||
// 2. Fallback: check config.json
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
const configKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (configKey) {
|
||||
const recoveredUuid = userUuids[configKey];
|
||||
uuidStore[displayName] = recoveredUuid;
|
||||
saveUuidStore(uuidStore);
|
||||
return recoveredUuid;
|
||||
}
|
||||
|
||||
// 3. New user — generate UUID
|
||||
const newUuid = uuidv4();
|
||||
uuidStore[displayName] = newUuid;
|
||||
saveUuidStore(uuidStore);
|
||||
userUuids[displayName] = newUuid;
|
||||
saveConfig({ userUuids });
|
||||
return newUuid;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// OLD CODE (before fix) — for comparison testing
|
||||
// ============================================================================
|
||||
|
||||
function getUuidForUser_OLD(username) {
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
if (!username || !username.trim()) throw new Error('Username required');
|
||||
const displayName = username.trim();
|
||||
const normalizedLookup = displayName.toLowerCase();
|
||||
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
const existingKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
|
||||
if (existingKey) {
|
||||
return userUuids[existingKey];
|
||||
}
|
||||
|
||||
// New user
|
||||
const newUuid = uuidv4();
|
||||
userUuids[displayName] = newUuid;
|
||||
saveConfig({ userUuids });
|
||||
return newUuid;
|
||||
}
|
||||
|
||||
function saveConfig_OLD(update) {
|
||||
// OLD saveConfig without safety check
|
||||
if (!fs.existsSync(TEST_DIR)) fs.mkdirSync(TEST_DIR, { recursive: true });
|
||||
const currentConfig = loadConfig();
|
||||
// NO SAFETY CHECK — this is the bug
|
||||
const newConfig = { ...currentConfig, ...update };
|
||||
fs.writeFileSync(CONFIG_FILE, JSON.stringify(newConfig, null, 2), 'utf8');
|
||||
return true;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// TESTS
|
||||
// ============================================================================
|
||||
|
||||
console.log('\n' + '='.repeat(70));
|
||||
console.log('UUID PERSISTENCE TESTS — Simulating update corruption scenarios');
|
||||
console.log('='.repeat(70));
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 1: Normal flow — UUID stays consistent
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 1: Normal flow — UUID stays consistent ---');
|
||||
setup();
|
||||
|
||||
const uuid1 = getUuidForUser('SpecialK');
|
||||
const uuid2 = getUuidForUser('SpecialK');
|
||||
const uuid3 = getUuidForUser('specialk'); // case insensitive
|
||||
|
||||
assertEqual(uuid1, uuid2, 'Same username returns same UUID');
|
||||
assertEqual(uuid1, uuid3, 'Case-insensitive lookup returns same UUID');
|
||||
assert(uuid1.match(/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i), 'UUID is valid v4 format');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 2: Simulate update corruption (THE BUG) — old code
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 2: OLD CODE — Config wipe during update loses UUID ---');
|
||||
setup();
|
||||
|
||||
// Setup: player has UUID
|
||||
const oldConfig = { username: 'SpecialK', userUuids: { 'SpecialK': 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee' }, hasLaunchedBefore: true };
|
||||
fs.writeFileSync(CONFIG_FILE, JSON.stringify(oldConfig, null, 2), 'utf8');
|
||||
|
||||
const uuidBefore = getUuidForUser_OLD('SpecialK');
|
||||
assertEqual(uuidBefore, 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee', 'UUID correct before corruption');
|
||||
|
||||
// Simulate: config.json gets corrupted (loadConfig returns {} because file locked)
|
||||
// This simulates what happens when saveConfig reads an empty/locked file
|
||||
fs.writeFileSync(CONFIG_FILE, '', 'utf8'); // Simulate corruption: empty file
|
||||
|
||||
// Old saveConfig behavior: reads empty, merges with update, saves
|
||||
// This wipes userUuids
|
||||
saveConfig_OLD({ hasLaunchedBefore: true });
|
||||
|
||||
const configAfterCorruption = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
|
||||
assert(!configAfterCorruption.userUuids, 'OLD CODE: userUuids wiped after corruption');
|
||||
assert(!configAfterCorruption.username, 'OLD CODE: username wiped after corruption');
|
||||
|
||||
// Player re-enters name, gets NEW UUID (character data lost!)
|
||||
const uuidAfterOld = getUuidForUser_OLD('SpecialK');
|
||||
assert(uuidAfterOld !== uuidBefore, 'OLD CODE: UUID changed after corruption (BUG!)');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 3: NEW CODE — Config wipe during update, UUID survives via uuid-store
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 3: NEW CODE — Config wipe + UUID survives via uuid-store ---');
|
||||
setup();
|
||||
|
||||
// Setup: player has UUID (stored in both config.json AND uuid-store.json)
|
||||
const initialConfig = { username: 'SpecialK', userUuids: { 'SpecialK': 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee' }, hasLaunchedBefore: true };
|
||||
fs.writeFileSync(CONFIG_FILE, JSON.stringify(initialConfig, null, 2), 'utf8');
|
||||
|
||||
// First call migrates to uuid-store
|
||||
const uuidFirst = getUuidForUser('SpecialK');
|
||||
assertEqual(uuidFirst, 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee', 'UUID correct before corruption');
|
||||
assert(fs.existsSync(UUID_STORE_FILE), 'uuid-store.json created');
|
||||
|
||||
// Simulate: config.json gets wiped (same as the update bug)
|
||||
fs.writeFileSync(CONFIG_FILE, '{}', 'utf8');
|
||||
|
||||
// Verify config is empty
|
||||
const wipedConfig = loadConfig();
|
||||
assert(!wipedConfig.userUuids || Object.keys(wipedConfig.userUuids).length === 0, 'Config wiped — no userUuids');
|
||||
assert(!wipedConfig.username, 'Config wiped — no username');
|
||||
|
||||
// Player re-enters same name → UUID recovered from uuid-store!
|
||||
const uuidAfterNew = getUuidForUser('SpecialK');
|
||||
assertEqual(uuidAfterNew, 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee', 'NEW CODE: UUID preserved after config wipe!');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 4: saveConfig safety check — refuses to overwrite good data with empty
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 4: saveConfig safety check — blocks destructive writes ---');
|
||||
setup();
|
||||
|
||||
// Setup: valid config file with data
|
||||
const goodConfig = { username: 'SpecialK', userUuids: { 'SpecialK': 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee' }, hasLaunchedBefore: true, installPath: 'C:\\Games\\Hytale' };
|
||||
fs.writeFileSync(CONFIG_FILE, JSON.stringify(goodConfig, null, 2), 'utf8');
|
||||
|
||||
// Make the file temporarily unreadable by writing garbage (simulates file lock/corruption)
|
||||
const originalContent = fs.readFileSync(CONFIG_FILE, 'utf8');
|
||||
fs.writeFileSync(CONFIG_FILE, 'NOT VALID JSON!!!', 'utf8');
|
||||
|
||||
// Try to save — should refuse because file exists but can't be parsed
|
||||
let saveThrew = false;
|
||||
try {
|
||||
saveConfig({ someNewField: true });
|
||||
} catch (e) {
|
||||
saveThrew = true;
|
||||
}
|
||||
|
||||
// The file should still have the garbage (not overwritten with { someNewField: true })
|
||||
const afterContent = fs.readFileSync(CONFIG_FILE, 'utf8');
|
||||
|
||||
// Restore original for backup recovery test
|
||||
fs.writeFileSync(CONFIG_FILE, JSON.stringify(goodConfig, null, 2), 'utf8');
|
||||
|
||||
// Note: with invalid JSON, loadConfig returns {} and safety check triggers
|
||||
// The save may eventually succeed on retry if the file becomes readable
|
||||
// What matters is that it doesn't blindly overwrite
|
||||
assert(afterContent !== '{\n "someNewField": true\n}', 'Safety check prevented blind overwrite of corrupted file');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 5: Backup recovery — config.json corrupted, recovered from .bak
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 5: Backup recovery — auto-recover from .bak ---');
|
||||
setup();
|
||||
|
||||
// Create config and backup
|
||||
const validConfig = { username: 'SpecialK', userUuids: { 'SpecialK': 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee' } };
|
||||
fs.writeFileSync(CONFIG_BACKUP, JSON.stringify(validConfig, null, 2), 'utf8');
|
||||
fs.writeFileSync(CONFIG_FILE, 'CORRUPTED', 'utf8');
|
||||
|
||||
const recovered = loadConfig();
|
||||
assertEqual(recovered.username, 'SpecialK', 'Username recovered from backup');
|
||||
assert(recovered.userUuids && recovered.userUuids['SpecialK'] === 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee', 'UUID recovered from backup');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 6: Full update simulation — the exact scenario from player report
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 6: Full update simulation (player report scenario) ---');
|
||||
setup();
|
||||
|
||||
// Step 1: Player installs v2.3.4, sets username, plays game
|
||||
console.log(' Step 1: Player sets up profile...');
|
||||
saveConfig({ username: 'Special K', hasLaunchedBefore: true });
|
||||
const originalUuid = getUuidForUser('Special K');
|
||||
console.log(` Original UUID: ${originalUuid}`);
|
||||
|
||||
// Step 2: v2.3.5 auto-update — new app launches
|
||||
console.log(' Step 2: Simulating v2.3.5 update...');
|
||||
|
||||
// Simulate the 3 saveConfig calls that happen during startup
|
||||
// But first, simulate config being temporarily locked (returns empty)
|
||||
const preUpdateContent = fs.readFileSync(CONFIG_FILE, 'utf8');
|
||||
fs.writeFileSync(CONFIG_FILE, '', 'utf8'); // Simulate: file empty during write (race condition)
|
||||
|
||||
// These are the 3 calls from: profileManager.init, migrateUserDataToCentralized, handleFirstLaunchCheck
|
||||
// With our safety check, they should NOT wipe the data
|
||||
try { saveConfig({ hasLaunchedBefore: true }); } catch (e) { /* expected — safety check blocks it */ }
|
||||
|
||||
// Simulate file becomes readable again (antivirus releases lock)
|
||||
fs.writeFileSync(CONFIG_FILE, preUpdateContent, 'utf8');
|
||||
|
||||
// Step 3: Player re-enters username (because UI might show empty)
|
||||
console.log(' Step 3: Player re-enters username...');
|
||||
const postUpdateUuid = getUuidForUser('Special K');
|
||||
console.log(` Post-update UUID: ${postUpdateUuid}`);
|
||||
|
||||
assertEqual(postUpdateUuid, originalUuid, 'UUID survived the full update cycle!');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 7: Multiple users — UUIDs stay independent
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 7: Multiple users — UUIDs stay independent ---');
|
||||
setup();
|
||||
|
||||
const uuidAlice = getUuidForUser('Alice');
|
||||
const uuidBob = getUuidForUser('Bob');
|
||||
const uuidCharlie = getUuidForUser('Charlie');
|
||||
|
||||
assert(uuidAlice !== uuidBob, 'Alice and Bob have different UUIDs');
|
||||
assert(uuidBob !== uuidCharlie, 'Bob and Charlie have different UUIDs');
|
||||
|
||||
// Wipe config, all should survive
|
||||
fs.writeFileSync(CONFIG_FILE, '{}', 'utf8');
|
||||
|
||||
assertEqual(getUuidForUser('Alice'), uuidAlice, 'Alice UUID survived config wipe');
|
||||
assertEqual(getUuidForUser('Bob'), uuidBob, 'Bob UUID survived config wipe');
|
||||
assertEqual(getUuidForUser('Charlie'), uuidCharlie, 'Charlie UUID survived config wipe');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 8: UUID store deleted — recovery from config.json
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 8: UUID store deleted — recovery from config.json ---');
|
||||
setup();
|
||||
|
||||
// Create UUID via normal flow (saves to both stores)
|
||||
const uuidOriginal = getUuidForUser('TestPlayer');
|
||||
|
||||
// Delete uuid-store.json (simulates user manually deleting it or disk issue)
|
||||
fs.unlinkSync(UUID_STORE_FILE);
|
||||
assert(!fs.existsSync(UUID_STORE_FILE), 'uuid-store.json deleted');
|
||||
|
||||
// UUID should be recovered from config.json
|
||||
const uuidRecovered = getUuidForUser('TestPlayer');
|
||||
assertEqual(uuidRecovered, uuidOriginal, 'UUID recovered from config.json after uuid-store deletion');
|
||||
assert(fs.existsSync(UUID_STORE_FILE), 'uuid-store.json recreated after recovery');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 9: Both stores deleted — new UUID generated (fresh install)
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 9: Both stores deleted — new UUID (fresh install) ---');
|
||||
setup();
|
||||
|
||||
const uuidFresh = getUuidForUser('NewPlayer');
|
||||
|
||||
// Delete both
|
||||
fs.unlinkSync(UUID_STORE_FILE);
|
||||
fs.unlinkSync(CONFIG_FILE);
|
||||
|
||||
const uuidAfterWipe = getUuidForUser('NewPlayer');
|
||||
assert(uuidAfterWipe !== uuidFresh, 'New UUID generated when both stores are gone (expected for true fresh install)');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// TEST 10: Worst case — config.json wiped AND uuid-store.json exists
|
||||
// Simulates the EXACT player-reported scenario with new code
|
||||
// --------------------------------------------------------------------------
|
||||
console.log('\n--- Test 10: Exact player scenario with new code ---');
|
||||
setup();
|
||||
|
||||
// Player has been playing for a while
|
||||
saveConfig({
|
||||
username: 'Special K',
|
||||
hasLaunchedBefore: true,
|
||||
installPath: 'C:\\Games\\Hytale',
|
||||
version_client: '2026.02.19-1a311a592',
|
||||
version_branch: 'release',
|
||||
userUuids: { 'Special K': '11111111-2222-4333-9444-555555555555' }
|
||||
});
|
||||
|
||||
// First call creates uuid-store.json
|
||||
const originalUuid10 = getUuidForUser('Special K');
|
||||
assertEqual(originalUuid10, '11111111-2222-4333-9444-555555555555', 'Original UUID loaded');
|
||||
|
||||
// BOOM: Update happens, config.json completely wiped
|
||||
fs.writeFileSync(CONFIG_FILE, '{}', 'utf8');
|
||||
|
||||
// Username lost — player has to re-enter
|
||||
const loadedUsername = loadConfig().username;
|
||||
assert(!loadedUsername, 'Username is gone from config (simulating what player saw)');
|
||||
|
||||
// Player types "Special K" again in settings
|
||||
saveConfig({ username: 'Special K' });
|
||||
|
||||
// Player clicks Play — getUuidForUser called
|
||||
const recoveredUuid10 = getUuidForUser('Special K');
|
||||
assertEqual(recoveredUuid10, '11111111-2222-4333-9444-555555555555', 'UUID recovered — character data preserved!');
|
||||
|
||||
// ============================================================================
|
||||
// RESULTS
|
||||
// ============================================================================
|
||||
console.log('\n' + '='.repeat(70));
|
||||
console.log(`RESULTS: ${passed} passed, ${failed} failed`);
|
||||
if (failed > 0) {
|
||||
console.log('\nFailures:');
|
||||
failures.forEach(f => console.log(` ✗ ${f}`));
|
||||
}
|
||||
console.log('='.repeat(70));
|
||||
|
||||
cleanup();
|
||||
process.exit(failed > 0 ? 1 : 0);
|
||||
Reference in New Issue
Block a user