@cedarjs/cli 5.0.0-canary.13899 → 5.0.0-canary.13902

package/dist/commands/serve.js

@@ -1,5 +1,6 @@
 import { fork } from "node:child_process";
 import fs from "node:fs";
+import net from "node:net";
 import path from "node:path";
 import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
@@ -18,7 +19,14 @@ const builder = async (yargs) => {
   yargs.command({
     command: "$0",
     description: bothServerCLIConfig.description,
-    builder: bothServerCLIConfig.builder,
+    builder: (yargs2) => {
+      bothServerCLIConfig.builder(yargs2);
+      return yargs2.option("ud", {
+        description: "Use the Universal Deploy server (srvx) for the API side. The web side is served by the existing static file server. Pass --ud to opt in; the default is Fastify for both sides.",
+        type: "boolean",
+        default: false
+      });
+    },
     handler: async (argv) => {
       recordTelemetryAttributes({
         command: "serve",
@@ -26,6 +34,110 @@ const builder = async (yargs) => {
         host: argv.host,
         socket: argv.socket
       });
+      if (argv.ud) {
+        if (argv.port) {
+          console.error(
+            c.error(
+              "\n The --port flag is not supported with --ud. Use --web-port and --api-port instead.\n"
+            )
+          );
+          process.exit(1);
+        }
+        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
+        if (!fs.existsSync(udEntryPath)) {
+          console.error(
+            c.error(
+              `
+ Universal Deploy server entry not found at ${udEntryPath}.
+ Please run \`yarn cedar build --ud\` before serving.
+`
+            )
+          );
+          process.exit(1);
+        }
+        const webDistIndexHtml = path.join(getPaths().web.dist, "index.html");
+        if (!fs.existsSync(webDistIndexHtml)) {
+          console.error(
+            c.error(
+              "\n Web build artifacts not found.\n Please run `yarn cedar build` before serving.\n"
+            )
+          );
+          process.exit(1);
+        }
+        if (serverFileExists()) {
+          console.warn(
+            c.warning(
+              "\n Note: api/src/server.ts was detected. This file is a Fastify concept and will be ignored when using --ud. You are testing the experimental UD support, so the behavior will not match your production Fastify setup.\n"
+            )
+          );
+        }
+        const { getAPIHost, getAPIPort, getWebHost, getWebPort } = await import("@cedarjs/api-server/cliHelpers");
+        const apiPort = argv.apiPort ?? getAPIPort();
+        const apiHost = argv.apiHost ?? getAPIHost();
+        const webPort = argv.webPort ?? getWebPort();
+        const webHost = argv.webHost ?? getWebHost();
+        const apiRootPath = argv.apiRootPath ?? "/";
+        const apiProxyTarget = [
+          "http://",
+          apiHost.includes(":") ? `[${apiHost}]` : apiHost,
+          ":",
+          apiPort,
+          apiRootPath
+        ].join("");
+        const { redwoodFastifyWeb } = await import("@cedarjs/fastify-web");
+        const { createFastifyInstance } = await import("@cedarjs/api-server/fastify");
+        const webFastify = await createFastifyInstance();
+        webFastify.register(redwoodFastifyWeb, {
+          redwood: {
+            apiProxyTarget
+          }
+        });
+        await webFastify.listen({
+          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);
+        process.stdout.write(
+          `\rAPI server listening at http://${apiHost}:${apiPort}
+`
+        );
+        return;
+      }
       if (serverFileExists()) {
         const serveBothHandlers = await import("./serveBothHandler.js");
         await serveBothHandlers.bothServerFileHandler(argv);
@@ -71,7 +183,7 @@ const builder = async (yargs) => {
             c.error(
               `
  Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build api\` before serving.
+ Please run \`yarn cedar build --ud\` before serving.
 `
             )
           );
@@ -84,17 +196,34 @@ const builder = async (yargs) => {
         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);
+        process.stdout.write(
+          `\rAPI server listening at http://${apiHost}:${apiPort}
+`
+        );
         await new Promise((resolve, reject) => {
-          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", reject);
           child.on("exit", (code) => {
             if (code !== 0) {
               reject(new Error(`UD server exited with code ${code}`));
@@ -166,6 +295,20 @@ const builder = async (yargs) => {
         );
         process.exit(1);
       }
+      if (argv.ud) {
+        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
+        if (!fs.existsSync(udEntryPath)) {
+          console.error(
+            c.error(
+              `
+ Universal Deploy server entry not found at ${udEntryPath}.
+ Please run \`yarn cedar build --ud\` before serving.
+`
+            )
+          );
+          process.exit(1);
+        }
+      }
     }
     if (positionalArgs.length === 1) {
       if (!apiSideExists && !rscEnabled) {
@@ -176,14 +319,38 @@ const builder = async (yargs) => {
         );
         process.exit(1);
       }
-      const apiExistsButIsNotBuilt = apiSideExists && !fs.existsSync(getPaths().api.dist);
-      if (apiExistsButIsNotBuilt || !webSideIsBuilt(streamingEnabled || rscEnabled)) {
-        console.error(
-          c.error(
-            "\nPlease run `yarn cedar build` before trying to serve your Cedar app.\n"
-          )
-        );
-        process.exit(1);
+      if (argv.ud) {
+        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
+        if (!fs.existsSync(udEntryPath)) {
+          console.error(
+            c.error(
+              `
+ Universal Deploy server entry not found at ${udEntryPath}.
+ Please run \`yarn cedar build --ud\` before serving.
+`
+            )
+          );
+          process.exit(1);
+        }
+        const webDistIndexHtml = path.join(getPaths().web.dist, "index.html");
+        if (!fs.existsSync(webDistIndexHtml)) {
+          console.error(
+            c.error(
+              "\n Web build artifacts not found.\n Please run `yarn cedar build` before serving.\n"
+            )
+          );
+          process.exit(1);
+        }
+      } else {
+        const apiExistsButIsNotBuilt = apiSideExists && !fs.existsSync(getPaths().api.dist);
+        if (apiExistsButIsNotBuilt || !webSideIsBuilt(streamingEnabled || rscEnabled)) {
+          console.error(
+            c.error(
+              "\nPlease run `yarn cedar build` before trying to serve your Cedar app.\n"
+            )
+          );
+          process.exit(1);
+        }
       }
     }
     if (!process.env.NODE_ENV) {
@@ -205,6 +372,34 @@ 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.13899+eb6c2b0f35",
+  "version": "5.0.0-canary.13902+61d1e11811",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.13899",
-    "@cedarjs/cli-helpers": "5.0.0-canary.13899",
-    "@cedarjs/fastify-web": "5.0.0-canary.13899",
-    "@cedarjs/internal": "5.0.0-canary.13899",
-    "@cedarjs/prerender": "5.0.0-canary.13899",
-    "@cedarjs/project-config": "5.0.0-canary.13899",
-    "@cedarjs/structure": "5.0.0-canary.13899",
-    "@cedarjs/telemetry": "5.0.0-canary.13899",
-    "@cedarjs/utils": "5.0.0-canary.13899",
-    "@cedarjs/vite": "5.0.0-canary.13899",
-    "@cedarjs/web-server": "5.0.0-canary.13899",
+    "@cedarjs/api-server": "5.0.0-canary.13902",
+    "@cedarjs/cli-helpers": "5.0.0-canary.13902",
+    "@cedarjs/fastify-web": "5.0.0-canary.13902",
+    "@cedarjs/internal": "5.0.0-canary.13902",
+    "@cedarjs/prerender": "5.0.0-canary.13902",
+    "@cedarjs/project-config": "5.0.0-canary.13902",
+    "@cedarjs/structure": "5.0.0-canary.13902",
+    "@cedarjs/telemetry": "5.0.0-canary.13902",
+    "@cedarjs/utils": "5.0.0-canary.13902",
+    "@cedarjs/vite": "5.0.0-canary.13902",
+    "@cedarjs/web-server": "5.0.0-canary.13902",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb6c2b0f35122011e47445b41d8b10d640ebc03e"
+  "gitHead": "61d1e11811bdc624db5b3aab49346430cfc963bc"
 }