@cocreate/file-server 1.16.4 → 1.16.6

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.16.6](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.5...v1.16.6) (2024-06-20)
+
+
+### Bug Fixes
+
+* base64 test ([8dd6ffc](https://github.com/CoCreate-app/CoCreate-file-server/commit/8dd6ffc8d4a24116056ea392ae697e61bb523ed5))
+
+## [1.16.5](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.4...v1.16.5) (2024-04-26)
+
+
+### Bug Fixes
+
+* data object structure ([46fef9e](https://github.com/CoCreate-app/CoCreate-file-server/commit/46fef9e8892bf9af7efc4dad34b1287dd4286bbf))
+* handling of src data to format for sending over network ([591b84b](https://github.com/CoCreate-app/CoCreate-file-server/commit/591b84bdc2b53ccd41266ab4bab0048d15790fd7))
+* properly handle encoding ([2f37b7e](https://github.com/CoCreate-app/CoCreate-file-server/commit/2f37b7e90332e63edeff1c348c84356ec73ab193))
+* removed console.log ([d7d010f](https://github.com/CoCreate-app/CoCreate-file-server/commit/d7d010f99284a68b775d2e9f9b07aee631f19cd6))
+
 ## [1.16.4](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.3...v1.16.4) (2024-02-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.16.4",
+  "version": "1.16.6",
   "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,13 +27,28 @@ class CoCreateFileSystem {
 
     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, '*'] },
+                        $or: []
+                    },
+                    limit: 1
+                }
+            }
+
             if (!organization || organization.error) {
                 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;
+            data.organization_id = organization_id
 
             res.setHeader('organization', organization_id)
             res.setHeader('storage', !!organization.storage);
@@ -74,19 +89,20 @@ 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
-            }
+            // 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 }]
 
             let file
             if (pathname.startsWith('/dist') || pathname.startsWith('/admin') || ['/403.html', '/404.html', '/offline.html', '/manifest.webmanifest', '/service-worker.js'].includes(pathname))
@@ -136,9 +152,12 @@ class CoCreateFileSystem {
             }
 
             let contentType = file['content-type'] || 'text/html';
-            if (/^[A-Za-z0-9+/]+[=]{0,2}$/.test(src)) {
+            // const cleanedSrc = src.replace(/\s/g, '');
+            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);
@@ -150,18 +169,30 @@ class CoCreateFileSystem {
             sendResponse(src, 200, { 'Content-Type': contentType })
 
             function sendResponse(src, statusCode, headers) {
-                crud.wsManager.emit("setBandwidth", {
-                    type: 'out',
-                    data: src,
-                    organization_id
-                });
+                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);
+                    }
 
-                res.writeHead(statusCode, headers);
-                return res.end(src);
+                    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.$or[0].pathname = fileName
+                data.$filter.query.$or[0] = { pathname: fileName }
                 let defaultFile
                 if (fileName !== '/hostNotFound.html')
                     defaultFile = await crud.send(data);