From ed2e3c3291ae8e13259b00bef3337bb43eb986ea Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Thu, 8 Jul 2021 12:06:11 +0200
Subject: [PATCH] use expose information

---
 src/server/index.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/server/index.js b/src/server/index.js
index 755591f..4f740db 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -43,7 +43,7 @@ class Server {
         this.routes = []
         this.endpoints = {}
         this.serverMiddlewares = [...this.params.serverMiddlewares ?? [], ...defaultMiddlewares]
-        this.middlewares = this.params.middlewares ?? {}
+        this.middlewares = {...this.params.middlewares}
         this.controllers = { ...this.params.controllers }
         this.headers = { ...defaultHeaders, ...this.params.headers }
 
@@ -100,9 +100,6 @@ class Server {
     handleRequest = (req, res, next, endpoint) => {
         const { route, controller } = endpoint
 
-        req.requestId = nanoid()
-        req.endpoint = endpoint
-
         // exec middleware before controller
         if (typeof endpoint.middleware !== "undefined") {
             let query = []
@@ -123,7 +120,6 @@ class Server {
 
         // exec controller
         if (typeof controller.exec === "function") {
-            res.setHeader("request_id", req.requestId)
             controller.exec(req, res, next)
         }
 
@@ -164,6 +160,16 @@ class Server {
         this.httpServer.use(express.json())
         this.httpServer.use(express.urlencoded({ extended: true }))
 
+        // expose information
+        this.httpServer.use((req, res, next) => {
+            req.requestId = nanoid()
+            req.endpoint = endpoint
+
+            res.setHeader("request_id", req.requestId)
+
+            next()
+        })
+
         // set middlewares
         if (Array.isArray(this.serverMiddlewares)) {
             this.serverMiddlewares.forEach((middleware) => {