Merge pull request #4 from codenotary/feat/update_schema

Feat/update schema

Author: Hextar

.gitignore

@@ -5,3 +5,4 @@ test/immudb
 .nyc_output
 test/root.json
 .vscode
+rootfile

examples/batch-operations.js

@@ -1,3 +1,16 @@
+/*
+Copyright 2019-2020 vChain, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 const ImmudbClient = require('../lib/client')
 
 const IMMUDB_HOST = process.env.IMMUDB_HOST || '127.0.0.1'

examples/database-operations-long-index.js

@@ -84,7 +84,7 @@ async function main(err, cl) {
       keyPrefix: rand,
       offset: '10',
       limit: 1,
-      reverse: true,
+      reverse: false,
       deep: false,
     }
     res = await cl.scan(req)

lib/client.js

@@ -3,8 +3,8 @@ require('dotenv').config()
 const grpc = require('@grpc/grpc-js')
 const empty = require('google-protobuf/google/protobuf/empty_pb');
 
-const messages = require('../proto/schema_pb')
-const services = require('../proto/schema_grpc_pb')
+const messages = require('../protos/build/schema_pb')
+const services = require('../protos/build/schema_grpc_pb')
 const util = require('./util')
 const proofs = require('./proofs')
 const root = require('./root')
@@ -841,7 +841,7 @@ const getBatch = (params, callback) => {
       }
 
       callback(null, {
-        items : result,
+        items: result,
       })
     })
   } catch (err) {

lib/root.js

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

lib/util.js

@@ -9,9 +9,7 @@ const utf8Encode = (val) => {
 }
 
 const utf8Decode = (val) => {
-  if (val === '') {
-      return val
-  }
+  if (val === '') { return val }
   return new util.TextDecoder("utf-8").decode(val)
 }
 

package.json

@@ -31,7 +31,7 @@
   },
   "tap": {
     "nyc-arg": [
-      "--exclude=proto"
+      "--exclude=protos"
     ]
   },
   "keywords": [

pb_generator.sh

@@ -1,16 +1,17 @@
 set -e
 set -x
 
-# ./node_modules/@grpc/grpc-js/packages/grpc-tools/bin/protoc.js \
-#   --proto_path=proto \
-#   --proto_path=./node_modules/protobufjs \
-#   --js_out=import_style=commonjs,binary:proto \
-#   --plugin==protc-gen-grpc=./node_modules/@grpc/grpc-js/packages/grpc-tools/bin/grpc_node_plugin \
-#   --grpc_out=import_style=commonjs,binary:proto \
-#   proto/schema.proto \
-#   node_modules/protobufjs/google/**/*.proto
+SRC_PATH=protos
+DEST_PATH=$SRC_PATH/build
 
+# remove the dest directory
+if [ -d "$DEST_PATH" ]; then rm -Rf $DEST_PATH; fi
+
+# recreate dest directory
+mkdir $DEST_PATH
+
+# generate js codes via grpc_tools_node_protoc[CommonJS imports]
 grpc_tools_node_protoc \
-  --js_out=import_style=commonjs,binary:./protos \
-  --grpc_out=grpc_js:./protos \
-  -I=./protos ./protos/*.proto
+  --js_out=import_style=commonjs,binary:./$DEST_PATH \
+  --grpc_out=grpc_js:./$DEST_PATH \
+  -I=./protos ./$SRC_PATH/*.proto