pathchain 1.1.12 → 1.1.14

package/getter.js

@@ -155,6 +155,78 @@ function getLabelObj(xlabel, xauthor = '') {
     }
 }
 
+
+/**
+ * Retrieves and decodes a address object from a file.
+ * @param {string} xaddress - The address string.
+ * @returns {Object|string} The decoded object or an error message.
+ */
+function getObj(xaddress) {
+    // const labelProto = pb(fs.readFileSync('node_modules/pathchain/proto/label.proto'));
+    const filePath = `files/${xaddress}`;
+    
+    var splitted_address = target.split("/");
+    console.log("Splitted address: ", splitted_target);
+    obj_type = splitted_address[splitted_address.length - 2];
+    console.log("Object type: ", obj_type);
+
+    try {
+        const fileContents = fs.readFileSync(filePath);
+        switch (obj_type) {
+            case "entities":
+                const entityProto = pb(fs.readFileSync('node_modules/pathchain/proto/entity.proto'));
+                return entityProto.entity.decode(fileContents);
+            case "labels":
+                const labelProto = pb(fs.readFileSync('node_modules/pathchain/proto/label.proto'));
+                return labelProto.label.decode(fileContents);
+            case "links":
+                const linkProto = pb(fs.readFileSync('node_modules/pathchain/proto/link.proto'));
+                return linkProto.link.decode(fileContents);
+            case "moments":
+                const momentProto = pb(fs.readFileSync('node_modules/pathchain/proto/moment.proto'));
+                return momentProto.moment.decode(fileContents);
+            case "nodes":
+                const nodeProto = pb(fs.readFileSync('node_modules/pathchain/proto/node.proto'));
+                return nodeProto.node.decode(fileContents);
+            case "paths":
+                const pathProto = pb(fs.readFileSync('node_modules/pathchain/proto/path.proto'));
+                return pathProto.path.decode(fileContents);
+            case "secrets":
+                const secretProto = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'));
+                return secretProto.secret.decode(fileContents);
+        }        
+    }
+    catch (err) {
+        return err.code === 'ENOENT' ? "Element not found" : err;
+    }
+}
+
+/**
+ * Retrieves and decodes a path object from a file.
+ * @param {string} xpath - The path hash.
+ * @param {string} xauthor - The author of the path (optional).
+ * @returns {Object|string} The decoded path object or an error message.
+ */
+function getPathChainObj(xpath, xauthor = '') {
+    const pathProto = pb(fs.readFileSync('node_modules/pathchain/proto/path.proto'));
+    const filePath = `files/${xauthor ? xauthor + '/' : ''}paths/${xpath}`;
+    
+    try {
+        const fileContents = fs.readFileSync(filePath);
+        var pathObj =  pathProto.path.decode(fileContents);
+
+        var current_link = this.getObj(pathObj.head);
+        console.log("Current link", current_link);
+        var current_obj = this.getObj(current_link.target);
+        console.log("Current object", current_obj);
+        // Get link -> get link.target
+        return pathObj;
+    } catch (err) {
+        return err.code === 'ENOENT' ? "Path not found" : err;
+    }
+}
+
+
 module.exports = {
     getCurrentDate,
     getMomentObj,
@@ -164,5 +236,7 @@ module.exports = {
     getNodeObj,
     getLinkObj,
     getPathObj,
-    getLabelObj
+    getLabelObj,
+    getObj,
+    getPathChainObj
 };

package/index.js

@@ -236,6 +236,18 @@ exports.getPathObj = (xpath, xauthor="") => {
     return path_object;
 }
 
+/** getPathChainObj
+ * [Function that recieves a path hash and returns the path object]
+ * 
+ * @param {string} xpath (required)
+ * 
+ * @return {obj} path_object (path object)
+ */
+exports.getPathChainObj = (xpath, xauthor="") => {
+    const path_object = getter.getPathChainObj(xpath, xauthor);
+    return path_object;
+}
+
 ////////////////////
 ///     LABEL    ///
 ////////////////////
@@ -262,3 +274,15 @@ exports.getLabelObj = (xlabel, xauthor="") => {
     return label_object;
 }
 
+/** getObj
+ * [Function that recieves a path hash and returns the path object]
+ * 
+
+ * Retrieves and decodes a address object from a file.
+ * @param {string} xaddress - The address string.
+ * @returns {Object|string} The decoded object or an error message.
+ */
+exports.getObj = (xaddress) => {
+    const pathchain_object = getter.getObj(xaddress);
+    return pathchain_object;
+}

package/maker.js

@@ -229,9 +229,11 @@ function path(text, elements, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [
     if (text == "") { text = path_hash; }
  
     let prev_link = "";
+    let head_link = "";
     // Building target chain
     for (let i = 0; i < elements.length; i++) {
         const current_link = link(elements[i], "", "", author, "");
+        if(i==0) head_link = current_link;
         if (i > 0) {
             updater.setLinkNext(prev_link, current_link);
             updater.setLinkPrev(current_link, prev_link);
@@ -245,7 +247,7 @@ function path(text, elements, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [
         register: `moments/${register_moment_hash}`,
         author: author,
         text: text,
-        head: `${prev_link}`,
+        head: `${head_link}`,
         ancestor: `${author_folder}paths/${ancestor}`,
         tag: `${author_folder}paths/${path_hash}`,
     });

package/package.json

@@ -34,5 +34,5 @@
   "deprecated": false,
   "description": "![image](https://user-images.githubusercontent.com/104391124/282268780-cbbc1ee6-8d97-4d80-b896-66ae3eb723dd.png)",
   "name": "pathchain",
-  "version": "1.1.12"
+  "version": "1.1.14"
 }

package/updater.js

@@ -1,149 +1,89 @@
-var fs = require("fs");
-var pb = require('protocol-buffers');
-const getter = require("./getter");
-
-/** useSecret
- * [Function that changes a secret state to used]
- * 
- * @param {string} xsecret
- * 
- * @return {string} xsecret
+const fs = require('fs');
+const pb = require('protocol-buffers');
+const getter = require('./getter');
+
+/**
+ * Changes a secret's state to used and associates it with a user.
+ * @param {string} xsecret - The secret hash.
+ * @param {string} [xauthor=''] - The author of the secret (optional).
+ * @returns {Object|string} The updated secret object or an error message.
  */
-function useSecret(xsecret, xauthor = "") {
-    let author_folder = xauthor;
-    if (xauthor == "") {
+function useSecret(xsecret, xauthor = '') {
+    if (!xauthor) {
         xauthor = pioneer(getter.getCurrentDate(), 'MM DD YYYY HH:mm:SSS [GMT]Z');
-        author_folder = "";
-    } else {
-        author_folder = `${author_folder}/`;
     }
 
-    // LOADING PB
-    var secret_pb = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'))
-    
-    // NOT FOUND EXCEPTION
-    var fileContents;
-    try {
-        fileContents = fs.readFileSync("files/secrets/" + xsecret);
-    } catch (err) {
-        if (err.code === 'ENOENT') {
-            return "Secret '" + xsecret + "' not found";
-        } else {
-            throw err;
-        }
-    }
+    const secretProto = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'));
+    const filePath = `files/secrets/${xsecret}`;
 
-    // DECODING SECRET
-    var secret_enc = fileContents
-    var secret_obj = secret_pb.secret.decode(secret_enc)
+    try {
+        const fileContents = fs.readFileSync(filePath);
+        const secretObj = secretProto.secret.decode(fileContents);
 
-    if(secret_obj.used == false){
-        // USING INVITE SECRET
-        secret_obj.used = true;
-        secret_obj.user = "entities/"+xauthor;
+        if (!secretObj.used) {
+            secretObj.used = true;
+            secretObj.user = `entities/${xauthor}`;
+            fs.writeFileSync(filePath, secretProto.secret.encode(secretObj));
+        }
 
-        // Public handling only >:c
-        fs.writeFileSync("files/secrets/" + xsecret, secret_pb.secret.encode(secret_obj));
+        return secretObj;
+    } catch (err) {
+        return err.code === 'ENOENT' ? `Secret '${xsecret}' not found` : err;
     }
-    return secret_obj;
 }
 
-
-/** setLinkNext
- * [Function that updates the 'next' pointer of a link]
- * 
- * @param {string} xlink
- * @param {string} xnextlink
- * 
- * @return {string} xlink
+/**
+ * Updates the 'next' pointer of a link.
+ * @param {string} xlink - The current link hash.
+ * @param {string} xnextlink - The next link hash.
+ * @returns {Object|string} The updated link object or an error message.
  */
-function setLinkNext(xlink = "", xnextlink = "") {
-    console.log("Setting link: ", xnextlink);
-    console.log("As prev link for: ", xlink);
+function setLinkNext(xlink = '', xnextlink = '') {
+    console.log('Setting link:', xnextlink);
+    console.log('As NEXT link for:', xlink);
 
-    // LOADING PB
-    var link_pb = pb(fs.readFileSync('node_modules/pathchain/proto/link.proto'))
-    
-    // EXCEPTIONS FOR NOT FOUND LINKS
-    var fileContents;
+    const linkProto = pb(fs.readFileSync('node_modules/pathchain/proto/link.proto'));
 
-    // NOT FOUND EXCEPTION FOR 'xlink'
     try {
-        fileContents = fs.readFileSync("files/" + xlink);
-    } catch (err) {
-        if (err.code === 'ENOENT') {
-            return "Link '" + xlink + "' not found";
-        } else {
-            throw err;
-        }
-    }
+        // Check if both links exist
+        fs.readFileSync(`files/${xlink}`);
+        fs.readFileSync(`files/${xnextlink}`);
 
-    // NOT FOUND EXCEPTION FOR 'xnextlink'
-    try {
-        fileContents = fs.readFileSync("files/" + xnextlink);
+        const fileContents = fs.readFileSync(`files/${xlink}`);
+        const linkObj = linkProto.link.decode(fileContents);
+        linkObj.next = xnextlink;
+
+        return linkObj;
     } catch (err) {
-        if (err.code === 'ENOENT') {
-            return "Link '" + xnextlink + "' not found";
-        } else {
-            throw err;
-        }
+        return err.code === 'ENOENT' ? `Link '${err.path.split('/').pop()}' not found` : err;
     }
-
-    // DECODING LINK
-    var link_enc = fileContents
-    var link_obj = link_pb.link.decode(link_enc)
-
-    link_obj.next = xnextlink;
-    return link_obj;
 }
 
-
-/** setLinkPrev
- * [Function that updates the 'previous' pointer of a link]
- * 
- * @param {string} xlink
- * @param {string} xprevlink
- * 
- * @return {string} xlink
+/**
+ * Updates the 'previous' pointer of a link.
+ * @param {string} xlink - The current link hash.
+ * @param {string} xprevlink - The previous link hash.
+ * @returns {Object|string} The updated link object or an error message.
  */
-function setLinkPrev(xlink = "", xprevlink = "") {
-    console.log("Setting link: ", xprevlink);
-    console.log("As prev link for: ", xlink);
+function setLinkPrev(xlink = '', xprevlink = '') {
+    console.log('Setting link:', xprevlink);
+    console.log('As PREV link for:', xlink);
 
-    // LOADING PB
-    var link_pb = pb(fs.readFileSync('node_modules/pathchain/proto/link.proto'))
-    
-    // EXCEPTIONS FOR NOT FOUND LINKS
-    var fileContents;
+    const linkProto = pb(fs.readFileSync('node_modules/pathchain/proto/link.proto'));
 
-    // NOT FOUND EXCEPTION FOR 'xlink'
     try {
-        fileContents = fs.readFileSync("files/" + xlink);
-    } catch (err) {
-        if (err.code === 'ENOENT') {
-            return "Link '" + xlink + "' not found";
-        } else {
-            throw err;
-        }
-    }
+        // Check if both links exist
+        fs.readFileSync(`files/${xlink}`);
+        fs.readFileSync(`files/${xprevlink}`);
 
-    // NOT FOUND EXCEPTION FOR 'xprevlink'
-    try {
-        fileContents = fs.readFileSync("files/" + xprevlink);
+        const fileContents = fs.readFileSync(`files/${xlink}`);
+        const linkObj = linkProto.link.decode(fileContents);
+        linkObj.prev = xprevlink;
+
+        return linkObj;
     } catch (err) {
-        if (err.code === 'ENOENT') {
-            return "Link '" + xprevlink + "' not found";
-        } else {
-            throw err;
-        }
+        return err.code === 'ENOENT' ? `Link '${err.path.split('/').pop()}' not found` : err;
     }
-
-    // DECODING LINK
-    var link_enc = fileContents
-    var link_obj = link_pb.link.decode(link_enc)
-
-    link_obj.prev = xprevlink;
-    return link_obj;
 }
 
-module.exports = { useSecret, setLinkNext, setLinkPrev }
+module.exports = { useSecret, setLinkNext, setLinkPrev };

package/proto/pathlink.proto

@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-message pathlink {
-    required string register = 1;
-    required string author = 2;
-    required string ancestor = 3;
-    required string first = 4;
-    required string second = 5;
-    required string tag = 6;
-}

package/proto/tree.proto

@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-message tree {
-    required string register = 1;
-    required string author = 2;
-    required string text = 3;
-    required string head = 4;
-    required string ancestor = 5;
-    optional string chain = 6;
-    required string tag = 7;
-}

package/proto/treelink.proto

@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-message treelink {
-    required string register = 1;
-    required string author = 2;
-    required string ancestor = 3;
-    required string first = 4;
-    required string second = 5;
-    required string tag = 6;
-}