[Node12.x] Add Node 12.x Support

.travis.yml

@@ -1,8 +1,11 @@
 language: node_js
 node_js:
   - 4
-  - "0.12"
-  - "0.10"
+  - 6
+  - 8
+  - 10
+  - 12
+  - 13.6.0
 addons:
   apt:
     sources:

binding.gyp

@@ -13,6 +13,7 @@
     {
       "target_name": "crypt3async",
       "sources": [ "crypt3async.cc" ],
+      "include_dirs" : [ "<!(node -e \"require('nan')\")" ],
       "conditions": [
         ['OS!="mac"', {
           'link_settings': { "libraries": [ "-lcrypt" ] }

crypt3.cc

@@ -18,8 +18,8 @@ NAN_METHOD(Method) {
 		return Nan::ThrowTypeError("Wrong arguments");
 	}
 
-	v8::String::Utf8Value key(info[0]->ToString());
-	v8::String::Utf8Value salt(info[1]->ToString());
+	Nan::Utf8String key(info[0]);
+	Nan::Utf8String salt(info[1]);
 
 	char* res = crypt(*key, *salt);
 	if (res != NULL) {
@@ -29,9 +29,13 @@ NAN_METHOD(Method) {
 	}
 }
 
-void init(Handle<Object> exports) {
-	exports->Set(Nan::New<String>("crypt").ToLocalChecked(),
-		Nan::New<FunctionTemplate>(Method)->GetFunction());
+
+void init(Local<Object> exports) {
+    Nan::Set(
+        exports,
+        Nan::New<String>("crypt").ToLocalChecked(),
+        Nan::GetFunction(Nan::New<FunctionTemplate>(Method)).ToLocalChecked()
+    );       
 }
 
 NODE_MODULE(crypt3, init)

crypt3async.cc

@@ -5,6 +5,7 @@
  *   Tested in node.js v4.4.2 LTS in Ubuntu Linux
  */
 
+#include <nan.h>
 #include <node.h>
 #include <uv.h>
 #include <iostream>
@@ -67,22 +68,26 @@ namespace asyncAddon {
 	 */
 	static void WorkAsyncComplete(uv_work_t *req,int status) {
 		Isolate * isolate = Isolate::GetCurrent();
-		v8::HandleScope handleScope(isolate);
+                v8::HandleScope handle_scope(isolate);
 		Work *work = static_cast<Work *>(req->data);
+                Local<v8::Context> context = isolate -> GetCurrentContext() ;
+                Local<Value> recv = Undefined( isolate ) ;
+
 
 		const int error = work->error;
 		const char *result = work->result.c_str();
+
 		if(error == 0) {
 			Local<Value> argv[2] = {
 				Undefined(isolate),
-				String::NewFromUtf8(isolate, result)
+				String::NewFromUtf8(isolate, result, v8::NewStringType::kNormal).ToLocalChecked()
 			};
 			// https://stackoverflow.com/questions/13826803/calling-javascript-function-from-a-c-callback-in-v8/28554065#28554065
-			Local<Function>::New(isolate, work->callback)->Call(isolate->GetCurrentContext()->Global(), 2, argv);
+			Local<Function>::New(isolate, work->callback)->Call(context, recv, 2, argv);
 		} else {
-			Local<Value> argv[1] = { String::NewFromUtf8(isolate, result) };
+			Local<Value> argv[1] = { String::NewFromUtf8(isolate, result, v8::NewStringType::kNormal).ToLocalChecked() };
 			// https://stackoverflow.com/questions/13826803/calling-javascript-function-from-a-c-callback-in-v8/28554065#28554065
-			Local<Function>::New(isolate, work->callback)->Call(isolate->GetCurrentContext()->Global(), 1, argv);
+			Local<Function>::New(isolate, work->callback)->Call(context, recv, 1, argv);
 		}
 
 		work->callback.Reset();
@@ -99,20 +104,20 @@ namespace asyncAddon {
 		work->request.data = work;
 
 		if (args.Length() < 3) {
-			isolate->ThrowException(Exception::TypeError(String::NewFromUtf8(isolate, "Wrong number of arguments")));
+			isolate->ThrowException(Exception::TypeError(String::NewFromUtf8(isolate, "Wrong number of arguments", v8::NewStringType::kNormal).ToLocalChecked()));
 			return;
 		}
 
 		if (!args[0]->IsString() || !args[1]->IsString() || !args[2]->IsFunction() ) {
-			isolate->ThrowException(Exception::TypeError(String::NewFromUtf8(isolate, "Wrong arguments")));
+			isolate->ThrowException(Exception::TypeError(String::NewFromUtf8(isolate, "Wrong arguments", v8::NewStringType::kNormal).ToLocalChecked()));
 			return;
 		}
 
-		v8::String::Utf8Value v8key(args[0]->ToString());
+		Nan::Utf8String v8key(args[0]);
 		string key = std::string(*v8key);
 		work->key = key;
 
-		v8::String::Utf8Value v8salt(args[1]->ToString());
+		Nan::Utf8String v8salt(args[1]);
 		string salt = std::string(*v8salt);
 		work->salt = salt;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crypt3",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Node.js crypt(3) bindings",
   "main": "src/index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/sendanor/node-crypt3.git"
+    "url": "https://github.com/ahmedbodi/node-crypt3.git"
   },
   "keywords": [
     "crypt",
@@ -21,12 +21,13 @@
     "hash"
   ],
   "dependencies": {
-    "nan": "^2.1.0"
+    "nan": "^2.14.0"
   },
   "optionalDependencies": {
     "q": "^1.0.1"
   },
   "author": "Jaakko-Heikki Heusala <jheusala@iki.fi>",
+  "maintainer": "Ahmed Bodiwala <ahmedbodi@crypto-expert.com>",
   "license": "MIT",
   "gypfile": true
 }