@cocreate/file-server 1.18.0 → 1.18.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.18.1](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.18.0...v1.18.1) (2024-12-22)
+
+
+### Bug Fixes
+
+* pass url to render.HTML ([c5827c3](https://github.com/CoCreate-app/CoCreate-file-server/commit/c5827c3247998014d2717b0ff426e98c9dffc145))
+
 # [1.18.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.17.1...v1.18.0) (2024-11-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "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

@@ -21,250 +21,312 @@
 // For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
 
 class CoCreateFileSystem {
-    constructor(render, sitemap) {
-        this.render = render
-        this.sitemap = sitemap
-    }
-
-    async send(req, res, crud, organization, valideUrl) {
-        try {
-            const hostname = valideUrl.hostname;
-
-            let data = {
-                method: 'object.read',
-                host: hostname,
-                array: 'files',
-                $filter: {
-                    query: {
-                        host: { $in: [hostname, '*'] }
-                    },
-                    limit: 1
-                }
-            }
-
-            let organization_id
-            if (!organization || organization.error) {
-                let hostNotFound = await getDefaultFile('/hostNotFound.html')
-                return sendResponse(hostNotFound.object[0].src, 404, { 'Content-Type': 'text/html' })
-            }
-
-            organization_id = organization._id
-            data.organization_id = organization_id
-
-            res.setHeader('organization', organization_id)
-            res.setHeader('storage', !!organization.storage);
-            res.setHeader('Access-Control-Allow-Origin', '*');
-            res.setHeader('Access-Control-Allow-Methods', '');
-            res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
-
-            let active = crud.wsManager.organizations.get(organization_id)
-            if (active === false) {
-                let balanceFalse = await getDefaultFile('/balanceFalse.html')
-                return sendResponse(balanceFalse.object[0].src, 403, { 'Content-Type': 'text/html', 'Account-Balance': 'false', 'storage': organization.storage })
-            }
-
-            let parameters = valideUrl.searchParams;
-            if (parameters.size) {
-                console.log('parameters', parameters)
-            }
-
-            let pathname = valideUrl.pathname;
-
-            if (pathname.endsWith('/')) {
-                pathname += "index.html";
-            } else if (!pathname.startsWith('/.well-known/acme-challenge')) {
-                let directory = pathname.split("/").slice(-1)[0];
-                if (!directory.includes('.'))
-                    pathname += "/index.html";
-            }
-
-            data.$filter.query.pathname = pathname
-
-            let file
-            if (pathname.startsWith('/dist') || pathname.startsWith('/admin') || ['/403.html', '/404.html', '/offline.html', '/manifest.webmanifest', '/service-worker.js'].includes(pathname))
-                file = await getDefaultFile(pathname)
-            else
-                file = await crud.send(data);
-
-            if (!file || !file.object || !file.object[0]) {
-                pathname = valideUrl.pathname
-                let lastIndex = pathname.lastIndexOf('/');
-                let wildcardPath = pathname.substring(0, lastIndex + 1);
-                let wildcard = pathname.substring(lastIndex + 1);
-
-                if (wildcard.includes('.')) {
-                    let fileLastIndex = wildcard.lastIndexOf('.');
-                    let fileExtension = wildcard.substring(fileLastIndex);
-                    wildcard = wildcardPath + '*' + fileExtension; // Create wildcard for file name
-                } else {
-                    wildcard = wildcardPath + '*/index.html'; // Append '*' if it's just a path or folder
-                }
-
-                data.$filter.query.pathname = wildcard
-                file = await crud.send(data);
-            }
-
-            if (!file || !file.object || !file.object[0]) {
-                let pageNotFound = await getDefaultFile('/404.html')
-                return sendResponse(pageNotFound.object[0].src, 404, { 'Content-Type': 'text/html' })
-            }
-
-            file = file.object[0]
-            if (!file['public'] || file['public'] === "false") {
-                let pageForbidden = await getDefaultFile('/403.html')
-                return sendResponse(pageForbidden.object[0].src, 403, { 'Content-Type': 'text/html' })
-            }
-
-            let src;
-            if (file['src'])
-                src = file['src'];
-            else {
-                let fileSrc = await crud.send({
-                    method: 'object.read',
-                    host: hostname,
-                    array: file['array'],
-                    object: {
-                        _id: file._id
-                    },
-                    organization_id
-                });
-                src = fileSrc[file['name']];
-            }
-
-            if (!src) {
-                let pageNotFound = await getDefaultFile('/404.html')
-                return sendResponse(pageNotFound.object[0].src, 404, { 'Content-Type': 'text/html' })
-            }
-
-
-            let modifiedOn = file.modified || file.created
-            if (modifiedOn) {
-                modifiedOn = modifiedOn.on
-                if (modifiedOn instanceof Date)
-                    modifiedOn = modifiedOn.toISOString()
-                res.setHeader('Last-Modified', modifiedOn);
-            }
-
-            let contentType = file['content-type'] || 'text/html';
-
-            if (/^data:image\/[a-zA-Z0-9+.-]+;base64,([A-Za-z0-9+/]+={0,2})$/.test(src)) {
-                src = src.replace(/^data:image\/(png|jpeg|jpg);base64,/, '');
-                src = Buffer.from(src, 'base64');
-            } else if (/^([A-Za-z0-9+/]+={0,2})$/.test(src)) {
-                src = Buffer.from(src, 'base64');
-            } else if (contentType === 'text/html') {
-                try {
-                    src = await this.render.HTML(src, organization_id);
-                } catch (err) {
-                    console.warn('server-side-render: ' + err.message)
-                }
-            } else if (contentType === 'text/xml' || contentType === 'application/xml') {
-                const protocol = 'https://' // || req.headers['x-forwarded-proto'] || req.protocol;
-                src = src.replaceAll('{{$host}}', `${protocol}${hostname}`)
-            }
-
-            sendResponse(src, 200, { 'Content-Type': contentType })
-            this.sitemap.check(file, hostname);
-
-            function sendResponse(src, statusCode, headers) {
-                try {
-                    if (src instanceof Uint8Array) {
-                        src = Buffer.from(src);
-                    } else if (Buffer.isBuffer(src)) {
-                        console.log('buffer')
-                        return
-                    } else if (typeof src === 'object') {
-                        src = JSON.stringify(src);
-                    }
-
-                    if (organization_id)
-                        crud.wsManager.emit("setBandwidth", {
-                            type: 'out',
-                            data: src,
-                            organization_id
-                        });
-                    res.writeHead(statusCode, headers);
-                    return res.end(src);
-                } catch (error) {
-                    console.log(error)
-                }
-            }
-
-            async function getDefaultFile(fileName) {
-                data.$filter.query.pathname = fileName
-                // data.$filter.query.$or[0] = { pathname: fileName }
-                let defaultFile
-                if (fileName !== '/hostNotFound.html')
-                    defaultFile = await crud.send(data);
-
-                if (defaultFile && defaultFile.object && defaultFile.object[0] && defaultFile.object[0].src) {
-                    return defaultFile
-                } else {
-                    data.$filter.query.host.$in = ['*']
-                    data.organization_id = process.env.organization_id
-
-                    if (fileName.startsWith('/admin'))
-                        data.$filter.query.pathname = '/superadmin' + fileName.replace('/admin', '')
-
-                    defaultFile = await crud.send(data)
-
-                    if (fileName !== '/hostNotFound.html') {
-                        crud.wsManager.emit("setBandwidth", {
-                            type: 'out',
-                            data,
-                            organization_id
-                        });
-
-                        crud.wsManager.emit("setBandwidth", {
-                            type: 'in',
-                            data: defaultFile,
-                            organization_id
-                        });
-                    }
-
-                    if (defaultFile && defaultFile.object && defaultFile.object[0] && defaultFile.object[0].src) {
-                        if (fileName.startsWith('/admin')) {
-                            data.object[0].directory = 'admin'
-                            data.object[0].path = '/admin' + data.object[0].path.replace('/superadmin', '')
-                            data.object[0].pathname = fileName
-                        }
-
-                        crud.send({
-                            method: 'object.create',
-                            host: hostname,
-                            array: 'files',
-                            object: defaultFile.object[0],
-                            organization_id
-                        })
-
-                        return defaultFile
-                    } else {
-                        switch (fileName) {
-                            case '/403.html':
-                                defaultFile.object = [{ src: `${pathname} access not allowed for ${organization_id}` }]
-                                break;
-                            case '/404.html':
-                                defaultFile.object = [{ src: `${pathname} could not be found for ${organization_id}` }];
-                                break;
-                            case '/balanceFalse.html':
-                                defaultFile.object = [{ src: 'This organizations account balance has fallen bellow 0: ' }];
-                                break;
-                            case '/hostNotFound.html':
-                                defaultFile.object = [{ src: 'An organization could not be found using the host: ' + hostname + ' in platformDB: ' + process.env.organization_id }];
-                                break;
-                        }
-                        return defaultFile
-                    }
-                }
-            }
-
-
-        } catch (error) {
-            res.writeHead(400, { 'Content-Type': 'text/plain' });
-            res.end('Invalid host format');
-        }
-    }
-
+	constructor(render, sitemap) {
+		this.render = render;
+		this.sitemap = sitemap;
+	}
+
+	async send(req, res, crud, organization, valideUrl) {
+		try {
+			const hostname = valideUrl.hostname;
+
+			let data = {
+				method: "object.read",
+				host: hostname,
+				array: "files",
+				$filter: {
+					query: {
+						host: { $in: [hostname, "*"] }
+					},
+					limit: 1
+				}
+			};
+
+			let organization_id;
+			if (!organization || organization.error) {
+				let hostNotFound = await getDefaultFile("/hostNotFound.html");
+				return sendResponse(hostNotFound.object[0].src, 404, {
+					"Content-Type": "text/html"
+				});
+			}
+
+			organization_id = organization._id;
+			data.organization_id = organization_id;
+
+			res.setHeader("organization", organization_id);
+			res.setHeader("storage", !!organization.storage);
+			res.setHeader("Access-Control-Allow-Origin", "*");
+			res.setHeader("Access-Control-Allow-Methods", "");
+			res.setHeader(
+				"Access-Control-Allow-Headers",
+				"Content-Type, Authorization"
+			);
+
+			let active = crud.wsManager.organizations.get(organization_id);
+			if (active === false) {
+				let balanceFalse = await getDefaultFile("/balanceFalse.html");
+				return sendResponse(balanceFalse.object[0].src, 403, {
+					"Content-Type": "text/html",
+					"Account-Balance": "false",
+					storage: organization.storage
+				});
+			}
+
+			let parameters = valideUrl.searchParams;
+			if (parameters.size) {
+				console.log("parameters", parameters);
+			}
+
+			let pathname = valideUrl.pathname;
+
+			if (pathname.endsWith("/")) {
+				pathname += "index.html";
+			} else if (!pathname.startsWith("/.well-known/acme-challenge")) {
+				let directory = pathname.split("/").slice(-1)[0];
+				if (!directory.includes(".")) pathname += "/index.html";
+			}
+
+			data.$filter.query.pathname = pathname;
+
+			let file;
+			if (
+				pathname.startsWith("/dist") ||
+				pathname.startsWith("/admin") ||
+				[
+					"/403.html",
+					"/404.html",
+					"/offline.html",
+					"/manifest.webmanifest",
+					"/service-worker.js"
+				].includes(pathname)
+			)
+				file = await getDefaultFile(pathname);
+			else file = await crud.send(data);
+
+			if (!file || !file.object || !file.object[0]) {
+				pathname = valideUrl.pathname;
+				let lastIndex = pathname.lastIndexOf("/");
+				let wildcardPath = pathname.substring(0, lastIndex + 1);
+				let wildcard = pathname.substring(lastIndex + 1);
+
+				if (wildcard.includes(".")) {
+					let fileLastIndex = wildcard.lastIndexOf(".");
+					let fileExtension = wildcard.substring(fileLastIndex);
+					wildcard = wildcardPath + "*" + fileExtension; // Create wildcard for file name
+				} else {
+					wildcard = wildcardPath + "*/index.html"; // Append '*' if it's just a path or folder
+				}
+
+				data.$filter.query.pathname = wildcard;
+				file = await crud.send(data);
+			}
+
+			if (!file || !file.object || !file.object[0]) {
+				let pageNotFound = await getDefaultFile("/404.html");
+				return sendResponse(pageNotFound.object[0].src, 404, {
+					"Content-Type": "text/html"
+				});
+			}
+
+			file = file.object[0];
+			if (!file["public"] || file["public"] === "false") {
+				let pageForbidden = await getDefaultFile("/403.html");
+				return sendResponse(pageForbidden.object[0].src, 403, {
+					"Content-Type": "text/html"
+				});
+			}
+
+			let src;
+			if (file["src"]) src = file["src"];
+			else {
+				let fileSrc = await crud.send({
+					method: "object.read",
+					host: hostname,
+					array: file["array"],
+					object: {
+						_id: file._id
+					},
+					organization_id
+				});
+				src = fileSrc[file["name"]];
+			}
+
+			if (!src) {
+				let pageNotFound = await getDefaultFile("/404.html");
+				return sendResponse(pageNotFound.object[0].src, 404, {
+					"Content-Type": "text/html"
+				});
+			}
+
+			let modifiedOn = file.modified || file.created;
+			if (modifiedOn) {
+				modifiedOn = modifiedOn.on;
+				if (modifiedOn instanceof Date)
+					modifiedOn = modifiedOn.toISOString();
+				res.setHeader("Last-Modified", modifiedOn);
+			}
+
+			let contentType = file["content-type"] || "text/html";
+
+			if (
+				/^data:image\/[a-zA-Z0-9+.-]+;base64,([A-Za-z0-9+/]+={0,2})$/.test(
+					src
+				)
+			) {
+				src = src.replace(/^data:image\/(png|jpeg|jpg);base64,/, "");
+				src = Buffer.from(src, "base64");
+			} else if (/^([A-Za-z0-9+/]+={0,2})$/.test(src)) {
+				src = Buffer.from(src, "base64");
+			} else if (contentType === "text/html") {
+				try {
+					src = await this.render.HTML(
+						src,
+						organization_id,
+						valideUrl
+					);
+				} catch (err) {
+					console.warn("server-side-render: " + err.message);
+				}
+			} else if (
+				contentType === "text/xml" ||
+				contentType === "application/xml"
+			) {
+				const protocol = "https://"; // || req.headers['x-forwarded-proto'] || req.protocol;
+				src = src.replaceAll("{{$host}}", `${protocol}${hostname}`);
+			}
+
+			sendResponse(src, 200, { "Content-Type": contentType });
+			this.sitemap.check(file, hostname);
+
+			function sendResponse(src, statusCode, headers) {
+				try {
+					if (src instanceof Uint8Array) {
+						src = Buffer.from(src);
+					} else if (Buffer.isBuffer(src)) {
+						console.log("buffer");
+						return;
+					} else if (typeof src === "object") {
+						src = JSON.stringify(src);
+					}
+
+					if (organization_id)
+						crud.wsManager.emit("setBandwidth", {
+							type: "out",
+							data: src,
+							organization_id
+						});
+					res.writeHead(statusCode, headers);
+					return res.end(src);
+				} catch (error) {
+					console.log(error);
+				}
+			}
+
+			async function getDefaultFile(fileName) {
+				data.$filter.query.pathname = fileName;
+				// data.$filter.query.$or[0] = { pathname: fileName }
+				let defaultFile;
+				if (fileName !== "/hostNotFound.html")
+					defaultFile = await crud.send(data);
+
+				if (
+					defaultFile &&
+					defaultFile.object &&
+					defaultFile.object[0] &&
+					defaultFile.object[0].src
+				) {
+					return defaultFile;
+				} else {
+					data.$filter.query.host.$in = ["*"];
+					data.organization_id = process.env.organization_id;
+
+					if (fileName.startsWith("/admin"))
+						data.$filter.query.pathname =
+							"/superadmin" + fileName.replace("/admin", "");
+
+					defaultFile = await crud.send(data);
+
+					if (fileName !== "/hostNotFound.html") {
+						crud.wsManager.emit("setBandwidth", {
+							type: "out",
+							data,
+							organization_id
+						});
+
+						crud.wsManager.emit("setBandwidth", {
+							type: "in",
+							data: defaultFile,
+							organization_id
+						});
+					}
+
+					if (
+						defaultFile &&
+						defaultFile.object &&
+						defaultFile.object[0] &&
+						defaultFile.object[0].src
+					) {
+						if (fileName.startsWith("/admin")) {
+							data.object[0].directory = "admin";
+							data.object[0].path =
+								"/admin" +
+								data.object[0].path.replace("/superadmin", "");
+							data.object[0].pathname = fileName;
+						}
+
+						crud.send({
+							method: "object.create",
+							host: hostname,
+							array: "files",
+							object: defaultFile.object[0],
+							organization_id
+						});
+
+						return defaultFile;
+					} else {
+						switch (fileName) {
+							case "/403.html":
+								defaultFile.object = [
+									{
+										src: `${pathname} access not allowed for ${organization_id}`
+									}
+								];
+								break;
+							case "/404.html":
+								defaultFile.object = [
+									{
+										src: `${pathname} could not be found for ${organization_id}`
+									}
+								];
+								break;
+							case "/balanceFalse.html":
+								defaultFile.object = [
+									{
+										src: "This organizations account balance has fallen bellow 0: "
+									}
+								];
+								break;
+							case "/hostNotFound.html":
+								defaultFile.object = [
+									{
+										src:
+											"An organization could not be found using the host: " +
+											hostname +
+											" in platformDB: " +
+											process.env.organization_id
+									}
+								];
+								break;
+						}
+						return defaultFile;
+					}
+				}
+			}
+		} catch (error) {
+			res.writeHead(400, { "Content-Type": "text/plain" });
+			res.end("Invalid host format");
+		}
+	}
 }
 
 module.exports = CoCreateFileSystem;