mirror of
https://gitea.shironeko-all.duckdns.org/shironeko/Hytale-F2P-2.git
synced 2026-02-26 10:41:46 -03:00
Release Stable Build v2.2.1 (#258)
* fix: resolve cross-platform EPERM permissions errors modManager.js: - Switch from hardcoded 'junction' to dynamic symlink type based on OS (fixing Linux EPERM). - Add retry logic for directory removal to handle file locking race conditions. - Improve broken symlink detection during profile sync. gameManager.js: - Implement retry loop (3 attempts) for game directory removal in updateGameFiles to prevent EBUSY/EPERM errors on Windows. paths.js: - Prevent fs.mkdirSync failure in getModsPath by pre-checking for broken symbolic links. * fix: missing pacman builds * prepare release for 2.1.1 minor fix for EPERM error permission * prepare release 2.1.1 minor fix EPERM permission error * prepare release 2.1.1 * Update README.md Windows Prequisites for ARM64 builds * fix: remove broken symlink after detected * fix: add pathexists for paths.js to check symlink * fix: isbrokenlink should be true to remove the symlink * add arch package .pkg.tar.zst for release * fix: release workflow for build-arch and build-linux * build-arch job now only build arch .pkg.tar.zst package instead of the whole generic linux. * build-linux job now exclude .pacman package since its deprecated and should not be used. * fix: removes pacman build as it replaced by tar.zst and adds build:arch shortcut for pkgbuild * aur: add proper VCS (-git) PKGBUILD created clean VCS-based PKGBUILD following arch packaging conventions. this explicitly marked as a rolling (-git) build and derives its version dynamically from git tags and commit history via pkgver(). previous hybrid approach has been changed. key changes: - use -git suffix to clearly indicate rolling source builds - set pkgver=0 and compute the actual version via pkgver() - build only a directory layout using electron-builder (--dir) - avoid generating AppImage, deb, rpm, or pacman installers - align build and package steps with Arch packaging guidelines note: this PKGBUILD is intended for development and AUR use only and is not suitable for binary redistribution or release artifacts. * ci: add fixed-version PKGBUILD for Arch Linux releases this PKGBUILD intended for CI and GitHub release artifacts. targets tagged releases only and uses a fixed pkgver that matches the corresponding git tag. all of the VCS logic has been removed to PKGBUILD-git to ensure reproducible builds and stable versioning suitable for binary distribution. the build process relies on electron-builder directory output (--dir) and packages only the unpacked application into a standard Arch Linux package (.pkg.tar.zst). other distro format are excluded from this path and handled separately. this change establishes a clear separation between: - rolling AUR development builds (-git) - CI-generated, versioned Arch Linux release packages the result is predictable artifact naming, correct version alignment, and Arch-compliant packaging for downstream users. * Update README.md adds information for Arch build * Update README.md BUILD.md location was changed and now this link is poiting to nothing * Update PKGBUILD * Update PKGBUILD-git * chore: fix ubuntu/debian part in README.md * Polish language support (#195) * Update support_request.yml Added hardware specification * Update bug_report.yml Add logs textfield to bug report * chore: add changelog in README.md * fix screenshot input in feature_request.yml * add hardware spec input in bug_report.yml * fix: PKGBUILD pkgname variable fix * userdata migration [need review from other OS] * french translate * Add German and Swedish translations Added de.json and sv.json locale files for German and Swedish language support. Updated i18n.js to register 'de' and 'sv' as available languages in the launcher. * Update README.md * chore: add offline-mode warning to the README.md * chore: add downloads counter in README.md * fix: Steam Deck/Ubuntu crash - use system libzstd.so The bundled libzstd.so is incompatible with glibc 2.41's stricter heap validation, causing "free(): invalid pointer" crashes. Solution: Automatically replace bundled libzstd.so with system version on Linux. The launcher detects and symlinks to /usr/lib/libzstd.so.1. - Auto-detect system libzstd at common paths (Arch, Debian, Fedora) - Backup bundled version as libzstd.so.bundled - Create symlink to system version - Add HYTALE_NO_LIBZSTD_FIX=1 to disable if needed Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * chore: remove Windows and Linux ARM64 information on the README.md * Update support_request.yml * fix: improve update system UX and macOS compatibility Update System Improvements: - Fix duplicate update popups by disabling legacy updater.js - Add skip button to update popup (shows after 30s, on error, or after download) - Add macOS-specific handling with manual download as primary option - Add missing open-download-page IPC handler - Add missing unblockInterface() method to properly clean up after popup close - Add quitAndInstallUpdate alias in preload for compatibility - Remove pulse animation when download completes - Fix manual download button to show correct status and close popup - Sync player name to settings input after first install Client Patcher Cleanup: - Remove server patching code (server uses pre-patched JAR from CDN) - Simplify to client-only patching - Remove unused imports (crypto, AdmZip, execSync, spawn, javaManager) - Remove unused methods (stringToUtf8, findAndReplaceDomainUtf8) - Move localhost dev code to backup file for reference Code Quality Fixes: - Fix duplicate DOMContentLoaded handlers in install.js - Fix duplicate checkForUpdates definition in preload.js - Fix redundant if/else in onProgressUpdate callback - Fix typo "Harwadre" -> "Hardware" in preload.js Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Add Russian language support Added Russian (ru) to the list of available languages. * chore: drafting documentation on SERVER.md * Some updates in Russian language localization file * fix * Update ru.json * Fixed Java runtime name and fixed typo * fixed untranslated place * Update ru.json * Update ru.json * Update ru.json * Update ru.json * Update ru.json * fix: timeout getLatestClient fixes #138 * fix: change default version to 7.pwr in main.js * fix: change default release version to 7.pwr * fix: change version release to 7.pwr * docs: Add comprehensive troubleshooting guide (#209) Add TROUBLESHOOTING.md with solutions for common issues including: - Windows: Firewall configuration, duplicate mods, SmartScreen - Linux: GPU detection (NVIDIA/AMD), SDL3_image/libpng dependencies, Wayland/X11 issues, Steam Deck support - macOS: Rosetta 2 for Apple Silicon, code signing, quarantine - Connection: Server boot failures, regional restrictions - Authentication: Token errors, config reset procedures - Avatar/Cosmetics: F2P limitations documentation - Backup locations for all platforms - Log locations for bug reports Solutions compiled from closed GitHub issues (#205, #155, #90, #60, #144, #192) and community feedback. Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> * Standardize language codes, improve formatting, and update all locale files. (#224) * Update German (Germany) localization * Update Español (España) localization * Update French (France) localization * Update Polish (Poland) localization * Update Portuguese (Brazil) localization * Update Russian (Russia) localization * Update Swedish (Sweden) localization * Update Turkish (Turkey) localization * Update language codes, names and alphabetical in i18n system * Changed Spanish language name to the Formal name "Spanish (Spain)" * Fix PKGBUILD-git * Fix PKGBUILD * delete cache after installation * Enforce 16-char player name limit and update mod sync Added a maxlength attribute to the player name input and enforced a 16-character limit in both install and settings scripts, providing user feedback if exceeded. Refactored modManager.js to replace symlink-based mod management with a copy-based system, copying enabled mods to HytaleSaves\Mods and removing legacy symlink logic to improve compatibility and avoid permission issues. * Update installation subtitle * chore: update quickstart link in README.md * chore: delete warning of Ubuntu-Debian at Linux Prequisites section * added featured server list from api * Add Featured Servers page to GUI * Update Discord invite URL in client patcher * Add differential update system * Remove launcher chat and add Discord popup * fix: removed 'check disk space' alert on permission file error * fix: upgrade tar to ^7.5.6 version * fix: re-add universal arch for mac * fix: upgrade electron/rebuild to 4.0.3 * fix: removed override tar version * fix: pkgbuild version to 2.1.2 * fix: src.tar.zst and srcinfo missing files * feat: add Indonesian language translation * fix: GPU preference hint to Laptop-only * feat: create two columns for settings page * Add Discord invite link to rpc * docs: add recordings form, fix OS list * Release v2.2.0 * Release v2.2.0 * Release v2.2.0 * chore: delete icon.ico, moved to build folder * chore: delete icon.png, moved to build folder * fix: build and release for tag push-only in release.yml * fix: gamescope steam deck issue fixes #186 hopefully * Support branch selection for server patching * chose: add auto-patch system for pre-release JAR * fix: preserves arch x64 on linux target for #242 * fix: removed arm64 flags * fix: redo package.json arch * update package-lock.json * Update release.yml * chore: sync package-lock with package.json * fix: reorder fedora libzstd paths to first iteration * feat: enhance gpu detection, drafting * fix: comprehensive UUID/username persistence bug fixes (#252) * fix: comprehensive UUID/username persistence bug fixes Major fixes for UUID/skin reset issues that caused players to lose cosmetics: Core fixes: - Username rename now preserves UUID (atomic rename, not new identity) - Atomic config writes with backup/recovery system - Case-insensitive UUID lookup with case-preserving storage - Pre-launch validation blocks play if no username configured - Removed saveUsername calls from launch/install flows UUID Modal fixes: - Fixed isCurrent badge showing on wrong user - Added switch identity button to change between saved usernames - Fixed custom UUID input using unsaved DOM username - UUID list now refreshes when player name changes - Enabled copy/paste in custom UUID input field UI/UX improvements: - Added translation keys for switch username functionality - CSS user-select fix for UUID input fields - Allowed Ctrl+V/C/X/A shortcuts in Electron Files: config.js, gameLauncher.js, gameManager.js, playerManager.js, launcher.js, settings.js, main.js, preload.js, style.css, en.json See UUID_BUGS_FIX_PLAN.md for detailed bug list (18 bugs, 16 fixed) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(i18n): add switch username translations to all locales Added translation keys for username switching functionality: - notifications.noUsername - notifications.switchUsernameSuccess - notifications.switchUsernameFailed - notifications.playerNameTooLong - confirm.switchUsernameTitle - confirm.switchUsernameMessage - confirm.switchUsernameButton Languages updated: de-DE, es-ES, fr-FR, id-ID, pl-PL, pt-BR, ru-RU, sv-SE, tr-TR Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * docs: move UUID_BUGS_FIX_PLAN.md to docs folder * docs: update UUID_BUGS_FIX_PLAN with complete fix details --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> * chore: rearrange, fix, and improve README.md * chore: link downloads, platform, and version to release page in README.md * chore: update discord link * chore: insert contact link in CODE_OF_CONDUCT.md * fix: missing version text on launcher * chore: update quickstart button link to header * chore: update discord link and give warning quickstart * chore revise online play hosting instructions in README Updated instructions for hosting an online game and clarified troubleshooting steps. * Fix Turkish translations in tr-TR.json * fix: EPERM error in Repair Game Button [windows testing needed] * fix: invalid generated token that caused hangs on exit [windows testing needed] * fix: major bug - hytale won't launch with laptop machine and ghost processes * fix: discord RPC destroy error if not connected * fix: major bug - detach game process to avoid launcher-held handles causing zombie process * docs: add analysis on ghost process and launcher cleanup * revert generateLocalTokens, wrong analysis on game launching issue * revert add deps for generateLocalTokens * Add proxy client and route downloads through it * fix: Prevent JAR file corruption during proxy downloads Fixed binary file corruption when downloading through proxy by using PassThrough stream to preserve data integrity while tracking download progress. * Improve featured servers layout with Discord integration - Add Discord button to server cards when discord link is present in API data - Remove HF2P Servers section to use full width for featured servers - Increase server card size (300x180px banner, larger fonts and spacing) - Simplify layout from 2-column grid to single full-width container - Discord button opens external browser with server invite link * package version to 2.2.1 Update package.json version from 2.2.0 to 2.2.1 to publish a patch release. * fix: add game_running_marker to prevent duplicate launches * Add smart proxy with direct-fallback and logging * fix: remove duplicate check * fix: cache invalidation from .env prevents multiple launch attempts for all env related, it is necessary to clear cache first, otherwise on few launch attempts the game wouldn't run * fix: redact proxy_url and remove timed out emoji * Prepare Release v2.2.1 * docs: enhance bug report template with placeholders and options Updated the bug report template to include placeholders and additional Linux distributions. * chore revise windows prerequisites and changelog Updated prerequisites and changelog for version 2.2.1. * chore: improvise badges, relocate star history, fix discord links * chore: fix release notes for v2.2.1 --------- Co-authored-by: TalesAmaral <57869141+TalesAmaral@users.noreply.github.com> Co-authored-by: walti0 <95646872+walti0@users.noreply.github.com> Co-authored-by: AMIAY <letudiantenrap.collab@gmail.com> Co-authored-by: sanasol <mail@sanasol.ws> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: Terromur <79866197+Terromur@users.noreply.github.com> Co-authored-by: Zakhar Smokotov <zaharb840@gmail.com> Co-authored-by: xSamiVS <samtaiebc@gmail.com> Co-authored-by: MetricsLite <66024355+MetricsLite@users.noreply.github.com>
This commit is contained in:
Fazri Gading
@@ -2,6 +2,9 @@ const fs = require('fs');
|
||||
const path = require('path');
|
||||
const os = require('os');
|
||||
|
||||
// =============================================================================
|
||||
// UUID PERSISTENCE FIX - Atomic writes, backups, validation
|
||||
// =============================================================================
|
||||
|
||||
// Default auth domain - can be overridden by env var or config
|
||||
const DEFAULT_AUTH_DOMAIN = 'auth.sanasol.ws';
|
||||
@@ -49,57 +52,443 @@ function getAppDir() {
|
||||
}
|
||||
|
||||
const CONFIG_FILE = path.join(getAppDir(), 'config.json');
|
||||
const CONFIG_BACKUP = path.join(getAppDir(), 'config.json.bak');
|
||||
const CONFIG_TEMP = path.join(getAppDir(), 'config.json.tmp');
|
||||
|
||||
// =============================================================================
|
||||
// CONFIG VALIDATION
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Validate config structure - ensures critical data is intact
|
||||
*/
|
||||
function validateConfig(config) {
|
||||
if (!config || typeof config !== 'object') {
|
||||
return false;
|
||||
}
|
||||
// If userUuids exists, it must be an object
|
||||
if (config.userUuids !== undefined && typeof config.userUuids !== 'object') {
|
||||
return false;
|
||||
}
|
||||
// If username exists, it must be a non-empty string
|
||||
if (config.username !== undefined && (typeof config.username !== 'string')) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// CONFIG LOADING - With backup recovery
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Load config with automatic backup recovery
|
||||
* Never returns empty object silently if data existed before
|
||||
*/
|
||||
function loadConfig() {
|
||||
// Try primary config first
|
||||
try {
|
||||
if (fs.existsSync(CONFIG_FILE)) {
|
||||
return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
|
||||
const data = fs.readFileSync(CONFIG_FILE, 'utf8');
|
||||
if (data.trim()) {
|
||||
const config = JSON.parse(data);
|
||||
if (validateConfig(config)) {
|
||||
return config;
|
||||
}
|
||||
console.warn('[Config] Primary config invalid structure, trying backup...');
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.log('Notice: could not load config:', err.message);
|
||||
console.error('[Config] Failed to load primary config:', err.message);
|
||||
}
|
||||
|
||||
// Try backup config
|
||||
try {
|
||||
if (fs.existsSync(CONFIG_BACKUP)) {
|
||||
const data = fs.readFileSync(CONFIG_BACKUP, 'utf8');
|
||||
if (data.trim()) {
|
||||
const config = JSON.parse(data);
|
||||
if (validateConfig(config)) {
|
||||
console.log('[Config] Recovered from backup successfully');
|
||||
// Restore primary from backup
|
||||
try {
|
||||
fs.writeFileSync(CONFIG_FILE, data, 'utf8');
|
||||
console.log('[Config] Primary config restored from backup');
|
||||
} catch (restoreErr) {
|
||||
console.error('[Config] Failed to restore primary from backup:', restoreErr.message);
|
||||
}
|
||||
return config;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('[Config] Failed to load backup config:', err.message);
|
||||
}
|
||||
|
||||
// No valid config - return empty (fresh install)
|
||||
console.log('[Config] No valid config found - fresh install');
|
||||
return {};
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// CONFIG SAVING - Atomic writes with backup
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Save config atomically with backup
|
||||
* Uses temp file + rename pattern to prevent corruption
|
||||
* Creates backup before overwriting
|
||||
*/
|
||||
function saveConfig(update) {
|
||||
try {
|
||||
const configDir = path.dirname(CONFIG_FILE);
|
||||
if (!fs.existsSync(configDir)) {
|
||||
fs.mkdirSync(configDir, { recursive: true });
|
||||
const maxRetries = 3;
|
||||
let lastError;
|
||||
|
||||
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
||||
try {
|
||||
const configDir = path.dirname(CONFIG_FILE);
|
||||
if (!fs.existsSync(configDir)) {
|
||||
fs.mkdirSync(configDir, { recursive: true });
|
||||
}
|
||||
|
||||
// Load current config
|
||||
const currentConfig = loadConfig();
|
||||
const newConfig = { ...currentConfig, ...update };
|
||||
const data = JSON.stringify(newConfig, null, 2);
|
||||
|
||||
// 1. Write to temp file first
|
||||
fs.writeFileSync(CONFIG_TEMP, data, 'utf8');
|
||||
|
||||
// 2. Verify temp file is valid JSON
|
||||
const verification = JSON.parse(fs.readFileSync(CONFIG_TEMP, 'utf8'));
|
||||
if (!validateConfig(verification)) {
|
||||
throw new Error('Config validation failed after write');
|
||||
}
|
||||
|
||||
// 3. Backup current config (if exists and valid)
|
||||
if (fs.existsSync(CONFIG_FILE)) {
|
||||
try {
|
||||
const currentData = fs.readFileSync(CONFIG_FILE, 'utf8');
|
||||
if (currentData.trim()) {
|
||||
fs.writeFileSync(CONFIG_BACKUP, currentData, 'utf8');
|
||||
}
|
||||
} catch (backupErr) {
|
||||
console.warn('[Config] Could not create backup:', backupErr.message);
|
||||
// Continue anyway - saving new config is more important
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Atomic rename (this is the critical operation)
|
||||
fs.renameSync(CONFIG_TEMP, CONFIG_FILE);
|
||||
|
||||
return true;
|
||||
} catch (err) {
|
||||
lastError = err;
|
||||
console.error(`[Config] Save attempt ${attempt}/${maxRetries} failed:`, err.message);
|
||||
|
||||
// Clean up temp file on failure
|
||||
try {
|
||||
if (fs.existsSync(CONFIG_TEMP)) {
|
||||
fs.unlinkSync(CONFIG_TEMP);
|
||||
}
|
||||
} catch (cleanupErr) {
|
||||
// Ignore cleanup errors
|
||||
}
|
||||
|
||||
if (attempt < maxRetries) {
|
||||
// Small delay before retry
|
||||
const delay = attempt * 100;
|
||||
const start = Date.now();
|
||||
while (Date.now() - start < delay) {
|
||||
// Busy wait (sync delay)
|
||||
}
|
||||
}
|
||||
}
|
||||
const config = loadConfig();
|
||||
const next = { ...config, ...update };
|
||||
fs.writeFileSync(CONFIG_FILE, JSON.stringify(next, null, 2), 'utf8');
|
||||
} catch (err) {
|
||||
console.log('Notice: could not save config:', err.message);
|
||||
}
|
||||
|
||||
// All retries failed - this is critical
|
||||
console.error('[Config] CRITICAL: Failed to save config after all retries:', lastError.message);
|
||||
throw new Error(`Failed to save config: ${lastError.message}`);
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// USERNAME MANAGEMENT - No silent fallbacks
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Save username to config
|
||||
* When changing username, the UUID is preserved (rename, not new identity)
|
||||
* Validates username before saving
|
||||
*/
|
||||
function saveUsername(username) {
|
||||
saveConfig({ username: username || 'Player' });
|
||||
if (!username || typeof username !== 'string') {
|
||||
throw new Error('Invalid username: must be a non-empty string');
|
||||
}
|
||||
const newName = username.trim();
|
||||
if (!newName) {
|
||||
throw new Error('Invalid username: cannot be empty or whitespace');
|
||||
}
|
||||
if (newName.length > 16) {
|
||||
throw new Error('Invalid username: must be 16 characters or less');
|
||||
}
|
||||
|
||||
const config = loadConfig();
|
||||
const currentName = config.username ? config.username.trim() : null;
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
// Check if we're actually changing the username (case-insensitive comparison)
|
||||
const isRename = currentName && currentName.toLowerCase() !== newName.toLowerCase();
|
||||
|
||||
if (isRename) {
|
||||
// Find the UUID for the current username
|
||||
const currentKey = Object.keys(userUuids).find(
|
||||
k => k.toLowerCase() === currentName.toLowerCase()
|
||||
);
|
||||
|
||||
if (currentKey && userUuids[currentKey]) {
|
||||
// Check if target username already exists (would be a different identity)
|
||||
const targetKey = Object.keys(userUuids).find(
|
||||
k => k.toLowerCase() === newName.toLowerCase()
|
||||
);
|
||||
|
||||
if (targetKey) {
|
||||
// Target username already exists - this is switching identity, not renaming
|
||||
console.log(`[Config] Switching to existing identity: "${newName}" (UUID already exists)`);
|
||||
} else {
|
||||
// Rename: move UUID from old name to new name
|
||||
const uuid = userUuids[currentKey];
|
||||
delete userUuids[currentKey];
|
||||
userUuids[newName] = uuid;
|
||||
console.log(`[Config] Renamed identity: "${currentKey}" → "${newName}" (UUID preserved: ${uuid})`);
|
||||
}
|
||||
}
|
||||
} else if (currentName && currentName !== newName) {
|
||||
// Case change only - update the key to preserve the new casing
|
||||
const currentKey = Object.keys(userUuids).find(
|
||||
k => k.toLowerCase() === currentName.toLowerCase()
|
||||
);
|
||||
if (currentKey && currentKey !== newName) {
|
||||
const uuid = userUuids[currentKey];
|
||||
delete userUuids[currentKey];
|
||||
userUuids[newName] = uuid;
|
||||
console.log(`[Config] Updated username case: "${currentKey}" → "${newName}"`);
|
||||
}
|
||||
}
|
||||
|
||||
// Save both username and updated userUuids
|
||||
saveConfig({ username: newName, userUuids });
|
||||
console.log(`[Config] Username saved: "${newName}"`);
|
||||
return newName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load username from config
|
||||
* Returns null if no username set (caller must handle)
|
||||
*/
|
||||
function loadUsername() {
|
||||
const config = loadConfig();
|
||||
return config.username || 'Player';
|
||||
const username = config.username;
|
||||
if (username && typeof username === 'string' && username.trim()) {
|
||||
return username.trim();
|
||||
}
|
||||
return null; // No username set - caller must handle this
|
||||
}
|
||||
|
||||
/**
|
||||
* Load username with fallback to 'Player'
|
||||
* Use this only for display purposes, NOT for UUID lookup
|
||||
*/
|
||||
function loadUsernameWithDefault() {
|
||||
return loadUsername() || 'Player';
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if username is configured
|
||||
*/
|
||||
function hasUsername() {
|
||||
return loadUsername() !== null;
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// UUID MANAGEMENT - Persistent and safe
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Normalize username for UUID lookup (case-insensitive, trimmed)
|
||||
*/
|
||||
function normalizeUsername(username) {
|
||||
if (!username || typeof username !== 'string') return null;
|
||||
return username.trim().toLowerCase();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get UUID for a username
|
||||
* Creates new UUID only if user explicitly doesn't exist
|
||||
* Uses case-insensitive lookup to prevent duplicates, but preserves original case for display
|
||||
*/
|
||||
function getUuidForUser(username) {
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
|
||||
if (!username || typeof username !== 'string' || !username.trim()) {
|
||||
throw new Error('Cannot get UUID: username is required');
|
||||
}
|
||||
|
||||
const displayName = username.trim();
|
||||
const normalizedLookup = displayName.toLowerCase();
|
||||
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
if (userUuids[username]) {
|
||||
return userUuids[username];
|
||||
// Case-insensitive lookup - find existing key regardless of case
|
||||
const existingKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
|
||||
if (existingKey) {
|
||||
// Found existing - return UUID, update display name if case changed
|
||||
const existingUuid = userUuids[existingKey];
|
||||
|
||||
// If user typed different case, update the key to new case (preserving UUID)
|
||||
if (existingKey !== displayName) {
|
||||
console.log(`[Config] Updating username case: "${existingKey}" → "${displayName}"`);
|
||||
delete userUuids[existingKey];
|
||||
userUuids[displayName] = existingUuid;
|
||||
saveConfig({ userUuids });
|
||||
}
|
||||
|
||||
return existingUuid;
|
||||
}
|
||||
|
||||
// Create new UUID for new user - store with original case
|
||||
const newUuid = uuidv4();
|
||||
userUuids[username] = newUuid;
|
||||
userUuids[displayName] = newUuid;
|
||||
saveConfig({ userUuids });
|
||||
console.log(`[Config] Created new UUID for "${displayName}": ${newUuid}`);
|
||||
|
||||
return newUuid;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get current user's UUID (based on saved username)
|
||||
*/
|
||||
function getCurrentUuid() {
|
||||
const username = loadUsername();
|
||||
if (!username) {
|
||||
throw new Error('Cannot get current UUID: no username configured');
|
||||
}
|
||||
return getUuidForUser(username);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all UUID mappings (raw object)
|
||||
*/
|
||||
function getAllUuidMappings() {
|
||||
const config = loadConfig();
|
||||
return config.userUuids || {};
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all UUID mappings as array with current user flag
|
||||
*/
|
||||
function getAllUuidMappingsArray() {
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
const currentUsername = loadUsername();
|
||||
// Case-insensitive comparison for isCurrent
|
||||
const normalizedCurrent = currentUsername ? currentUsername.toLowerCase() : null;
|
||||
|
||||
return Object.entries(userUuids).map(([username, uuid]) => ({
|
||||
username, // Original case preserved
|
||||
uuid,
|
||||
isCurrent: username.toLowerCase() === normalizedCurrent
|
||||
}));
|
||||
}
|
||||
|
||||
/**
|
||||
* Set UUID for a specific user
|
||||
* Validates UUID format before saving
|
||||
* Preserves original case of username
|
||||
*/
|
||||
function setUuidForUser(username, uuid) {
|
||||
const { validate: validateUuid } = require('uuid');
|
||||
|
||||
if (!username || typeof username !== 'string' || !username.trim()) {
|
||||
throw new Error('Invalid username');
|
||||
}
|
||||
|
||||
if (!validateUuid(uuid)) {
|
||||
throw new Error('Invalid UUID format');
|
||||
}
|
||||
|
||||
const displayName = username.trim();
|
||||
const normalizedLookup = displayName.toLowerCase();
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
// Remove any existing entry with same name (case-insensitive)
|
||||
const existingKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
if (existingKey) {
|
||||
delete userUuids[existingKey];
|
||||
}
|
||||
|
||||
// Store with original case
|
||||
userUuids[displayName] = uuid;
|
||||
saveConfig({ userUuids });
|
||||
|
||||
console.log(`[Config] UUID set for "${displayName}": ${uuid}`);
|
||||
return uuid;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a new UUID (without saving)
|
||||
*/
|
||||
function generateNewUuid() {
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
return uuidv4();
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete UUID for a specific user
|
||||
* Uses case-insensitive lookup
|
||||
*/
|
||||
function deleteUuidForUser(username) {
|
||||
if (!username || typeof username !== 'string') {
|
||||
throw new Error('Invalid username');
|
||||
}
|
||||
|
||||
const normalizedLookup = username.trim().toLowerCase();
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
// Case-insensitive lookup
|
||||
const existingKey = Object.keys(userUuids).find(k => k.toLowerCase() === normalizedLookup);
|
||||
|
||||
if (existingKey) {
|
||||
delete userUuids[existingKey];
|
||||
saveConfig({ userUuids });
|
||||
console.log(`[Config] UUID deleted for "${username}"`);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset current user's UUID (generates new one)
|
||||
*/
|
||||
function resetCurrentUserUuid() {
|
||||
const username = loadUsername();
|
||||
if (!username) {
|
||||
throw new Error('Cannot reset UUID: no username configured');
|
||||
}
|
||||
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
const newUuid = uuidv4();
|
||||
|
||||
return setUuidForUser(username, newUuid);
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// JAVA PATH MANAGEMENT
|
||||
// =============================================================================
|
||||
|
||||
function saveJavaPath(javaPath) {
|
||||
const trimmed = (javaPath || '').trim();
|
||||
saveConfig({ javaPath: trimmed });
|
||||
@@ -120,6 +509,10 @@ function loadJavaPath() {
|
||||
return config.javaPath || '';
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// INSTALL PATH MANAGEMENT
|
||||
// =============================================================================
|
||||
|
||||
function saveInstallPath(installPath) {
|
||||
const trimmed = (installPath || '').trim();
|
||||
saveConfig({ installPath: trimmed });
|
||||
@@ -130,6 +523,10 @@ function loadInstallPath() {
|
||||
return config.installPath || '';
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// DISCORD RPC SETTINGS
|
||||
// =============================================================================
|
||||
|
||||
function saveDiscordRPC(enabled) {
|
||||
saveConfig({ discordRPC: !!enabled });
|
||||
}
|
||||
@@ -139,6 +536,10 @@ function loadDiscordRPC() {
|
||||
return config.discordRPC !== undefined ? config.discordRPC : true;
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// LANGUAGE SETTINGS
|
||||
// =============================================================================
|
||||
|
||||
function saveLanguage(language) {
|
||||
saveConfig({ language: language || 'en' });
|
||||
}
|
||||
@@ -148,6 +549,10 @@ function loadLanguage() {
|
||||
return config.language || 'en';
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// LAUNCHER SETTINGS
|
||||
// =============================================================================
|
||||
|
||||
function saveCloseLauncherOnStart(enabled) {
|
||||
saveConfig({ closeLauncherOnStart: !!enabled });
|
||||
}
|
||||
@@ -166,31 +571,38 @@ function loadLauncherHardwareAcceleration() {
|
||||
return config.launcherHardwareAcceleration !== undefined ? config.launcherHardwareAcceleration : true;
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// MODS MANAGEMENT
|
||||
// =============================================================================
|
||||
|
||||
function saveModsToConfig(mods) {
|
||||
try {
|
||||
const config = loadConfig();
|
||||
|
||||
// Config migration handles structure, but mod saves must go to the ACTIVE profile.
|
||||
// Global installedMods is kept mainly for reference/migration.
|
||||
// The profile is the source of truth for enabled mods.
|
||||
|
||||
|
||||
if (config.activeProfileId && config.profiles && config.profiles[config.activeProfileId]) {
|
||||
config.profiles[config.activeProfileId].mods = mods;
|
||||
} else {
|
||||
// Fallback for legacy or no-profile state
|
||||
config.installedMods = mods;
|
||||
}
|
||||
|
||||
// Use atomic save
|
||||
const configDir = path.dirname(CONFIG_FILE);
|
||||
if (!fs.existsSync(configDir)) {
|
||||
fs.mkdirSync(configDir, { recursive: true });
|
||||
}
|
||||
|
||||
fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
|
||||
console.log('Mods saved to config.json');
|
||||
// Write atomically
|
||||
const data = JSON.stringify(config, null, 2);
|
||||
fs.writeFileSync(CONFIG_TEMP, data, 'utf8');
|
||||
if (fs.existsSync(CONFIG_FILE)) {
|
||||
fs.copyFileSync(CONFIG_FILE, CONFIG_BACKUP);
|
||||
}
|
||||
fs.renameSync(CONFIG_TEMP, CONFIG_FILE);
|
||||
|
||||
console.log('[Config] Mods saved successfully');
|
||||
} catch (error) {
|
||||
console.error('Error saving mods to config:', error);
|
||||
console.error('[Config] Error saving mods:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -198,25 +610,34 @@ function loadModsFromConfig() {
|
||||
try {
|
||||
const config = loadConfig();
|
||||
|
||||
// Prefer Active Profile
|
||||
if (config.activeProfileId && config.profiles && config.profiles[config.activeProfileId]) {
|
||||
return config.profiles[config.activeProfileId].mods || [];
|
||||
}
|
||||
|
||||
return config.installedMods || [];
|
||||
} catch (error) {
|
||||
console.error('Error loading mods from config:', error);
|
||||
console.error('[Config] Error loading mods:', error);
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// FIRST LAUNCH DETECTION - FIXED
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Check if this is the first launch
|
||||
* FIXED: Was always returning true due to bug
|
||||
*/
|
||||
function isFirstLaunch() {
|
||||
const config = loadConfig();
|
||||
|
||||
// If explicitly marked, use that
|
||||
if ('hasLaunchedBefore' in config) {
|
||||
return !config.hasLaunchedBefore;
|
||||
}
|
||||
|
||||
// Check for any existing user data
|
||||
const hasUserData = config.installPath || config.username || config.javaPath ||
|
||||
config.chatUsername || config.userUuids ||
|
||||
Object.keys(config).length > 0;
|
||||
@@ -225,65 +646,17 @@ function isFirstLaunch() {
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
// FIXED: Was returning true here, should be false
|
||||
return false;
|
||||
}
|
||||
|
||||
function markAsLaunched() {
|
||||
saveConfig({ hasLaunchedBefore: true, firstLaunchDate: new Date().toISOString() });
|
||||
}
|
||||
|
||||
// UUID Management Functions
|
||||
function getCurrentUuid() {
|
||||
const username = loadUsername();
|
||||
return getUuidForUser(username);
|
||||
}
|
||||
|
||||
function getAllUuidMappings() {
|
||||
const config = loadConfig();
|
||||
return config.userUuids || {};
|
||||
}
|
||||
|
||||
function setUuidForUser(username, uuid) {
|
||||
const { v4: uuidv4, validate: validateUuid } = require('uuid');
|
||||
|
||||
// Validate UUID format
|
||||
if (!validateUuid(uuid)) {
|
||||
throw new Error('Invalid UUID format');
|
||||
}
|
||||
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
userUuids[username] = uuid;
|
||||
saveConfig({ userUuids });
|
||||
|
||||
return uuid;
|
||||
}
|
||||
|
||||
function generateNewUuid() {
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
return uuidv4();
|
||||
}
|
||||
|
||||
function deleteUuidForUser(username) {
|
||||
const config = loadConfig();
|
||||
const userUuids = config.userUuids || {};
|
||||
|
||||
if (userUuids[username]) {
|
||||
delete userUuids[username];
|
||||
saveConfig({ userUuids });
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function resetCurrentUserUuid() {
|
||||
const username = loadUsername();
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
const newUuid = uuidv4();
|
||||
|
||||
return setUuidForUser(username, newUuid);
|
||||
}
|
||||
// =============================================================================
|
||||
// GPU PREFERENCE
|
||||
// =============================================================================
|
||||
|
||||
function saveGpuPreference(gpuPreference) {
|
||||
saveConfig({ gpuPreference: gpuPreference || 'auto' });
|
||||
@@ -294,6 +667,10 @@ function loadGpuPreference() {
|
||||
return config.gpuPreference || 'auto';
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// VERSION MANAGEMENT
|
||||
// =============================================================================
|
||||
|
||||
function saveVersionClient(versionClient) {
|
||||
saveConfig({ version_client: versionClient });
|
||||
}
|
||||
@@ -306,7 +683,7 @@ function loadVersionClient() {
|
||||
function saveVersionBranch(versionBranch) {
|
||||
const branch = versionBranch || 'release';
|
||||
if (branch !== 'release' && branch !== 'pre-release') {
|
||||
console.warn(`Invalid branch "${branch}", defaulting to "release"`);
|
||||
console.warn(`[Config] Invalid branch "${branch}", defaulting to "release"`);
|
||||
saveConfig({ version_branch: 'release' });
|
||||
} else {
|
||||
saveConfig({ version_branch: branch });
|
||||
@@ -318,50 +695,98 @@ function loadVersionBranch() {
|
||||
return config.version_branch || 'release';
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// READY STATE - For UI to check before allowing launch
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Check if launcher is ready to launch game
|
||||
* Returns object with ready state and any issues
|
||||
*/
|
||||
function checkLaunchReady() {
|
||||
const issues = [];
|
||||
|
||||
const username = loadUsername();
|
||||
if (!username) {
|
||||
issues.push('No username configured');
|
||||
} else if (username === 'Player') {
|
||||
issues.push('Using default username "Player"');
|
||||
}
|
||||
|
||||
return {
|
||||
ready: issues.length === 0,
|
||||
hasUsername: !!username,
|
||||
username: username,
|
||||
issues: issues
|
||||
};
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// EXPORTS
|
||||
// =============================================================================
|
||||
|
||||
module.exports = {
|
||||
// Core config
|
||||
loadConfig,
|
||||
saveConfig,
|
||||
validateConfig,
|
||||
|
||||
// Username (no silent fallbacks)
|
||||
saveUsername,
|
||||
loadUsername,
|
||||
loadUsernameWithDefault,
|
||||
hasUsername,
|
||||
|
||||
// UUID management
|
||||
getUuidForUser,
|
||||
saveJavaPath,
|
||||
loadJavaPath,
|
||||
saveInstallPath,
|
||||
loadInstallPath,
|
||||
saveDiscordRPC,
|
||||
loadDiscordRPC,
|
||||
saveLanguage,
|
||||
loadLanguage,
|
||||
saveModsToConfig,
|
||||
loadModsFromConfig,
|
||||
isFirstLaunch,
|
||||
markAsLaunched,
|
||||
CONFIG_FILE,
|
||||
// Auth server exports
|
||||
getAuthServerUrl,
|
||||
getAuthDomain,
|
||||
saveAuthDomain,
|
||||
// UUID Management exports
|
||||
getCurrentUuid,
|
||||
getAllUuidMappings,
|
||||
getAllUuidMappingsArray,
|
||||
setUuidForUser,
|
||||
generateNewUuid,
|
||||
deleteUuidForUser,
|
||||
resetCurrentUserUuid,
|
||||
// GPU Preference exports
|
||||
saveGpuPreference,
|
||||
loadGpuPreference,
|
||||
// Close Launcher export
|
||||
|
||||
// Java/Install paths
|
||||
saveJavaPath,
|
||||
loadJavaPath,
|
||||
saveInstallPath,
|
||||
loadInstallPath,
|
||||
|
||||
// Settings
|
||||
saveDiscordRPC,
|
||||
loadDiscordRPC,
|
||||
saveLanguage,
|
||||
loadLanguage,
|
||||
saveCloseLauncherOnStart,
|
||||
loadCloseLauncherOnStart,
|
||||
|
||||
// Hardware Acceleration functions
|
||||
saveLauncherHardwareAcceleration,
|
||||
loadLauncherHardwareAcceleration,
|
||||
|
||||
// Version Management exports
|
||||
// Mods
|
||||
saveModsToConfig,
|
||||
loadModsFromConfig,
|
||||
|
||||
// Launch state
|
||||
isFirstLaunch,
|
||||
markAsLaunched,
|
||||
checkLaunchReady,
|
||||
|
||||
// Auth server
|
||||
getAuthServerUrl,
|
||||
getAuthDomain,
|
||||
saveAuthDomain,
|
||||
|
||||
// GPU
|
||||
saveGpuPreference,
|
||||
loadGpuPreference,
|
||||
|
||||
// Version
|
||||
saveVersionClient,
|
||||
loadVersionClient,
|
||||
saveVersionBranch,
|
||||
loadVersionBranch
|
||||
loadVersionBranch,
|
||||
|
||||
// Constants
|
||||
CONFIG_FILE
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user