dbm-graph-api 1.1.31 → 1.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.31",
+  "version": "1.1.33",
   "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.1",
+    "dbm": "^1.2.3",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

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

@@ -114,7 +114,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     console.error(theError);
                 }
 
-                this._webSocket.send(JSON.stringify({"type": "range/response", "ids": ids, "requestId": data["requestId"], "logs": logs}));
+                this._sendData({"type": "range/response", "ids": ids, "requestId": data["requestId"], "logs": logs});
                 break;
             case "data":
                 {
@@ -128,7 +128,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                         returnData = await dataFunctionItem.controller.getData(data['data'], encodeSession);
                     }
 
-                    this._webSocket.send(JSON.stringify({"type": "data/response", "data": returnData, "requestId": data["requestId"]}));
+                    this._sendData({"type": "data/response", "data": returnData, "requestId": data["requestId"]});
                 }
                 break;
             case "action":
@@ -151,7 +151,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                         console.error(theError);
                     }
 
-                    this._webSocket.send(JSON.stringify({"type": "data/response", "data": returnData, "requestId": data["requestId"], "logs": logs}));
+                    this._sendData({"type": "data/response", "data": returnData, "requestId": data["requestId"], "logs": logs});
                 }
                 break;
             case "item":
@@ -162,11 +162,19 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     let encodeSession = new DbmGraphApi.range.EncodeSession();
                     encodeSession.outputController = this;
 
-                    await encodeSession.encodeSingleWithTypes(id, data.encode);
+                    let logs = [];
+
+                    try {
+                        await encodeSession.encodeSingleWithTypes(id, data.encode);
+                    }
+                    catch(theError) {
+                        logs.push(theError.message);
+                        console.error(theError);
+                    }
 
                     encodeSession.destroy();
 
-                    this._webSocket.send(JSON.stringify({"type": "item/response", "id": id, "requestId": data["requestId"]}));
+                    this._sendData({"type": "item/response", "id": id, "requestId": data["requestId"], "logs": logs});
                 }
                 break;
             case "url":
@@ -188,10 +196,10 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
                         await encodeSession.encodeSingleWithTypes(urlObject.id, ["urlRequest"]);
                         encodeSession.destroy();
-                        this._webSocket.send(JSON.stringify({"type": "url/response", "id": urlObject.id, "requestId": data["requestId"]}));
+                        this._sendData({"type": "url/response", "id": urlObject.id, "requestId": data["requestId"]});
                     }
                     else {
-                        this._webSocket.send(JSON.stringify({"type": "url/response", "id": 0, "requestId": data["requestId"]}));
+                        this._sendData({"type": "url/response", "id": 0, "requestId": data["requestId"]});
                     }
                 }
                 break;
@@ -230,7 +238,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     }
                     
                     
-                    this._webSocket.send(JSON.stringify({"type": "item/response", "id": returnId, "requestId": data["requestId"]}));
+                    this._sendData({"type": "item/response", "id": returnId, "requestId": data["requestId"]});
                 }
                 break;
             case "admin/editObject":
@@ -260,7 +268,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     }
                     
                     
-                    this._webSocket.send(JSON.stringify({"type": "item/response", "id": theObject.id, "requestId": data["requestId"]}));
+                    this._sendData({"type": "item/response", "id": theObject.id, "requestId": data["requestId"]});
                 }
                 break;
             case "user/signInWithToken":
@@ -279,19 +287,29 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                         this.item.setValue("user", user);
                     }
 
-                    this._webSocket.send(JSON.stringify({"type": "currentUser/response", "id": userId, "requestId": data["requestId"]}));
-                    
+                    this._sendData({"type": "currentUser/response", "id": userId, "requestId": data["requestId"]});
                 }
                 break;
             case "heartbeat":
                 {
-                    this._webSocket.send(JSON.stringify({"type": "heartbeat/response"}));
-                    
+                    this._sendData({"type": "heartbeat/response"});
                 }
                 break;
         }	
     }
 
+    _sendData(aData) {
+        if(this._webSocket) {
+            let encodedData = JSON.stringify(aData);
+            try {
+                this._webSocket.send(encodedData);
+            }
+            catch(theError) {
+                console.error();
+            }
+        }
+    }
+
     _callback_error(aMessage) {
 		console.log("_callback_error");
         console.error(aMessage);
@@ -328,7 +346,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     outputEncodedData(aId, aData, aEncoding) {
         //console.log("WebSocketConnection::outputEncodedData");
 
-        this._webSocket.send(JSON.stringify({"type": "updateEncodedObject", "id": aId, "data": aData, "encoding": aEncoding}));
+        this._sendData({"type": "updateEncodedObject", "id": aId, "data": aData, "encoding": aEncoding});
         
     }
 
@@ -344,7 +362,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
             this.item.setValue("user", null);
         }
 
