@cedarjs/cli 5.0.0-canary.2343 → 5.0.0-canary.2347

package/dist/commands/build.js

@@ -28,7 +28,7 @@ const builder = (yargs) => {
   }).option("ud", {
     type: "boolean",
     default: false,
-    description: "Build the Universal Deploy server entry (api/dist/ud/index.js)."
+    description: "Build the Universal Deploy server entry (api/dist/ud/)."
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

package/dist/commands/serve.js

@@ -1,7 +1,7 @@
-import { fork } from "node:child_process";
 import fs from "node:fs";
-import net from "node:net";
 import path from "node:path";
+import { pathToFileURL } from "node:url";
+import { serve as serveSrvx } from "srvx";
 import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
@@ -11,6 +11,35 @@ import * as webServerCLIConfig from "@cedarjs/web-server";
 import { getPaths, getConfig } from "../lib/index.js";
 import { serverFileExists } from "../lib/project.js";
 import { webSsrServerHandler } from "./serveWebHandler.js";
+function resolveUDEntryPath() {
+  const base = path.join(getPaths().api.dist, "ud", "index");
+  for (const ext of [".mjs", ".js"]) {
+    const entryPath = base + ext;
+    if (fs.existsSync(entryPath)) {
+      return entryPath;
+    }
+  }
+  return null;
+}
+async function startUDServer(entryPath, host, port) {
+  const mod = await import(pathToFileURL(entryPath).href);
+  const fetchable = mod.default ?? mod;
+  if (!fetchable || typeof fetchable.fetch !== "function") {
+    throw new Error(
+      `UD entry at ${entryPath} does not export a Fetchable (\`export default { fetch }\`).`
+    );
+  }
+  const server = serveSrvx({
+    ...fetchable,
+    port,
+    hostname: host,
+    gracefulShutdown: false,
+    manual: true
+  });
+  server.serve();
+  await server.ready();
+  return server;
+}
 const command = "serve [side]";
 const description = "Start a server for serving both the api and web sides";
 const builder = async (yargs) => {
@@ -43,14 +72,11 @@ const builder = async (yargs) => {
           );
           process.exit(1);
         }
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
@@ -96,42 +122,11 @@ const builder = async (yargs) => {
           port: webPort,
           host: webHost
         });
-        const child = fork(
-          udEntryPath,
-          ["--port", String(apiPort), "--host", apiHost],
-          {
-            execArgv: process.execArgv,
-            env: {
-              ...process.env,
-              NODE_ENV: process.env.NODE_ENV ?? "production",
-              PORT: String(apiPort),
-              HOST: apiHost
-            }
-          }
-        );
-        child.on("error", (err) => {
-          console.error(
-            c.error(`
- Failed to start UD API server: ${err.message}
-`)
-          );
-          process.exit(1);
-        });
-        child.on("exit", (code) => {
-          if (code !== 0) {
-            console.error(
-              c.error(`
- UD API server exited with code ${code}
-`)
-            );
-            process.exit(1);
-          }
-        });
         console.log(`Web server listening at http://${webHost}:${webPort}`);
         process.stdout.write(
           `API server starting at http://${apiHost}:${apiPort}...`
         );
-        await waitForPort(apiHost, apiPort);
+        await startUDServer(udEntryPath, apiHost, apiPort);
         process.stdout.write(
           `\rAPI server listening at http://${apiHost}:${apiPort}
 `
@@ -177,61 +172,25 @@ const builder = async (yargs) => {
         apiRootPath: argv.apiRootPath
       });
       if (argv.ud) {
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
         }
-        const udArgs = [];
-        if (argv.port) {
-          udArgs.push("--port", String(argv.port));
-        }
-        if (argv.host) {
-          udArgs.push("--host", argv.host);
-        }
-        const child = fork(udEntryPath, udArgs, {
-          execArgv: process.execArgv,
-          env: {
-            ...process.env,
-            NODE_ENV: process.env.NODE_ENV ?? "production",
-            PORT: argv.port ? String(argv.port) : process.env.PORT,
-            HOST: argv.host ?? process.env.HOST
-          }
-        });
-        child.on("error", (err) => {
-          console.error(
-            c.error(`
- Failed to start UD server: ${err.message}
-`)
-          );
-          process.exit(1);
-        });
         const apiPort = argv.port ?? parseInt(process.env.PORT ?? "8911", 10);
         const apiHost = argv.host ?? process.env.HOST ?? "localhost";
         process.stdout.write(
           `API server starting at http://${apiHost}:${apiPort}...`
         );
-        await waitForPort(apiHost, apiPort);
+        await startUDServer(udEntryPath, apiHost, apiPort);
         process.stdout.write(
           `\rAPI server listening at http://${apiHost}:${apiPort}
 `
         );
-        await new Promise((resolve, reject) => {
-          child.on("exit", (code) => {
-            if (code !== 0) {
-              reject(new Error(`UD server exited with code ${code}`));
-            } else {
-              resolve();
-            }
-          });
-        });
         return;
       }
       if (serverFileExists()) {
@@ -296,14 +255,11 @@ const builder = async (yargs) => {
         process.exit(1);
       }
       if (argv.ud) {
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
@@ -320,14 +276,11 @@ const builder = async (yargs) => {
         process.exit(1);
       }
       if (argv.ud) {
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
@@ -372,34 +325,6 @@ function webSideIsBuilt(isStreamingOrRSC) {
     return fs.existsSync(path.join(getPaths().web.dist, "index.html"));
   }
 }
-function waitForPort(host, port) {
-  const maxAttempts = 50;
-  const intervalMs = 200;
-  return new Promise((resolve, reject) => {
-    let attempts = 0;
-    const tryConnect = () => {
-      attempts++;
-      const socket = net.createConnection({ host, port });
-      socket.on("connect", () => {
-        socket.destroy();
-        resolve();
-      });
-      socket.on("error", () => {
-        socket.destroy();
-        if (attempts >= maxAttempts) {
-          reject(
-            new Error(
-              `API server did not become ready on port ${port} after ${maxAttempts * intervalMs}ms`
-            )
-          );
-        } else {
-          setTimeout(tryConnect, intervalMs);
-        }
-      });
-    };
-    tryConnect();
-  });
-}
 export {
   builder,
   command,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2343",
+  "version": "5.0.0-canary.2347",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.3",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.2343",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2343",
-    "@cedarjs/fastify-web": "5.0.0-canary.2343",
-    "@cedarjs/internal": "5.0.0-canary.2343",
-    "@cedarjs/prerender": "5.0.0-canary.2343",
-    "@cedarjs/project-config": "5.0.0-canary.2343",
-    "@cedarjs/structure": "5.0.0-canary.2343",
-    "@cedarjs/telemetry": "5.0.0-canary.2343",
-    "@cedarjs/utils": "5.0.0-canary.2343",
-    "@cedarjs/vite": "5.0.0-canary.2343",
-    "@cedarjs/web-server": "5.0.0-canary.2343",
+    "@cedarjs/api-server": "5.0.0-canary.2347",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2347",
+    "@cedarjs/fastify-web": "5.0.0-canary.2347",
+    "@cedarjs/internal": "5.0.0-canary.2347",
+    "@cedarjs/prerender": "5.0.0-canary.2347",
+    "@cedarjs/project-config": "5.0.0-canary.2347",
+    "@cedarjs/structure": "5.0.0-canary.2347",
+    "@cedarjs/telemetry": "5.0.0-canary.2347",
+    "@cedarjs/utils": "5.0.0-canary.2347",
+    "@cedarjs/vite": "5.0.0-canary.2347",
+    "@cedarjs/web-server": "5.0.0-canary.2347",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",