chore: updated libs

Author: Hextar

lib/client.js

@@ -1,8 +1,10 @@
+require('dotenv').config()
+
 const grpc = require('@grpc/grpc-js')
 const empty = require('google-protobuf/google/protobuf/empty_pb');
 
-const messages = require('../protos/schema_pb')
-const services = require('../protos/schema_grpc_pb')
+const messages = require('../proto/schema_pb')
+const services = require('../proto/schema_grpc_pb')
 const util = require('./util')
 const proofs = require('./proofs')
 const root = require('./root')
@@ -140,8 +142,7 @@ const useDatabase = (params, callback) => {
         err.clientErr = 'Use database error'
         return callback(err)
       }
-    //   const token = res && res.getToken()
-      const token = _token
+      const token = res && res.getToken()
       _metadata && _metadata.remove('authorization')
       _metadata && _metadata.add('authorization', 'Bearer ' + token)
       _activeDatabase = params && params.database
@@ -228,7 +229,7 @@ const listDatabases = (params, callback) => {
 
       const dl = res && res.getDatabasesList()
       const l = []
-      for (let i = 0; i < dl.length; i++) {
+      for (let i = 0; dl && i < dl.length; i++) {
         l.push(dl[i].getDatabasename())
       }
 
@@ -249,7 +250,7 @@ const changePermission = (params, callback) => {
 
     const req = new messages.ChangePermissionRequest()
     req.setAction(messages.PermissionAction[params && params.action])
-    req.setPermission(params && arams.permission)
+    req.setPermission(params && params.permission)
     req.setUsername(params && params.username)
     req.setDatabase(params && params.database)
 
@@ -282,7 +283,7 @@ const listUsers = (params, callback) => {
 
       const ul = res && res.getUsersList()
       const l = []
-      for (let i = 0; i < ul.length; i++) {
+      for (let i = 0; ul && i < ul.length; i++) {
         let u = ul[i]
 
         const pl = u.getPermissionsList()
@@ -420,7 +421,7 @@ const printTree = (params, callback) => {
 
       const result = []
       const tl = res && res.getTList()
-      for (let i = 0; i < tl.length; i++) {
+      for (let i = 0; tl && i < tl.length; i++) {
         let layer = tl[i]
 
         const ll = layer.getLList()
@@ -527,7 +528,7 @@ const scan = (params, callback) => {
 
       const result = []
       const il = res && res.getItemsList()
-      for (let i = 0; i < il.length; i++) {
+      for (let i = 0; il && i < il.length; i++) {
         let item = il[i]
         result.push({
           key: util.utf8Decode(item.getKey()),
@@ -579,6 +580,9 @@ const history = (params, callback) => {
 
     const req = new messages.HistoryOptions()
     req.setKey(util.utf8Encode(params && params.key))
+    req.setOffset(params && params.offset)
+    req.setLimit(params && params.limit)
+    req.setReverse(params && params.reverse)
 
     _client.history(req, _metadata, (err, res) => {
       if (err) {
@@ -588,7 +592,7 @@ const history = (params, callback) => {
 
       const result = []
       const il = res && res.getItemsList()
-      for (let i = 0; i < il.length; i++) {
+      for (let i = 0; il && i < il.length; i++) {
         let item = il[i]
         result.push({
           key: util.utf8Decode(item.getKey()),
@@ -627,7 +631,7 @@ const zScan = (params, callback) => {
 
       const result = []
       const il = res && res.getItemsList()
-      for (let i = 0; i < il.length; i++) {
+      for (let i = 0; il && i < il.length; i++) {
         let item = il[i]
         result.push({
           key: util.utf8Decode(item.getKey()),
@@ -663,12 +667,12 @@ const iScan = (params, callback) => {
 
       const result = []
       const il = res && res.getItemsList()
-      for (let i = 0; i < il.length; i++) {
+      for (let i = 0; il && i < il.length; i++) {
         let item = il[i]
         result.push({
-          key: util.utf8Decode(item.getKey()),
-          value: util.utf8Decode(item.getValue()),
-          index: item.getIndex(),
+          key: util.utf8Decode(item && item.getKey()),
+          value: util.utf8Decode(item && item.getValue()),
+          index: item && item.getIndex(),
         })
       }
 
@@ -781,10 +785,10 @@ const setBatch = (params, callback) => {
 
     const req = new messages.KVList()
 
-    for (let i = 0; i < params && params.kvList.length; i++) {
+    for (let i = 0; params && params.keys && i < params.keys.length; i++) {
       const kv = new messages.KeyValue() 
-      kv.setKey(util.utf8Encode(params && params.kvList[i].key))
-      kv.setValue(util.utf8Encode(params && params.kvList[i].value))
+      kv.setKey(util.utf8Encode(params && params.keys[i].key))
+      kv.setValue(util.utf8Encode(params && params.keys[i].value))
       req.addKvs(kv)
     }
 
@@ -809,9 +813,9 @@ const getBatch = (params, callback) => {
       return util.asyncifyMethod(getBatch, params)
     }
 
-    const key = new messages.Key()
     const l = []
-    for (let i = 0; i < params && params.keys.length; i++) {
+    for (let i = 0; params && params.keys && i < params.keys.length; i++) {
+      const key = new messages.Key()
       key.setKey(util.utf8Encode(params && params.keys[i].key))
       l.push(key)
     }
@@ -827,7 +831,7 @@ const getBatch = (params, callback) => {
 
       const result = []
       const il = res && res.getItemsList()
-      for (let i = 0; i < il.length; i++) {
+      for (let i = 0; il && i < il.length; i++) {
         let item = il[i]
         result.push({
           key: util.utf8Decode(item.getKey()),

lib/root.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const process = require('process')
 
-const messages = require('../protos/schema_pb')
+const messages = require('../proto/schema_pb')
 
 let root = {}
 let rootPath

lib/util.js

@@ -1,6 +1,9 @@
+const AsyncLock = require('async-lock');
 const btoa = require('btoa')
 const util = require('util')
 
+var lock = new AsyncLock();
+
 const utf8Encode = (val) => {
   return new util.TextEncoder("utf-8").encode(val)
 }
@@ -18,14 +21,19 @@ const base64Encode = (val) => {
 }
 
 const asyncifyMethod = (method, params) => {
-  return new Promise((resolve, reject) => {
-    method(params, (err, res) => {
-      if (err) {
-        return reject(err)
-      }
-      resolve(res)
+  const key = method.name 
+  return lock.acquire(key, function() {
+    return new Promise((resolve, reject) => {
+      method(params, (err, res) => {
+        if (err) {
+          return reject(err)
+        }
+        resolve(res)
+      })
     })
-  })
+  }).catch(function(err) {
+    console.log(err.message)
+  });
 }
 
 const equalArray = (a1, a2) => {