dbm-graph-api 1.1.48 → 1.1.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.48",
+  "version": "1.1.50",
   "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.6",
-    "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/Api.js

@@ -25,7 +25,7 @@ export default class Api extends Dbm.core.BaseObject {
         return this;
     }
 
-    _callback_connection(aWebSocket, aRequest) {
+    async _callback_connection(aWebSocket, aRequest) {
         let newWebSocketConnection = new WebSocketConnection();
 
         newWebSocketConnection.item.setValue("api", this.item);
@@ -48,17 +48,15 @@ export default class Api extends Dbm.core.BaseObject {
                     let userId = 1*value.split(":")[1];
                     let user = Dbm.getRepositoryItem("graphDatabase").controller.getUser(userId);
     
-                    user.verifySession(value).then(function(aIsValidSession) {
-                        //console.log("verifySession", aIsValidSession);
+                    let isValidSession = await user.verifySession(value);
     
-                        if(aIsValidSession) {
-                            newWebSocketConnection.setInitialUser(userId);
-                        }
-                        else {
-                            newWebSocketConnection.setInitialUser(0);
-                        }
-                        
-                    });
+                    if(isValidSession) {
+                        await newWebSocketConnection.setInitialUser(userId);
+                    }
+                    else {
+                        await newWebSocketConnection.setInitialUser(0);
+                    };
+
                     hasUserCookie = true;
                     break;
                 }
@@ -66,7 +64,7 @@ export default class Api extends Dbm.core.BaseObject {
         }
         
         if(!hasUserCookie) {
-            newWebSocketConnection.setInitialUser(0);
+            await newWebSocketConnection.setInitialUser(0);
         }
     }
 	

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

@@ -30,16 +30,36 @@ export default class UrlRequest extends Dbm.core.BaseObject {
         let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
         let urlObject = await database.getObjectByUrl(url);
 
+		let logs = [];
+
         if(urlObject) {
-            let encodeSession = new DbmGraphApi.range.EncodeSession();
-            encodeSession.outputController = this;
+			let isOk = false;
+			let visibility = await urlObject.getVisibility();
+			if(visibility === "public") {
+				isOk = true;
+			}
+			else {
+				let isAdmin = await this.hasRole("admin");
+				if(isAdmin) {
+					isOk = true;
+				}
+			}
 
-            await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
-            encodeSession.destroy();
-            this._responseData = {"id": urlObject.id};
+			if(isOk) {
+				let encodeSession = new DbmGraphApi.range.EncodeSession();
+				encodeSession.outputController = this;
+
+				await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
+				encodeSession.destroy();
+				this._responseData = {"id": urlObject.id, "logs": logs};
+			}
+            else {
+				this._responseData = {"id": urlObject.id, "logs": ["Not allowed to load item"]};
+			}
         }
         else {
-            this._responseData = {"id": 0};
+			logs.push("Not found");
+            this._responseData = {"id": 0, "logs": logs};
         }
 	}
 	
@@ -111,13 +131,29 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 		let encodeSession = new DbmGraphApi.range.EncodeSession();
 		encodeSession.outputController = this;
 
-		//METODO: check visibility
+		let isOk = false;
+		let visibility = await Dbm.node.getDatabase().getObjectVisibility(aId);
+		if(visibility === "public") {
+			isOk = true;
+		}
+		else {
+			let isAdmin = await this.hasRole("admin");
+			if(isAdmin) {
+				isOk = true;
+			}
+		}
 
-		await encodeSession.encodeSingleWithTypes(aId, aEncodes);
+		let logs = [];
+		if(isOk) {
+			await encodeSession.encodeSingleWithTypes(aId, aEncodes);
 
-		encodeSession.destroy();
+			encodeSession.destroy();
+		}
+		else {
+			logs.push("Not allowed to load item");
+		}
 
-		this._responseData = {"id": aId};
+		this._responseData = {"id": aId, "logs": logs};
 	}
 	
 	async requestData(aFunctionName, aData) {
@@ -236,6 +272,26 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 			throw(new Error("Only signed in users can use this endpoint"));
 		}
 
+		let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+    		throw(new Error("User doesn't have privileges"));
+        }
+
 		return true;
 	}
+
+	async hasRole(aRole) {
+        let user = await this.getUser();
+
+		if(!user) {
+			return false;
+		}
+
+        let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+            return false;
+        }
+
+		return true;
+    }
 }

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

