dbm-graph-api 1.1.34 → 1.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.34",
+  "version": "1.1.36",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.741.0",
     "@aws-sdk/s3-request-presigner": "^3.741.0",
-    "dbm": "^1.2.3",
+    "dbm": "^1.2.5",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

package/src/dbm-graph-api/action/development/ReRenderPages.js

@@ -0,0 +1,26 @@
+import Dbm from "dbm";
+import { exec } from 'node:child_process';
+import { createHash } from 'node:crypto';
+
+export default class ReRenderPages extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performAction(aData, aEncodeSession) {
+        let returnObject = {};
+
+        let database = Dbm.getRepositoryItem("graphDatabase").controller;
+        
+        let pages = await database.getObjectsOfType("page");
+        let currentArray = pages;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let page = currentArray[i];
+
+            await database.addActionToProcess("pageUpdates/updateRenderedContent", [page]);
+        }
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/action/development/index.js

@@ -1,2 +1,3 @@
 export {default as RestartServer} from "./RestartServer.js";
-export {default as RestartDatabaseConnection} from "./RestartDatabaseConnection.js";
+export {default as RestartDatabaseConnection} from "./RestartDatabaseConnection.js";
+export {default as ReRenderPages} from "./ReRenderPages.js";

package/src/dbm-graph-api/index.js

@@ -276,6 +276,8 @@ let fullActionSetup = function() {
 
     registerActionFunction("development/restartServer", new DbmGraphApi.action.development.RestartServer());
     registerActionFunction("development/restartDatabaseConnection", new DbmGraphApi.action.development.RestartDatabaseConnection());
+
+    registerActionFunction("development/reRenderPages", new DbmGraphApi.action.development.ReRenderPages());
 }
 
 export {fullActionSetup};
@@ -294,6 +296,8 @@ let fullProcessActionSetup = function() {
     registerProcessActionFunction("handleFormSubmission", new DbmGraphApi.processAction.HandleFormSubmission());
 
     registerProcessActionFunction("pageUpdates/updateCategoryListing", new DbmGraphApi.processAction.pageUpdates.UpdateCategoryListing());
+    registerProcessActionFunction("pageUpdates/updateRenderedContent", new DbmGraphApi.processAction.pageUpdates.UpdateRenderedContent());
+    registerProcessActionFunction("pageUpdates/clearCache", new DbmGraphApi.processAction.pageUpdates.ClearCloudflareCache());
 }
 
 export {fullProcessActionSetup};
