dbm-graph-api 1.1.47 → 1.1.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.47",
+  "version": "1.1.49",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -11,14 +11,16 @@
   "license": "MIT",
   "description": "",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.741.0",
-    "@aws-sdk/s3-request-presigner": "^3.741.0",
-    "dbm": "^1.4.5",
-    "mime": "^4.0.6",
-    "sharp": "^0.33.5",
-    "ws": "^8.18.0"
+    "@aws-sdk/client-s3": "^3.984.0",
+    "@aws-sdk/s3-request-presigner": "^3.984.0",
+    "dbm": "^1.4.7",
+    "html-to-text": "^9.0.5",
+    "mime": "^4.1.0",
+    "node-cron": "^4.2.1",
+    "sharp": "^0.34.5",
+    "ws": "^8.19.0"
   },
   "optionalDependencies": {
-    "bufferutil": "^4.0.9"
+    "bufferutil": "^4.1.0"
   }
 }

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

@@ -9,6 +9,7 @@ import UrlRequest from "./UrlRequest.js";
 import fs from "node:fs";
 import sharp from 'sharp';
 import mime from 'mime';
+import { htmlToText } from "html-to-text";
 
 export {Api};
 
@@ -24,7 +25,7 @@ export const fullSelectSetup = function() {
     DbmGraphApi.range.select.fullSetup();
 }
 
