Update NAN version to support upcoming node v10 release (mathiask88#39)

mathiask88 · web-flow · commit fe2e6e6bb7f1 · 2018-04-29T00:36:56.000+02:00
* make nodejs v10 ready
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,10 @@ sudo: false
 language: node_js
 
 node_js:
+  - "10"
   - "9"
   - "8"
-  - "7"
   - "6"
-  - "5"
   - "4"
 
 os:
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,11 +4,10 @@ environment:
   # Test against these versions of Node.js
   matrix:
     # node.js
+    - nodejs_version: "10"
     - nodejs_version: "9"
     - nodejs_version: "8"
-    - nodejs_version: "7"
     - nodejs_version: "6"
-    - nodejs_version: "5"
     - nodejs_version: "4"
 
 # Build on both platforms
@@ -20,8 +19,6 @@ platform:
 install:
   # Get the latest version of $env:nodejs_version
   - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
-  - npm -g install npm 2>&1>nul
-  - SET PATH=%APPDATA%\npm;%PATH%
   # Output useful info for debugging.
   - node --version
   - npm --version
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "license": "MIT",
   "readmeFilename": "README.md",
   "dependencies": {
-    "nan": "~2.9.2",
+    "nan": "~2.10.0",
     "bindings": "~1.3.0",
     "prebuild-install": "^2.4.0"
   },
diff --git a/src/node_snap7_server.cpp b/src/node_snap7_server.cpp
@@ -643,7 +643,7 @@ NAN_MODULE_INIT(S7Server::Init) {
 
 NAN_METHOD(S7Server::New) {
   if (info.IsConstructCall()) {
-    S7Server *s7Server = new S7Server();
+    S7Server *s7Server = new S7Server(info.This());
 
     s7Server->Wrap(info.This());
   info.GetReturnValue().Set(info.This());
@@ -655,7 +655,8 @@ NAN_METHOD(S7Server::New) {
   }
 }
 
-S7Server::S7Server() {
+S7Server::S7Server(v8::Local<v8::Object> resource)
+  : async_resource("S7Server:emit", resource) {
   lastError = 0;
   snap7Server = new TS7Server();
 
@@ -769,7 +770,7 @@ void S7Server::HandleEvent(uv_async_t* handle, int status) {
       event_obj
     };
 
-    Nan::MakeCallback(s7server->handle(), "emit", 2, argv);
+    s7server->async_resource.runInAsyncScope(s7server->handle(), "emit", 2, argv);
     event_list_g.pop_front();
   }
   uv_mutex_unlock(&mutex_event);
@@ -822,7 +823,7 @@ void S7Server::HandleReadWriteEvent(uv_async_t* handle, int status) {
     Nan::New<v8::Function>(S7Server::RWBufferCallback)
   };
 
-  Nan::MakeCallback(s7server->handle(), "emit", 6, argv);
+  s7server->async_resource.runInAsyncScope(s7server->handle(), "emit", 6, argv);
 }
 
 void IOWorkerServer::Execute() {
diff --git a/src/node_snap7_server.h b/src/node_snap7_server.h
@@ -26,7 +26,7 @@ typedef struct {
 
 class S7Server : public Nan::ObjectWrap {
  public:
-  S7Server();
+  S7Server(v8::Local<v8::Object> resource);
   static NAN_MODULE_INIT(Init);
   static NAN_METHOD(New);
 
@@ -73,6 +73,7 @@ class S7Server : public Nan::ObjectWrap {
   TS7Server *snap7Server;
   std::map<int, std::map<int, TBufferInfo> > area2buffer;
   int lastError;
+  Nan::AsyncResource async_resource;
 
  private:
   ~S7Server();