@@ -536,7 +540,7 @@ export const setupEndpoints = function(aServer) {
 export const setupSite = function(aServer) {
 
     aServer.get('/cdn-cgi/image/:options/*', async function(request, reply) {
-        console.log("/cdn-cgi/image/");
+        //console.log("/cdn-cgi/image/");
 
         let publicDir = Dbm.getInstance().repository.getItem("site").publicDir;
 
@@ -546,8 +550,7 @@ export const setupSite = function(aServer) {
 		let realPath;
 		try {
 			realPath = fs.realpathSync(publicDir + "/" + imageUrl);
-            console.log(realPath);
-			console.log(realPath);
+            //console.log(realPath);
 			if(realPath.indexOf(publicDir + "/") !== 0) {
 				throw("Not in folder");
 			}
@@ -868,16 +871,34 @@ export const setupSite = function(aServer) {
 	    <meta property="article:publisher" content="https://sv-se.facebook.com/..." />
         */
 
+
+        let renderedContent = "";
+        
+        if(fields["renderedPageContent"]) {
+            renderedContent = fields["renderedPageContent"];
+        }
+        
+        let renderedContentHolder = "";
+        if(renderedContent) {
+            renderedContentHolder = `<div id="preRenderContent">${renderedContent}</div>`;
+        }
+
+        let moduleData = {};
+        //METODO: add page data
+        let endodedModuleData = JSON.stringify(moduleData);
+
 		returnString += `   </head>
 	<body>
-		<div id="site"></div>
+		<div id="site">
+            ${renderedContentHolder}
+        </div>
 		<script>
 		(function(d,b,m,j,s){
 				d[m] = d[m] || {}; d[m][j] = d[m][j] || {_: [], create: function(element, moduleName, data) {return this._.push({element, moduleName, data});}, remove: function(id) {this._[id-1] = null;}};
 				let e = b.createElement("script"); e.async = true; e.src = s; b.head.appendChild(e);
 			})(window, document, "dbmstartup", "modules", "${assetsUri}js/${loader}");
 		
-			dbmstartup.modules.create(document.getElementById("site"), "${moduleName}", {});
+			dbmstartup.modules.create(document.getElementById("site"), "${moduleName}", ${endodedModuleData});
 		</script>
 	</body>
 </html>`;

package/src/dbm-graph-api/processAction/pageUpdates/ClearCloudflareCache.js

@@ -0,0 +1,46 @@
+import Dbm from "dbm";
+
+export default class ClearCloudflareCache extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async process(aAction) {
+        console.log("ClearCloudflareCache:process");
+        //console.log(aAction);
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let page = await aAction.singleObjectRelationQuery("out:from:page");
+
+        let cloudflare = Dbm.getInstance().repository.getItem("cloudflare");
+        let url = await page.getUrl();
+
+        if(cloudflare.domain && cloudflare.zone) {
+            let fullUrl = cloudflare.domain + url;
+    
+            let requestUrl = "https://api.cloudflare.com/client/v4/zones/" + cloudflare.zone + "/purge_cache";
+    
+            let body = {
+              "files": [fullUrl]
+            }
+    
+            let headers = {
+                "Content-Type": "application/json",
+                'Authorization': 'Bearer ' + cloudflare.cacheToken
+            }
+            
+            let response = await fetch(requestUrl, {
+                method: "DELETE",
+                headers: headers,
+                body: JSON.stringify(body),
+            });
+    
+            let data = await response.json();
+        }
+        else {
+            //METODO: report error log
+        }
+
+        
+    }
+}

package/src/dbm-graph-api/processAction/pageUpdates/UpdateRenderedContent.js

@@ -0,0 +1,53 @@
+import Dbm from "dbm";
+
+export default class UpdateRenderedContent extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async process(aAction) {
+        console.log("UpdateRenderedContent:process");
+        //console.log(aAction);
+
+        let database = Dbm.getRepositoryItem("graphDatabase").controller;
+        let page = await aAction.singleObjectRelationQuery("out:from:page");
+
+        let fields = await page.getFields();
+
+        let webcrawler = Dbm.getRepositoryItem("webcrawler");
+        let renderedContent = null;
+
+        if(!fields["seo/noIndex"]) {
+            if(webcrawler.domain && webcrawler.renderPageUrl) {
+                let url = await page.getUrl();
+
+                let fullUrl = webcrawler.domain + url;
+        
+                let body = {
+                    "url": fullUrl,
+                    "key": webcrawler.key
+                }
+        
+                let headers = {
+                    "Content-Type": "application/json",
+                }
+                
+                let response = await fetch(webcrawler.renderPageUrl, {
+                    method: "POST",
+                    headers: headers,
+                    body: JSON.stringify(body),
+                });
+        
+                let data = await response.json();
+
+                renderedContent = Dbm.objectPath(data, "data.html");
+            }
+        }
+
+        if(renderedContent !== fields["renderedContent"]) {
+            await page.updateField("renderedPageContent", renderedContent);
+
+            await database.addActionToProcess("pageUpdates/clearCache", [page]);
+        }
+    }
+}

package/src/dbm-graph-api/processAction/pageUpdates/index.js

@@ -1 +1,3 @@
-export {default as UpdateCategoryListing} from "./UpdateCategoryListing.js";
+export {default as UpdateCategoryListing} from "./UpdateCategoryListing.js";
+export {default as UpdateRenderedContent} from "./UpdateRenderedContent.js";
+export {default as ClearCloudflareCache} from "./ClearCloudflareCache.js";

package/src/dbm-graph-api/schema/JsonLdGenerator.js

@@ -10,7 +10,7 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
     }
 
     async encodeWebsiteEntity(aDatabaseObject) {
-        console.log("encodeWebsiteEntity");
+        //console.log("encodeWebsiteEntity");
 
         let site = Dbm.getInstance().repository.getItem("site");
         let fields = await aDatabaseObject.getFields();
@@ -27,7 +27,7 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
     }
 
     async encodeOrganizationEntity(aDatabaseObject) {
-        console.log("encodeOrganizationEntity");
+        //console.log("encodeOrganizationEntity");
 
         let site = Dbm.getInstance().repository.getItem("site");
         let fields = await aDatabaseObject.getFields();
@@ -124,7 +124,7 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
     }
     
     async getWebsiteEntites() {
-        console.log("getWebsiteEntites");
+        //console.log("getWebsiteEntites");
     
         let returnArray = [];
         let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
@@ -142,9 +142,9 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
                 for(let i = 0; i < currentArrayLength; i++) {
                     let currentLocalBusiness = currentArray[i];
                     if(currentLocalBusiness) {
-                        console.log(currentLocalBusiness);
+                        //console.log(currentLocalBusiness);
                         returnArray.push(await this.encodeLocalBusiness(currentLocalBusiness));
-                        console.log("-");
+                        //console.log("-");
                     }
                 }
             }