minimalistic-server 0.0.55 → 0.0.57

package/index.mjs

@@ -1630,9 +1630,11 @@ export class Response {
 				cookieStrings.push(cookieString);
 			}
 
-			headers = {
-				...headers,
-				'Set-Cookie': cookieStrings,
+			if (cookieStrings.length) {
+				headers = {
+					...headers,
+					'Set-Cookie': cookieStrings,
+				}
 			}
 		}
 
@@ -1699,6 +1701,7 @@ export class FileResponse extends Response {
 	#urlPathForDirectory = null;
 
 	#blocked = false;
+	#proxiedResponse = null;
 
 	constructor(filePath, code = 200, contentType = null, cookies = null) {
 		super();
@@ -1709,6 +1712,10 @@ export class FileResponse extends Response {
 	}
 
 	async getCode(headers = null) {
+		if (this.#proxiedResponse) {
+			return await this.#proxiedResponse.code(headers);
+		}
+
 		const requestedFragment = await this.#getFragmentRequest(headers);
 		const data = await this.#retreiveData();
 
@@ -1720,6 +1727,11 @@ export class FileResponse extends Response {
 	}
 
 	async getHeaders(headers = null) {
+		if (this.#proxiedResponse) {
+			const resultingHeaders = await this.#proxiedResponse.getHeaders(headers);
+			return this.getMergedWithOtherHeaders(resultingHeaders);
+		}
+
 		const requestedFragment = await this.#getFragmentRequest(headers);
 		const data = await this.#retreiveData();
 
@@ -1744,6 +1756,10 @@ export class FileResponse extends Response {
 	}
 
 	async getBody(headers = null) {
+		if (this.#proxiedResponse) {
+			return await this.#proxiedResponse.getBody(headers);
+		}
+
 		const requestedFragment = await this.#getFragmentRequest(headers);
 		const data = await this.#retreiveData();
 
@@ -1754,23 +1770,29 @@ export class FileResponse extends Response {
 		return data.body;
 	}
 
+	getProxy() {
+		const proxy = new FileResponse(this.#filePath, this.#code, this.#contentType, this.getCookies());
+		proxy.#proxiedResponse = this;
+		return proxy;
+	}
+
 	getFilePath() {
 		return this.#filePath;
 	}
 
 	setFilePath(filePath) {
 		this.#filePath = filePath;
-		this.#dataPromise = null;
+		this.#dataPromise = this.#proxiedResponse = null;
 	}
 
 	setNotFoundErrorCustomResponseHandler(handler) {
 		this.#makeNotFoundResponse = handler;
-		this.#dataPromise = null;
+		this.#dataPromise = this.#proxiedResponse = null;
 	}
 
 	setUrlPathForDirectory(urlPathForDirectory) {
 		this.#urlPathForDirectory = urlPathForDirectory;
-		this.#dataPromise = null;
+		this.#dataPromise = this.#proxiedResponse = null;
 	}
 
 	#isStreamableFileFormat(isDirectory = false) {
@@ -1979,7 +2001,7 @@ ${urlPath ? `<a href="/${parentUrlPath}">Up</a><hr>` : ''}
 
 	block() {
 		this.#blocked = true;
-		this.#dataPromise = null;
+		this.#dataPromise = this.#proxiedResponse = null;
 	}
 
 	isBlocked() {
@@ -2306,13 +2328,13 @@ function normalizeRoutes(routes, handleServerError) {
 				flattenRecursively(root[prop], newPath, preMiddlewares, postMiddlewares);
 			}
 		} else if (typeof root === 'function') {
-			flatten[path] = wrapInMiddlewares(root, preMiddlewares, postMiddlewares, handleServerError);
+			setObjectProperty(flatten, path, wrapInMiddlewares(root, preMiddlewares, postMiddlewares, handleServerError));
 		}
 	}
 
 	flattenRecursively(routes);
 
-	const result = {};
+	const result = Object.create(null);
 
 	for (const route in flatten) {
 		const split = route.split('/').filter(x => x);
@@ -2328,13 +2350,13 @@ function normalizeRoutes(routes, handleServerError) {
 
 		for (const fragment of split) {
 			if (!parent[fragment]) {
-				parent[fragment] = { __proto__: null };
+				setObjectProperty(parent, fragment, Object.create(null));
 			}
 
 			parent = parent[fragment];
 		}
 
-		parent[`/${method}/`] = flatten[route];
+		setObjectProperty(parent, `/${method}/`, flatten[route]);
 	}
 
 	return result;
@@ -2443,7 +2465,7 @@ async function handleRequest(req, routes, staticFileDirectories, handleNotFoundE
 					}
 				}
 
-				return resp;
+				return resp.getProxy();
 			};
 
 			routeHandler = wrapInMiddlewares(routeHandler, staticFileOrDirectory.preMiddlewares, staticFileOrDirectory.postMiddlewares);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minimalistic-server",
-  "version": "0.0.55",
+  "version": "0.0.57",
   "engines" : { 
     "npm" : ">=8.6.0",
     "node" : ">=22.0.0"