pathchain 1.1.10 → 1.1.12

package/maker.js

@@ -245,7 +245,7 @@ function path(text, elements, author, ancestor, format = 'MM DD YYYY HH:mm:SSS [
         register: `moments/${register_moment_hash}`,
         author: author,
         text: text,
-        head: `links/${prev_link}`,
+        head: `${prev_link}`,
         ancestor: `${author_folder}paths/${ancestor}`,
         tag: `${author_folder}paths/${path_hash}`,
     });
@@ -349,6 +349,11 @@ function link(target, prev, next, author, ancestor, format = 'MM DD YYYY HH:mm:S
         }
     }
 
+    // Checking target existance
+    if (!checker.checkFile(`files/${target}`)) {
+        return "Target was not found!";
+    }
+
     // Homogenize the author.
     // Break down the target address
     // Make a copy of it inside *author* address if it is not public or if the original author is different than *author*
@@ -358,18 +363,13 @@ function link(target, prev, next, author, ancestor, format = 'MM DD YYYY HH:mm:S
     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!";
-    }
 
     // Encode the link data into a protocol buffer
     const buffer = link_pb.link.encode({

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.10"
+  "version": "1.1.12"
 }

package/updater.js

@@ -58,6 +58,8 @@ function useSecret(xsecret, xauthor = "") {
  * @return {string} xlink
  */
 function setLinkNext(xlink = "", xnextlink = "") {
+    console.log("Setting link: ", xnextlink);
+    console.log("As prev link for: ", xlink);
 
     // LOADING PB
     var link_pb = pb(fs.readFileSync('node_modules/pathchain/proto/link.proto'))
@@ -67,7 +69,7 @@ function setLinkNext(xlink = "", xnextlink = "") {
 
     // NOT FOUND EXCEPTION FOR 'xlink'
     try {
-        fileContents = fs.readFileSync("files/links/" + xlink);
+        fileContents = fs.readFileSync("files/" + xlink);
     } catch (err) {
         if (err.code === 'ENOENT') {
             return "Link '" + xlink + "' not found";
@@ -78,7 +80,7 @@ function setLinkNext(xlink = "", xnextlink = "") {
 
     // NOT FOUND EXCEPTION FOR 'xnextlink'
     try {
-        fileContents = fs.readFileSync("files/links/" + xnextlink);
+        fileContents = fs.readFileSync("files/" + xnextlink);
     } catch (err) {
         if (err.code === 'ENOENT') {
             return "Link '" + xnextlink + "' not found";
@@ -105,6 +107,8 @@ function setLinkNext(xlink = "", xnextlink = "") {
  * @return {string} 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'))
@@ -114,7 +118,7 @@ function setLinkPrev(xlink = "", xprevlink = "") {
 
     // NOT FOUND EXCEPTION FOR 'xlink'
     try {
-        fileContents = fs.readFileSync("files/links/" + xlink);
+        fileContents = fs.readFileSync("files/" + xlink);
     } catch (err) {
         if (err.code === 'ENOENT') {
             return "Link '" + xlink + "' not found";
@@ -125,7 +129,7 @@ function setLinkPrev(xlink = "", xprevlink = "") {
 
     // NOT FOUND EXCEPTION FOR 'xprevlink'
     try {
-        fileContents = fs.readFileSync("files/links/" + xprevlink);
+        fileContents = fs.readFileSync("files/" + xprevlink);
     } catch (err) {
         if (err.code === 'ENOENT') {
             return "Link '" + xprevlink + "' not found";