@forklaunch/core 0.17.1 → 0.17.3

package/lib/http/index.mjs

@@ -1323,7 +1323,8 @@ function resolveRouteMiddlewares(params) {
       params.requestSchema,
       params.responseSchemas,
       params.openTelemetryCollector,
-      () => params.routerOptions
+      // Use dynamic lookup from router instance instead of captured params
+      () => params.router ? params.router.routerOptions : params.routerOptions
     ),
     ...params.postEnrichMiddleware,
     parse,
@@ -1471,56 +1472,94 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
    * @param controllerHandler
    * @returns
    */
-  #localParamRequest(handlers, controllerHandler, version) {
+  #localParamRequest(middlewares, controllerHandler, contractDetails, requestSchema, responseSchemas, version) {
     return async (route, request) => {
       let statusCode;
       let responseMessage;
       const responseHeaders = {};
+      const resEventHandlers = {};
       const req = {
         params: request?.params ?? {},
         query: request?.query ?? {},
         headers: request?.headers ?? {},
         body: discriminateBody(this.schemaValidator, request?.body)?.schema ?? {},
         path: route,
-        version
+        originalPath: route,
+        method: "GET",
+        version,
+        // Properties needed by middlewares
+        schemaValidator: this.schemaValidator,
+        contractDetails,
+        requestSchema,
+        openTelemetryCollector: this.openTelemetryCollector,
+        _globalOptions: () => this.routerOptions,
+        context: {
+          correlationId: "local-fetch-" + Date.now(),
+          span: void 0
+        },
+        _rawBody: void 0,
+        _parsedVersions: void 0
       };
       const res = {
+        statusCode: 200,
         status: (code) => {
           statusCode = code;
+          res.statusCode = code;
           return res;
         },
         send: (message) => {
           responseMessage = message;
+          resEventHandlers["finish"]?.forEach((handler) => handler());
         },
         json: (body) => {
           responseMessage = body;
+          resEventHandlers["finish"]?.forEach((handler) => handler());
         },
         jsonp: (body) => {
           responseMessage = body;
+          resEventHandlers["finish"]?.forEach((handler) => handler());
         },
         setHeader: (key, value) => {
           responseHeaders[key] = value;
+          return res;
+        },
+        getHeader: (key) => responseHeaders[key],
+        type: (contentType) => {
+          responseHeaders["content-type"] = contentType;
+          return res;
         },
         sseEmitter: (generator) => {
           responseMessage = generator();
         },
+        on: (event, handler) => {
+          if (!resEventHandlers[event]) {
+            resEventHandlers[event] = [];
+          }
+          resEventHandlers[event].push(handler);
+          return res;
+        },
+        responseSchemas,
         version
       };
-      let cursor = handlers.shift();
-      if (cursor) {
-        for (const fn of handlers) {
-          await cursor(req, res, (err) => {
+      const executeMiddlewares = request?.executeMiddlewares ?? false;
+      if (executeMiddlewares && middlewares.length > 0) {
+        const allHandlers = [...middlewares];
+        let cursor = allHandlers.shift();
+        if (cursor) {
+          for (const fn of allHandlers) {
+            await cursor(req, res, (err) => {
+              if (err) {
+                throw err;
+              }
+              cursor = fn;
+            });
+          }
+          await cursor(req, res, async (err) => {
             if (err) {
               throw err;
             }
-            cursor = fn;
           });
         }
-        await cursor(req, res, async (err) => {
-          if (err) {
-            throw err;
-          }
-        });
       }
       const cHandler = controllerHandler;
       await cHandler(req, res, (err) => {
@@ -1561,7 +1600,8 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
       routerOptions: this.routerOptions,
       postEnrichMiddleware: this.postEnrichMiddleware,
       includeCreateContext: false,
-      handlers
+      handlers,
+      router: this
     });
     registrationMethod.bind(this.internal)(
       path,
@@ -1576,12 +1616,18 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
           this.#localParamRequest(
             middlewares,
             controllerHandler,
+            contractDetails,
+            requestSchema,
+            responseSchemas,
             version
           )
         ])
       ) : this.#localParamRequest(
         middlewares,
-        controllerHandler
+        controllerHandler,
+        contractDetails,
+        requestSchema,
+        responseSchemas
       )
     };
     const contractDetailsName = contractDetails.name;
@@ -1592,12 +1638,18 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
           (req) => this.#localParamRequest(
             middlewares,
             controllerHandler,
+            contractDetails,
+            requestSchema,
+            responseSchemas,
             version
           )(`${this.basePath}${path}`, req)
         ])
       ) : (req) => this.#localParamRequest(
         middlewares,
-        controllerHandler
+        controllerHandler,
+        contractDetails,
+        requestSchema,
+        responseSchemas
       )(`${this.basePath}${path}`, req);
     }
     return this;