@lucaapp/service-utils 1.62.2 → 1.62.3

package/dist/lib/api/api.js

@@ -72,14 +72,17 @@ class Api {
         return spec;
     }
     mountSwaggerMiddlewares() {
+        // Serve the Swagger UI documentation at '/swagger'
         this.router.use('/swagger', swagger_ui_express_1.default.serve);
+        // Setup the Swagger UI documentation at '/swagger'
         this.router.get('/swagger', (request, response, next) => {
             const spec = this.generateOpenAPISpec();
-            swagger_ui_express_1.default.setup(spec)(request, response, next);
+            return swagger_ui_express_1.default.setup(spec)(request, response, next);
         });
+        // Serve the Swagger specification JSON at '/swagger.json'
         this.router.get('/swagger.json', (request, response) => {
             const spec = this.generateOpenAPISpec();
-            response.send(spec);
+            response.json(spec); // Ensuring a proper JSON response
         });
     }
 }

package/dist/lib/api/endpoint.js

@@ -321,52 +321,50 @@ new Promise(async (resolve) => {
 });
 const mountEndpoint = (router, method, path, options, handler, debug) => {
     (0, assert_1.default)(options.responses.length > 0, 'You need to specify at least one response');
-    router[method](path, (request, response) => {
-        (async () => {
+    router[method](path, async (request, response) => {
+        try {
+            let handlerRequestBody;
+            let handlerRequestParams;
+            let handlerRequestQuery;
+            let handlerRequestHeaders;
             try {
-                let handlerRequestBody;
-                let handlerRequestParams;
-                let handlerRequestQuery;
-                let handlerRequestHeaders;
-                try {
-                    // parse request schemas
-                    handlerRequestBody = ((await options.schemas?.body?.parseAsync(request.body)) || undefined);
-                    handlerRequestParams = ((await options.schemas?.params?.parseAsync(request.params)) || undefined);
-                    handlerRequestQuery = ((await options.schemas?.query?.parseAsync(request.query)) || undefined);
-                    handlerRequestHeaders = ((await options.schemas?.headers?.parseAsync(request.headers)) || undefined);
-                }
-                catch (error) {
-                    if (error instanceof zod_1.ZodError) {
-                        return sendBadRequestZodError(response, error);
-                    }
-                    if (error instanceof libphonenumber_js_1.ParseError) {
-                        const newError = new Error(error.message);
-                        return sendBadRequestError(response, newError);
-                    }
-                    throw error;
+                // parse request schemas
+                handlerRequestBody = ((await options.schemas?.body?.parseAsync(request.body)) || undefined);
+                handlerRequestParams = ((await options.schemas?.params?.parseAsync(request.params)) || undefined);
+                handlerRequestQuery = ((await options.schemas?.query?.parseAsync(request.query)) || undefined);
+                handlerRequestHeaders = ((await options.schemas?.headers?.parseAsync(request.headers)) || undefined);
+            }
+            catch (error) {
+                if (error instanceof zod_1.ZodError) {
+                    return sendBadRequestZodError(response, error);
                 }
-                const handlerRequest = {
-                    body: handlerRequestBody,
-                    params: handlerRequestParams,
-                    query: handlerRequestQuery,
-                    headers: handlerRequestHeaders,
-                };
-                const ctx = {};
-                if (options.middlewares instanceof Array) {
-                    for (const middleware of options.middlewares) {
-                        const shouldContinue = await handleMiddleware(middleware, ctx, request, response, debug);
-                        if (!shouldContinue)
-                            return;
-                    }
+                if (error instanceof libphonenumber_js_1.ParseError) {
+                    const newError = new Error(error.message);
+                    return sendBadRequestError(response, newError);
                 }
-                await handler(handlerRequest, ctx, async (controllerResponse) => {
-                    await validateAndSendResponse(response, controllerResponse, options.responses, debug);
-                }, response);
+                throw error;
             }
-            catch (error) {
-                sendErrorResponse(response, error, options.errors, debug);
+            const handlerRequest = {
+                body: handlerRequestBody,
+                params: handlerRequestParams,
+                query: handlerRequestQuery,
+                headers: handlerRequestHeaders,
+            };
+            const ctx = {};
+            if (options.middlewares instanceof Array) {
+                for (const middleware of options.middlewares) {
+                    const shouldContinue = await handleMiddleware(middleware, ctx, request, response, debug);
+                    if (!shouldContinue)
+                        return;
+                }
             }
-        })();
+            await handler(handlerRequest, ctx, async (controllerResponse) => {
+                await validateAndSendResponse(response, controllerResponse, options.responses, debug);
+            }, response);
+        }
+        catch (error) {
+            sendErrorResponse(response, error, options.errors, debug);
+        }
     });
 };
 exports.mountEndpoint = mountEndpoint;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.62.2",
+  "version": "1.62.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -21,10 +21,10 @@
     "@asteasolutions/zod-to-openapi": "6.1.0",
     "@hapi/boom": "^10.0.0",
     "@tsconfig/node18": "1.0.1",
-    "@types/express": "5.0.0",
-    "@types/express-serve-static-core": "5.0.5",
+    "@types/express": "4.17.15",
+    "@types/express-serve-static-core": "^4.17.43",
     "@types/node": "18.18.2",
-    "@types/response-time": "^2.3.5",
+    "@types/response-time": "^2.3.8",
     "@types/swagger-ui-express": "4.1.3",
     "axios": "^1.7.4",
     "busboy": "^1.6.0",
@@ -39,7 +39,7 @@
     "negotiator": "^0.6.3",
     "pino-http": "9.0.0",
     "prom-client": "14.1.0",
-    "response-time": "^2.3.2",
+    "response-time": "2.3.3",
     "sequelize": "6.32.0",
     "sqlite3": "5.1.1",
     "swagger-ui-express": "5.0.1",
@@ -78,6 +78,7 @@
     "send": "0.19.0",
     "rollup": "4.22.4",
     "cookie": ">= 0.7.0",
-    "string-width": "4.2.3"
+    "string-width": "4.2.3",
+    "@types/express": "4.17.15"
   }
 }