@@ -166,23 +166,39 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
             case "item":
                 {
                     let id = data['id'];
-                    //METODO: check visibility in database
-
-                    let encodeSession = new DbmGraphApi.range.EncodeSession();
-                    encodeSession.outputController = this;
+                    
+                    let isOk = false;
+                    let visibility = await Dbm.node.getDatabase().getObjectVisibility(id);
+                    if(visibility === "public") {
+                        isOk = true;
+                    }
+                    else {
+                        let isAdmin = await this.hasRole("admin");
+                        if(isAdmin) {
+                            isOk = true;
+                        }
+                    }
 
                     let logs = [];
 
-                    try {
-                        await encodeSession.encodeSingleWithTypes(id, data.encode);
+                    if(isOk) {
+                        let encodeSession = new DbmGraphApi.range.EncodeSession();
+                        encodeSession.outputController = this;
+
+                        try {
+                            await encodeSession.encodeSingleWithTypes(id, data.encode);
+                        }
+                        catch(theError) {
+                            logs.push(theError.message);
+                            console.error(theError);
+                        }
+
+                        encodeSession.destroy();
                     }
-                    catch(theError) {
-                        logs.push(theError.message);
-                        console.error(theError);
+                    else {
+                        logs.push("Not allowed to load item");
                     }
 
-                    encodeSession.destroy();
-
                     this._sendData({"type": "item/response", "id": id, "requestId": data["requestId"], "logs": logs});
                 }
                 break;
@@ -192,32 +208,47 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     if(url[url.length-1] !== "/") {
                         url += "/";
                     }
-                    //METODO: check visibility in database
-
                     
-
-                    let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+                    let database = Dbm.node.getDatabase();
                     let urlObject = await database.getObjectByUrl(url);
 
+                    let logs = [];
+
+                    let id = 0;
                     if(urlObject) {
-                        let encodeSession = new DbmGraphApi.range.EncodeSession();
-                        encodeSession.outputController = this;
+                        id = urlObject.id;
 
-                        await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
-                        encodeSession.destroy();
-                        this._sendData({"type": "url/response", "id": urlObject.id, "requestId": data["requestId"]});
-                    }
-                    else {
-                        this._sendData({"type": "url/response", "id": 0, "requestId": data["requestId"]});
+                        let isOk = false;
+                        let visibility = await urlObject.getVisibility();
+                        if(visibility === "public") {
+                            isOk = true;
+                        }
+                        else {
+                            let isAdmin = await this.hasRole("admin");
+                            if(isAdmin) {
+                                isOk = true;
+                            }
+                        }
+
+                        if(isOk) {
+                            let encodeSession = new DbmGraphApi.range.EncodeSession();
+                            encodeSession.outputController = this;
+
+                            await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
+                            encodeSession.destroy();
+                        }
+                        else {
+                            logs.push("Not allowed to load item");
+                        }
                     }
+                    
+                    this._sendData({"type": "url/response", "id": id, "requestId": data["requestId"], "logs": logs});
                 }
                 break;
             case "admin/createObject":
                 {
-                    //METODO: require role
                     let returnId = 0;
-                    let user = await this.getUser();
-                    if(user) {
+                    if(await this.hasRole("admin")) {
                         let types = data['types'];
                         let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
                         let visibility = data['visibility'] ? data['visibility'] : 'draft';
@@ -256,8 +287,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
                     let theObject = database.getObject(data.id);
 
-                    let user = await this.getUser();
-                    if(user) {
+                    if(await this.hasRole("admin")) {
                         if(data.changes) {
                             await this._applyChanges(theObject, data.changes, request);
                         }
@@ -288,21 +318,28 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
                     let isVerified = await user.verifySignedSessionToken(data.token);
 
+                    let roleIds = [];
                     let userId = 0;
                     if(isVerified) {
-                        //METODO: set user for connection
-                        
                         userId = user.id;
                         this.item.setValue("user", user);
+
+                        let roles = await user.getRoles();
+            
+                        let currentArray = roles;
+                        let currentArrayLength = currentArray.length;
+                        for(let i = 0; i < currentArrayLength; i++) {
+                            roleIds.push(await currentArray[i].getIdentifier());
+                        }
                     }
 
-                    this._sendData({"type": "currentUser/response", "id": userId, "requestId": data["requestId"]});
+                    this._sendData({"type": "currentUser/response", "id": userId, "roles": roleIds, "requestId": data["requestId"]});
                 }
                 break;
             case "user/signOut":
                 {
                     this.item.setValue("user", null);
-                    this._sendData({"type": "currentUser/response", "id": 0, "requestId": data["requestId"]});
+                    this._sendData({"type": "currentUser/response", "id": 0, "roles": [], "requestId": data["requestId"]});
                 }
                 break;
             case "heartbeat":
@@ -367,19 +404,27 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
         
     }
 
-    setInitialUser(aId) {
+    async setInitialUser(aId) {
 
-        if(aId) {
-            let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let roleIds = [];
 
-            let user = database.getUser(aId);
+        if(aId) {
+            let user = Dbm.node.getDatabase().getUser(aId);
             this.item.setValue("user", user);
+
+            let roles = await user.getRoles();
+            
+            let currentArray = roles;
+            let currentArrayLength = currentArray.length;
+            for(let i = 0; i < currentArrayLength; i++) {
+                roleIds.push(await currentArray[i].getIdentifier());
+            }
         }
         else {
             this.item.setValue("user", null);
         }
 
-        this._sendData({"type": "connectionReady", "user": aId});
+        this._sendData({"type": "connectionReady", "user": aId, "roles": roleIds});
     }
 
     async getUser() {
@@ -393,6 +438,26 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 			throw(new Error("Only signed in users can use this endpoint"));
 		}
 
+        let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+            throw(new Error("User doesn't have privileges"));
+        }
+
 		return true;
 	}
+
+    async hasRole(aRole) {
+        let user = await this.getUser();
+
+		if(!user) {
+			return false;
+		}
+
+        let hasRole = await user.hasRole(aRole);
+        if(!hasRole) {
+            return false;
+        }
+
+		return true;
+    }
 }

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();
 

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;
+}