Refactor whitelist middleware to return a promise and update server.js to handle async initialization

978b2cdb213785459c928e264ff40565e42a476c

Cohee <18619528+Cohee1207@users.noreply.github.com>

server.js+3 -2 Viewed

 import getWebpackServeMiddleware from './src/middleware/webpack-serve.js';
 import basicAuthMiddleware from './src/middleware/basicAuth.js';
-import whitelistMiddleware from './src/middleware/whitelist.js';
+import getWhitelistMiddleware from './src/middleware/whitelist.js';
 import accessLoggerMiddleware, { getAccessLogPath, migrateAccessLog } from './src/middleware/accessLogWriter.js';
 import multerMonkeyPatch from './src/middleware/multerMonkeyPatch.js';
 import initRequestProxy from './src/request-proxy.js';

@@ -125,7 +125,8 @@ if (cliArgs.listen && cliArgs.basicAuthMode) {
125	}	125	}
126		126
127	if (cliArgs.whitelistMode) {	127	if (cliArgs.whitelistMode) {
128	app.use(whitelistMiddleware());	128	const whitelistMiddleware = await getWhitelistMiddleware();
		129	app.use(whitelistMiddleware);
129	}	130	}
130		131
131	if (cliArgs.listen) {	132	if (cliArgs.listen) {

src/middleware/whitelist.js+4 -4 Viewed

@@ -22,8 +22,6 @@ if (fs.existsSync(whitelistPath)) {
22	}	22	}
23	}	23	}
24		24
25	await resolveHostnames();
26
27	/**	25	/**
28	* Get the client IP address from the request headers.	26	* Get the client IP address from the request headers.
29	* @param {import('express').Request} req Express request object	27	* @param {import('express').Request} req Express request object

 /**
  * Returns a middleware function that checks if the client IP is in the whitelist.
- * @returns {import('express').RequestHandler} The middleware function
+ * @returns {Promise<import('express').RequestHandler>} Promise that resolves to the middleware function
  */
-export default function whitelistMiddleware() {
+export default async function getWhitelistMiddleware() {
     const forbiddenWebpage = Handlebars.compile(
         safeReadFileSync('./public/error/forbidden-by-whitelist.html') ?? '',
     );

         '/favicon.ico',
     ];
+    await resolveHostnames();
     return function (req, res, next) {
         const clientIp = getIpFromRequest(req);
         const forwardedIp = getForwardedIp(req);