@cedarjs/api-server 4.0.0 → 4.0.1-next.67

package/dist/cjs/createServer.js

@@ -32,7 +32,8 @@ __export(createServer_exports, {
 });
 module.exports = __toCommonJS(createServer_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
-var import_path = __toESM(require("path"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_node_url = require("node:url");
 var import_ansis = __toESM(require("ansis"), 1);
 var import_dotenv_defaults = require("dotenv-defaults");
 var import_fast_glob = __toESM(require("fast-glob"), 1);
@@ -43,8 +44,8 @@ var import_createServerHelpers = require("./createServerHelpers.js");
 var import_api = require("./plugins/api.js");
 if (!process.env.CEDAR_ENV_FILES_LOADED) {
   (0, import_dotenv_defaults.config)({
-    path: import_path.default.join((0, import_project_config.getPaths)().base, ".env"),
-    defaults: import_path.default.join((0, import_project_config.getPaths)().base, ".env.defaults"),
+    path: import_node_path.default.join((0, import_project_config.getPaths)().base, ".env"),
+    defaults: import_node_path.default.join((0, import_project_config.getPaths)().base, ".env.defaults"),
     multiline: true
   });
   process.env.CEDAR_ENV_FILES_LOADED = "true";
@@ -58,7 +59,7 @@ async function createServer(options = {}) {
     apiPort,
     apiHost
   } = (0, import_createServerHelpers.resolveOptions)(options);
-  const serverConfigPath = import_path.default.join(
+  const serverConfigPath = import_node_path.default.join(
     (0, import_project_config.getPaths)().base,
     (0, import_project_config.getConfig)().api.serverConfig
   );
@@ -109,7 +110,7 @@ async function createServer(options = {}) {
   });
   if (graphqlFunctionPath) {
     const { redwoodFastifyGraphQLServer } = await import("./plugins/graphql.js");
-    const { __rw_graphqlOptions } = await import(`file://${graphqlFunctionPath}`);
+    const { __rw_graphqlOptions } = await import((0, import_node_url.pathToFileURL)(graphqlFunctionPath).href);
     await server.register(redwoodFastifyGraphQLServer, {
       redwood: {
         apiRootPath,

package/dist/cjs/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/cjs/fastify.js

@@ -45,6 +45,7 @@ const DEFAULT_OPTIONS = {
   }
 };
 let isServerConfigLoaded = false;
+let loadedServerConfigPath;
 let serverConfigFile = {
   config: DEFAULT_OPTIONS,
   configureFastify: async (fastify, options) => {
@@ -63,6 +64,9 @@ async function loadFastifyConfig() {
   if (!import_node_fs.default.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}`);
@@ -71,6 +75,7 @@ async function loadFastifyConfig() {
     );
     const config = await import((0, import_url.pathToFileURL)(serverConfigPath).href);
     serverConfigFile = { ...config.default };
+    loadedServerConfigPath = serverConfigPath;
     isServerConfigLoaded = true;
   }
   return serverConfigFile;

package/dist/cjs/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;KAC3D,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;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"}

package/dist/cjs/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;AAO3D,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,iBAmGtC"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAA+B,MAAM,SAAS,CAAA;AAO3E,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,iBAuGtC"}

package/dist/cjs/plugins/graphql.js

@@ -31,9 +31,11 @@ __export(graphql_exports, {
   redwoodFastifyGraphQLServer: () => redwoodFastifyGraphQLServer
 });
 module.exports = __toCommonJS(graphql_exports);
+var import_node_url = require("node:url");
 var import_multipart = __toESM(require("@fastify/multipart"), 1);
 var import_url_data = __toESM(require("@fastify/url-data"), 1);
 var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_runtime = require("@cedarjs/api/runtime");
 var import_store = require("@cedarjs/context/dist/store");
 var import_helpers = require("@cedarjs/fastify-web/dist/helpers.js");
 var import_graphql_server = require("@cedarjs/graphql-server");
@@ -55,7 +57,7 @@ async function redwoodFastifyGraphQLServer(fastify, options) {
         cwd: (0, import_project_config.getPaths)().api.base,
         absolute: true
       });
-      const filePath = `file://${graphqlFunctionPath}`;
+      const filePath = (0, import_node_url.pathToFileURL)(graphqlFunctionPath).href;
       const { __rw_graphqlOptions } = await import(filePath);
       if (!__rw_graphqlOptions) {
         return;
@@ -63,33 +65,28 @@ async function redwoodFastifyGraphQLServer(fastify, options) {
       redwoodOptions.graphql = __rw_graphqlOptions;
     }
     const graphqlOptions = redwoodOptions.graphql;
-    if (graphqlOptions?.realtime) {
-      const { useCedarRealtime } = await import("@cedarjs/realtime");
-      const originalExtraPlugins = graphqlOptions.extraPlugins ?? [];
-      originalExtraPlugins.push(
-        // This type cast is needed because useCedarRealtime returns an
-        // EnvelopPlugin and here we need a YogaPlugin. I can't change the
-        // return type of `useCedarRealtime` yet, because it'd be a breaking
-        // change.
-        useCedarRealtime(graphqlOptions.realtime)
-      );
-      graphqlOptions.extraPlugins = originalExtraPlugins;
-      if (graphqlOptions.realtime.subscriptions) {
-        method.push("PUT");
-      }
+    if (graphqlOptions?.realtime?.subscriptions) {
+      method.push("PUT");
     }
-    const { yoga } = (0, import_graphql_server.createGraphQLYoga)(graphqlOptions);
+    const { yoga } = await (0, import_graphql_server.createGraphQLYoga)(graphqlOptions);
     const graphqlEndpoint = trimSlashes(yoga.graphqlEndpoint);
     const routePaths = ["", "/health", "/readiness", "/stream"];
     for (const routePath of routePaths) {
       fastify.route({
         url: `${redwoodOptions.apiRootPath}${graphqlEndpoint}${routePath}`,
         method,
-        handler: (req, reply) => yoga.handleNodeRequestAndResponse(req, reply, {
-          req,
-          reply,
-          event: (0, import_awsLambdaFastify.lambdaEventForFastifyRequest)(req)
-        })
+        handler: async (req, _reply) => {
+          const request = createFetchRequest(req);
+          const cedarContext = await (0, import_runtime.buildCedarContext)(request, {
+            authDecoder: graphqlOptions.authDecoder
+          });
+          return yoga.handle(request, {
+            request,
+            cedarContext,
+            event: (0, import_awsLambdaFastify.lambdaEventForFastifyRequest)(req),
+            requestContext: void 0
+          });
+        }
       });
     }
     fastify.addHook("onReady", (done) => {
@@ -109,6 +106,15 @@ async function redwoodFastifyGraphQLServer(fastify, options) {
 function trimSlashes(path) {
   return path.replace(/^\/|\/$/g, "");
 }
+function createFetchRequest(req) {
+  const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.body === "string" ? req.body : req.body ? JSON.stringify(req.body) : void 0;
+  const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+  return new Request(href, {
+    method: req.method,
+    headers: req.headers,
+    body: requestBody
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   redwoodFastifyGraphQLServer

package/dist/cjs/plugins/lambdaLoader.d.ts

@@ -1,8 +1,16 @@
 import type { Handler } from 'aws-lambda';
 import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyReply, FastifyRequest, RequestGenericInterface } from 'fastify';
-export type Lambdas = Record<string, Handler>;
-export declare const LAMBDA_FUNCTIONS: Lambdas;
+import type { CedarHandler, CedarRouteRecord } from '@cedarjs/api/runtime';
+export declare const LAMBDA_FUNCTIONS: Map<string, Handler>;
+export declare const CEDAR_HANDLERS: Map<string, CedarHandler>;
+/**
+ * Exports a copy of the Cedar route manifest.
+ *
+ * This is intended to be used to later build WinterTC compatible `fetch`
+ * exports
+ */
+export declare const getCedarRouteManifest: () => CedarRouteRecord[];
 export declare const setLambdaFunctions: (foundFunctions: string[]) => Promise<void>;
 type LoadFunctionsFromDistOptions = {
     fastGlobOptions?: FastGlobOptions;
@@ -15,10 +23,12 @@ interface LambdaHandlerRequest extends RequestGenericInterface {
     };
 }
 /**
- This will take a fastify request
- Then convert it to a lambdaEvent, and pass it to the the appropriate handler for the routeName
- The LAMBDA_FUNCTIONS lookup has been populated already by this point
- **/
+ * This will take a fastify request
+ * Then convert it to a lambdaEvent, and pass it to the the appropriate handler
+ * for the routeName
+ * The CEDAR_HANDLERS and LAMBDA_FUNCTIONS maps have been populated already by
+ * this point
+ */
 export declare const lambdaRequestHandler: (req: FastifyRequest<LambdaHandlerRequest>, reply: FastifyReply) => Promise<void>;
 export {};
 //# sourceMappingURL=lambdaLoader.d.ts.map

package/dist/cjs/plugins/lambdaLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lambdaLoader.d.ts","sourceRoot":"","sources":["../../../src/plugins/lambdaLoader.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAOhB,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAC7C,eAAO,MAAM,gBAAgB,EAAE,OAAY,CAAA;AAI3C,eAAO,MAAM,kBAAkB,GAAU,gBAAgB,MAAM,EAAE,kBAsDhE,CAAA;AAED,KAAK,4BAA4B,GAAG;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1C,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAChC,UAAS,4BAAiC,kBAe3C,CAAA;AA0BD,UAAU,oBAAqB,SAAQ,uBAAuB;IAC5D,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED;;;;IAII;AACJ,eAAO,MAAM,oBAAoB,GAC/B,KAAK,cAAc,CAAC,oBAAoB,CAAC,EACzC,OAAO,YAAY,kBAsBpB,CAAA"}
+{"version":3,"file":"lambdaLoader.d.ts","sourceRoot":"","sources":["../../../src/plugins/lambdaLoader.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAEjB,MAAM,sBAAsB,CAAA;AAO7B,eAAO,MAAM,gBAAgB,sBAA6B,CAAA;AAC1D,eAAO,MAAM,cAAc,2BAAkC,CAAA;AAG7D;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,0BAAgC,CAAA;AAIlE,eAAO,MAAM,kBAAkB,GAAU,gBAAgB,MAAM,EAAE,kBAuGhE,CAAA;AAED,KAAK,4BAA4B,GAAG;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1C,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAChC,UAAS,4BAAiC,kBAe3C,CAAA;AA0BD,UAAU,oBAAqB,SAAQ,uBAAuB;IAC5D,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAC/B,KAAK,cAAc,CAAC,oBAAoB,CAAC,EACzC,OAAO,YAAY,kBAqEpB,CAAA"}

package/dist/cjs/plugins/lambdaLoader.js

@@ -28,26 +28,38 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var lambdaLoader_exports = {};
 __export(lambdaLoader_exports, {
+  CEDAR_HANDLERS: () => CEDAR_HANDLERS,
   LAMBDA_FUNCTIONS: () => LAMBDA_FUNCTIONS,
+  getCedarRouteManifest: () => getCedarRouteManifest,
   lambdaRequestHandler: () => lambdaRequestHandler,
   loadFunctionsFromDist: () => loadFunctionsFromDist,
   setLambdaFunctions: () => setLambdaFunctions
 });
 module.exports = __toCommonJS(lambdaLoader_exports);
-var import_path = __toESM(require("path"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_node_url = require("node:url");
 var import_ansis = __toESM(require("ansis"), 1);
 var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_termi_link = require("termi-link");
+var import_runtime = require("@cedarjs/api/runtime");
 var import_project_config = require("@cedarjs/project-config");
 var import_awsLambdaFastify = require("../requestHandlers/awsLambdaFastify.js");
 var import_utils = require("../utils.js");
-const LAMBDA_FUNCTIONS = {};
+const LAMBDA_FUNCTIONS = /* @__PURE__ */ new Map();
+const CEDAR_HANDLERS = /* @__PURE__ */ new Map();
+const cedarRouteManifest = [];
+const getCedarRouteManifest = () => [...cedarRouteManifest];
 const setLambdaFunctions = async (foundFunctions) => {
   const tsImport = Date.now();
   console.log(import_ansis.default.dim.italic("Importing Server Functions... "));
+  cedarRouteManifest.length = 0;
+  LAMBDA_FUNCTIONS.clear();
+  CEDAR_HANDLERS.clear();
   const imports = foundFunctions.map(async (fnPath) => {
     const ts = Date.now();
-    const routeName = import_path.default.basename(fnPath).replace(".js", "");
-    const fnImport = await import(`file://${fnPath}`);
+    const routeName = import_node_path.default.basename(fnPath).replace(".js", "");
+    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
+    const fnImport = await import((0, import_node_url.pathToFileURL)(fnPath).href);
     const handler = (() => {
       if ("handler" in fnImport) {
         return fnImport.handler;
@@ -59,17 +71,39 @@ const setLambdaFunctions = async (foundFunctions) => {
       }
       return void 0;
     })();
-    LAMBDA_FUNCTIONS[routeName] = handler;
-    if (!handler) {
+    const cedarHandler = (() => {
+      if ("handleRequest" in fnImport && typeof fnImport.handleRequest === "function") {
+        return fnImport.handleRequest;
+      }
+      if ("default" in fnImport && fnImport.default && "handleRequest" in fnImport.default && typeof fnImport.default.handleRequest === "function") {
+        return fnImport.default.handleRequest;
+      }
+      return void 0;
+    })();
+    if (handler) {
+      LAMBDA_FUNCTIONS.set(routeName, handler);
+    }
+    if (cedarHandler) {
+      CEDAR_HANDLERS.set(routeName, cedarHandler);
+    } else if (handler) {
+      CEDAR_HANDLERS.set(routeName, (0, import_runtime.wrapLegacyHandler)(handler));
+    }
+    if (!handler && !cedarHandler) {
       console.warn(
         routeName,
         "at",
         fnPath,
-        "does not have a function called handler defined."
+        "does not have a function called handler or handleRequest defined."
       );
     }
+    cedarRouteManifest.push({
+      path: routePath,
+      methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+      type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
+      entry: fnPath
+    });
     console.log(
-      import_ansis.default.magenta("/" + routeName),
+      (0, import_termi_link.terminalLink)(import_ansis.default.magenta("/" + routeName), (0, import_node_url.pathToFileURL)(fnPath).href),
       import_ansis.default.dim.italic(Date.now() - ts + " ms")
     );
   });
@@ -84,7 +118,7 @@ const loadFunctionsFromDist = async (options = {}) => {
     options: options?.fastGlobOptions,
     discoverFunctionsGlob: options?.discoverFunctionsGlob
   });
-  const i = serverFunctions.findIndex((x) => import_path.default.basename(x) === "graphql.js");
+  const i = serverFunctions.findIndex((x) => import_node_path.default.basename(x) === "graphql.js");
   if (i >= 0) {
     const graphQLFn = serverFunctions.splice(i, 1)[0];
     serverFunctions.unshift(graphQLFn);
@@ -108,14 +142,43 @@ const findApiDistFunctions = (params) => {
 };
 const lambdaRequestHandler = async (req, reply) => {
   const { routeName } = req.params;
-  if (!LAMBDA_FUNCTIONS[routeName]) {
+  const cedarHandlerCandidate = CEDAR_HANDLERS.get(routeName);
+  const cedarHandler = typeof cedarHandlerCandidate === "function" ? cedarHandlerCandidate : void 0;
+  if (cedarHandler) {
+    const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.rawBody === "string" ? req.rawBody : req.rawBody ? Buffer.from(req.rawBody).toString() : void 0;
+    const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+    const request = new Request(href, {
+      method: req.method,
+      headers: req.headers,
+      body: requestBody
+    });
+    const ctx = await (0, import_runtime.buildCedarContext)(request, {
+      params: {
+        routeName
+      }
+    });
+    const response = await cedarHandler(request, ctx);
+    reply.status(response.status);
+    response.headers.forEach((value, name) => {
+      reply.header(name, value);
+    });
+    const body = await response.arrayBuffer();
+    reply.send(Buffer.from(body));
+    return;
+  }
+  const handler = LAMBDA_FUNCTIONS.get(routeName);
+  if (handler) {
+    return (0, import_awsLambdaFastify.requestHandler)(req, reply, handler);
+  } else {
     const errorMessage = `Function "${routeName}" was not found.`;
     req.log.error(errorMessage);
     reply.status(404);
     if (process.env.NODE_ENV === "development") {
       const devError = {
         error: errorMessage,
-        availableFunctions: Object.keys(LAMBDA_FUNCTIONS)
+        availableFunctions: [
+          .../* @__PURE__ */ new Set([...LAMBDA_FUNCTIONS.keys(), ...CEDAR_HANDLERS.keys()])
+        ]
       };
       reply.send(devError);
     } else {
@@ -123,11 +186,12 @@ const lambdaRequestHandler = async (req, reply) => {
     }
     return;
   }
-  return (0, import_awsLambdaFastify.requestHandler)(req, reply, LAMBDA_FUNCTIONS[routeName]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  CEDAR_HANDLERS,
   LAMBDA_FUNCTIONS,
+  getCedarRouteManifest,
   lambdaRequestHandler,
   loadFunctionsFromDist,
   setLambdaFunctions

package/dist/cjs/requestHandlers/awsLambdaFastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"awsLambdaFastify.d.ts","sourceRoot":"","sources":["../../../src/requestHandlers/awsLambdaFastify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,OAAO,EAER,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAK3D,eAAO,MAAM,4BAA4B,GACvC,SAAS,cAAc,KACtB,oBAyBF,CAAA;AAoCD,eAAO,MAAM,cAAc,GACzB,KAAK,cAAc,EACnB,OAAO,YAAY,EACnB,SAAS,OAAO,kBAmCjB,CAAA"}
+{"version":3,"file":"awsLambdaFastify.d.ts","sourceRoot":"","sources":["../../../src/requestHandlers/awsLambdaFastify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,OAAO,EAGR,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAK3D,eAAO,MAAM,4BAA4B,GACvC,SAAS,cAAc,KACtB,oBA6BF,CAAA;AAoCD,eAAO,MAAM,cAAc,GACzB,KAAK,cAAc,EACnB,OAAO,YAAY,EACnB,SAAS,OAAO,kBAmCjB,CAAA"}

package/dist/cjs/requestHandlers/awsLambdaFastify.js

@@ -35,14 +35,18 @@ const lambdaEventForFastifyRequest = (request) => {
   );
   return {
     httpMethod: request.method,
-    headers: request.headers,
+    headers: {
+      "x-forwarded-proto": request.protocol,
+      ...request.headers
+    },
     path: request.urlData("path"),
     queryStringParameters: qsParams,
     requestContext: {
       requestId: request.id,
       identity: {
         sourceIp: request.ip
-      }
+      },
+      domainName: request.hostname
     },
     ...(0, import_utils.parseBody)(request.rawBody || "")
     // adds `body` and `isBase64Encoded`

package/dist/cjs/udDispatcher.d.ts

@@ -0,0 +1,28 @@
+import type { EntryMeta } from '@universal-deploy/store';
+import type { Fetchable } from './udFetchable.js';
+export interface CedarDispatcherOptions {
+    apiRootPath?: string;
+    discoverFunctionsGlob?: string | string[];
+    /**
+     * Cache-bust token appended to dynamic ESM imports. Use this in dev to
+     * bypass Node.js's ESM module cache after a rebuild. Production builds
+     * should omit this.
+     */
+    cacheBust?: string | number;
+}
+export interface CedarDispatcherResult {
+    fetchable: Fetchable;
+    registrations: EntryMeta[];
+}
+/**
+ * Shared aggregate Cedar API dispatcher used by
+ * `cedarUniversalDeployPlugin` (via `virtual:cedar-api`).
+ *
+ * Discovers Cedar API functions in `api/dist/functions/`, builds a rou3 router
+ * and a map of route names to Fetchables, then returns a single Fetchable that
+ * routes incoming Fetch-API requests to the correct per-function handler.
+ * Also returns the list of `EntryMeta` registrations so callers can forward
+ * them to `@universal-deploy/store` via `addEntry()`.
+ */
+export declare function buildCedarDispatcher(options?: CedarDispatcherOptions): Promise<CedarDispatcherResult>;
+//# sourceMappingURL=udDispatcher.d.ts.map

package/dist/cjs/udDispatcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"udDispatcher.d.ts","sourceRoot":"","sources":["../../src/udDispatcher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAUxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAgBjD,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,SAAS,CAAA;IACpB,aAAa,EAAE,SAAS,EAAE,CAAA;CAC3B;AA6BD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CAmNhC"}

package/dist/cjs/udDispatcher.js

@@ -0,0 +1,192 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var udDispatcher_exports = {};
+__export(udDispatcher_exports, {
+  buildCedarDispatcher: () => buildCedarDispatcher
+});
+module.exports = __toCommonJS(udDispatcher_exports);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_node_url = require("node:url");
+var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_rou3 = require("rou3");
+var import_runtime = require("@cedarjs/api/runtime");
+var import_store = require("@cedarjs/context/dist/store");
+var import_project_config = require("@cedarjs/project-config");
+var import_udFetchable = require("./udFetchable.js");
+const ALL_HTTP_METHODS = [
+  "GET",
+  "HEAD",
+  "POST",
+  "PUT",
+  "DELETE",
+  "PATCH",
+  "OPTIONS",
+  "CONNECT",
+  "TRACE"
+];
+const GRAPHQL_METHODS = ["GET", "POST", "OPTIONS"];
+function normalizeApiRootPath(rootPath) {
+  let normalized = rootPath;
+  if (!normalized.startsWith("/")) {
+    normalized = "/" + normalized;
+  }
+  if (!normalized.endsWith("/")) {
+    normalized = normalized + "/";
+  }
+  return normalized;
+}
+async function buildCedarDispatcher(options) {
+  const normalizedApiRootPath = normalizeApiRootPath(
+    options?.apiRootPath ?? "/"
+  );
+  const discoverFunctionsGlob = options?.discoverFunctionsGlob ?? "dist/functions/**/*.{ts,js}";
+  const serverFunctions = import_fast_glob.default.sync(discoverFunctionsGlob, {
+    cwd: (0, import_project_config.getPaths)().api.base,
+    deep: 2,
+    absolute: true
+  });
+  const graphqlIdx = serverFunctions.findIndex(
+    (x) => import_node_path.default.basename(x, import_node_path.default.extname(x)) === "graphql"
+  );
+  if (graphqlIdx >= 0) {
+    const [graphqlFn] = serverFunctions.splice(graphqlIdx, 1);
+    serverFunctions.unshift(graphqlFn);
+  }
+  const fetchableMap = /* @__PURE__ */ new Map();
+  const router = (0, import_rou3.createRouter)();
+  const registrations = [];
+  for (const fnPath of serverFunctions) {
+    const routeName = import_node_path.default.basename(fnPath, import_node_path.default.extname(fnPath));
+    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
+    const importUrl = options?.cacheBust ? `${(0, import_node_url.pathToFileURL)(fnPath).href}?t=${options.cacheBust}` : (0, import_node_url.pathToFileURL)(fnPath).href;
+    const fnImport = await import(importUrl);
+    if ("__rw_graphqlOptions" in fnImport && fnImport.__rw_graphqlOptions != null) {
+      const { createGraphQLYoga } = await import("@cedarjs/graphql-server");
+      const graphqlOptions = fnImport.__rw_graphqlOptions;
+      const { yoga } = await createGraphQLYoga(graphqlOptions);
+      const graphqlFetchable = {
+        async fetch(request) {
+          const cedarContext = await (0, import_runtime.buildCedarContext)(request, {
+            authDecoder: graphqlOptions.authDecoder
+          });
+          const event = await (0, import_runtime.requestToLegacyEvent)(request, cedarContext);
+          return yoga.handle(request, {
+            request,
+            cedarContext,
+            event,
+            requestContext: void 0
+          });
+        }
+      };
+      fetchableMap.set(routeName, graphqlFetchable);
+      registrations.push({
+        id: routePath,
+        route: routePath,
+        method: [...GRAPHQL_METHODS]
+      });
+      for (const method of GRAPHQL_METHODS) {
+        (0, import_rou3.addRoute)(router, method, routePath, routeName);
+        (0, import_rou3.addRoute)(router, method, `${routePath}/**`, routeName);
+      }
+      continue;
+    }
+    const cedarHandler = (() => {
+      if ("handle" in fnImport && typeof fnImport.handle === "function") {
+        return fnImport.handle;
+      }
+      if ("default" in fnImport && fnImport.default != null && "handle" in fnImport.default && typeof fnImport.default.handle === "function") {
+        return fnImport.default.handle;
+      }
+      return void 0;
+    })();
+    if (!cedarHandler) {
+      console.warn(
+        routeName,
+        "at",
+        fnPath,
+        "does not export a Fetch-native `handle` function and will not be served by the Universal Deploy server. Migrate to `export async function handle(request, ctx)` or use `yarn cedar serve` for legacy Lambda-shaped handler support."
+      );
+      continue;
+    }
+    const handler = cedarHandler;
+    fetchableMap.set(routeName, (0, import_udFetchable.createCedarFetchable)(handler));
+    registrations.push({
+      id: routePath,
+      route: routePath
+      // method omitted → matches all HTTP methods per @universal-deploy/store docs
+    });
+    for (const method of ALL_HTTP_METHODS) {
+      (0, import_rou3.addRoute)(router, method, routePath, routeName);
+      (0, import_rou3.addRoute)(router, method, `${routePath}/**`, routeName);
+    }
+  }
+  const fetchable = {
+    fetch(request) {
+      return (0, import_store.getAsyncStoreInstance)().run(
+        /* @__PURE__ */ new Map(),
+        async () => {
+          const url = new URL(request.url);
+          let routePathname = url.pathname;
+          if (normalizedApiRootPath !== "/" && routePathname.startsWith(normalizedApiRootPath)) {
+            routePathname = routePathname.slice(
+              normalizedApiRootPath.length - 1
+            );
+          }
+          if (!routePathname.startsWith("/")) {
+            routePathname = "/" + routePathname;
+          }
+          const match = (0, import_rou3.findRoute)(router, request.method, routePathname);
+          if (!match) {
+            return new Response("Not Found", { status: 404 });
+          }
+          const matchedRouteName = match.data;
+          const fnFetchable = fetchableMap.get(matchedRouteName);
+          if (!fnFetchable) {
+            return new Response("Not Found", { status: 404 });
+          }
+          try {
+            return await fnFetchable.fetch(request);
+          } catch (err) {
+            console.error(
+              "Unhandled error in fetch handler for route",
+              matchedRouteName,
+              err
+            );
+            return new Response("Internal Server Error", { status: 500 });
+          }
+        }
+      );
+    }
+  };
+  return { fetchable, registrations };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildCedarDispatcher
+});

package/dist/cjs/udFetchable.d.ts

@@ -0,0 +1,12 @@
+import type { CedarHandler } from '@cedarjs/api/runtime';
+export interface Fetchable {
+    fetch(request: Request): Response | Promise<Response>;
+}
+/**
+ * Wraps a CedarHandler in a WinterTC-compatible Fetchable.
+ *
+ * The Fetchable calls buildCedarContext to produce a CedarRequestContext,
+ * then delegates to the handler.
+ */
+export declare function createCedarFetchable(handler: CedarHandler): Fetchable;
+//# sourceMappingURL=udFetchable.d.ts.map

package/dist/cjs/udFetchable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"udFetchable.d.ts","sourceRoot":"","sources":["../../src/udFetchable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;CACtD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,CAOrE"}