Merge pull request #110 from Axosoft/revert/napi-changes

Revert Napi changes

Author: implausible

binding.gyp

@@ -5,27 +5,22 @@
         "sources": [
             "src/NSFW.cpp",
             "src/Queue.cpp",
-            "src/NativeInterface.cpp"
+            "src/NativeInterface.cpp",
+            "includes/NSFW.h",
+            "includes/Queue.h",
+            "includes/NativeInterface.h"
         ],
         "include_dirs": [
-            "includes",
-            "<!@(node -p \"require('node-addon-api').include\")"
+            "<!(node -e \"require('nan')\")",
+            "includes"
         ],
-        "cflags!": ["-fno-exceptions"],
-        "cflags_cc!": ["-fno-exceptions"],
-        "xcode_settings": {
-            "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-            "CLANG_CXX_LIBRARY": "libc++",
-            "MACOSX_DEPLOYMENT_TARGET": "10.7",
-        },
-        "msvs_settings": {
-            "VCCLCompilerTool": { "ExceptionHandling": 1 },
-        },
         "conditions": [
             ["OS=='win'", {
                 "sources": [
                     "src/win32/Controller.cpp",
-                    "src/win32/Watcher.cpp"
+                    "src/win32/Watcher.cpp",
+                    "includes/win32/Controller.h",
+                    "includes/win32/Watcher.h"
                 ],
                 "msvs_settings": {
                     "VCCLCompilerTool": {
@@ -37,14 +32,14 @@
                 }
             }],
             ["OS=='mac'", {
-                "cflags+": ["-fvisibility-hidden"],
                 "sources": [
                     "src/osx/RunLoop.cpp",
-                    "src/osx/FSEventsService.cpp"
+                    "src/osx/FSEventsService.cpp",
+                    "includes/osx/RunLoop.h",
+                    "includes/osx/FSEventsService.h"
                 ],
                 "xcode_settings": {
-                    "GCC_SYMBOLS_PRIVATE_EXTERN": "YES", # -fvisibility=hidden
-                    "MACOSX_DEPLOYMENT_TARGET": "10.7",
+                    'MACOSX_DEPLOYMENT_TARGET': '10.7',
                     "OTHER_CFLAGS": [
                         "-std=c++11",
                         "-stdlib=libc++"
@@ -65,7 +60,10 @@
                 "sources": [
                     "src/linux/InotifyEventLoop.cpp",
                     "src/linux/InotifyTree.cpp",
-                    "src/linux/InotifyService.cpp"
+                    "src/linux/InotifyService.cpp",
+                    "includes/linux/InotifyEventLoop.h",
+                    "includes/linux/InotifyTree.h",
+                    "includes/linux/InotifyService.h"
                 ],
                 "cflags": [
                     "-Wno-unknown-pragmas",
@@ -102,7 +100,7 @@
                 ],
                 "libraries": [
                     "-L/usr/local/lib",
-                    "-linotify" 
+                    "-linotify"
                 ]
             }],
         ]

includes/NSFW.h

@@ -1,70 +1,69 @@
 #ifndef NSFW_H
 #define NSFW_H
 
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <napi.h>
-#include <thread>
+#include "Queue.h"
+#include "NativeInterface.h"
+#include <nan.h>
+#include <uv.h>
 #include <vector>
+#include <atomic>
 
-#include "./Queue.h"
-#include "./NativeInterface.h"
-
-class NSFW : public Napi::ObjectWrap<NSFW> {
-  private:
-    static Napi::FunctionReference constructor;
-    static std::size_t instanceCount;
-    static bool gcEnabled;
+using namespace Nan;
 
-    uint32_t mDebounceMS;
-    Napi::ThreadSafeFunction mErrorCallback;
-    Napi::ThreadSafeFunction mEventCallback;
-    std::unique_ptr<NativeInterface> mInterface;
-    std::mutex mInterfaceLock;
-    std::shared_ptr<EventQueue> mQueue;
-    std::string mPath;
-    std::thread mPollThread;
-    std::atomic<bool> mRunning;
+class NSFW : public ObjectWrap {
+public:
+  static NAN_MODULE_INIT(Init);
 
-    class StartWorker: public Napi::AsyncWorker {
-      public:
-        StartWorker(Napi::Env env, NSFW *nsfw);
-        void Execute();
-        void OnOK();
-        Napi::Promise RunJob();
+  static void fireErrorCallback(uv_async_t *handle);
+  static void fireEventCallback(uv_async_t *handle);
+  static void pollForEvents(void *arg);
 
-      private:
-        enum JobStatus { STARTED, ALREADY_RUNNING, COULD_NOT_START, JOB_NOT_EXECUTED_YET };
-        Napi::Promise::Deferred mDeferred;
-        NSFW *mNSFW;
-        JobStatus mStatus;
-    };
+  Persistent<v8::Object> mPersistentHandle;
+private:
+  NSFW(uint32_t debounceMS, std::string path, Callback *eventCallback, Callback *errorCallback);
+  ~NSFW();
 
-    Napi::Value Start(const Napi::CallbackInfo &info);
+  uint32_t mDebounceMS;
+  uv_async_t mErrorCallbackAsync;
+  uv_async_t mEventCallbackAsync;
+  Callback *mErrorCallback;
+  Callback *mEventCallback;
+  NativeInterface *mInterface;
+  uv_mutex_t mInterfaceLock;
+  bool mInterfaceLockValid;
+  std::string mPath;
+  uv_thread_t mPollThread;
+  std::atomic<bool> mRunning;
+  std::shared_ptr<EventQueue> mQueue;
 
-    class StopWorker: public Napi::AsyncWorker {
-      public:
-        StopWorker(Napi::Env env, NSFW *nsfw);
-        void Execute();
-        void OnOK();
-        Napi::Promise RunJob();
+  struct ErrorBaton {
+    NSFW *nsfw;
+    std::string error;
+  };
 
-      private:
-        Napi::Promise::Deferred mDeferred;
-        bool mDidStopWatching;
-        NSFW *mNSFW;
-    };
+  static NAN_METHOD(JSNew);
 
-    Napi::Value Stop(const Napi::CallbackInfo &info);
+  static NAN_METHOD(Start);
+  class StartWorker : public AsyncWorker {
+  public:
+    StartWorker(NSFW *nsfw, Callback *callback);
+    void Execute();
+    void HandleOKCallback();
+  private:
+    NSFW *mNSFW;
+  };
 
+  static NAN_METHOD(Stop);
+  class StopWorker : public AsyncWorker {
   public:
-    static Napi::Object Init(Napi::Env, Napi::Object exports);
-    static Napi::Value InstanceCount(const Napi::CallbackInfo &info);
-    void pollForEvents();
+    StopWorker(NSFW *nsfw, Callback *callback);
+    void Execute();
+    void HandleOKCallback();
+  private:
+    NSFW *mNSFW;
+  };
 
-    NSFW(const Napi::CallbackInfo &info);
-    ~NSFW();
+  static Persistent<v8::Function> constructor;
 };
 
 #endif

js/spec/index-spec.js

@@ -673,14 +673,4 @@ describe('Node Sentinel File Watcher', function() {
       }
     });
   });
-
-  describe('Garbage collection', function() {
-    it('can garbage collect all instances', async function () {
-      this.timeout(60000);
-      while (nsfw.getAllocatedInstanceCount() > 0) {
-        global.gc();
-        await sleep(0);
-      }
-    });
-  });
 });

js/src/index.js

@@ -1,7 +1,8 @@
 const { promises: fs } = require('fs');
 const path = require('path');
+const { promisify } = require('util');
 
-const NSFW = require('../../build/Release/nsfw.node');
+const { NSFW } = require('../../build/Release/nsfw.node');
 
 function NSFWFilePoller(watchPath, eventCallback, debounceMS) {
   const { CREATED, DELETED, MODIFIED } = nsfw.actions;
@@ -71,7 +72,7 @@ const buildNSFW = async (watchPath, eventCallback, { debounceMS = 500, errorCall
   }
 
   if (stats.isDirectory()) {
-    return new NSFW(watchPath, eventCallback, { debounceMS, errorCallback });
+    return new NSFW(debounceMS, watchPath, eventCallback, errorCallback);
   } else if (stats.isFile()) {
     return new NSFWFilePoller(watchPath, eventCallback, debounceMS);
   } else {
@@ -85,9 +86,13 @@ function nsfw(watchPath, eventCallback, options) {
   }
 
   const implementation = watchPath;
-
-  this.start = () => implementation.start();
-  this.stop = () => implementation.stop();
+  if (implementation instanceof NSFW) {
+    this.start = promisify((callback) => implementation.start(callback));
+    this.stop = promisify((callback) => implementation.stop(callback));
+  } else {
+    this.start = () => implementation.start();
+    this.stop = () => implementation.stop();
+  }
 }
 
 nsfw.actions = {

package.json

@@ -26,7 +26,7 @@
   ],
   "homepage": "https://github.com/axosoft/node-simple-file-watcher",
   "dependencies": {
-    "node-addon-api": "*"
+    "nan": "^2.0.0"
   },
   "devDependencies": {
     "eslint": "^6.8.0",

src/NSFW.cpp

@@ -894,6 +894,11 @@ mute-stream@0.0.8:
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+nan@^2.0.0:
+  version "2.14.0"
+  resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -904,11 +909,6 @@ nice-try@^1.0.4:
   resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-addon-api@*:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz#f9afb8d777a91525244b01775ea0ddbe1125483b"
-  integrity sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==
-
 node-environment-flags@1.0.6:
   version "1.0.6"
   resolved "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"