-let registerEncoding = function(aName, aEncoder) {
+export const registerEncoding = function(aName, aEncoder) {
     let encodePrefix = "graphApi/range/encode/";
     aEncoder.item.register(encodePrefix + aName);
     aEncoder.item.setValue("encodingType", aName);
@@ -32,15 +33,11 @@ let registerEncoding = function(aName, aEncoder) {
     return aEncoder;
 }
 
-export {registerEncoding};
-
-let registerEncodingClass = function(aEncoderClass) {
+export const registerEncodingClass = function(aEncoderClass) {
     return registerEncoding(aEncoderClass.DEFAULT_ENCODING_NAME, new aEncoderClass());
 }
 
-export {registerEncodingClass};
-
-let fullEncodeSetup = function() {
+export const fullEncodeSetup = function() {
     let encodePrefix = "graphApi/range/encode/";
     {
         let name = "example";
@@ -195,9 +192,7 @@ let fullEncodeSetup = function() {
     registerEncoding("action", new DbmGraphApi.range.encode.Action());
 }
 
-export {fullEncodeSetup};
-
-export let registerDataFunction = function(aName, aDataFunction) {
+export const registerDataFunction = function(aName, aDataFunction) {
 
     aDataFunction.item.register("graphApi/data/" + aName);
     aDataFunction.item.setValue("functionName", aName);
@@ -205,7 +200,7 @@ export let registerDataFunction = function(aName, aDataFunction) {
     return aDataFunction;
 }
 
-let fullDataSetup = function() {
+export const fullDataSetup = function() {
     registerDataFunction("example", new DbmGraphApi.data.Example());
 
     registerDataFunction("breadcrumb", new DbmGraphApi.data.Breadcrumb());
@@ -221,9 +216,7 @@ let fullDataSetup = function() {
     registerDataFunction("server/status", new DbmGraphApi.data.server.Status());
 }
 
-export {fullDataSetup};
-
-export let registerActionFunction = function(aName, aDataFunction) {
+export const registerActionFunction = function(aName, aDataFunction) {
 
     aDataFunction.item.register("graphApi/action/" + aName);
     aDataFunction.item.setValue("functionName", aName);
@@ -231,7 +224,7 @@ export let registerActionFunction = function(aName, aDataFunction) {
     return aDataFunction;
 }
 
-let fullActionSetup = function() {
+export const fullActionSetup = function() {
     registerActionFunction("example", new DbmGraphApi.action.Example());
     registerActionFunction("submitForm", new DbmGraphApi.action.SubmitForm());
     registerActionFunction("incomingWebhook", new DbmGraphApi.action.IncomingWebhook());
@@ -249,9 +242,7 @@ let fullActionSetup = function() {
     registerActionFunction("development/reRenderPages", new DbmGraphApi.action.development.ReRenderPages());
 }
 
-export {fullActionSetup};
-
-export let registerProcessActionFunction = function(aName, aDataFunction) {
+export const registerProcessActionFunction = function(aName, aDataFunction) {
 
     aDataFunction.item.register("graphApi/processAction/" + aName);
     aDataFunction.item.setValue("functionName", aName);
@@ -259,7 +250,7 @@ export let registerProcessActionFunction = function(aName, aDataFunction) {
     return aDataFunction;
 }
 
-let fullProcessActionSetup = function() {
+export const fullProcessActionSetup = function() {
     registerProcessActionFunction("example", new DbmGraphApi.processAction.Example());
 
     registerProcessActionFunction("handleFormSubmission", new DbmGraphApi.processAction.HandleFormSubmission());
@@ -273,9 +264,7 @@ let fullProcessActionSetup = function() {
     registerProcessActionFunction("pageUpdates/clearCache", new DbmGraphApi.processAction.pageUpdates.ClearCloudflareCache());
 }
 
-export {fullProcessActionSetup};
-
-let setupInternalTaskRunner = function() {
+export const setupInternalTaskRunner = function() {
     Dbm.getRepositoryItem("taskRunner").requireProperty("runners", []);
 
     let runner = new DbmGraphApi.taskrunner.InternalTaskRunner();
@@ -287,10 +276,30 @@ let setupInternalTaskRunner = function() {
     
 }
 
-export {setupInternalTaskRunner};
-
+export const fullSettingsSetup = function() {
+    let htmlToTextConverter = {"item": new Dbm.repository.Item(), "convertToText": function(aHtmlText) {
+        return htmlToText(aHtmlText, {
+            wordwrap: false,
+            selectors: [
+                {
+                    selector: "a",
+                    options: {
+                        hideLinkHrefIfSameAsText: true
+                    }
+                },
+                {
+                    selector: "img",
+                    format: "skip"
+                }
+                
+            ]
+        });
+    }};
+    htmlToTextConverter.item.setValue("controller", htmlToTextConverter);
+    htmlToTextConverter.item.register("htmlToTextConverter");
+}
 
-let fullSetup = function() {
+export const fullSetup = function() {
 
     fullSelectSetup();
     fullEncodeSetup();
@@ -298,12 +307,11 @@ let fullSetup = function() {
     fullActionSetup();
     fullProcessActionSetup();
     setupInternalTaskRunner();
+    fullSettingsSetup();
     
     DbmGraphApi.admin.edit.fullSetup();
 }
 
-export {fullSetup};
-
 export const setupEndpoints = function(aServer) {
     aServer.post('/api/user/login', async function handler (aRequest, aReply) {
 
@@ -357,7 +365,6 @@ export const setupEndpoints = function(aServer) {
         }
 
         let user = await loginMethod.controller.getUser(params);
-        console.log(user);
         if(user) {
             let sessionId = await user.createSession();
 
@@ -693,10 +700,18 @@ export const setupSite = function(aServer) {
 		let assetsUri = site.assetsUri;
 		let language = site.language;
 		let siteName = site.name;
-		let loader = "loader.js?version=" + site.version;
-		if((process.env.NODE_ENV === "production" && request.query.forceLoad !== "unminified") || request.query.forceLoad === "minified") {
-			loader = "loader.min.js?version=" + site.version;
-		}
+        let loaderName = "loader";
+		
+        if(request.query.forceLoader) {
+            loaderName = request.query.forceLoader;
+        }
+        else {
+            if((process.env.NODE_ENV === "production" && request.query.forceLoad !== "unminified") || request.query.forceLoad === "minified") {
+                loaderName += ".min";
+            }
+        }
+        
+        let loader = loaderName + ".js?version=" + site.version;
 
 		let url = request.url;
         let shouldRedirect = false;

package/src/dbm-graph-api/processAction/communication/SendEmail.js

@@ -23,6 +23,8 @@ export default class SendEmail extends Dbm.core.BaseObject {
         message.setTextContent(data["textContent"]);
         message.setHtmlContent(data["htmlContent"]);
 
+        message.item.additionalData = data["additionalData"];
+
         await message.send();
     }
 }

package/src/dbm-graph-api/taskrunner/CronBaseObject.js

@@ -0,0 +1,42 @@
+import Dbm from "dbm";
+import DbmGraphApi from "../../../index.js";
+
+import cron from 'node-cron';
+
+export default class CronBaseObject extends Dbm.core.BaseObject {
+
+    _construct() {
+        super._construct();
+
+        this._cronTask = null;
+
+        this._callback_runTaskBound = this._callback_runTask.bind(this);
+    }
+
+    start(aSchedule, aTimezone = null) {
+        if(!this._cronTask) {
+            let options = {};
+            if(aTimezone) {
+                options["timezone"] = aTimezone;
+            }
+            this._cronTask = cron.createTask(aSchedule, this._callback_runTaskBound, options);
+            this._cronTask.start();
+        }
+    }
+
+    stop() {
+        if(this._cronTask) {
+            this._cronTask.stop();
+            this._cronTask.destroy();
+            this._cronTask = null;
+        }
+    }
+
+    async runTask() {
+        console.warn("runTask should be overridden", this);
+    }
+
+    async _callback_runTask(aTaskContext) {
+        return await this.runTask();
+    }
+}

package/src/dbm-graph-api/taskrunner/ExternalCron.js

@@ -0,0 +1,39 @@
+import Dbm from "dbm";
+import DbmGraphApi from "../../../index.js";
+
+export default class ExternalCron extends DbmGraphApi.taskrunner.CronBaseObject {
+
+    _construct() {
+        super._construct();
+
+        this.item.requireProperty("url", null);
+        this.item.requireProperty("method", "GET");
+        this.item.requireProperty("headers", {});
+        this.item.requireProperty("body", null);
+    }
+
+    async runTask() {
+        //console.log("ExternalCron::runTask");
+
+        let requestData = {
+            method: this.item.method,
+            headers: this.item.headers
+        };
+
+        if(this.item.body) {
+            requestData["body"] = this.item.body;
+        }
+        
+        try {
+            let startTime = performance.now();
+            let response = await fetch(this.item.url, requestData);
+
+            let responseText = await response.text();
+
+            let endTime = performance.now();
+        }
+        catch(theError) {
+            console.log(theError);
+        }
+    }
+}

package/src/dbm-graph-api/taskrunner/InternalCron.js

@@ -0,0 +1,32 @@
+import Dbm from "dbm";
+import DbmGraphApi from "../../../index.js";
+
+export default class InternalCron extends DbmGraphApi.taskrunner.CronBaseObject {
+
+    _construct() {
+        super._construct();
+
+        this.item.setValue("cronName", null);
+    }
+
+    async runTask() {
+        console.log("InternalCron::runTask");
+        let encodeSession = new DbmGraphApi.range.EncodeSession();
+        encodeSession.outputController = this;
+    
+        let dataFunctionItem = Dbm.getRepositoryItemIfExists("graphApi/action/cron/" + this.item.cronName);
+
+        if(dataFunctionItem) {
+            try {
+                await dataFunctionItem.controller.performAction({}, encodeSession);
+            }
+            catch(theError) {
+                console.log(theError);
+            }
+        }
+        else {
+            console.warn("No cron function called " + this.item.cronName + ". Can't run internal cron.");
+        }
+        
+    }
+}

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

@@ -1,2 +1,14 @@
+import DbmGraphApi from "../../../index.js";
+
 export {default as InternalTaskRunner} from "./InternalTaskRunner.js";
-export {default as ExternalTaskRunner} from "./ExternalTaskRunner.js";
+export {default as ExternalTaskRunner} from "./ExternalTaskRunner.js";
+export {default as CronBaseObject} from "./CronBaseObject.js";
+export {default as InternalCron} from "./InternalCron.js";
+export {default as ExternalCron} from "./ExternalCron.js";
+
+export const startInternalCron = function(aSchedule, aFunctionName) {
+    let cronRunner = new DbmGraphApi.taskrunner.InternalCron();
+    cronRunner.item.cronName = aFunctionName;
+    cronRunner.start(aSchedule);
+    return cronRunner;
+}