mirror of
https://git.sanhost.net/sanasol/hytale-f2p
synced 2026-02-26 18:41:48 -03:00
Compare commits
176 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d811fd7e0 | ||
|
|
8435fc698c | ||
|
|
6c369edb0f | ||
|
|
fdd8e59ec4 | ||
|
|
e7a033932f | ||
|
|
11c6d40dfe | ||
|
|
0dafb17c7b | ||
|
|
66112f15b2 | ||
|
|
0a71fdac8c | ||
|
|
4b9eae215b | ||
|
|
1510eceb0f | ||
|
|
c4b5368538 | ||
|
|
e0ebf137fc | ||
|
|
5241a502e5 | ||
|
|
3e7c7ccff3 | ||
|
|
89d09f032f | ||
|
|
8bdb78d1e2 | ||
|
|
e9e66dbca7 | ||
|
|
92a0a26251 | ||
|
|
3abe885ab4 | ||
|
|
82f1dd2739 | ||
|
|
4502c11bd0 | ||
|
|
bcc7476322 | ||
|
|
b93dc027e1 | ||
|
|
fdbca6b9da | ||
|
|
b2f65bd524 | ||
|
|
bd6b05d1e4 | ||
|
|
454ca7f075 | ||
|
|
e7324eb176 | ||
|
|
98123d7338 | ||
|
|
6761f6b3e0 | ||
|
|
b1aeb9fe4a | ||
|
|
c27e1f4cd4 | ||
|
|
f0939a60c9 | ||
|
|
23fad047c0 | ||
|
|
5f3c9e0411 | ||
|
|
2e0bdeee5a | ||
|
|
d8d7702d9d | ||
|
|
3ac2f25955 | ||
|
|
7c8a106f06 | ||
|
|
0015ecbe80 | ||
|
|
b5cd9ca791 | ||
|
|
d5da9ecb6d | ||
|
|
b1d01a2f34 | ||
|
|
cd25f124bd | ||
|
|
fc91560acb | ||
|
|
3370628b6e | ||
|
|
3fee5b0f72 | ||
|
|
38d436ceb7 | ||
|
|
6ee23e1944 | ||
|
|
5de155f190 | ||
|
|
b84457d88d | ||
|
|
1ef96561bf | ||
|
|
d91ba72969 | ||
|
|
ecaaa28866 | ||
|
|
ad34741627 | ||
|
|
a346e9d9e3 | ||
|
|
1f4e91c975 | ||
|
|
a1a45a2d31 | ||
|
|
2ed402b14b | ||
|
|
4ce6fbee0a | ||
|
|
3dfaa1c778 | ||
|
|
6a4da66a1e | ||
|
|
53939fc0ae | ||
|
|
fb135d3486 | ||
|
|
62430fe8f0 | ||
|
|
6847a54c0f | ||
|
|
95d47f0e60 | ||
|
|
6fbf37422f | ||
|
|
7b2acd49b6 | ||
|
|
7b9951e72d | ||
|
|
e81a0167c1 | ||
|
|
50c04b64df | ||
|
|
28e5fa35e1 | ||
|
|
52e7eafe0b | ||
|
|
3de5c2eaa3 | ||
|
|
5147e1856f | ||
|
|
a21e7e4910 | ||
|
|
14a63febc1 | ||
|
|
2cdef44fec | ||
|
|
f8cf41972d | ||
|
|
ea0f87c46a | ||
|
|
a5b3fe02c8 | ||
|
|
0bb82a0b3d | ||
|
|
eccdcf223e | ||
|
|
a09b082152 | ||
|
|
f1d01ac78c | ||
|
|
bfe0156606 | ||
|
|
78e97bdbb7 | ||
|
|
769bc2054c | ||
|
|
5337441d97 | ||
|
|
12453d2dda | ||
|
|
803df90fb6 | ||
|
|
6c31c39abd | ||
|
|
b5ab8b78e8 | ||
|
|
343f7b8016 | ||
|
|
fa568fcce7 | ||
|
|
a6ecd2c167 | ||
|
|
3e1c4aef73 | ||
|
|
1c14c3f603 | ||
|
|
30a4327655 | ||
|
|
33a0e219fc | ||
|
|
fbdd9ee0cf | ||
|
|
22ea2f56d3 | ||
|
|
5039bcdadf | ||
|
|
4db8016a28 | ||
|
|
e0fd7e6900 | ||
|
|
93a2a98028 | ||
|
|
4775e9adbd | ||
|
|
90db069e4c | ||
|
|
baa585d6b3 | ||
|
|
a5b930a9f0 | ||
|
|
b708f4a7d7 | ||
|
|
28a4f65f21 | ||
|
|
966de83ead | ||
|
|
bc7f46cf45 | ||
|
|
534b3f1f34 | ||
|
|
a07f0f1de1 | ||
|
|
bf29112848 | ||
|
|
0e4e332dab | ||
|
|
779f6820cb | ||
|
|
4fc4d77415 | ||
|
|
de193e991f | ||
|
|
d69695e499 | ||
|
|
4fff87f221 | ||
|
|
4cd76bb96d | ||
|
|
721d287036 | ||
|
|
e491bf1a84 | ||
|
|
89f981b586 | ||
|
|
9cf504bbcc | ||
|
|
e7110936d8 | ||
|
|
79456e43a6 | ||
|
|
dd2dbc6f08 | ||
|
|
c4acb32fcd | ||
|
|
fbcbafb9b5 | ||
|
|
86ed33358c | ||
|
|
9ec97f9d33 | ||
|
|
ee18455b4b | ||
|
|
a5c931b26d | ||
|
|
661a0c9eed | ||
|
|
9025800820 | ||
|
|
34ee099ae2 | ||
|
|
e56b12cd72 | ||
|
|
6bd63f5b60 | ||
|
|
663ac5f834 | ||
|
|
3edee4b4eb | ||
|
|
e5fec7c326 | ||
|
|
7d2672b684 | ||
|
|
01823729ec | ||
|
|
639a2ab1b5 | ||
|
|
6b76eb365e | ||
|
|
6fa933fece | ||
|
|
e7023dcf95 | ||
|
|
f4d966ee65 | ||
|
|
ca835a868b | ||
|
|
3a1b6039d0 | ||
|
|
7828454631 | ||
|
|
cc1c6c334c | ||
|
|
081ac926e3 | ||
|
|
75a450c9ec | ||
|
|
e426690632 | ||
|
|
78f76afe0a | ||
|
|
131de1dcd7 | ||
|
|
b39877f561 | ||
|
|
0b1b448cce | ||
|
|
aed00cd067 | ||
|
|
eff6fcd520 | ||
|
|
94d4586b97 | ||
|
|
20faf36b37 | ||
|
|
375b422c73 | ||
|
|
b668bdb45a | ||
|
|
653d4429ed | ||
|
|
17e15c17f0 | ||
|
|
b99b22e8bf | ||
|
|
9303c17e57 | ||
|
|
615ee5cadc |
2
.github/CODE_OF_CONDUCT.md
vendored
2
.github/CODE_OF_CONDUCT.md
vendored
@@ -36,7 +36,7 @@ This Code of Conduct applies within all community spaces, and also applies when
|
|||||||
|
|
||||||
## Enforcement
|
## 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/hf2pdc). 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 [Discord Server, message Founders/Devs](https://discord.gg/Fhbb9Yk5WW). 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.
|
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
|
||||||
|
|
||||||
|
|||||||
2
.github/ISSUE_TEMPLATE/support_request.yml
vendored
2
.github/ISSUE_TEMPLATE/support_request.yml
vendored
@@ -22,7 +22,7 @@ body:
|
|||||||
value: |
|
value: |
|
||||||
If you need help or support with using the launcher, please fill out this support request.
|
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.
|
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/gME8rUy3MB)!
|
**Need a quick assistance?** Please Open-A-Ticket in our [Discord Server](https://discord.gg/Fhbb9Yk5WW)!
|
||||||
|
|
||||||
- type: textarea
|
- type: textarea
|
||||||
id: question
|
id: question
|
||||||
|
|||||||
231
.github/workflows/release.yml
vendored
231
.github/workflows/release.yml
vendored
@@ -6,192 +6,117 @@ on:
|
|||||||
- 'v*'
|
- 'v*'
|
||||||
workflow_dispatch:
|
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:
|
jobs:
|
||||||
build-windows:
|
create-release:
|
||||||
runs-on: windows-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- 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
|
||||||
|
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
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: '22'
|
node-version: '22'
|
||||||
cache: 'npm'
|
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
|
||||||
- name: Create Virtual .env File
|
|
||||||
# Because main.js needed physical env, we need to create virtual one to store it
|
|
||||||
run: |
|
|
||||||
$env_content = @"
|
|
||||||
HF2P_PROXY_URL=${{ secrets.HF2P_PROXY_URL }}
|
|
||||||
HF2P_SECRET_KEY=${{ secrets.HF2P_SECRET_KEY }}
|
|
||||||
"@
|
|
||||||
Set-Content -Path .env -Value $env_content
|
|
||||||
|
|
||||||
- name: Build Windows Packages
|
- name: Build Windows Packages
|
||||||
run: npx electron-builder --win --publish never
|
run: npx electron-builder --win --publish never --config.npmRebuild=false
|
||||||
- uses: actions/upload-artifact@v4
|
|
||||||
with:
|
- name: Upload to Release
|
||||||
name: windows-builds
|
run: |
|
||||||
path: |
|
RELEASE_ID=$(curl -s "${FORGEJO_API}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ github.ref_name }}" \
|
||||||
dist/*.exe
|
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
||||||
dist/*.exe.blockmap
|
for file in dist/*.exe dist/*.exe.blockmap dist/latest.yml; do
|
||||||
dist/latest.yml
|
[ -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
|
||||||
|
|
||||||
build-macos:
|
build-macos:
|
||||||
|
needs: [create-release]
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: '22'
|
node-version: '22'
|
||||||
cache: 'npm'
|
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
|
||||||
- name: Create Virtual .env File
|
|
||||||
run: |
|
|
||||||
cat << EOF > .env
|
|
||||||
HF2P_PROXY_URL=${{ secrets.HF2P_PROXY_URL }}
|
|
||||||
HF2P_SECRET_KEY=${{ secrets.HF2P_SECRET_KEY }}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- name: Build macOS Packages
|
- 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
|
run: npx electron-builder --mac --publish never
|
||||||
- uses: actions/upload-artifact@v4
|
|
||||||
with:
|
- name: Upload to Release
|
||||||
name: macos-builds
|
run: |
|
||||||
path: |
|
RELEASE_ID=$(curl -s "${FORGEJO_API}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ github.ref_name }}" \
|
||||||
dist/*.dmg
|
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
||||||
dist/*.zip
|
for file in dist/*.dmg dist/*.zip dist/*.blockmap dist/latest-mac.yml; do
|
||||||
dist/latest-mac.yml
|
[ -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
|
||||||
|
|
||||||
build-linux:
|
build-linux:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
needs: [create-release]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Install build dependencies
|
- name: Install build dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y libarchive-tools
|
sudo apt-get install -y libarchive-tools rpm
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: '22'
|
node-version: '22'
|
||||||
cache: 'npm'
|
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
|
||||||
- name: Create Virtual .env File
|
|
||||||
run: |
|
|
||||||
cat << EOF > .env
|
|
||||||
HF2P_PROXY_URL=${{ secrets.HF2P_PROXY_URL }}
|
|
||||||
HF2P_SECRET_KEY=${{ secrets.HF2P_SECRET_KEY }}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- name: Build Linux Packages
|
- name: Build Linux Packages
|
||||||
|
run: npx electron-builder --linux AppImage deb rpm pacman --publish never
|
||||||
|
|
||||||
|
- name: Upload to Release
|
||||||
run: |
|
run: |
|
||||||
npx electron-builder --linux AppImage deb rpm --publish never
|
RELEASE_ID=$(curl -s "${FORGEJO_API}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ github.ref_name }}" \
|
||||||
- uses: actions/upload-artifact@v4
|
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
||||||
with:
|
for file in dist/*.AppImage dist/*.AppImage.blockmap dist/*.deb dist/*.rpm dist/*.pacman dist/latest-linux.yml; do
|
||||||
name: linux-builds
|
[ -f "$file" ] || continue
|
||||||
path: |
|
echo "Uploading $file..."
|
||||||
dist/*.AppImage
|
curl -s --max-time 600 -X POST "${FORGEJO_UPLOAD}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=$(basename $file)" \
|
||||||
dist/*.AppImage.blockmap
|
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
|
||||||
dist/*.deb
|
-F "attachment=@${file}" || echo "Failed to upload $file"
|
||||||
dist/*.rpm
|
done
|
||||||
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
|
|
||||||
|
|
||||||
cat << EOP > .env
|
|
||||||
HF2P_PROXY_URL=${{ secrets.HF2P_PROXY_URL }}
|
|
||||||
HF2P_SECRET_KEY=${{ secrets.HF2P_SECRET_KEY }}
|
|
||||||
EOP
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
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/.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,6 +17,9 @@ dist/
|
|||||||
# Project Specific: Downloaded patcher (from hytale-auth-server)
|
# Project Specific: Downloaded patcher (from hytale-auth-server)
|
||||||
backend/patcher/
|
backend/patcher/
|
||||||
|
|
||||||
|
# Private docs (local only)
|
||||||
|
docs/PATCH_CDN_INFRASTRUCTURE.md
|
||||||
|
|
||||||
# macOS Specific
|
# macOS Specific
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*.zst.DS_Store
|
*.zst.DS_Store
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ window.closeDiscordPopup = function() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
window.joinDiscord = async function() {
|
window.joinDiscord = async function() {
|
||||||
await window.electronAPI?.openExternal('https://discord.gg/hf2pdc');
|
await window.electronAPI?.openExternal('https://discord.gg/Fhbb9Yk5WW');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await window.electronAPI?.saveConfig({ discordPopup: true });
|
await window.electronAPI?.saveConfig({ discordPopup: true });
|
||||||
|
|||||||
@@ -1103,7 +1103,7 @@ function getRetryContextMessage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
window.openDiscordExternal = function() {
|
window.openDiscordExternal = function() {
|
||||||
window.electronAPI?.openExternal('https://discord.gg/hf2pdc');
|
window.electronAPI?.openExternal('https://discord.gg/Fhbb9Yk5WW');
|
||||||
};
|
};
|
||||||
|
|
||||||
window.toggleMaximize = toggleMaximize;
|
window.toggleMaximize = toggleMaximize;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
### ⚠️ **WARNING: READ [QUICK START](#-quick-start) before Downloading & Installing the Launcher!** ⚠️
|
### ⚠️ **WARNING: READ [QUICK START](#-quick-start) before Downloading & Installing the Launcher!** ⚠️
|
||||||
|
|
||||||
#### 🛑 **Found a problem? [Join the HF2P Discord](https://discord.gg/9zkSbQYZjA) and head to `#-⚠️-community-help`** 🛑
|
#### 🛑 **Found a problem? [Join the HF2P Discord](https://discord.gg/Fhbb9Yk5WW) and head to `#-⚠️-community-help`** 🛑
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
👍 If you like the project, <b>feel free to support us via Buy Me a Coffee!</b> ☕<br>
|
👍 If you like the project, <b>feel free to support us via Buy Me a Coffee!</b> ☕<br>
|
||||||
@@ -455,7 +455,7 @@ See [BUILD.md](docs/BUILD.md) for comprehensive build instructions.
|
|||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
**Questions? Ads? Collaboration? Endorsement? Other business-related?**
|
**Questions? Ads? Collaboration? Endorsement? Other business-related?**
|
||||||
Message the founders at https://discord.gg/hf2pdc
|
Message the founders at https://discord.gg/Fhbb9Yk5WW
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
130
SERVER.md
130
SERVER.md
@@ -2,19 +2,20 @@
|
|||||||
|
|
||||||
Play with friends online! This guide covers both easy in-game hosting and advanced dedicated server setup.
|
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/hf2pdc**
|
### **DOWNLOAD SERVER FILES (JAR/RAR/SCRIPTS) HERE: https://discord.gg/Fhbb9Yk5WW**
|
||||||
|
|
||||||
**Table of Contents**
|
**Table of Contents**
|
||||||
|
|
||||||
|
* [\[NEW!\] Play Online with Official Accounts 🆕](#new-play-online-with-official-accounts-)
|
||||||
* ["Server" Term and Definition](#server-term-and-definiton)
|
* ["Server" Term and Definition](#server-term-and-definiton)
|
||||||
* [Server Directory Location](#server-directory-location)
|
* [Server Directory Location](#server-directory-location)
|
||||||
* [A. Online Play Feature](#a-online-play-feature)
|
* [A. Host Your Singleplayer World](#a-host-your-singleplayer-world)
|
||||||
* [1. Host Your Singleplayer World using In-Game Invite Code](#1-host-your-singleplayer-world-using-in-game-invite-code)
|
* [1. Using Online-Play Feature In-Game Invite Code](#1-using-online-play-feature--in-game-invite-code)
|
||||||
* [Common Issues (UPnP/NAT/STUN) on Online Play](#common-issues-upnpnatstun-on-online-play)
|
* [Common Issues (UPnP/NAT/STUN) on Online Play](#common-issues-upnpnatstun-on-online-play)
|
||||||
* [2. Host Your Singleplayer World using Tailscale](#2-host-your-singleplayer-world-using-tailscale)
|
* [2. Using Tailscale](#2-using-tailscale)
|
||||||
|
* [3. Using Radmin VPN](#3-using-radmin-vpn)
|
||||||
* [B. Local Dedicated Server](#b-local-dedicated-server)
|
* [B. Local Dedicated Server](#b-local-dedicated-server)
|
||||||
* [1. Using Playit.gg (Recommended) ✅](#1-using-playitgg-recommended-)
|
* [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)
|
* [C. 24/7 Dedicated Server (Advanced)](#c-247-dedicated-server-advanced)
|
||||||
* [Step 1: Get the Files Ready](#step-1-get-the-files-ready)
|
* [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)
|
* [Step 2: Place HytaleServer.jar in the Server directory](#step-2-place-hytaleserverjar-in-the-server-directory)
|
||||||
@@ -32,6 +33,69 @@ Play with friends online! This guide covers both easy in-game hosting and advanc
|
|||||||
* [10. Getting Help](#10-getting-help)
|
* [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
|
### "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.
|
"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.
|
||||||
@@ -41,14 +105,15 @@ Kindly support us via [our Buy Me a Coffee link](https://buymeacoffee.com/hf2p)
|
|||||||
|
|
||||||
### Server Directory Location
|
### Server Directory Location
|
||||||
|
|
||||||
Here are the directory locations of Server folder if you have installed
|
Here are the directory locations of Server folder if you have installed it on default instalation location:
|
||||||
- **Windows:** `%localappdata%\HytaleF2P\release\package\game\latest\Server`
|
- **Windows:** `%localappdata%\HytaleF2P\release\package\game\latest\Server`
|
||||||
- **macOS:** `~/Library/Application Support/HytaleF2P/release/package/game/latest/Server`
|
- **macOS:** `~/Library/Application Support/HytaleF2P/release/package/game/latest/Server`
|
||||||
- **Linux:** `~/.hytalef2p/release/package/game/latest/Server`
|
- **Linux:** `~/.hytalef2p/release/package/game/latest/Server`
|
||||||
|
|
||||||
> [!NOTE]
|
> [!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 online
|
> This location only exists if the user installed the game using our launcher.
|
||||||
> (for now; we planned to add offline mode in later version of 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).
|
||||||
|
|
||||||
> [!IMPORTANT]
|
> [!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
|
> 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
|
||||||
@@ -64,6 +129,7 @@ Terms and conditions applies.
|
|||||||
## 1. Using Online-Play Feature / In-Game Invite Code
|
## 1. Using Online-Play Feature / In-Game Invite Code
|
||||||
|
|
||||||
The easiest way to play with friends - no manual server setup required!
|
The easiest way to play with friends - no manual server setup required!
|
||||||
|
|
||||||
*The game automatically handles networking using UPnP/STUN/NAT traversal.*
|
*The game automatically handles networking using UPnP/STUN/NAT traversal.*
|
||||||
|
|
||||||
**For Online Play to work, you need:**
|
**For Online Play to work, you need:**
|
||||||
@@ -112,6 +178,7 @@ Warning: Your network configuration may prevent other players from connecting.
|
|||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details><summary><b>b. "UPnP Failed" or "Port Mapping Failed" Warning</b></summary>
|
<details><summary><b>b. "UPnP Failed" or "Port Mapping Failed" Warning</b></summary>
|
||||||
|
|
||||||
**Check your router:**
|
**Check your router:**
|
||||||
1. Log into router admin panel (usually `192.168.1.1` or `192.168.0.1`)
|
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")
|
2. Find UPnP settings (often under "Advanced" or "NAT")
|
||||||
@@ -123,7 +190,8 @@ Warning: Your network configuration may prevent other players from connecting.
|
|||||||
- See "Port Forwarding" or "Workarounds or NAT/CGNAT" sections below
|
- See "Port Forwarding" or "Workarounds or NAT/CGNAT" sections below
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details><summary><b>c. "Strict NAT" or "Symmetric NAT" Warning</b></summary>
|
<details><summary><b>c. "Connected via STUN", "Strict NAT" or "Symmetric NAT" Warning</b></summary>
|
||||||
|
|
||||||
Some routers have restrictive NAT that blocks peer connections.
|
Some routers have restrictive NAT that blocks peer connections.
|
||||||
|
|
||||||
**Try:**
|
**Try:**
|
||||||
@@ -133,6 +201,7 @@ Some routers have restrictive NAT that blocks peer connections.
|
|||||||
</details>
|
</details>
|
||||||
|
|
||||||
## 2. Using Tailscale
|
## 2. Using Tailscale
|
||||||
|
|
||||||
Tailscale creates mesh VPN service that streamlines connecting devices and services securely across different networks. And **works crossplatform!!**
|
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.
|
1. All members are required to download [Tailscale](https://tailscale.com/download) on your device.
|
||||||
@@ -148,6 +217,17 @@ Tailscale creates mesh VPN service that streamlines connecting devices and servi
|
|||||||
* Use the new share code to connect
|
* Use the new share code to connect
|
||||||
* To test your connection, ping the host's ipv4 mentioned in Tailscale
|
* 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
|
# B. Local Dedicated Server
|
||||||
@@ -166,12 +246,13 @@ Free tunneling service - only the host needs to install it:
|
|||||||
* Linux:
|
* Linux:
|
||||||
* Right-click file > Properties > Turn on 'Executable as a Program' | or `chmod +x playit-linux-amd64` on terminal
|
* 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
|
* 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.
|
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**
|
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. 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`
|
7. Put the script file to the `Server` folder in `HytaleF2P` directory (`%localappdata%\HytaleF2P\release\package\game\latest\Server`)
|
||||||
8. 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. 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!)
|
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. Double-click the .BAT file to host your server, wait until it shows:
|
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:
|
||||||
```
|
```
|
||||||
===================================================
|
===================================================
|
||||||
Hytale Server Booted! [Multiplayer, Fresh Universe]
|
Hytale Server Booted! [Multiplayer, Fresh Universe]
|
||||||
@@ -180,16 +261,12 @@ 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.
|
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.
|
12. Send the public address in Step 3 to your friends.
|
||||||
|
|
||||||
## 2. Using Radmin VPN
|
> [!CAUTION]
|
||||||
|
> Do not close the Playit.gg Terminal OR HytaleServer Terminal if you are still playing or hosting the server.
|
||||||
|
|
||||||
Creates a virtual LAN - all players need to install it:
|
## 2. Using Tailscale [DRAFT]
|
||||||
|
|
||||||
1. Download [Radmin VPN](https://www.radmin-vpn.com/) - All players install it
|
Tailscale
|
||||||
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!**
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -228,12 +305,12 @@ For 24/7 servers, custom configurations, or hosting on a VPS/dedicated machine.
|
|||||||
|
|
||||||
**Windows:**
|
**Windows:**
|
||||||
```batch
|
```batch
|
||||||
run_server.bat
|
run_server_with_token.bat
|
||||||
```
|
```
|
||||||
|
|
||||||
**macOS / Linux:**
|
**macOS / Linux:**
|
||||||
```bash
|
```bash
|
||||||
./run_server.sh
|
./run_server_with_token.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -503,3 +580,6 @@ See [Docker documentation](https://github.com/Hybrowse/hytale-server-docker) for
|
|||||||
- Auth Server: sanasol.ws
|
- Auth Server: sanasol.ws
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Hytale F2P Launcher - Troubleshooting Guide
|
# 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/gME8rUy3MB).
|
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).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -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:
|
If your issue isn't resolved by this guide:
|
||||||
|
|
||||||
1. **Check existing issues:** [GitHub Issues](https://github.com/amiayweb/Hytale-F2P/issues)
|
1. **Check existing issues:** [GitHub Issues](https://github.com/amiayweb/Hytale-F2P/issues)
|
||||||
2. **Join Discord:** [discord.gg/gME8rUy3MB](https://discord.gg/gME8rUy3MB)
|
2. **Join Discord:** [discord.gg/Fhbb9Yk5WW](https://discord.gg/Fhbb9Yk5WW)
|
||||||
3. **Open a new issue** with:
|
3. **Open a new issue** with:
|
||||||
- Your operating system and version
|
- Your operating system and version
|
||||||
- Launcher version
|
- Launcher version
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ const logger = require('./logger');
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const os = require('os');
|
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 {
|
class AppUpdater {
|
||||||
constructor(mainWindow) {
|
constructor(mainWindow) {
|
||||||
@@ -14,6 +18,34 @@ class AppUpdater {
|
|||||||
this.setupAutoUpdater();
|
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() {
|
setupAutoUpdater() {
|
||||||
|
|
||||||
// Configure logger for electron-updater
|
// Configure logger for electron-updater
|
||||||
@@ -216,8 +248,10 @@ class AppUpdater {
|
|||||||
}
|
}
|
||||||
|
|
||||||
checkForUpdatesAndNotify() {
|
checkForUpdatesAndNotify() {
|
||||||
// Check for updates and notify if available
|
// Resolve latest release URL then check for updates
|
||||||
autoUpdater.checkForUpdatesAndNotify().catch(err => {
|
this._resolveUpdateUrl().catch(err => {
|
||||||
|
console.warn('Failed to resolve update URL:', err.message);
|
||||||
|
}).then(() => autoUpdater.checkForUpdatesAndNotify()).catch(err => {
|
||||||
console.error('Failed to check for updates:', err);
|
console.error('Failed to check for updates:', err);
|
||||||
|
|
||||||
// Network errors are not critical - just log and continue
|
// Network errors are not critical - just log and continue
|
||||||
@@ -245,8 +279,10 @@ class AppUpdater {
|
|||||||
}
|
}
|
||||||
|
|
||||||
checkForUpdates() {
|
checkForUpdates() {
|
||||||
// Manual check for updates (returns promise)
|
// Manual check - resolve latest release URL first
|
||||||
return autoUpdater.checkForUpdates().catch(err => {
|
return this._resolveUpdateUrl().catch(err => {
|
||||||
|
console.warn('Failed to resolve update URL:', err.message);
|
||||||
|
}).then(() => autoUpdater.checkForUpdates()).catch(err => {
|
||||||
console.error('Failed to check for updates:', err);
|
console.error('Failed to check for updates:', err);
|
||||||
|
|
||||||
// Network errors are not critical - just return no update available
|
// Network errors are not critical - just return no update available
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
const FORCE_CLEAN_INSTALL_VERSION = false;
|
const FORCE_CLEAN_INSTALL_VERSION = false;
|
||||||
const CLEAN_INSTALL_TEST_VERSION = '4.pwr';
|
const CLEAN_INSTALL_TEST_VERSION = 'v4';
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
FORCE_CLEAN_INSTALL_VERSION,
|
FORCE_CLEAN_INSTALL_VERSION,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ const path = require('path');
|
|||||||
const { execFile } = require('child_process');
|
const { execFile } = require('child_process');
|
||||||
const { downloadFile, retryDownload } = require('../utils/fileManager');
|
const { downloadFile, retryDownload } = require('../utils/fileManager');
|
||||||
const { getOS, getArch } = require('../utils/platformUtils');
|
const { getOS, getArch } = require('../utils/platformUtils');
|
||||||
const { validateChecksum, extractVersionDetails, canUseDifferentialUpdate, needsIntermediatePatches, getInstalledClientVersion } = require('../services/versionManager');
|
const { validateChecksum, extractVersionDetails, getInstalledClientVersion, getUpdatePlan, extractVersionNumber } = require('../services/versionManager');
|
||||||
const { installButler } = require('./butlerManager');
|
const { installButler } = require('./butlerManager');
|
||||||
const { GAME_DIR, CACHE_DIR, TOOLS_DIR } = require('../core/paths');
|
const { GAME_DIR, CACHE_DIR, TOOLS_DIR } = require('../core/paths');
|
||||||
const { saveVersionClient } = require('../core/config');
|
const { saveVersionClient } = require('../core/config');
|
||||||
@@ -30,7 +30,7 @@ async function acquireGameArchive(downloadUrl, targetPath, checksum, progressCal
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.log(`Downloading game archive from: ${downloadUrl}`);
|
console.log(`Downloading game archive from: ${downloadUrl}`);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (allowRetry) {
|
if (allowRetry) {
|
||||||
await retryDownload(downloadUrl, targetPath, progressCallback);
|
await retryDownload(downloadUrl, targetPath, progressCallback);
|
||||||
@@ -103,13 +103,13 @@ async function deployGameArchive(archivePath, destinationDir, toolsDir, progress
|
|||||||
if (error) {
|
if (error) {
|
||||||
const cleanStderr = stderr.replace(/[\u2714\u2716\u2713\u2717\u26A0\uD83D[\uDC00-\uDFFF]]/g, '').trim();
|
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();
|
const cleanStdout = stdout.replace(/[\u2714\u2716\u2713\u2717\u26A0\uD83D[\uDC00-\uDFFF]]/g, '').trim();
|
||||||
|
|
||||||
if (cleanStderr) console.error('Deployment stderr:', cleanStderr);
|
if (cleanStderr) console.error('Deployment stderr:', cleanStderr);
|
||||||
if (cleanStdout) console.error('Deployment stdout:', cleanStdout);
|
if (cleanStdout) console.error('Deployment stdout:', cleanStdout);
|
||||||
|
|
||||||
const errorText = (stderr + ' ' + error.message).toLowerCase();
|
const errorText = (stderr + ' ' + error.message).toLowerCase();
|
||||||
let message = 'Game deployment failed';
|
let message = 'Game deployment failed';
|
||||||
|
|
||||||
if (errorText.includes('unexpected eof')) {
|
if (errorText.includes('unexpected eof')) {
|
||||||
message = 'Corrupted archive detected. Please retry download.';
|
message = 'Corrupted archive detected. Please retry download.';
|
||||||
if (fs.existsSync(archivePath)) {
|
if (fs.existsSync(archivePath)) {
|
||||||
@@ -156,20 +156,20 @@ async function performIntelligentUpdate(targetVersion, branch = 'release', progr
|
|||||||
console.log(`Initiating intelligent update to version ${targetVersion}`);
|
console.log(`Initiating intelligent update to version ${targetVersion}`);
|
||||||
|
|
||||||
const currentVersion = getInstalledClientVersion();
|
const currentVersion = getInstalledClientVersion();
|
||||||
console.log(`Current version: ${currentVersion || 'none (clean install)'}`);
|
const currentBuild = extractVersionNumber(currentVersion) || 0;
|
||||||
console.log(`Target version: ${targetVersion}`);
|
const targetBuild = extractVersionNumber(targetVersion);
|
||||||
console.log(`Branch: ${branch}`);
|
console.log(`Current build: ${currentBuild}, Target build: ${targetBuild}, Branch: ${branch}`);
|
||||||
|
|
||||||
|
// For non-release branches, always do full install
|
||||||
if (branch !== 'release') {
|
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 versionDetails = await extractVersionDetails(targetVersion, branch);
|
||||||
const archiveName = path.basename(versionDetails.fullUrl);
|
const archivePath = path.join(cacheDir, `${branch}_0_to_${targetBuild}.pwr`);
|
||||||
const archivePath = path.join(cacheDir, `${branch}_${archiveName}`);
|
|
||||||
|
|
||||||
if (progressCallback) {
|
if (progressCallback) {
|
||||||
progressCallback('Downloading full game archive (pre-release)...', 0, null, null, null);
|
progressCallback('Downloading full game archive (pre-release)...', 0, null, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
||||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
||||||
saveVersionClient(targetVersion);
|
saveVersionClient(targetVersion);
|
||||||
@@ -177,16 +177,16 @@ async function performIntelligentUpdate(targetVersion, branch = 'release', progr
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!currentVersion) {
|
// Clean install (no current version)
|
||||||
|
if (currentBuild === 0) {
|
||||||
console.log('No existing installation detected - downloading full archive');
|
console.log('No existing installation detected - downloading full archive');
|
||||||
const versionDetails = await extractVersionDetails(targetVersion, branch);
|
const versionDetails = await extractVersionDetails(targetVersion, branch);
|
||||||
const archiveName = path.basename(versionDetails.fullUrl);
|
const archivePath = path.join(cacheDir, `${branch}_0_to_${targetBuild}.pwr`);
|
||||||
const archivePath = path.join(cacheDir, `${branch}_${archiveName}`);
|
|
||||||
|
|
||||||
if (progressCallback) {
|
if (progressCallback) {
|
||||||
progressCallback(`Downloading full game archive (first install - v${targetVersion})...`, 0, null, null, null);
|
progressCallback(`Downloading full game archive (first install - v${targetBuild})...`, 0, null, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
||||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, false);
|
||||||
saveVersionClient(targetVersion);
|
saveVersionClient(targetVersion);
|
||||||
@@ -194,59 +194,67 @@ async function performIntelligentUpdate(targetVersion, branch = 'release', progr
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const patchesToApply = needsIntermediatePatches(currentVersion, targetVersion);
|
// Already at target
|
||||||
|
if (currentBuild >= targetBuild) {
|
||||||
if (patchesToApply.length === 0) {
|
console.log('Already at target version or newer');
|
||||||
console.log('Already at target version or invalid version sequence');
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`Applying ${patchesToApply.length} differential patch(es): ${patchesToApply.join(' -> ')}`);
|
// 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;
|
||||||
|
|
||||||
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) {
|
if (progressCallback) {
|
||||||
progressCallback(`Downloading full archive for ${patchVersion} (${i + 1}/${patchesToApply.length})...`, 0, null, null, null);
|
progressCallback(`Downloading patch ${i + 1}/${plan.steps.length}: ${stepName}...`, 0, null, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
await acquireGameArchive(versionDetails.fullUrl, archivePath, null, progressCallback);
|
await acquireGameArchive(step.url, 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) {
|
if (progressCallback) {
|
||||||
progressCallback(`Applying patch ${i + 1}/${patchesToApply.length}: ${patchVersion}...`, 0, null, null, null);
|
progressCallback(`Applying patch ${i + 1}/${plan.steps.length}: ${stepName}...`, 50, null, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
await acquireGameArchive(versionDetails.differentialUrl, archivePath, versionDetails.checksum, progressCallback);
|
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, isDifferential);
|
||||||
await deployGameArchive(archivePath, gameDir, toolsDir, progressCallback, true);
|
|
||||||
|
// Clean up patch file
|
||||||
if (fs.existsSync(archivePath)) {
|
if (fs.existsSync(archivePath)) {
|
||||||
try {
|
try {
|
||||||
fs.unlinkSync(archivePath);
|
fs.unlinkSync(archivePath);
|
||||||
console.log(`Cleaned up patch file: ${archiveName}`);
|
console.log(`Cleaned up: ${stepName}.pwr`);
|
||||||
} catch (cleanupErr) {
|
} catch (cleanupErr) {
|
||||||
console.warn(`Failed to cleanup patch file: ${cleanupErr.message}`);
|
console.warn(`Failed to cleanup: ${cleanupErr.message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
saveVersionClient(patchVersion);
|
|
||||||
console.log(`Patch ${patchVersion} applied successfully (${i + 1}/${patchesToApply.length})`);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`Update completed successfully. Version ${targetVersion} is now installed.`);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function ensureGameInstalled(targetVersion, branch = 'release', progressCallback, gameDir = GAME_DIR, cacheDir = CACHE_DIR, toolsDir = TOOLS_DIR) {
|
async function ensureGameInstalled(targetVersion, branch = 'release', progressCallback, gameDir = GAME_DIR, cacheDir = CACHE_DIR, toolsDir = TOOLS_DIR) {
|
||||||
|
|||||||
@@ -61,12 +61,39 @@ async function fetchAuthTokens(uuid, name) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
console.log('Auth tokens received from server');
|
const identityToken = data.IdentityToken || data.identityToken;
|
||||||
|
const sessionToken = data.SessionToken || data.sessionToken;
|
||||||
|
|
||||||
return {
|
// Verify the identity token has the correct username
|
||||||
identityToken: data.IdentityToken || data.identityToken,
|
// This catches cases where the auth server defaults to "Player"
|
||||||
sessionToken: data.SessionToken || data.sessionToken
|
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 };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to fetch auth tokens:', error.message);
|
console.error('Failed to fetch auth tokens:', error.message);
|
||||||
// Fallback to local generation if server unavailable
|
// Fallback to local generation if server unavailable
|
||||||
@@ -252,8 +279,8 @@ async function launchGame(playerNameOverride = null, progressCallback, javaPathO
|
|||||||
if (patchResult.client) {
|
if (patchResult.client) {
|
||||||
console.log(` Client: ${patchResult.client.patchCount || 0} occurrences`);
|
console.log(` Client: ${patchResult.client.patchCount || 0} occurrences`);
|
||||||
}
|
}
|
||||||
if (patchResult.server) {
|
if (patchResult.agent) {
|
||||||
console.log(` Server: ${patchResult.server.patchCount || 0} occurrences`);
|
console.log(` Agent: ${patchResult.agent.alreadyExists ? 'already present' : patchResult.agent.success ? 'downloaded' : 'failed'}`);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.warn('Game patching failed:', patchResult.error);
|
console.warn('Game patching failed:', patchResult.error);
|
||||||
@@ -408,6 +435,17 @@ 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 {
|
try {
|
||||||
let spawnOptions = {
|
let spawnOptions = {
|
||||||
stdio: ['ignore', 'pipe', 'pipe'],
|
stdio: ['ignore', 'pipe', 'pipe'],
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ const { promisify } = require('util');
|
|||||||
const { getResolvedAppDir, findClientPath, findUserDataPath, findUserDataRecursive, GAME_DIR, CACHE_DIR, TOOLS_DIR } = require('../core/paths');
|
const { getResolvedAppDir, findClientPath, findUserDataPath, findUserDataRecursive, GAME_DIR, CACHE_DIR, TOOLS_DIR } = require('../core/paths');
|
||||||
const { getOS, getArch } = require('../utils/platformUtils');
|
const { getOS, getArch } = require('../utils/platformUtils');
|
||||||
const { downloadFile, retryDownload, retryStalledDownload, MAX_AUTOMATIC_STALL_RETRIES } = require('../utils/fileManager');
|
const { downloadFile, retryDownload, retryStalledDownload, MAX_AUTOMATIC_STALL_RETRIES } = require('../utils/fileManager');
|
||||||
const { getLatestClientVersion, getInstalledClientVersion } = require('../services/versionManager');
|
const { getLatestClientVersion, getInstalledClientVersion, getUpdatePlan, extractVersionNumber } = require('../services/versionManager');
|
||||||
const { FORCE_CLEAN_INSTALL_VERSION, CLEAN_INSTALL_TEST_VERSION } = require('../core/testConfig');
|
const { FORCE_CLEAN_INSTALL_VERSION, CLEAN_INSTALL_TEST_VERSION } = require('../core/testConfig');
|
||||||
const { installButler } = require('./butlerManager');
|
const { installButler } = require('./butlerManager');
|
||||||
const { downloadAndReplaceHomePageUI, downloadAndReplaceLogo } = require('./uiFileManager');
|
const { downloadAndReplaceHomePageUI, downloadAndReplaceLogo } = require('./uiFileManager');
|
||||||
@@ -64,7 +64,7 @@ async function safeRemoveDirectory(dirPath, maxRetries = 3) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function downloadPWR(branch = 'release', fileName = '7.pwr', progressCallback, cacheDir = CACHE_DIR, manualRetry = false) {
|
async function downloadPWR(branch = 'release', fileName = 'v8', progressCallback, cacheDir = CACHE_DIR, manualRetry = false, directUrl = null, expectedSize = null) {
|
||||||
const osName = getOS();
|
const osName = getOS();
|
||||||
const arch = getArch();
|
const arch = getArch();
|
||||||
|
|
||||||
@@ -72,28 +72,69 @@ async function downloadPWR(branch = 'release', fileName = '7.pwr', progressCallb
|
|||||||
throw new Error('Hytale x86_64 Intel Mac Support has not been released yet. Please check back later.');
|
throw new Error('Hytale x86_64 Intel Mac Support has not been released yet. Please check back later.');
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = `https://game-patches.hytale.com/patches/${osName}/${arch}/${branch}/0/${fileName}`;
|
let url;
|
||||||
const dest = path.join(cacheDir, `${branch}_${fileName}`);
|
|
||||||
|
|
||||||
// Check if file exists and validate it
|
if (directUrl) {
|
||||||
if (fs.existsSync(dest) && !manualRetry) {
|
url = directUrl;
|
||||||
console.log('PWR file found in cache:', dest);
|
console.log(`[DownloadPWR] Using direct URL: ${url}`);
|
||||||
|
} else {
|
||||||
// Validate file size (PWR files should be > 1MB and >= 1.5GB for complete downloads)
|
const { getPWRUrl } = require('../services/versionManager');
|
||||||
const stats = fs.statSync(dest);
|
try {
|
||||||
if (stats.size < 1024 * 1024) {
|
console.log(`[DownloadPWR] Fetching mirror URL for branch: ${branch}, version: ${fileName}`);
|
||||||
return false;
|
url = await getPWRUrl(branch, fileName);
|
||||||
}
|
console.log(`[DownloadPWR] Mirror URL: ${url}`);
|
||||||
|
} catch (error) {
|
||||||
// Check if file is under 1.5 GB (incomplete download)
|
console.error(`[DownloadPWR] Failed to get mirror URL: ${error.message}`);
|
||||||
const sizeInMB = stats.size / 1024 / 1024;
|
const { getPatchesBaseUrl } = require('../services/versionManager');
|
||||||
if (sizeInMB < 1500) {
|
const baseUrl = await getPatchesBaseUrl();
|
||||||
console.log(`[PWR Validation] File appears incomplete: ${sizeInMB.toFixed(2)} MB < 1.5 GB`);
|
url = `${baseUrl}/${osName}/${arch}/${branch}/0_to_${extractVersionNumber(fileName)}.pwr`;
|
||||||
return false;
|
console.log(`[DownloadPWR] Fallback URL: ${url}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('Fetching PWR patch file:', 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`);
|
||||||
|
|
||||||
|
// Check if file exists and validate it
|
||||||
|
if (fs.existsSync(dest) && !manualRetry) {
|
||||||
|
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`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`[DownloadPWR] Downloading from: ${url}`);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (manualRetry) {
|
if (manualRetry) {
|
||||||
@@ -119,7 +160,7 @@ async function downloadPWR(branch = 'release', fileName = '7.pwr', progressCallb
|
|||||||
const retryStats = fs.statSync(dest);
|
const retryStats = fs.statSync(dest);
|
||||||
console.log(`PWR file downloaded (auto-retry), size: ${(retryStats.size / 1024 / 1024).toFixed(2)} MB`);
|
console.log(`PWR file downloaded (auto-retry), size: ${(retryStats.size / 1024 / 1024).toFixed(2)} MB`);
|
||||||
|
|
||||||
if (!validatePWRFile(dest)) {
|
if (!validatePWRFile(dest, expectedSize)) {
|
||||||
console.log(`[PWR Validation] PWR file validation failed after auto-retry, deleting corrupted file: ${dest}`);
|
console.log(`[PWR Validation] PWR file validation failed after auto-retry, deleting corrupted file: ${dest}`);
|
||||||
fs.unlinkSync(dest);
|
fs.unlinkSync(dest);
|
||||||
throw new Error('Downloaded PWR file is corrupted or invalid after automatic retry. Please retry manually');
|
throw new Error('Downloaded PWR file is corrupted or invalid after automatic retry. Please retry manually');
|
||||||
@@ -169,8 +210,8 @@ async function downloadPWR(branch = 'release', fileName = '7.pwr', progressCallb
|
|||||||
// Enhanced PWR file validation
|
// Enhanced PWR file validation
|
||||||
const stats = fs.statSync(dest);
|
const stats = fs.statSync(dest);
|
||||||
console.log(`PWR file downloaded, size: ${(stats.size / 1024 / 1024).toFixed(2)} MB`);
|
console.log(`PWR file downloaded, size: ${(stats.size / 1024 / 1024).toFixed(2)} MB`);
|
||||||
|
|
||||||
if (!validatePWRFile(dest)) {
|
if (!validatePWRFile(dest, expectedSize)) {
|
||||||
console.log(`[PWR Validation] PWR file validation failed, deleting corrupted file: ${dest}`);
|
console.log(`[PWR Validation] PWR file validation failed, deleting corrupted file: ${dest}`);
|
||||||
fs.unlinkSync(dest);
|
fs.unlinkSync(dest);
|
||||||
throw new Error('Downloaded PWR file is corrupted or invalid. Please retry');
|
throw new Error('Downloaded PWR file is corrupted or invalid. Please retry');
|
||||||
@@ -188,7 +229,7 @@ async function retryPWRDownload(branch, fileName, progressCallback, cacheDir = C
|
|||||||
return await downloadPWR(branch, fileName, progressCallback, cacheDir, true);
|
return await downloadPWR(branch, fileName, progressCallback, cacheDir, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyPWR(pwrFile, progressCallback, gameDir = GAME_DIR, toolsDir = TOOLS_DIR, branch = 'release', cacheDir = CACHE_DIR) {
|
async function applyPWR(pwrFile, progressCallback, gameDir = GAME_DIR, toolsDir = TOOLS_DIR, branch = 'release', cacheDir = CACHE_DIR, skipExistingCheck = false) {
|
||||||
console.log(`[Butler] Starting PWR application with:`);
|
console.log(`[Butler] Starting PWR application with:`);
|
||||||
console.log(`[Butler] - PWR file: ${pwrFile}`);
|
console.log(`[Butler] - PWR file: ${pwrFile}`);
|
||||||
console.log(`[Butler] - Staging dir: ${path.join(gameDir, 'staging-temp')}`);
|
console.log(`[Butler] - Staging dir: ${path.join(gameDir, 'staging-temp')}`);
|
||||||
@@ -212,11 +253,12 @@ async function applyPWR(pwrFile, progressCallback, gameDir = GAME_DIR, toolsDir
|
|||||||
const gameLatest = gameDir;
|
const gameLatest = gameDir;
|
||||||
const stagingDir = path.join(gameLatest, 'staging-temp');
|
const stagingDir = path.join(gameLatest, 'staging-temp');
|
||||||
|
|
||||||
const clientPath = findClientPath(gameLatest);
|
if (!skipExistingCheck) {
|
||||||
|
const clientPath = findClientPath(gameLatest);
|
||||||
if (clientPath) {
|
if (clientPath) {
|
||||||
console.log('Game files detected, skipping patch installation.');
|
console.log('Game files detected, skipping patch installation.');
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate and prepare directories
|
// Validate and prepare directories
|
||||||
@@ -397,57 +439,118 @@ async function updateGameFiles(newVersion, progressCallback, gameDir = GAME_DIR,
|
|||||||
}
|
}
|
||||||
console.log(`Updating game files to version: ${newVersion} (branch: ${branch})`);
|
console.log(`Updating game files to version: ${newVersion} (branch: ${branch})`);
|
||||||
|
|
||||||
tempUpdateDir = path.join(gameDir, '..', 'temp_update');
|
// Determine update strategy: intermediate patches vs full reinstall
|
||||||
|
const currentVersion = loadVersionClient();
|
||||||
|
const currentBuild = extractVersionNumber(currentVersion) || 0;
|
||||||
|
const targetBuild = extractVersionNumber(newVersion);
|
||||||
|
|
||||||
if (fs.existsSync(tempUpdateDir)) {
|
let useIntermediatePatches = false;
|
||||||
fs.rmSync(tempUpdateDir, { recursive: true, force: true });
|
let updatePlan = null;
|
||||||
}
|
|
||||||
fs.mkdirSync(tempUpdateDir, { recursive: true });
|
|
||||||
|
|
||||||
if (progressCallback) {
|
if (currentBuild > 0 && currentBuild < targetBuild) {
|
||||||
progressCallback('Downloading new game version...', 20, null, null, null);
|
try {
|
||||||
}
|
updatePlan = await getUpdatePlan(currentBuild, targetBuild, branch);
|
||||||
|
useIntermediatePatches = !updatePlan.isFullInstall;
|
||||||
const pwrFile = await downloadPWR(branch, newVersion, progressCallback, cacheDir);
|
if (useIntermediatePatches) {
|
||||||
|
const totalMB = (updatePlan.totalSize / 1024 / 1024).toFixed(0);
|
||||||
if (progressCallback) {
|
console.log(`[UpdateGameFiles] Using intermediate patches: ${updatePlan.steps.map(s => `${s.from}\u2192${s.to}`).join(' + ')} (${totalMB} MB)`);
|
||||||
progressCallback('Extracting new files...', 60, null, null, null);
|
}
|
||||||
}
|
} catch (planError) {
|
||||||
|
console.warn('[UpdateGameFiles] Could not get update plan, falling back to full install:', planError.message);
|
||||||
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 (fs.existsSync(gameDir)) {
|
if (useIntermediatePatches && updatePlan) {
|
||||||
console.log('Removing old game files...');
|
// Apply intermediate patches directly to game dir
|
||||||
let retries = 3;
|
for (let i = 0; i < updatePlan.steps.length; i++) {
|
||||||
while (retries > 0) {
|
const step = updatePlan.steps[i];
|
||||||
|
const stepName = `${step.from}_to_${step.to}`;
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
const pwrFile = await downloadPWR(branch, stepName, progressCallback, cacheDir, false, step.url, step.size);
|
||||||
|
|
||||||
|
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
|
||||||
try {
|
try {
|
||||||
fs.rmSync(gameDir, { recursive: true, force: true });
|
if (fs.existsSync(pwrFile)) {
|
||||||
break;
|
fs.unlinkSync(pwrFile);
|
||||||
} catch (err) {
|
}
|
||||||
if ((err.code === 'EPERM' || err.code === 'EBUSY') && retries > 0) {
|
} catch (delErr) {
|
||||||
retries--;
|
console.warn('[UpdateGameFiles] Failed to delete PWR from cache:', delErr.message);
|
||||||
console.log(`[UpdateGameFiles] Removal failed with ${err.code}, retrying in 1s... (${retries} retries left)`);
|
}
|
||||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
||||||
} else {
|
// Save intermediate version so we can resume if interrupted
|
||||||
throw err;
|
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.renameSync(tempUpdateDir, gameDir);
|
fs.renameSync(tempUpdateDir, gameDir);
|
||||||
|
}
|
||||||
|
|
||||||
const homeUIResult = await downloadAndReplaceHomePageUI(gameDir, progressCallback);
|
const homeUIResult = await downloadAndReplaceHomePageUI(gameDir, progressCallback);
|
||||||
console.log('HomePage.ui update result after update:', homeUIResult);
|
console.log('HomePage.ui update result after update:', homeUIResult);
|
||||||
@@ -818,36 +921,30 @@ function validateGameDirectory(gameDir, stagingDir) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Enhanced PWR file validation
|
// Enhanced PWR file validation
|
||||||
function validatePWRFile(filePath) {
|
// Accepts intermediate patches (50+ MB) and full installs (1.5+ GB)
|
||||||
|
function validatePWRFile(filePath, expectedSize = null) {
|
||||||
try {
|
try {
|
||||||
if (!fs.existsSync(filePath)) {
|
if (!fs.existsSync(filePath)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const stats = fs.statSync(filePath);
|
const stats = fs.statSync(filePath);
|
||||||
const sizeInMB = stats.size / 1024 / 1024;
|
const sizeInMB = stats.size / 1024 / 1024;
|
||||||
|
|
||||||
|
// PWR files should be at least 1 MB
|
||||||
if (stats.size < 1024 * 1024) {
|
if (stats.size < 1024 * 1024) {
|
||||||
|
console.log(`[PWR Validation] File too small: ${sizeInMB.toFixed(2)} MB`);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if file is under 1.5 GB (incomplete download)
|
// Validate against expected size if known (reject if < 99% of expected)
|
||||||
if (sizeInMB < 1500) {
|
if (expectedSize && stats.size < expectedSize * 0.99) {
|
||||||
console.log(`[PWR Validation] File appears incomplete: ${sizeInMB.toFixed(2)} MB < 1.5 GB`);
|
const expectedMB = expectedSize / 1024 / 1024;
|
||||||
|
console.log(`[PWR Validation] File truncated: ${sizeInMB.toFixed(2)} MB, expected ${expectedMB.toFixed(2)} MB`);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Basic file header validation (PWR files should have specific headers)
|
console.log(`[PWR Validation] File size: ${sizeInMB.toFixed(2)} MB - OK`);
|
||||||
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;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[PWR Validation] Error:`, error.message);
|
console.error(`[PWR Validation] Error:`, error.message);
|
||||||
|
|||||||
@@ -1,133 +1,465 @@
|
|||||||
const axios = require('axios');
|
const axios = require('axios');
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
const { getOS, getArch } = require('../utils/platformUtils');
|
const { getOS, getArch } = require('../utils/platformUtils');
|
||||||
const { smartRequest } = require('../utils/proxyClient');
|
|
||||||
|
|
||||||
const BASE_PATCH_URL = 'https://game-patches.hytale.com/patches';
|
// Patches base URL fetched dynamically via multi-source fallback chain
|
||||||
const MANIFEST_API = 'https://files.hytalef2p.com/api/patch_manifest';
|
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: 'auth-server' },
|
||||||
|
{ type: 'http', url: 'https://htdwnldsan.top/patches-config', name: 'backup-http' },
|
||||||
|
{ type: 'doh', name: '_patches.htdwnldsan.top', name_label: 'dns-txt' },
|
||||||
|
];
|
||||||
|
const HARDCODED_FALLBACK = 'https://dl.vboro.de/patches';
|
||||||
|
|
||||||
async function getLatestClientVersion(branch = 'release') {
|
// 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 {
|
try {
|
||||||
console.log(`Fetching latest client version from API (branch: ${branch})...`);
|
const cachePath = getDiskCachePath();
|
||||||
const response = await smartRequest(`https://files.hytalef2p.com/api/version_client?branch=${branch}`, {
|
const dir = path.dirname(cachePath);
|
||||||
timeout: 40000,
|
if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
|
||||||
headers: {
|
fs.writeFileSync(cachePath, JSON.stringify({ patches_url: url, ts: Date.now() }), 'utf8');
|
||||||
'User-Agent': 'Hytale-F2P-Launcher'
|
} catch (e) {
|
||||||
}
|
// Non-critical, ignore
|
||||||
});
|
|
||||||
|
|
||||||
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('Warning: Invalid API response, falling back to latest known version (7.pwr)');
|
|
||||||
return '7.pwr';
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error fetching client version:', error.message);
|
|
||||||
console.log('Warning: API unavailable, falling back to latest known version (7.pwr)');
|
|
||||||
return '7.pwr';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildArchiveUrl(buildNumber, branch = 'release') {
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch the mirror manifest
|
||||||
|
*/
|
||||||
|
async function fetchMirrorManifest() {
|
||||||
|
const now = Date.now();
|
||||||
|
|
||||||
|
if (manifestCache && (now - manifestCacheTime) < MANIFEST_CACHE_DURATION) {
|
||||||
|
console.log('[Mirror] Using cached manifest');
|
||||||
|
return manifestCache;
|
||||||
|
}
|
||||||
|
|
||||||
|
const baseUrl = await getPatchesBaseUrl();
|
||||||
|
const manifestUrl = `${baseUrl}/manifest.json`;
|
||||||
|
|
||||||
|
try {
|
||||||
|
console.log('[Mirror] Fetching manifest from:', manifestUrl);
|
||||||
|
const response = await axios.get(manifestUrl, {
|
||||||
|
timeout: 15000,
|
||||||
|
headers: { 'User-Agent': 'Hytale-F2P-Launcher' }
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.data && response.data.files) {
|
||||||
|
manifestCache = response.data;
|
||||||
|
manifestCacheTime = now;
|
||||||
|
console.log('[Mirror] Manifest fetched successfully');
|
||||||
|
return response.data;
|
||||||
|
}
|
||||||
|
throw new Error('Invalid manifest structure');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[Mirror] Error fetching manifest:', error.message);
|
||||||
|
if (manifestCache) {
|
||||||
|
console.log('[Mirror] Using expired cache');
|
||||||
|
return manifestCache;
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 os = getOS();
|
||||||
const arch = getArch();
|
const arch = getArch();
|
||||||
return `${BASE_PATCH_URL}/${os}/${arch}/${branch}/0/${buildNumber}.pwr`;
|
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()}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getLatestClientVersion(branch = 'release') {
|
||||||
|
try {
|
||||||
|
console.log(`[Mirror] Fetching latest client version (branch: ${branch})...`);
|
||||||
|
const manifest = await fetchMirrorManifest();
|
||||||
|
const patches = getPlatformPatches(manifest, branch);
|
||||||
|
|
||||||
|
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`);
|
||||||
|
} else {
|
||||||
|
console.log(`[Mirror] Branch '${branch}' not in mirror, constructing URL`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('[Mirror] Error getting PWR URL:', error.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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();
|
||||||
|
const os = getOS();
|
||||||
|
const arch = getArch();
|
||||||
|
return `${baseUrl}/${os}/${arch}/${branch}/0_to_${buildNumber}.pwr`;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function checkArchiveExists(buildNumber, branch = 'release') {
|
async function checkArchiveExists(buildNumber, branch = 'release') {
|
||||||
const url = buildArchiveUrl(buildNumber, branch);
|
const url = await buildArchiveUrl(buildNumber, branch);
|
||||||
try {
|
try {
|
||||||
const response = await axios.head(url, { timeout: 10000 });
|
const response = await axios.head(url, { timeout: 10000 });
|
||||||
return response.status === 200;
|
return response.status === 200;
|
||||||
} catch (error) {
|
} catch {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function discoverAvailableVersions(latestKnown, branch = 'release', maxProbe = 50) {
|
async function discoverAvailableVersions(latestKnown, branch = 'release') {
|
||||||
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 {
|
try {
|
||||||
const os = getOS();
|
const manifest = await fetchMirrorManifest();
|
||||||
const arch = getArch();
|
const patches = getPlatformPatches(manifest, branch);
|
||||||
const response = await smartRequest(`${MANIFEST_API}?branch=${branch}&os=${os}&arch=${arch}`, {
|
const versions = [...new Set(patches.map(p => p.to))].sort((a, b) => b - a);
|
||||||
timeout: 10000
|
return versions.map(v => `${v}.pwr`);
|
||||||
});
|
} catch {
|
||||||
return response.data.patches || {};
|
return [];
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to fetch patch manifest:', error.message);
|
|
||||||
return {};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function extractVersionDetails(targetVersion, branch = 'release') {
|
async function extractVersionDetails(targetVersion, branch = 'release') {
|
||||||
const buildNumber = parseInt(targetVersion.replace('.pwr', ''));
|
const buildNumber = extractVersionNumber(targetVersion);
|
||||||
const previousBuild = buildNumber - 1;
|
const fullUrl = await buildArchiveUrl(buildNumber, branch);
|
||||||
|
|
||||||
const manifest = await fetchPatchManifest(branch);
|
|
||||||
const patchInfo = manifest[buildNumber];
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
version: targetVersion,
|
version: targetVersion,
|
||||||
buildNumber: buildNumber,
|
buildNumber,
|
||||||
buildName: `HYTALE-Build-${buildNumber}`,
|
buildName: `HYTALE-Build-${buildNumber}`,
|
||||||
fullUrl: patchInfo?.original_url || buildArchiveUrl(buildNumber, branch),
|
fullUrl,
|
||||||
differentialUrl: patchInfo?.patch_url || null,
|
differentialUrl: null,
|
||||||
checksum: patchInfo?.patch_hash || null,
|
checksum: null,
|
||||||
sourceVersion: patchInfo?.from ? `${patchInfo.from}.pwr` : (previousBuild > 0 ? `${previousBuild}.pwr` : null),
|
sourceVersion: null,
|
||||||
isDifferential: !!patchInfo?.proper_patch,
|
isDifferential: false,
|
||||||
releaseNotes: patchInfo?.patch_note || null
|
releaseNotes: null
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function canUseDifferentialUpdate(currentVersion, targetDetails) {
|
function canUseDifferentialUpdate() {
|
||||||
if (!targetDetails) return false;
|
// Differential updates are now handled via getUpdatePlan()
|
||||||
if (!targetDetails.differentialUrl) return false;
|
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) {
|
function needsIntermediatePatches(currentVersion, targetVersion) {
|
||||||
if (!currentVersion) return [];
|
if (!currentVersion) return [];
|
||||||
|
const current = extractVersionNumber(currentVersion);
|
||||||
const current = parseInt(currentVersion.replace('.pwr', ''));
|
const target = extractVersionNumber(targetVersion);
|
||||||
const target = parseInt(targetVersion.replace('.pwr', ''));
|
if (current >= target) return [];
|
||||||
|
return [targetVersion];
|
||||||
const intermediates = [];
|
|
||||||
for (let i = current + 1; i <= target; i++) {
|
|
||||||
intermediates.push(`${i}.pwr`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return intermediates;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function computeFileChecksum(filePath) {
|
async function computeFileChecksum(filePath) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const hash = crypto.createHash('sha256');
|
const hash = crypto.createHash('sha256');
|
||||||
const stream = fs.createReadStream(filePath);
|
const stream = fs.createReadStream(filePath);
|
||||||
|
|
||||||
stream.on('data', data => hash.update(data));
|
stream.on('data', data => hash.update(data));
|
||||||
stream.on('end', () => resolve(hash.digest('hex')));
|
stream.on('end', () => resolve(hash.digest('hex')));
|
||||||
stream.on('error', reject);
|
stream.on('error', reject);
|
||||||
@@ -136,7 +468,6 @@ async function computeFileChecksum(filePath) {
|
|||||||
|
|
||||||
async function validateChecksum(filePath, expectedChecksum) {
|
async function validateChecksum(filePath, expectedChecksum) {
|
||||||
if (!expectedChecksum) return true;
|
if (!expectedChecksum) return true;
|
||||||
|
|
||||||
const actualChecksum = await computeFileChecksum(filePath);
|
const actualChecksum = await computeFileChecksum(filePath);
|
||||||
return actualChecksum === expectedChecksum;
|
return actualChecksum === expectedChecksum;
|
||||||
}
|
}
|
||||||
@@ -145,7 +476,7 @@ function getInstalledClientVersion() {
|
|||||||
try {
|
try {
|
||||||
const { loadVersionClient } = require('../core/config');
|
const { loadVersionClient } = require('../core/config');
|
||||||
return loadVersionClient();
|
return loadVersionClient();
|
||||||
} catch (err) {
|
} catch {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -160,5 +491,13 @@ module.exports = {
|
|||||||
needsIntermediatePatches,
|
needsIntermediatePatches,
|
||||||
computeFileChecksum,
|
computeFileChecksum,
|
||||||
validateChecksum,
|
validateChecksum,
|
||||||
getInstalledClientVersion
|
getInstalledClientVersion,
|
||||||
|
fetchMirrorManifest,
|
||||||
|
getPWRUrl,
|
||||||
|
getPWRUrlFromNewAPI,
|
||||||
|
getUpdatePlan,
|
||||||
|
extractVersionNumber,
|
||||||
|
getPlatformPatches,
|
||||||
|
findOptimalPatchPath,
|
||||||
|
getPatchesBaseUrl
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,6 +7,10 @@ const ORIGINAL_DOMAIN = 'hytale.com';
|
|||||||
const MIN_DOMAIN_LENGTH = 4;
|
const MIN_DOMAIN_LENGTH = 4;
|
||||||
const MAX_DOMAIN_LENGTH = 16;
|
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_FILENAME = 'dualauth-agent.jar';
|
||||||
|
|
||||||
function getTargetDomain() {
|
function getTargetDomain() {
|
||||||
if (process.env.HYTALE_AUTH_DOMAIN) {
|
if (process.env.HYTALE_AUTH_DOMAIN) {
|
||||||
return process.env.HYTALE_AUTH_DOMAIN;
|
return process.env.HYTALE_AUTH_DOMAIN;
|
||||||
@@ -23,7 +27,7 @@ const DEFAULT_NEW_DOMAIN = 'auth.sanasol.ws';
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Patches HytaleClient binary to replace hytale.com with custom domain
|
* Patches HytaleClient binary to replace hytale.com with custom domain
|
||||||
* Server patching is done via pre-patched JAR download from CDN
|
* Server auth is handled by DualAuth ByteBuddy Agent (-javaagent: flag)
|
||||||
*
|
*
|
||||||
* Supports domains from 4 to 16 characters:
|
* Supports domains from 4 to 16 characters:
|
||||||
* - All F2P traffic routes to single endpoint: https://{domain} (no subdomains)
|
* - All F2P traffic routes to single endpoint: https://{domain} (no subdomains)
|
||||||
@@ -494,211 +498,95 @@ class ClientPatcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if server JAR contains DualAuth classes (was patched)
|
* Get the path to the DualAuth Agent JAR in a directory
|
||||||
*/
|
*/
|
||||||
serverJarContainsDualAuth(serverPath) {
|
getAgentPath(dir) {
|
||||||
try {
|
return path.join(dir, DUALAUTH_AGENT_FILENAME);
|
||||||
const data = fs.readFileSync(serverPath);
|
|
||||||
// Check for DualAuthContext class signature in JAR
|
|
||||||
const signature = Buffer.from('DualAuthContext', 'utf8');
|
|
||||||
return data.includes(signature);
|
|
||||||
} catch (e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validate downloaded file is not corrupt/partial
|
* Download DualAuth ByteBuddy Agent (replaces old pre-patched JAR approach)
|
||||||
* Server JAR should be at least 50MB
|
* The agent provides runtime class transformation via -javaagent: flag
|
||||||
|
* No server JAR modification needed - original JAR stays pristine
|
||||||
*/
|
*/
|
||||||
validateServerJarSize(serverPath) {
|
async ensureAgentAvailable(serverDir, progressCallback) {
|
||||||
try {
|
const agentPath = this.getAgentPath(serverDir);
|
||||||
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) ===');
|
||||||
* Patch server JAR by downloading pre-patched version from CDN
|
console.log(`Target: ${agentPath}`);
|
||||||
*/
|
|
||||||
async patchServer(serverPath, progressCallback, branch = 'release') {
|
|
||||||
const newDomain = this.getNewDomain();
|
|
||||||
|
|
||||||
console.log('=== Server Patcher (Pre-patched Download) ===');
|
// Check if agent already exists and is valid
|
||||||
console.log(`Target: ${serverPath}`);
|
if (fs.existsSync(agentPath)) {
|
||||||
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 {
|
try {
|
||||||
const flagData = JSON.parse(fs.readFileSync(patchFlagFile, 'utf8'));
|
const stats = fs.statSync(agentPath);
|
||||||
if (flagData.domain === newDomain && flagData.branch === branch) {
|
if (stats.size > 1024) {
|
||||||
// Verify JAR actually contains DualAuth classes (game may have auto-updated)
|
console.log(`DualAuth Agent present (${(stats.size / 1024).toFixed(0)} KB)`);
|
||||||
if (this.serverJarContainsDualAuth(serverPath)) {
|
if (progressCallback) progressCallback('DualAuth Agent ready', 100);
|
||||||
console.log(`Server already patched for ${newDomain} (${branch}), skipping`);
|
return { success: true, agentPath, alreadyExists: true };
|
||||||
if (progressCallback) progressCallback('Server already patched', 100);
|
|
||||||
return { success: true, alreadyPatched: true };
|
|
||||||
} else {
|
|
||||||
console.log(' Flag exists but JAR not patched (was auto-updated?), will re-download...');
|
|
||||||
// Delete stale flag file
|
|
||||||
try { fs.unlinkSync(patchFlagFile); } catch (e) { /* ignore */ }
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.log(`Server patched for "${flagData.domain}" (${flagData.branch}), need to change to "${newDomain}" (${branch})`);
|
|
||||||
needsRestore = true;
|
|
||||||
}
|
}
|
||||||
|
// File exists but too small - corrupt, re-download
|
||||||
|
console.log('Agent file appears corrupt, re-downloading...');
|
||||||
|
fs.unlinkSync(agentPath);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// Flag file corrupt, re-patch
|
console.warn('Could not check agent file:', e.message);
|
||||||
console.log(' Flag file corrupt, will re-download');
|
|
||||||
try { fs.unlinkSync(patchFlagFile); } catch (e) { /* ignore */ }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Restore backup if patched for different domain
|
// Download agent from GitHub releases
|
||||||
if (needsRestore) {
|
if (progressCallback) progressCallback('Downloading DualAuth Agent...', 20);
|
||||||
const backupPath = serverPath + '.original';
|
console.log(`Downloading from: ${DUALAUTH_AGENT_URL}`);
|
||||||
if (fs.existsSync(backupPath)) {
|
|
||||||
if (progressCallback) progressCallback('Restoring original for domain change...', 5);
|
|
||||||
console.log('Restoring original JAR from backup for re-patching...');
|
|
||||||
fs.copyFileSync(backupPath, serverPath);
|
|
||||||
if (fs.existsSync(patchFlagFile)) {
|
|
||||||
fs.unlinkSync(patchFlagFile);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.warn(' No backup found to restore - will download fresh patched JAR');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create backup
|
|
||||||
if (progressCallback) progressCallback('Creating backup...', 10);
|
|
||||||
console.log('Creating backup...');
|
|
||||||
const backupResult = this.backupClient(serverPath);
|
|
||||||
if (!backupResult) {
|
|
||||||
console.warn(' Could not create backup - proceeding without backup');
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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 {
|
try {
|
||||||
let url;
|
// Ensure server directory exists
|
||||||
if (branch === 'pre-release') {
|
if (!fs.existsSync(serverDir)) {
|
||||||
url = 'https://patcher.authbp.xyz/download/patched_prerelease';
|
fs.mkdirSync(serverDir, { recursive: true });
|
||||||
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 file = fs.createWriteStream(serverPath);
|
const tmpPath = agentPath + '.tmp';
|
||||||
let totalSize = 0;
|
const file = fs.createWriteStream(tmpPath);
|
||||||
let downloaded = 0;
|
|
||||||
|
|
||||||
const stream = await smartDownloadStream(url, (chunk, downloadedBytes, total) => {
|
const stream = await smartDownloadStream(DUALAUTH_AGENT_URL, (chunk, downloadedBytes, total) => {
|
||||||
downloaded = downloadedBytes;
|
if (progressCallback && total) {
|
||||||
totalSize = total;
|
const percent = 20 + Math.floor((downloadedBytes / total) * 70);
|
||||||
if (progressCallback && totalSize) {
|
progressCallback(`Downloading agent... ${(downloadedBytes / 1024).toFixed(0)} KB`, percent);
|
||||||
const percent = 30 + Math.floor((downloaded / totalSize) * 60);
|
|
||||||
progressCallback(`Downloading... ${(downloaded / 1024 / 1024).toFixed(2)} MB`, percent);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
stream.pipe(file);
|
stream.pipe(file);
|
||||||
|
|
||||||
await new Promise((resolve, reject) => {
|
await new Promise((resolve, reject) => {
|
||||||
file.on('finish', () => {
|
file.on('finish', () => { file.close(); resolve(); });
|
||||||
file.close();
|
|
||||||
resolve();
|
|
||||||
});
|
|
||||||
file.on('error', reject);
|
file.on('error', reject);
|
||||||
stream.on('error', reject);
|
stream.on('error', reject);
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log(' Download successful');
|
// Verify download
|
||||||
|
const stats = fs.statSync(tmpPath);
|
||||||
// Verify downloaded JAR size and contents
|
if (stats.size < 1024) {
|
||||||
if (progressCallback) progressCallback('Verifying downloaded JAR...', 95);
|
fs.unlinkSync(tmpPath);
|
||||||
|
const error = 'Downloaded agent too small (corrupt or failed download)';
|
||||||
if (!this.validateServerJarSize(serverPath)) {
|
console.error(error);
|
||||||
console.error('Downloaded JAR appears corrupt or incomplete');
|
return { success: false, error };
|
||||||
|
|
||||||
// Restore backup on verification failure
|
|
||||||
const backupPath = serverPath + '.original';
|
|
||||||
if (fs.existsSync(backupPath)) {
|
|
||||||
fs.copyFileSync(backupPath, serverPath);
|
|
||||||
console.log('Restored backup after verification failure');
|
|
||||||
}
|
|
||||||
|
|
||||||
return { success: false, error: 'Downloaded JAR verification failed - file too small (corrupt/partial download)' };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.serverJarContainsDualAuth(serverPath)) {
|
// Atomic move
|
||||||
console.error('Downloaded JAR does not contain DualAuth classes - invalid or corrupt download');
|
if (fs.existsSync(agentPath)) {
|
||||||
|
fs.unlinkSync(agentPath);
|
||||||
// Restore backup on verification failure
|
|
||||||
const backupPath = serverPath + '.original';
|
|
||||||
if (fs.existsSync(backupPath)) {
|
|
||||||
fs.copyFileSync(backupPath, serverPath);
|
|
||||||
console.log('Restored backup after verification failure');
|
|
||||||
}
|
|
||||||
|
|
||||||
return { success: false, error: 'Downloaded JAR verification failed - missing DualAuth classes' };
|
|
||||||
}
|
}
|
||||||
console.log(' Verification successful - DualAuth classes present');
|
fs.renameSync(tmpPath, agentPath);
|
||||||
|
|
||||||
// Mark as patched
|
console.log(`DualAuth Agent downloaded (${(stats.size / 1024).toFixed(0)} KB)`);
|
||||||
const sourceUrl = branch === 'pre-release'
|
if (progressCallback) progressCallback('DualAuth Agent ready', 100);
|
||||||
? 'https://patcher.authbp.xyz/download/patched_prerelease'
|
return { success: true, agentPath };
|
||||||
: 'https://patcher.authbp.xyz/download/patched_release';
|
|
||||||
|
|
||||||
fs.writeFileSync(patchFlagFile, JSON.stringify({
|
|
||||||
domain: newDomain,
|
|
||||||
branch: branch,
|
|
||||||
patchedAt: new Date().toISOString(),
|
|
||||||
patcher: 'PrePatchedDownload',
|
|
||||||
source: sourceUrl
|
|
||||||
}));
|
|
||||||
|
|
||||||
if (progressCallback) progressCallback('Server patching complete', 100);
|
|
||||||
console.log('=== Server Patching Complete ===');
|
|
||||||
return { success: true, patchCount: 1 };
|
|
||||||
|
|
||||||
} catch (downloadError) {
|
} catch (downloadError) {
|
||||||
console.error(`Failed to download patched JAR: ${downloadError.message}`);
|
console.error(`Failed to download DualAuth Agent: ${downloadError.message}`);
|
||||||
|
// Clean up temp file
|
||||||
// Restore backup on failure
|
const tmpPath = agentPath + '.tmp';
|
||||||
const backupPath = serverPath + '.original';
|
if (fs.existsSync(tmpPath)) {
|
||||||
if (fs.existsSync(backupPath)) {
|
try { fs.unlinkSync(tmpPath); } catch (e) { /* ignore */ }
|
||||||
fs.copyFileSync(backupPath, serverPath);
|
|
||||||
console.log('Restored backup after download failure');
|
|
||||||
}
|
}
|
||||||
|
return { success: false, error: downloadError.message };
|
||||||
return { success: false, error: `Failed to download patched server: ${downloadError.message}` };
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -743,12 +631,12 @@ class ClientPatcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensure both client and server are patched before launching
|
* Ensure client is patched and DualAuth Agent is available before launching
|
||||||
*/
|
*/
|
||||||
async ensureClientPatched(gameDir, progressCallback, javaPath = null, branch = 'release') {
|
async ensureClientPatched(gameDir, progressCallback, javaPath = null, branch = 'release') {
|
||||||
const results = {
|
const results = {
|
||||||
client: null,
|
client: null,
|
||||||
server: null,
|
agent: null,
|
||||||
success: true
|
success: true
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -765,22 +653,23 @@ class ClientPatcher {
|
|||||||
results.client = { success: false, error: 'Client binary not found' };
|
results.client = { success: false, error: 'Client binary not found' };
|
||||||
}
|
}
|
||||||
|
|
||||||
const serverPath = this.findServerPath(gameDir);
|
// Download DualAuth ByteBuddy Agent (runtime patching, no JAR modification)
|
||||||
if (serverPath) {
|
const serverDir = path.join(gameDir, 'Server');
|
||||||
if (progressCallback) progressCallback('Patching server JAR...', 50);
|
if (fs.existsSync(serverDir)) {
|
||||||
results.server = await this.patchServer(serverPath, (msg, pct) => {
|
if (progressCallback) progressCallback('Checking DualAuth Agent...', 50);
|
||||||
|
results.agent = await this.ensureAgentAvailable(serverDir, (msg, pct) => {
|
||||||
if (progressCallback) {
|
if (progressCallback) {
|
||||||
progressCallback(`Server: ${msg}`, pct ? 50 + pct / 2 : null);
|
progressCallback(`Agent: ${msg}`, pct ? 50 + pct / 2 : null);
|
||||||
}
|
}
|
||||||
}, branch);
|
});
|
||||||
} else {
|
} else {
|
||||||
console.warn('Could not find HytaleServer.jar');
|
console.warn('Server directory not found, skipping agent download');
|
||||||
results.server = { success: false, error: 'Server JAR not found' };
|
results.agent = { success: true, skipped: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
results.success = (results.client && results.client.success) || (results.server && results.server.success);
|
results.success = (results.client && results.client.success) || (results.agent && results.agent.success);
|
||||||
results.alreadyPatched = (results.client && results.client.alreadyPatched) && (results.server && results.server.alreadyPatched);
|
results.alreadyPatched = (results.client && results.client.alreadyPatched) && (results.agent && results.agent.alreadyExists);
|
||||||
results.patchCount = (results.client ? results.client.patchCount || 0 : 0) + (results.server ? results.server.patchCount || 0 : 0);
|
results.patchCount = results.client ? results.client.patchCount || 0 : 0;
|
||||||
|
|
||||||
if (progressCallback) progressCallback('Patching complete', 100);
|
if (progressCallback) progressCallback('Patching complete', 100);
|
||||||
|
|
||||||
|
|||||||
18
build/entitlements.mac.plist
Normal file
18
build/entitlements.mac.plist
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<?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,3 +1,2 @@
|
|||||||
provider: github
|
provider: generic
|
||||||
owner: amiayweb # Change to your own GitHub username
|
url: https://git.sanhost.net/sanasol/hytale-f2p/releases/download/latest
|
||||||
repo: Hytale-F2P
|
|
||||||
|
|||||||
18
main.js
18
main.js
@@ -84,12 +84,12 @@ function setDiscordActivity() {
|
|||||||
largeImageText: 'Hytale F2P Launcher',
|
largeImageText: 'Hytale F2P Launcher',
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
label: 'GitHub',
|
label: 'Download',
|
||||||
url: 'https://github.com/amiayweb/Hytale-F2P'
|
url: 'https://git.sanhost.net/sanasol/hytale-f2p/releases'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Discord',
|
label: 'Discord',
|
||||||
url: 'https://discord.gg/hf2pdc'
|
url: 'https://discord.gg/Fhbb9Yk5WW'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
@@ -627,7 +627,7 @@ ipcMain.handle('install-game', async (event, playerName, javaPath, installPath,
|
|||||||
console.log('[Main] Processing Butler error with retry context');
|
console.log('[Main] Processing Butler error with retry context');
|
||||||
errorData.retryData = {
|
errorData.retryData = {
|
||||||
branch: error.branch || 'release',
|
branch: error.branch || 'release',
|
||||||
fileName: error.fileName || '7.pwr',
|
fileName: error.fileName || 'v8',
|
||||||
cacheDir: error.cacheDir
|
cacheDir: error.cacheDir
|
||||||
};
|
};
|
||||||
errorData.canRetry = error.canRetry !== false;
|
errorData.canRetry = error.canRetry !== false;
|
||||||
@@ -647,7 +647,7 @@ ipcMain.handle('install-game', async (event, playerName, javaPath, installPath,
|
|||||||
console.log('[Main] Processing generic error, creating default retry data');
|
console.log('[Main] Processing generic error, creating default retry data');
|
||||||
errorData.retryData = {
|
errorData.retryData = {
|
||||||
branch: 'release',
|
branch: 'release',
|
||||||
fileName: '7.pwr'
|
fileName: 'v8'
|
||||||
};
|
};
|
||||||
// For generic errors, assume it's retryable unless specified
|
// For generic errors, assume it's retryable unless specified
|
||||||
errorData.canRetry = error.canRetry !== false;
|
errorData.canRetry = error.canRetry !== false;
|
||||||
@@ -887,7 +887,7 @@ ipcMain.handle('retry-download', async (event, retryData) => {
|
|||||||
console.log('[IPC] Invalid retry data, using PWR defaults');
|
console.log('[IPC] Invalid retry data, using PWR defaults');
|
||||||
retryData = {
|
retryData = {
|
||||||
branch: 'release',
|
branch: 'release',
|
||||||
fileName: '7.pwr'
|
fileName: 'v8'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -921,7 +921,7 @@ ipcMain.handle('retry-download', async (event, retryData) => {
|
|||||||
} :
|
} :
|
||||||
{
|
{
|
||||||
branch: retryData?.branch || 'release',
|
branch: retryData?.branch || 'release',
|
||||||
fileName: retryData?.fileName || '7.pwr',
|
fileName: retryData?.fileName || 'v8',
|
||||||
cacheDir: retryData?.cacheDir
|
cacheDir: retryData?.cacheDir
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -964,8 +964,8 @@ ipcMain.handle('open-external', async (event, url) => {
|
|||||||
|
|
||||||
ipcMain.handle('open-download-page', async () => {
|
ipcMain.handle('open-download-page', async () => {
|
||||||
try {
|
try {
|
||||||
// Open GitHub releases page for manual download
|
// Open Forgejo releases page for manual download
|
||||||
await shell.openExternal('https://github.com/amiayweb/Hytale-F2P/releases/latest');
|
await shell.openExternal('https://git.sanhost.net/sanasol/hytale-f2p/releases/latest');
|
||||||
return { success: true };
|
return { success: true };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to open download page:', error);
|
console.error('Failed to open download page:', error);
|
||||||
|
|||||||
16
package.json
16
package.json
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "hytale-f2p-launcher",
|
"name": "hytale-f2p-launcher",
|
||||||
"version": "2.2.1",
|
"version": "2.3.5",
|
||||||
"description": "A modern, cross-platform launcher for Hytale with automatic updates and multi-client support",
|
"description": "A modern, cross-platform launcher for Hytale with automatic updates and multi-client support",
|
||||||
"homepage": "https://github.com/amiayweb/Hytale-F2P",
|
"homepage": "https://git.sanhost.net/sanasol/hytale-f2p",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "electron .",
|
"start": "electron .",
|
||||||
@@ -104,7 +104,12 @@
|
|||||||
],
|
],
|
||||||
"icon": "build/icon.icns",
|
"icon": "build/icon.icns",
|
||||||
"artifactName": "${name}_${version}_${arch}.${ext}",
|
"artifactName": "${name}_${version}_${arch}.${ext}",
|
||||||
"category": "public.app-category.games"
|
"category": "public.app-category.games",
|
||||||
|
"hardenedRuntime": true,
|
||||||
|
"gatekeeperAssess": false,
|
||||||
|
"entitlements": "build/entitlements.mac.plist",
|
||||||
|
"entitlementsInherit": "build/entitlements.mac.plist",
|
||||||
|
"notarize": true
|
||||||
},
|
},
|
||||||
"nsis": {
|
"nsis": {
|
||||||
"oneClick": false,
|
"oneClick": false,
|
||||||
@@ -113,9 +118,8 @@
|
|||||||
"createStartMenuShortcut": true
|
"createStartMenuShortcut": true
|
||||||
},
|
},
|
||||||
"publish": {
|
"publish": {
|
||||||
"provider": "github",
|
"provider": "generic",
|
||||||
"owner": "amiayweb",
|
"url": "https://git.sanhost.net/sanasol/hytale-f2p/releases/download/latest"
|
||||||
"repo": "Hytale-F2P"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user