Fix warnings when building node addon (#1379)

lynckia · Mar 19, 2019 · ab2dfcb · ab2dfcb
1 parent 86a4fd3
commit ab2dfcb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/erizoAPI/ExternalInput.cc b/erizoAPI/ExternalInput.cc
@@ -30,7 +30,8 @@ class AsyncDeleter : public Nan::AsyncWorker {
         Local<Value> argv[] = {
           Nan::New(msg.c_str()).ToLocalChecked()
         };
-        callback->Call(1, argv);
+        Nan::AsyncResource resource("erizo::addon.externalInput.deleter");
+        callback->Call(1, argv, &resource);
       }
     }
  private:

diff --git a/erizoAPI/ExternalOutput.cc b/erizoAPI/ExternalOutput.cc
@@ -34,7 +34,8 @@ class AsyncCloser : public Nan::AsyncWorker {
         Local<Value> argv[] = {
           Nan::New(msg.c_str()).ToLocalChecked()
         };
-        callback->Call(1, argv);
+        Nan::AsyncResource resource("erizo::addon.externalOutput.closer");
+        callback->Call(1, argv, &resource);
       }
     }
  private:

diff --git a/erizoAPI/MediaStream.cc b/erizoAPI/MediaStream.cc
@@ -40,7 +40,8 @@ void StatCallWorker::HandleOKCallback() {
   Local<Value> argv[] = {
     Nan::New<v8::String>(stat_).ToLocalChecked()
   };
-  callback->Call(1, argv);
+  Nan::AsyncResource resource("erizo::addon.statCall");
+  callback->Call(1, argv, &resource);
 }
 
 void destroyAsyncHandle(uv_handle_t *handle) {
@@ -439,7 +440,8 @@ NAUV_WORK_CB(MediaStream::statsCallback) {
   if (obj->has_stats_callback_) {
     while (!obj->stats_messages.empty()) {
       Local<Value> args[] = {Nan::New(obj->stats_messages.front().c_str()).ToLocalChecked()};
-      Nan::MakeCallback(Nan::GetCurrentContext()->Global(), obj->stats_callback_->GetFunction(), 1, args);
+      Nan::AsyncResource resource("erizo::addon.stream.statsCallback");
+      resource.runInAsyncScope(Nan::GetCurrentContext()->Global(), obj->stats_callback_->GetFunction(), 1, args);
       obj->stats_messages.pop();
     }
   }
@@ -457,7 +459,8 @@ NAUV_WORK_CB(MediaStream::eventCallback) {
       while (!obj->event_messages.empty()) {
           Local<Value> args[] = {Nan::New(obj->event_messages.front().first.c_str()).ToLocalChecked(),
               Nan::New(obj->event_messages.front().second.c_str()).ToLocalChecked()};
-          Nan::MakeCallback(Nan::GetCurrentContext()->Global(), obj->event_callback_->GetFunction(), 2, args);
+          Nan::AsyncResource resource("erizo::addon.stream.eventCallback");
+          resource.runInAsyncScope(Nan::GetCurrentContext()->Global(), obj->event_callback_->GetFunction(), 2, args);
           obj->event_messages.pop();
       }
   }

diff --git a/erizoAPI/OneToManyProcessor.cc b/erizoAPI/OneToManyProcessor.cc
@@ -31,8 +31,8 @@ class AsyncDeleter : public Nan::AsyncWorker {
         Local<Value> argv[] = {
           Nan::New(msg.c_str()).ToLocalChecked()
         };
-
-        callback->Call(1, argv);
+        Nan::AsyncResource resource("erizo::addon.oneToManyProcessor.deleter");
+        callback->Call(1, argv, &resource);
       }
     }
  private:

diff --git a/erizoAPI/OneToManyTranscoder.cc b/erizoAPI/OneToManyTranscoder.cc
@@ -30,8 +30,8 @@ class AsyncDeleter : public Nan::AsyncWorker {
       Local<Value> argv[] = {
         Nan::New(msg.c_str()).ToLocalChecked()
       };
-
-      callback->Call(1, argv);
+      Nan::AsyncResource resource("erizo::addon.oneToManyTranscoder.deleter");
+      callback->Call(1, argv), &resource;
     }
   }
  private:

diff --git a/erizoAPI/SyntheticInput.cc b/erizoAPI/SyntheticInput.cc
@@ -31,7 +31,8 @@ class AsyncDeleter : public Nan::AsyncWorker {
         Local<Value> argv[] = {
           Nan::New(msg.c_str()).ToLocalChecked()
         };
-        callback->Call(1, argv);
+        Nan::AsyncResource resource("erizo::addon.SyntheticInput.deleter");
+        callback->Call(1, argv, &resource);
       }
     }
  private:

diff --git a/erizoAPI/WebRtcConnection.cc b/erizoAPI/WebRtcConnection.cc
@@ -535,7 +535,8 @@ NAUV_WORK_CB(WebRtcConnection::eventsCallback) {
     Local<Value> args[] = {Nan::New(obj->event_status.front()),
                            Nan::New(obj->event_messages.front().first.c_str()).ToLocalChecked(),
                            Nan::New(obj->event_messages.front().second.c_str()).ToLocalChecked()};
-    Nan::MakeCallback(Nan::GetCurrentContext()->Global(), obj->event_callback_->GetFunction(), 3, args);
+    Nan::AsyncResource resource("erizo::addon.connection.eventsCallback");
+    resource.runInAsyncScope(Nan::GetCurrentContext()->Global(), obj->event_callback_->GetFunction(), 3, args);
     obj->event_messages.pop();
     obj->event_status.pop();
   }

diff --git a/scripts/installErizo.sh b/scripts/installErizo.sh
@@ -73,7 +73,7 @@ install_erizo_api(){
   cd $ROOT/erizoAPI
   . $NVM_CHECK
   nvm use
-  npm install nan@2.3.2
+  npm install nan@2.13.1
   $FAST_BUILD ./build.sh
   check_result $?
   cd $CURRENT_DIR