@cocreate/file-server 1.0.52 → 1.1.0

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# [1.1.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.0.53...v1.1.0) (2023-04-23)
+
+
+### Features
+
+* store organizaton_id in map to prevent repeated db queries ([74c0540](https://github.com/CoCreate-app/CoCreate-file-server/commit/74c05407df2118a9b1601181a7a42c1ac7bdad32))
+
+## [1.0.53](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.0.52...v1.0.53) (2023-04-11)
+
+
+### Bug Fixes
+
+* domains renamd to hosts ([8d19734](https://github.com/CoCreate-app/CoCreate-file-server/commit/8d197343a5daa9039f00f69e4a0a78e8a9925f59))
+* if !organization_id query platform org by domain to find id ([c849c7d](https://github.com/CoCreate-app/CoCreate-file-server/commit/c849c7dc2e4c7533550389a589f650077fd9da96))
+* renamed domans to hosts ([57c06c3](https://github.com/CoCreate-app/CoCreate-file-server/commit/57c06c32a5b38c1006ad1e85648164ce3568ac63))
+
 ## [1.0.52](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.0.51...v1.0.52) (2023-02-01)
 
 

package/CoCreate.config.js

@@ -12,7 +12,7 @@ module.exports = {
                 "name": "index.html",
                 "path": "/docs/file-server/index.html",
                 "src": "{{./docs/index.html}}",
-                "domains": [
+                "hosts": [
                     "cocreate.app",
                     "general.cocreate.app"
                 ],

package/package.json

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

@@ -4,37 +4,47 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
- const express = require('express');
- const router = express.Router();
- const mime = require('mime-types');
- const dns = require('dns');
- 
+const express = require('express');
+const router = express.Router();
+const mime = require('mime-types');
+const organizations = new Map();
+
 class CoCreateFileSystem {
     constructor(crud, render) {
         this.router = router.get('/*', async(req, res) => {
-            let organization_id;
             let hostname = req.hostname;
+
+            let organization_id = organizations.get(hostname);
+            console.log(req.protocol, req.secure)
+            // let ddns = await certManager.checkDns(hostname)
+            // let hasCert = await certManager.checkCert(hostname)
+            // console.log(hostname, 'crt==', hasCert)
+            // ToDo: check if secured domain by running command 
+            // sudo certbot certificates using spawn
+            // console.dir(req.headers.host)
             // dns.resolve(hostname, 'TXT', (err, records) => {
             //     if (records)
             //         organization_id = records[0][0];
             //     if (err)
             //         console.log(hostname, err);
             // });
-        
+               
+    
             if (!organization_id) {
                 let organization = await crud.readDocument({ 
                     collection: 'organizations',
                     filter: {
                         query: [
-                            {name: "domains", value: [hostname], operator: "$in"}
+                            {name: "hosts", value: [hostname], operator: "$in"}
                         ]
-                    }
-
+                    },
+                    organization_id: process.env.organization_id
                 })
                 if (!organization || !organization.document || !organization.document[0])
-                    return res.send('Organization cannot be found using the domain: ' + hostname + ' in platformDB: ' + process.env.organization_id);
+                    return res.send('Organization cannot be found using the host---: ' + hostname + ' in platformDB: ' + process.env.organization_id);
 
                 organization_id = organization.document[0]._id
+                organizations.set(hostname, organization_id)
             }
 
             let [url, parameters] = req.url.split("?");
@@ -55,7 +65,7 @@ class CoCreateFileSystem {
                 collection: 'files',
                 filter: {
                     query: [
-                        {name: "domains", value: [hostname, '*'], operator: "$in"},
+                        {name: "hosts", value: [hostname, '*'], operator: "$in"},
                         {name: "path", value: url, operator: "$eq"}
                     ]
                 },