Automatically try to render 404.html for not-found routes

Author: leo

src/index.js

@@ -400,9 +400,9 @@ module.exports = async (request, response, config = {}, methods = {}) => {
 		response.end();
 	}
 
-	const relativePath = applyRewrites(decodedPath, config.rewrites);
-
+	let relativePath = applyRewrites(decodedPath, config.rewrites);
 	let absolutePath = path.join(current, relativePath);
+
 	let stats = null;
 
 	try {
@@ -416,52 +416,74 @@ module.exports = async (request, response, config = {}, methods = {}) => {
 		}
 	}
 
-	if (!stats || stats.isDirectory()) {
-		if (cleanUrl) {
-			try {
-				const related = await findRelated(current, relativePath, handlers.stat);
+	if ((!stats || stats.isDirectory()) && cleanUrl) {
+		try {
+			const related = await findRelated(current, relativePath, handlers.stat);
 
-				if (related) {
-					({stats, absolutePath} = related);
-				}
-			} catch (err) {
-				if (err.code !== 'ENOENT') {
-					response.statusCode = 500;
-					response.end(err.message);
+			if (related) {
+				({stats, absolutePath} = related);
+			}
+		} catch (err) {
+			if (err.code !== 'ENOENT') {
+				response.statusCode = 500;
+				response.end(err.message);
 
-					return;
-				}
+				return;
 			}
 		}
+	}
 
-		if (!stats) {
-			response.statusCode = 404;
-			response.end('Not Found');
+	if (stats && stats.isDirectory()) {
+		let directory = null;
+
+		try {
+			directory = await renderDirectory(current, relativePath, absolutePath, handlers, config);
+		} catch (err) {
+			response.statusCode = 500;
+			response.end(err.message);
 
 			return;
 		}
-	}
 
-	const headers = await getHeaders(config.headers, relativePath, stats);
+		if (directory) {
+			response.statusCode = 200;
+			response.end(directory);
 
-	if (stats.isFile()) {
-		response.writeHead(200, headers);
-		handlers.createReadStream(absolutePath).pipe(response);
+			return;
+		}
 
-		return;
+		// The directory listing is disabled, so we want to
+		// render a 404 error.
+		stats = null;
 	}
 
-	let directory = null;
+	if (!stats) {
+		response.statusCode = 404;
 
-	try {
-		directory = await renderDirectory(current, relativePath, absolutePath, handlers, config);
-	} catch (err) {
-		response.statusCode = 500;
-		response.end(err.message);
+		const errorPage = '404.html';
+		const errorPageFull = path.join(current, errorPage);
 
-		return;
+		try {
+			stats = await handlers.stat(errorPage);
+		} catch (err) {
+			if (err.code !== 'ENOENT') {
+				response.statusCode = 500;
+				response.end(err.message);
+
+				return;
+			}
+		}
+
+		if (!stats) {
+			response.end('Not Found');
+			return;
+		}
+		absolutePath = errorPageFull;
+		relativePath = errorPage;
 	}
 
-	response.statusCode = directory ? 200 : 404;
-	response.end(directory || 'Not Found');
+	const headers = await getHeaders(config.headers, relativePath, stats);
+
+	response.writeHead(200, headers);
+	handlers.createReadStream(absolutePath).pipe(response);
 };