@dimzxzzx07/mc-headless 2.2.1 → 2.2.2

package/README.md

@@ -5,7 +5,7 @@
 </div>
 
 <div align="center">
-    <img src="https://img.shields.io/badge/Version-2.2.1-2563eb?style=for-the-badge&logo=typescript" alt="Version">
+    <img src="https://img.shields.io/badge/Version-2.2.2-2563eb?style=for-the-badge&logo=typescript" alt="Version">
     <img src="https://img.shields.io/badge/License-MIT-green?style=for-the-badge&logo=open-source-initiative" alt="License">
     <img src="https://img.shields.io/badge/Node-18%2B-339933?style=for-the-badge&logo=nodedotjs" alt="Node">
     <img src="https://img.shields.io/badge/Java-Portable-007396?style=for-the-badge&logo=openjdk" alt="Java Portable">
@@ -55,7 +55,7 @@
 ## Table of Contents
 
 - [What is MC-Headless?](#what-is-mc-headless)
-- [What's New in 2.2.1](#whats-new-in-221)
+- [What's New in 2.2.2](#whats-new-in-222)
 - [Features](#features)
 - [Why MC-Headless?](#why-mc-headless)
 - [Installation](#installation)
@@ -111,19 +111,21 @@ Built specifically for developers, sysadmins, and Minecraft enthusiasts who want
 
 ---
 
-## What's New in 2.2.1
+## What's New in 2.2.2
 
-### Version 2.2.1 - March 2026
+### Version 2.2.2 - March 2026
 
-- **Pterodactyl Optimized** - Full compatibility with Pterodactyl panel
-- **No curl/wget required** - Pure Node.js downloader works everywhere
-- **Better error handling** - Clear messages for disk space issues
-- **Smaller Java downloads** - Uses JRE instead of full JDK (saves 150MB)
-- **Automatic disk space check** - Warns before downloading
-- **Improved platform detection** - Works on all Linux distros
-- **Fallback URLs** - Multiple mirrors for Java downloads
-- **Corrupted file detection** - Auto-retry on bad downloads
-- **Memory limit awareness** - Respects cgroup limits in containers
+- **Smart Java Storage** - Automatically detects Pterodactyl environment and stores Java in `/home/container/.java` instead of RAM-heavy `/tmp`
+- **Multi-Architecture Support** - Full support for x64, ARM64 (Oracle Cloud Ampere), and ARM (Raspberry Pi)
+- **Streaming Download + Extract** - Downloads and extracts Java simultaneously, saving disk space and time
+- **Partial Download Recovery** - Automatically cleans up corrupted partial downloads and retries
+- **Content-Length Verification** - Ensures downloaded files match expected size (within 95% tolerance)
+- **Rotating User-Agents** - Bypasses rate limiting with 4 different user-agent strings
+- **Smart Retry Logic** - Retries on rate limits (429), server errors (500+), and network timeouts
+- **30-Day Auto-Update** - Automatically checks and updates Java if older than 30 days
+- **Low RAM Warning** - Alerts users when storing Java in `/tmp` on systems with less than 3GB RAM
+- **Robust Redirect Handling** - Follows up to 3 redirects with proper error handling
+- **Stalled Download Detection** - Cancels and retries if no data received for 30 seconds
 
 ---
 
@@ -133,17 +135,20 @@ Built specifically for developers, sysadmins, and Minecraft enthusiasts who want
 |----------|----------|
 | **Server Types** | Paper, Purpur, Vanilla, Spigot, Forge, Fabric |
 | **Platforms** | Java Edition, Bedrock Edition, Cross-play (Geyser) |
+| **Architecture Support** | x64, ARM64, ARM (Raspberry Pi, Oracle Cloud) |
 | **Auto Setup** | Automatic Java detection, EULA acceptance, server.properties generation |
-| **Portable Java** | Download JRE to current directory, no system installation required |
+| **Portable Java** | Download JRE to `/home/container/.java` (Pterodactyl) or `/tmp/.mc-headless` |
+| **Smart Storage** | Detects Pterodactyl, warns on low RAM for /tmp usage |
+| **Streaming Download** | Download and extract simultaneously, no temporary files |
 | **Cgroups Stats** | CPU/Memory stats like Pterodactyl (30s interval) |
-| **Downloader** | Pure Node.js downloader (no curl/wget needed) |
+| **Downloader** | Pure Node.js with rotating user-agents, retry logic, stalled detection |
 | **Memory Management** | Custom memory allocation, Aikar's flags optimization |
 | **Backup System** | Automatic scheduled backups, manual backup triggers |
 | **Monitoring** | Real-time CPU/memory usage, player tracking, server events |
 | **Cross-play** | Built-in Geyser & Floodgate support for Bedrock clients |
 | **ViaVersion** | Built-in ViaVersion, ViaBackwards, ViaRewind support |
 | **SkinRestorer** | Auto-download and install SkinRestorer plugin |
-| **Pterodactyl Ready** | Optimized for panel hosting |
+| **Pterodactyl Ready** | Optimized for panel hosting with environment variable support |
 | **Termux Friendly** | Optimized for Android/Termux environments |
 | **Headless Ready** | No GUI required, perfect for servers and automation |
 | **Silent Mode** | Direct log piping for minimal CPU usage |
@@ -181,7 +186,7 @@ wget https://github.com/SkinsRestorer/SkinsRestorerX/releases/latest/download/Sk
 tail -f logs/latest.log
 ```
 
-After (MC-Headless v2.2.1)
+After (MC-Headless v2.2.2)
 
 ```javascript
 const { MinecraftServer } = require('@dimzxzzx07/mc-headless');
@@ -223,7 +228,7 @@ RAM 2 GB 4 GB or more
 Storage 2 GB 10 GB
 OS Linux, macOS, Windows, Termux Linux (production)
 
-Note: Java is auto-downloaded as portable JRE (no system installation needed)
+Note: Java is auto-downloaded as portable JRE (no system installation needed). On Pterodactyl, Java is stored in /home/container/.java to save RAM.
 
 ---
 
@@ -341,7 +346,7 @@ async function startServer() {
   server.on("ready", (info) => {
     console.clear();
     console.log(`\n==========================================`);
-    console.log(`Minecraft Server - v2.2.1`);
+    console.log(`Minecraft Server - v2.2.2`);
     console.log(` IP: ${publicIp}:${info.port}`);
     console.log(` Version: ${info.version}`);
     console.log(` Memory: ${info.memory.used}/${info.memory.max} MB`);
@@ -470,7 +475,7 @@ autoAcceptEula boolean true Automatically accept Minecraft EULA
 Java Options
 
 Option Type Default Description
-usePortableJava boolean true Download portable JRE to current directory
+usePortableJava boolean true Download portable JRE to /home/container/.java (Pterodactyl) or /tmp/.mc-headless
 javaVersion string 'auto' '17', '21', or 'auto'
 
 Memory Options
@@ -1070,12 +1075,13 @@ const server = new MinecraftServer({
 });
 ```
 
-· Downloads JRE (not full JDK) ~50MB
-· Extracts to .java/jre-{version}/ in current directory
-· Auto-cleanup after 24 hours
-· No system installation required
-· Sets JAVA_HOME and PATH automatically
-· Adds MALLOC_ARENA_MAX=2 for memory efficiency
+· Smart Storage: Automatically detects Pterodactyl environment and stores Java in /home/container/.java (disk) instead of /tmp (RAM)
+· Low RAM Warning: Alerts if storing Java in /tmp on systems with less than 3GB RAM
+· Multi-Architecture: Supports x64, ARM64 (Oracle Cloud), and ARM (Raspberry Pi)
+· Streaming Download: Downloads and extracts simultaneously, saving disk space
+· Auto-Update: Checks and updates Java if older than 30 days
+· Robust Download: Rotating user-agents, retry logic, stalled detection, size verification
+· No System Installation: Java runs from local folder, no root required
 
 Java Version Requirements
 
@@ -1170,9 +1176,18 @@ EOF
 node index.js
 ```
 
-Pterodactyl Egg Configuration
+Pterodactyl Environment Variables
+
+MC-Headless automatically detects Pterodactyl and respects these environment variables:
 
-If you want to create a custom Pterodactyl egg:
+Variable Description Default
+SERVER_PORT Server port 25565
+SERVER_MEMORY_INIT Initial memory 2G
+SERVER_MEMORY_MAX Max memory 4G
+SERVER_MOTD Message of the day "Minecraft Server"
+SERVER_IP Bind IP 0.0.0.0
+
+Pterodactyl Egg Configuration
 
 ```json
 {
@@ -1261,11 +1276,13 @@ Common Issues
 Issue Cause Solution
 Java not found Java not installed Enable usePortableJava: true
 ENOSPC: no space left Disk full Free disk space, reduce memory
-Download failed: 302 URL redirect Using Node.js downloader (fixed in v2.2.1)
+Download failed: 302 URL redirect Automatic in v2.2.2
 Port already in use Another server running Change port number
 Plugin corrupt Bad download Delete plugin and restart
 High CPU usage Too many chunks Reduce viewDistance to 4
 Out of memory RAM too low Reduce max memory or add RAM
+Java verification failed Corrupt download Automatic retry in v2.2.2
+Download stalled Slow connection Automatic retry in v2.2.2
 
 Disk Space Issues
 

package/dist/core/JavaChecker.d.ts

@@ -4,16 +4,22 @@ export interface JavaInfo {
     type: 'system' | 'portable';
 }
 export declare class JavaChecker {
-    private static logger;
     private static readonly JAVA_DIR;
     private static readonly JAVA_URLS;
+    private static getOptimalJavaDirectory;
+    private static getArch;
     static getRequiredJavaVersion(serverVersion: string): '17' | '21';
     static checkJava(): Promise<boolean>;
     static getSystemJavaPath(): string | null;
     static getSystemJavaVersion(): string | null;
-    private static downloadWithNode;
+    private static shouldUpdateJava;
+    private static downloadAndExtractWithStream;
     static getOrDownloadPortableJava(version: '17' | '21'): Promise<JavaInfo>;
     static ensureJava(serverVersion: string, usePortable?: boolean): Promise<JavaInfo>;
     static cleanupOldJava(): void;
+    static getJavaInfo(): {
+        dir: string;
+        arch: string;
+    };
 }
 //# sourceMappingURL=JavaChecker.d.ts.map

package/dist/core/JavaChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JavaChecker.d.ts","sourceRoot":"","sources":["../../src/core/JavaChecker.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;CAC/B;AAED,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAwB;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAGrE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAS/B;WAEY,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;WAUpD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;WAenC,iBAAiB,IAAI,MAAM,GAAG,IAAI;WASlC,oBAAoB,IAAI,MAAM,GAAG,IAAI;mBAc9B,gBAAgB;WAoFjB,yBAAyB,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;WAqElE,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,GAAE,OAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;WAyBvF,cAAc,IAAI,IAAI;CAkBvC"}
+{"version":3,"file":"JavaChecker.d.ts","sourceRoot":"","sources":["../../src/core/JavaChecker.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;CAC/B;AAED,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAyC;IAEzE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CA+B/B;IAEF,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAmBtC,OAAO,CAAC,MAAM,CAAC,OAAO;WAOR,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;WAUpD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;WAYnC,iBAAiB,IAAI,MAAM,GAAG,IAAI;WASlC,oBAAoB,IAAI,MAAM,GAAG,IAAI;IA2BnD,OAAO,CAAC,MAAM,CAAC,gBAAgB;mBAUV,4BAA4B;WAoI7B,yBAAyB,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;WAgElE,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,GAAE,OAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;WAoBvF,cAAc,IAAI,IAAI;WAwBtB,WAAW,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;CAM7D"}

package/dist/core/JavaChecker.js

@@ -39,22 +39,66 @@ const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 const https = __importStar(require("https"));
 const http = __importStar(require("http"));
+const os = __importStar(require("os"));
 const tar = __importStar(require("tar"));
-const Logger_1 = require("../utils/Logger");
 class JavaChecker {
-    static logger = Logger_1.Logger.getInstance();
-    static JAVA_DIR = path.join(process.cwd(), '.java');
-    // Hanya pakai URL yang reliable dan direct download
+    static JAVA_DIR = JavaChecker.getOptimalJavaDirectory();
     static JAVA_URLS = {
-        '21': [
-            'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz',
-            'https://corretto.aws/downloads/latest/amazon-corretto-21-x64-linux-jre.tar.gz'
-        ],
-        '17': [
-            'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.10_7.tar.gz',
-            'https://corretto.aws/downloads/latest/amazon-corretto-17-x64-linux-jre.tar.gz'
-        ]
+        '21': {
+            'x64': [
+                'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_x64_linux_hotspot_21.0.2_13.tar.gz',
+                'https://corretto.aws/downloads/latest/amazon-corretto-21-x64-linux-jre.tar.gz',
+                'https://download.bell-sw.com/java/21.0.2+13/bellsoft-jre21.0.2+13-linux-amd64.tar.gz'
+            ],
+            'arm64': [
+                'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.2_13.tar.gz',
+                'https://corretto.aws/downloads/latest/amazon-corretto-21-aarch64-linux-jre.tar.gz',
+                'https://download.bell-sw.com/java/21.0.2+13/bellsoft-jre21.0.2+13-linux-aarch64.tar.gz'
+            ],
+            'arm': [
+                'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_arm_linux_hotspot_21.0.2_13.tar.gz'
+            ]
+        },
+        '17': {
+            'x64': [
+                'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.10_7.tar.gz',
+                'https://corretto.aws/downloads/latest/amazon-corretto-17-x64-linux-jre.tar.gz',
+                'https://download.bell-sw.com/java/17.0.10+13/bellsoft-jre17.0.10+13-linux-amd64.tar.gz'
+            ],
+            'arm64': [
+                'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.10_7.tar.gz',
+                'https://corretto.aws/downloads/latest/amazon-corretto-17-aarch64-linux-jre.tar.gz',
+                'https://download.bell-sw.com/java/17.0.10+13/bellsoft-jre17.0.10+13-linux-aarch64.tar.gz'
+            ],
+            'arm': [
+                'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.10_7.tar.gz'
+            ]
+        }
     };
+    static getOptimalJavaDirectory() {
+        const pterodactylDir = '/home/container/.java';
+        const tmpDir = '/tmp/.mc-headless';
+        try {
+            if (fs.existsSync('/home/container')) {
+                return pterodactylDir;
+            }
+        }
+        catch {
+        }
+        const totalRamGB = os.totalmem() / 1024 / 1024 / 1024;
+        if (totalRamGB < 3) {
+            console.warn(`Warning: Low RAM (${totalRamGB.toFixed(1)} GB). Java in /tmp may cause issues.`);
+        }
+        return tmpDir;
+    }
+    static getArch() {
+        const arch = process.arch;
+        if (arch === 'arm64')
+            return 'arm64';
+        if (arch === 'arm')
+            return 'arm';
+        return 'x64';
+    }
     static getRequiredJavaVersion(serverVersion) {
         if (serverVersion.startsWith('1.21') || serverVersion === '1.21.11') {
             return '21';
@@ -68,12 +112,9 @@ class JavaChecker {
         return new Promise((resolve) => {
             (0, child_process_1.exec)('which java', (error, stdout) => {
                 if (error || !stdout.trim()) {
-                    this.logger.warning('Java is not installed in system');
                     resolve(false);
                 }
                 else {
-                    const javaPath = stdout.trim();
-                    this.logger.success(`System Java found at: ${javaPath}`);
                     resolve(true);
                 }
             });
@@ -91,131 +132,199 @@ class JavaChecker {
     static getSystemJavaVersion() {
         try {
             const output = (0, child_process_1.execSync)('java -version 2>&1').toString();
-            if (output.includes('version "21'))
+            const versionRegex = /(?:version|openjdk|java)[\s"]+(\d+)(?:\.(\d+))?/i;
+            const match = output.match(versionRegex);
+            if (match) {
+                const majorVersion = parseInt(match[1]);
+                if (majorVersion === 21)
+                    return '21';
+                if (majorVersion === 17)
+                    return '17';
+                if (majorVersion === 11)
+                    return '11';
+                if (majorVersion === 8)
+                    return '8';
+                if (majorVersion === 1 && match[2] === '8')
+                    return '8';
+            }
+            if (output.includes('version "21') || output.includes('openjdk 21'))
                 return '21';
-            if (output.includes('version "17'))
+            if (output.includes('version "17') || output.includes('openjdk 17'))
                 return '17';
-            if (output.includes('version "11'))
+            if (output.includes('version "11') || output.includes('openjdk 11'))
                 return '11';
-            if (output.includes('version "1.8'))
+            if (output.includes('version "1.8') || output.includes('openjdk 1.8'))
                 return '8';
-            const match = output.match(/version "([^"]+)"/);
-            return match ? match[1] : null;
+            return null;
         }
         catch {
             return null;
         }
     }
-    static async downloadWithNode(url, destPath) {
+    static shouldUpdateJava(javaHome) {
+        try {
+            const stats = fs.statSync(javaHome);
+            const ageInDays = (Date.now() - stats.mtimeMs) / (1000 * 60 * 60 * 24);
+            return ageInDays > 30;
+        }
+        catch {
+            return true;
+        }
+    }
+    static async downloadAndExtractWithStream(url, javaHome, retryCount = 0) {
+        const maxRetries = 3;
+        const userAgents = [
+            'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/120.0.0.0 Safari/537.36',
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/120.0.0.0 Safari/537.36',
+            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/120.0.0.0 Safari/537.36'
+        ];
         return new Promise((resolve, reject) => {
-            this.logger.info(`Downloading Java from ${url}`);
+            console.log(`Downloading Java...`);
             const protocol = url.startsWith('https') ? https : http;
+            let isDone = false;
+            let cleanup = () => {
+                if (!isDone) {
+                    isDone = true;
+                    fs.remove(javaHome).catch(() => { });
+                }
+            };
             const request = protocol.get(url, {
                 headers: {
-                    'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36'
+                    'User-Agent': userAgents[retryCount % userAgents.length],
+                    'Accept': 'application/octet-stream',
+                    'Accept-Encoding': 'gzip, deflate'
                 }
             }, (response) => {
                 if (response.statusCode === 301 || response.statusCode === 302 || response.statusCode === 307 || response.statusCode === 308) {
                     const location = response.headers.location;
-                    if (location) {
-                        this.logger.info(`Redirecting to ${location}`);
-                        this.downloadWithNode(location, destPath).then(resolve).catch(reject);
-                        return;
+                    if (location && retryCount < maxRetries) {
+                        this.downloadAndExtractWithStream(location, javaHome, retryCount + 1).then(resolve).catch(reject);
+                    }
+                    else {
+                        cleanup();
+                        reject(new Error('Redirect failed'));
                     }
-                }
-                if (response.statusCode !== 200) {
-                    reject(new Error(`Download failed: ${response.statusCode}`));
                     return;
                 }
-                const contentType = response.headers['content-type'];
-                if (contentType && contentType.includes('text/html')) {
-                    reject(new Error('Received HTML instead of binary - likely license redirect'));
+                if (response.statusCode !== 200) {
+                    if (response.statusCode === 429 && retryCount < maxRetries) {
+                        setTimeout(() => {
+                            this.downloadAndExtractWithStream(url, javaHome, retryCount + 1).then(resolve).catch(reject);
+                        }, 10000);
+                    }
+                    else if (response.statusCode && response.statusCode >= 500 && retryCount < maxRetries) {
+                        setTimeout(() => {
+                            this.downloadAndExtractWithStream(url, javaHome, retryCount + 1).then(resolve).catch(reject);
+                        }, 10000);
+                    }
+                    else {
+                        cleanup();
+                        reject(new Error(`Download failed: ${response.statusCode}`));
+                    }
                     return;
                 }
-                const file = fs.createWriteStream(destPath);
-                const totalSize = parseInt(response.headers['content-length'] || '0');
-                let downloadedSize = 0;
-                let lastPercent = 0;
-                response.on('data', (chunk) => {
-                    downloadedSize += chunk.length;
-                    if (totalSize > 0) {
-                        const percent = ((downloadedSize / totalSize) * 100).toFixed(1);
-                        if (parseFloat(percent) >= lastPercent + 5 || parseFloat(percent) >= 100) {
-                            lastPercent = parseFloat(percent);
-                            process.stdout.write(`\rDownloading Java: ${percent}% (${(downloadedSize / 1024 / 1024).toFixed(1)} MB)`);
-                        }
-                    }
+                const contentLength = response.headers['content-length'];
+                let downloadedBytes = 0;
+                fs.ensureDirSync(javaHome);
+                const extractor = tar.extract({
+                    cwd: javaHome,
+                    strip: 1
                 });
-                response.pipe(file);
-                file.on('finish', () => {
-                    process.stdout.write('\n');
-                    file.close();
-                    const stats = fs.statSync(destPath);
-                    if (stats.size < 1000000) {
-                        fs.unlinkSync(destPath);
-                        reject(new Error(`Downloaded file too small: ${stats.size} bytes - possibly HTML page`));
-                        return;
+                let extractError = null;
+                extractor.on('finish', () => {
+                    if (!isDone) {
+                        isDone = true;
+                        resolve();
                     }
-                    resolve();
                 });
-                file.on('error', (err) => {
-                    fs.unlink(destPath).catch(() => { });
+                extractor.on('error', (err) => {
+                    extractError = err;
+                    cleanup();
                     reject(err);
                 });
+                response.on('data', (chunk) => {
+                    downloadedBytes += chunk.length;
+                });
+                response.on('error', (err) => {
+                    extractor.end();
+                    cleanup();
+                    reject(err);
+                });
+                response.on('end', () => {
+                    if (contentLength) {
+                        const expected = parseInt(contentLength);
+                        if (downloadedBytes < expected * 0.95) {
+                            cleanup();
+                            reject(new Error(`Download incomplete: ${downloadedBytes} of ${expected} bytes`));
+                            return;
+                        }
+                    }
+                    extractor.on('finish', () => {
+                        if (!isDone && !extractError) {
+                            isDone = true;
+                            resolve();
+                        }
+                    });
+                });
+                response.pipe(extractor);
             });
             request.on('error', (err) => {
-                fs.unlink(destPath).catch(() => { });
-                reject(err);
+                if (retryCount < maxRetries) {
+                    setTimeout(() => {
+                        this.downloadAndExtractWithStream(url, javaHome, retryCount + 1).then(resolve).catch(reject);
+                    }, 5000);
+                }
+                else {
+                    cleanup();
+                    reject(err);
+                }
             });
             request.setTimeout(300000, () => {
                 request.destroy();
-                fs.unlink(destPath).catch(() => { });
-                reject(new Error('Download timeout after 5 minutes'));
+                cleanup();
+                reject(new Error('Download timeout'));
             });
             request.end();
         });
     }
     static async getOrDownloadPortableJava(version) {
         await fs.ensureDir(this.JAVA_DIR);
-        const javaHome = path.join(this.JAVA_DIR, `jre-${version}`);
+        const arch = this.getArch();
+        const javaHome = path.join(this.JAVA_DIR, `jre-${version}-${arch}`);
         const javaBin = path.join(javaHome, 'bin', 'java');
         if (await fs.pathExists(javaBin)) {
-            this.logger.info(`Portable Java ${version} already exists at ${javaBin}`);
-            try {
-                const versionOutput = (0, child_process_1.execSync)(`"${javaBin}" -version 2>&1`).toString();
-                this.logger.debug(`Portable Java version: ${versionOutput.split('\n')[0]}`);
+            if (!this.shouldUpdateJava(javaHome)) {
                 return {
                     path: javaBin,
                     version: version,
                     type: 'portable'
                 };
             }
-            catch (error) {
-                this.logger.warning(`Existing Java seems corrupted, re-downloading...`);
-                await fs.remove(javaHome);
-            }
+            console.log('Java update available, downloading latest...');
+            await fs.remove(javaHome);
+        }
+        const archUrls = this.JAVA_URLS[version]?.[arch];
+        if (!archUrls || archUrls.length === 0) {
+            throw new Error(`No Java download for ${version} on ${arch}`);
         }
-        const urls = this.JAVA_URLS[version] || this.JAVA_URLS['21'];
         let lastError = null;
-        for (let i = 0; i < urls.length; i++) {
-            const url = urls[i];
-            const tarPath = path.join(this.JAVA_DIR, `jre-${version}-${Date.now()}.tar.gz`);
+        for (let i = 0; i < archUrls.length; i++) {
+            const url = archUrls[i];
             try {
-                this.logger.info(`Downloading portable Java ${version} (attempt ${i + 1}/${urls.length})...`);
-                this.logger.info(`URL: ${url}`);
-                await this.downloadWithNode(url, tarPath);
-                this.logger.info(`Extracting Java ${version}...`);
+                await fs.remove(javaHome);
                 await fs.ensureDir(javaHome);
-                await tar.extract({
-                    file: tarPath,
-                    cwd: javaHome,
-                    strip: 1
-                });
-                await fs.remove(tarPath);
+                await this.downloadAndExtractWithStream(url, javaHome);
+                if (!await fs.pathExists(javaBin)) {
+                    throw new Error('Java binary not found after extraction');
+                }
                 await fs.chmod(javaBin, 0o755);
-                this.logger.success(`Portable Java ${version} installed at ${javaBin}`);
-                const versionOutput = (0, child_process_1.execSync)(`"${javaBin}" -version 2>&1`).toString();
-                this.logger.debug(`Portable Java version: ${versionOutput.split('\n')[0]}`);
+                try {
+                    (0, child_process_1.execSync)(`"${javaBin}" -version 2>&1`);
+                }
+                catch {
+                    await fs.remove(javaHome);
+                    throw new Error('Java verification failed');
+                }
                 return {
                     path: javaBin,
                     version: version,
@@ -224,53 +333,59 @@ class JavaChecker {
             }
             catch (error) {
                 lastError = error instanceof Error ? error : new Error(String(error));
-                this.logger.warning(`Attempt ${i + 1} failed: ${lastError.message}`);
-                await fs.remove(tarPath).catch(() => { });
+                console.log(`Download attempt ${i + 1} failed, trying next source...`);
+                await fs.remove(javaHome).catch(() => { });
             }
         }
-        throw new Error(`Failed to download Java ${version} after ${urls.length} attempts. Last error: ${lastError?.message}`);
+        throw new Error(`Failed to download Java: ${lastError?.message}`);
     }
     static async ensureJava(serverVersion, usePortable = true) {
         const requiredVersion = this.getRequiredJavaVersion(serverVersion);
-        this.logger.info(`Server requires Java ${requiredVersion}`);
         if (!usePortable) {
             const systemJava = this.getSystemJavaPath();
             if (systemJava) {
                 const systemVersion = this.getSystemJavaVersion();
                 if (systemVersion === requiredVersion) {
-                    this.logger.success(`Using system Java ${systemVersion} at ${systemJava}`);
                     return {
                         path: systemJava,
                         version: systemVersion,
                         type: 'system'
                     };
                 }
-                else {
-                    this.logger.warning(`System Java is ${systemVersion}, but server needs Java ${requiredVersion}`);
-                }
             }
         }
-        this.logger.info(`Downloading portable Java ${requiredVersion}...`);
         return this.getOrDownloadPortableJava(requiredVersion);
     }
     static cleanupOldJava() {
         try {
+            if (!fs.existsSync(this.JAVA_DIR))
+                return;
             const files = fs.readdirSync(this.JAVA_DIR);
             const now = Date.now();
             const oneDay = 24 * 60 * 60 * 1000;
             files.forEach(file => {
                 const filePath = path.join(this.JAVA_DIR, file);
-                const stats = fs.statSync(filePath);
-                if (now - stats.mtimeMs > oneDay) {
-                    fs.removeSync(filePath);
-                    this.logger.debug(`Cleaned up old Java: ${file}`);
+                try {
+                    const stats = fs.statSync(filePath);
+                    if (now - stats.mtimeMs > oneDay) {
+                        if (stats.isDirectory()) {
+                            fs.removeSync(filePath);
+                        }
+                    }
+                }
+                catch {
                 }
             });
         }
-        catch (error) {
-            this.logger.debug('No old Java to cleanup');
+        catch {
         }
     }
+    static getJavaInfo() {
+        return {
+            dir: this.JAVA_DIR,
+            arch: this.getArch()
+        };
+    }
 }
 exports.JavaChecker = JavaChecker;
 //# sourceMappingURL=JavaChecker.js.map