@umituz/web-cloudflare 1.4.5 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/web-cloudflare",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "Comprehensive Cloudflare Workers integration with config-based patterns, middleware, router, workflows, and AI (Patch-only versioning: only z in x.y.z increments)",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,8 +17,8 @@
     "./ai-gateway": "./src/domains/ai-gateway/index.ts",
     "./workers-ai": "./src/domains/ai-gateway/index.ts",
     "./wrangler": "./src/domains/wrangler/index.ts",
+    "./middleware": "./src/domains/middleware/index.ts",
     "./router": "./src/infrastructure/router/index.ts",
-    "./middleware": "./src/infrastructure/middleware/index.ts",
     "./utils": "./src/infrastructure/utils/helpers.ts",
     "./helpers": "./src/infrastructure/utils/helpers.ts",
     "./config": "./src/config/patterns.ts",

package/src/domains/middleware/entities/index.ts

@@ -0,0 +1,106 @@
+/**
+ * Middleware Domain Entities
+ * @description Middleware configuration and types for Cloudflare Workers
+ */
+
+/**
+ * CORS configuration
+ */
+export interface CORSConfig {
+  enabled: boolean;
+  allowedOrigins: string[];
+  allowedMethods: string[];
+  allowedHeaders: string[];
+  exposedHeaders?: string[];
+  allowCredentials?: boolean;
+  maxAge?: number;
+}
+
+/**
+ * Cache configuration
+ */
+export interface CacheConfig {
+  enabled: boolean;
+  defaultTTL: number;
+  paths?: Record<string, number>;
+  prefix?: string;
+  bypassPaths?: string[];
+  respectHeaders?: boolean;
+}
+
+/**
+ * Rate limit configuration
+ */
+export interface RateLimitConfig {
+  enabled: boolean;
+  maxRequests: number;
+  window: number;
+  by?: 'ip' | 'user' | 'both';
+  customKeys?: string[];
+  whitelist?: string[];
+  response?: {
+    status: number;
+    message: string;
+    retryAfter?: number;
+  };
+}
+
+/**
+ * Authentication configuration
+ */
+export interface AuthConfig {
+  enabled: boolean;
+  type: 'bearer' | 'apikey' | 'basic';
+  token?: string;
+  apiKeyHeader?: string;
+  apiKeyValue?: string;
+  username?: string;
+  password?: string;
+}
+
+/**
+ * Security headers configuration
+ */
+export interface SecurityHeadersConfig {
+  frameGuard?: boolean;
+  contentTypeNosniff?: boolean;
+  xssProtection?: boolean;
+  strictTransportSecurity?: boolean;
+  referrerPolicy?: string;
+  contentSecurityPolicy?: string;
+}
+
+/**
+ * IP filter configuration
+ */
+export interface IPFilterConfig {
+  mode: 'whitelist' | 'blacklist';
+  ips: string[];
+  cidrs?: string[];
+}
+
+/**
+ * Log configuration
+ */
+export interface LogConfig {
+  level: 'debug' | 'info' | 'warn' | 'error';
+  includeHeaders?: boolean;
+  includeBody?: boolean;
+  sampleRate?: number;
+}
+
+/**
+ * Health check configuration
+ */
+export interface HealthCheckConfig {
+  uptime: number;
+  checks: Record<string, () => Promise<boolean>>;
+}
+
+/**
+ * Error handler configuration
+ */
+export interface ErrorHandlerConfig {
+  debug: boolean;
+  logger?: (error: Error) => void;
+}

package/src/domains/middleware/index.ts

@@ -0,0 +1,14 @@
+/**
+ * Middleware Domain
+ * @description Complete middleware integration for Cloudflare Workers
+ * Subpath: @umituz/web-cloudflare/middleware
+ */
+
+// Entities
+export * from './entities';
+
+// Types
+export * from './types';
+
+// Services
+export * from './services';

package/src/{infrastructure/middleware/auth.ts → domains/middleware/services/auth.service.ts}

