Two cleanups in one pass for the v1.14.0 'works on any platform' theme: 1. Response helpers — merged src/utils/responses.js and the root-level response-helpers.js into a single module at src/utils/responses.js. The old module had a richer set (created, noContent, validationError, unauthorized, forbidden, notFound, conflict) and is now re-exported from the new location. Updated 15 routes to import from src/utils/responses and deleted the root response-helpers.js. 2. Error logger — error-handler.js now uses the unified src/utils/logging.js#logError (same one src/app.js uses), so all errors go to one log file with one rotation policy. Removed the dead asyncHandler export (the real one is in src/utils/async-handler.js and is used everywhere). Deleted the legacy error-logger.js. Both are invisible to users — same HTTP response shapes, same log file path, same error format. Internal-only refactor.
91 lines
2.6 KiB
JavaScript
91 lines
2.6 KiB
JavaScript
/**
|
|
* DashCaddy Error Handler Middleware
|
|
* Centralizes error handling logic to eliminate duplicate catch blocks
|
|
*
|
|
* Logging: this middleware uses the unified logError from src/utils/logging.js
|
|
* (same one src/app.js uses), so all errors go to one log file. The legacy
|
|
* ./error-logger.js and its ./error.log file have been retired.
|
|
*/
|
|
|
|
const path = require('path');
|
|
const { AppError } = require('./errors');
|
|
const { LIMITS } = require('./constants');
|
|
const { logError: unifiedLogError, safeErrorMessage } = require('./src/utils/logging');
|
|
|
|
const ERROR_LOG_FILE = path.join(__dirname, 'error.log');
|
|
const MAX_ERROR_LOG_SIZE = LIMITS.ERROR_LOG_SIZE;
|
|
|
|
/**
|
|
* Global error handling middleware
|
|
* MUST be registered after all routes in server.js
|
|
*/
|
|
function errorMiddleware(err, req, res, next) {
|
|
// Log all errors with request context (unified, same file the rest of the app uses)
|
|
unifiedLogError(
|
|
ERROR_LOG_FILE,
|
|
MAX_ERROR_LOG_SIZE,
|
|
req.path,
|
|
err,
|
|
{
|
|
method: req.method,
|
|
ip: req.ip,
|
|
userId: req.user?.id,
|
|
body: req.body
|
|
}
|
|
).catch(e => console.error('Failed to write to error log:', e.message));
|
|
|
|
// Determine if this is an operational error (AppError) or programming error
|
|
const isOperational = err.isOperational || err instanceof AppError;
|
|
|
|
// Status code
|
|
const statusCode = err.statusCode || 500;
|
|
|
|
// Error code (DC-XXX format)
|
|
const code = err.code || `DC-${statusCode}`;
|
|
|
|
// Build response
|
|
const response = {
|
|
success: false,
|
|
error: isOperational ? safeErrorMessage(err) : 'Internal server error',
|
|
code
|
|
};
|
|
|
|
// Add optional fields if present
|
|
if (err.requiresTotp) response.requiresTotp = true;
|
|
if (err.retryAfter) response.retryAfter = err.retryAfter;
|
|
if (err.field) response.field = err.field;
|
|
if (err.resource) response.resource = err.resource;
|
|
if (err.details && Object.keys(err.details).length > 0) response.details = err.details;
|
|
|
|
// Development mode: include stack trace
|
|
if (process.env.NODE_ENV === 'development') {
|
|
response.stack = err.stack;
|
|
}
|
|
|
|
// Send response
|
|
res.status(statusCode).json(response);
|
|
|
|
// For non-operational errors, log as fatal
|
|
if (!isOperational) {
|
|
console.error('FATAL: Non-operational error detected', {
|
|
error: err.message,
|
|
stack: err.stack,
|
|
path: req.path
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 404 handler for routes not found
|
|
* Register this before the global error handler
|
|
*/
|
|
function notFoundHandler(req, res, next) {
|
|
const { NotFoundError } = require('./errors');
|
|
next(new NotFoundError(`Route ${req.method} ${req.path}`));
|
|
}
|
|
|
|
module.exports = {
|
|
errorMiddleware,
|
|
notFoundHandler
|
|
};
|