@cedarjs/api-server 6.0.0-rc.189 → 6.0.0-rc.221

package/README.md

@@ -16,7 +16,6 @@ From package.json
 
 ```
   "bin": {
-    "cedarjs-api-server-watch": "./dist/watch.js",
     "cedarjs-log-formatter": "./dist/logFormatter/bin.js",
     "cedarjs-server": "./dist/bin.js",
   },

package/dist/apiCLIConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiCLIConfig.d.ts","sourceRoot":"","sources":["../src/apiCLIConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,eAAO,MAAM,WAAW,4CAA4C,CAAA;AAEpE,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,QA0BpD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,gBAAgB,iBAGtD"}
+{"version":3,"file":"apiCLIConfig.d.ts","sourceRoot":"","sources":["../src/apiCLIConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,eAAO,MAAM,WAAW,4CAA4C,CAAA;AAEpE,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAwBpD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,gBAAgB,iBAGtD"}

package/dist/apiCLIConfig.js

@@ -7,7 +7,7 @@ function builder(yargs) {
       alias: "p"
     },
     host: {
-      description: "The host to listen at. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host to listen at",
       type: "string"
     },
     apiRootPath: {

package/dist/apiCLIConfigHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/apiCLIConfigHandler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,wBAAsB,OAAO,CAAC,OAAO,GAAE,gBAAqB,iBAoC3D"}
+{"version":3,"file":"apiCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/apiCLIConfigHandler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,wBAAsB,OAAO,CAAC,OAAO,GAAE,gBAAqB,iBA4C3D"}

package/dist/apiCLIConfigHandler.js

@@ -1,7 +1,12 @@
 import ansis from "ansis";
 import { coerceRootPath } from "@cedarjs/fastify-web";
 import { createServer } from "./createServer.js";
+import { apiDistServerFileExists, runApiDistServerFile } from "./serverFile.js";
 async function handler(options = {}) {
+  if (apiDistServerFileExists()) {
+    await runApiDistServerFile(options);
+    return;
+  }
   const timeStart = Date.now();
   console.log(ansis.dim.italic("Starting API Server..."));
   options.apiRootPath = coerceRootPath(options.apiRootPath ?? "/");

package/dist/bin.js

@@ -15,27 +15,55 @@ var __export = (target, all) => {
 };
 
 // src/cliHelpers.ts
-import { getConfig } from "@cedarjs/project-config";
-function getAPIHost() {
-  let host = process.env.REDWOOD_API_HOST;
+import { getConfig, parsePort, readEnvVar } from "@cedarjs/project-config";
+function getAPIHost({ isPublicSide = false } = {}) {
+  let host = readEnvVar("CEDAR_API_HOST", {
+    deprecatedAlias: "REDWOOD_API_HOST"
+  });
+  if (isPublicSide) {
+    host ??= process.env.HOST;
+  }
   host ??= getConfig().api.host;
-  host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
+  host ??= "::";
   return host;
 }
-function getAPIPort() {
-  return process.env.REDWOOD_API_PORT ? parseInt(process.env.REDWOOD_API_PORT) : getConfig().api.port;
+function getAPIPort({ isPublicSide = false } = {}) {
+  const apiPort = readEnvVar("CEDAR_API_PORT", {
+    deprecatedAlias: "REDWOOD_API_PORT"
+  });
+  if (apiPort) {
+    return parsePort(apiPort, "CEDAR_API_PORT");
+  }
+  if (isPublicSide && process.env.PORT) {
+    return parsePort(process.env.PORT, "PORT");
+  }
+  return getConfig().api.port;
 }
 function getAPIRootPath() {
   return process.env.CEDAR_API_ROOT_PATH ?? "/";
 }
-function getWebHost() {
-  let host = process.env.REDWOOD_WEB_HOST;
+function getWebHost({ isPublicSide = false } = {}) {
+  let host = readEnvVar("CEDAR_WEB_HOST", {
+    deprecatedAlias: "REDWOOD_WEB_HOST"
+  });
+  if (isPublicSide) {
+    host ??= process.env.HOST;
+  }
   host ??= getConfig().web.host;
-  host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
+  host ??= "::";
   return host;
 }
-function getWebPort() {
-  return process.env.REDWOOD_WEB_PORT ? parseInt(process.env.REDWOOD_WEB_PORT) : getConfig().web.port;
+function getWebPort({ isPublicSide = false } = {}) {
+  const webPort = readEnvVar("CEDAR_WEB_PORT", {
+    deprecatedAlias: "REDWOOD_WEB_PORT"
+  });
+  if (webPort) {
+    return parsePort(webPort, "CEDAR_WEB_PORT");
+  }
+  if (isPublicSide && process.env.PORT) {
+    return parsePort(process.env.PORT, "PORT");
+  }
+  return getConfig().web.port;
 }
 var init_cliHelpers = __esm({
   "src/cliHelpers.ts"() {
@@ -128,8 +156,12 @@ var init_createServerHelpers = __esm({
       configureApiServer: () => {
       },
       parseArgs: true,
-      apiHost: getAPIHost(),
-      apiPort: getAPIPort()
+      // `createServer()`'s only callers are `cedarjs-server api` and custom
+      // `api/src/server.ts` files — both only ever run with the api side
+      // serving public traffic on its own, so they get to use the host's
+      // `HOST`/`PORT` env vars.
+      apiHost: getAPIHost({ isPublicSide: true }),
+      apiPort: getAPIPort({ isPublicSide: true })
     });
   }
 });
@@ -496,7 +528,7 @@ import fastifyRawBody from "fastify-raw-body";
 import { getAsyncStoreInstance as getAsyncStoreInstance2 } from "@cedarjs/context/dist/store";
 import { coerceRootPath as coerceRootPath2 } from "@cedarjs/fastify-web/dist/helpers.js";
 async function cedarFastifyAPI(fastify2, opts) {
-  const cedarOptions = opts.redwood ?? {};
+  const cedarOptions = opts.cedar ?? {};
   cedarOptions.apiRootPath ??= "/";
   cedarOptions.apiRootPath = coerceRootPath2(cedarOptions.apiRootPath);
   cedarOptions.fastGlobOptions ??= {};
@@ -541,7 +573,7 @@ var init_api = __esm({
 // src/plugins/graphql.ts
 var graphql_exports = {};
 __export(graphql_exports, {
-  redwoodFastifyGraphQLServer: () => redwoodFastifyGraphQLServer
+  cedarFastifyGraphQLServer: () => cedarFastifyGraphQLServer
 });
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 import fastifyMultiPart from "@fastify/multipart";
@@ -552,10 +584,10 @@ import { getAsyncStoreInstance as getAsyncStoreInstance3 } from "@cedarjs/contex
 import { coerceRootPath as coerceRootPath3 } from "@cedarjs/fastify-web/dist/helpers.js";
 import { createGraphQLYoga } from "@cedarjs/graphql-server";
 import { getPaths as getPaths3 } from "@cedarjs/project-config";
-async function redwoodFastifyGraphQLServer(fastify2, options) {
-  const redwoodOptions = options.redwood ?? {};
-  redwoodOptions.apiRootPath ??= "/";
-  redwoodOptions.apiRootPath = coerceRootPath3(redwoodOptions.apiRootPath);
+async function cedarFastifyGraphQLServer(fastify2, options) {
+  const cedarOptions = options.cedar ?? {};
+  cedarOptions.apiRootPath ??= "/";
+  cedarOptions.apiRootPath = coerceRootPath3(cedarOptions.apiRootPath);
   fastify2.register(fastifyUrlData2);
   fastify2.register(fastifyMultiPart);
   const method = ["GET", "POST", "OPTIONS"];
@@ -563,7 +595,7 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
     getAsyncStoreInstance3().run(/* @__PURE__ */ new Map(), done);
   });
   try {
-    if (!redwoodOptions.graphql) {
+    if (!cedarOptions.graphql) {
       const [graphqlFunctionPath] = await fg2("dist/functions/graphql.{ts,js}", {
         cwd: getPaths3().api.base,
         absolute: true
@@ -573,9 +605,9 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
       if (!__cedar_graphqlOptions) {
         return;
       }
-      redwoodOptions.graphql = __cedar_graphqlOptions;
+      cedarOptions.graphql = __cedar_graphqlOptions;
     }
-    const graphqlOptions = redwoodOptions.graphql;
+    const graphqlOptions = cedarOptions.graphql;
     if (graphqlOptions?.realtime?.subscriptions) {
       method.push("PUT");
     }
@@ -584,7 +616,7 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
     const routePaths = ["", "/health", "/readiness", "/stream"];
     for (const routePath of routePaths) {
       fastify2.route({
-        url: `${redwoodOptions.apiRootPath}${graphqlEndpoint}${routePath}`,
+        url: `${cedarOptions.apiRootPath}${graphqlEndpoint}${routePath}`,
         method,
         handler: async (req, reply) => {
           const request = createFetchRequest(req, reply);
@@ -618,11 +650,13 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
       done();
     });
   } catch (e) {
-    console.log(e);
+    const message = e instanceof Error ? e.message : String(e);
+    fastify2.log.error(e, `Failed to set up the GraphQL server: ${message}`);
+    throw e;
   }
 }
-function trimSlashes(path5) {
-  return path5.replace(/^\/|\/$/g, "");
+function trimSlashes(path6) {
+  return path6.replace(/^\/|\/$/g, "");
 }
 function createFetchRequest(req, reply) {
   const controller = new AbortController();
@@ -702,7 +736,7 @@ async function createServer(options = {}) {
     getAsyncStoreInstance4().run(/* @__PURE__ */ new Map(), done);
   });
   await server.register(cedarFastifyAPI, {
-    redwood: {
+    cedar: {
       apiRootPath,
       fastGlobOptions: {
         ignore: ["**/dist/functions/graphql.js"]
@@ -716,10 +750,10 @@ async function createServer(options = {}) {
     absolute: true
   });
   if (graphqlFunctionPath) {
-    const { redwoodFastifyGraphQLServer: redwoodFastifyGraphQLServer2 } = await Promise.resolve().then(() => (init_graphql(), graphql_exports));
+    const { cedarFastifyGraphQLServer: cedarFastifyGraphQLServer2 } = await Promise.resolve().then(() => (init_graphql(), graphql_exports));
     const { __cedar_graphqlOptions } = await import(pathToFileURL4(graphqlFunctionPath).href);
-    await server.register(redwoodFastifyGraphQLServer2, {
-      redwood: {
+    await server.register(cedarFastifyGraphQLServer2, {
+      cedar: {
         apiRootPath,
         graphql: __cedar_graphqlOptions
       }
@@ -762,10 +796,51 @@ var init_createServer = __esm({
   }
 });
 
+// src/serverFile.ts
+import { spawn } from "node:child_process";
+import fs3 from "node:fs";
+import path4 from "node:path";
+import { getPaths as getPaths5 } from "@cedarjs/project-config";
+function apiDistServerFilePath() {
+  return path4.join(getPaths5().api.dist, "server.js");
+}
+function apiDistServerFileExists() {
+  return fs3.existsSync(apiDistServerFilePath());
+}
+async function runApiDistServerFile(options = {}) {
+  const args = ["--apiRootPath", options.apiRootPath ?? "/"];
+  if (options.port !== void 0) {
+    args.push("--apiPort", String(options.port));
+  }
+  await new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [apiDistServerFilePath(), ...args], {
+      cwd: getPaths5().api.dist,
+      stdio: "inherit"
+    });
+    child.on("error", reject);
+    child.on("exit", (code, signal) => {
+      if (signal || code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`api/dist/server.js exited with code ${code}`));
+    });
+  });
+}
+var init_serverFile = __esm({
+  "src/serverFile.ts"() {
+    "use strict";
+  }
+});
+
 // src/apiCLIConfigHandler.ts
 import ansis3 from "ansis";
 import { coerceRootPath as coerceRootPath4 } from "@cedarjs/fastify-web";
 async function handler(options = {}) {
+  if (apiDistServerFileExists()) {
+    await runApiDistServerFile(options);
+    return;
+  }
   const timeStart = Date.now();
   console.log(ansis3.dim.italic("Starting API Server..."));
   options.apiRootPath = coerceRootPath4(options.apiRootPath ?? "/");
@@ -796,6 +871,7 @@ var init_apiCLIConfigHandler = __esm({
   "src/apiCLIConfigHandler.ts"() {
     "use strict";
     init_createServer();
+    init_serverFile();
   }
 });
 
@@ -803,10 +879,15 @@ var init_apiCLIConfigHandler = __esm({
 import ansis4 from "ansis";
 import { redwoodFastifyWeb, coerceRootPath as coerceRootPath5 } from "@cedarjs/fastify-web";
 async function handler2(options) {
+  if (apiDistServerFileExists()) {
+    throw new Error(
+      "api/dist/server.js was found, but a custom server file is not supported when serving both sides from one process (`cedarjs-server` / `cedar serve`). It is a Fastify concept. Anything registered there (Realtime, custom plugins, custom middleware) would silently be skipped if this continued.\n\nRun the api and web sides as separate processes instead, so the api side goes through `cedarjs-server api`, which does run your server file:\n\n  cedarjs-server api\n  cedarjs-server web"
+    );
+  }
   const timeStart = Date.now();
   console.log(ansis4.dim.italic("Starting API and Web Servers..."));
-  options.webHost ??= getWebHost();
-  options.webPort ??= getWebPort();
+  options.webHost ??= getWebHost({ isPublicSide: true });
+  options.webPort ??= getWebPort({ isPublicSide: true });
   options.apiHost ??= getAPIHost();
   options.apiPort ??= getAPIPort();
   options.apiRootPath = coerceRootPath5(options.apiRootPath ?? "/");
@@ -873,15 +954,16 @@ var init_bothCLIConfigHandler = __esm({
     init_cliHelpers();
     init_createServer();
     init_fastify();
+    init_serverFile();
   }
 });
 
 // src/bin.ts
-import path4 from "path";
+import path5 from "path";
 import { config as config2 } from "dotenv-defaults";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs/yargs";
-import { getPaths as getPaths5 } from "@cedarjs/project-config";
+import { getPaths as getPaths6 } from "@cedarjs/project-config";
 import {
   description as webDescription,
   builder as webBuilder,
@@ -898,7 +980,7 @@ function builder(yargs2) {
       alias: "p"
     },
     host: {
-      description: "The host to listen at. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host to listen at",
       type: "string"
     },
     apiRootPath: {
@@ -929,7 +1011,7 @@ function builder2(yargs2) {
       alias: ["web-port"]
     },
     webHost: {
-      description: "The host for the web server to listen on. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host for the web server to listen on",
       type: "string",
       alias: ["web-host"]
     },
@@ -939,7 +1021,7 @@ function builder2(yargs2) {
       alias: ["api-port"]
     },
     apiHost: {
-      description: "The host for the api server to listen on. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host for the api server to listen on",
       type: "string",
       alias: ["api-host"]
     },
@@ -956,8 +1038,8 @@ function builder2(yargs2) {
 init_bothCLIConfigHandler();
 if (!process.env.CEDAR_ENV_FILES_LOADED) {
   config2({
-    path: path4.join(getPaths5().base, ".env"),
-    defaults: path4.join(getPaths5().base, ".env.defaults"),
+    path: path5.join(getPaths6().base, ".env"),
+    defaults: path5.join(getPaths6().base, ".env.defaults"),
     multiline: true
   });
   process.env.CEDAR_ENV_FILES_LOADED = "true";

package/dist/bothCLIConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bothCLIConfig.d.ts","sourceRoot":"","sources":["../src/bothCLIConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,eAAO,MAAM,WAAW,qDAAqD,CAAA;AAE7E,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,QA+BrD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBAGvD"}
+{"version":3,"file":"bothCLIConfig.d.ts","sourceRoot":"","sources":["../src/bothCLIConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,eAAO,MAAM,WAAW,qDAAqD,CAAA;AAE7E,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,QA6BrD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBAGvD"}

package/dist/bothCLIConfig.js

@@ -7,7 +7,7 @@ function builder(yargs) {
       alias: ["web-port"]
     },
     webHost: {
-      description: "The host for the web server to listen on. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host for the web server to listen on",
       type: "string",
       alias: ["web-host"]
     },
@@ -17,7 +17,7 @@ function builder(yargs) {
       alias: ["api-port"]
     },
     apiHost: {
-      description: "The host for the api server to listen on. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host for the api server to listen on",
       type: "string",
       alias: ["api-host"]
     },

package/dist/bothCLIConfigHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bothCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/bothCLIConfigHandler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBAmEvD"}
+{"version":3,"file":"bothCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/bothCLIConfigHandler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBA0FvD"}

package/dist/bothCLIConfigHandler.js

@@ -3,11 +3,17 @@ import { redwoodFastifyWeb, coerceRootPath } from "@cedarjs/fastify-web";
 import { getWebHost, getWebPort, getAPIHost, getAPIPort } from "./cliHelpers.js";
 import { createServer as createApiServer } from "./createServer.js";
 import { createFastifyInstance } from "./fastify.js";
+import { apiDistServerFileExists } from "./serverFile.js";
 async function handler(options) {
+  if (apiDistServerFileExists()) {
+    throw new Error(
+      "api/dist/server.js was found, but a custom server file is not supported when serving both sides from one process (`cedarjs-server` / `cedar serve`). It is a Fastify concept. Anything registered there (Realtime, custom plugins, custom middleware) would silently be skipped if this continued.\n\nRun the api and web sides as separate processes instead, so the api side goes through `cedarjs-server api`, which does run your server file:\n\n  cedarjs-server api\n  cedarjs-server web"
+    );
+  }
   const timeStart = Date.now();
   console.log(ansis.dim.italic("Starting API and Web Servers..."));
-  options.webHost ??= getWebHost();
-  options.webPort ??= getWebPort();
+  options.webHost ??= getWebHost({ isPublicSide: true });
+  options.webPort ??= getWebPort({ isPublicSide: true });
   options.apiHost ??= getAPIHost();
   options.apiPort ??= getAPIPort();
   options.apiRootPath = coerceRootPath(options.apiRootPath ?? "/");

package/dist/cliHelpers.d.ts

@@ -1,6 +1,23 @@
-export declare function getAPIHost(): string;
-export declare function getAPIPort(): number;
+interface SideOptions {
+    /**
+     * Whether this side receives the deployment's public traffic.
+     *
+     * Container hosts (Railway, Render, Fly.io, Cloud Run, Heroku) tell an app
+     * which host and port to bind with the `HOST` and `PORT` env vars. Only the
+     * side serving public traffic falls back to them — when the api and web
+     * servers run in the same deployment they would otherwise both bind to
+     * `PORT` and collide.
+     *
+     * The web side is the public one whenever both sides are served together,
+     * because it proxies api requests. The api side is only public when it is
+     * served on its own.
+     */
+    isPublicSide?: boolean;
+}
+export declare function getAPIHost({ isPublicSide }?: SideOptions): string;
+export declare function getAPIPort({ isPublicSide }?: SideOptions): number;
 export declare function getAPIRootPath(): string;
-export declare function getWebHost(): string;
-export declare function getWebPort(): number;
+export declare function getWebHost({ isPublicSide }?: SideOptions): string;
+export declare function getWebPort({ isPublicSide }?: SideOptions): number;
+export {};
 //# sourceMappingURL=cliHelpers.d.ts.map

package/dist/cliHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cliHelpers.d.ts","sourceRoot":"","sources":["../src/cliHelpers.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,WAKzB;AAED,wBAAgB,UAAU,WAIzB;AAED,wBAAgB,cAAc,WAE7B;AAED,wBAAgB,UAAU,WAKzB;AAED,wBAAgB,UAAU,WAIzB"}
+{"version":3,"file":"cliHelpers.d.ts","sourceRoot":"","sources":["../src/cliHelpers.ts"],"names":[],"mappings":"AAEA,UAAU,WAAW;IACnB;;;;;;;;;;;;OAYG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,wBAAgB,UAAU,CAAC,EAAE,YAAoB,EAAE,GAAE,WAAgB,UAepE;AAED,wBAAgB,UAAU,CAAC,EAAE,YAAoB,EAAE,GAAE,WAAgB,UAcpE;AAED,wBAAgB,cAAc,WAE7B;AAED,wBAAgB,UAAU,CAAC,EAAE,YAAoB,EAAE,GAAE,WAAgB,UAepE;AAED,wBAAgB,UAAU,CAAC,EAAE,YAAoB,EAAE,GAAE,WAAgB,UAcpE"}

package/dist/cliHelpers.js

@@ -1,24 +1,52 @@
-import { getConfig } from "@cedarjs/project-config";
-function getAPIHost() {
-  let host = process.env.REDWOOD_API_HOST;
+import { getConfig, parsePort, readEnvVar } from "@cedarjs/project-config";
+function getAPIHost({ isPublicSide = false } = {}) {
+  let host = readEnvVar("CEDAR_API_HOST", {
+    deprecatedAlias: "REDWOOD_API_HOST"
+  });
+  if (isPublicSide) {
+    host ??= process.env.HOST;
+  }
   host ??= getConfig().api.host;
-  host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
+  host ??= "::";
   return host;
 }
-function getAPIPort() {
-  return process.env.REDWOOD_API_PORT ? parseInt(process.env.REDWOOD_API_PORT) : getConfig().api.port;
+function getAPIPort({ isPublicSide = false } = {}) {
+  const apiPort = readEnvVar("CEDAR_API_PORT", {
+    deprecatedAlias: "REDWOOD_API_PORT"
+  });
+  if (apiPort) {
+    return parsePort(apiPort, "CEDAR_API_PORT");
+  }
+  if (isPublicSide && process.env.PORT) {
+    return parsePort(process.env.PORT, "PORT");
+  }
+  return getConfig().api.port;
 }
 function getAPIRootPath() {
   return process.env.CEDAR_API_ROOT_PATH ?? "/";
 }
-function getWebHost() {
-  let host = process.env.REDWOOD_WEB_HOST;
+function getWebHost({ isPublicSide = false } = {}) {
+  let host = readEnvVar("CEDAR_WEB_HOST", {
+    deprecatedAlias: "REDWOOD_WEB_HOST"
+  });
+  if (isPublicSide) {
+    host ??= process.env.HOST;
+  }
   host ??= getConfig().web.host;
-  host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
+  host ??= "::";
   return host;
 }
-function getWebPort() {
-  return process.env.REDWOOD_WEB_PORT ? parseInt(process.env.REDWOOD_WEB_PORT) : getConfig().web.port;
+function getWebPort({ isPublicSide = false } = {}) {
+  const webPort = readEnvVar("CEDAR_WEB_PORT", {
+    deprecatedAlias: "REDWOOD_WEB_PORT"
+  });
+  if (webPort) {
+    return parsePort(webPort, "CEDAR_WEB_PORT");
+  }
+  if (isPublicSide && process.env.PORT) {
+    return parsePort(process.env.PORT, "PORT");
+  }
+  return getConfig().web.port;
 }
 export {
   getAPIHost,

package/dist/createServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../src/createServer.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EAEP,MAAM,0BAA0B,CAAA;AAsBjC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,YAAY,CAAC,OAAO,GAAE,mBAAwB,mBAoHnE"}
+{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../src/createServer.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EAEP,MAAM,0BAA0B,CAAA;AAsBjC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,YAAY,CAAC,OAAO,GAAE,mBAAwB,mBAqHnE"}

package/dist/createServer.js

@@ -62,7 +62,7 @@ async function createServer(options = {}) {
     getAsyncStoreInstance().run(/* @__PURE__ */ new Map(), done);
   });
   await server.register(cedarFastifyAPI, {
-    redwood: {
+    cedar: {
       apiRootPath,
       fastGlobOptions: {
         ignore: ["**/dist/functions/graphql.js"]
@@ -76,10 +76,10 @@ async function createServer(options = {}) {
     absolute: true
   });
   if (graphqlFunctionPath) {
-    const { redwoodFastifyGraphQLServer } = await import("./plugins/graphql.js");
+    const { cedarFastifyGraphQLServer } = await import("./plugins/graphql.js");
     const { __cedar_graphqlOptions } = await import(pathToFileURL(graphqlFunctionPath).href);
-    await server.register(redwoodFastifyGraphQLServer, {
-      redwood: {
+    await server.register(cedarFastifyGraphQLServer, {
+      cedar: {
         apiRootPath,
         graphql: __cedar_graphqlOptions
       }

package/dist/createServerHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServerHelpers.d.ts","sourceRoot":"","sources":["../src/createServerHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,SAAS,CAAA;AAMhB,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AAEtE,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;IAGpB,iCAAiC;IACjC,MAAM,CAAC,EACH,oBAAoB,CAAC,QAAQ,CAAC,GAC9B,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IAE1C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;IAE3D;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAEzC,sEAAsE;IACtE,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE7D,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,KAAK,0BAA0B,GAAG,QAAQ,CACxC,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG;IAClD,oBAAoB,EAAE,oBAAoB,CAAA;CAC3C,CACF,CAAA;AAID,eAAO,MAAM,6BAA6B,EAAE,MAAM,0BAiB9C,CAAA;AAgBJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BAdS,oBAAoB;GA4F7C"}
+{"version":3,"file":"createServerHelpers.d.ts","sourceRoot":"","sources":["../src/createServerHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,SAAS,CAAA;AAMhB,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AAEtE,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;IAGpB,iCAAiC;IACjC,MAAM,CAAC,EACH,oBAAoB,CAAC,QAAQ,CAAC,GAC9B,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IAE1C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;IAE3D;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAEzC,sEAAsE;IACtE,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE7D,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,KAAK,0BAA0B,GAAG,QAAQ,CACxC,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG;IAClD,oBAAoB,EAAE,oBAAoB,CAAA;CAC3C,CACF,CAAA;AAID,eAAO,MAAM,6BAA6B,EAAE,MAAM,0BAqB9C,CAAA;AAgBJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BAdS,oBAAoB;GA4F7C"}

package/dist/createServerHelpers.js

@@ -15,8 +15,12 @@ const getDefaultCreateServerOptions = () => ({
   configureApiServer: () => {
   },
   parseArgs: true,
-  apiHost: getAPIHost(),
-  apiPort: getAPIPort()
+  // `createServer()`'s only callers are `cedarjs-server api` and custom
+  // `api/src/server.ts` files — both only ever run with the api side
+  // serving public traffic on its own, so they get to use the host's
+  // `HOST`/`PORT` env vars.
+  apiHost: getAPIHost({ isPublicSide: true }),
+  apiPort: getAPIPort({ isPublicSide: true })
 });
 function isCustomLoggerInstance(logger) {
   return !!logger && typeof logger === "object" && "info" in logger;

package/dist/plugins/api.d.ts

@@ -2,7 +2,7 @@ import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyInstance } from 'fastify';
 import type { Server } from '../createServerHelpers.js';
 export interface CedarFastifyAPIOptions {
-    redwood: {
+    cedar: {
         apiRootPath?: string;
         fastGlobOptions?: FastGlobOptions;
         discoverFunctionsGlob?: string | string[];

package/dist/plugins/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,sBAAsB;IAErC,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAI3D,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBA4C7B"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAI3D,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBA4C7B"}

package/dist/plugins/api.js

@@ -5,7 +5,7 @@ import { coerceRootPath } from "@cedarjs/fastify-web/dist/helpers.js";
 import { loadFastifyConfig } from "../fastify.js";
 import { lambdaRequestHandler, loadFunctionsFromDist } from "./lambdaLoader.js";
 async function cedarFastifyAPI(fastify, opts) {
-  const cedarOptions = opts.redwood ?? {};
+  const cedarOptions = opts.cedar ?? {};
   cedarOptions.apiRootPath ??= "/";
   cedarOptions.apiRootPath = coerceRootPath(cedarOptions.apiRootPath);
   cedarOptions.fastGlobOptions ??= {};

package/dist/plugins/graphql.d.ts

@@ -1,10 +1,10 @@
 import type { FastifyInstance } from 'fastify';
 import type { GraphQLYogaOptions } from '@cedarjs/graphql-server';
-export interface RedwoodFastifyGraphQLOptions {
-    redwood: {
+export interface CedarFastifyGraphQLOptions {
+    cedar: {
         apiRootPath?: string;
         graphql?: GraphQLYogaOptions;
     };
 }
-export declare function redwoodFastifyGraphQLServer(fastify: FastifyInstance, options: RedwoodFastifyGraphQLOptions): Promise<void>;
+export declare function cedarFastifyGraphQLServer(fastify: FastifyInstance, options: CedarFastifyGraphQLOptions): Promise<void>;
 //# sourceMappingURL=graphql.d.ts.map

package/dist/plugins/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,SAAS,CAAA;AAOhB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,CAAA;CACF;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,4BAA4B,iBAuHtC"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,SAAS,CAAA;AAOhB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,CAAA;CACF;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,0BAA0B,iBA+HpC"}