rostc 1.0.2 → 1.0.3

package/cli.js

@@ -3,108 +3,155 @@
 const WebSocket = require('ws');
 const http = require('http');
 const { randomBytes } = require('crypto');
+const { exec } = require('child_process');
 
-// Chalk v5+ fix
 let chalk;
 try {
   chalk = require('chalk');
 } catch (e) {
-  // Fallback if chalk fails
-  chalk = {
-    cyan: (t) => t,
-    green: (t) => t,
-    gray: (t) => t,
-    red: (t) => t,
-    yellow: (t) => t
-  };
+  chalk = { cyan: (t)=>t, green: (t)=>t, gray: (t)=>t, red: (t)=>t, yellow: (t)=>t };
 }
 
-// YOUR WORKER URL FROM DEPLOYMENT
 const WORKER_URL = 'https://rostc.roygichira084.workers.dev';
-
 const port = process.argv[2];
 
 if (!port) {
   console.log(chalk.red('✗ Error: Please specify a port'));
-  console.log(chalk.yellow('→ Usage: npx rostc 8080'));
+  console.log(chalk.yellow('→ Usage: rostc 8080'));
   process.exit(1);
 }
 
-if (isNaN(port) || port < 1 || port > 65535) {
-  console.log(chalk.red('✗ Error: Invalid port number'));
-  process.exit(1);
-}
-
-console.log(chalk.cyan(`→ Building tunnel on port ${port}...`));
-
-// Generate random tunnel ID
-const tunnelId = randomBytes(8).toString('hex');
-const publicUrl = `${WORKER_URL}/${tunnelId}`;
+console.log(chalk.cyan(`→ Starting tunnel on port ${port}...`));
 
-// Connect to Cloudflare Worker
-const ws = new WebSocket(`${WORKER_URL.replace('https', 'wss')}/${tunnelId}`);
+// Check if something is already running on the port
+const net = require('net');
+const tester = net.createServer()
+  .once('error', (err) => {
+    if (err.code === 'EADDRINUSE') {
+      // Port is in use — just tunnel to existing server
+      console.log(chalk.gray(`→ Port ${port} already in use. Tunneling to existing server.`));
+      startTunnel(false);
+    }
+  })
+  .once('listening', () => {
+    // Port is free — start our own simple HTTP server
+    tester.close();
+    console.log(chalk.gray(`→ No server found on port ${port}. Starting built-in file server...`));
+    startTunnel(true);
+  })
+  .listen(port);
 
