Merge branch 'master' into es6

yfinkelstein · Jul 17, 2019 · 72967a0 · 72967a0
2 parents 8b8f944 + 43018e7
commit 72967a0
Show file tree

Hide file tree

Showing 11 changed files with 329 additions and 99 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - "10"
   - "8"
+  - "10"
+  - "12"
 os:
   - linux
   - osx
@@ -13,6 +14,7 @@ install:
   - npm install
 script:
   - npm test
+  - npm run test-components
 addons:
   apt:
     sources:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+#### v 4.2.0 (2019-07-16) ####
+* fix: Node.js 12 support
+* fix: V8 and Nan deprecation warnings
+* chore: reduce build output on Linux/Mac OS X. Pull request [183](https://github.com/yfinkelstein/node-zookeeper/pull/183) by @jbienkowski311
+* fix: deprecated getters and setters, pull request [181](https://github.com/yfinkelstein/node-zookeeper/pull/181) by @jbienkowski311 
+* chore: pull request template, added by @jbienkowski311
+* chore: added integration test scripts
+
 #### v 4.1.1 (2019-06-18) ####
 * feat: handle ZNOTHING return code from the ZooKeeper C library
 * fix: README typos

diff --git a/binding.gyp b/binding.gyp
@@ -15,7 +15,7 @@
                     '/opt/local/include/zookeeper',
                     '<!(node -e "require(\'nan\')")'
                 ],
-	            'ldflags': ['-lzookeeper_st'],
+                'ldflags': ['-lzookeeper_st'],
             }],
             ['OS=="mac"',{
                 'include_dirs': [

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zookeeper",
     "description": "apache zookeeper client (zookeeper async API >= 3.4.0)",
-    "version": "4.1.1",
+    "version": "4.2.0",
     "author": "Yuri Finkelstein <yurif2003@yahoo.com>",
     "license": "MIT",
     "contributors": [
@@ -46,10 +46,12 @@
     "main": "lib/index",
     "scripts": {
         "build": "node-gyp configure build",
+        "build-components": "node-gyp configure build --directory=tests_components",
         "install": "node ./scripts/prepublish.js && npm run build",
         "lint": "eslint .",
         "integrationtest": "/usr/bin/env bash -c 'pushd tests_integration; source ./test; popd'",
-        "test": "npm run lint && tape ./tests/**/*.js | tap-spec"
+        "test": "npm run lint && tape ./tests/**/*.js | tap-spec",
+        "test-components": "npm run build-components && tape ./tests_components/**/*.js | tap-spec"
     },
     "engines": {
         "node": ">=8.9.4"

diff --git a/src/converters.hpp b/src/converters.hpp
@@ -0,0 +1,49 @@
+#include <v8.h>
+#include "nan.h"
+
+using namespace v8;
+
+namespace nodezk {
+    Local<Object> toLocalObj(Local<Value> val) {
+        return Nan::To<Object>(val).ToLocalChecked();
+    }
+
+    Local<Value> toLocalVal(Local<Object> arg, Local<String> propertyName) {
+        Local<Value> val_local = arg->Get(Nan::GetCurrentContext(), propertyName).ToLocalChecked();
+        return val_local;
+    }
+
+    int32_t toInt(Local<Value> val_local) {
+        int32_t val = val_local->Int32Value(Nan::GetCurrentContext()).FromJust();
+
+        return val;
+    }
+
+    int32_t toInt(Local<Object> arg, Local<String> propertyName) {
+        Local<Value> val_local = toLocalVal(arg, propertyName);
+
+        return toInt(val_local);
+    }
+
+    bool toBool(Local<Value> val_local) {
+        return Nan::To<bool>(val_local).FromJust();
+    }
+
+    bool toBool(Local<Object> arg, Local<String> propertyName) {
+        Local<Value> val_local = toLocalVal(arg, propertyName);
+
+        return toBool(val_local);
+    }
+
+    Local<Value> convertUnixTimeToDate(double time) {
+        return Date::New(Isolate::GetCurrent()->GetCurrentContext(), time).ToLocalChecked();
+    }
+
+    Local<String> toString(Local<Value> val) {
+        return val->ToString(Nan::GetCurrentContext()).FromMaybe(Local<String>());
+    }
+
+    uint32_t toUint(Local<Value> val) {
+        return val->Uint32Value(Nan::GetCurrentContext()).FromJust();
+    }
+}