gitbasher 3.8.0 → 3.8.2

package/download-release.js

@@ -1,4 +1,5 @@
 const https = require('https');
+const http = require('http');
 const fs = require('fs');
 const path = require('path');
 
@@ -18,31 +19,101 @@ if (!fs.existsSync(BIN_DIR)) {
     fs.mkdirSync(BIN_DIR, { recursive: true });
 }
 
-// Download the release asset
-console.log(`Downloading gitbasher v${VERSION} from GitHub releases...`);
-const file = fs.createWriteStream(BIN_PATH);
-
-https.get(RELEASE_URL, (response) => {
-    if (response.statusCode === 302 || response.statusCode === 301) {
-    // Follow redirect
-    https.get(response.headers.location, (redirectResponse) => {
-        redirectResponse.pipe(file);
-        file.on('finish', () => {
-        file.close();
-        fs.chmodSync(BIN_PATH, 0o755);
-        console.log('Download complete!');
+// Download function with redirect handling
+function download(url, outputPath, maxRedirects = 5) {
+    return new Promise((resolve, reject) => {
+        if (maxRedirects === 0) {
+            reject(new Error('Too many redirects'));
+            return;
+        }
+
+        const client = url.startsWith('https') ? https : http;
+        const file = fs.createWriteStream(outputPath);
+        let downloadedBytes = 0;
+        let totalBytes = 0;
+        
+        // Add timeout (30 seconds)
+        const timeout = setTimeout(() => {
+            file.close();
+            if (fs.existsSync(outputPath)) {
+                fs.unlinkSync(outputPath);
+            }
+            reject(new Error('Download timeout after 30s'));
+        }, 30000);
+
+        client.get(url, (response) => {
+            // Handle redirects
+            if (response.statusCode === 301 || response.statusCode === 302 || response.statusCode === 307 || response.statusCode === 308) {
+                clearTimeout(timeout);
+                file.close();
+                fs.unlinkSync(outputPath);
+                const redirectUrl = response.headers.location;
+                if (!redirectUrl) {
+                    reject(new Error('Redirect location not found'));
+                    return;
+                }
+                // Resolve relative redirects
+                const redirectUrlFull = redirectUrl.startsWith('http') 
+                    ? redirectUrl 
+                    : new URL(redirectUrl, url).href;
+                return download(redirectUrlFull, outputPath, maxRedirects - 1)
+                    .then(resolve)
+                    .catch(reject);
+            }
+
+            // Handle errors
+            if (response.statusCode !== 200) {
+                file.close();
+                fs.unlinkSync(outputPath);
+                reject(new Error(`HTTP ${response.statusCode}: ${response.statusMessage}`));
+                return;
+            }
+
+            // Track download progress
+            totalBytes = parseInt(response.headers['content-length'] || '0', 10);
+            if (totalBytes > 0) {
+                response.on('data', (chunk) => {
+                    downloadedBytes += chunk.length;
+                });
+            }
+
+            // Pipe response to file
+            response.pipe(file);
+
+            file.on('finish', () => {
+                clearTimeout(timeout);
+                file.close();
+                fs.chmodSync(outputPath, 0o755);
+                if (totalBytes > 0) {
+                    const sizeKB = (downloadedBytes / 1024).toFixed(1);
+                    process.stderr.write(`✓ Downloaded ${sizeKB}KB\n`);
+                } else {
+                    process.stderr.write('✓ Download complete\n');
+                }
+                resolve();
+            });
+        }).on('error', (err) => {
+            clearTimeout(timeout);
+            file.close();
+            if (fs.existsSync(outputPath)) {
+                fs.unlinkSync(outputPath);
+            }
+            reject(err);
         });
     });
-    } else {
-    response.pipe(file);
-    file.on('finish', () => {
-        file.close();
-        fs.chmodSync(BIN_PATH, 0o755);
-        console.log('Download complete!');
-    });
-    }
-}).on('error', (err) => {
-    fs.unlinkSync(BIN_PATH);
-    console.error(`Error downloading release: ${err.message}`);
-    process.exit(1);
-});
+}
+
+// Download the release asset
+// Use stderr for progress so it's visible during npm install
+process.stderr.write(`Downloading gitbasher v${VERSION}...\n`);
+const startTime = Date.now();
+
+download(RELEASE_URL, BIN_PATH)
+    .then(() => {
+        const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+        process.stderr.write(`✓ Installed in ${duration}s\n`);
+    })
+    .catch((err) => {
+        process.stderr.write(`✗ Error downloading release: ${err.message}\n`);
+        process.exit(1);
+    });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbasher",
-    "version": "3.8.0",
+    "version": "3.8.2",
     "description": "Simple bash utility that makes git easy to use",
     "keywords": [
         "git",