Merge 2305fae into 120f745

.travis.yml

@@ -3,6 +3,8 @@ node_js:
   - "4"
   - "6"
   - "8"
+  - "10"
+  - "12"
 install:
   - export CXX="g++-4.8" CXX="gcc-4.8"
   - $CXX --version

package.json

@@ -25,9 +25,9 @@
   },
   "homepage": "https://github.com/XadillaX/bling_hashes#readme",
   "dependencies": {
-    "big-number": "^1.0.0",
-    "long": "^3.0.1",
-    "nan": "^2.7.0"
+    "big-number": "^2.0.0",
+    "long": "^4.0.0",
+    "nan": "^2.14.0"
   },
   "devDependencies": {
     "coveralls": "^2.11.4",

src/byvoid/entry.h

@@ -17,8 +17,9 @@
  */
 #ifndef __BYVOID_ENTRY_H__
 #define __BYVOID_ENTRY_H__
-#include <nan.h>
+
 #include "algorithms.h"
+#include "../common.h"
 
 using v8::String;
 
@@ -35,14 +36,16 @@ void ToUpperCase(std::string& str)
 
 NAN_METHOD(CalcHash)
 {
+    CURRENT_CONTEXT(ctx);
+
     // argument length...
     if(info.Length() < 2)
     {
         return Nan::ThrowError("invalid argument count");
     }
 
-    String::Utf8Value v8_algorithm_type(info[0]->ToString());
-    String::Utf8Value v8_string(info[1]->ToString());
+    String::Utf8Value v8_algorithm_type(isolate, info[0]->ToString(ctx).ToLocalChecked());
+    String::Utf8Value v8_string(isolate, info[1]->ToString(ctx).ToLocalChecked());
 
     // type to uppercase
     std::string algorithm_type = *v8_algorithm_type;

src/cityhash/entry.h

@@ -18,9 +18,9 @@
 #ifndef __CITYHASH_ENTRY_H__
 #define __CITYHASH_ENTRY_H__
 
-#include <nan.h>
 #include <string>
 #include "cityhash.h"
+#include "../common.h"
 
 void __CityHash64FreeCallback(char* data, void* hint)
 {
@@ -30,13 +30,15 @@ void __CityHash64FreeCallback(char* data, void* hint)
 
 NAN_METHOD(_CityHash32)
 {
+    CURRENT_CONTEXT(ctx);
+
     // argument length...
     if(info.Length() < 1)
     {
         return Nan::ThrowError("invalid argument count");
     }
 
-    String::Utf8Value v8_source_string(info[0]->ToString());
+    String::Utf8Value v8_source_string(isolate, info[0]->ToString(ctx).ToLocalChecked());
     std::string source_string = *v8_source_string;
     unsigned int len = source_string.size();
 
@@ -52,13 +54,15 @@ NAN_METHOD(_CityHash32)
 
 NAN_METHOD(_CityHash64)
 {
+    CURRENT_CONTEXT(ctx);
+
     // argument length...
     if(info.Length() < 1)
     {
         return Nan::ThrowError("invalid argument count");
     }
 
-    String::Utf8Value v8_source_string(info[0]->ToString());
+    String::Utf8Value v8_source_string(isolate, info[0]->ToString(ctx).ToLocalChecked());
     std::string source_string = *v8_source_string;
     unsigned int len = source_string.size();
 
@@ -77,13 +81,15 @@ const Extract128Func Extract128[] = { Uint128Low64, Uint128High64 };
 
 NAN_METHOD(_CityHash128)
 {
+    CURRENT_CONTEXT(ctx);
+
     // argument length...
     if(info.Length() < 1)
     {
         return Nan::ThrowError("invalid argument count");
     }
 
-    String::Utf8Value v8_source_string(info[0]->ToString());
+    String::Utf8Value v8_source_string(isolate, info[0]->ToString(ctx).ToLocalChecked());
     std::string source_string = *v8_source_string;
     unsigned int len = source_string.size();
 

src/common.h

@@ -0,0 +1,13 @@
+#ifndef __COMMON_H__
+#define __COMMON_H__
+
+#include <nan.h>
+
+using v8::Isolate;
+using v8::Local;
+using v8::Context;
+
+#define CURRENT_CONTEXT(ctx) Isolate* isolate = Isolate::GetCurrent(); \
+                             Local<Context> ctx = isolate->GetCurrentContext();
+
+#endif