@cocreate/file-server 1.11.0 → 1.11.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.11.2](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.11.1...v1.11.2) (2023-10-09)
+
+
+### Bug Fixes
+
+* improved handeling of header "last-modified" ([e508144](https://github.com/CoCreate-app/CoCreate-file-server/commit/e50814498fdd4cb859f06c345c8173d707fcdabd))
+* svg bug ([db9d9f7](https://github.com/CoCreate-app/CoCreate-file-server/commit/db9d9f79ec5ee8158ad0e2f7f72862e49badc7ec))
+
+## [1.11.1](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.11.0...v1.11.1) (2023-09-18)
+
+
+### Bug Fixes
+
+*  Add path and pathname ([f2ff42d](https://github.com/CoCreate-app/CoCreate-file-server/commit/f2ff42d5ecfc46807f03753c586feec1ea848148))
+* Update dCoCreate dpendencies to latest versions ([7945630](https://github.com/CoCreate-app/CoCreate-file-server/commit/794563023c42884ddfad4a9d4c434423b67ebf32))
+
 # [1.11.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.10.0...v1.11.0) (2023-09-17)
 
 

package/CoCreate.config.js

@@ -8,16 +8,16 @@ module.exports = {
             "object": {
                 "_id": "60145dc49f64ba1680b86693",
                 "name": "index.html",
-                "path": "/docs/file-server/index.html",
+                "path": "/docs/file-server",
+                "pathname": "/docs/file-server/index.html",
                 "src": "{{./docs/index.html}}",
                 "host": [
                     "cocreate.app",
                     "general.cocreate.app"
                 ],
-                "directory": "/docs/file-server",
+                "directory": "file-server",
                 "content-type": "text/html",
-                "public": "true",
-                "website_id": "5ffbceb7f11d2d00103c4535"
+                "public": "true"
             }
         }
     ]

package/package.json

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

@@ -91,14 +91,13 @@ class CoCreateFileSystem {
                     $filter: {
                         query: [
                             { key: "host", value: [hostname, '*'], operator: "$in" },
-                            { key: "path", value: pathname, operator: "$eq" }
+                            { key: "pathname", value: pathname, operator: "$eq" }
                         ],
                         limit: 1
                     },
                     organization_id
                 }
 
-
                 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)
@@ -136,8 +135,18 @@ class CoCreateFileSystem {
                     return sendResponse(pageNotFound.object[0].src, 404, { 'Content-Type': 'text/html' })
                 }
 
+
+                if (file.modified || file.created) {
+                    let modifiedOn = file.modified.on || file.created.on
+                    if (modifiedOn instanceof Date)
+                        modifiedOn = modifiedOn.toISOString()
+                    res.setHeader('Last-Modified', modifiedOn);
+                }
+
                 let contentType = file['content-type'] || 'text/html';
-                if (contentType.startsWith('image/') || contentType.startsWith('audio/') || contentType.startsWith('video/')) {
+                if (contentType === 'image/svg+xml')
+                    contentType = contentType
+                else if (contentType.startsWith('image/') || contentType.startsWith('audio/') || contentType.startsWith('video/')) {
                     src = src.replace(/^data:image\/(png|jpeg|jpg);base64,/, '');
                     src = Buffer.from(src, 'base64');
                 } else if (contentType === 'text/html') {
@@ -148,9 +157,6 @@ class CoCreateFileSystem {
                     }
                 }
 
-                if (file.modified)
-                    res.setHeader('Last-Modified', file.modified.on);
-
                 sendResponse(src, 200, { 'Content-Type': contentType })
 
                 function sendResponse(src, statusCode, headers) {
@@ -176,6 +182,9 @@ class CoCreateFileSystem {
                         data.$filter.query[0].value = ['*']
                         data.organization_id = process.env.organization_id
 
+                        if (fileName.startsWith('/admin'))
+                            data.$filter.query[1].value = '/superadmin' + fileName.replace('/admin', '')
+
                         defaultFile = await crud.send(data)
 
                         if (fileName !== '/hostNotFound.html') {
@@ -193,6 +202,12 @@ class CoCreateFileSystem {
                         }
 
                         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: 'create.object',
                                 array: 'files',