Support Node 13 (#619)

* Support Node 13

* More context additions

Author: mattcolegate

.travis.yml

@@ -6,6 +6,7 @@ node_js:
   - "8"
   - "10"
   - "12"
+  - "13"
 os:
   - osx
   - linux
@@ -18,13 +19,17 @@ matrix:
       node_js: "10"
     - os: windows
       node_js: "12"
+    - os: windows
+      node_js: "13"
   allow_failures:
     - os: windows
       node_js: "8"
     - os: windows
       node_js: "10"
     - os: windows
       node_js: "12"
+    - os: windows
+      node_js: "13"
   fast_finish: true
 
 

src/appmetrics.cpp

@@ -330,7 +330,9 @@ NAN_METHOD(getOption) {
     if (info.Length() > 0) {
         Local<String> value = Nan::To<String>(info[0]).ToLocalChecked();
         std::string property = loaderApi->getProperty(toStdString(value).c_str());
-#if NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
+#if NODE_VERSION_AT_LEAST(13, 0, 0) // > v13.0+
+        v8::Local<v8::String> v8str = v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), property.c_str()).ToLocalChecked();
+#elif NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
         v8::Local<v8::String> v8str = v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), property.c_str());
 #else
         v8::Local<v8::String> v8str = v8::String::New(property.c_str(), strlen(property.c_str()));
@@ -584,8 +586,13 @@ void lrtime(const Nan::FunctionCallbackInfo<v8::Value>& info) {
     }
     timespec ts = {0, 0};
     clock_gettime(clock_id, &ts);
-
-#if NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
+#if NODE_VERSION_AT_LEAST(13, 0, 0) // > v13.0+
+    v8::Isolate* isolate = info.GetIsolate();
+    v8::Local<v8::Context> context = isolate -> GetCurrentContext();
+    v8::Local<v8::Array> result = v8::Array::New(isolate, 2);
+    result->Set(context, 0, v8::Number::New(isolate, ts.tv_sec));
+    result->Set(context, 1, v8::Integer::NewFromUnsigned(isolate, ts.tv_nsec));
+#elif NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
     v8::Isolate* isolate = info.GetIsolate();
     v8::Local<v8::Array> result = v8::Array::New(isolate, 2);
     result->Set(0, v8::Number::New(isolate, ts.tv_sec));

src/headlessutils.cpp

