@cocreate/file-server 1.16.0 → 1.16.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.16.2](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.1...v1.16.2) (2024-01-17)
+
+
+### Bug Fixes
+
+* return if organization.error ([b6425eb](https://github.com/CoCreate-app/CoCreate-file-server/commit/b6425eb780f2a031a3e68bd7f61226774d65d966))
+* update to support new query system ([e46947c](https://github.com/CoCreate-app/CoCreate-file-server/commit/e46947cb3c6ee63975ae6c696e5ac5f6ef6e5cb6))
+
+## [1.16.1](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.0...v1.16.1) (2024-01-11)
+
+
+### Bug Fixes
+
+* wildcard without ext should defualt to */index.html ([7779170](https://github.com/CoCreate-app/CoCreate-file-server/commit/77791709688373f51db672937f3b64c1f1fae5a3))
+
 # [1.16.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.15.2...v1.16.0) (2024-01-08)
 
 

package/package.json

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

@@ -27,7 +27,7 @@ class CoCreateFileSystem {
 
     async send(req, res, crud, organization, valideUrl) {
         try {
-            if (!organization) {
+            if (!organization || organization.error) {
                 let hostNotFound = await getDefaultFile('/hostNotFound.html')
                 return sendResponse(hostNotFound.object[0].src, 404, { 'Content-Type': 'text/html' })
             }
@@ -41,25 +41,18 @@ class CoCreateFileSystem {
             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";
-            }
-
-            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 lastIndex = pathname.lastIndexOf('/');
             let wildcardPath = pathname.substring(0, lastIndex + 1);
@@ -70,7 +63,15 @@ class CoCreateFileSystem {
                 let fileExtension = wildcard.substring(fileLastIndex); // Get extension
                 wildcard = wildcardPath + '*' + fileExtension; // Create wildcard for file name
             } else {
-                wildcard = wildcardPath + '*'; // Append '*' if it's just a path or folder
+                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')) {
+                let directory = pathname.split("/").slice(-1)[0];
+                if (!directory.includes('.'))
+                    pathname += "/index.html";
             }
 
             // console.log("Wildcard: ", wildcard);
@@ -80,11 +81,10 @@ class CoCreateFileSystem {
                 host: hostname,
                 array: 'files',
                 $filter: {
-                    query: [
-                        { key: "host", value: [hostname, '*'], operator: "$in" },
-                        { key: "pathname", value: pathname, operator: "$or" },
-                        { key: "pathname", value: wildcard, operator: "$or" }
-                    ],
+                    query: {
+                        host: { $in: [hostname, '*'] },
+                        $or: [{ pathname }, { pathname: wildcard }]
+                    },
                     limit: 1
                 },
                 organization_id
@@ -163,7 +163,7 @@ class CoCreateFileSystem {
             }
 
             async function getDefaultFile(fileName) {
-                data.$filter.query[1].value = fileName
+                data.$filter.query.$or[0].pathname = fileName
                 let defaultFile
                 if (fileName !== '/hostNotFound.html')
                     defaultFile = await crud.send(data);
@@ -171,11 +171,11 @@ class CoCreateFileSystem {
                 if (defaultFile && defaultFile.object && defaultFile.object[0] && defaultFile.object[0].src) {
                     return defaultFile
                 } else {
-                    data.$filter.query[0].value = ['*']
+                    data.$filter.query.host.$in = ['*']
                     data.organization_id = process.env.organization_id
 
                     if (fileName.startsWith('/admin'))
-                        data.$filter.query[1].value = '/superadmin' + fileName.replace('/admin', '')
+                        data.$filter.query.$or[0].pathname = '/superadmin' + fileName.replace('/admin', '')
 
                     defaultFile = await crud.send(data)