equipped 4.4.0 → 4.4.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.4.1](https://github.com/kevinand11/equipped/compare/v4.4.0...v4.4.1) (2024-02-24)
+
+
+### Bug Fixes
+
+* error handler routes ([421ca8a](https://github.com/kevinand11/equipped/commit/421ca8a6fa94af55570d1c0d549ae2238de07db2))
+
 ## [4.4.0](https://github.com/kevinand11/equipped/compare/v4.3.2...v4.4.0) (2024-02-23)
 
 ### [4.3.2](https://github.com/kevinand11/equipped/compare/v4.3.1...v4.3.2) (2024-02-21)

package/lib/server/app.js

@@ -77,18 +77,18 @@ class Server {
         return __classPrivateFieldGet(this, _Server_listener, "f");
     }
     set routes(routes) {
-        routes.forEach(({ method, path, controllers }) => {
+        routes.forEach(({ method, path, global, controllers }) => {
             controllers = [parseAuthUser_1.parseAuthUser, ...controllers];
-            if (path)
+            if (!global)
                 __classPrivateFieldGet(this, _Server_expressApp, "f")[method]?.((0, routes_1.formatPath)(path), ...controllers);
             else
                 __classPrivateFieldGet(this, _Server_expressApp, "f").use(...controllers);
         });
     }
     register(router) {
-        router.routes.forEach(({ method, path, controllers }) => {
+        router.routes.forEach(({ method, path, global, controllers }) => {
             controllers = [parseAuthUser_1.parseAuthUser, ...controllers];
-            if (path)
+            if (!global)
                 __classPrivateFieldGet(this, _Server_expressApp, "f")[method]?.(path, ...controllers);
             else
                 __classPrivateFieldGet(this, _Server_expressApp, "f").use(...controllers);
@@ -100,8 +100,8 @@ class Server {
     async start(port) {
         const postRoutesRouter = new routes_1.Router();
         postRoutesRouter.get({ path: '__health' })(async () => `${instance_1.Instance.get().settings.appId} service running`);
-        postRoutesRouter.all({ middlewares: [middlewares_1.notFoundHandler] })();
-        postRoutesRouter.all({ middlewares: [middlewares_1.errorHandler] })();
+        postRoutesRouter.all({ global: true, middlewares: [middlewares_1.notFoundHandler] })();
+        postRoutesRouter.all({ global: true, middlewares: [middlewares_1.errorHandler] })();
         this.register(postRoutesRouter);
         return await new Promise((resolve, reject) => {
             try {

package/lib/server/middlewares/errorHandler.js

@@ -3,20 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorHandler = void 0;
 const instance_1 = require("../../instance");
 const controllers_1 = require("../controllers");
+const response_1 = require("../controllers/response");
 const statusCodes_1 = require("../statusCodes");
 exports.errorHandler = (0, controllers_1.makeErrorMiddleware)(async (_, err) => {
     const error = err;
-    if (error.isCustomError) {
-        return {
-            status: error.statusCode,
-            result: error.serializedErrors
-        };
-    }
+    if (error.isCustomError)
+        return new response_1.Response({
+            body: error.serializedErrors,
+            status: error.statusCode
+        });
     else {
         await instance_1.Instance.get().logger.error(err);
-        return {
-            status: statusCodes_1.StatusCodes.BadRequest,
-            result: [{ message: 'Something went wrong', data: err.message }]
-        };
+        return new response_1.Response({
+            body: [{ message: 'Something went wrong', data: err.message }],
+            status: statusCodes_1.StatusCodes.BadRequest
+        });
     }
 });

package/lib/server/routes.d.ts

@@ -4,6 +4,7 @@ export type Route = {
     path: string;
     method: MethodTypes;
     controllers: Controller[];
+    global?: boolean;
 };
 export declare const formatPath: (path: string) => string;
 export declare const groupRoutes: (parent: string, routes: Route[]) => Route[];

package/lib/server/routes.js

@@ -59,6 +59,8 @@ _Router_config = new WeakMap(), _Router_instances = new WeakSet(), _Router_addRo
         if (handler)
             controllers.push((0, controllers_1.makeController)(handler));
         this.routes.push({
+            ...__classPrivateFieldGet(this, _Router_config, "f"),
+            ...route,
             method,
             controllers,
             path: (0, exports.formatPath)(`${__classPrivateFieldGet(this, _Router_config, "f")?.path ?? ''}/${route.path ?? ''}`),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "4.4.0",
+	"version": "4.4.1",
 	"private": false,
 	"description": "",
 	"main": "lib/index.js",
@@ -25,12 +25,12 @@
 		"@types/express-fileupload": "^1.4.4",
 		"@types/jsonwebtoken": "^9.0.5",
 		"@types/morgan": "^1.9.9",
-		"@types/node": "^20.11.19",
+		"@types/node": "^20.11.20",
 		"@types/pug": "^2.0.10",
 		"@types/supertest": "^6.0.2",
-		"@typescript-eslint/eslint-plugin": "^7.0.1",
-		"@typescript-eslint/parser": "^7.0.1",
-		"eslint": "^8.56.0",
+		"@typescript-eslint/eslint-plugin": "^7.0.2",
+		"@typescript-eslint/parser": "^7.0.2",
+		"eslint": "^8.57.0",
 		"eslint-plugin-promise": "^6.1.1",
 		"husky": "^9.0.11",
 		"standard-version": "^9.5.0",
@@ -46,7 +46,7 @@
 		"compression": "^1.7.4",
 		"cookie-parser": "^1.4.6",
 		"cors": "^2.8.5",
-		"dotenv": "^16.4.4",
+		"dotenv": "^16.4.5",
 		"express": "^4.18.2",
 		"express-fileupload": "^1.4.3",
 		"express-rate-limit": "^7.1.5",
@@ -55,7 +55,7 @@
 		"jsonwebtoken": "^9.0.2",
 		"jwks-rsa": "^3.1.0",
 		"kafkajs": "^2.2.4",
-		"mongoose": "^8.1.3",
+		"mongoose": "^8.2.0",
 		"mongoose-lean-defaults": "^2.2.1",
 		"mongoose-lean-getters": "^1.1.0",
 		"mongoose-lean-virtuals": "^0.9.1",