@cedarjs/api-server 9.0.0-canary.1784 → 9.0.0-canary.3124

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":"AAUA,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,5 +1,23 @@
-export declare function getAPIHost(): string;
-export declare function getAPIPort(): number;
-export declare function getWebHost(): string;
-export declare function getWebPort(): 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({ 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,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,25 +1,57 @@
-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 getWebHost() {
-  let host = process.env.REDWOOD_WEB_HOST;
+function getAPIRootPath() {
+  return process.env.CEDAR_API_ROOT_PATH ?? "/";
+}
+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,
   getAPIPort,
+  getAPIRootPath,
   getWebHost,
   getWebPort
 };

package/dist/createServer.d.ts

@@ -11,13 +11,29 @@ import type { CreateServerOptions, Server } from './createServerHelpers.js';
  *   const server = await createServer({
  *     logger,
  *     apiRootPath: 'api'
+ *     configureServer: (server) => {
+ *       // Runs before the api functions and GraphQL plugins are
+ *       // registered, i.e. before any routes exist. This is the right
+ *       // place for plugins with a "global" mode that hooks `onRoute`
+ *       // (e.g. `@fastify/compress`), since those only affect routes
+ *       // registered *after* the plugin itself — registering them here
+ *       // applies them to *both* api functions and the GraphQL endpoint:
+ *       server.register(compress, { global: true })
+ *     },
  *     configureApiServer: (server) => {
- *       // Configure the API server fastify instance, e.g. add content type parsers
+ *       // Configure just the api functions' fastify instance, e.g. add
+ *       // content type parsers. Doesn't apply to the GraphQL endpoint.
+ *     },
+ *     configureGraphQLServer: (server) => {
+ *       // Configure just the GraphQL fastify instance. Doesn't apply to
+ *       // api function routes.
  *     },
  *   })
  *
- *   // Configure the returned fastify instance:
- *   server.register(myPlugin)
+ *   // Plain request-lifecycle hooks (onRequest, onSend, etc.) don't depend
+ *   // on registration order, so they can also be added to the returned
+ *   // instance after the fact and will still apply to both:
+ *   server.addHook('onRequest', myHook)
  *
  *   // When ready, start the server:
  *   await server.start()

package/dist/createServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../src/createServer.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EAEP,MAAM,0BAA0B,CAAA;AAqBjC;;;;;;;;;;;;;;;;;;;;;;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAsB,YAAY,CAAC,OAAO,GAAE,mBAAwB,mBA4InE"}

package/dist/createServer.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
 import ansis from "ansis";
 import { config } from "dotenv-defaults";
 import fg from "fast-glob";
@@ -7,21 +8,23 @@ import fastify from "fastify";
 import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { resolveOptions } from "./createServerHelpers.js";
-import { redwoodFastifyAPI } from "./plugins/api.js";
-if (!process.env.REDWOOD_ENV_FILES_LOADED) {
+import { cedarFastifyAPI } from "./plugins/api.js";
+if (!process.env.CEDAR_ENV_FILES_LOADED) {
   config({
     path: path.join(getPaths().base, ".env"),
     defaults: path.join(getPaths().base, ".env.defaults"),
     multiline: true
   });
-  process.env.REDWOOD_ENV_FILES_LOADED = "true";
+  process.env.CEDAR_ENV_FILES_LOADED = "true";
 }
 async function createServer(options = {}) {
   const {
     apiRootPath,
     fastifyServerOptions,
     discoverFunctionsGlob,
+    configureServer,
     configureApiServer,
+    configureGraphQLServer,
     apiPort,
     apiHost
   } = resolveOptions(options);
@@ -60,8 +63,11 @@ async function createServer(options = {}) {
   server.addHook("onRequest", (_req, _reply, done) => {
     getAsyncStoreInstance().run(/* @__PURE__ */ new Map(), done);
   });
-  await server.register(redwoodFastifyAPI, {
-    redwood: {
+  if (configureServer) {
+    await configureServer(server);
+  }
+  await server.register(cedarFastifyAPI, {
+    cedar: {
       apiRootPath,
       fastGlobOptions: {
         ignore: ["**/dist/functions/graphql.js"]
@@ -75,12 +81,13 @@ async function createServer(options = {}) {
     absolute: true
   });
   if (graphqlFunctionPath) {
-    const { redwoodFastifyGraphQLServer } = await import("./plugins/graphql.js");
-    const { __rw_graphqlOptions } = await import(`file://${graphqlFunctionPath}`);
-    await server.register(redwoodFastifyGraphQLServer, {
-      redwood: {
+    const { cedarFastifyGraphQLServer } = await import("./plugins/graphql.js");
+    const { __cedar_graphqlOptions } = await import(pathToFileURL(graphqlFunctionPath).href);
+    await server.register(cedarFastifyGraphQLServer, {
+      cedar: {
         apiRootPath,
-        graphql: __rw_graphqlOptions
+        graphql: __cedar_graphqlOptions,
+        configureServer: configureGraphQLServer
       }
     });
   }

package/dist/createServerHelpers.d.ts

@@ -18,8 +18,21 @@ export interface CreateServerOptions {
      * Defaults to: "dist/functions/**\/*.{ts,js}"
      */
     discoverFunctionsGlob?: string | string[];
-    /** Customise the API server fastify plugin before it is registered */
-    configureApiServer?: (server: Server) => void | Promise<void>;
+    /**
+     * Configure the root fastify instance *before* the api functions and
+     * GraphQL plugins are registered. Use this to register Fastify plugins
+     * that need to run before any routes exist — most notably plugins with a
+     * "global" mode that works by hooking `onRoute` (e.g. `@fastify/compress`),
+     * which only affects routes registered *after* the plugin itself. Simple
+     * request-lifecycle hooks (`onRequest`, `onSend`, etc.) don't have this
+     * restriction and can also be added to the returned server after
+     * `createServer()` resolves.
+     */
+    configureServer?: (server: FastifyInstance) => void | Promise<void>;
+    /** Customise the API functions fastify plugin before it is registered */
+    configureApiServer?: (server: FastifyInstance) => void | Promise<void>;
+    /** Customise the GraphQL fastify plugin before it is registered */
+    configureGraphQLServer?: (server: FastifyInstance) => void | Promise<void>;
     /** Whether to parse args or not. Defaults to `true` */
     parseArgs?: boolean;
     /** The port to listen on. Defaults to what's configured in cedar.toml */

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,EACL,oBAAoB,CAAC,QAAQ,CAAC,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IAEzE;;;OAGG;IACH,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;IAE3D;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAEzC;;;;;;;;;OASG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEnE,yEAAyE;IACzE,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEtE,mEAAmE;IACnE,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE1E,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,0BAuB9C,CAAA;AAeJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BAbS,oBAAoB;GA8F7C"}

package/dist/createServerHelpers.js

@@ -1,8 +1,8 @@
 import { parseArgs } from "util";
 import { coerceRootPath } from "@cedarjs/fastify-web/dist/helpers.js";
-import { getAPIHost, getAPIPort } from "./cliHelpers.js";
+import { getAPIHost, getAPIPort, getAPIRootPath } from "./cliHelpers.js";
 const getDefaultCreateServerOptions = () => ({
-  apiRootPath: "/",
+  apiRootPath: getAPIRootPath(),
   logger: {
     level: process.env.LOG_LEVEL ?? (process.env.NODE_ENV === "development" ? "debug" : "warn")
   },
@@ -12,11 +12,19 @@ const getDefaultCreateServerOptions = () => ({
     // 100MB
   },
   discoverFunctionsGlob: "dist/functions/**/*.{ts,js}",
+  configureServer: () => {
+  },
   configureApiServer: () => {
   },
+  configureGraphQLServer: () => {
+  },
   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;
@@ -32,7 +40,9 @@ function resolveOptions(options = {}, args) {
       bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
     discoverFunctionsGlob: options.discoverFunctionsGlob ?? defaults.discoverFunctionsGlob,
+    configureServer: options.configureServer ?? defaults.configureServer,
     configureApiServer: options.configureApiServer ?? defaults.configureApiServer,
+    configureGraphQLServer: options.configureGraphQLServer ?? defaults.configureGraphQLServer,
     apiHost: options.apiHost ?? defaults.apiHost,
     apiPort: options.apiPort ?? defaults.apiPort
   };

package/dist/fastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAiBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GAsCtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}
+{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAkBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GA2CtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}

package/dist/fastify.js

@@ -10,6 +10,7 @@ const DEFAULT_OPTIONS = {
   }
 };
 let isServerConfigLoaded = false;
+let loadedServerConfigPath;
 let serverConfigFile = {
   config: DEFAULT_OPTIONS,
   configureFastify: async (fastify, options) => {
@@ -28,6 +29,9 @@ async function loadFastifyConfig() {
   if (!fs.existsSync(serverConfigPath)) {
     return serverConfigFile;
   }
+  if (loadedServerConfigPath !== serverConfigPath) {
+    isServerConfigLoaded = false;
+  }
   if (!isServerConfigLoaded) {
     console.log(`Loading server config from ${serverConfigPath}`);
     console.log(`Loading server config from URL file://${serverConfigPath}`);
@@ -36,6 +40,7 @@ async function loadFastifyConfig() {
     );
     const config = await import(pathToFileURL(serverConfigPath).href);
     serverConfigFile = { ...config.default };
+    loadedServerConfigPath = serverConfigPath;
     isServerConfigLoaded = true;
   }
   return serverConfigFile;

package/dist/logFormatter/formatters.d.ts

@@ -11,7 +11,7 @@ export declare const formatData: (data?: Record<string, unknown>) => string | un
 export declare const formatDate: (instant: Date) => string;
 export declare const formatErrorProp: (errorPropValue: Record<string, unknown>) => string;
 export declare const formatLevel: (level: any) => string;
-export declare const formatLoadTime: (elapsedTime: any) => string;
+export declare const formatLoadTime: (elapsedTime: string) => string;
 export declare const formatMessage: (logData: any) => string | undefined;
 export declare const formatMethod: (method: string) => string;
 export declare const formatRequestId: (requestId: string) => string;

package/dist/logFormatter/formatters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../../src/logFormatter/formatters.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,OAAO,CAAA;AAE3B,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAO3C,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,MAAM,EASrC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,wBAExD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,wBAE7D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,wBAEtD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,WAAW,MAAM,YAE5C,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,WAI9C,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAgB3D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAQxD,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,IAAI,WAOvC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,gBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAgBtE,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,OAAO,GAAG,WAIrC,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,aAAa,GAAG,WAI9C,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,GAAG,uBAyBzC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,WAE1C,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,WAAW,MAAM,WAEhD,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,IAAI,MAAM,WAElC,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,WAEtC,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,WAYhD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,eAAe,MAAM,WAExD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAQ1D,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,gBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAYxC,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,YAAY,MAAM,WAGlD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAMnE,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAQ3D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,KAAK,MAAM,WAEpC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,WAAW,MAAM,WAEhD,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,OAAO,GAAG,YAEjC,CAAA"}
+{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../../src/logFormatter/formatters.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,OAAO,OAAO,CAAA;AAE3B,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAO3C,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,MAAM,EASrC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,wBAExD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,wBAE7D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,wBAEtD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,WAAW,MAAM,YAE5C,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,WAI9C,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAgB3D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAQxD,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,IAAI,WAOvC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,gBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAgBtE,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,OAAO,GAAG,WAIrC,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,WAIjD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,GAAG,uBAyBzC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,WAE1C,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,WAAW,MAAM,WAEhD,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,IAAI,MAAM,WAElC,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,WAEtC,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,WAYhD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,eAAe,MAAM,WAExD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAQ1D,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,gBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAYxC,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,YAAY,MAAM,WAGlD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAMnE,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAQ3D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,KAAK,MAAM,WAEpC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,WAAW,MAAM,WAEhD,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,OAAO,GAAG,YAEjC,CAAA"}

package/dist/logFormatter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logFormatter/index.ts"],"names":[],"mappings":"AA8BA,eAAO,MAAM,YAAY,oBACG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WA0L3D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logFormatter/index.ts"],"names":[],"mappings":"AA8BA,eAAO,MAAM,YAAY,oBACG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WA6L3D,CAAA"}

package/dist/plugins/api.d.ts

@@ -1,14 +1,13 @@
 import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyInstance } from 'fastify';
-import type { Server } from '../createServerHelpers.js';
-export interface RedwoodFastifyAPIOptions {
-    redwood: {
+export interface CedarFastifyAPIOptions {
+    cedar: {
         apiRootPath?: string;
         fastGlobOptions?: FastGlobOptions;
         discoverFunctionsGlob?: string | string[];
         loadUserConfig?: boolean;
-        configureServer?: (server: Server) => void | Promise<void>;
+        configureServer?: (server: FastifyInstance) => void | Promise<void>;
     };
 }
-export declare function redwoodFastifyAPI(fastify: FastifyInstance, opts: RedwoodFastifyAPIOptions): Promise<void>;
+export declare function cedarFastifyAPI(fastify: FastifyInstance, opts: CedarFastifyAPIOptions): Promise<void>;
 //# sourceMappingURL=api.d.ts.map

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,wBAAwB;IACvC,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;KAC3D,CAAA;CACF;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,iBA4C/B"}
+{"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;AAW9C,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,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAIpE,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBAgD7B"}

package/dist/plugins/api.js

@@ -4,12 +4,12 @@ import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
 import { coerceRootPath } from "@cedarjs/fastify-web/dist/helpers.js";
 import { loadFastifyConfig } from "../fastify.js";
 import { lambdaRequestHandler, loadFunctionsFromDist } from "./lambdaLoader.js";
-async function redwoodFastifyAPI(fastify, opts) {
-  const redwoodOptions = opts.redwood ?? {};
-  redwoodOptions.apiRootPath ??= "/";
-  redwoodOptions.apiRootPath = coerceRootPath(redwoodOptions.apiRootPath);
-  redwoodOptions.fastGlobOptions ??= {};
-  redwoodOptions.loadUserConfig ??= false;
+async function cedarFastifyAPI(fastify, opts) {
+  const cedarOptions = opts.cedar ?? {};
+  cedarOptions.apiRootPath ??= "/";
+  cedarOptions.apiRootPath = coerceRootPath(cedarOptions.apiRootPath);
+  cedarOptions.fastGlobOptions ??= {};
+  cedarOptions.loadUserConfig ??= false;
   fastify.register(fastifyUrlData);
   await fastify.register(fastifyRawBody);
   fastify.addHook("onRequest", (_req, _reply, done) => {
@@ -20,25 +20,25 @@ async function redwoodFastifyAPI(fastify, opts) {
     { parseAs: "string" },
     fastify.defaultTextParser
   );
-  if (redwoodOptions.loadUserConfig) {
+  if (cedarOptions.loadUserConfig) {
     const { configureFastify } = await loadFastifyConfig();
     if (configureFastify) {
       await configureFastify(fastify, {
         side: "api",
-        apiRootPath: redwoodOptions.apiRootPath
+        apiRootPath: cedarOptions.apiRootPath
       });
     }
   }
-  if (redwoodOptions.configureServer) {
-    await redwoodOptions.configureServer(fastify);
+  if (cedarOptions.configureServer) {
+    await cedarOptions.configureServer(fastify);
   }
-  fastify.all(`${redwoodOptions.apiRootPath}:routeName`, lambdaRequestHandler);
-  fastify.all(`${redwoodOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
+  fastify.all(`${cedarOptions.apiRootPath}:routeName`, lambdaRequestHandler);
+  fastify.all(`${cedarOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
   await loadFunctionsFromDist({
-    fastGlobOptions: redwoodOptions.fastGlobOptions,
-    discoverFunctionsGlob: redwoodOptions.discoverFunctionsGlob
+    fastGlobOptions: cedarOptions.fastGlobOptions,
+    discoverFunctionsGlob: cedarOptions.discoverFunctionsGlob
   });
 }
 export {
-  redwoodFastifyAPI
+  cedarFastifyAPI
 };

package/dist/plugins/graphql.d.ts

@@ -1,10 +1,27 @@
 import type { FastifyInstance } from 'fastify';
 import type { GraphQLYogaOptions } from '@cedarjs/graphql-server';
-export interface RedwoodFastifyGraphQLOptions {
-    redwood: {
+export interface CedarFastifyGraphQLOptions {
+    cedar: {
         apiRootPath?: string;
         graphql?: GraphQLYogaOptions;
+        configureServer?: (server: FastifyInstance) => void | Promise<void>;
     };
 }
-export declare function redwoodFastifyGraphQLServer(fastify: FastifyInstance, options: RedwoodFastifyGraphQLOptions): Promise<void>;
+export declare function cedarFastifyGraphQLServer(fastify: FastifyInstance, options: CedarFastifyGraphQLOptions): Promise<void>;
+/**
+ * Detects errors that indicate the client disconnected before the response
+ * finished, rather than a genuine server-side failure.
+ *
+ * `ERR_STREAM_PREMATURE_CLOSE` can surface from the underlying Node stream
+ * closing early. The `DOMException` named `AbortError` is thrown by Yoga
+ * when the AbortSignal wired up in `createFetchRequest`'s
+ * `reply.raw.on('close', ...)` handler is aborted, which only happens when
+ * the client itself has gone away.
+ *
+ * The `DOMException` check (rather than just `name === 'AbortError'`) is
+ * deliberate: a resolver or hook could throw a plain `Error` renamed to
+ * `AbortError`, which would otherwise be misclassified as a benign
+ * disconnect and hide a real server-side failure behind a 499.
+ */
+export declare function isClientDisconnectError(e: unknown): boolean;
 //# 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":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AAM3D,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,iBA8FtC"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,SAAS,CAAA;AAMhB,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;QAC5B,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KACpE,CAAA;CACF;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,0BAA0B,iBAiIpC;AAMD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAc3D"}