openmagic 0.31.7 → 0.31.9

package/dist/cli.js

@@ -1885,7 +1885,8 @@ var COMMON_DEV_PORTS = [
 ];
 function checkPortSingle(port, host) {
   return new Promise((resolve4) => {
-    const socket = createConnection({ port, host, timeout: 500 });
+    const socket = createConnection({ port, host, timeout: 1e3 });
+    socket.unref();
     socket.on("connect", () => {
       socket.destroy();
       resolve4(true);
@@ -2097,7 +2098,7 @@ function ask(question) {
     });
   });
 }
-function waitForPort(port, timeoutMs = 3e4, shouldAbort) {
+function waitForPort(port, timeoutMs = 6e4, shouldAbort) {
   const start = Date.now();
   return new Promise((resolve4) => {
     const check = async () => {
@@ -2109,11 +2110,13 @@ function waitForPort(port, timeoutMs = 3e4, shouldAbort) {
         resolve4(true);
         return;
       }
-      if (Date.now() - start > timeoutMs) {
+      const elapsed = Date.now() - start;
+      if (elapsed > timeoutMs) {
         resolve4(false);
         return;
       }
-      setTimeout(check, 500);
+      const interval = elapsed < 1e4 ? 300 : 1e3;
+      setTimeout(check, interval);
     };
     check();
   });
@@ -2170,23 +2173,6 @@ async function healthCheck(proxyPort, _targetPort) {
   }
   console.log("");
 }
-function formatDevServerLine(line) {
-  const trimmed = line.trim();
-  if (!trimmed) return "";
-  if (trimmed.startsWith("Error:") || trimmed.includes("ModuleNotFoundError") || trimmed.includes("Can't resolve")) {
-    return chalk.red(`  \u2502 ${trimmed}`);
-  }
-  if (trimmed.includes("EADDRINUSE") || trimmed.includes("address already in use")) {
-    return chalk.red(`  \u2502 ${trimmed}`) + "\n" + chalk.yellow("  \u2502 \u2192 Port is already in use. Stop the other process or use --port <different-port>");
-  }
-  if (trimmed.includes("EACCES") || trimmed.includes("permission denied")) {
-    return chalk.red(`  \u2502 ${trimmed}`) + "\n" + chalk.yellow("  \u2502 \u2192 Permission denied. Try a different port or check file permissions.");
-  }
-  if (trimmed.includes("Cannot find module") || trimmed.includes("MODULE_NOT_FOUND")) {
-    return chalk.red(`  \u2502 ${trimmed}`) + "\n" + chalk.yellow("  \u2502 \u2192 Missing dependency. Try running npm install.");
-  }
-  return chalk.dim(`  \u2502 ${trimmed}`);
-}
 var program = new Command();
 program.name("openmagic").description("AI-powered coding toolbar for any web application").version(VERSION2).option("-p, --port <port>", "Dev server port to proxy", "").option(
   "-l, --listen <port>",
@@ -2453,6 +2439,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,21 +2456,27 @@ 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, {
       cwd: process.cwd(),
-      stdio: ["ignore", "pipe", "pipe"],
-      detached: false,
-      shell: true,
+      stdio: "inherit",
       env: {
         ...process.env,
         PORT: String(port),
@@ -2497,49 +2490,16 @@ async function offerToStartDevServer(expectedPort) {
   }
   childProcesses.push(child);
   let childExited = false;
-  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+)/);
-    if (portMatch && !detectedPort) {
-      const p = parseInt(portMatch[1], 10);
-      if (p > 0 && p < 65536 && p !== port) {
-        detectedPort = p;
-        return;
-      }
-    }
-    if (!detectedPort) {
-      const fallback = clean.match(/(?:port|Port|PORT)\s+(\d{4,5})/);
-      if (fallback) {
-        const p = parseInt(fallback[1], 10);
-        if (p > 0 && p < 65536 && p !== port) {
-          detectedPort = p;
-        }
-      }
-    }
-  }
-  child.stdout?.on("data", (data) => {
-    for (const line of data.toString().trim().split("\n")) {
-      parsePortFromOutput(line);
-      const formatted = formatDevServerLine(line);
-      if (formatted) process.stdout.write(formatted + "\n");
-    }
-  });
-  child.stderr?.on("data", (data) => {
-    for (const line of data.toString().trim().split("\n")) {
-      parsePortFromOutput(line);
-      const formatted = formatDevServerLine(line);
-      if (formatted) process.stdout.write(formatted + "\n");
-    }
-  });
   child.on("error", (err) => {
     childExited = true;
-    console.log(chalk.red(`  \u2717  Failed to start: ${err.message}`));
+    console.log(chalk.red(`
+  \u2717  Failed to start: ${err.message}`));
   });
   child.on("exit", (code) => {
     childExited = true;
     if (code !== null && code !== 0) {
-      console.log(chalk.red(`  \u2717  Dev server exited with code ${code}`));
+      console.log(chalk.red(`
+  \u2717  Dev server exited with code ${code}`));
     }
   });
   const cleanup = () => {
@@ -2562,24 +2522,30 @@ async function offerToStartDevServer(expectedPort) {
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   console.log(
-    chalk.dim(`  Waiting for dev server...`)
+    chalk.dim(`  Waiting for dev server on port ${port}...`)
   );
-  const isUp = await waitForPort(port, 3e4, () => {
-    if (childExited) return true;
-    if (detectedPort) return true;
-    return false;
-  });
-  if (!isUp && detectedPort) {
-    const altUp = await isPortOpen(detectedPort);
-    if (altUp) {
-      console.log(
-        chalk.green(`  \u2713  Dev server is on port ${detectedPort} (configured in project, not default ${port})`)
-      );
-      lastDetectedPort = detectedPort;
-      return true;
+  const isUp = await waitForPort(port, 6e4, () => childExited);
+  if (isUp) {
+    lastDetectedPort = port;
+    console.log("");
+    return true;
+  }
+  if (!childExited) {
+    const scanPorts = [port, 3e3, 3001, 3002, 5173, 5174, 4200, 8080, 8e3, 4e3, 1234, 4321, 3333, 8081].filter((p, i, a) => a.indexOf(p) === i);
+    for (const scanPort of scanPorts) {
+      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}.`)
+        );
+        lastDetectedPort = scanPort;
+        return true;
+      }
     }
   }
-  if (childExited && !isUp) {
+  if (childExited) {
     console.log(
       chalk.red(`  \u2717  Dev server failed to start.`)
     );
@@ -2603,37 +2569,15 @@ async function offerToStartDevServer(expectedPort) {
     console.log("");
     return false;
   }
-  if (!isUp) {
-    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}.`)
-        );
-        lastDetectedPort = scanPort;
-        return true;
-      }
-    }
-    console.log(
-      chalk.yellow(`  \u26A0  Port ${port} didn't open after 30s.`)
-    );
-    console.log(
-      chalk.dim(`     The server might use a different port. Check the output above.`)
-    );
-    console.log("");
-    const detected = await detectDevServer();
-    if (detected) {
-      console.log(
-        chalk.green(`  \u2713  Found server on port ${detected.port} instead.`)
-      );
-      return true;
-    }
-    return false;
-  }
+  console.log(
+    chalk.yellow(`
+  \u26A0  Could not find the dev server after 60s.`)
+  );
+  console.log(chalk.dim(`     Check the output above for errors.`));
+  console.log(chalk.dim(`     Or start the server manually, then run:`));
+  console.log(chalk.cyan(`     npx openmagic --port <your-port>`));
   console.log("");
-  return true;
+  return false;
 }
 program.parse();
 //# sourceMappingURL=cli.js.map