@cocreate/file-server 1.15.2 → 1.16.1

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [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)
+
+
+### Bug Fixes
+
+* applied host to define environment/branch ([e3ad9e0](https://github.com/CoCreate-app/CoCreate-file-server/commit/e3ad9e0f38aafa3710d3ae49957ebe714b765e22))
+* convert storage to boolean ([280a178](https://github.com/CoCreate-app/CoCreate-file-server/commit/280a178da956cb943e41d13854e330709ed2b1eb))
+* removed host.files as handled from crud-server ([5418c06](https://github.com/CoCreate-app/CoCreate-file-server/commit/5418c06cc00985115045bcfbfc03d56cafaf3a09))
+
+
+### Features
+
+* bumped CoCreate dependencies to their latest versions ([5ad1994](https://github.com/CoCreate-app/CoCreate-file-server/commit/5ad199440e9023fa25301c7eef98f033c5832e66))
+* query wildcard pathname ([bdd4e99](https://github.com/CoCreate-app/CoCreate-file-server/commit/bdd4e998bd986469dad99d6976c2fc9288ddef1d))
+* routing logic per host ([7964778](https://github.com/CoCreate-app/CoCreate-file-server/commit/7964778ce6ee231c39ea6ce7721e6ec5da3ad107))
+
 ## [1.15.2](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.15.1...v1.15.2) (2023-12-31)
 
 

package/package.json

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

@@ -27,21 +27,45 @@ class CoCreateFileSystem {
 
     async send(req, res, crud, organization, valideUrl) {
         try {
+            if (!organization) {
+                let hostNotFound = await getDefaultFile('/hostNotFound.html')
+                return sendResponse(hostNotFound.object[0].src, 404, { 'Content-Type': 'text/html' })
+            }
+
             const organization_id = organization._id
             const hostname = valideUrl.hostname;
 
             res.setHeader('organization', organization_id)
-            res.setHeader('storage', organization.storage);
+            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;
+
+            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')) {
@@ -50,19 +74,17 @@ class CoCreateFileSystem {
                     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 })
-            }
+            // console.log("Wildcard: ", wildcard);
 
             let data = {
                 method: 'object.read',
+                host: hostname,
                 array: 'files',
                 $filter: {
                     query: [
                         { key: "host", value: [hostname, '*'], operator: "$in" },
-                        { key: "pathname", value: pathname, operator: "$eq" }
+                        { key: "pathname", value: pathname, operator: "$or" },
+                        { key: "pathname", value: wildcard, operator: "$or" }
                     ],
                     limit: 1
                 },
@@ -92,6 +114,7 @@ class CoCreateFileSystem {
             else {
                 let fileSrc = await crud.send({
                     method: 'object.read',
+                    host: hostname,
                     array: file['array'],
                     object: {
                         _id: file._id
@@ -180,6 +203,7 @@ class CoCreateFileSystem {
 
                         crud.send({
                             method: 'object.create',
+                            host: hostname,
                             array: 'files',
                             object: defaultFile.object[0],
                             organization_id