@naman_deep_singh/server-utils 1.4.3 → 1.4.4

package/README.md

@@ -1,6 +1,6 @@
 # @naman_deep_singh/server-utils
 
-**Version:** 1.4.3 (with integrated cache & session support)
+**Version:** 1.4.4 (with integrated cache & session support)
 
 Extensible server utilities for Express.js microservices with multi-protocol support, integrated caching, session management, and TypeScript.
 

package/dist/cjs/middleware/auth.middleware.d.ts

@@ -1,7 +1,6 @@
-import type { Request, RequestHandler } from 'node_modules/@types/express';
+import type { Request, RequestHandler } from 'express';
 export interface AuthConfig {
     secret: string;
-    unauthorizedMessage?: string;
     tokenExtractor?: (req: Request) => string | null;
 }
 export declare function createAuthMiddleware(config: AuthConfig): RequestHandler;

package/dist/cjs/middleware/auth.middleware.js

@@ -4,7 +4,7 @@ exports.createAuthMiddleware = createAuthMiddleware;
 const errors_utils_1 = require("@naman_deep_singh/errors-utils");
 const security_1 = require("@naman_deep_singh/security");
 function createAuthMiddleware(config) {
-    const { secret, unauthorizedMessage = 'Unauthorized access', tokenExtractor = (req) => (0, security_1.extractToken)({
+    const { secret, tokenExtractor = (req) => (0, security_1.extractToken)({
         header: req.headers.authorization || undefined,
         cookies: req.cookies,
         query: req.query,
@@ -12,30 +12,33 @@ function createAuthMiddleware(config) {
     }), } = config;
     return async (req, _res, next) => {
         try {
-            // Extract token from request
+            // 1️⃣ Extract token
             const token = tokenExtractor(req);
             if (!token) {
-                const error = new errors_utils_1.UnauthorizedError(unauthorizedMessage, {
+                // No cause → client mistake
+                return next(new errors_utils_1.TokenMalformedError({
                     reason: 'No token provided',
-                });
-                return next(error);
+                }));
             }
-            // Use safe verify token from security package
+            // 2️⃣ Verify token
             const result = (0, security_1.safeVerifyToken)(token, secret);
             if (!result.valid) {
-                const error = new errors_utils_1.UnauthorizedError(unauthorizedMessage, {
-                    reason: 'Invalid or expired token',
-                    originalError: result.error?.message,
-                });
-                return next(error);
+                // Token expired
+                if (result.error?.name === 'TokenExpiredError') {
+                    return next(new errors_utils_1.TokenExpiredError({ reason: 'Token expired' }, result.error));
+                }
+                // Token invalid / malformed
+                return next(new errors_utils_1.TokenMalformedError({
+                    reason: 'Invalid token',
+                }, result.error));
             }
-            // Attach the verified payload as user
+            // 3️⃣ Attach payload
             req.user = result.payload;
             next();
         }
         catch (error) {
-            const unauthorizedError = new errors_utils_1.UnauthorizedError(unauthorizedMessage, error instanceof Error ? { originalError: error.message } : error);
-            return next(unauthorizedError);
+            // Unexpected error → always pass cause
+            return next(new errors_utils_1.UnauthorizedError({ reason: 'Authentication failed' }, error instanceof Error ? error : undefined));
         }
     };
 }

package/dist/cjs/middleware/errorHandler.middleware.d.ts

@@ -1,2 +1,2 @@
-import type { ErrorRequestHandler } from 'node_modules/@types/express';
+import type { ErrorRequestHandler } from 'express';
 export declare function createErrorHandler(): ErrorRequestHandler;

package/dist/cjs/middleware/errorHandler.middleware.js

@@ -1,29 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createErrorHandler = createErrorHandler;
-// Error handling middleware
+const errors_utils_1 = require("@naman_deep_singh/errors-utils");
 function createErrorHandler() {
     return (err, _req, res, next) => {
-        console.error('Error:', err);
         if (res.headersSent) {
             return next(err);
         }
-        // Type guard for error objects
-        const errorObj = err;
-        const status = errorObj.status || errorObj.statusCode || 500;
-        const message = process.env.NODE_ENV === 'production'
-            ? 'Internal Server Error'
-            : errorObj.message || 'Unknown error';
-        res.status(status).json({
+        // Use responder if available
+        const responder = res.responder?.() ?? null;
+        // Known application error
+        if (err instanceof errors_utils_1.AppError) {
+            if (responder) {
+                return responder.status(err.statusCode).error(err.code, err.details);
+            }
+            // Fallback (if responder middleware is not mounted)
+            return res.status(err.statusCode).json({
+                success: false,
+                message: err.code,
+                error: {
+                    message: err.code,
+                    details: err.details,
+                },
+                data: undefined,
+                meta: null,
+            });
+        }
+        // Unknown / unhandled error
+        console.error('Unhandled error:', err);
+        const status = 500;
+        const message = 'Internal Server Error';
+        if (responder) {
+            return responder.status(status).error(message);
+        }
+        // Final fallback
+        return res.status(status).json({
             success: false,
             message,
+            error: { message },
             data: undefined,
-            error: {
-                message,
-                ...(process.env.NODE_ENV !== 'production' && {
-                    details: { stack: errorObj.stack },
-                }),
-            },
             meta: null,
         });
     };

package/dist/cjs/middleware/validation.middleware.js

@@ -57,8 +57,8 @@ function createValidationMiddleware(rules) {
         }
         if (errors.length > 0) {
             // Use ValidationError from errors-utils and let error middleware handle response
-            const validationError = new errors_utils_1.ValidationError('Validation failed', {
-                validationErrors: errors,
+            const validationError = new errors_utils_1.ValidationError({
+                fieldErrors: errors,
             });
             return next(validationError);
         }

package/dist/esm/middleware/auth.middleware.d.ts

@@ -1,7 +1,6 @@
-import type { Request, RequestHandler } from 'node_modules/@types/express';
+import type { Request, RequestHandler } from 'express';
 export interface AuthConfig {
     secret: string;
-    unauthorizedMessage?: string;
     tokenExtractor?: (req: Request) => string | null;
 }
 export declare function createAuthMiddleware(config: AuthConfig): RequestHandler;

package/dist/esm/middleware/auth.middleware.js

@@ -1,7 +1,7 @@
-import { UnauthorizedError } from '@naman_deep_singh/errors-utils';
+import { TokenExpiredError, TokenMalformedError, UnauthorizedError, } from '@naman_deep_singh/errors-utils';
 import { extractToken, safeVerifyToken } from '@naman_deep_singh/security';
 export function createAuthMiddleware(config) {
-    const { secret, unauthorizedMessage = 'Unauthorized access', tokenExtractor = (req) => extractToken({
+    const { secret, tokenExtractor = (req) => extractToken({
         header: req.headers.authorization || undefined,
         cookies: req.cookies,
         query: req.query,
@@ -9,30 +9,33 @@ export function createAuthMiddleware(config) {
     }), } = config;
     return async (req, _res, next) => {
         try {
-            // Extract token from request
+            // 1️⃣ Extract token
             const token = tokenExtractor(req);
             if (!token) {
-                const error = new UnauthorizedError(unauthorizedMessage, {
+                // No cause → client mistake
+                return next(new TokenMalformedError({
                     reason: 'No token provided',
-                });
-                return next(error);
+                }));
             }
-            // Use safe verify token from security package
+            // 2️⃣ Verify token
             const result = safeVerifyToken(token, secret);
             if (!result.valid) {
-                const error = new UnauthorizedError(unauthorizedMessage, {
-                    reason: 'Invalid or expired token',
-                    originalError: result.error?.message,
-                });
-                return next(error);
+                // Token expired
+                if (result.error?.name === 'TokenExpiredError') {
+                    return next(new TokenExpiredError({ reason: 'Token expired' }, result.error));
+                }
+                // Token invalid / malformed
+                return next(new TokenMalformedError({
+                    reason: 'Invalid token',
+                }, result.error));
             }
-            // Attach the verified payload as user
+            // 3️⃣ Attach payload
             req.user = result.payload;
             next();
         }
         catch (error) {
-            const unauthorizedError = new UnauthorizedError(unauthorizedMessage, error instanceof Error ? { originalError: error.message } : error);
-            return next(unauthorizedError);
+            // Unexpected error → always pass cause
+            return next(new UnauthorizedError({ reason: 'Authentication failed' }, error instanceof Error ? error : undefined));
         }
     };
 }

package/dist/esm/middleware/errorHandler.middleware.d.ts

@@ -1,2 +1,2 @@
-import type { ErrorRequestHandler } from 'node_modules/@types/express';
+import type { ErrorRequestHandler } from 'express';
 export declare function createErrorHandler(): ErrorRequestHandler;

package/dist/esm/middleware/errorHandler.middleware.js

@@ -1,26 +1,41 @@
-// Error handling middleware
+import { AppError } from '@naman_deep_singh/errors-utils';
 export function createErrorHandler() {
     return (err, _req, res, next) => {
-        console.error('Error:', err);
         if (res.headersSent) {
             return next(err);
         }
-        // Type guard for error objects
-        const errorObj = err;
-        const status = errorObj.status || errorObj.statusCode || 500;
-        const message = process.env.NODE_ENV === 'production'
-            ? 'Internal Server Error'
-            : errorObj.message || 'Unknown error';
-        res.status(status).json({
+        // Use responder if available
+        const responder = res.responder?.() ?? null;
+        // Known application error
+        if (err instanceof AppError) {
+            if (responder) {
+                return responder.status(err.statusCode).error(err.code, err.details);
+            }
+            // Fallback (if responder middleware is not mounted)
+            return res.status(err.statusCode).json({
+                success: false,
+                message: err.code,
+                error: {
+                    message: err.code,
+                    details: err.details,
+                },
+                data: undefined,
+                meta: null,
+            });
+        }
+        // Unknown / unhandled error
+        console.error('Unhandled error:', err);
+        const status = 500;
+        const message = 'Internal Server Error';
+        if (responder) {
+            return responder.status(status).error(message);
+        }
+        // Final fallback
+        return res.status(status).json({
             success: false,
             message,
+            error: { message },
             data: undefined,
-            error: {
-                message,
-                ...(process.env.NODE_ENV !== 'production' && {
-                    details: { stack: errorObj.stack },
-                }),
-            },
             meta: null,
         });
     };

package/dist/esm/middleware/validation.middleware.js

@@ -54,8 +54,8 @@ export function createValidationMiddleware(rules) {
         }
         if (errors.length > 0) {
             // Use ValidationError from errors-utils and let error middleware handle response
-            const validationError = new ValidationError('Validation failed', {
-                validationErrors: errors,
+            const validationError = new ValidationError({
+                fieldErrors: errors,
             });
             return next(validationError);
         }

package/dist/types/middleware/auth.middleware.d.ts

@@ -1,7 +1,6 @@
-import type { Request, RequestHandler } from 'node_modules/@types/express';
+import type { Request, RequestHandler } from 'express';
 export interface AuthConfig {
     secret: string;
-    unauthorizedMessage?: string;
     tokenExtractor?: (req: Request) => string | null;
 }
 export declare function createAuthMiddleware(config: AuthConfig): RequestHandler;

package/dist/types/middleware/errorHandler.middleware.d.ts

@@ -1,2 +1,2 @@
-import type { ErrorRequestHandler } from 'node_modules/@types/express';
+import type { ErrorRequestHandler } from 'express';
 export declare function createErrorHandler(): ErrorRequestHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naman_deep_singh/server-utils",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Extensible server utilities for Express.js microservices with TypeScript",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -28,7 +28,7 @@
   "license": "ISC",
   "dependencies": {
     "@naman_deep_singh/cache": "^1.3.1",
-    "@naman_deep_singh/errors-utils": "^1.1.1",
+    "@naman_deep_singh/errors-utils": "^1.3.4",
     "@naman_deep_singh/security": "^1.3.2",
     "@types/express": "^5.0.5",
     "cookie-parser": "^1.4.6",