@cocreate/file-server 1.16.10 → 1.16.11

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.16.11](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.10...v1.16.11) (2024-08-30)
+
+
+### Bug Fixes
+
+* $or operator removed from getDefaultFile ([d9f2b90](https://github.com/CoCreate-app/CoCreate-file-server/commit/d9f2b905b302a721ac8af847375e52af29f575dd))
+* add sitemap handling plugin ([870b15d](https://github.com/CoCreate-app/CoCreate-file-server/commit/870b15d93ad935538befcb0f7c85bc2110e4ede5))
+* query for file if not returned query for wildcard ([1af8851](https://github.com/CoCreate-app/CoCreate-file-server/commit/1af885132fcc47180b2756605988b0edd1841404))
+
 ## [1.16.10](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.9...v1.16.10) (2024-06-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.16.10",
+  "version": "1.16.11",
   "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,8 +21,9 @@
 // For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
 
 class CoCreateFileSystem {
-    constructor(render) {
+    constructor(render, sitemap) {
         this.render = render
+        this.sitemap = sitemap
     }
 
     async send(req, res, crud, organization, valideUrl) {
@@ -35,8 +36,7 @@ class CoCreateFileSystem {
                 array: 'files',
                 $filter: {
                     query: {
-                        host: { $in: [hostname, '*'] },
-                        $or: []
+                        host: { $in: [hostname, '*'] }
                     },
                     limit: 1
                 }
@@ -69,18 +69,6 @@ class CoCreateFileSystem {
 
             let 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); // Get extension
-                wildcard = wildcardPath + '*' + fileExtension; // Create wildcard for file name
-            } else {
-                wildcard = wildcardPath + '*/index.html'; // Append '*' if it's just a path or folder
-            }
-
             if (pathname.endsWith('/')) {
                 pathname += "index.html";
             } else if (!pathname.startsWith('/.well-known/acme-challenge')) {
@@ -89,20 +77,7 @@ class CoCreateFileSystem {
                     pathname += "/index.html";
             }
 
-            // let data = {
-            //     method: 'object.read',
-            //     host: hostname,
-            //     array: 'files',
-            //     $filter: {
-            //         query: {
-            //             host: { $in: [hostname, '*'] },
-            //             $or: [{ pathname }, { pathname: wildcard }]
-            //         },
-            //         limit: 1
-            //     },
-            //     organization_id
-            // }
-            data.$filter.query.$or = [{ pathname }, { pathname: wildcard }]
+            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))
@@ -110,6 +85,24 @@ class CoCreateFileSystem {
             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' })
@@ -167,6 +160,7 @@ class CoCreateFileSystem {
             }
 
             sendResponse(src, 200, { 'Content-Type': contentType })
+            this.sitemap.check(file, hostname);
 
             function sendResponse(src, statusCode, headers) {
                 try {
@@ -192,7 +186,8 @@ class CoCreateFileSystem {
             }
 
             async function getDefaultFile(fileName) {
-                data.$filter.query.$or[0] = { pathname: fileName }
+                data.$filter.query.pathname = fileName
+                // data.$filter.query.$or[0] = { pathname: fileName }
                 let defaultFile
                 if (fileName !== '/hostNotFound.html')
                     defaultFile = await crud.send(data);
@@ -204,7 +199,7 @@ class CoCreateFileSystem {
                     data.organization_id = process.env.organization_id
 
                     if (fileName.startsWith('/admin'))
-                        data.$filter.query.$or[0].pathname = '/superadmin' + fileName.replace('/admin', '')
+                        data.$filter.query.pathname = '/superadmin' + fileName.replace('/admin', '')
 
                     defaultFile = await crud.send(data)