applay-utils 1.8.4 → 1.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applay-utils",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "Utilitary tools for Applay applications",
   "scripts": {
     "build": "npm version patch",

package/utils/crypto.js

@@ -4,23 +4,19 @@ var key = process.env.key;
 const sha1 = require('sha1');
 
 var utils = {
-    'genHash': (json) => {
-        if(!key) return null;
-        var id = json._id?json._id+'':null;
-        delete json._id;
+    'genHash': (orig) => {
+        if (!key) return null;
+        var json = Object({}, orig);
+        if (json._id) { delete json._id; }
         if (json.apyId) { delete json.apyId; }
         var block = `KEY=>${key}|JSON=>${JSON.stringify(json)}`;
-        json.apyId = sha1(block);
-        if(id){json._id=id;}
-        return json;
+        orig.apyId = sha1(block);
+        return orig;
     },
     'verifyHash': (orig) => {
         if (!key) return null;
-        var json = Object({}, orig);
-        delete json._id;
-        if (json.apyId) { delete json.apyId; }
-        var block = `KEY=>${key}|JSON=>${JSON.stringify(json)}`;
-        json.apyId = sha1(block);
+        var json = utils.genHash(Object({}, orig));
+        console.log(json.apyId, orig.apyId);
         return json.apyId == orig.apyId
     },
     'setKey': (newkey)=>{key=newkey},

package/utils/querys.js

@@ -48,7 +48,7 @@ var querys = {
   'findLastAsync': (db, collection, filter) => new Promise(resolve => db.collection(collection).find(filter).sort({ _id: -1 }).limit(1).toArray((err, result) => resolve(result[0]))),
   'updateSetAsync': (db, collection, itemId, itemSet) => new Promise(resolve => db.collection(collection).findOneAndUpdate(itemId, { $set: itemSet }, (err, result) => resolve(result))),
   'updateAllAsync': (db, collection, filter, itemSet) => new Promise(resolve => db.collection(collection).updateMany(filter, itemSet, (err, result) => resolve(err || result))),
-  'aggregateAsync': (db, collection, data) => new Promise(resolve => db.collection(collection).aggregate(data).toArray((err, result) => resolve(result))), 
+  'aggregateAsync': (db, collection, pipe, options) => new Promise(resolve => db.collection(collection).aggregate(pipe, { allowDiskUse: true, ...options }).toArray((err, result) => resolve(result))),
   'deleteMany': (db, collection, filter) => new Promise(resolve => db.collection(collection).deleteMany(filter, (err, result) => resolve(result))),
   'saveAsync': (db, collection, dataOrItem, user) => new Promise(resolve => {
     // console.log("🚀 ~ db", db)