@cocreate/file-server 1.0.13 → 1.0.15

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.0.15](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.0.14...v1.0.15) (2022-12-05)
+
+
+### Bug Fixes
+
+* console.logs ([e73293f](https://github.com/CoCreate-app/CoCreate-file-server/commit/e73293fbb50330760a42250b773581527e870bd3))
+
+## [1.0.14](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.0.13...v1.0.14) (2022-12-05)
+
+
+### Bug Fixes
+
+* typo res.end ([2299a83](https://github.com/CoCreate-app/CoCreate-file-server/commit/2299a83a7f54b14a6f034cfa54563f090acfc344))
+
 ## [1.0.13](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.0.12...v1.0.13) (2022-12-05)
 
 

package/package.json

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

@@ -87,38 +87,31 @@ class CoCreateFileSystem {
                 res.send('could not find src');
             }
         
-            let content_type = file['content_type'] || mime.lookup(url) || 'text/html';
+            let contentType = file['content-type'] || mime.lookup(url) || 'text/html';
         
-            if (content_type.startsWith('image/') || content_type.startsWith('audio/') || content_type.startsWith('video/')) {
+            if (contentType.startsWith('image/') || contentType.startsWith('audio/') || contentType.startsWith('video/')) {
                 var base64Data = src.replace(/^data:image\/(png|jpeg|jpg);base64,/, '');
                 let file = Buffer.from(base64Data, 'base64');
                 res.writeHead(200, {
-                'Content-Type': content_type,
-                'Content-Length': file.length
+                    'Content-Type': contentType,
+                    'Content-Length': file.length
                 });
-                res.end(file);
-            }
-            else if (content_type === 'text/html') {
+                res.send(file);
+            } else if (contentType === 'text/html') {
                 try {
-                    let fullHtml = await render.HTML(src, organization_id);
-                    res.type(content_type);
-                    res.send(fullHtml);
+                    console.log('html src',  src)
+                    let html = await render.HTML(src, organization_id);
+                    console.log('returned html',  html)
+                    if (html)
+                        src = html
                 }
                 catch (err) {
-                    if (err.message.startsWith('infinite loop:')) {
-                        console.log('infinte loop')
-                        return res.send('there is a infinite loop');
-        
-                    }
-                    else {
-                        console.warn('server-render: ' + err.message)
-                        return res.send(src + `<script>console.log("${'server-render: ' + err.message}")</script>`)
-                    }
+                    console.warn('server-render: ' + err.message)
                 }
-        
-            }
-            else {
-                res.type(content_type);
+                res.type(contentType);
+                res.send(src)
+            } else {
+                res.type(contentType);
                 res.send(src);
             }