@@ -41,7 +41,9 @@ void asyncfunc(uv_async_t* handle, int status) {
 #endif
 	Nan::HandleScope scope;
  	v8::Isolate* isolate = v8::Isolate::GetCurrent();
-#if NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
+#if NODE_VERSION_AT_LEAST(13, 0, 0) // > v13.0+
+	v8::Local<v8::Value> argv[] = { v8::String::NewFromUtf8(isolate, outputDir.c_str()).ToLocalChecked() };
+#elif NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
 	v8::Local<v8::Value> argv[] = { v8::String::NewFromUtf8(isolate, outputDir.c_str()) };
 #else
 	v8::Local<v8::Value> argv[] = { v8::String::New(outputDir.c_str(),  strlen(outputDir.c_str())) };

src/heapdump/heapdump.cc

@@ -160,6 +160,18 @@ inline C::ReturnType Configure(const C::ArgumentType& args) {
 inline void Initialize(Local<Object> binding) {
   Isolate* const isolate = Isolate::GetCurrent();
   Local<Context> context = Nan::GetCurrentContext();
+#if NODE_VERSION_AT_LEAST(13, 0, 0)
+  binding->Set(context, C::String::NewFromUtf8(isolate, "kForkFlag"),
+               C::Integer::New(isolate, kForkFlag));
+  binding->Set(context, C::String::NewFromUtf8(isolate, "kSignalFlag"),
+               C::Integer::New(isolate, kSignalFlag));
+  binding->Set(context, C::String::NewFromUtf8(isolate, "configure"),
+               C::FunctionTemplate::New(isolate, Configure)
+                ->GetFunction(context).ToLocalChecked());
+  binding->Set(context, C::String::NewFromUtf8(isolate, "writeSnapshot"),
+               C::FunctionTemplate::New(isolate, WriteSnapshot)
+                ->GetFunction(context).ToLocalChecked());
+#else
   binding->Set(C::String::NewFromUtf8(isolate, "kForkFlag"),
                C::Integer::New(isolate, kForkFlag));
   binding->Set(C::String::NewFromUtf8(isolate, "kSignalFlag"),
@@ -170,6 +182,7 @@ inline void Initialize(Local<Object> binding) {
   binding->Set(C::String::NewFromUtf8(isolate, "writeSnapshot"),
                C::FunctionTemplate::New(isolate, WriteSnapshot)
                 ->GetFunction(context).ToLocalChecked());
+#endif
 }
 
 NODE_MODULE(addon, Initialize)

src/objecttracker.cpp

@@ -36,6 +36,7 @@ NAN_METHOD(getObjectHistogram) {
 	}
 
 	HeapProfiler *heapProfiler = isolate->GetHeapProfiler();
+	Local<Context> currentContext = isolate->GetCurrentContext();
 
 #if NODE_VERSION_AT_LEAST(4, 0, 0) // > v4.00+
 	// Title field removed in Node 4.x
@@ -51,7 +52,7 @@ NAN_METHOD(getObjectHistogram) {
 #else
 	const HeapSnapshot* snapshot = heapProfiler->TakeSnapshot(snapshotName);
 #endif
-#if NODE_VERSION_AT_LEAST(4, 0, 0) // > v0.11+
+#if NODE_VERSION_AT_LEAST(4, 0, 0) // > v4.0+
 	// Title field removed in Node 4.x
 #else
 	snapshotName
@@ -60,19 +61,26 @@ NAN_METHOD(getObjectHistogram) {
 
 	/* Build a simple histogram from the heap snapshot. */
 	Local<Object> histogram = Object::New(isolate);
+#if NODE_VERSION_AT_LEAST(13, 0, 0) // > v13.0+
 
 	/* Declare our tuple keys outside the loop. */
-	Local<String> countName = String::NewFromUtf8(isolate, "count");
-	Local<String> sizeName = String::NewFromUtf8(isolate, "size");
+	Local<String> countName = String::NewFromUtf8(isolate, "count").ToLocalChecked();
+	Local<String> sizeName = String::NewFromUtf8(isolate, "size").ToLocalChecked();
 
 	/* v8-profiler.h says that kObject is "A JS object (except for arrays and strings)."
 	 * so we should include strings and arrays as objects in the histogram as they are
 	 * objects as the user understands them.
 	 * When you take a heap dump in Chrome dev tools and then view it the
 	 * names "(string)" and "(array)" are used for these, so that's what we'll show the user.
 	 */
+	Local<String> stringName = String::NewFromUtf8(isolate, "(string)").ToLocalChecked();
+	Local<String> arrayName = String::NewFromUtf8(isolate, "(array)").ToLocalChecked();
+#else
+	Local<String> countName = String::NewFromUtf8(isolate, "count");
+	Local<String> sizeName = String::NewFromUtf8(isolate, "size");
 	Local<String> stringName = String::NewFromUtf8(isolate, "(string)");
 	Local<String> arrayName = String::NewFromUtf8(isolate, "(array)");
+#endif
 
 	/* Walk every node by index (not id) */
 	for(int i = 0; i < snapshot->GetNodesCount(); i++ ) {
@@ -119,15 +127,25 @@ NAN_METHOD(getObjectHistogram) {
 			 * values for count and size.
 			 */
 			tuple = Object::New(isolate);
-			histogram->Set(name, tuple);
+#if NODE_VERSION_AT_LEAST(13, 0, 0) // > v13.0+
+			histogram->Set(currentContext, name, tuple);
 		}
 
 		/* Update the values in the existing (or new) tuple */
 		Local<Value> newcount = Number::New(isolate, ++ncount);
-		tuple->Set(countName, newcount);
+		tuple->Set(currentContext, countName, newcount);
 		Local<Value> newsize = Number::New(isolate, nsize+node->GetShallowSize());
-		tuple->Set(sizeName, newsize);
+		tuple->Set(currentContext,sizeName, newsize);
+#else
+            histogram->Set(currentContext, name, tuple);
+		}
 
+		/* Update the values in the existing (or new) tuple */
+		Local<Value> newcount = Number::New(isolate, ++ncount);
+		tuple->Set(currentContext, countName, newcount);
+		Local<Value> newsize = Number::New(isolate, nsize+node->GetShallowSize());
+		tuple->Set(currentContext,sizeName, newsize);
+#endif
 	}
 
 	// Delete the snapshot as soon as we are done with it.

src/plugins/node/prof/compat-inl.h

@@ -350,7 +350,11 @@ v8::Local<v8::String> String::NewFromUtf8(v8::Isolate* isolate,
                                           const char* data, NewStringType type,
                                           int length) {
   return v8::String::NewFromUtf8(
+#if NODE_VERSION_AT_LEAST(13, 0, 0)
+      isolate, data, static_cast<v8::NewStringType>(type), length).ToLocalChecked();
+#else
       isolate, data, static_cast<v8::String::NewStringType>(type), length);
+#endif
 }
 
 HandleScope::HandleScope(v8::Isolate* isolate) : handle_scope_(isolate) {}