@naman_deep_singh/server-utils 1.3.0 → 1.4.1

package/dist/esm/middleware/session.middleware.js

@@ -0,0 +1,50 @@
+// Session middleware helper (attaches sessionStore and helpers to req)
+export function useSession(cookieName) {
+    return async (req, res, next) => {
+        try {
+            const store = req.app.locals.sessionStore;
+            if (!store)
+                return next();
+            const name = cookieName || req.app.locals.sessionCookieName || 'sid';
+            let sid = req.cookies?.[name];
+            if (!sid) {
+                const cookieHeader = req.headers.cookie;
+                if (cookieHeader) {
+                    const match = cookieHeader
+                        .split(';')
+                        .map((s) => s.trim())
+                        .find((s) => s.startsWith(`${name}=`));
+                    if (match)
+                        sid = match.split('=')[1];
+                }
+            }
+            req.sessionId = sid;
+            req.sessionStore = store;
+            req.getSession = async () => {
+                if (!sid)
+                    return null;
+                try {
+                    return await store.get(sid);
+                }
+                catch (err) {
+                    console.error(`[Session] Failed to get session "${sid}":`, err);
+                    throw err;
+                }
+            };
+            req.createSession = async (id, data, ttl) => {
+                try {
+                    return await store.create(id, data, ttl);
+                }
+                catch (err) {
+                    console.error(`[Session] Failed to create session "${id}":`, err);
+                    throw err;
+                }
+            };
+            next();
+        }
+        catch (err) {
+            console.error('[Session] Unexpected error in useSession middleware:', err);
+            next();
+        }
+    };
+}

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

@@ -0,0 +1,11 @@
+import type { RequestHandler } from 'node_modules/@types/express';
+export interface ValidationRule {
+    field: string;
+    required?: boolean;
+    type?: 'string' | 'number' | 'email' | 'boolean';
+    minLength?: number;
+    maxLength?: number;
+    pattern?: RegExp;
+    custom?: (value: unknown) => boolean | string;
+}
+export declare function createValidationMiddleware(rules: ValidationRule[]): RequestHandler;

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

@@ -0,0 +1,64 @@
+import { ValidationError } from '@naman_deep_singh/errors-utils';
+export function createValidationMiddleware(rules) {
+    return (req, res, next) => {
+        const errors = [];
+        for (const rule of rules) {
+            const value = req.body[rule.field];
+            if (rule.required &&
+                (value === undefined || value === null || value === '')) {
+                errors.push(`${rule.field} is required`);
+                continue;
+            }
+            if (value === undefined || value === null)
+                continue;
+            if (rule.type) {
+                switch (rule.type) {
+                    case 'email':
+                        const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+                        if (!emailRegex.test(value)) {
+                            errors.push(`${rule.field} must be a valid email`);
+                        }
+                        break;
+                    case 'string':
+                        if (typeof value !== 'string') {
+                            errors.push(`${rule.field} must be a string`);
+                        }
+                        break;
+                    case 'number':
+                        if (typeof value !== 'number' && isNaN(Number(value))) {
+                            errors.push(`${rule.field} must be a number`);
+                        }
+                        break;
+                    case 'boolean':
+                        if (typeof value !== 'boolean') {
+                            errors.push(`${rule.field} must be a boolean`);
+                        }
+                        break;
+                }
+            }
+            if (rule.minLength && value.length < rule.minLength) {
+                errors.push(`${rule.field} must be at least ${rule.minLength} characters`);
+            }
+            if (rule.maxLength && value.length > rule.maxLength) {
+                errors.push(`${rule.field} must be no more than ${rule.maxLength} characters`);
+            }
+            if (rule.pattern && !rule.pattern.test(value)) {
+                errors.push(`${rule.field} format is invalid`);
+            }
+            if (rule.custom) {
+                const result = rule.custom(value);
+                if (result !== true) {
+                    errors.push(typeof result === 'string' ? result : `${rule.field} is invalid`);
+                }
+            }
+        }
+        if (errors.length > 0) {
+            // Use ValidationError from errors-utils and let error middleware handle response
+            const validationError = new ValidationError('Validation failed', {
+                validationErrors: errors,
+            });
+            return next(validationError);
+        }
+        next();
+    };
+}

package/dist/{types/types.d.ts → esm/types/index.d.ts}

