@cocreate/file-server 1.18.4 → 1.18.6

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.18.6](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.18.5...v1.18.6) (2025-10-08)
+
+
+### Bug Fixes
+
+* add handling for font files and improve error processing in CoCreateFileSystem ([de3c618](https://github.com/CoCreate-app/CoCreate-file-server/commit/de3c6186eebef00bfb6c237dc6d5c7435773ba41))
+* correct pathname handling by ensuring language region is prefixed with a slash ([680832b](https://github.com/CoCreate-app/CoCreate-file-server/commit/680832b7cf710f48afd28a2fe2b425c7eb41d4b1))
+* enhance language detection in pathname processing and support Accept-Language header ([cccc35d](https://github.com/CoCreate-app/CoCreate-file-server/commit/cccc35dc68107a5f39fbf2af053181825eb252fa))
+* enhance language handling in pathname processing and improve file retrieval logic ([b499141](https://github.com/CoCreate-app/CoCreate-file-server/commit/b499141fe599e095a3d0a051ccede4b6131d3fa7))
+* simplify pathname query handling in CoCreateFileSystem ([1632670](https://github.com/CoCreate-app/CoCreate-file-server/commit/1632670b17b7c76775094b2726178248e4e903d6))
+* streamline HTML rendering logic by removing unnecessary language handling ([924041b](https://github.com/CoCreate-app/CoCreate-file-server/commit/924041bc4fba30fbeef5bcd85b6fe42f811af695))
+* streamline language handling in pathname processing and simplify file retrieval logic ([fd43225](https://github.com/CoCreate-app/CoCreate-file-server/commit/fd432258880c33ba9f417d7a0d40eba8a9997863))
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.18.4",
+  "version": "1.18.6",
   "description": "A simple file-server component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "file-server",

package/src/index.js

@@ -86,15 +86,32 @@ class CoCreateFileSystem {
 				if (!directory.includes(".")) pathname += "/index.html";
 			}
 
-			const bcp47Regex = /^\/([a-zA-Z]{2,3}(?:-[a-zA-Z0-9]{2,8})+)\//;
-			const match = pathname.match(bcp47Regex);
+			// Match both /en/ and /en-US/ style URLs
+			const bcp47Regex = /^\/([a-zA-Z]{2,3}(?:-[a-zA-Z0-9]{2,8})?)\//;
+			const langMatch = pathname.match(bcp47Regex);
 			let lang, langRegion;
-			if (match) {
-				langRegion = match[1];
+			if (langMatch) {
+				langRegion = langMatch[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] };
+				let basePathname = pathname.replace("/" + langRegion, "");
+				data.$filter.query.pathname = basePathname;
 			} else {
+				// No language in URL, try Accept-Language header
+				let acceptLang = req.headers && req.headers["accept-language"];
+				if (acceptLang) {
+					// Parse the Accept-Language header, get the first language
+					let preferred = acceptLang.split(",")[0].trim();
+					if (preferred) {
+						lang = preferred.split("-")[0];
+						langRegion = preferred;
+						// --- BEGIN OPTIONAL REDIRECT ---
+						// Uncomment to enable automatic redirect to language-specific path
+						// let newPath = `/${preferred}${pathname.startsWith('/') ? '' : '/'}${pathname.replace(/^\//, '')}`;
+						// res.writeHead(302, { Location: newPath });
+						// return res.end();
+						// --- END OPTIONAL REDIRECT ---
+					}
+				}
 				data.$filter.query.pathname = pathname;
 			}
 
@@ -182,7 +199,39 @@ class CoCreateFileSystem {
 
 			let contentType = file["content-type"] || "text/html";
 
-			if (
+			// Add handling for font files
+			if (contentType.startsWith("font/") || /\.(woff2?|ttf|otf)$/i.test(pathname)) {
+				try {
+					if (typeof src === "string") {
+						if (/^([A-Za-z0-9+/]+={0,2})$/.test(src)) {
+							// Decode base64-encoded font data
+							src = Buffer.from(src, "base64");
+						} else {
+							throw new Error("Font data is not valid base64");
+						}
+					} else if (typeof src === "object" && src.src) {
+						// Handle case where src is an object containing base64 data
+						if (/^([A-Za-z0-9+/]+={0,2})$/.test(src.src)) {
+							src = Buffer.from(src.src, "base64");
+						} else {
+							throw new Error("Font data inside object is not valid base64");
+						}
+					} else {
+						throw new Error("Font data is not a valid base64 string or object");
+					}
+				} catch (err) {
+					console.error("Error processing font file:", {
+						message: err.message,
+						contentType,
+						srcType: typeof src,
+						srcPreview: typeof src === "string" ? src.slice(0, 50) : null
+					});
+					let pageNotFound = await getDefaultFile("/404.html");
+					return sendResponse(pageNotFound.object[0].src, 404, {
+						"Content-Type": "text/html"
+					});
+				}
+			} else if (
 				/^data:image\/[a-zA-Z0-9+.-]+;base64,([A-Za-z0-9+/]+={0,2})$/.test(
 					src
 				)
@@ -193,14 +242,15 @@ class CoCreateFileSystem {
 				src = Buffer.from(src, "base64");
 			} else if (contentType === "text/html") {
 				try {
-					file.urlObject = urlObject;
-					if (langRegion) {
-						file.langRegion = langRegion;
-					}
-					if (lang) {
-						file.lang = lang;
-					}	
-					src = await this.render.HTML(file);
+					let data = {};
+
+					src = await this.render.HTML(
+						file,
+						organization,
+						urlObject,
+						langRegion,
+						lang
+					);
 				} catch (err) {
 					console.warn("server-side-render: " + err.message);
 				}
@@ -217,11 +267,33 @@ class CoCreateFileSystem {
 
 			function sendResponse(src, statusCode, headers) {
 				try {
-					if (src instanceof Uint8Array) {
-						src = Buffer.from(src);
-					} else if (Buffer.isBuffer(src)) {
-						console.log("buffer");
-						return;
+					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 || Buffer.isBuffer(src)) {
+						// Ensure binary data is sent as-is
 					} else if (typeof src === "object") {
 						src = JSON.stringify(src);
 					}