lieko-express 1.0.0 → 1.0.2

package/lib/cors.js

@@ -56,7 +56,6 @@ module.exports = function cors(userOptions = {}) {
             if (!allowed) {
                 res.statusCode = 403;
                 return res.end(JSON.stringify({
-                    success: false,
                     error: "Origin Forbidden",
                     message: `Origin "${requestOrigin}" is not allowed`
                 }));

package/lib/schema.js

@@ -371,15 +371,11 @@ function validate(schema) {
         try {
             schema.validate(req.body);
             next();
-        } catch (error) {
-            if (error instanceof ValidationError) {
-                return res.status(400).json({
-                    success: false,
-                    message: 'Validation failed',
-                    errors: error.errors
-                });
+        } catch (err) {
+            if (err instanceof ValidationError) {
+                return res.status(400).json({ error: { status: 400, type: "VALIDATION_ERROR", message: 'Validation failed', details: err.errors } });
             }
-            throw error;
+            throw err;
         }
     };
 }

package/lieko-express.js

@@ -781,7 +781,8 @@ ${cyan}    (req, res, next) => {
       return res.status(500).json({
         error: {
           message: "Internal Server Error",
-          code: 500
+          status: 500,
+          type: "InternalServerError"
         }
       });
     }
@@ -812,7 +813,7 @@ ${cyan}    (req, res, next) => {
       res.status(500).json({
         error: {
           message: "Internal Server Error",
-          code: 500
+          status: 500
         }
       });
     }
@@ -827,13 +828,12 @@ ${cyan}    (req, res, next) => {
       return res.status(500).json({
         error: {
           message: "Invalid error format passed to res.error()",
-          code: 500
+          status: 500
         }
       });
     }
 
     const HTTP_STATUS = {
-      // 4xx – CLIENT ERRORS
       INVALID_REQUEST: 400,
       VALIDATION_FAILED: 400,
       NO_TOKEN_PROVIDED: 401,
@@ -844,18 +844,21 @@ ${cyan}    (req, res, next) => {
       CONFLICT: 409,
       RECORD_EXISTS: 409,
       TOO_MANY_REQUESTS: 429,
-
-      // 5xx – SERVER ERRORS
       SERVER_ERROR: 500,
       SERVICE_UNAVAILABLE: 503
     };
 
-    const status = errorObj.status || HTTP_STATUS[errorObj.code] || 500;
+    let currentStatus = res.statusCode || 200;
+    let desiredStatus = errorObj.status || HTTP_STATUS[errorObj.status];
+
+    const finalStatus = (currentStatus >= 400 && currentStatus < 600)
+      ? currentStatus
+      : (desiredStatus || 500);
 
-    return res.status(status).json({
+    return res.status(finalStatus).json({
       error: {
         message: errorObj.message || 'An error occurred',
-        code: errorObj.code || 500,
+        status: errorObj.status || finalStatus,
         ...errorObj
       }
     });
@@ -982,7 +985,7 @@ ${cyan}    (req, res, next) => {
           return res.status(413).json({
             error: {
               message: 'Payload Too Large',
-              code: 413
+              status: 413
             }
           });
         }
@@ -1032,7 +1035,7 @@ ${cyan}    (req, res, next) => {
 
       if (!route) {
         if (this.notFoundHandler) return this.notFoundHandler(req, res);
-        return res.status(404).json({ error: { message: 'Route not found', code: 404 } });
+        return res.status(404).error('Not Found');
       }
 
       req.params = route.params;
@@ -1058,7 +1061,11 @@ ${cyan}    (req, res, next) => {
 
       if (res.headersSent) return;
 
-      await route.handler(req, res);
+      await route.handler(req, res, (err) => {
+        if (err) {
+          return this._runErrorHandlers(err, req, res);
+        }
+      });
 
     } catch (error) {
       if (!res.headersSent) {
@@ -1138,16 +1145,21 @@ ${cyan}    (req, res, next) => {
         .map(item => item.type);
     };
 
-    const accepts = (types) => {
+    const acceptedTypes = parseAccept(req.headers['accept']);
+
+    req.accepts = function (types) {
+      if (arguments.length === 0) {
+        return acceptedTypes;
+      }
+
       if (!Array.isArray(types)) types = [types];
-      const accepted = parseAccept(req.headers['accept']);
 
       for (const type of types) {
         const t = type.toLowerCase();
 
-        if (accepted.includes(t)) return type;
+        if (acceptedTypes.includes(t)) return type;
 
-        if (accepted.some(a => {
+        if (acceptedTypes.some(a => {
           if (a === '*/*') return true;
           if (a.endsWith('/*')) {
             const prefix = a.slice(0, -1);
@@ -1162,8 +1174,24 @@ ${cyan}    (req, res, next) => {
       return false;
     };
 
-    req.accepts = function (types) {
-      return accepts(types);
+    req.responseType = function () {
+      const accepted = this.accepts();
+
+      if (accepted.length > 0) {
+        for (const type of accepted) {
+          if (type === 'text/html') return 'html';
+          if (type === 'application/json') return 'json';
+          if (type === '*/*') break;
+        }
+      }
+
+      const ua = (this.headers['user-agent'] || '').toLowerCase();
+      const isApi = ua.includes('curl') ||
+        ua.includes('postman') ||
+        this.xhr ||
+        this.headers['content-type']?.includes('application/json');
+
+      return isApi ? 'json' : 'html';
     };
 
     req.acceptsLanguages = function (langs) {
@@ -1538,6 +1566,7 @@ ${cyan}    (req, res, next) => {
           status = 404;
           message = 'File Not Found';
           details = `The file "${filePath}" does not exist.\nFull path tried: ${file}`;
+          console.error(details, err);
         } else if (err.code === 'FORBIDDEN') {
           status = 403;
           message = 'Forbidden';
@@ -1576,11 +1605,9 @@ ${cyan}    (req, res, next) => {
       if (message !== undefined) payload.message = message;
       return res.json(payload);
     };
-    //res.success = res.ok;
 
     res.created = (data, message = 'Resource created successfully') => {
-      const payload = { success: true, data, message };
-      return res.status(201).json(payload);
+      return res.status(201).json({ data, message });
     };
 
     res.noContent = () => {
@@ -1859,43 +1886,47 @@ ${cyan}    (req, res, next) => {
   }
 
   printRoutes() {
-    if (this.routes.length === 0) {
-      console.log('\nNo routes registered.\n');
-      return;
-    }
+    setImmediate(() => {
+      if (this.routes.length === 0) {
+        console.log('\nNo routes registered.\n');
+        return;
+      }
 
-    console.log(`\nRegistered Routes: ${this.routes.length}\n`);
+      console.log(`\nRegistered Routes: ${this.routes.length}\n`);
 
-    const grouped = new Map();
+      const grouped = new Map();
 
-    for (const route of this.routes) {
-      const key = `${route.method}|${route.handler}`;
-      if (!grouped.has(key)) {
-        grouped.set(key, {
-          method: route.method,
-          paths: [],
-          mw: route.middlewares.length
-        });
-      }
-      const entry = grouped.get(key);
-      const p = route.path || '/';
-      if (!entry.paths.includes(p)) {
-        entry.paths.push(p);
+      for (const route of this.routes) {
+        const key = `${route.method}|${route.handler}`;
+        if (!grouped.has(key)) {
+          grouped.set(key, {
+            method: route.method,
+            paths: [],
+            mw: route.middlewares.length
+          });
+        }
+        const entry = grouped.get(key);
+        const p = route.path || '/';
+        if (!entry.paths.includes(p)) {
+          entry.paths.push(p);
+        }
       }
-    }
 
-    const sorted = Array.from(grouped.values()).sort((a, b) => {
-      if (a.method !== b.method) return a.method.localeCompare(b.method);
-      return a.paths[0].localeCompare(b.paths[0]);
-    });
+      const sorted = Array.from(grouped.values()).sort((a, b) => {
+        if (a.method !== b.method) return a.method.localeCompare(b.method);
+        return a.paths[0].localeCompare(b.paths[0]);
+      });
 
-    for (const r of sorted) {
-      const pathStr = r.paths.length === 1
-        ? r.paths[0]
-        : r.paths.join(', ');
+      for (const r of sorted) {
+        const pathStr = r.paths.length === 1
+          ? r.paths[0]
+          : r.paths.join(', ');
 
-      console.log(` \x1b[36m${r.method.padEnd(7)}\x1b[0m \x1b[33m${pathStr}\x1b[0m \x1b[90m(mw: ${r.mw})\x1b[0m`);
-    }
+        console.log(` \x1b[36m${r.method.padEnd(7)}\x1b[0m \x1b[33m${pathStr}\x1b[0m \x1b[90m(mw: ${r.mw})\x1b[0m`);
+      }
+    });
+
+    return this;
   }
 
   listen() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lieko-express",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/eiwSrvt/lieko-express"