@cocreate/file-server 1.18.3 → 1.18.5

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.18.5](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.18.4...v1.18.5) (2025-09-02)
+
+
+### Bug Fixes
+
+* enhance Cache-Control header handling in sendResponse function ([7b6f29c](https://github.com/CoCreate-app/CoCreate-file-server/commit/7b6f29cbe1511be4fa41670db55747e8ad61bc00))
+
+## [1.18.4](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.18.3...v1.18.4) (2025-09-01)
+
+
+### Bug Fixes
+
+* enhance file retrieval with BCP 47 language support and improve fallback logic ([f3f44f8](https://github.com/CoCreate-app/CoCreate-file-server/commit/f3f44f83a7b6403a3a080dc8e040eb0141dcfab1))
+* improve language handling in HTML rendering by conditionally setting langRegion and lang ([ea72c6e](https://github.com/CoCreate-app/CoCreate-file-server/commit/ea72c6eb2519d0564d7af181fcaee387ff5ee0b3))
+* refactor send method to use urlObject and enhance BCP 47 language handling ([c9f8591](https://github.com/CoCreate-app/CoCreate-file-server/commit/c9f859168beebad80df3e46de9cc74a43bbc11b2))
+
 ## [1.18.3](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.18.2...v1.18.3) (2025-05-01)
 
 

package/package.json

@@ -1,18 +1,10 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.18.3",
+  "version": "1.18.5",
   "description": "A simple file-server component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "file-server",
-    "cocreate",
-    "low-code-framework",
-    "no-code-framework",
-    "cocreatejs",
-    "cocreatejs-component",
-    "cocreate-framework",
-    "no-code",
     "low-code",
-    "collaborative-framework",
     "realtime",
     "realtime-framework",
     "collaboration",

package/src/index.js

@@ -26,9 +26,9 @@ class CoCreateFileSystem {
 		this.sitemap = sitemap;
 	}
 
-	async send(req, res, crud, organization, valideUrl) {
+	async send(req, res, crud, organization, urlObject) {
 		try {
-			const hostname = valideUrl.hostname;
+			const hostname = urlObject.hostname;
 
 			let data = {
 				method: "object.read",
@@ -72,12 +72,12 @@ class CoCreateFileSystem {
 				});
 			}
 
-			let parameters = valideUrl.searchParams;
+			let parameters = urlObject.searchParams;
 			if (parameters.size) {
 				console.log("parameters", parameters);
 			}
 
-			let pathname = valideUrl.pathname;
+			let pathname = urlObject.pathname;
 
 			if (pathname.endsWith("/")) {
 				pathname += "index.html";
@@ -86,7 +86,17 @@ class CoCreateFileSystem {
 				if (!directory.includes(".")) pathname += "/index.html";
 			}
 
-			data.$filter.query.pathname = pathname;
+			const bcp47Regex = /^\/([a-zA-Z]{2,3}(?:-[a-zA-Z0-9]{2,8})+)\//;
+			const match = pathname.match(bcp47Regex);
+			let lang, langRegion;
+			if (match) {
+				langRegion = match[1];
+				lang = langRegion.split("-")[0]; // Get just the base language (e.g., 'en', 'es', 'fr')
+				let newPathname = pathname.replace(langRegion, lang);
+				data.$filter.query.pathname = { $in: [newPathname, pathname] };
+			} else {
+				data.$filter.query.pathname = pathname;
+			}
 
 			let file;
 			if (
@@ -99,12 +109,15 @@ class CoCreateFileSystem {
 					"/manifest.webmanifest",
 					"/service-worker.js"
 				].includes(pathname)
-			)
+			) {
 				file = await getDefaultFile(pathname);
-			else file = await crud.send(data);
+			} else {
+				file = await crud.send(data);
+			}
 
+			// --- Wildcard fallback ---
 			if (!file || !file.object || !file.object[0]) {
-				pathname = valideUrl.pathname;
+				pathname = urlObject.pathname;
 				let lastIndex = pathname.lastIndexOf("/");
 				let wildcardPath = pathname.substring(0, lastIndex + 1);
 				let wildcard = pathname.substring(lastIndex + 1);
@@ -137,8 +150,9 @@ class CoCreateFileSystem {
 			}
 
 			let src;
-			if (file["src"]) src = file["src"];
-			else {
+			if (file["src"]) {
+				src = file["src"];
+			} else {
 				let fileSrc = await crud.send({
 					method: "object.read",
 					host: hostname,
@@ -179,11 +193,14 @@ class CoCreateFileSystem {
 				src = Buffer.from(src, "base64");
 			} else if (contentType === "text/html") {
 				try {
-					src = await this.render.HTML(
-						src,
-						organization_id,
-						valideUrl
-					);
+					file.urlObject = urlObject;
+					if (langRegion) {
+						file.langRegion = langRegion;
+					}
+					if (lang) {
+						file.lang = lang;
+					}	
+					src = await this.render.HTML(file);
 				} catch (err) {
 					console.warn("server-side-render: " + err.message);
 				}
@@ -200,11 +217,41 @@ class CoCreateFileSystem {
 
 			function sendResponse(src, statusCode, headers) {
 				try {
+					let cacheControl;
+					if (statusCode >= 400) {
+						cacheControl = "no-cache, no-store, must-revalidate";
+					} else if (
+						file &&
+						file["cache-control"] !== undefined &&
+						file["cache-control"] !== null
+					) {
+						const val = file["cache-control"];
+						if (
+							typeof val === "number" ||
+							/^\s*\d+\s*$/.test(val)
+						) {
+							// If it's numeric (number or numeric string) treat it as max-age.
+							cacheControl = `public, max-age=${String(
+								val
+							).trim()};`;
+						} else {
+							// use the value verbatim (allow full Cache-Control strings like "no-cache" or "public, max-age=600")
+							cacheControl = val;
+						}
+					} else {
+						cacheControl =
+							organization["cache-control"] ||
+							"public, max-age=3600";
+					}
+
+					// Always override/set Cache-Control header so the response aligns with the file metadata/defaults
+					headers["Cache-Control"] = cacheControl;
+
 					if (src instanceof Uint8Array) {
 						src = Buffer.from(src);
 					} else if (Buffer.isBuffer(src)) {
-						console.log("buffer");
-						return;
+						// Buffer is fine to send — don't bail out here (previous code returned early)
+						// keep src as-is
 					} else if (typeof src === "object") {
 						src = JSON.stringify(src);
 					}