@cedarjs/api-server 6.0.0-canary.2816 → 6.0.0-canary.2819

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" : "::";
   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" : "::";
   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"() {
@@ -805,8 +833,8 @@ import { redwoodFastifyWeb, coerceRootPath as coerceRootPath5 } from "@cedarjs/f
 async function handler2(options) {
   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 ?? "/");

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":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBAsEvD"}

package/dist/bothCLIConfigHandler.js

@@ -6,8 +6,8 @@ import { createFastifyInstance } from "./fastify.js";
 async function handler(options) {
   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,UAYpE;AAED,wBAAgB,UAAU,CAAC,EAAE,YAAoB,EAAE,GAAE,WAAgB,UAcpE;AAED,wBAAgB,cAAc,WAE7B;AAED,wBAAgB,UAAU,CAAC,EAAE,YAAoB,EAAE,GAAE,WAAgB,UAYpE;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" : "::";
   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" : "::";
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "6.0.0-canary.2816",
+  "version": "6.0.0-canary.2819",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -100,12 +100,12 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/api": "6.0.0-canary.2816",
-    "@cedarjs/context": "6.0.0-canary.2816",
-    "@cedarjs/fastify-web": "6.0.0-canary.2816",
-    "@cedarjs/internal": "6.0.0-canary.2816",
-    "@cedarjs/project-config": "6.0.0-canary.2816",
-    "@cedarjs/web-server": "6.0.0-canary.2816",
+    "@cedarjs/api": "6.0.0-canary.2819",
+    "@cedarjs/context": "6.0.0-canary.2819",
+    "@cedarjs/fastify-web": "6.0.0-canary.2819",
+    "@cedarjs/internal": "6.0.0-canary.2819",
+    "@cedarjs/project-config": "6.0.0-canary.2819",
+    "@cedarjs/web-server": "6.0.0-canary.2819",
     "@fastify/multipart": "9.4.0",
     "@fastify/url-data": "6.0.3",
     "ansis": "4.3.1",
@@ -123,7 +123,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2816",
+    "@cedarjs/framework-tools": "6.0.0-canary.2819",
     "@types/aws-lambda": "8.10.162",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/split2": "4.2.3",
@@ -138,7 +138,7 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "6.0.0-canary.2816"
+    "@cedarjs/graphql-server": "6.0.0-canary.2819"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {