pathchain 1.0.39 → 1.0.41

package/getter.js

@@ -188,6 +188,42 @@ function getNodeObj(xnode, xauthor) {
 }
 
 
+/** getNodelinkObj
+ * [Function that recieves a nodelink hash and returns the nodelink object]
+ * 
+ * @param {string} xnodelink (required)
+ * 
+ * @return void
+ */
+function getNodelinkObj(xnodelink, xauthor) {
+
+    if(xauthor != ""){
+        xauthor = xauthor + '/';
+    }
+
+    // LOADING PB
+    var nodelink_pb = pb(fs.readFileSync('node_modules/pathchain/proto/nodelink.proto'))
+    
+    // NOT FOUND EXCEPTION
+    var fileContents;
+    try {
+        fileContents = fs.readFileSync("files/" + xauthor + "nodelinks/" + xnodelink);
+    } catch (err) {
+        if (err.code === 'ENOENT') {
+            return "Nodelink not found";
+        } else {
+            throw err;
+        }
+    }
+
+    // DECODING NODE
+    var nodelink_enc = fileContents
+    var nodelink_obj = nodelink_pb.nodelink.decode(nodelink_enc)
+
+    return nodelink_obj;
+}
+
+
 /** getPathObj
  * [Function that recieves a path hash and returns the path object]
  * 
@@ -224,50 +260,86 @@ function getPathObj(xpath, xauthor) {
 }
 
 
-/** getLabelObj
- * [Function that recieves a label hash and returns the label object]
+/** getPathlinkObj
+ * [Function that recieves a pathlink hash and returns the pathlink object]
  * 
- * @param {string} xlabel (required)
+ * @param {string} xpathlink (required)
  * 
  * @return void
  */