-        this._webSocket.send(JSON.stringify({"type": "connectionReady", "user": aId}));
+        this._sendData({"type": "connectionReady", "user": aId});
     }
 
     async getUser() {

package/src/dbm-graph-api/action/admin/AddAndProcessAction.js

@@ -11,6 +11,7 @@ export default class AddAndProcessAction extends Dbm.core.BaseObject {
         await aEncodeSession.outputController.requireRole("admin");
         let user = await aEncodeSession.outputController.getUser();
         
+        //METODO: check role
         if(user) {
             let type = aData["type"];
 

package/src/dbm-graph-api/action/admin/AddUser.js

@@ -6,44 +6,40 @@ export default class AddUser extends Dbm.core.BaseObject {
     }
 
     async performAction(aData, aEncodeSession) {
-        console.log("AddUser");
+        //console.log("AddUser");
         let returnObject = {};
 
         await aEncodeSession.outputController.requireRole("admin");
-        let user = await aEncodeSession.outputController.getUser();
 
         let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
         
-        if(user) {
-            let username = aData["username"];
+        let username = aData["username"];
 
-            if(username) {
-                let user = await database.getUserByUsername(username);
+        if(username) {
+            let user = await database.getUserByUsername(username);
 
-                if(!user) {
-                    user = await database.createUser();
-                    returnObject["created"] = true;
+            if(!user) {
+                user = await database.createUser();
+                returnObject["created"] = true;
 
-                    await user.setUsername(username);
-                    if(aData["password"]) {
-                        await user.setPassword(aData["password"]);
-                    }
-
-                    if(aData["role"]) {
-                        let role = await database.getIdentifiableObject("type/userRole", aData["role"]);
-                        await user.addIncomingRelation(role, "for");
-                    }
-                }
-                else {
-                    returnObject["created"] = false;
+                await user.setUsername(username);
+                if(aData["password"]) {
+                    await user.setPassword(aData["password"]);
                 }
 
-                returnObject["id"] = user.id;
+                if(aData["role"]) {
+                    let role = await database.getIdentifiableObject("type/userRole", aData["role"]);
+                    await user.addIncomingRelation(role, "for");
+                }
             }
             else {
-                throw("No username");
+                returnObject["created"] = false;
             }
-            
+
+            returnObject["id"] = user.id;
+        }
+        else {
+            throw("No username");
         }
 
         return returnObject;

package/src/dbm-graph-api/action/admin/SetPassword.js

@@ -0,0 +1,35 @@
+import Dbm from "dbm";
+
+export default class SetPassword extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performAction(aData, aEncodeSession) {
+        //console.log("SetPassword");
+        let returnObject = {};
+
+        await aEncodeSession.outputController.requireRole("admin");
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        
+        let id = aData["id"];
+
+        if(id) {
+            let user = await database.getUser(id);
+
+            if(user) {
+                await user.setPassword(aData["password"]);
+                returnObject["updated"] = true;
+            }
+            else {
+                throw("No user");
+            }
+        }
+        else {
+            throw("No id");
+        }
+
+        return returnObject;
+    }
+}

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

@@ -1,4 +1,5 @@
 export {default as AddAndProcessAction} from "./AddAndProcessAction.js";
 export {default as AddUser} from "./AddUser.js";
+export {default as SetPassword} from "./SetPassword.js";
 
 export * as setup from "./setup/index.js";

package/src/dbm-graph-api/admin/edit/ReplaceOutgoingRelation.js

@@ -7,6 +7,6 @@ export default class ReplaceOutgoingRelation extends EditBaseObject {
     }
 
     async performChange(aObject, aData, aRequest) {
-        await aObject.replaceOutgoingRelation(aData["value"], aData["type"]), aData["objectType"];
+        await aObject.replaceOutgoingRelation(aData["value"], aData["type"], aData["objectType"]);
     }
 }

package/src/dbm-graph-api/admin/edit/SetFieldTranslation.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class SetFieldTranslation extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.updateFieldTranslation(aData["field"], aData["language"], aData["value"]);
+    }
+}

package/src/dbm-graph-api/admin/edit/Trash.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class Trash extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.trash();
+    }
+}

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

@@ -15,6 +15,8 @@ export {default as ReplaceMultipleOutgoingRelations} from "./ReplaceMultipleOutg
 export {default as AddObjectType} from "./AddObjectType.js";
 export {default as RemoveObjectType} from "./RemoveObjectType.js";
 export {default as AddAction} from "./AddAction.js";
+export {default as SetFieldTranslation} from "./SetFieldTranslation.js";
+export {default as Trash} from "./Trash.js";
 
 
 export const fullSetup = function() {
@@ -102,4 +104,16 @@ export const fullSetup = function() {
         let currentSelect = new DbmGraphApi.admin.edit.AddAction();
         currentSelect.item.register(prefix + name);
     }
+
+    {
+        let name = "setFieldTranslation";
+        let currentSelect = new DbmGraphApi.admin.edit.SetFieldTranslation();
+        currentSelect.item.register(prefix + name);
+    }
+
+    {
+        let name = "trash";
+        let currentSelect = new DbmGraphApi.admin.edit.Trash();
+        currentSelect.item.register(prefix + name);
+    }
 }

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

@@ -73,6 +73,12 @@ let registerEncoding = function(aName, aEncoder) {
 
 export {registerEncoding};
 
+let registerEncodingClass = function(aEncoderClass) {
+    return registerEncoding(aEncoderClass.DEFAULT_ENCODING_NAME, new aEncoderClass());
+}
+
+export {registerEncodingClass};
+
 let fullEncodeSetup = function() {
     let encodePrefix = "graphApi/range/encode/";
     {
@@ -213,6 +219,13 @@ let fullEncodeSetup = function() {
     registerEncoding("mainImage", new DbmGraphApi.range.encode.MainImage());
     registerEncoding("linkPreview", new DbmGraphApi.range.encode.LinkPreview());
     registerEncoding("publishDate", new DbmGraphApi.range.encode.PublishDate());
+
+    registerEncoding("title_translations", new DbmGraphApi.range.encode.TranslatedTitle());
+    registerEncoding("admin_fieldTranslations", new DbmGraphApi.range.encode.admin.FieldTranslations());
+
+    registerEncoding("language", DbmGraphApi.range.encode.SingleRelation.create("language", "in:for:language", "type"));
+    registerEncodingClass(DbmGraphApi.range.encode.TranslatedName);
+    registerEncoding("translationGroup", new DbmGraphApi.range.encode.TranslationGroup());
 }
 
 export {fullEncodeSetup};
@@ -256,6 +269,7 @@ let fullActionSetup = function() {
     registerActionFunction("cron/processActions", new DbmGraphApi.action.cron.ProcessActions());
     registerActionFunction("admin/addAndProcessAction", new DbmGraphApi.action.admin.AddAndProcessAction());
     registerActionFunction("admin/addUser", new DbmGraphApi.action.admin.AddUser());
+    registerActionFunction("admin/user/setPassword", new DbmGraphApi.action.admin.SetPassword());
 
     registerActionFunction("admin/setup/setupWebsite", new DbmGraphApi.action.admin.setup.SetupWebsite());
     registerActionFunction("admin/setup/setupOrganization", new DbmGraphApi.action.admin.setup.SetupOrganization());
@@ -706,6 +720,10 @@ export const setupSite = function(aServer) {
 		reply.type('text/html');
 
 		let fields = await urlObject.getFields();
+        let languageItem = await urlObject.singleObjectRelationQuery("in:for:language");
+        if(languageItem) {
+            language = await languageItem.getIdentifier();
+        }
 
         let baseUrl = request.protocol + "://" + request.hostname;
 		if(request.port && request.port !== 80 && request.port !== 443) {

package/src/dbm-graph-api/range/encode/SingleRelation.js

@@ -0,0 +1,39 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class Language extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+
+        this.outputFieldName = "language";
+        this.relationPath = "in:for:language";
+        this.encodeType = "type";
+    }
+
+    setup(aOutputFieldName, aRelationPath, aEncodeType) {
+
+        this.outputFieldName = aOutputFieldName;
+        this.relationPath = aRelationPath;
+        this.encodeType = aEncodeType;
+
+        return this;
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getRepositoryItem("graphDatabase").controller.getObject(aId);
+
+        returnObject[this.outputFieldName] = await aEncodingSession.encodeObjectOrNull(await object.singleObjectRelationQuery(this.relationPath), this.encodeType);
+
+        return returnObject;
+    }
+
+    static create(aOutputFieldName, aRelationPath, aEncodeType) {
+        let newEncoder = new Language();
+        newEncoder.setup(aOutputFieldName, aRelationPath, aEncodeType);
+
+        return newEncoder;
+    }
+}

package/src/dbm-graph-api/range/encode/TranslatedName.js

@@ -0,0 +1,25 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class TranslatedName extends EncodeBaseObject {
+
+    static DEFAULT_ENCODING_NAME = "name_translations";
+
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        await aEncodingSession.encodeSingle(aId, "name");
+
+        let fieldTranslations = await object.getFieldTranslation("name");
+        returnObject["name/translations"] = fieldTranslations;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/TranslatedTitle.js

@@ -0,0 +1,22 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class TranslatedTitle extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        await aEncodingSession.encodeSingle(aId, "title");
+
+        let fieldTranslations = await object.getFieldTranslation("title");
+        returnObject["title/translations"] = fieldTranslations;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/TranslationGroup.js

@@ -0,0 +1,28 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class TranslationGroup extends EncodeBaseObject {
+
+     static DEFAULT_ENCODING_NAME = "translationGroup";
+
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+        //console.log("TranslationGroup::getEncodedData");
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+
+        {
+            let relatedItems = await object.objectRelationQuery("in:in:page");
+            returnObject["pages"] = await aEncodingSession.encodeObjects(relatedItems, "language");
+            await aEncodingSession.encodeObjects(relatedItems, "url");
+        }
+
+        return returnObject;
+    }
+}

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

@@ -18,6 +18,7 @@ export default class UrlRequest extends EncodeBaseObject {
         await aEncodingSession.encodeSingle(aId, "url");
         await aEncodingSession.encodeSingle(aId, "navigationName");
         await aEncodingSession.encodeSingle(aId, "pageRepresentation");
+        await aEncodingSession.encodeSingle(aId, "language");
 
         let fields = await object.getFields();
 
@@ -38,6 +39,12 @@ export default class UrlRequest extends EncodeBaseObject {
             returnObject["category"] = await aEncodingSession.encodeObjectOrNull(relatedItem, "type");
         }
 
+        {
+            let relatedItem = await object.singleObjectRelationQuery("out:in:group/translationGroup");
+
+            returnObject["translations"] = await aEncodingSession.encodeObjectOrNull(relatedItem, "translationGroup");
+        }
+
         return returnObject;
     }
 }

package/src/dbm-graph-api/range/encode/admin/FieldTranslations.js

@@ -0,0 +1,22 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "../EncodeBaseObject.js";
+
+export default class Fields extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        await aEncodingSession.outputController.requireRole("admin");
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        let fields = await object.getAllFieldTranslations();
+        returnObject["fields/translations"] = fields;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/admin/index.js

@@ -1,2 +1,3 @@
 export {default as Fields} from "./Fields.js";
-export {default as User} from "./User.js";
+export {default as User} from "./User.js";
+export {default as FieldTranslations} from "./FieldTranslations.js";

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

@@ -22,5 +22,9 @@ export {default as Location} from "./Location.js";
 export {default as AtLocation} from "./AtLocation.js";
 export {default as LinkPreview} from "./LinkPreview.js";
 export {default as PublishDate} from "./PublishDate.js";
+export {default as SingleRelation} from "./SingleRelation.js";
+export {default as TranslatedTitle} from "./TranslatedTitle.js";
+export {default as TranslatedName} from "./TranslatedName.js";
+export {default as TranslationGroup} from "./TranslationGroup.js";
 
 export * as admin from "./admin/index.js";

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

@@ -45,14 +45,26 @@ export default class ExternalTaskRunner extends Dbm.core.BaseObject {
 
             let response = await fetch(this.item.url, requestData);
 
-            let data = await response.json();
+            let responseText = await response.text();
 
-            let continueData = Dbm.objectPath(data, this.item.continueField);
-            console.log(this.item.name + " " + continueData);
+            let data = null;
+            try {
+                data = JSON.parse(responseText);
+            }
+            catch(theError) {
+                console.error(theError);
+                console.log(responseText);
+            }
+            
+            if(data) {
+                let continueData = Dbm.objectPath(data, this.item.continueField);
+                console.log(this.item.name + " " + continueData);
 
-            if(continueData > 0) {
-                runDirect = true;
+                if(continueData > 0) {
+                    runDirect = true;
+                }
             }
+            
         }
         catch(theError) {
             console.log(theError);