pathchain 1.0.18 → 1.0.20

package/checker.js

@@ -48,22 +48,28 @@ function checkEmptyDir(dir) {
  * 
  * @return {bool}  used_secret
  */
-function isSecretUsed(xsecret) {
-    // DECODING SECRET
-    var secret_pb = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'))
+function isSecretUsed(xsecret, xauthor = "") {
+    if(xauthor != ""){
+        xauthor = xauthor + '/';
+    }
 
+    // LOADING PB
+    var secret_pb = pb(fs.readFileSync('node_modules/pathchain/proto/secret.proto'))
+    
     // NOT FOUND EXCEPTION
-    var secret_enc;
+    var fileContents;
     try {
-        secret_enc = fs.readFileSync("files/"+xsecret)
+        fileContents = fs.readFileSync("files/" + xauthor + "secrets/" + xsecret);
     } catch (err) {
         if (err.code === 'ENOENT') {
-            return "Secret not found :(";
+            return "Secret not found";
         } else {
             throw err;
         }
     }
-    
+
+    // DECODING SECRET
+    var secret_enc = fileContents
     var secret_obj = secret_pb.secret.decode(secret_enc)
 
     if(secret_obj.used == false){

package/getter.js

@@ -90,10 +90,6 @@ function getPioneerObj(xpioneer) {
  * @return void
  */
 function getSecretObj(xsecret, xauthor) {
-    // "secret/hash" FORMAT EXCEPTION
-    /*if(xsecret.split("/").length > 1){ 
-        xsecret = xsecret.split("/")[xsecret.length -1]
-    }*/
 
     if(xauthor != ""){
         xauthor = xauthor + '/';
@@ -121,4 +117,40 @@ function getSecretObj(xsecret, xauthor) {
     return secret_obj;
 }
 
-module.exports = { getCurrentDate, getMomentObj, getPioneerObj, getSecretObj }
+
+/** getEntityObj
+ * [Function that recieves a entity hash and returns the entity object]
+ * 
+ * @param {string} xentity (required)
+ * 
+ * @return void
+ */
+function getEntityObj(xentity, xauthor) {
+    
+    if(xauthor != ""){
+        xauthor = xauthor + '/';
+    }
+
+    // LOADING PB
+    var entity_pb = pb(fs.readFileSync('node_modules/pathchain/proto/entity.proto'))
+    
+    // NOT FOUND EXCEPTION
+    var fileContents;
+    try {
+        fileContents = fs.readFileSync("files/" + xauthor + "entities/" + xentity);
+    } catch (err) {
+        if (err.code === 'ENOENT') {
+            return "Entity not found";
+        } else {
+            throw err;
+        }
+    }
+
+    // DECODING SECRET
+    var entity_enc = fileContents
+    var entity_obj = entity_pb.entity.decode(entity_enc)
+
+    return entity_obj;
+}
+
+module.exports = { getCurrentDate, getMomentObj, getPioneerObj, getSecretObj, getEntityObj }

package/index.js

@@ -80,6 +80,33 @@ exports.getPioneerObj = (xpioneer = this.makePioneer()) => {
     return pioneer_object;
 }
 
+
+//////////////////
+///   ENTITY   ///
+//////////////////
+
+/** makeEntity
+ * [Entity maker]
+ * 
+ * @return {string} entity_buffer
+ */
+exports.makeEntity = (xsecret, format = 'MM DD YYYY HH:mm:SSS [GMT]Z') => {
+    const entity_buffer = maker.entity(xsecret, format);
+    return entity_buffer;
+}
+
+/** getEntityObj
+ * [Function that recieves a entity hash and returns the entity object]
+ * 
+ * @param {string} xentity (required)
+ * 
+ * @return {obj} entity_object (entity object)
+ */
+exports.getEntityObj = (xentity) => {
+    const entity_object = getter.getEntityObj(xentity);
+    return entity_object;
+}
+
 ////////////////
 ///  SECRET  ///
 ////////////////

package/maker.js

@@ -174,7 +174,7 @@ function entity(xsecret, format) {
         return "A pioneer's secret is needed to create the first entity. There was no pioneer, but here is the one at 'files/pioneer/'" + pioneer();
     }
     else{
-        if(!checker.isSecretUsed(xsecret)){
+        if(checker.isSecretUsed(xsecret) == false){
             // CREATING entity
             var entity = pb(fs.readFileSync('node_modules/pathchain/proto/entity.proto'))
             

package/package.json

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