instatunnel 1.0.14 → 1.0.16

package/install.js

@@ -21,7 +21,7 @@ const colors = {
 };
 
 function log(message, color = 'reset') {
-    console.log(`${colors[color]}${message}${colors.reset}`);
+    console.log(colors[color] + message + colors.reset);
 }
 
 function detectPlatform() {
@@ -46,9 +46,9 @@ function detectPlatform() {
             platformSuffix = 'openbsd';
             break;
         default:
-            throw new Error(`Unsupported platform: ${platform}`);
+            throw new Error('Unsupported platform: ' + platform);
     }
-    
+
     let archSuffix;
     switch (arch) {
         case 'x64':
@@ -61,11 +61,11 @@ function detectPlatform() {
             archSuffix = '386';
             break;
         default:
-            throw new Error(`Unsupported architecture: ${arch}`);
+            throw new Error('Unsupported architecture: ' + arch);
     }
-    
+
     const extension = platform === 'win32' ? '.exe' : '';
-    return `${BINARY_NAME}-${platformSuffix}-${archSuffix}${extension}`;
+    return { platform: platformSuffix, arch: archSuffix, extension };
 }
 
 function downloadFile(url, outputPath) {
@@ -73,29 +73,20 @@ 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) {
-                file.close();
-                fs.unlinkSync(outputPath);
-                reject(new Error(`HTTP ${response.statusCode}: ${response.statusMessage}`));
+                reject(new Error('Download failed with status: ' + response.statusCode));
                 return;
             }
             
             response.pipe(file);
             
             file.on('finish', () => {
-                file.close(resolve);
+                file.close();
+                resolve();
             });
             
             file.on('error', (err) => {
-                file.close();
-                fs.unlinkSync(outputPath);
+                fs.unlink(outputPath, () => {}); // Delete the file on error
                 reject(err);
             });
         }).on('error', (err) => {
@@ -105,92 +96,98 @@ function downloadFile(url, outputPath) {
 }
 
 async function downloadBinary() {
-    const binaryName = detectPlatform();
-    const binDir = path.join(__dirname, 'bin');
-    const isWindows = os.platform() === 'win32';
-    const outputPath = path.join(binDir, isWindows ? 'instatunnel.exe' : 'instatunnel');
-    
-    // Create bin directory
-    if (!fs.existsSync(binDir)) {
-        fs.mkdirSync(binDir, { recursive: true });
-    }
-    
-    log('🚀 Installing InstaTunnel CLI...', 'blue');
-    log(`📋 Platform: ${os.platform()}-${os.arch()}`, 'cyan');
-    
-    // Try primary URL first
-    const primaryUrl = `${PRIMARY_URL}/${binaryName}`;
-    const fallbackUrl = `${FALLBACK_URL}/${binaryName}`;
+    log('🚀 Installing InstaTunnel CLI...', 'cyan');
     
     try {
-        log('📥 Downloading from primary source...', 'blue');
-        await downloadFile(primaryUrl, outputPath);
-    } catch (primaryError) {
-        log(`⚠️  Primary download failed: ${primaryError.message}`, 'yellow');
-        log('📥 Trying fallback source (GitHub)...', 'blue');
+        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');
+            
+            // 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(mainBinaryPath, '755');
+                fs.chmodSync(aliasBinaryPath, '755');
+            }
+            
+            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(fallbackUrl, outputPath);
-        } catch (fallbackError) {
-            throw new Error(`Both downloads failed:\n  Primary: ${primaryError.message}\n  Fallback: ${fallbackError.message}`);
+            await downloadFile(downloadUrl, sourceBinaryPath);
+        } catch (err) {
+            log('⚠️  Primary download failed, trying fallback...', 'yellow');
+            const fallbackUrl = FALLBACK_URL + '/' + sourceBinaryName;
+            await downloadFile(fallbackUrl, sourceBinaryPath);
         }
-    }
-    
-    // Verify binary was downloaded and is valid
-    if (!fs.existsSync(outputPath) || fs.statSync(outputPath).size === 0) {
-        throw new Error('Downloaded binary is invalid or empty');
-    }
-    
-    // Make executable on Unix systems
-    if (!isWindows) {
-        fs.chmodSync(outputPath, 0o755);
-    }
-    
-    // Create 'it' alias and Windows wrappers
-    const itPath = path.join(binDir, isWindows ? 'it.exe' : 'it');
-    fs.copyFileSync(outputPath, itPath);
-    
-    // Create Windows wrapper scripts to prevent new console window
-    if (isWindows) {
-        const instatunnelCmd = path.join(binDir, 'instatunnel.cmd');
-        const itCmd = path.join(binDir, 'it.cmd');
         
-        // Create instatunnel.cmd wrapper
-        const instatunnelWrapper = '@echo off\r\nsetlocal\r\nset "args=%*"\r\n"%~dp0instatunnel.exe" %args%\r\nendlocal\r\n';
-        fs.writeFileSync(instatunnelCmd, instatunnelWrapper);
+        // 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);
         
-        // Create it.cmd wrapper
-        const itWrapper = '@echo off\r\nsetlocal\r\nset "args=%*"\r\n"%~dp0it.exe" %args%\r\nendlocal\r\n';
-        fs.writeFileSync(itCmd, itWrapper);
+        // Make executable on Unix systems
+        if (platform !== 'windows') {
+            fs.chmodSync(sourceBinaryPath, '755');
+            fs.chmodSync(mainBinaryPath, '755');
+            fs.chmodSync(aliasBinaryPath, '755');
+        }
         
-        log('✅ Windows wrapper scripts created to prevent new console window', 'green');
+        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('✅ 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
+    // Test installation
     try {
-        // Just verify the file exists and has content
-        const stats = fs.statSync(outputPath);
+        const binaryPath = path.join(__dirname, 'bin', BINARY_NAME + (os.platform() === 'win32' ? '.exe' : ''));
+        const stats = fs.statSync(binaryPath);
         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');
         }
@@ -202,30 +199,7 @@ async function downloadBinary() {
 // Create uninstall script
 function createUninstallScript() {
     const uninstallPath = path.join(__dirname, 'uninstall.js');
-    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 };
-`;
+    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";
 
     fs.writeFileSync(uninstallPath, uninstallScript);
 }
@@ -233,42 +207,8 @@ module.exports = { cleanup };
 // Create test script
 function createTestScript() {
     const testPath = path.join(__dirname, 'test.js');
-    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 };
-`;
+    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";
 
     fs.writeFileSync(testPath, testScript);
 }
@@ -280,7 +220,7 @@ if (require.main === module) {
             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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instatunnel",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Expose your localhost to the internet instantly - the ngrok alternative that's 40% cheaper with superior UX",
   "main": "install.js",
   "bin": {
@@ -71,10 +71,9 @@
     "uninstall.js",
     "test.js",
     "bin/",
-    "*.cmd",
     "README.md"
   ],
   "directories": {
     "bin": "./bin"
   }
-}
+}

package/test.js

@@ -0,0 +1,35 @@
+#!/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 extension = os.platform() === 'win32' ? '.exe' : '';
+    const instatunnelPath = path.join(binDir, 'instatunnel' + extension);
+    const itPath = path.join(binDir, 'it' + extension);
+    
+    try {
+        // Test main command - execute binary directly, not with node
+        const helpOutput = execSync('"' + instatunnelPath + '" --help', { encoding: 'utf8', timeout: 5000 });
+        console.log('✅ instatunnel command works');
+        
+        // Test alias - execute binary directly, not with node
+        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 };

package/uninstall.js

@@ -0,0 +1,23 @@
+#!/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 };