instatunnel 1.0.28 → 1.0.30

package/install.js

@@ -21,51 +21,31 @@ const colors = {
 };
 
 function log(message, color = 'reset') {
-    console.log(colors[color] + message + colors.reset);
+    console.log(`${colors[color]}${message}${colors.reset}`);
 }
 
 function detectPlatform() {
     const platform = os.platform();
     const arch = os.arch();
     
-    let platformSuffix;
+    // Map to our actual binary names in the bin/ directory
     switch (platform) {
         case 'linux':
-            platformSuffix = 'linux';
-            break;
+            if (arch === 'arm64') {
+                return 'instatunnel-linux-arm64';
+            }
+            return 'instatunnel-linux';
         case 'darwin':
-            platformSuffix = 'darwin';
-            break;
+            if (arch === 'arm64') {
+                return 'instatunnel-macos-arm64';
+            }
+            return 'instatunnel-macos';
         case 'win32':
-            platformSuffix = 'windows';
-            break;
-        case 'freebsd':
-            platformSuffix = 'freebsd';
-            break;
-        case 'openbsd':
-            platformSuffix = 'openbsd';
-            break;
-        default:
-            throw new Error('Unsupported platform: ' + platform);
-    }
-
-    let archSuffix;
-    switch (arch) {
-        case 'x64':
-            archSuffix = 'amd64';
-            break;
-        case 'arm64':
-            archSuffix = 'arm64';
-            break;
-        case 'ia32':
-            archSuffix = '386';
-            break;
+            return 'instatunnel-windows.exe';
         default:
-            throw new Error('Unsupported architecture: ' + arch);
+            // Fallback to linux binary for other Unix-like systems
+            return 'instatunnel-linux';
     }
-
-    const extension = platform === 'win32' ? '.exe' : '';
-    return { platform: platformSuffix, arch: archSuffix, extension };
 }
 
 function downloadFile(url, outputPath) {
@@ -73,20 +53,29 @@ function downloadFile(url, outputPath) {
         const file = fs.createWriteStream(outputPath);
         
         https.get(url, (response) => {
+            // Handle redirects
+            if (response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
+                file.close();
+                fs.unlinkSync(outputPath);
+                return downloadFile(response.headers.location, outputPath).then(resolve).catch(reject);
+            }
+            
             if (response.statusCode !== 200) {
-                reject(new Error('Download failed with status: ' + response.statusCode));
+                file.close();
+                fs.unlinkSync(outputPath);
+                reject(new Error(`HTTP ${response.statusCode}: ${response.statusMessage}`));
                 return;
             }
             
             response.pipe(file);
             
             file.on('finish', () => {
-                file.close();
-                resolve();
+                file.close(resolve);
             });
             
             file.on('error', (err) => {
-                fs.unlink(outputPath, () => {}); // Delete the file on error
+                file.close();
+                fs.unlinkSync(outputPath);
                 reject(err);
             });
         }).on('error', (err) => {
@@ -95,121 +84,59 @@ function downloadFile(url, outputPath) {
     });
 }
 
-async function downloadBinary() {
-    log('🚀 Installing InstaTunnel CLI...', 'cyan');
+async function setupBinary() {
+    const binaryName = detectPlatform();
+    const binDir = path.join(__dirname, 'bin');
+    const isWindows = os.platform() === 'win32';
+    const outputPath = path.join(binDir, isWindows ? 'instatunnel.exe' : 'instatunnel');
+    const sourcePath = path.join(binDir, binaryName);
     
-    try {
-        const { platform, arch, extension } = detectPlatform();
-        const binDir = path.join(__dirname, 'bin');
-        
-        // Ensure bin directory exists
-        if (!fs.existsSync(binDir)) {
-            fs.mkdirSync(binDir, { recursive: true });
-        }
-        
-        // Use pre-compiled binaries from our package
-        const sourceBinaryName = BINARY_NAME + '-' + platform + '-' + arch + extension;
-        const sourceBinaryPath = path.join(binDir, sourceBinaryName);
-        
-        if (fs.existsSync(sourceBinaryPath)) {
-            log('✅ Using pre-compiled binary: ' + sourceBinaryName, 'green');
-            
-            // Set permissions on source binary first
-            try {
-                fs.chmodSync(sourceBinaryPath, 0o755);
-            } catch (chmodError) {
-                // Ignore chmod errors on Windows
-                if (platform !== 'windows') {
-                    console.warn('Warning: Could not set permissions on source binary');
-                }
-            }
-            
-            // Copy to main binary names
-            const mainBinaryPath = path.join(binDir, BINARY_NAME + extension);
-            const aliasBinaryPath = path.join(binDir, 'it' + extension);
-            
-            // Remove existing files if they exist
-            try {
-                if (fs.existsSync(mainBinaryPath)) fs.unlinkSync(mainBinaryPath);
-                if (fs.existsSync(aliasBinaryPath)) fs.unlinkSync(aliasBinaryPath);
-            } catch (unlinkError) {
-                // Continue if we can't remove existing files
-            }
-            
-            fs.copyFileSync(sourceBinaryPath, mainBinaryPath);
-            fs.copyFileSync(sourceBinaryPath, aliasBinaryPath);
-            
-            // Make executable on Unix systems
-            if (platform !== 'windows') {
-                try {
-                    fs.chmodSync(mainBinaryPath, 0o755);
-                    fs.chmodSync(aliasBinaryPath, 0o755);
-                } catch (chmodError) {
-                    console.warn('Warning: Could not set executable permissions');
-                }
-            }
-            
-            log('✅ InstaTunnel CLI installed successfully!', 'green');
-            log('', 'reset');
-            log('🎉 Quick start:', 'yellow');
-            log('   instatunnel 3000    # Expose port 3000', 'cyan');
-            log('   it 3000             # Short alias', 'cyan');
-            log('   instatunnel --help  # Show all options', 'cyan');
-            log('', 'reset');
-            
-            return;
-        }
-        
-        // Fallback to download if pre-compiled binary not found
-        log('📥 Downloading ' + sourceBinaryName + ' from server...', 'yellow');
-        const downloadUrl = PRIMARY_URL + '/' + sourceBinaryName;
-        
-        try {
-            await downloadFile(downloadUrl, sourceBinaryPath);
-        } catch (err) {
-            log('⚠️  Primary download failed, trying fallback...', 'yellow');
-            const fallbackUrl = FALLBACK_URL + '/' + sourceBinaryName;
-            await downloadFile(fallbackUrl, sourceBinaryPath);
-        }
-        
-        // Verify download
-        const stats = fs.statSync(sourceBinaryPath);
-        if (stats.size < 1000000) {
-            throw new Error('Downloaded binary appears corrupted (too small)');
-        }
-        
-        // Copy to main binary names
-        const mainBinaryPath = path.join(binDir, BINARY_NAME + extension);
-        const aliasBinaryPath = path.join(binDir, 'it' + extension);
-        
-        fs.copyFileSync(sourceBinaryPath, mainBinaryPath);
-        fs.copyFileSync(sourceBinaryPath, aliasBinaryPath);
-        
-        // Make executable on Unix systems
-        if (platform !== 'windows') {
-            fs.chmodSync(sourceBinaryPath, 0o755);
-            fs.chmodSync(mainBinaryPath, 0o755);
-            fs.chmodSync(aliasBinaryPath, 0o755);
-        }
-        
-        log('✅ InstaTunnel CLI installed successfully!', 'green');
-        log('', 'reset');
-        log('🎉 Quick start:', 'yellow');
-        log('   instatunnel 3000    # Expose port 3000', 'cyan');
-        log('   it 3000             # Short alias', 'cyan');
-        log('   instatunnel --help  # Show all options', 'cyan');
-        log('', 'reset');
-        
-    } catch (error) {
-        throw new Error('Installation failed: ' + error.message);
+    log('🚀 Installing InstaTunnel CLI...', 'blue');
+    log(`📋 Platform: ${os.platform()}-${os.arch()}`, 'cyan');
+    log(`🎯 Using binary: ${binaryName}`, 'cyan');
+    
+    // Check if the platform-specific binary exists
+    if (!fs.existsSync(sourcePath)) {
+        throw new Error(`Binary for your platform (${binaryName}) not found. Supported platforms: linux, macOS, Windows (x64/arm64)`);
+    }
+    
+    // Copy the platform-specific binary to the standard name
+    fs.copyFileSync(sourcePath, outputPath);
+    
+    // Make executable on Unix systems
+    if (!isWindows) {
+        fs.chmodSync(outputPath, 0o755);
     }
     
-    // Test installation
+    // Create 'it' alias
+    const itPath = path.join(binDir, isWindows ? 'it.exe' : 'it');
+    fs.copyFileSync(outputPath, itPath);
+    
+    log('✅ InstaTunnel CLI installed successfully!', 'green');
+    log('', 'reset');
+    log('🚀 Quick Start:', 'cyan');
+    log('   instatunnel 3000    # Expose port 3000 instantly (no setup needed!)', 'reset');
+    log('   it 3000             # Short alias for the same command', 'reset');
+    log('', 'reset');
+    log('💡 More examples:', 'cyan');
+    log('   instatunnel         # Auto-detect common ports (3000, 8000, 8080)', 'reset');
+    log('   instatunnel 8080 --name myapp', 'reset');
+    log('   instatunnel --help  # See all options', 'reset');
+    log('', 'reset');
+    log('🌟 Key Benefits:', 'yellow');
+    log('   ✓ No signup required - works instantly', 'green');
+    log('   ✓ 24+ hour sessions (vs ngrok\'s 2 hours)', 'green');
+    log('   ✓ Custom subdomains included free', 'green');
+    log('   ✓ 40% cheaper than ngrok', 'green');
+    log('', 'reset');
+    log('📚 Documentation: https://docs.instatunnel.my', 'yellow');
+    
+    // Test installation - skip version test to avoid hanging
     try {
-        const binaryPath = path.join(__dirname, 'bin', BINARY_NAME + (os.platform() === 'win32' ? '.exe' : ''));
-        const stats = fs.statSync(binaryPath);
+        // Just verify the file exists and has content
+        const stats = fs.statSync(outputPath);
         if (stats.size > 1000000) { // Binary should be at least 1MB
-            log('🔧 Installation verified! Binary size: ' + Math.round(stats.size / 1024 / 1024) + 'MB', 'green');
+            log(`🔧 Installation verified! Binary size: ${Math.round(stats.size / 1024 / 1024)}MB`, 'green');
         } else {
             log('⚠️  Binary seems too small, but installation completed', 'yellow');
         }
@@ -221,7 +148,30 @@ async function downloadBinary() {
 // Create uninstall script
 function createUninstallScript() {
     const uninstallPath = path.join(__dirname, 'uninstall.js');
-    const uninstallScript = "#!/usr/bin/env node\n\nconst fs = require('fs');\nconst path = require('path');\n\nfunction cleanup() {\n    const binDir = path.join(__dirname, 'bin');\n    \n    try {\n        if (fs.existsSync(binDir)) {\n            fs.rmSync(binDir, { recursive: true, force: true });\n        }\n        console.log('✅ InstaTunnel CLI uninstalled successfully!');\n    } catch (error) {\n        console.warn('⚠️  Some cleanup may be incomplete:', error.message);\n    }\n}\n\nif (require.main === module) {\n    cleanup();\n}\n\nmodule.exports = { cleanup };\n";
+    const uninstallScript = `#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+function cleanup() {
+    const binDir = path.join(__dirname, 'bin');
+    
+    try {
+        if (fs.existsSync(binDir)) {
+            fs.rmSync(binDir, { recursive: true, force: true });
+        }
+        console.log('✅ InstaTunnel CLI uninstalled successfully!');
+    } catch (error) {
+        console.warn('⚠️  Some cleanup may be incomplete:', error.message);
+    }
+}
+
+if (require.main === module) {
+    cleanup();
+}
+
+module.exports = { cleanup };
+`;
 
     fs.writeFileSync(uninstallPath, uninstallScript);
 }
@@ -229,23 +179,57 @@ function createUninstallScript() {
 // Create test script
 function createTestScript() {
     const testPath = path.join(__dirname, 'test.js');
-    const extension = os.platform() === 'win32' ? '.exe' : '';
-    const testScript = "#!/usr/bin/env node\n\nconst { execSync } = require('child_process');\nconst path = require('path');\nconst os = require('os');\n\nfunction test() {\n    const binDir = path.join(__dirname, 'bin');\n    const extension = os.platform() === 'win32' ? '.exe' : '';\n    const instatunnelPath = path.join(binDir, 'instatunnel' + extension);\n    const itPath = path.join(binDir, 'it' + extension);\n    \n    try {\n        // Test main command - execute binary directly, not with node\n        const helpOutput = execSync('\"' + instatunnelPath + '\" --help', { encoding: 'utf8', timeout: 5000 });\n        console.log('✅ instatunnel command works');\n        \n        // Test alias - execute binary directly, not with node\n        const itHelpOutput = execSync('\"' + itPath + '\" --help', { encoding: 'utf8', timeout: 5000 });\n        console.log('✅ it alias works');\n        \n        console.log('✅ All tests passed!');\n        return true;\n    } catch (error) {\n        console.error('❌ Test failed:', error.message);\n        return false;\n    }\n}\n\nif (require.main === module) {\n    const success = test();\n    process.exit(success ? 0 : 1);\n}\n\nmodule.exports = { test };\n";
+    const testScript = `#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+const path = require('path');
+const os = require('os');
+
+function test() {
+    const binDir = path.join(__dirname, 'bin');
+    const isWindows = os.platform() === 'win32';
+    const instatunnelPath = path.join(binDir, isWindows ? 'instatunnel.exe' : 'instatunnel');
+    const itPath = path.join(binDir, isWindows ? 'it.exe' : 'it');
+    
+    try {
+        // Test main command
+        const helpOutput = execSync(\`"\${instatunnelPath}" --help\`, { encoding: 'utf8', timeout: 5000 });
+        console.log('✅ instatunnel command works');
+        
+        // Test alias
+        const itHelpOutput = execSync(\`"\${itPath}" --help\`, { encoding: 'utf8', timeout: 5000 });
+        console.log('✅ it alias works');
+        
+        console.log('✅ All tests passed!');
+        return true;
+    } catch (error) {
+        console.error('❌ Test failed:', error.message);
+        return false;
+    }
+}
+
+if (require.main === module) {
+    const success = test();
+    process.exit(success ? 0 : 1);
+}
+
+module.exports = { test };
+`;
 
     fs.writeFileSync(testPath, testScript);
 }
 
 if (require.main === module) {
-    downloadBinary()
+    setupBinary()
         .then(() => {
             createUninstallScript();
             createTestScript();
         })
         .catch((err) => {
-            log('❌ Installation failed: ' + err.message, 'red');
+            log(`❌ Installation failed: ${err.message}`, 'red');
             log('', 'reset');
             log('🔧 Troubleshooting:', 'yellow');
-            log('   • Check your internet connection', 'reset');
+            log('   • Your platform may not be supported yet', 'reset');
             log('   • Try running: npm install -g instatunnel --verbose', 'reset');
             log('   • Report issues: https://github.com/instatunnel/cli/issues', 'reset');
             process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instatunnel",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "Expose your localhost to the internet instantly - the ngrok alternative that's 40% cheaper with superior UX",
   "main": "install.js",
   "bin": {