@cocreate/lazy-loader 1.14.0 → 1.15.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.15.0](https://github.com/CoCreate-app/CoCreate-lazy-loader/compare/v1.14.0...v1.15.0) (2024-01-08)
+
+
+### Bug Fixes
+
+* applied host to define environment/branch ([2e830bf](https://github.com/CoCreate-app/CoCreate-lazy-loader/commit/2e830bfbc3a6ab08b4d67b7f756e19f7933d412a))
+* hostNotFound handled by fileServer ([4773bb8](https://github.com/CoCreate-app/CoCreate-lazy-loader/commit/4773bb8466e6f5ae469ab9b6687a0c52e74ef992))
+* init logging ([40c1157](https://github.com/CoCreate-app/CoCreate-lazy-loader/commit/40c11576f402593c8dff92414959c7f1e96948f7))
+
+
+### Features
+
+* bumped CoCreate dependencies to their latest versions ([8331382](https://github.com/CoCreate-app/CoCreate-lazy-loader/commit/83313829d28f95071cee5704164a35745067278a))
+* use crud.getHost and crud.getorganization ([142715e](https://github.com/CoCreate-app/CoCreate-lazy-loader/commit/142715e931e3e56bf841d5c2bcf061a0e3d56af2))
+
 # [1.14.0](https://github.com/CoCreate-app/CoCreate-lazy-loader/compare/v1.13.2...v1.14.0) (2024-01-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/lazy-loader",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "A simple lazy-loader component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "lazy-loader",
@@ -59,6 +59,6 @@
   },
   "dependencies": {
     "@cocreate/config": "^1.10.0",
-    "@cocreate/observer": "^1.14.0"
+    "@cocreate/observer": "^1.15.0"
   }
 }

package/src/server.js

@@ -4,8 +4,7 @@ const vm = require('vm');
 const Config = require("@cocreate/config");
 const { URL } = require('url');
 
-const organizations = {};
-const hosts = {};
+// const organizations = {};
 
 class CoCreateLazyLoader {
     constructor(server, crud, files) {
@@ -22,16 +21,10 @@ class CoCreateLazyLoader {
         const scriptsDirectory = './scripts';
 
         try {
-            await fs.access(directory);
-            console.log("The directory exists.");
+            await fs.mkdir(scriptsDirectory, { recursive: true });
         } catch (error) {
-            try {
-                await fs.mkdir(scriptsDirectory, { recursive: true });
-                console.log(`Scripts directory created at ${scriptsDirectory}`);
-            } catch (error) {
-                console.error('Error creating scripts directory:', error);
-                throw error; // Halt execution if directory creation fails
-            }
+            console.error('Error creating scripts directory:', error);
+            throw error; // Halt execution if directory creation fails
         }
 
         this.modules = await Config('modules', false, false)
@@ -56,36 +49,14 @@ class CoCreateLazyLoader {
             const valideUrl = new URL(`http://${req.headers.host}${req.url}`);
             const hostname = valideUrl.hostname;
 
-            let organization = hosts[hostname];
-            if (!organization) {
-                let org = await this.crud.send({
-                    method: 'object.read',
-                    array: 'organizations',
-                    $filter: {
-                        query: [
-                            { key: "host", value: [hostname], operator: "$in" }
-                        ]
-                    },
-                    organization_id: process.env.organization_id
-                })
-
-                if (!org || !org.object || !org.object[0]) {
-                    // TODO: hostNotFound is not defined
-                    if (!hostNotFound)
-                        hostNotFound = await getDefaultFile('/hostNotFound.html')
-                    return sendResponse(hostNotFound.object[0].src, 404, { 'Content-Type': 'text/html', 'storage': organization.storage })
-                } else {
-                    organization = org.object[0]
-                    organizations[organization._id] = organization
-                }
-            }
-
-            hosts[hostname] = organization
+            let organization = await this.crud.getHost(hostname);
+            if (organization.error)
+                return this.files.send(req, res, this.crud, organization, valideUrl)
 
             if (valideUrl.pathname.startsWith('/webhooks/')) {
                 let name = req.url.split('/')[2]; // Assuming URL structure is /webhook/name/...
                 if (this.modules[name]) {
-                    this.executeScriptWithTimeout(name, { req, res, organization, valideUrl, organization_id: organization._id })
+                    this.executeScriptWithTimeout(name, { req, res, host: hostname, organization, valideUrl, organization_id: organization._id })
                 } else {
                     // Handle unknown module or missing webhook method
                     res.writeHead(404, { 'Content-Type': 'application/json' });
@@ -163,31 +134,14 @@ class CoCreateLazyLoader {
     }
 
     async getApiKey(organization_id, name) {
-        organizations[organization_id] = this.getOrganization(organization_id, name)
-        organizations[organization_id] = await organizations[organization_id]
-        return organizations[organization_id][name]
-    }
-
-    async getOrganization(organization_id) {
-        let organization = await this.crud.send({
-            method: 'object.read',
-            database: organization_id,
-            array: 'organizations',
-            object: [{ _id: organization_id }],
-            organization_id
-        })
-
-        if (organization
-            && organization.object
-            && organization.object[0]) {
-            if (organization.object[0].apis) {
-                return organization.object[0].apis
-            } else
-                return { error: 'No apis defined could not be found' }
-        } else {
-            return { serverOrganization: false, error: 'An organization could not be found' }
-        }
-
+        let organization = await this.crud.getOrganization(organization_id, false);
+        if (!organization.error)
+            return organization.error
+        else if (!organization.apis)
+            return { error: 'Missing apis object in organization object' }
+        if (!organization.apis[name])
+            return { error: `Missing ${name} in organization apis object` }
+        return organization.apis[name]
     }
 
 }
@@ -250,6 +204,7 @@ function clearModuleCache(name) {
 async function fetchScriptFromDatabaseAndSave(name, moduleConfig) {
     let data = {
         method: 'object.read',
+        host: moduleConfig.object.hostname,
         array: moduleConfig.array,
         $filter: {
             query: [