-function getLabelObj(xlabel, xauthor) {
+function getPathlinkObj(xpathlink, xauthor) {
 
     if(xauthor != ""){
         xauthor = xauthor + '/';
     }
 
     // LOADING PB
-    var label_pb = pb(fs.readFileSync('node_modules/pathchain/proto/label.proto'))
+    var pathlink_pb = pb(fs.readFileSync('node_modules/pathchain/proto/pathlink.proto'))
     
     // NOT FOUND EXCEPTION
     var fileContents;
     try {
-        fileContents = fs.readFileSync("files/" + xauthor + "labels/" + xlabel);
+        fileContents = fs.readFileSync("files/" + xauthor + "pathlinks/" + xpathlink);
     } catch (err) {
         if (err.code === 'ENOENT') {
-            return "Label not found";
+            return "Pathlink not found";
         } else {
             throw err;
         }
     }
 
     // DECODING NODE
-    var label_enc = fileContents
-    var label_obj = label_pb.label.decode(label_enc)
+    var pathlink_enc = fileContents
+    var pathlink_obj = pathlink_pb.pathlink.decode(pathlink_enc)
 
-    return label_obj;
+    return pathlink_obj;
 }
 
 
-/** getNodelinkObj
+/** getTreeObj
+ * [Function that recieves a tree hash and returns the tree object]
+ * 
+ * @param {string} xtree (required)
+ * 
+ * @return void
+ */
+function getTreeObj(xtree, xauthor) {
+
+    if(xauthor != ""){
+        xauthor = xauthor + '/';
+    }
+
+    // LOADING PB
+    var tree_pb = pb(fs.readFileSync('node_modules/pathchain/proto/tree.proto'))
+    
+    // NOT FOUND EXCEPTION
+    var fileContents;
+    try {
+        fileContents = fs.readFileSync("files/" + xauthor + "trees/" + xtree);
+    } catch (err) {
+        if (err.code === 'ENOENT') {
+            return "Tree not found";
+        } else {
+            throw err;
+        }
+    }
+
+    // DECODING NODE
+    var tree_enc = fileContents
+    var tree_obj = tree_pb.tree.decode(tree_enc)
+
+    return tree_obj;
+}
+
+
+/** getTreelinkObj
  * [Function that recieves a nodelink hash and returns the nodelink object]
  * 
  * @param {string} xnodelink (required)
  * 
  * @return void
  */
-function getNodelinkObj(xnodelink, xauthor) {
+function getTreelinkObj(xnodelink, xauthor) {
 
     if(xauthor != ""){
         xauthor = xauthor + '/';
@@ -282,7 +354,7 @@ function getNodelinkObj(xnodelink, xauthor) {
         fileContents = fs.readFileSync("files/" + xauthor + "nodelinks/" + xnodelink);
     } catch (err) {
         if (err.code === 'ENOENT') {
-            return "Nodelink not found";
+            return "Treelink not found";
         } else {
             throw err;
         }
@@ -295,4 +367,41 @@ function getNodelinkObj(xnodelink, xauthor) {
     return nodelink_obj;
 }
 
-module.exports = { getCurrentDate, getMomentObj, getPioneerObj, getSecretObj, getEntityObj, getNodeObj, getPathObj, getLabelObj, getNodelinkObj }
+
+/** getLabelObj
+ * [Function that recieves a label hash and returns the label object]
+ * 
+ * @param {string} xlabel (required)
+ * 
+ * @return void
+ */
+function getLabelObj(xlabel, xauthor) {
+
+    if(xauthor != ""){
+        xauthor = xauthor + '/';
+    }
+
+    // LOADING PB
+    var label_pb = pb(fs.readFileSync('node_modules/pathchain/proto/label.proto'))
+    
+    // NOT FOUND EXCEPTION
+    var fileContents;
+    try {
+        fileContents = fs.readFileSync("files/" + xauthor + "labels/" + xlabel);
+    } catch (err) {
+        if (err.code === 'ENOENT') {
+            return "Label not found";
+        } else {
+            throw err;
+        }
+    }
+
+    // DECODING NODE
+    var label_enc = fileContents
+    var label_obj = label_pb.label.decode(label_enc)
+
+    return label_obj;
+}
+
+
+module.exports = { getCurrentDate, getMomentObj, getPioneerObj, getSecretObj, getEntityObj, getNodeObj, getNodelinkObj, getPathObj, getPathlinkObj, getTreeObj, getTreelinkObj, getLabelObj }

package/index.js

@@ -107,6 +107,7 @@ exports.getEntityObj = (xentity, xauthor="") => {
     return entity_object;
 }
 
+
 ////////////////
 ///  SECRET  ///
 ////////////////
@@ -182,6 +183,33 @@ exports.getNodeObj = (xnode, xauthor="") => {
 }
 
 
+///////////////////////
+///     NODELINK    ///
+///////////////////////
+
+/** makeNodelink
+ * [Nodelink maker]
+ * 
+ * @return {string} nodelink_buffer
+ */
+exports.makeNodelink = (first="", second="", xauthor = "", ancestor = "", format = 'MM DD YYYY HH:mm:SSS [GMT]Z') => {
+    const nodelink_buffer = maker.nodelink(first, second, xauthor, ancestor, format);
+    return nodelink_buffer;
+}
+
+/** getNodelinkObj
+ * [Function that recieves a nodelink hash and returns the nodelink object]
+ * 
+ * @param {string} xnodelink (required)
+ * 
+ * @return {obj} nodelink_object (nodelink object)
+ */
+exports.getNodelinkObj = (xnodelink, xauthor="") => {
+    const nodelink_object = getter.getNodelinkObj(xnodelink, xauthor);
+    return nodelink_object;
+}
+
+
 //////////////////
 ///    PATH    ///
 //////////////////
@@ -209,6 +237,87 @@ exports.getPathObj = (xpath, xauthor="") => {
 }
 
 
+///////////////////////
+///     PATHLINK    ///
+///////////////////////
+
+/** makePathlink
+ * [Pathlink maker]
+ * 
+ * @return {string} pathlink_buffer
+ */
+exports.makePathlink = (first="", second="", xauthor = "", ancestor = "", format = 'MM DD YYYY HH:mm:SSS [GMT]Z') => {
+    const pathlink_buffer = maker.pathlink(first, second, xauthor, ancestor, format);
+    return pathlink_buffer;
+}
+
+/** getPathlinkObj
+ * [Function that recieves a pathlink hash and returns the pathlink object]
+ * 
+ * @param {string} xpathlink (required)
+ * 
+ * @return {obj} pathlink_object (pathlink object)
+ */
+exports.getPathlinkObj = (xpathlink, xauthor="") => {
+    const pathlink_object = getter.getPathlinkObj(xpathlink, xauthor);
+    return pathlink_object;
+}
+
+
+//////////////////
+///    TREE    ///
+//////////////////
+
+/** makeTree
+ * [Tree maker]
+ * 
+ * @return {string} tree_buffer
+ */
+exports.makeTree = (text ="", head="", xauthor = "", ancestor="", format = 'MM DD YYYY HH:mm:SSS [GMT]Z') => {
+    const tree_buffer = maker.tree(text, head, xauthor, ancestor, format);
+    return tree_buffer;
+}
+
+/** getTreeObj
+ * [Function that recieves a tree hash and returns the tree object]
+ * 
+ * @param {string} xtree (required)
+ * 
+ * @return {obj} tree_object (tree object)
+ */
+exports.getTreeObj = (xtree, xauthor="") => {
+    const tree_object = getter.getTreeObj(xtree, xauthor);
+    return tree_object;
+}
+
+
+///////////////////////
+///     TREELINK    ///
+///////////////////////
+
+/** makeTreelink
+ * [Treelink maker]
+ * 
+ * @return {string} treelink_buffer
+ */
+exports.makeTreelink = (first="", second="", xauthor = "", ancestor = "", format = 'MM DD YYYY HH:mm:SSS [GMT]Z') => {
+    const treelink_buffer = maker.treelink(first, second, xauthor, ancestor, format);
+    return treelink_buffer;
+}
+
+/** getTreelinkObj
+ * [Function that recieves a treelink hash and returns the treelink object]
+ * 
+ * @param {string} xtreelink (required)
+ * 
+ * @return {obj} treelink_object (treelink object)
+ */
+exports.getTreelinkObj = (xtreelink, xauthor="") => {
+    const treelink_object = getter.getTreelinkObj(xtreelink, xauthor);
+    return treelink_object;
+}
+
+
 ////////////////////
 ///     LABEL    ///
 ////////////////////
@@ -235,29 +344,3 @@ exports.getLabelObj = (xlabel, xauthor="") => {
     return label_object;
 }
 
-///////////////////////
-///     NODELINK    ///
-///////////////////////
-
-/** makeNodelink
- * [Nodelink maker]
- * 
- * @return {string} nodelink_buffer
- */
-exports.makeNodelink = (first="", second="", xauthor = "", ancestor = "", format = 'MM DD YYYY HH:mm:SSS [GMT]Z') => {
-    const nodelink_buffer = maker.nodelink(first, second, xauthor, ancestor, format);
-    return nodelink_buffer;
-}
-
-/** getNodelinkObj
- * [Function that recieves a nodelink hash and returns the nodelink object]
- * 
- * @param {string} xnodelink (required)
- * 
- * @return {obj} nodelink_object (nodelink object)
- */
-exports.getNodelinkObj = (xnodelink, xauthor="") => {
-    const nodelink_object = getter.getNodelinkObj(xnodelink, xauthor);
-    return nodelink_object;
-}
-

package/maker.js

@@ -248,8 +248,57 @@ function node(text, author, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
 }
 
 
+/** nodelink
+ * [Label Protocol Buffer Creation]
+ * 
+ * @param {string} author (optional, default=pioneer_hash)
+ * @param {string} file   (optional)
+ * @param {string} str    (optional)
+ * @param {string} format (required)
+ * 
+ * @return {string} nodelink_hash
+ */
+function nodelink(first, second, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
+    var nodelink_pb = pb(fs.readFileSync('node_modules/pathchain/proto/nodelink.proto'))
+
+    if(first == "" || second == "") return "Two nodes are required to create a nodelink";
+
+    var author_folder = author; 
+    if(author == ""){
+        author = pioneer();
+        author_folder = "";
+    }else{
+        author_folder = author_folder + '/';
+    }
+
+    var register = new Date()
+    register = dt.format(register, dt.compile(format, true));
+
+    var register_moment_hash = moment(register, 0, 0, 0, 0, 0, format)
+    
+    var nodelink_hash = sha256(register_moment_hash + "_" + author);
+
+    if(ancestor == ""){
+        ancestor = nodelink_hash;        
+    }
+    
+    var buffer = nodelink_pb.nodelink.encode({
+        register: "moments/" + register_moment_hash,
+        author: "etities/" + author,
+        first: "nodes/" + first,
+        second: "nodes/" + second,
+        ancestor: author_folder + "nodelinks/" + ancestor,
+        tag: author_folder + "nodelinks/" + nodelink_hash
+    })
 
-/**
+    checker.checkDir("files/" + author_folder + "nodelinks/") // checking
+    fs.writeFileSync("files/" + author_folder + "nodelinks/" + nodelink_hash, buffer);
+    
+    return nodelink_hash;
+}
+
+
+/** path
 * [Pioneer Protocol Buffer Creation]
 * 
 * @param {string} author (optional, default=pioneer_hash)
@@ -294,11 +343,11 @@ function path(text, head, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]
    checker.checkDir("files/" + author_folder + "paths/") // checking
    fs.writeFileSync("files/" + author_folder + "paths/" + path_hash, buffer);
    
-   return author_folder + "/paths/" + path_hash;
+   return path_hash;
 }
 
 
-/** label
+/** pathlink
  * [Label Protocol Buffer Creation]
  * 
  * @param {string} author (optional, default=pioneer_hash)
@@ -306,10 +355,12 @@ function path(text, head, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]
  * @param {string} str    (optional)
  * @param {string} format (required)
  * 
- * @return {string} label_hash
+ * @return {string} pathlink_hash
  */
-function label(text, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
-    var label_pb = pb(fs.readFileSync('node_modules/pathchain/proto/label.proto'))
+function pathlink(first, second, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
+    var pathlink_pb = pb(fs.readFileSync('node_modules/pathchain/proto/pathlink.proto'))
+
+    if(first == "" || second == "") return "Two paths are required to create a pathlink";
 
     var author_folder = author; 
     if(author == ""){
@@ -324,27 +375,78 @@ function label(text, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
 
     var register_moment_hash = moment(register, 0, 0, 0, 0, 0, format)
     
-    var label_hash = sha256(register_moment_hash + "_" + author);
+    var pathlink_hash = sha256(register_moment_hash + "_" + author);
 
     if(ancestor == ""){
-        ancestor = label_hash;        
+        ancestor = pathlink_hash;        
     }
     
-    var buffer = label_pb.label.encode({
+    var buffer = pathlink_pb.pathlink.encode({
         register: "moments/" + register_moment_hash,
         author: "etities/" + author,
-        text: text,
-        ancestor: author_folder + "labels/" + ancestor,
-        tag: author_folder + "labels/" + label_hash
+        first: "paths/" + first,
+        second: "paths/" + second,
+        ancestor: author_folder + "pathlinks/" + ancestor,
+        tag: author_folder + "pathlinks/" + pathlink_hash
     })
 
-    checker.checkDir("files/" + author_folder + "labels/") // checking
-    fs.writeFileSync("files/" + author_folder + "labels/" + label_hash, buffer);
+    checker.checkDir("files/" + author_folder + "pathlinks/") // checking
+    fs.writeFileSync("files/" + author_folder + "pathlinks/" + pathlink_hash, buffer);
     
-    return label_hash;
+    return pathlink_hash;
 }
 
-/** nodelink
+
+/** tree
+* [Pioneer Protocol Buffer Creation]
+* 
+* @param {string} author (optional, default=pioneer_hash)
+* @param {string} text   (optional, default=tree_hash)
+* @param {string} head   (required)
+* @param {string} ancestor (optional, default=tree_hash)
+* @param {string} format (required)
+* 
+* @return {string} tree_hash
+*/
+function tree(text, head, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
+    var tree_pb = pb(fs.readFileSync('node_modules/pathchain/proto/tree.proto'))
+ 
+    var author_folder = author;
+    if(author == ""){
+         author = pioneer();
+         author_folder = "";
+    }else{
+         author_folder = author_folder + '/';
+    }
+ 
+    var register = new Date()
+    register = dt.format(register, dt.compile(format, true));
+ 
+    var register_moment_hash = moment(register, 0, 0, 0, 0, 0, format)
+ 
+    var tree_hash = sha256(register_moment_hash + "_" + author);
+    
+    if(text == ""){ text = tree_hash; }
+    if(head == ""){ return "Head node_link is required to create a tree!" }
+    if(ancestor == ""){ ancestor = tree_hash; }
+ 
+    var buffer = tree_pb.tree.encode({
+        register: "moments/"+register_moment_hash,
+        author: author,
+        text: text,
+        head: "nodelinks/" + head,
+        ancestor: author_folder + "trees/" + ancestor,
+        tag: author_folder + "trees/" + tree_hash,
+    })
+ 
+    checker.checkDir("files/" + author_folder + "trees/") // checking
+    fs.writeFileSync("files/" + author_folder + "trees/" + tree_hash, buffer);
+    
+    return tree_hash;
+}
+
+
+/** treelink
  * [Label Protocol Buffer Creation]
  * 
  * @param {string} author (optional, default=pioneer_hash)
@@ -352,12 +454,12 @@ function label(text, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
  * @param {string} str    (optional)
  * @param {string} format (required)
  * 
- * @return {string} nodelink_hash
+ * @return {string} treelink_hash
  */
-function nodelink(first, second, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
-    var nodelink_pb = pb(fs.readFileSync('node_modules/pathchain/proto/nodelink.proto'))
+function treelink(first, second, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
+    var treelink_pb = pb(fs.readFileSync('node_modules/pathchain/proto/treelink.proto'))
 
-    if(first == "" || second == "") return "Two nodes are required to create a nodelink";
+    if(first == "" || second == "") return "Two trees are required to create a treelink";
 
     var author_folder = author; 
     if(author == ""){
@@ -372,26 +474,73 @@ function nodelink(first, second, author, ancestor, format = 'MM DD YYYY HH:mm:SS
 
     var register_moment_hash = moment(register, 0, 0, 0, 0, 0, format)
     
-    var nodelink_hash = sha256(register_moment_hash + "_" + author);
+    var treelink_hash = sha256(register_moment_hash + "_" + author);
 
     if(ancestor == ""){
-        ancestor = nodelink_hash;        
+        ancestor = treelink_hash;        
     }
     
-    var buffer = nodelink_pb.nodelink.encode({
+    var buffer = treelink_pb.treelink.encode({
         register: "moments/" + register_moment_hash,
         author: "etities/" + author,
-        first: "nodes/" + first,
-        second: "nodes/" + second,
-        ancestor: author_folder + "nodelinks/" + ancestor,
-        tag: author_folder + "nodelinks/" + nodelink_hash
+        first: "trees/" + first,
+        second: "trees/" + second,
+        ancestor: author_folder + "treelinks/" + ancestor,
+        tag: author_folder + "treelinks/" + treelink_hash
     })
 
-    checker.checkDir("files/" + author_folder + "nodelinks/") // checking
-    fs.writeFileSync("files/" + author_folder + "nodelinks/" + nodelink_hash, buffer);
+    checker.checkDir("files/" + author_folder + "treelinks/") // checking
+    fs.writeFileSync("files/" + author_folder + "treelinks/" + treelink_hash, buffer);
     
-    return nodelink_hash;
+    return treelink_hash;
+}
+
+
+/** label
+ * [Label Protocol Buffer Creation]
+ * 
+ * @param {string} author (optional, default=pioneer_hash)
+ * @param {string} file   (optional)
+ * @param {string} str    (optional)
+ * @param {string} format (required)
+ * 
+ * @return {string} label_hash
+ */
+function label(text, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') {
+    var label_pb = pb(fs.readFileSync('node_modules/pathchain/proto/label.proto'))
+
+    var author_folder = author; 
+    if(author == ""){
+        author = pioneer();
+        author_folder = "";
+    }else{
+        author_folder = author_folder + '/';
+    }
+
+    var register = new Date()
+    register = dt.format(register, dt.compile(format, true));
+
+    var register_moment_hash = moment(register, 0, 0, 0, 0, 0, format)
+    
+    var label_hash = sha256(register_moment_hash + "_" + author);
+
+    if(ancestor == ""){
+        ancestor = label_hash;        
+    }
+    
+    var buffer = label_pb.label.encode({
+        register: "moments/" + register_moment_hash,
+        author: "etities/" + author,
+        text: text,
+        ancestor: author_folder + "labels/" + ancestor,
+        tag: author_folder + "labels/" + label_hash
+    })
+
+    checker.checkDir("files/" + author_folder + "labels/") // checking
+    fs.writeFileSync("files/" + author_folder + "labels/" + label_hash, buffer);
+    
+    return label_hash;
 }
 
 
-module.exports = { moment, pioneer, secret, entity, node, path, label, nodelink }
+module.exports = { moment, pioneer, secret, entity, node, nodelink, path, pathlink, tree, treelink, label }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pathchain",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "dependencies": {
     "date-and-time": "^3.0.2",
     "empty-dir": "^3.0.0",