@@ -1,4 +1,4 @@
-import express from 'express';
+import type express from 'express';
 export interface CorsOptions {
     origin?: string | string[] | boolean | RegExp | ((origin: string | undefined, callback: (err: Error | null, allow?: boolean) => void) => void);
     methods?: string | string[];

package/dist/esm/{utils.js → utils/utils.js}

@@ -31,8 +31,8 @@ export function getEnvBoolean(key, defaultValue) {
         return defaultValue;
     }
     const normalized = value.toLowerCase();
-    if (normalized !== "true" && normalized !== "false") {
+    if (normalized !== 'true' && normalized !== 'false') {
         throw new Error(`Environment variable ${key} must be 'true' or 'false'`);
     }
-    return normalized === "true";
+    return normalized === 'true';
 }

package/dist/types/core/health.d.ts

@@ -0,0 +1,5 @@
+import type { Application, RequestHandler } from 'express';
+import type { HealthCheckConfig, ServerPlugin } from '../types';
+export declare function createHealthCheck(config?: HealthCheckConfig): RequestHandler;
+export declare function withHealthCheck(path?: string, config?: HealthCheckConfig): ServerPlugin;
+export declare function addHealthCheck(app: Application, path?: string, config?: HealthCheckConfig): void;

package/dist/types/{periodic-health.d.ts → core/periodic-health.d.ts}

@@ -1,4 +1,4 @@
-import { PeriodicHealthCheckConfig } from './types';
+import type { PeriodicHealthCheckConfig } from '../types';
 export declare class PeriodicHealthMonitor {
     private intervals;
     private config;

package/dist/{cjs → types/core}/server.d.ts

@@ -1,6 +1,7 @@
-import express from 'express';
-import { Server } from 'http';
-import { ServerConfig, SocketIOConfig } from './types';
+import { ICache, SessionStore } from '@naman_deep_singh/cache';
+import type { Server } from 'http';
+import type { Application } from 'express';
+import type { ServerConfig, SocketIOConfig } from '../types';
 export interface GrpcService {
     service: Record<string, unknown>;
     implementation: Record<string, (...args: unknown[]) => unknown>;
@@ -26,7 +27,7 @@ export interface ServerInstanceConfig extends Required<Omit<ServerConfig, 'socke
     socketIO?: SocketIOConfig;
 }
 export interface ServerInstance {
-    app: express.Application;
+    app: Application;
     server?: Server;
     config: ServerInstanceConfig;
     start(): Promise<ServerInstance>;
@@ -46,11 +47,11 @@ export interface ServerInfo {
     startTime: Date;
 }
 export declare class ExpressServer implements ServerInstance {
-    app: express.Application;
+    app: Application;
     server?: Server;
     config: ServerInstanceConfig;
-    cache?: import('@naman_deep_singh/cache').ICache<unknown>;
-    sessionStore?: import('@naman_deep_singh/cache').SessionStore | undefined;
+    cache?: ICache<unknown>;
+    sessionStore?: SessionStore | undefined;
     private status;
     private grpcServices;
     private grpcServer?;

package/dist/types/{shutdown.d.ts → core/shutdown.d.ts}

@@ -1,5 +1,5 @@
-import { Server } from 'http';
-import { GracefulShutdownConfig, ServerPlugin } from './types';
+import type { Server } from 'http';
+import type { GracefulShutdownConfig, ServerPlugin } from '../types';
 export declare function createGracefulShutdown(server: Server, config?: GracefulShutdownConfig): void;
 export declare function withGracefulShutdown(config?: GracefulShutdownConfig): ServerPlugin;
 export declare function startServerWithShutdown(app: import('express').Application, port: number, shutdownConfig?: GracefulShutdownConfig, serverName?: string, serverVersion?: string): Server;

package/dist/types/index.d.ts

@@ -1,19 +1,19 @@
-export { ExpressServer, createServer } from './server';
-export type { ServerInstance, ServerInfo, GrpcService, RpcMethod, WebhookConfig } from './server';
+export { ExpressServer, createServer } from './core/server';
+export type { ServerInstance, ServerInfo, GrpcService, RpcMethod, WebhookConfig, } from './core/server';
 export { Request, Response, NextFunction, Router, Application } from 'express';
 export type { RequestHandler, ErrorRequestHandler } from 'express';
-export { createHealthCheck, withHealthCheck, addHealthCheck } from './health';
-export { createGracefulShutdown, withGracefulShutdown, startServerWithShutdown } from './shutdown';
-export { createLoggingMiddleware, createErrorHandler, createRequestIdMiddleware, createValidationMiddleware, createRateLimitMiddleware, createAuthMiddleware, withLogging, withErrorHandler, withRequestId, withValidation, withRateLimit, withAuth, validateFields, rateLimit, requireAuth, cacheResponse, useSession, type ValidationRule, type RateLimitConfig, type AuthConfig } from './middleware';
-export { getEnv, getEnvNumber, getEnvBoolean } from './utils';
-export { PeriodicHealthMonitor } from './periodic-health';
-export type { ServerConfig, HealthCheckConfig, HealthCheck, GracefulShutdownConfig, ServerPlugin, SocketIOConfig, SocketInstance, PeriodicHealthCheckConfig, HealthCheckService } from './types';
-import { ExpressServer, createServer } from './server';
-import { createHealthCheck, withHealthCheck, addHealthCheck } from './health';
-import { createGracefulShutdown, withGracefulShutdown, startServerWithShutdown } from './shutdown';
-import { createLoggingMiddleware, createErrorHandler, createRequestIdMiddleware, createValidationMiddleware, createRateLimitMiddleware, createAuthMiddleware, withLogging, withErrorHandler, withRequestId, withValidation, withRateLimit, withAuth, validateFields, rateLimit, requireAuth } from './middleware';
-import { getEnv, getEnvNumber, getEnvBoolean } from './utils';
-import { PeriodicHealthMonitor } from './periodic-health';
+export { createHealthCheck, withHealthCheck, addHealthCheck, } from './core/health';
+export { createGracefulShutdown, withGracefulShutdown, startServerWithShutdown, } from './core/shutdown';
+export { createLoggingMiddleware, createErrorHandler, createRequestIdMiddleware, createValidationMiddleware, createRateLimitMiddleware, createAuthMiddleware, withLogging, withErrorHandler, withRequestId, withValidation, withRateLimit, withAuth, validateFields, rateLimit, requireAuth, cacheResponse, useSession, type ValidationRule, type RateLimitConfig, type AuthConfig, } from './middleware';
+export { getEnv, getEnvNumber, getEnvBoolean, } from './utils/utils';
+export { PeriodicHealthMonitor } from './core/periodic-health';
+export type { ServerConfig, HealthCheckConfig, HealthCheck, GracefulShutdownConfig, ServerPlugin, SocketIOConfig, SocketInstance, PeriodicHealthCheckConfig, HealthCheckService, } from './types';
+import { addHealthCheck, createHealthCheck, withHealthCheck } from './core/health';
+import { PeriodicHealthMonitor } from './core/periodic-health';
+import { ExpressServer, createServer } from './core/server';
+import { createGracefulShutdown, startServerWithShutdown, withGracefulShutdown } from './core/shutdown';
+import { createAuthMiddleware, createErrorHandler, createLoggingMiddleware, createRateLimitMiddleware, createRequestIdMiddleware, createValidationMiddleware, rateLimit, requireAuth, validateFields, withAuth, withErrorHandler, withLogging, withRateLimit, withRequestId, withValidation } from './middleware';
+import { getEnv, getEnvBoolean, getEnvNumber } from './utils/utils';
 declare const ServerUtils: {
     createServer: typeof createServer;
     ExpressServer: typeof ExpressServer;

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

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

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

@@ -0,0 +1,2 @@
+import type { RequestHandler } from 'node_modules/@types/express';
+export declare function cacheResponse(ttl?: number): RequestHandler;

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

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

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

@@ -0,0 +1,10 @@
+export { AuthConfig, createAuthMiddleware } from './auth.middleware';
+export { cacheResponse } from './cache.middleware';
+export { createErrorHandler } from './errorHandler.middleware';
+export { createLoggingMiddleware } from './logging.middleware';
+export { RateLimitConfig, createRateLimitMiddleware, } from './rateLimiter.middleware';
+export { createRequestIdMiddleware } from './requestId.middleware';
+export { useSession } from './session.middleware';
+export { ValidationRule, createValidationMiddleware, } from './validation.middleware';
+export { withLogging, withErrorHandler, withRequestId, withValidation, withRateLimit, withAuth, } from './plugins.middleware';
+export { validateFields, rateLimit, requireAuth, } from './plugins.middleware';

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

@@ -0,0 +1,2 @@
+import type { RequestHandler } from 'node_modules/@types/express';
+export declare function createLoggingMiddleware(format?: 'simple' | 'detailed'): RequestHandler;

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

@@ -0,0 +1,14 @@
+import type { RequestHandler } from 'express';
+import type { ServerPlugin } from '../types';
+import type { AuthConfig } from './auth.middleware';
+import type { RateLimitConfig } from './rateLimiter.middleware';
+import type { ValidationRule } from './validation.middleware';
+export declare function withLogging(format?: 'simple' | 'detailed'): ServerPlugin;
+export declare function withErrorHandler(): ServerPlugin;
+export declare function withRequestId(): ServerPlugin;
+export declare function withValidation(rules: ValidationRule[]): ServerPlugin;
+export declare function withRateLimit(config?: RateLimitConfig): ServerPlugin;
+export declare function withAuth(config: AuthConfig): ServerPlugin;
+export declare function validateFields(rules: ValidationRule[]): RequestHandler;
+export declare function rateLimit(config?: RateLimitConfig): RequestHandler;
+export declare function requireAuth(config: AuthConfig): RequestHandler;

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

@@ -0,0 +1,8 @@
+import type { Request, RequestHandler } from 'node_modules/@types/express';
+export interface RateLimitConfig {
+    windowMs?: number;
+    maxRequests?: number;
+    message?: string;
+    keyGenerator?: (req: Request) => string;
+}
+export declare function createRateLimitMiddleware(config?: RateLimitConfig): RequestHandler;

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

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

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

@@ -0,0 +1,2 @@
+import type { RequestHandler } from 'node_modules/@types/express';
+export declare function useSession(cookieName?: string): RequestHandler;

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

@@ -0,0 +1,11 @@
+import type { RequestHandler } from 'node_modules/@types/express';
+export interface ValidationRule {
+    field: string;
+    required?: boolean;
+    type?: 'string' | 'number' | 'email' | 'boolean';
+    minLength?: number;
+    maxLength?: number;
+    pattern?: RegExp;
+    custom?: (value: unknown) => boolean | string;
+}
+export declare function createValidationMiddleware(rules: ValidationRule[]): RequestHandler;

package/dist/{cjs/types.d.ts → types/types/index.d.ts}

@@ -1,4 +1,4 @@
-import express from 'express';
+import type express from 'express';
 export interface CorsOptions {
     origin?: string | string[] | boolean | RegExp | ((origin: string | undefined, callback: (err: Error | null, allow?: boolean) => void) => void);
     methods?: string | string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naman_deep_singh/server-utils",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Extensible server utilities for Express.js microservices with TypeScript",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -27,7 +27,9 @@
   "author": "Naman Deep Singh",
   "license": "ISC",
   "dependencies": {
-    "@naman_deep_singh/cache": "^1.2.0",
+    "@naman_deep_singh/cache": "^1.3.1",
+    "@naman_deep_singh/errors-utils": "^1.1.1",
+    "@naman_deep_singh/security": "^1.3.1",
     "@types/express": "^5.0.5",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",

package/dist/cjs/health.d.ts

@@ -1,5 +0,0 @@
-import express from 'express';
-import { HealthCheckConfig, ServerPlugin } from './types';
-export declare function createHealthCheck(config?: HealthCheckConfig): express.RequestHandler;
-export declare function withHealthCheck(path?: string, config?: HealthCheckConfig): ServerPlugin;
-export declare function addHealthCheck(app: express.Application, path?: string, config?: HealthCheckConfig): void;

package/dist/cjs/middleware.d.ts

@@ -1,39 +0,0 @@
-import express from 'express';
-import { ServerPlugin } from './types';
-export declare function createLoggingMiddleware(format?: 'simple' | 'detailed'): express.RequestHandler;
-export declare function createErrorHandler(): express.ErrorRequestHandler;
-export declare function createRequestIdMiddleware(): express.RequestHandler;
-export interface ValidationRule {
-    field: string;
-    required?: boolean;
-    type?: 'string' | 'number' | 'email' | 'boolean';
-    minLength?: number;
-    maxLength?: number;
-    pattern?: RegExp;
-    custom?: (value: unknown) => boolean | string;
-}
-export declare function createValidationMiddleware(rules: ValidationRule[]): express.RequestHandler;
-export interface RateLimitConfig {
-    windowMs?: number;
-    maxRequests?: number;
-    message?: string;
-    keyGenerator?: (req: express.Request) => string;
-}
-export declare function createRateLimitMiddleware(config?: RateLimitConfig): express.RequestHandler;
-export interface AuthConfig {
-    tokenExtractor?: (req: express.Request) => string | null;
-    tokenValidator?: (token: string) => Promise<unknown> | unknown;
-    unauthorizedMessage?: string;
-}
-export declare function createAuthMiddleware(config: AuthConfig): express.RequestHandler;
-export declare function withLogging(format?: 'simple' | 'detailed'): ServerPlugin;
-export declare function withErrorHandler(): ServerPlugin;
-export declare function withRequestId(): ServerPlugin;
-export declare function withValidation(rules: ValidationRule[]): ServerPlugin;
-export declare function withRateLimit(config?: RateLimitConfig): ServerPlugin;
-export declare function withAuth(config: AuthConfig): ServerPlugin;
-export declare function validateFields(rules: ValidationRule[]): express.RequestHandler;
-export declare function rateLimit(config?: RateLimitConfig): express.RequestHandler;
-export declare function requireAuth(config: AuthConfig): express.RequestHandler;
-export declare function cacheResponse(ttl?: number): express.RequestHandler;
-export declare function useSession(cookieName?: string): express.RequestHandler;