Update screenshot handling with improved error resilience and URL formatting

Author: erdinccurebal

.env.sample

@@ -5,4 +5,6 @@ NODE_ENV=<development|production>
 # Authentication
 AUTH_USERNAME=<your_secure_username>
 AUTH_PASSWORD=<your_secure_password>
+
+# Puppeteer Configuration
 CHROME_PATH=<path_to_chrome_executable>

app.js

@@ -4,6 +4,8 @@ import express from 'express';
 import cors from 'cors';
 import helmet from 'helmet';
 import morgan from 'morgan';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
 // Import centralized routes
 import routes from './routes.js';
@@ -18,6 +20,9 @@ import { swaggerDocs, swaggerUi } from './swagger.js';
 import controllerRouteNotFoundHandler from './controllers/route-not-found-handler.js';
 import controllerErrorHandler from './controllers/error-handler.js';
 
+// Get directory name in ES module context
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 // Initialize Express application
 const app = express();
 
@@ -50,6 +55,9 @@ app.use(morgan(morganFormat, { skip: skipOption }));
 // Sets a limit to handle large payloads
 app.use(express.json({ limit: API_CONFIG.JSON_LIMIT }));
 
+// Serve static files from tmp directory
+app.use('/tmp', express.static(path.join(__dirname, 'tmp')));
+
 // Set up Swagger documentation
 app.use(
     '/docs',

controllers/error-handler.js

@@ -10,42 +10,40 @@
  * @param {Response} res - Express response object
  * @param {Function} next - Express next middleware function
  */
-export default (error, req, res, next) => {
+
+export default (error, _req, res, _next) => {
   // Log the complete error to server console for debugging
   console.error(error);
 
   // Create standardized error response structure
   const result = {
     success: false,
-    data: null,
-  };
-
-  // Prepare detailed error information container
-  const data = {
-    message: null,
-    stack: null,
+    data: {
+      message: null,
+      stack: null
+    }
   };
 
   // Format error message based on error type
   if (error.name === 'ValidationError') {
     // Handle Joi validation errors with more details
-    data.message = formatValidationError(error);
+    result.data.message = formatValidationError(error);
   } else if (error.message) {
     // For general errors with messages
-    data.message = formatErrorMessage(error.message);
+    result.data.message = formatErrorMessage(error.message);
   } else {
     // Default message if error doesn't contain one
-    data.message = 'Internal Server Error';
+    result.data.message = 'Internal Server Error';
   }
 
   // Include stack trace only in development environment
   if (process.env.NODE_ENV === 'development' && error.stack) {
-    data.stack = formatStackTrace(error.stack);
+    result.data.stack = formatStackTrace(error.stack);
   }
 
-  // Only include data field if we have meaningful information to share
-  if (data.message || data.stack) {
-    result.data = data;
+  // Add screenshot path to data object (if exists)
+  if (error.screenshot) {
+    result.data.screenshot = error.screenshot;
   }
 
   // Send response with appropriate status code

controllers/health.js

@@ -13,6 +13,7 @@ import process from 'process';
 
 // Custom helpers
 import checkPuppeteerHealth from '../helpers/puppeteer-health.js';
+import browserSemaphore from '../helpers/browser-semaphore.js';
 
 /**
  * Health check controller function - GET /health endpoint handler
@@ -23,6 +24,9 @@ import checkPuppeteerHealth from '../helpers/puppeteer-health.js';
  */
 export default async function (req, res, next) {
     try {
+        // Acquire browser semaphore lock
+        await browserSemaphore.acquire();
+
         // Get system info
         const uptime = process.uptime();
 
@@ -70,6 +74,9 @@ export default async function (req, res, next) {
         res.json(result);
     } catch (error) {
         next(error); // Pass the error to the error handler
+    } finally {
+        // Release browser semaphore lock
+        browserSemaphore.release();
     }
 }