openmagic 0.31.6 → 0.31.8

package/dist/cli.js

@@ -1968,6 +1968,16 @@ async function detectDevServer(cwd = process.cwd()) {
 async function isPortOpen(port) {
   return checkPort(port);
 }
+async function findAvailablePort(startPort) {
+  let port = startPort;
+  while (await isPortOpen(port)) {
+    port++;
+    if (port > startPort + 100) {
+      throw new Error(`Could not find an available port near ${startPort}`);
+    }
+  }
+  return port;
+}
 var FRAMEWORK_PATTERNS = [
   { match: /\bnext\b/, framework: "Next.js", defaultPort: 3e3 },
   { match: /\bvite\b/, framework: "Vite", defaultPort: 5173 },
@@ -2442,14 +2452,40 @@ async function offerToStartDevServer(expectedPort) {
       chosen = scripts[idx];
     }
   }
-  const port = expectedPort || chosen.defaultPort;
+  let port = expectedPort || chosen.defaultPort;
+  let portChanged = false;
+  if (await isPortOpen(port)) {
+    const owned = verifyPortOwnership(port, process.cwd());
+    if (owned === true) {
+      console.log(chalk.green(`  \u2713  Dev server already running on port ${port}`));
+      lastDetectedPort = port;
+      return true;
+    }
+    const altPort = await findAvailablePort(port + 1);
+    console.log("");
+    console.log(
+      chalk.yellow(`  \u26A0  Port ${port} is already in use by another process.`)
+    );
+    console.log(
+      chalk.dim(`     Starting on port ${altPort} instead.`)
+    );
+    port = altPort;
+    portChanged = true;
+  }
   console.log("");
   console.log(
-    chalk.dim(`  Starting `) + chalk.cyan(`npm run ${chosen.name}`) + chalk.dim("...")
+    chalk.dim(`  Starting `) + chalk.cyan(`npm run ${chosen.name}`) + (portChanged ? chalk.dim(` (port ${port})`) : "") + chalk.dim("...")
   );
   const depsInfo = checkDependenciesInstalled();
   const runCmd = depsInfo.packageManager === "yarn" ? "yarn" : depsInfo.packageManager === "pnpm" ? "pnpm" : depsInfo.packageManager === "bun" ? "bun" : "npm";
   const runArgs = runCmd === "npm" ? ["run", chosen.name] : [chosen.name];
+  if (portChanged) {
+    if (runCmd === "npm") {
+      runArgs.push("--", "--port", String(port));
+    } else {
+      runArgs.push("--port", String(port));
+    }
+  }
   let child;
   try {
     child = spawn(runCmd, runArgs, {
@@ -2473,10 +2509,14 @@ async function offerToStartDevServer(expectedPort) {
   let detectedPort = null;
   function parsePortFromOutput(line) {
     const clean = line.replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "").replace(/\x1b[^a-zA-Z]*[a-zA-Z]/g, "").replace(/[\x00-\x1f\x7f]/g, "");
-    const portMatch = clean.match(/https?:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0):(\d+)/);
+    const portMatch = clean.match(/https?:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1?\]):(\d+)/);
     if (portMatch && !detectedPort) {
       const p = parseInt(portMatch[1], 10);
-      if (p > 0 && p < 65536 && p !== port) {
+      if (p > 0 && p < 65536) {
+        if (p === port) {
+          detectedPort = p;
+          return;
+        }
         detectedPort = p;
         return;
       }
@@ -2537,17 +2577,19 @@ async function offerToStartDevServer(expectedPort) {
   console.log(
     chalk.dim(`  Waiting for dev server...`)
   );
-  const isUp = await waitForPort(port, 3e4, () => {
+  const isUp = await waitForPort(port, 6e4, () => {
     if (childExited) return true;
     if (detectedPort) return true;
     return false;
   });
-  if (!isUp && detectedPort) {
-    const altUp = await isPortOpen(detectedPort);
+  if (detectedPort) {
+    const altUp = detectedPort === port ? isUp : await isPortOpen(detectedPort);
     if (altUp) {
-      console.log(
-        chalk.green(`  \u2713  Dev server is on port ${detectedPort} (configured in project, not default ${port})`)
-      );
+      if (detectedPort !== port) {
+        console.log(
+          chalk.green(`  \u2713  Dev server is on port ${detectedPort} (configured in project, not default ${port})`)
+        );
+      }
       lastDetectedPort = detectedPort;
       return true;
     }
@@ -2580,6 +2622,8 @@ async function offerToStartDevServer(expectedPort) {
     for (const scanPort of [3e3, 3001, 5173, 5174, 4200, 8080, 8e3, 4e3, 1234, 4321, 3333, 8081]) {
       if (scanPort === port) continue;
       if (await isPortOpen(scanPort)) {
+        const owned = verifyPortOwnership(scanPort, process.cwd());
+        if (owned === false) continue;
         console.log(
           chalk.green(`  \u2713  Dev server found on port ${scanPort}.`)
         );
@@ -2588,7 +2632,7 @@ async function offerToStartDevServer(expectedPort) {
       }
     }
     console.log(
-      chalk.yellow(`  \u26A0  Port ${port} didn't open after 30s.`)
+      chalk.yellow(`  \u26A0  Port ${port} didn't open after 60s.`)
     );
     console.log(
       chalk.dim(`     The server might use a different port. Check the output above.`)