@de-otio/trellis 0.7.0 → 0.9.0

package/dist/lib/routes/media.js

@@ -1,57 +1,20 @@
-"use strict";
 /**
  * Media Routes
  *
  * Handles media file uploads (images, videos) for posts and profiles.
  * Implements content-addressed storage (CAS) with SHA-256 hashing for deduplication.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mediaRoutes = void 0;
-const cors_handler_1 = require("../cors-handler");
-const database_connection_manager_1 = require("../database-connection-manager");
-const db_query_helper_1 = require("../db-query-helper");
-const logger_1 = require("../logger");
-const media_handler_1 = require("../media-handler");
-const middleware_1 = require("../middleware");
-const rate_limit_1 = require("../rate-limit");
-const secret_resolver_1 = require("../secret-resolver");
-const security_headers_1 = require("../security-headers");
-const session_manager_1 = require("../session-manager");
-const image_normalizer_1 = require("../services/image-normalizer");
-const media_upload_service_1 = require("../services/media-upload-service");
+import { CorsHandler } from "../cors-handler.js";
+import { sharedDatabaseConnectionManager } from "../database-connection-manager.js";
+import { QueryTimeoutPresets, withQueryTimeoutAndRetry, } from "../db-query-helper.js";
+import { getLogger } from "../logger.js";
+import { MediaHandler } from "../media-handler.js";
+import { corsMiddleware, csrfMiddleware } from "../middleware.js";
+import { RateLimiter } from "../rate-limit.js";
+import { SecurityHeaders } from "../security-headers.js";
+import { SessionManager } from "../session-cookie.js";
+import { ImageNormalizer } from "../services/image-normalizer.js";
+import { MediaUploadService } from "../services/media-upload-service.js";
 /**
  * Generate SHA-256 content hash for content-addressed storage
  */
