trying

2026-02-26 02:31:46 -03:00 · 2026-01-25 13:31:08 +01:00
parent f07e4a2004
commit b11b78f7dc
13 changed files with 465 additions and 490 deletions
--- a/GUI/index.html
+++ b/GUI/index.html
@@ -635,20 +635,6 @@
        </div>
    </div>

-    <!-- Installation effects overlay -->
-    <div id="installationEffects" class="installation-effects" style="display: none;">
-        <div class="space-effects">
-            <div class="warp-line"></div>
-            <div class="warp-line"></div>
-            <div class="warp-line"></div>
-            <div class="warp-line"></div>
-            <div class="warp-line"></div>
-            <div class="warp-line"></div>
-            <div class="warp-line"></div>
-            <div class="warp-line"></div>
-        </div>
-    </div>
-
    <div id="chatUsernameModal" class="chat-username-modal" style="display: none;">
        <div class="chat-username-modal-content">
            <div class="chat-username-modal-header">
--- a/GUI/js/mods.js
+++ b/GUI/js/mods.js
@@ -1,5 +1,5 @@

-let CF_API_KEY = "$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32";
+let API_KEY = "$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32";
 const CURSEFORGE_API = 'https://api.curseforge.com/v1';
 const HYTALE_GAME_ID = 70216;

