openmagic 0.31.7 → 0.31.8

package/dist/cli.js

@@ -2453,6 +2453,7 @@ async function offerToStartDevServer(expectedPort) {
     }
   }
   let port = expectedPort || chosen.defaultPort;
+  let portChanged = false;
   if (await isPortOpen(port)) {
     const owned = verifyPortOwnership(port, process.cwd());
     if (owned === true) {
@@ -2469,14 +2470,22 @@ async function offerToStartDevServer(expectedPort) {
       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, {
@@ -2500,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;
       }
@@ -2564,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;
     }
@@ -2617,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.`)