@@ -172,13 +135,13 @@ function validateMagicNumbers(bytes, declaredMimeType) {
  * Shared function used by both /api/media/:mediaId and /api/media/:hash routes
  */
 async function serveMediaByHash(contentHash, variant, request, env, session) {
-    const logger = logger_1.Logger.getInstance(env);
+    const logger = getLogger();
     logger.debug("SERVE MEDIA BY HASH: Starting", {
         contentHash,
         variant,
         userId: session.userId,
     });
-    const securityHeaders = new security_headers_1.SecurityHeaders(env);
+    const securityHeaders = new SecurityHeaders(env);
     try {
         // Wrap entire function in try-catch to catch any unexpected errors
         logger.debug("SERVE MEDIA: Inside try block");
@@ -187,7 +150,7 @@ async function serveMediaByHash(contentHash, variant, request, env, session) {
         try {
             const region = "US"; // TODO: Get from session or request
             // Using retry logic with exponential backoff for connection resilience
-            mediaFile = await (0, db_query_helper_1.withQueryTimeoutAndRetry)(database_connection_manager_1.sharedDatabaseConnectionManager, region, env, async (db) => {
+            mediaFile = await withQueryTimeoutAndRetry(sharedDatabaseConnectionManager, region, env, async (db) => {
                 const dbAny = db;
                 if (dbAny.mediaFile) {
                     return await dbAny.mediaFile.findUnique({
@@ -196,7 +159,7 @@ async function serveMediaByHash(contentHash, variant, request, env, session) {
                 }
                 return null;
             }, {
-                ...db_query_helper_1.QueryTimeoutPresets.USER_FACING,
+                ...QueryTimeoutPresets.USER_FACING,
                 maxRetries: 3,
                 baseDelayMs: 100,
                 context: {
@@ -231,7 +194,7 @@ async function serveMediaByHash(contentHash, variant, request, env, session) {
         const r2Bucket = env.MEDIA_BUCKET_R2 || env.R2_BUCKET;
         if (!r2Bucket) {
             const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Media storage not configured" }), { status: 503, headers: { "content-type": "application/json" } });
-            return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+            return CorsHandler.addCorsHeaders(errorResponse, request, env);
         }
         // Determine which R2 key to serve
         let r2Key = null;
@@ -513,7 +476,7 @@ async function serveMediaByHash(contentHash, variant, request, env, session) {
                 source: "serveMediaByHash-noKey",
                 ...(debugInfo && { debug: debugInfo }),
             }), { status: 404, headers: { "content-type": "application/json" } });
-            return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+            return CorsHandler.addCorsHeaders(errorResponse, request, env);
         }
         const object = await r2Bucket.get(r2Key);
         if (!object) {
@@ -537,7 +500,7 @@ async function serveMediaByHash(contentHash, variant, request, env, session) {
                 source: "serveMediaByHash",
                 ...(debugInfo && { debug: debugInfo }),
             }), { status: 404, headers: { "content-type": "application/json" } });
-            return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+            return CorsHandler.addCorsHeaders(errorResponse, request, env);
         }
         // Get content type from object metadata or use determined type
         const objectContentType = object.httpMetadata?.contentType || contentType;
@@ -554,7 +517,7 @@ async function serveMediaByHash(contentHash, variant, request, env, session) {
                 "X-Debug-Timestamp": Date.now().toString(), // Unique per request
             },
         });
-        return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+        return CorsHandler.addCorsHeaders(response, request, env);
     }
     catch (unexpectedError) {
         // Catch any unexpected errors in serveMediaByHash
@@ -571,7 +534,7 @@ async function serveMediaByHash(contentHash, variant, request, env, session) {
             contentHash,
             variant,
         }), { status: 500, headers: { "content-type": "application/json" } });
-        return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+        return CorsHandler.addCorsHeaders(errorResponse, request, env);
     }
 }
 /**
@@ -620,15 +583,15 @@ function checkSuspiciousContent(bytes, mimeType) {
     }
     return suspicious;
 }
-exports.mediaRoutes = [
+export const mediaRoutes = [
     {
         path: "/api/media/upload",
         method: "POST",
         handler: async (request, env) => {
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
             // Check authentication
             const authHeader = request.headers.get("Authorization");
             logger.debug("[Media Upload] Attempting to get session", {
@@ -636,14 +599,14 @@ exports.mediaRoutes = [
                 hasAuthHeader: !!authHeader,
                 authHeaderPreview: authHeader?.substring(0, 50) || "none",
             });
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 logger.warn("[Media Upload] Unauthorized - no valid session", {
                     hasCookie: !!request.headers.get("Cookie"),
                     hasAuthHeader: !!authHeader,
                 });
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 10 uploads per 60s per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/upload", 10, 60, session.userId);
@@ -665,7 +628,7 @@ exports.mediaRoutes = [
                         error: "Invalid request format",
                         message: "Failed to parse multipart form data",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 const file = formData.get("file");
                 if (!file) {
@@ -677,7 +640,7 @@ exports.mediaRoutes = [
                         error: "No file provided",
                         message: "File field is required in multipart form data",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Check if file is empty
                 if (file.size === 0) {
@@ -689,7 +652,7 @@ exports.mediaRoutes = [
                         error: "Empty file",
                         message: "File cannot be empty",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Validate file type
                 const allowedImageTypes = [
@@ -722,7 +685,7 @@ exports.mediaRoutes = [
                         error: "File read error",
                         message: "Failed to read file data",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 if (fileBuffer.byteLength === 0) {
                     logger.warn("Media upload failed: File buffer is empty", {
@@ -734,7 +697,7 @@ exports.mediaRoutes = [
                         error: "Empty file",
                         message: "File data is empty",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 const bytes = new Uint8Array(fileBuffer);
                 // Always detect MIME type from magic numbers (trust the file, not the declared type)
@@ -823,7 +786,7 @@ exports.mediaRoutes = [
                             fileName: file.name,
                         },
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Validate file size (per documentation: 10MB for images, 100MB for videos)
                 const maxImageSize = 10 * 1024 * 1024; // 10MB
@@ -836,7 +799,7 @@ exports.mediaRoutes = [
                             ? "Image must be 10MB or less"
                             : "Video must be 100MB or less",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // File buffer already read above for MIME type detection
                 // Reuse the bytes array
@@ -862,7 +825,7 @@ exports.mediaRoutes = [
                         error: "Invalid file signature",
                         message: "File signature does not match detected file type. File may be corrupted or malicious.",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Check for suspicious patterns
                 const suspicious = checkSuspiciousContent(bytes, mimeType);
@@ -881,7 +844,7 @@ exports.mediaRoutes = [
                 // Extract metadata (best effort, non-fatal)
                 let extracted = {};
                 try {
-                    const { MetadataExtractor } = await Promise.resolve().then(() => __importStar(require("../metadata/metadata-extractor")));
+                    const { MetadataExtractor } = await import("../metadata/metadata-extractor.js");
                     const extractor = new MetadataExtractor(env);
                     extracted = await extractor.extractAll(fileBuffer, mimeType);
                 }
@@ -904,13 +867,13 @@ exports.mediaRoutes = [
                 // Pass the already-read fileBuffer to avoid a second file.arrayBuffer() call.
                 // On Cloudflare Workers, File objects from FormData may not support
                 // reliable re-reads of arrayBuffer(), causing a different contentHash.
-                const uploadService = new media_upload_service_1.MediaUploadService(env);
+                const uploadService = new MediaUploadService(env);
                 const result = await uploadService.uploadSingle(file, session.userId, metadata, fileBuffer);
                 // Normalize images to sRGB (non-blocking, best effort)
                 let optimizedKey = null;
                 if (mimeType.startsWith("image/")) {
                     if (env.IMAGES && env.MEDIA_BUCKET_R2) {
-                        const normalizer = new image_normalizer_1.ImageNormalizer(env.IMAGES, env.MEDIA_BUCKET_R2);
+                        const normalizer = new ImageNormalizer(env.IMAGES, env.MEDIA_BUCKET_R2);
                         const startTime = Date.now();
                         logger.info("image_normalization.started", {
                             contentHash: result.contentHash,
@@ -950,7 +913,7 @@ exports.mediaRoutes = [
                 const uploadOriginalKey = `media/${result.contentHash}.${getExtensionFromMimeType(mimeType)}`;
                 const uploadRegion = "US"; // TODO: Get from session or request
                 try {
-                    await (0, db_query_helper_1.withQueryTimeoutAndRetry)(database_connection_manager_1.sharedDatabaseConnectionManager, uploadRegion, env, async (db) => {
+                    await withQueryTimeoutAndRetry(sharedDatabaseConnectionManager, uploadRegion, env, async (db) => {
                         return await db.mediaFile.upsert({
                             where: { contentHash: result.contentHash },
                             create: {
@@ -975,7 +938,7 @@ exports.mediaRoutes = [
                             },
                         });
                     }, {
-                        ...db_query_helper_1.QueryTimeoutPresets.USER_FACING,
+                        ...QueryTimeoutPresets.USER_FACING,
                         maxRetries: 1,
                         context: {
                             operation: "mediaUpload_createRecord",
@@ -997,7 +960,7 @@ exports.mediaRoutes = [
                         status: 500,
                         headers: { "content-type": "application/json" },
                     });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(dbErrorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(dbErrorResponse, request, env);
                 }
                 logger.debug("[Media Upload] DB record created successfully", {
                     contentHash: result.contentHash,
@@ -1019,7 +982,7 @@ exports.mediaRoutes = [
                     contentHash: result.contentHash,
                     status: result.status,
                 }), { status: 200, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 logger.error("Error handling media upload:", error);
@@ -1027,26 +990,26 @@ exports.mediaRoutes = [
                     error: "Failed to upload media",
                     message: error.message || "An unexpected error occurred",
                 }), { status: 500, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)(), (0, middleware_1.csrfMiddleware)()],
+        middleware: [corsMiddleware(), csrfMiddleware()],
         description: "Upload media file (image or video) with content-addressed storage",
     },
     {
         path: "/api/media/upload/batch",
         method: "POST",
         handler: async (request, env) => {
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 logger.warn("[Media Batch Upload] Unauthorized");
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 5 batch uploads per 60s per user (stricter than single)
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/upload/batch", 5, 60, session.userId);
@@ -1082,7 +1045,7 @@ exports.mediaRoutes = [
                         error: "No files provided",
                         message: "At least one file is required",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 if (files.length > 20) {
                     logger.warn("[Media Batch Upload] Too many files", {
@@ -1093,14 +1056,14 @@ exports.mediaRoutes = [
                         error: "Too many files",
                         message: "Maximum 20 files per batch",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 logger.info("[Media Batch Upload] Processing batch", {
                     userId: session.userId,
                     fileCount: files.length,
                 });
                 // Use MediaUploadService for batch upload
-                const uploadService = new media_upload_service_1.MediaUploadService(env);
+                const uploadService = new MediaUploadService(env);
                 const results = await uploadService.uploadBatch(files, session.userId);
                 const successCount = results.filter((r) => r.success).length;
                 const failureCount = results.filter((r) => !r.success).length;
@@ -1118,7 +1081,7 @@ exports.mediaRoutes = [
                         failed: failureCount,
                     },
                 }), { status: 200, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 logger.error("[Media Batch Upload] Error:", error);
@@ -1126,10 +1089,10 @@ exports.mediaRoutes = [
                     error: "Failed to upload media batch",
                     message: error.message || "An unexpected error occurred",
                 }), { status: 500, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)(), (0, middleware_1.csrfMiddleware)()],
+        middleware: [corsMiddleware(), csrfMiddleware()],
         description: "Upload multiple media files in a single batch request",
     },
     {
@@ -1137,19 +1100,19 @@ exports.mediaRoutes = [
         method: "GET",
         handler: async (request, env) => {
             const startTime = Date.now();
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
-            const mediaHandler = media_handler_1.MediaHandler.create(env);
-            const { MediaMetrics } = await Promise.resolve().then(() => __importStar(require("../media-metrics")));
-            const { RegionDetector } = await Promise.resolve().then(() => __importStar(require("../region-detection")));
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
+            const mediaHandler = MediaHandler.create(env);
+            const { MediaMetrics } = await import("../media-metrics.js");
+            const { RegionDetector } = await import("../region-detection.js");
             const metrics = new MediaMetrics(env);
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 60 requests per minute per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/grouped", 60, 60, session.userId);
@@ -1178,7 +1141,7 @@ exports.mediaRoutes = [
                         error: "Invalid groupBy",
                         message: 'groupBy must be "month" or "year"',
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 const includeHidden = url.searchParams.get("includeHidden") === "true";
                 const type = url.searchParams.get("type") || "all";
@@ -1203,7 +1166,7 @@ exports.mediaRoutes = [
                         error: "Invalid limit",
                         message: "Limit must be between 1 and 10000",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 const result = await mediaHandler.listUserMediaGrouped(session.userId, groupBy, {
                     includeHidden,
@@ -1218,7 +1181,7 @@ exports.mediaRoutes = [
                 // Track metrics
                 metrics.trackGrouped("/api/media/grouped", duration, result.groups.length, totalItems, 200, region, session.userId);
                 const response = securityHeaders.createSecureResponse(JSON.stringify(result), { status: 200, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 const duration = Date.now() - startTime;
@@ -1243,10 +1206,10 @@ exports.mediaRoutes = [
                     status: statusCode,
                     headers: { "content-type": "application/json" },
                 });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)()],
+        middleware: [corsMiddleware()],
         description: "List user media grouped by month or year",
     },
     {
@@ -1254,19 +1217,19 @@ exports.mediaRoutes = [
         method: "GET",
         handler: async (request, env) => {
             const startTime = Date.now();
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
-            const mediaHandler = media_handler_1.MediaHandler.create(env);
-            const { MediaMetrics } = await Promise.resolve().then(() => __importStar(require("../media-metrics")));
-            const { RegionDetector } = await Promise.resolve().then(() => __importStar(require("../region-detection")));
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
+            const mediaHandler = MediaHandler.create(env);
+            const { MediaMetrics } = await import("../media-metrics.js");
+            const { RegionDetector } = await import("../region-detection.js");
             const metrics = new MediaMetrics(env);
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 60 requests per minute per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/stats", 60, 60, session.userId);
@@ -1284,7 +1247,7 @@ exports.mediaRoutes = [
                 // Track metrics
                 metrics.trackStats("/api/media/stats", duration, result.totalCount, 200, region, session.userId);
                 const response = securityHeaders.createSecureResponse(JSON.stringify(result), { status: 200, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 const duration = Date.now() - startTime;
@@ -1309,10 +1272,10 @@ exports.mediaRoutes = [
                     status: statusCode,
                     headers: { "content-type": "application/json" },
                 });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)()],
+        middleware: [corsMiddleware()],
         description: "Get media statistics",
     },
     {
@@ -1320,23 +1283,23 @@ exports.mediaRoutes = [
         method: "GET",
         handler: async (request, env, context) => {
             const startTime = Date.now();
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
             logger.debug("MEDIA ROUTE: /api/media/:mediaId GET handler called", {
                 url: request.url,
                 mediaId: context.params?.mediaId,
             });
-            const rateLimiter = new rate_limit_1.RateLimiter();
-            const mediaHandler = media_handler_1.MediaHandler.create(env);
-            const { MediaMetrics } = await Promise.resolve().then(() => __importStar(require("../media-metrics")));
-            const { RegionDetector } = await Promise.resolve().then(() => __importStar(require("../region-detection")));
+            const rateLimiter = new RateLimiter();
+            const mediaHandler = MediaHandler.create(env);
+            const { MediaMetrics } = await import("../media-metrics.js");
+            const { RegionDetector } = await import("../region-detection.js");
             const metrics = new MediaMetrics(env);
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 120 requests per minute per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/:mediaId", 120, 60, session.userId);
@@ -1362,7 +1325,7 @@ exports.mediaRoutes = [
                         error: "Invalid request",
                         message: "Media ID is required",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Check if this is actually a content hash request (64-char hex)
                 // Content hashes are hex strings and typically 64 characters
@@ -1417,7 +1380,7 @@ exports.mediaRoutes = [
                         expires: new Date(Date.now() + 5 * 60 * 1000).toUTCString(),
                     },
                 });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 const duration = Date.now() - startTime;
@@ -1444,24 +1407,24 @@ exports.mediaRoutes = [
                     message: error.message || "An unexpected error occurred",
                     source: "mediaId-route-catch",
                 }), { status, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)()],
+        middleware: [corsMiddleware()],
         description: "Get detailed information about a media file",
     },
     {
         path: "/api/media/:hash",
         method: "GET",
         handler: async (request, env, { params }) => {
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             try {
                 const contentHash = params.hash;
@@ -1470,7 +1433,7 @@ exports.mediaRoutes = [
                         error: "Missing content hash",
                         source: "hash-route",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Parse variant from query params (thumbnail, optimized, original)
                 const url = new URL(request.url);
@@ -1490,27 +1453,27 @@ exports.mediaRoutes = [
                     message: error.message || "An unexpected error occurred",
                     source: "hash-route-catch",
                 }), { status: 500, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)()],
+        middleware: [corsMiddleware()],
         description: "Serve media file by content hash with variant support",
     },
     {
         path: "/api/media",
         method: "GET",
         handler: async (request, env) => {
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
-            const mediaHandler = media_handler_1.MediaHandler.create(env);
-            const { MediaMetrics } = await Promise.resolve().then(() => __importStar(require("../media-metrics")));
-            const { RegionDetector } = await Promise.resolve().then(() => __importStar(require("../region-detection")));
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
+            const mediaHandler = MediaHandler.create(env);
+            const { MediaMetrics } = await import("../media-metrics.js");
+            const { RegionDetector } = await import("../region-detection.js");
             const metrics = new MediaMetrics(env);
             const startTime = Date.now();
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const duration = Date.now() - startTime;
                 metrics.trackOperation({
@@ -1521,7 +1484,7 @@ exports.mediaRoutes = [
                     errorType: "unauthorized",
                 });
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 60 requests per minute per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media", 60, 60, session.userId);
@@ -1556,7 +1519,7 @@ exports.mediaRoutes = [
                         error: "Invalid limit",
                         message: "Limit must be between 1 and 100",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Get user media
                 const result = await mediaHandler.listUserMedia(session.userId, {
@@ -1573,7 +1536,7 @@ exports.mediaRoutes = [
                 // Track metrics
                 metrics.trackList("/api/media", duration, result.media.length, 200, region, session.userId);
                 const response = securityHeaders.createSecureResponse(JSON.stringify(result), { status: 200, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 const duration = Date.now() - startTime;
@@ -1598,10 +1561,10 @@ exports.mediaRoutes = [
                     status: statusCode,
                     headers: { "content-type": "application/json" },
                 });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)()],
+        middleware: [corsMiddleware()],
         description: "List user media with pagination, sorting, and filtering",
     },
     {
@@ -1609,19 +1572,19 @@ exports.mediaRoutes = [
         method: "POST",
         handler: async (request, env, context) => {
             const startTime = Date.now();
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
-            const mediaHandler = media_handler_1.MediaHandler.create(env);
-            const { MediaMetrics } = await Promise.resolve().then(() => __importStar(require("../media-metrics")));
-            const { RegionDetector } = await Promise.resolve().then(() => __importStar(require("../region-detection")));
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
+            const mediaHandler = MediaHandler.create(env);
+            const { MediaMetrics } = await import("../media-metrics.js");
+            const { RegionDetector } = await import("../region-detection.js");
             const metrics = new MediaMetrics(env);
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 10 requests per minute per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/:mediaId/hide", 10, 60, session.userId);
@@ -1647,7 +1610,7 @@ exports.mediaRoutes = [
                         error: "Invalid request",
                         message: "Media ID is required",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Hide media
                 const result = await mediaHandler.hideMedia(mediaId, session.userId, env, request);
@@ -1660,7 +1623,7 @@ exports.mediaRoutes = [
                     success: true,
                     media: result,
                 }), { status: 200, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 const duration = Date.now() - startTime;
@@ -1692,10 +1655,10 @@ exports.mediaRoutes = [
                     error: message,
                     message: error.message || "An unexpected error occurred",
                 }), { status, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)(), (0, middleware_1.csrfMiddleware)()],
+        middleware: [corsMiddleware(), csrfMiddleware()],
         description: "Hide a media file from all posts",
     },
     {
@@ -1703,19 +1666,19 @@ exports.mediaRoutes = [
         method: "POST",
         handler: async (request, env, context) => {
             const startTime = Date.now();
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
-            const mediaHandler = media_handler_1.MediaHandler.create(env);
-            const { MediaMetrics } = await Promise.resolve().then(() => __importStar(require("../media-metrics")));
-            const { RegionDetector } = await Promise.resolve().then(() => __importStar(require("../region-detection")));
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
+            const mediaHandler = MediaHandler.create(env);
+            const { MediaMetrics } = await import("../media-metrics.js");
+            const { RegionDetector } = await import("../region-detection.js");
             const metrics = new MediaMetrics(env);
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 10 requests per minute per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/:mediaId/unhide", 10, 60, session.userId);
@@ -1741,7 +1704,7 @@ exports.mediaRoutes = [
                         error: "Invalid request",
                         message: "Media ID is required",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Unhide media
                 const result = await mediaHandler.unhideMedia(mediaId, session.userId, env, request);
@@ -1754,7 +1717,7 @@ exports.mediaRoutes = [
                     success: true,
                     media: result,
                 }), { status: 200, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                return CorsHandler.addCorsHeaders(response, request, env);
             }
             catch (error) {
                 const duration = Date.now() - startTime;
@@ -1786,10 +1749,10 @@ exports.mediaRoutes = [
                     error: message,
                     message: error.message || "An unexpected error occurred",
                 }), { status, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)(), (0, middleware_1.csrfMiddleware)()],
+        middleware: [corsMiddleware(), csrfMiddleware()],
         description: "Unhide a media file (make it visible again)",
     },
     {
@@ -1797,19 +1760,19 @@ exports.mediaRoutes = [
         method: "DELETE",
         handler: async (request, env, context) => {
             const startTime = Date.now();
-            const sessionManager = new session_manager_1.SessionManager();
-            const securityHeaders = new security_headers_1.SecurityHeaders(env);
-            const logger = logger_1.Logger.getInstance(env);
-            const rateLimiter = new rate_limit_1.RateLimiter();
-            const mediaHandler = media_handler_1.MediaHandler.create(env);
-            const { MediaMetrics } = await Promise.resolve().then(() => __importStar(require("../media-metrics")));
-            const { RegionDetector } = await Promise.resolve().then(() => __importStar(require("../region-detection")));
+            const sessionManager = new SessionManager();
+            const securityHeaders = new SecurityHeaders(env);
+            const logger = getLogger();
+            const rateLimiter = new RateLimiter();
+            const mediaHandler = MediaHandler.create(env);
+            const { MediaMetrics } = await import("../media-metrics.js");
+            const { RegionDetector } = await import("../region-detection.js");
             const metrics = new MediaMetrics(env);
             // Check authentication
-            const session = await sessionManager.getSession(request, secret_resolver_1.Secrets.getSessionSecret(env), env);
+            const session = await sessionManager.getSession(request, env.SESSION_SECRET, env);
             if (!session) {
                 const errorResponse = securityHeaders.createSecureResponse(JSON.stringify({ error: "Unauthorized" }), { status: 401, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
             // Apply rate limiting: 10 requests per minute per user
             const rateLimitResponse = await rateLimiter.applyRateLimitKV(env, request, "/api/media/:mediaId", 10, 60, session.userId);
@@ -1835,7 +1798,7 @@ exports.mediaRoutes = [
                         error: "Invalid request",
                         message: "Media ID is required",
                     }), { status: 400, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                    return CorsHandler.addCorsHeaders(errorResponse, request, env);
                 }
                 // Delete media
                 try {
@@ -1849,7 +1812,7 @@ exports.mediaRoutes = [
                         success: true,
                         message: "Media deleted successfully",
                     }), { status: 200, headers: { "content-type": "application/json" } });
-                    return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                    return CorsHandler.addCorsHeaders(response, request, env);
                 }
                 catch (deleteError) {
                     const duration = Date.now() - startTime;
@@ -1866,7 +1829,7 @@ exports.mediaRoutes = [
                             message: deleteError.message,
                             action: "hidden", // Media was hidden instead of deleted
                         }), { status: 409, headers: { "content-type": "application/json" } });
-                        return cors_handler_1.CorsHandler.addCorsHeaders(response, request, env);
+                        return CorsHandler.addCorsHeaders(response, request, env);
                     }
                     throw deleteError;
                 }
@@ -1900,10 +1863,10 @@ exports.mediaRoutes = [
                     error: message,
                     message: error.message || "An unexpected error occurred",
                 }), { status, headers: { "content-type": "application/json" } });
-                return cors_handler_1.CorsHandler.addCorsHeaders(errorResponse, request, env);
+                return CorsHandler.addCorsHeaders(errorResponse, request, env);
             }
         },
-        middleware: [(0, middleware_1.corsMiddleware)(), (0, middleware_1.csrfMiddleware)()],
+        middleware: [corsMiddleware(), csrfMiddleware()],
         description: "Delete a media file (soft delete)",
     },
 ];