-ws.on('open', () => {
-  console.log(chalk.green(`✓ ${publicUrl}`));
-  console.log(chalk.gray(`⌛ Expires in 4 minutes (240 seconds)`));
-  console.log(chalk.gray(`→ Press Ctrl+C to destroy early\n`));
+function startTunnel(startOwnServer) {
+  let server;
   
-  // Start local HTTP server
-  const server = http.createServer((req, res) => {
-    const chunks = [];
-    req.on('data', chunk => chunks.push(chunk));
-    req.on('end', () => {
-      const body = Buffer.concat(chunks);
-      const requestId = randomBytes(8).toString('hex');
+  if (startOwnServer) {
+    // Start a simple HTTP file server
+    const http = require('http');
+    const fs = require('fs');
+    const path = require('path');
+    
+    server = http.createServer((req, res) => {
+      let filePath = '.' + req.url;
+      if (filePath === './') filePath = './index.html';
       
-      ws.send(JSON.stringify({
-        type: 'request',
-        id: requestId,
-        method: req.method,
-        path: req.url,
-        headers: req.headers,
-        body: body.toString('base64')
-      }));
+      const ext = path.extname(filePath);
+      const contentType = {
+        '.html': 'text/html',
+        '.js': 'text/javascript',
+        '.css': 'text/css',
+        '.json': 'application/json',
+        '.png': 'image/png',
+        '.jpg': 'image/jpeg',
+        '.gif': 'image/gif',
+      }[ext] || 'text/plain';
       
-      const handler = (data) => {
-        try {
-          const msg = JSON.parse(data);
-          if (msg.type === 'response' && msg.id === requestId) {
-            ws.removeListener('message', handler);
-            res.writeHead(msg.status || 200, msg.headers || {});
-            res.end(msg.body ? Buffer.from(msg.body, 'base64') : null);
+      fs.readFile(filePath, (err, content) => {
+        if (err) {
+          res.writeHead(404);
+          res.end('File not found');
+        } else {
+          res.writeHead(200, { 'Content-Type': contentType });
+          res.end(content);
+        }
+      });
+    });
+    
+    server.listen(port, () => {
+      console.log(chalk.gray(`→ Built-in server running on http://localhost:${port}`));
+    });
+  }
+  
+  // Generate random tunnel ID
+  const tunnelId = randomBytes(8).toString('hex');
+  const publicUrl = `${WORKER_URL}/${tunnelId}`;
+  
+  // Connect to Cloudflare Worker
+  const ws = new WebSocket(`${WORKER_URL.replace('https', 'wss')}/${tunnelId}`);
+  
+  ws.on('open', () => {
+    console.log(chalk.green(`✓ ${publicUrl}`));
+    console.log(chalk.gray(`⌛ Expires in 4 minutes (240 seconds)`));
+    console.log(chalk.gray(`→ Press Ctrl+C to destroy\n`));
+  });
+  
+  // Handle incoming requests through WebSocket
+  if (server) {
+    // Forward requests from the tunnel to our local server
+    ws.on('message', (data) => {
+      try {
+        const msg = JSON.parse(data);
+        if (msg.type === 'request') {
+          const options = {
+            hostname: 'localhost',
+            port: port,
+            path: msg.path,
+            method: msg.method,
+            headers: msg.headers
+          };
+          
+          const req = http.request(options, (res) => {
+            const chunks = [];
+            res.on('data', chunk => chunks.push(chunk));
+            res.on('end', () => {
+              ws.send(JSON.stringify({
+                type: 'response',
+                id: msg.id,
+                status: res.statusCode,
+                headers: res.headers,
+                body: Buffer.concat(chunks).toString('base64')
+              }));
+            });
+          });
+          
+          if (msg.body) {
+            req.write(Buffer.from(msg.body, 'base64'));
           }
-        } catch(e) {}
-      };
-      ws.on('message', handler);
+          req.end();
+        }
+      } catch(e) {}
     });
+  }
+  
+  // 4-minute timer
+  const timeout = setTimeout(() => {
+    console.log(chalk.red(`\n✗ Tunnel expired after 4 minutes`));
+    ws.close();
+    if (server) server.close();
+    process.exit(0);
+  }, 240000);
+  
+  // Handle Ctrl+C
+  process.on('SIGINT', () => {
+    console.log(chalk.yellow(`\n→ Destroying tunnel...`));
+    clearTimeout(timeout);
+    ws.close();
+    if (server) server.close();
+    process.exit(0);
   });
   
-  server.listen(port, () => {
-    // Server ready
+  ws.on('error', (err) => {
+    console.log(chalk.red(`✗ Error: ${err.message}`));
+    if (server) server.close();
+    process.exit(1);
   });
-});
-
-// 4-minute timer
-const timeout = setTimeout(() => {
-  console.log(chalk.red(`\n✗ Tunnel expired after 4 minutes`));
-  ws.close();
-  process.exit(0);
-}, 240000);
-
-// Handle Ctrl+C
-process.on('SIGINT', () => {
-  console.log(chalk.yellow(`\n→ Destroying tunnel...`));
-  clearTimeout(timeout);
-  ws.close();
-  process.exit(0);
-});
-
-ws.on('error', (err) => {
-  console.log(chalk.red(`✗ WebSocket error: ${err.message}`));
-  process.exit(1);
-});
-
-ws.on('close', () => {
-  console.log(chalk.gray('\n→ Tunnel closed'));
-});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rostc",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "4-minute localhost tunnel",
   "bin": {
     "rostc": "./cli.js"