apiblaze 0.21.29 → 0.21.31

package/dist/index.js

@@ -34,7 +34,7 @@ var __toESM = (mod, isNodeMode, target2) => (target2 = mod != null ? __create(__
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.21.29";
+    version = "0.21.31";
   }
 });
 
@@ -7521,6 +7521,7 @@ __export(demo_exports, {
   DEMO_GINO_ADMIN_EMAIL: () => DEMO_GINO_ADMIN_EMAIL,
   DEMO_RPS: () => DEMO_RPS,
   demoName: () => demoName,
+  isDemoProcess: () => isDemoProcess,
   routesOf: () => routesOf,
   runDemo: () => runDemo,
   runDemoLogs: () => runDemoLogs,
@@ -7602,12 +7603,40 @@ function appCtl(dir, arg) {
   const r = (0, import_child_process4.spawnSync)(process.execPath, [import_path5.default.join(dir, "start.js"), arg], { cwd: dir, stdio: "ignore", timeout: 15e3 });
   return r.status === 0;
 }
+function isDemoProcess(args) {
+  return /[\\/](apiblaze|mcpblaze)-demo[\\/]start\.js(\s|$)/.test(args) || /\sdemo --serve\s/.test(args);
+}
+function demoProcesses() {
+  if (process.platform === "win32") return [];
+  const r = (0, import_child_process4.spawnSync)("ps", ["-Ao", "pid=,args="], { encoding: "utf8" });
+  if (r.status !== 0 || !r.stdout) return [];
+  const out = [];
+  for (const line of r.stdout.split("\n")) {
+    const m = /^\s*(\d+)\s+(.*)$/.exec(line);
+    if (m && Number(m[1]) !== process.pid && isDemoProcess(m[2])) out.push(Number(m[1]));
+  }
+  return out;
+}
 async function stopDemos() {
   const dirs = [...new Set(readRegistry().map((r) => r.dir))];
   const n = await stopTunnels();
   for (const d of dirs) appCtl(d, "--stop");
   writeRegistry([]);
-  return n;
+  const left = demoProcesses();
+  for (const pid of left) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+    }
+  }
+  for (let i = 0; i < 40 && left.some(alive); i++) await new Promise((r) => setTimeout(r, 100));
+  for (const pid of left) if (alive(pid)) {
+    try {
+      process.kill(pid, "SIGKILL");
+    } catch {
+    }
+  }
+  return n + left.length;
 }
 function writeApp(dir) {
   import_fs6.default.mkdirSync(dir, { recursive: true });
@@ -9205,6 +9234,80 @@ function fromNode(dir, out) {
   out.configuredPort = portFromScripts(scripts);
   out.start = scripts.dev ? "npm run dev" : scripts.start ? "npm start" : void 0;
 }
+var ENTRY_FILES = [
+  "server.js",
+  "app.js",
+  "index.js",
+  "main.js",
+  "server.mjs",
+  "app.mjs",
+  "index.mjs",
+  "server.cjs",
+  "server.ts",
+  "app.ts",
+  "index.ts",
+  "main.ts",
+  "src/server.ts",
+  "src/index.ts",
+  "src/app.ts",
+  "src/main.ts",
+  "src/server.js",
+  "src/index.js",
+  "src/app.js",
+  "main.py",
+  "app.py",
+  "server.py",
+  "main.go",
+  "server.go"
+];
+var NODE_MODULE_SERVERS = [
+  [/\b(?:require\(\s*|from\s+)['"]express['"]/, "Express"],
+  [/\b(?:require\(\s*|from\s+)['"]fastify['"]/, "Fastify"],
+  [/\b(?:require\(\s*|from\s+)['"]koa['"]/, "Koa"],
+  [/\b(?:require\(\s*|from\s+)['"]hono['"]/, "Hono"],
+  [/\b(?:require\(\s*|from\s+)['"](?:node:)?https?['"]/, "a Node server"]
+];
+function portInSource(text) {
+  const m = /\.listen\(\s*(\d{2,5})\b/.exec(text) ?? /\bPORT\b[^\n]{0,40}?(?:\|\||\?\?|or)\s*['"]?(\d{2,5})\b/.exec(text) ?? /\bport\s*[:=]\s*(\d{2,5})\b/.exec(text) ?? /ListenAndServe\(\s*"[^":]*:(\d{2,5})"/.exec(text) ?? /\.run\([^)]*port\s*=\s*(\d{2,5})/.exec(text);
+  return m ? Number(m[1]) : void 0;
+}
+function fromEntryFiles(dir, out) {
+  for (const rel of ENTRY_FILES) {
+    const text = readText(import_path4.default.join(dir, rel));
+    if (!text) continue;
+    let fw;
+    let def;
+    if (/\.(c|m)?[jt]s$/.test(rel)) {
+      if (!/\.listen\(|createServer\(|\bserve\(|export default\s+app\b/.test(text)) continue;
+      fw = NODE_MODULE_SERVERS.find(([re]) => re.test(text))?.[1] ?? "a Node server";
+      def = 3e3;
+    } else if (rel.endsWith(".py")) {
+      if (/\bFastAPI\(/.test(text)) {
+        fw = "FastAPI";
+        def = 8e3;
+      } else if (/\bFlask\(/.test(text)) {
+        fw = "Flask";
+        def = 5e3;
+      } else if (/HTTPServer\(|http\.server/.test(text)) {
+        fw = "a Python server";
+        def = 8e3;
+      } else continue;
+    } else if (rel.endsWith(".go")) {
+      if (!/ListenAndServe\(|\.Run\(|\.Start\(|\.Listen\(/.test(text)) continue;
+      fw = GO_SERVERS.find(([re]) => re.test(text))?.[1] ?? "a Go server";
+      def = 8080;
+    }
+    if (!fw) continue;
+    if (!out.framework) {
+      out.framework = fw;
+      out.source = rel;
+      out.defaultPort = def;
+    }
+    if (!out.configuredPort) out.configuredPort = portInSource(text);
+    if (!out.start && rel.endsWith(".js")) out.start = `node ${rel}`;
+    return;
+  }
+}
 function fromPython(dir, out) {
   for (const f of ["requirements.txt", "pyproject.toml", "Pipfile"]) {
     const text = readText(import_path4.default.join(dir, f));
@@ -9278,6 +9381,7 @@ async function detectBackend(dir, opts = {}) {
     fromNode(dir, out);
     if (!out.framework) fromPython(dir, out);
     if (!out.framework) fromOthers(dir, out);
+    if (!out.frontendOnly && (!out.framework || !out.configuredPort)) fromEntryFiles(dir, out);
     const spec2 = findSpecFile(dir);
     if (spec2) {
       out.specFile = spec2.file;
@@ -9340,7 +9444,7 @@ function folderReport(f, opts = {}) {
       // A person may know what that is; an agent would only be distracted by it.
       opts.forPerson && f.strayPorts?.length ? ` Something answers on localhost:${f.strayPorts[0]}, but nothing in this folder points at it.` : ""
     ].join("");
-    return { lines: [`No backend here: no server framework in the project files and no OpenAPI spec.${extra}`], question: demoQuestion, ownApi: false };
+    return { lines: [`No backend in this folder: no server framework in the project files and no OpenAPI spec.${extra}`], question: demoQuestion, ownApi: false };
   }
   const port = backendPort(f);
   const spec2 = f.specFile ? `Spec: ${f.specFile}.` : f.specUrl ? `It serves its spec at ${f.specUrl}.` : "No OpenAPI spec yet.";
@@ -9885,11 +9989,19 @@ async function runForPerson(found) {
     return;
   }
   if (report.ownApi) {
-    console.log(`  Start it${found.start ? ` (${found.start})` : ""}, then put it on the internet:`);
-    console.log(`    ${import_chalk25.default.cyan(`${run2} dev --port ${port ?? "<port>"}${found.specFile ? ` --openapi ${found.specFile}` : ""}`)}`);
+    const args = ["dev", "--port", String(port ?? 3e3), ...found.specFile ? ["--openapi", found.specFile] : []];
+    const startHint = found.start ? `, once you start it (${found.start})` : ", once it runs";
+    if (!await ask2(`  ${import_chalk25.default.bold("?")} Put it behind ${P} now? It reaches your app on port ${port ?? 3e3}${startHint}. ${import_chalk25.default.dim("(Y/n)")} `)) {
+      console.log(`  Any time: ${import_chalk25.default.cyan(`${run2} ${args.join(" ")}`)}`);
+      return;
+    }
+    console.log(import_chalk25.default.dim(`  $ ${run2} ${args.join(" ")}`));
+    const { spawnSync: spawnSync4 } = await import("child_process");
+    const r = spawnSync4(process.execPath, [process.argv[1], ...args], { stdio: "inherit" });
+    process.exitCode = r.status ?? 0;
     return;
   }
-  if (!await ask2(`  ${import_chalk25.default.bold("?")} See it on a sample app first? ${import_chalk25.default.dim("(Y/n)")} `)) {
+  if (!await ask2(`  ${import_chalk25.default.bold("?")} Create a demo app to try out ${P}? ${import_chalk25.default.dim("(Y/n)")} `)) {
     console.log(`  Your own app, when it runs: ${import_chalk25.default.cyan(`${run2} dev --port <port>`)}`);
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.21.29",
+  "version": "0.21.31",
   "description": "APIblaze CLI — Chat with your APIs, Manage your API keys, users and groups with the APIblaze serverless proxy",
   "keywords": [
     "apiblaze",