zumito-framework 1.7.4 → 1.8.1

package/dist/ZumitoFramework.js

@@ -213,21 +213,6 @@ export class ZumitoFramework {
         this.app.use(express.json());
         this.app.use(express.urlencoded({ extended: false }));
         this.app.use(cookieParser());
-        //Error handler
-        this.app.use(function (err, req, res, next) {
-            const errorHandler = ServiceContainer.getService(ErrorHandler);
-            errorHandler.handleError(err, {
-                type: ErrorType.Api,
-                endpoint: req.originalUrl,
-                method: req.method,
-            });
-            if (!res.headersSent) {
-                return res.status(500).json({
-                    error: 'Internal Server Error',
-                    message: 'An unexpected error occurred. Please try again later.',
-                });
-            }
-        });
         //this.app.use(express.static(path.join(__dirname, "public")));
         //To allow cross-origin requests
         this.app.use(cors());
@@ -235,18 +220,39 @@ export class ZumitoFramework {
         //this.app.use("/", indexRouter);
         //this.app.use("/api/", apiRouter);
         this.routes.forEach(route => {
-            this.app[route.method](route.path, function (req, res) {
-                return route.execute(req, res);
+            this.app[route.method](route.path, async (req, res, next) => {
+                try {
+                    await Promise.resolve(route.execute(req, res));
+                }
+                catch (err) {
+                    next(err);
+                }
             });
         });
         // throw 404 if URL not found
-        this.app.all('*', function (req, res) {
+        this.app.all('*', (req, res) => {
             return ApiResponse.notFoundResponse(res, 'Page not found');
         });
-        this.app.use(function (err, req, res) {
+        this.app.use((err, req, res, next) => {
             if (err.name === 'UnauthorizedError') {
                 return ApiResponse.unauthorizedResponse(res, 'Invalid token');
             }
+            next(err);
+        });
+        //Error handler
+        this.app.use((err, req, res, next) => {
+            const errorHandler = ServiceContainer.getService(ErrorHandler);
+            errorHandler.handleError(err, {
+                type: ErrorType.Api,
+                endpoint: req.originalUrl,
+                method: req.method,
+            });
+            if (!res.headersSent) {
+                return res.status(500).json({
+                    error: 'Internal Server Error',
+                    message: 'An unexpected error occurred. Please try again later.',
+                });
+            }
         });
     }
     /**

package/dist/services/handlers/ErrorHandler.js

@@ -33,6 +33,8 @@ export class ErrorHandler {
             console.error(error?.toString?.() || 'Unknown error');
             console.line('');
         }
+        // Emit framework error event so external modules can listen and report
+        this.framework.eventEmitter.emit('error', error, options);
         this.printErrorStack(error);
         if (options.exit)
             process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.7.4",
+  "version": "1.8.1",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",