Fix merge conflicts and add termi-link dependency

Rebase onto current main and add missing termi-link to api-server dependencies.

Author: lisa-assistant

packages/api-server/package.json

@@ -87,10 +87,12 @@
   "main": "./dist/createServer.js",
   "types": "./dist/createServer.d.ts",
   "bin": {
+    "cedar-api-server-watch": "./dist/cjs/watch.js",
+    "cedar-log-formatter": "./dist/cjs/logFormatter/bin.js",
+    "cedar-server": "./dist/cjs/bin.js",
     "cedarjs-api-server-watch": "./dist/watch.js",
     "cedarjs-log-formatter": "./dist/logFormatter/bin.js",
     "cedarjs-server": "./dist/bin.js",
-    "rw-api-server-watch": "./dist/cjs/watch.js",
     "rw-log-formatter": "./dist/cjs/logFormatter/bin.js",
     "rw-server": "./dist/cjs/bin.js"
   },
@@ -123,7 +125,7 @@
     "dotenv-defaults": "5.0.2",
     "fast-glob": "3.3.3",
     "fast-json-parse": "1.0.3",
-    "fastify": "5.8.4",
+    "fastify": "5.8.5",
     "fastify-raw-body": "5.0.0",
     "picoquery": "2.5.0",
     "pretty-bytes": "5.6.0",
@@ -139,7 +141,7 @@
     "@types/split2": "4.2.3",
     "@types/yargs": "17.0.35",
     "graphql-yoga": "5.21.0",
-    "memfs": "4.57.1",
+    "memfs": "4.57.2",
     "pino-abstract-transport": "1.2.0",
     "tsx": "4.21.0",
     "typescript": "5.9.3",

packages/api-server/src/plugins/lambdaLoader.ts

@@ -15,26 +15,46 @@ import type {
 } from 'fastify'
 import { terminalLink } from 'termi-link'
 
+import type {
+  CedarHandler,
+  CedarRouteRecord,
+  LegacyHandler,
+} from '@cedarjs/api/runtime'
+import { buildCedarContext, wrapLegacyHandler } from '@cedarjs/api/runtime'
 import { getPaths } from '@cedarjs/project-config'
 
 import { requestHandler } from '../requestHandlers/awsLambdaFastify.js'
 import { escape } from '../utils.js'
 
-export type Lambdas = Record<string, Handler>
-export const LAMBDA_FUNCTIONS: Lambdas = {}
+export const LAMBDA_FUNCTIONS = new Map<string, Handler>()
+export const CEDAR_HANDLERS = new Map<string, CedarHandler>()
+const cedarRouteManifest: CedarRouteRecord[] = []
+
+/**
+ * Exports a copy of the Cedar route manifest.
+ *
+ * This is intended to be used to later build WinterTC compatible `fetch`
+ * exports
+ */
+export const getCedarRouteManifest = () => [...cedarRouteManifest]
 
-// Import the API functions and add them to the LAMBDA_FUNCTIONS object
+// Import the API functions and add them to the LAMBDA_FUNCTIONS map
 
 export const setLambdaFunctions = async (foundFunctions: string[]) => {
   const tsImport = Date.now()
   console.log(ansis.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 = path.basename(fnPath).replace('.js', '')
+    const routePath = routeName === 'graphql' ? '/graphql' : `/${routeName}`
 
     const fnImport = await import(pathToFileURL(fnPath).href)
-    const handler: Handler = (() => {
+    const handler: Handler | undefined = (() => {
       if ('handler' in fnImport) {
         // ESModule export of handler - when using
         // `export const handler = ...` - most common case
@@ -58,15 +78,60 @@ export const setLambdaFunctions = async (foundFunctions: string[]) => {
       return undefined
     })()
 
-    LAMBDA_FUNCTIONS[routeName] = handler
-    if (!handler) {
+    const cedarHandler: CedarHandler | undefined = (() => {
+      if (
+        'handleRequest' in fnImport &&
+        typeof fnImport.handleRequest === 'function'
+      ) {
+        return fnImport.handleRequest as CedarHandler
+      }
+
+      if (
+        'default' in fnImport &&
+        fnImport.default &&
+        'handleRequest' in fnImport.default &&
+        typeof fnImport.default.handleRequest === 'function'
+      ) {
+        return fnImport.default.handleRequest as CedarHandler
+      }
+
+      return undefined
+    })()
+
+    if (handler) {
+      LAMBDA_FUNCTIONS.set(routeName, handler)
+    }
+
+    if (cedarHandler) {
+      CEDAR_HANDLERS.set(routeName, cedarHandler)
+    } else if (handler) {
+      CEDAR_HANDLERS.set(routeName, wrapLegacyHandler(handler as LegacyHandler))
+    }
+
+    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(
       terminalLink(ansis.magenta('/' + routeName), 'file://' + fnPath),
       ansis.dim.italic(Date.now() - ts + ' ms'),
@@ -135,25 +200,75 @@ 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 const lambdaRequestHandler = async (
   req: FastifyRequest<LambdaHandlerRequest>,
   reply: FastifyReply,
 ) => {
   const { routeName } = req.params
+  const cedarHandlerCandidate = CEDAR_HANDLERS.get(routeName)
+  const cedarHandler =
+    typeof cedarHandlerCandidate === 'function'
+      ? cedarHandlerCandidate
+      : undefined
+
+  if (cedarHandler) {
+    const requestBody =
+      req.method === 'GET' || req.method === 'HEAD'
+        ? undefined
+        : typeof req.rawBody === 'string'
+          ? req.rawBody
+          : req.rawBody
+            ? Buffer.from(req.rawBody).toString()
+            : undefined
+
+    const href = `${req.protocol}://${req.hostname}${req.raw.url ?? '/'}`
+    const request = new Request(href, {
+      method: req.method,
+      headers: req.headers as HeadersInit,
+      body: requestBody,
+    })
+
+    const ctx = await buildCedarContext(request, {
+      params: {
+        routeName,
+      },
+    })
+
+    const response = await cedarHandler(request, ctx)
+
+    reply.status(response.status)
+
+    response.headers.forEach((value: string, name: string) => {
+      reply.header(name, value)
+    })
+
+    const body = await response.arrayBuffer()
+    reply.send(Buffer.from(body))
+
+    return
+  }
+
+  const handler = LAMBDA_FUNCTIONS.get(routeName)
 
-  if (!LAMBDA_FUNCTIONS[routeName]) {
+  if (handler) {
+    return 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: [
+          ...new Set([...LAMBDA_FUNCTIONS.keys(), ...CEDAR_HANDLERS.keys()]),
+        ],
       }
       reply.send(devError)
     } else {
@@ -162,5 +277,4 @@ export const lambdaRequestHandler = async (
 
     return
   }
-  return requestHandler(req, reply, LAMBDA_FUNCTIONS[routeName])
 }