@@ -12,7 +12,9 @@ let modsTotalPages = 1;

 export async function initModsManager() {
  try {
-    console.log('Loaded API Key:', CF_API_KEY ? 'Yes' : 'No');
+    if (window.electronAPI && window.electronAPI.getEnvVar) {
+      console.log('Loaded API Key:', API_KEY ? 'Yes' : 'No');
+    }
  } catch (err) {
    console.error('Failed to load API Key:', err);
  }
@@ -194,7 +196,7 @@ async function loadBrowseMods() {
  browseContainer.innerHTML = `<div class="loading-mods"><div class="loading-spinner"></div><span>${window.i18n ? window.i18n.t('mods.loadingMods') : 'Loading mods from CurseForge...'}</span></div>`;

  try {
-    if (!CF_API_KEY || CF_API_KEY.length < 10) {
+    if (!API_KEY || API_KEY.length < 10) {
      browseContainer.innerHTML = `
        <div class=\"empty-browse-mods\">
          <i class=\"fas fa-key\"></i>
@@ -221,7 +223,7 @@ async function loadBrowseMods() {

    const response = await fetch(url, {
      headers: {
-        'x-api-key': CF_API_KEY,
+        'x-api-key': API_KEY,
        'Accept': 'application/json'
      }
    });
--- a/GUI/js/settings.js
+++ b/GUI/js/settings.js
@@ -207,11 +207,6 @@ function setupSettingsElements() {
  }


-  if (closeLauncherCheck) {
-    closeLauncherCheck.addEventListener('change', saveCloseLauncher);
-  }
-
-
  // UUID event listeners
  if (copyUuidBtn) {
    copyUuidBtn.addEventListener('click', copyCurrentUuid);
@@ -397,31 +392,6 @@ async function loadCloseLauncher() {
 }


-async function saveCloseLauncher() {
-  try {
-    if (window.electronAPI && window.electronAPI.saveCloseLauncher && closeLauncherCheck) {
-      const enabled = closeLauncherCheck.checked;
-      await window.electronAPI.saveCloseLauncher(enabled);
-    }
-  } catch (error) {
-    console.error('Error saving close launcher setting:', error);
-  }
-}
-
-async function loadCloseLauncher() {
-  try {
-    if (window.electronAPI && window.electronAPI.loadCloseLauncher) {
-      const enabled = await window.electronAPI.loadCloseLauncher();
-      if (closeLauncherCheck) {
-        closeLauncherCheck.checked = enabled;
-      }
-    }
-  } catch (error) {
-    console.error('Error loading close launcher setting:', error);
-  }
-}
-
-
 async function savePlayerName() {
  try {
    if (!window.electronAPI || !settingsPlayerName) return;
--- a/GUI/js/ui.js
+++ b/GUI/js/ui.js
@@ -638,9 +638,6 @@ function setupUI() {
  // Setup retry button
  setupRetryButton();

-  // Setup draggable progress bar
-  setupProgressDrag();
-
  lockPlayButton(true);

  setTimeout(() => {
@@ -741,6 +738,7 @@ window.LauncherUI = {

 // Make installation effects globally available

+
 // Draggable progress bar functionality
 function setupProgressDrag() {
  if (!progressOverlay) return;
--- a/backend/appUpdater.js
+++ b/backend/appUpdater.js
@@ -15,12 +15,6 @@ class AppUpdater {
  }

  setupAutoUpdater() {
-    // Enable dev mode for testing (reads dev-app-update.yml)
-    // Only enable in development, not in production builds
-    if (process.env.NODE_ENV === 'development' || !app.isPackaged) {
-      autoUpdater.forceDevUpdateConfig = true;
-      console.log('Dev update mode enabled - using dev-app-update.yml');
-    }

    // Configure logger for electron-updater
    // Create a compatible logger interface
--- a/backend/managers/javaManager.js
+++ b/backend/managers/javaManager.js
@@ -406,5 +406,6 @@ module.exports = {
  getJavaDetection,
  downloadJRE,
  extractJRE,
+  retryJREDownload,
  JAVA_EXECUTABLE
 };
--- a/backend/managers/modManager.js
+++ b/backend/managers/modManager.js
@@ -6,7 +6,7 @@ const { getModsPath, getProfilesDir } = require('../core/paths');
 const { saveModsToConfig, loadModsFromConfig } = require('../core/config');
 const profileManager = require('./profileManager');

-const CF_API_KEY = "$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32";
+const API_KEY = "$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32";

 /**
 * Get the physical mods path for a specific profile.
@@ -120,7 +120,7 @@ async function downloadMod(modInfo) {
    if (!downloadUrl && modInfo.fileId && modInfo.modId) {
      const response = await axios.get(`https://api.curseforge.com/v1/mods/${modInfo.modId || modInfo.curseForgeId}/files/${modInfo.fileId || modInfo.curseForgeFileId}`, {
        headers: {
-          'x-api-key': modInfo.apiKey || CF_API_KEY,
+          'x-api-key': modInfo.apiKey || API_KEY,
          'Accept': 'application/json'
        }
      });
@@ -393,7 +393,7 @@ async function syncModsForCurrentProfile() {
                ...mod,
                modId: mod.curseForgeId,
                fileId: mod.curseForgeFileId || mod.fileId,
-                apiKey: CF_API_KEY
+                apiKey: API_KEY
              });
            } catch (err) {
              console.error(`[ModManager] Auto-repair failed for "${mod.name}": ${err.message}`);
--- a/backend/utils/fileManager.js
+++ b/backend/utils/fileManager.js
@@ -103,40 +103,36 @@ async function downloadFile(url, dest, progressCallback, maxRetries = 5) {
      }

      const headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-        'Accept': '*/*',
-        'Accept-Language': 'en-US,en;q=0.9',
-        'Referer': 'https://launcher.hytale.com/',
-        'Connection': 'keep-alive'
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+        'Accept': '*/*'
      };
      
-      // Add Range header for resume capability
+      // Add Range header ONLY if resuming (startByte > 0)
      if (startByte > 0) {
        headers['Range'] = `bytes=${startByte}-`;
+        console.log(`Adding Range header: bytes=${startByte}-`);
+      } else {
+        console.log('Fresh download, no Range header');
      }

      const response = await axios({
        method: 'GET',
        url: url,
        responseType: 'stream',
-        timeout: 60000, // 60 secondes timeout
+        timeout: 60000,
        signal: controller.signal,
        headers: headers,
-        // Configuration Axios pour la robustesse réseau
        validateStatus: function (status) {
-          // Accept both 200 (full download) and 206 (partial content for resume)
          return (status >= 200 && status < 300) || status === 206;
        },
-        // Retry configuration
        maxRedirects: 5,
-        // Network resilience
-        family: 4 // Force IPv4
+        family: 4
      });

      const contentLength = response.headers['content-length'];
-      const totalSize = contentLength ? parseInt(contentLength, 10) + startByte : 0; // Adjust for resume
-      let downloaded = startByte; // Start with existing bytes
-      lastProgressTime = Date.now(); // Update time after response received
+      const totalSize = contentLength ? parseInt(contentLength, 10) + startByte : 0;
+      let downloaded = startByte;
+      lastProgressTime = Date.now();
      const startTime = Date.now();

      // Check network status before attempting download
@@ -344,7 +340,6 @@ async function downloadFile(url, dest, progressCallback, maxRetries = 5) {
        });
      });

