devtunnel-cli 3.0.24 → 3.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devtunnel-cli",
-  "version": "3.0.24",
+  "version": "3.0.26",
   "type": "module",
   "description": "DevTunnel - Share local dev servers worldwide. Zero configuration tunnel for any framework. Install via npm: npm install -g devtunnel-cli. Works with Vite, React, Next.js, Express, NestJS, Laravel (PHP), HTML, and more.",
   "main": "src/core/start.js",

package/src/core/proxy-server.js

@@ -8,13 +8,14 @@ process.emitWarning = function (warning, ...args) {
 };
 const { default: httpProxy } = await import("http-proxy");
 
-// Get ports from command line
+// Get ports and optional base path from command line
 const TARGET_PORT = parseInt(process.argv[2]); // Your dev server port
 const PROXY_PORT = parseInt(process.argv[3]);  // Port for tunnel to connect to
 const PROJECT_NAME = process.argv[4] || "Project";
+const BASE_PATH = process.argv[5] || ""; // e.g. /PeopleQ for XAMPP htdocs/PeopleQ
 
 if (!TARGET_PORT || !PROXY_PORT) {
-  console.error("Usage: node proxy-server.js <target-port> <proxy-port> [project-name]");
+  console.error("Usage: node proxy-server.js <target-port> <proxy-port> [project-name] [base-path]");
   process.exit(1);
 }
 
@@ -63,12 +64,22 @@ const server = http.createServer((req, res) => {
     return;
   }
   
+  // XAMPP subfolder: rewrite path so / → /PeopleQ/, /style.css → /PeopleQ/style.css
+  if (BASE_PATH) {
+    const prefix = BASE_PATH.replace(/\/$/, "");
+    req.url = prefix + (req.url === "/" ? "/" : req.url);
+  }
+  
   // Proxy the request
   proxy.web(req, res);
 });
 
 // Handle WebSocket upgrade (for Vite HMR)
 server.on("upgrade", (req, socket, head) => {
+  if (BASE_PATH) {
+    const prefix = BASE_PATH.replace(/\/$/, "");
+    req.url = prefix + (req.url === "/" ? "/" : req.url);
+  }
   proxy.ws(req, socket, head);
 });
 
