minimalistic-server 0.0.64 → 0.0.66

package/index.mjs

@@ -1707,6 +1707,7 @@ export class FileResponse extends Response {
 
 	#blocked = false;
 	#proxiedResponse = null;
+	#enableFragments = false;
 
 	constructor(filePath, code = 200, contentType = null, cookies = null) {
 		super();
@@ -1795,6 +1796,11 @@ export class FileResponse extends Response {
 		this.#dataPromise = this.#proxiedResponse = null;
 	}
 
+	enableFraments() {
+		this.#enableFragments = true;
+		this.#dataPromise = this.#proxiedResponse = null;
+	}
+
 	setUrlPathForDirectory(urlPathForDirectory) {
 		this.#urlPathForDirectory = urlPathForDirectory;
 		this.#dataPromise = this.#proxiedResponse = null;
@@ -1812,7 +1818,7 @@ export class FileResponse extends Response {
 	#getFragmentRequest(headers) {
 		let promise = this.#fragmentRequestMap.get(headers);
 
-		if (promise === undefined && headers?.['range']) {
+		if (promise === undefined && headers?.['range'] && this.#enableFragments) {
 			const getFragmentRequest = async () => {
 				if (headers['range'].includes(',')) {
 					return null;
@@ -2460,6 +2466,7 @@ async function handleRequest(req, routes, staticFileDirectories, handleNotFoundE
 
 				if (!resp) {
 					resp = new FileResponse(filePath);
+					resp.enableFraments();
 
 					if (staticFileOrDirectory.maxAgeInSeconds > 0) {
 						resp.addCustomHeaders({
@@ -2492,39 +2499,63 @@ async function handleRequest(req, routes, staticFileDirectories, handleNotFoundE
 
 			routeHandler = wrapInMiddlewares(routeHandler, staticFileOrDirectory.preMiddlewares, staticFileOrDirectory.postMiddlewares);
 		} else {
-			for (const fragment of path.split('/')) {
-				if (!fragment) {
-					break;
+			function getRouteHandler(fragments, root, methodPath, accumulatedPathParams) {
+				if (!fragments.at(0) || !root) {
+					return typeof root?.[methodPath] === 'function' ? root[methodPath] : null;
 				}
 
-				let newRouteHandler = routeHandler[fragment];
+				const fragment = fragments.shift();
+				let newRoot = root[fragment];
+				let result = null;
 
-				if (!newRouteHandler) {
-					for (let k in routeHandler) {
+				if (newRoot) {
+					result = getRouteHandler(fragments, newRoot, methodPath, accumulatedPathParams);
+				}
+
+				if (!result) {
+					for (let k in root) {
 						if (k.match(/^{\w+}$/gm)) {
-							setObjectProperty(pathParams, k.replace(/[{}]/gm, ''), decodeURIComponent(fragment));
-							newRouteHandler = routeHandler[k];
-							break;
+							newRoot = root[k];
+							result = getRouteHandler(fragments, newRoot, methodPath, accumulatedPathParams);
+
+							if (result) {
+								setObjectProperty(accumulatedPathParams, k.replace(/[{}]/gm, ''), decodeURIComponent(fragment));
+								break;
+							}
 						}
 					}
 				}
 
-				routeHandler = newRouteHandler;
+				fragments.unshift(fragment);
+				return result;
+			}
 
-				if (!routeHandler) {
-					break;
+			const fragments = path.split('/');
+			let accumulatedPathParams = {};
+			routeHandler = getRouteHandler(fragments, routes, `/${method}/`, accumulatedPathParams);
+
+			if (typeof routeHandler !== 'function') {
+				if (method === 'OPTIONS') {
+					handleOptions = true;
+					accumulatedPathParams = {};
+					routeHandler = getRouteHandler(
+						fragments,
+						routes,
+						`/${requestHeaders?.['access-control-request-method']}/`.toUpperCase(),
+						accumulatedPathParams,
+					);
+				} else if (!responseBodyIsIncluded) {
+					accumulatedPathParams = {};
+					routeHandler = getRouteHandler(
+						fragments,
+						routes,
+						`/GET/`,
+						accumulatedPathParams,
+					);
 				}
 			}
 
-
-			if (method === 'OPTIONS' && typeof routeHandler?.[`/${method}/`] !== 'function') {
-				handleOptions = true;
-				routeHandler = routeHandler?.[`/${requestHeaders?.['access-control-request-method']}/`.toUpperCase()];
-			} else if (!responseBodyIsIncluded && typeof routeHandler?.[`/${method}/`] !== 'function') {
-				routeHandler = routeHandler?.[`/GET/`];
-			} else {
-				routeHandler = routeHandler?.[`/${method}/`];
-			}
+			Object.assign(pathParams, accumulatedPathParams);
 		}
 
 		if (typeof routeHandler === 'function') {

package/package.json

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