-      // Si on arrive ici, le téléchargement a réussi
      return;

  } catch (error) {
@@ -375,6 +370,9 @@ async function downloadFile(url, dest, progressCallback, maxRetries = 5) {
    // Enhanced file cleanup with validation
    if (fs.existsSync(dest)) {
      try {
+        // HTTP 416 = Range Not Satisfiable, delete corrupted partial file
+        const isRangeError = error.message && error.message.includes('416');
+        
        // Check if file is corrupted (small or invalid) or if error is non-resumable
        const partialStats = fs.statSync(dest);
        const isResumableError = error.message && (
@@ -387,13 +385,14 @@ async function downloadFile(url, dest, progressCallback, maxRetries = 5) {
        // Check if download appears to be complete (close to expected PWR size)
        const isPossiblyComplete = partialStats.size >= 1500 * 1024 * 1024; // >= 1.5GB
        
-        if (partialStats.size < 1024 * 1024 || (!isResumableError && !isPossiblyComplete)) {
-          // Delete if file is too small OR error is non-resumable AND not possibly complete
-          console.log(`[Cleanup] Removing PWR file (${!isResumableError && !isPossiblyComplete ? 'non-resumable error' : 'too small'}): ${(partialStats.size / 1024 / 1024).toFixed(2)} MB`);
+        if (isRangeError || partialStats.size < 1024 * 1024 || (!isResumableError && !isPossiblyComplete)) {
+          // Delete if HTTP 416 OR file is too small OR error is non-resumable AND not possibly complete
+          const reason = isRangeError ? 'HTTP 416 range error' : (!isResumableError && !isPossiblyComplete ? 'non-resumable error' : 'too small');
+          console.log(`[Cleanup] Removing file (${reason}): ${(partialStats.size / 1024 / 1024).toFixed(2)} MB`);
          fs.unlinkSync(dest);
        } else {
          // Keep the file for resume on resumable errors or if possibly complete
-          console.log(`[Resume] Keeping PWR file (${isPossiblyComplete ? 'possibly complete' : 'for resume'}): ${(partialStats.size / 1024 / 1024).toFixed(2)} MB`);
+          console.log(`[Resume] Keeping file (${isPossiblyComplete ? 'possibly complete' : 'for resume'}): ${(partialStats.size / 1024 / 1024).toFixed(2)} MB`);
        }
      } catch (cleanupError) {
        console.warn('Could not handle partial file:', cleanupError.message);
@@ -554,6 +553,17 @@ async function retryDownload(url, dest, progressCallback, previousError = null)
    fs.mkdirSync(destDir, { recursive: true });
  }
  
+  // CRITICAL: Delete partial file before manual retry to avoid HTTP 416
+  if (fs.existsSync(dest)) {
+    try {
+      const stats = fs.statSync(dest);
+      console.log(`[Retry] Deleting partial file before retry: ${(stats.size / 1024 / 1024).toFixed(2)} MB`);
+      fs.unlinkSync(dest);
+    } catch (err) {
+      console.warn('Could not delete partial file:', err.message);
+    }
+  }
+  
  try {
    await downloadFile(url, dest, progressCallback, additionalRetries);
    console.log('Manual retry successful');
--- a/icon.ico
+++ b/icon.ico
--- a/icon.png
+++ b/icon.png
--- a/main.js
+++ b/main.js
@@ -1,4 +1,5 @@
 const path = require('path');
+require('dotenv').config({ path: path.join(__dirname, '.env') });
 const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron');
 const { autoUpdater } = require('electron-updater');
 const fs = require('fs');
@@ -446,6 +447,13 @@ ipcMain.handle('launch-game', async (event, playerName, javaPath, installPath, g

 ipcMain.handle('install-game', async (event, playerName, javaPath, installPath, branch) => {
  try {
+    console.log(`[IPC] install-game called with parameters:`);
+    console.log(`  - playerName: ${playerName}`);
+    console.log(`  - javaPath: ${javaPath}`);
+    console.log(`  - installPath: ${installPath}`);
+    console.log(`  - branch: ${branch}`);
+    console.log(`[IPC] branch type: ${typeof branch}, value: ${JSON.stringify(branch)}`);
+    
    // Signal installation start
    if (mainWindow && !mainWindow.isDestroyed()) {
      mainWindow.webContents.send('installation-start');
@@ -625,6 +633,7 @@ ipcMain.handle('load-close-launcher', () => {
 });

 ipcMain.handle('select-install-path', async () => {
+
  const result = await dialog.showOpenDialog(mainWindow, {
    properties: ['openDirectory'],
    title: 'Select Installation Folder'
@@ -742,8 +751,8 @@ ipcMain.handle('retry-download', async (event, retryData) => {
      console.log('[IPC] Full JRE retry data:', JSON.stringify(retryData, null, 2));
      
      const { retryJREDownload } = require('./backend/managers/javaManager');
-      await retryJREDownload(retryData.jreUrl, jreCacheFile, progressCallback);
      const jreCacheFile = path.join(retryData.cacheDir, retryData.fileName);
+      await retryJREDownload(retryData.jreUrl, jreCacheFile, progressCallback);
      
      return { success: true };
    }
@@ -930,6 +939,10 @@ ipcMain.handle('get-local-app-data', async () => {
  return process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
 });

+ipcMain.handle('get-env-var', async (event, key) => {
+  return process.env[key];
+});
+
 ipcMain.handle('get-user-id', async () => {
  try {
    const { getOrCreatePlayerId } = require('./backend/launcher');
--- a/preload.js
+++ b/preload.js
@@ -35,6 +35,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
  openGameLocation: () => ipcRenderer.invoke('open-game-location'),
  saveSettings: (settings) => ipcRenderer.invoke('save-settings', settings),
  loadSettings: () => ipcRenderer.invoke('load-settings'),
+  getEnvVar: (key) => ipcRenderer.invoke('get-env-var', key),
  getLocalAppData: () => ipcRenderer.invoke('get-local-app-data'),
  getModsPath: () => ipcRenderer.invoke('get-mods-path'),
  loadInstalledMods: (modsPath) => ipcRenderer.invoke('load-installed-mods', modsPath),