@@ -78,7 +89,7 @@ server.listen(PROXY_PORT, () => {
   console.log("DevTunnel Proxy Server");
   console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
   console.log(`Project: ${PROJECT_NAME}`);
-  console.log(`Dev Server: http://localhost:${TARGET_PORT}`);
+  console.log(`Dev Server: http://localhost:${TARGET_PORT}${BASE_PATH || ""}`);
   console.log(`Proxy Port: ${PROXY_PORT}`);
   console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
   console.log("Ready! Tunnel will connect to proxy");

package/src/core/start.js

@@ -17,10 +17,10 @@ function getPackageVersion() {
     const pkgPath = join(PROJECT_ROOT, "package.json");
     if (existsSync(pkgPath)) {
       const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
-      return pkg.version || "3.0.24";
+      return pkg.version || "3.0.26";
     }
   } catch (err) {}
-  return "3.0.24";
+  return "3.0.26";
 }
 
 // Helper to run command
@@ -136,9 +136,17 @@ function detectHtmlProject(currentDir) {
   return { name: basename(currentDir), defaultPort: 5500 }; // Live Server default; matches VS Code
 }
 
+// Detect PHP/XAMPP project (index.php in root, not Laravel)
+function detectPhpProject(currentDir) {
+  if (detectLaravelProject(currentDir)) return null; // Laravel has its own flow
+  const indexPhp = join(currentDir, "index.php");
+  if (!existsSync(indexPhp)) return null;
+  return { name: basename(currentDir), defaultPort: 80 }; // XAMPP/Apache default
+}
+
 // Check common ports for running dev servers (includes Laravel 8000, XAMPP/Live Server 8080/5500)
 async function detectRunningDevServer() {
-  const commonPorts = [3000, 5173, 5500, 8080, 8000, 5000, 4000, 3001, 5174]; // 5500 before 8080 for Live Server
+  const commonPorts = [3000, 5173, 5500, 8080, 8000, 80, 5000, 4000, 3001, 5174]; // 80 for XAMPP
   const detected = [];
   
   for (const port of commonPorts) {
@@ -218,6 +226,18 @@ async function autoDetectProject() {
     };
   }
 
+  // 4) PHP/XAMPP (index.php) — default port 80 (Apache), e.g. http://localhost/PeopleQ/
+  const php = detectPhpProject(currentDir);
+  if (php) {
+    const detectedPort = runningPorts.length > 0 ? runningPorts[0] : php.defaultPort;
+    return {
+      path: currentDir,
+      name: php.name,
+      port: detectedPort,
+      projectType: "php"
+    };
+  }
+
   return null;
 }
 
@@ -355,7 +375,9 @@ async function main() {
           ? "Laravel (php artisan serve)"
           : autoDetected.projectType === "html"
             ? "HTML project"
-            : "package.json";
+            : autoDetected.projectType === "php"
+              ? "PHP/XAMPP"
+              : "package.json";
       console.log(`Detected port ${autoDetected.port} (${portSource}), but no server running on that port`);
       console.log("Checking for running dev servers...");
       
@@ -418,12 +440,15 @@ async function main() {
       projectPath = selectedPath;
       projectName = basename(selectedPath);
       
-      // Try to detect port for selected project (Laravel → 8000, Node from package.json, else 5173)
+      // Try to detect port for selected project (Laravel → 8000, HTML → 5500, Node from package.json)
       const selectedPackagePath = join(selectedPath, "package.json");
       const laravelSelected = detectLaravelProject(selectedPath);
+      const htmlSelected = detectHtmlProject(selectedPath);
       const detectedPort = laravelSelected
         ? laravelSelected.defaultPort
-        : detectPortFromPackage(selectedPackagePath);
+        : htmlSelected
+          ? htmlSelected.defaultPort
+          : detectPortFromPackage(selectedPackagePath);
       
       const portResponse = await prompts({
         type: "number",
@@ -438,6 +463,17 @@ async function main() {
       }
       
       devPort = portResponse.port;
+    } else {
+      // User confirmed – let them keep default port or type another (e.g. HTML default 5500, can change)
+      const portPrompt = await prompts({
+        type: "number",
+        name: "port",
+        message: "Dev server port (press Enter for default):",
+        initial: devPort
+      });
+      if (portPrompt.port != null && portPrompt.port > 0) {
+        devPort = portPrompt.port;
+      }
     }
   } else if (autoDetected && !autoDetected.port) {
     // Project detected but no port
@@ -507,15 +543,18 @@ async function main() {
     console.log(`Selected: ${projectPath}`);
     console.log("");
     
-    // Try to detect port for selected project (Laravel → 8000, HTML → 8080, Node from package.json)
+    // Try to detect port for selected project (Laravel → 8000, HTML → 5500, PHP → 80, Node from package.json)
     const selectedPackagePath = join(projectPath, "package.json");
     const laravelSelected = detectLaravelProject(projectPath);
     const htmlSelected = detectHtmlProject(projectPath);
+    const phpSelected = detectPhpProject(projectPath);
     let detectedPort = laravelSelected
       ? laravelSelected.defaultPort
       : htmlSelected
         ? htmlSelected.defaultPort  // 5500
-        : detectPortFromPackage(selectedPackagePath);
+        : phpSelected
+          ? phpSelected.defaultPort  // 80
+          : detectPortFromPackage(selectedPackagePath);
     
     // Check for running servers
     const runningPorts = await detectRunningDevServer();
@@ -543,11 +582,17 @@ async function main() {
   console.log("");
   const proxyPort = devPort + 1000; // Use port 1000 higher for proxy
 
+  // XAMPP subfolder (e.g. htdocs/PeopleQ → http://localhost/PeopleQ/) — proxy rewrites path
+  const isPhpXamppSubfolder =
+    devPort === 80 &&
+    (projectPath.toLowerCase().includes("htdocs") || projectPath.toLowerCase().includes("www"));
+  const basePath = isPhpXamppSubfolder ? "/" + basename(projectPath) : "";
+
   console.log("");
   console.log("Configuration:");
   console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
   console.log(`Project: ${projectName}`);
-  console.log(`Dev Server: localhost:${devPort}`);
+  console.log(`Dev Server: localhost:${devPort}${basePath || ""}`);
   console.log(`Proxy Port: ${proxyPort}`);
   console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
   console.log("");
@@ -579,7 +624,9 @@ async function main() {
   console.log("Starting services...");
   console.log("");
   const proxyPath = join(__dirname, "proxy-server.js");
-  const proxyProcess = spawn("node", [proxyPath, devPort.toString(), proxyPort.toString(), projectName], {
+  const proxyArgs = [proxyPath, devPort.toString(), proxyPort.toString(), projectName];
+  if (basePath) proxyArgs.push(basePath);
+  const proxyProcess = spawn("node", proxyArgs, {
     stdio: "inherit",
     shell: false
   });