Minimal node 12 support (#62)

* Minimal node 12 support * Fix deprecated v8/nan calls.
ddopson · May 18, 2019 · 6c47b1f · 6c47b1f
1 parent 024ca6c
commit 6c47b1f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
+### NEXT
+
+* [PR#62](https://github.com/ddopson/node-segfault-handler/pull/62) - Support for node 12.
+
 ### 1.1.0 (2018-04-30)
 
 * [PR#37](https://github.com/ddopson/node-segfault-handler/pull/37) - Fix lack of stack trace on ARM.
 * [PR#57](https://github.com/ddopson/node-segfault-handler/pull/57) - Support for Xcode 10.
-* [PR#58](https://github.com/ddopson/node-segfault-handler/pull/58) - Fix the `v8::String` deprecation warning. 
+* [PR#58](https://github.com/ddopson/node-segfault-handler/pull/58) - Fix the `v8::String` deprecation warning.
 
 ### 1.0.1 (2018-05-17)
 

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "bindings": "^1.2.1",
-    "nan": "^2.0.9"
+    "nan": "^2.13.2"
   },
   "main": "index.js",
   "license": "BSD-3-Clause"

diff --git a/src/segfault-handler.cpp b/src/segfault-handler.cpp
@@ -83,7 +83,7 @@ struct callback_helper {
   uv_async_t* handle;
   v8::Persistent<Function, v8::CopyablePersistentTraits<Function> > callback;
 
-  callback_helper(Handle<Function> func) {
+  callback_helper(Local<Function> func) {
     Isolate* isolate = Isolate::GetCurrent();
     // set the function reference
     callback.Reset(isolate, func);
@@ -149,14 +149,14 @@ struct callback_helper {
     // build the stack arguments
     Local<Array> argStack = Array::New(isolate, args->stack_size);
     for (size_t i = 0; i < args->stack_size; i++) {
-      argStack->Set(i, String::NewFromUtf8(isolate, args->stack[i]));
+      Nan::Set(argStack, i, String::NewFromUtf8(isolate, args->stack[i], v8::NewStringType::kInternalized).ToLocalChecked());
     }
 
     // collect all callback arguments
     Local<Value> argv[3] = {Number::New(isolate, args->signo), Number::New(isolate, args->addr), argStack};
 
     // execute the callback function on the main threaod
-    Local<Function>::New(isolate, *args->callback)->Call(isolate->GetCurrentContext()->Global(), 3, argv);
+    Nan::Call(Local<Function>::New(isolate, *args->callback), isolate->GetCurrentContext()->Global(), 3, argv);
 
     // broadcast that we're done with the callback
     pthread_cond_broadcast(&args->cond);
@@ -302,7 +302,7 @@ NAN_METHOD(RegisterHandler) {
 
         strncpy(logPath, *utf8Value, len);
         logPath[127] = '\0';
-      
+
       #ifndef _WIN32
       } else if (info[i]->IsFunction()) {
         if (callback) {
@@ -311,7 +311,7 @@ NAN_METHOD(RegisterHandler) {
         }
 
         // create the new callback object
-        callback = new callback_helper(Handle<Function>::Cast(info[i]));
+        callback = new callback_helper(Local<Function>::Cast(info[i]));
       #endif
 
       }