@@ -1,17 +1,9 @@
 /**
- * Auth Middleware
+ * Auth Service
  * @description Authentication middleware for Cloudflare Workers
  */
 
-export interface AuthConfig {
-  enabled: boolean;
-  type: 'bearer' | 'apikey' | 'basic';
-  token?: string;
-  apiKeyHeader?: string;
-  apiKeyValue?: string;
-  username?: string;
-  password?: string;
-}
+import type { AuthConfig } from '../entities';
 
 /**
  * Require authentication

package/src/{infrastructure/middleware/cache.ts → domains/middleware/services/cache.service.ts}

@@ -1,18 +1,16 @@
 /**
- * Cache Middleware
+ * Cache Service
  * @description Caching middleware for Cloudflare Workers
  */
 
-export interface CacheConfig {
-  enabled: boolean;
-  defaultTTL: number;
-  paths?: Record<string, number>;
-  prefix?: string;
-  bypassPaths?: string[];
-  respectHeaders?: boolean;
+import type { CacheConfig } from '../entities';
+
+interface CacheEntry {
+  response: Response;
+  expires: number;
 }
 
-const cacheStore = new Map<string, { response: Response; expires: number }>();
+const cacheStore = new Map<string, CacheEntry>();
 
 /**
  * Cache middleware

package/src/{infrastructure/middleware/cors.ts → domains/middleware/services/cors.service.ts}

@@ -1,17 +1,9 @@
 /**
- * CORS Middleware
+ * CORS Service
  * @description Cross-Origin Resource Sharing middleware for Cloudflare Workers
  */
 
-export interface CORSConfig {
-  enabled: boolean;
-  allowedOrigins: string[];
-  allowedMethods: string[];
-  allowedHeaders: string[];
-  exposedHeaders?: string[];
-  allowCredentials?: boolean;
-  maxAge?: number;
-}
+import type { CORSConfig } from '../entities';
 
 /**
  * Add CORS headers to response

package/src/domains/middleware/services/index.ts

@@ -0,0 +1,9 @@
+/**
+ * Middleware Services
+ * @description Middleware service implementations
+ */
+
+export { cors, addCorsHeaders } from './cors.service';
+export { cache, setCache, invalidateCache } from './cache.service';
+export { checkRateLimit } from './rate-limit.service';
+export { requireAuth, addUserContext } from './auth.service';

package/src/{infrastructure/middleware/rate-limit.ts → domains/middleware/services/rate-limit.service.ts}

@@ -1,21 +1,9 @@
 /**
- * Rate Limit Middleware
+ * Rate Limit Service
  * @description Rate limiting middleware for Cloudflare Workers
  */
 
-export interface RateLimitConfig {
-  enabled: boolean;
-  maxRequests: number;
-  window: number;
-  by?: 'ip' | 'user' | 'both';
-  customKeys?: string[];
-  whitelist?: string[];
-  response?: {
-    status: number;
-    message: string;
-    retryAfter?: number;
-  };
-}
+import type { RateLimitConfig } from '../entities';
 
 interface RateLimitEntry {
   count: number;

package/src/domains/middleware/types/index.ts

@@ -0,0 +1,5 @@
+/**
+ * Middleware Domain Types
+ */
+
+export * from './service.interface';

package/src/domains/middleware/types/service.interface.ts

@@ -0,0 +1,122 @@
+/**
+ * Middleware Service Interface
+ * @description Defines the contract for middleware operations
+ */
+
+import type {
+  CORSConfig,
+  CacheConfig,
+  RateLimitConfig,
+  AuthConfig,
+  SecurityHeadersConfig,
+  IPFilterConfig,
+  LogConfig,
+  HealthCheckConfig,
+  ErrorHandlerConfig,
+} from '../entities';
+
+export interface IMiddlewareService {
+  /**
+   * CORS middleware
+   */
+  cors(request: Request, config: CORSConfig): Promise<Response | null>;
+  addCorsHeaders(request: Request, response: Response, config: CORSConfig): Response;
+
+  /**
+   * Cache middleware
+   */
+  cache(request: Request, config: CacheConfig): Promise<Response | null>;
+  setCache(request: Request, response: Response, config: CacheConfig): void;
+  invalidateCache(pattern?: string): void;
+
+  /**
+   * Rate limit middleware
+   */
+  checkRateLimit(request: Request, config: RateLimitConfig): Promise<Response | null>;
+
+  /**
+   * Authentication middleware
+   */
+  requireAuth(request: Request, config: AuthConfig): Promise<Response | null>;
+  addUserContext(request: Request, user: {
+    id: string;
+    [key: string]: unknown;
+  }): Request;
+
+  /**
+   * Security headers
+   */
+  addSecurityHeaders(response: Response, config: SecurityHeadersConfig): Response;
+
+  /**
+   * Bot detection
+   */
+  detectBot(request: Request): Promise<{
+    isBot: boolean;
+    botType?: string;
+  }>;
+
+  /**
+   * Request logging
+   */
+  logRequest(request: Request, config: LogConfig): Promise<void>;
+
+  /**
+   * Response time tracking
+   */
+  trackResponseTime(handler: () => Promise<Response>): Promise<{
+    response: Response;
+    duration: number;
+  }>;
+
+  /**
+   * IP filter
+   */
+  checkIPFilter(request: Request, config: IPFilterConfig): Response | null;
+
+  /**
+   * Method override
+   */
+  methodOverride(request: Request): Request;
+
+  /**
+   * Request ID
+   */
+  addRequestID(request: Request): string;
+
+  /**
+   * Health check
+   */
+  healthCheck(
+    env: import('../../router').CloudflareEnv,
+    config?: HealthCheckConfig
+  ): Promise<Response>;
+
+  /**
+   * Error handling
+   */
+  handleMiddlewareError(error: Error, config: ErrorHandlerConfig): Response;
+
+  /**
+   * Conditional middleware
+   */
+  conditionalChainMiddleware(
+    condition: (request: Request) => boolean,
+    middleware: (request: Request) => Response | null
+  ): (request: Request) => Response | null;
+
+  /**
+   * Chain middleware
+   */
+  chainMiddleware(
+    ...middlewares: Array<(request: Request) => Response | null>
+  ): (request: Request) => Response | null;
+
+  /**
+   * Chain async middleware
+   */
+  chainAsyncMiddleware(
+    request: Request,
+    ...middlewares: Array<(request: Request) => Promise<Response | null>>
+  ): Promise<Response | null>;
+}

package/src/index.ts

@@ -35,10 +35,10 @@ export * from "./domains/kv";
 export * from "./domains/images";
 export * from "./domains/analytics";
 export * from "./domains/workflows";
+export * from "./domains/middleware";
 
-// Infrastructure - Router, Middleware, Utils
+// Infrastructure - Router, Utils
 export * from "./infrastructure/router";
-export * from "./infrastructure/middleware";
 export * from "./infrastructure/utils/helpers";
 export * from "./infrastructure/constants";
 

package/src/infrastructure/middleware/index.ts

@@ -1,10 +1,14 @@
 /**
  * Cloudflare Middleware Collection
  * @description Comprehensive middleware for Cloudflare Workers
+ * @deprecated Import from '@umituz/web-cloudflare/middleware' instead
  */
 
+// Re-export from middleware domain
+export * from '../../domains/middleware';
+
 // ============================================================
-// Environment Types
+// Environment Types (kept for backwards compatibility)
 // ============================================================
 
 export interface CloudflareMiddlewareEnv {
@@ -20,12 +24,6 @@ export interface CloudflareMiddlewareEnv {
 // Type alias for backwards compatibility
 export type Env = CloudflareMiddlewareEnv;
 
-// Re-export existing middleware
-export { cors, addCorsHeaders } from './cors';
-export { cache, setCache, invalidateCache } from './cache';
-export { checkRateLimit } from './rate-limit';
-export { requireAuth, addUserContext } from './auth';
-
 // ============================================================
 // New Middleware
 // ============================================================