pathchain 1.1.8 → 1.1.10

package/maker.js

@@ -313,6 +313,15 @@ function link(target, prev, next, author, ancestor, format = 'MM DD YYYY HH:mm:S
     const link_pb = pb(fs.readFileSync('node_modules/pathchain/proto/link.proto'));
     var target_type = "";
 
+    // Handle author and author folder
+    let author_folder = author; 
+    if (author === "") {
+        author = pioneer(getter.getCurrentDate(), 'MM DD YYYY HH:mm:SSS [GMT]Z');
+        author_folder = "";
+    } else {
+        author_folder = `${author_folder}/`;
+    }
+
     // Validate target
     if (target === "") {
         return "The link must be linking something. The target cannot be null.";
@@ -320,8 +329,24 @@ function link(target, prev, next, author, ancestor, format = 'MM DD YYYY HH:mm:S
     else{
         var splitted_target = target.split("/");
         console.log("Splitted target: ", splitted_target);
-        target_type = splitted_target[splitted_target.length - 2];
-        console.log("Target type: ", target_type);
+        if(splitted_target.length>1){
+            target_type = splitted_target[splitted_target.length - 2];
+            console.log("Target type: ", target_type);
+        }
+        else{
+            // Determine the nature of the target (node, path, or label)
+            if (checker.checkFile(`files/${author_folder}nodes/${target}`)) {
+                target_type = "nodes";
+                target = `${author_folder}nodes/${target}`;
+            } else if (checker.checkFile(`files/${author_folder}paths/${target}`)) {
+                target_type = "paths";
+                target = `${author_folder}paths/${target}`;
+            } else if (checker.checkFile(`files/${author_folder}labels/${target}`)) {
+                target_type = "labels";
+                target = `${author_folder}labels/${target}`;
+            }
+            console.log("Target type determined for single buffer: ", target_type);
+        }
     }
 
     // Homogenize the author.
@@ -329,27 +354,19 @@ function link(target, prev, next, author, ancestor, format = 'MM DD YYYY HH:mm:S
     // Make a copy of it inside *author* address if it is not public or if the original author is different than *author*
     // What the fuck 
 
-    // Handle author and author folder
-    let author_folder = author; 
-    if (author === "") {
-        author = pioneer(getter.getCurrentDate(), 'MM DD YYYY HH:mm:SSS [GMT]Z');
-        author_folder = "";
-    } else {
-        author_folder = `${author_folder}/`;
-    }
-
     // Create a moment for this link
     const register = dt.format(new Date(), dt.compile(format, true));
     const register_moment_hash = moment(register, 0, 0, 0, 0, 0, format);
     
-    // Generate a unique hash for this link
-    const link_hash = sha256(`${register_moment_hash}_${author}_${prev}_${next}`);
 
     // Set default values if not provided
     if (ancestor === "") { ancestor = link_hash; }
     if (prev === "") { prev = link_hash; }
     if (next === "") { next = link_hash; }
     
+    // Generate a unique hash for this link
+    const link_hash = sha256(`${register_moment_hash}_${author}_${prev}_${next}`);
+    
     if (!checker.checkFile(`files/${target}`)) {
         return "Target was not found!";
     }
@@ -358,8 +375,8 @@ function link(target, prev, next, author, ancestor, format = 'MM DD YYYY HH:mm:S
     const buffer = link_pb.link.encode({
         register: `moments/${register_moment_hash}`,
         author: `entities/${author}`,
-        prev: `links/${prev}`,
-        next: `links/${next}`,
+        prev: `${author_folder}links/${prev}`,
+        next: `${author_folder}links/${next}`,
         target: target,
         ancestor: `${author_folder}links/${ancestor}`,
         tag: `${author_folder}links/${link_hash}`
@@ -369,7 +386,7 @@ function link(target, prev, next, author, ancestor, format = 'MM DD YYYY HH:mm:S
     checker.checkDir(`files/${author_folder}links/`);
     fs.writeFileSync(`files/${author_folder}links/${link_hash}`, buffer);
     
-    return link_hash;
+    return `${author_folder}links/${link_hash}`;
 }
 
 module.exports = { moment, pioneer, secret, entity, node, path, label, link };

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.8"
+  "version": "1.1.10"
 }

package/updater.js

@@ -1,5 +1,6 @@
 var fs = require("fs");
 var pb = require('protocol-buffers');
+const getter = require("./getter");
 
 /** useSecret
  * [Function that changes a secret state to used]
@@ -9,8 +10,12 @@ var pb = require('protocol-buffers');
  * @return {string} xsecret
  */
 function useSecret(xsecret, xauthor = "") {
-    if(xauthor == ""){
-        xauthor = xauthor + '/';
+    let author_folder = xauthor;
+    if (xauthor == "") {
+        xauthor = pioneer(getter.getCurrentDate(), 'MM DD YYYY HH:mm:SSS [GMT]Z');
+        author_folder = "";
+    } else {
+        author_folder = `${author_folder}/`;
     }
 
     // LOADING PB