dbm-graph-api 1.1.35 → 1.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.35",
+  "version": "1.1.36",
   "main": "index.js",
   "type": "module",
   "scripts": {

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};
@@ -538,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;
 
@@ -548,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");
 			}

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

@@ -9,39 +9,45 @@ export default class UpdateRenderedContent extends Dbm.core.BaseObject {
         console.log("UpdateRenderedContent:process");
         //console.log(aAction);
 
-        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let database = Dbm.getRepositoryItem("graphDatabase").controller;
         let page = await aAction.singleObjectRelationQuery("out:from:page");
 
-        let webcrawler = Dbm.getInstance().repository.getItem("webcrawler");
+        let fields = await page.getFields();
 
-        if(webcrawler.domain && webcrawler.renderPageUrl) {
-            let url = await page.getUrl();
+        let webcrawler = Dbm.getRepositoryItem("webcrawler");
+        let renderedContent = null;
 
-            let fullUrl = webcrawler.domain + url;
-    
-            let body = {
-                "url": fullUrl,
-                "key": webcrawler.key
-            }
-    
-            let headers = {
-                "Content-Type": "application/json",
+        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");
             }
-            
-            let response = await fetch(webcrawler.renderPageUrl, {
-                method: "POST",
-                headers: headers,
-                body: JSON.stringify(body),
-            });
-    
-            let data = await response.json();
-
-            let 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/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("-");
                     }
                 }
             }