Add kqueue backend

.github/workflows/release.yml

@@ -63,6 +63,7 @@ jobs:
           cache: yarn
           node-version: ${{matrix.node}}
       - run: yarn --frozen-lockfile --ignore-scripts
+      - run: npm install node-gyp -g
       - run: yarn prebuild --arch ${{ matrix.arch }} -t ${{ matrix.node }}.0.0
         env:
           PREBUILD_LIBC: ${{ matrix.libc }}
@@ -72,10 +73,35 @@ jobs:
           name: prebuilds
           path: prebuilds
 
+  build-freebsd:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build FreeBSD
+        uses: vmactions/freebsd-vm@v0
+        with:
+          usesh: true
+          prepare: |
+            pkg install -y -f curl node libnghttp2 npm yarn
+            echo "~~~~ node -v ~~~~"
+            node -v
+            echo "~~~~ yarn --version ~~~~"
+            yarn --version
+          run: |
+            yarn --frozen-lockfile --ignore-scripts
+            npm install node-gyp -g
+            yarn prebuild --arch x64 -t 16.0.0
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: prebuilds
+          path: prebuilds
+
   release:
     runs-on: ubuntu-latest
     needs:
       - build
+      - build-freebsd
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

.github/workflows/test.yml

@@ -51,3 +51,20 @@ jobs:
           watchman -v
       - run: yarn --frozen-lockfile
       - run: yarn test
+  test-freebsd:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Test in FreeBSD
+        uses: vmactions/freebsd-vm@v0
+        with:
+          usesh: true
+          prepare: |
+            pkg install -y -f curl node libnghttp2 npm yarn
+            echo "~~~~ node -v ~~~~"
+            node -v
+            echo "~~~~ yarn --version ~~~~"
+            yarn --version
+          run: |
+            yarn --frozen-lockfile
+            yarn test

binding.gyp

@@ -14,15 +14,17 @@
             "src/watchman/WatchmanBackend.cc",
             "src/shared/BruteForceBackend.cc",
             "src/unix/fts.cc",
-            "src/macos/FSEventsBackend.cc"
+            "src/macos/FSEventsBackend.cc",
+            "src/kqueue/KqueueBackend.cc"
           ],
           "link_settings": {
             "libraries": ["CoreServices.framework"]
           },
           "defines": [
             "WATCHMAN",
             "BRUTE_FORCE",
-            "FS_EVENTS"
+            "FS_EVENTS",
+            "KQUEUE"
           ],
           "xcode_settings": {
             "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
@@ -65,6 +67,20 @@
               "ExceptionHandling": 1,  # /EHsc
             }
           }
+        }],
+        ['OS=="freebsd"', {
+          "sources": [
+            "src/watchman/BSER.cc",
+            "src/watchman/WatchmanBackend.cc",
+            "src/shared/BruteForceBackend.cc",
+            "src/unix/fts.cc",
+            "src/kqueue/KqueueBackend.cc"
+          ],
+          "defines": [
+            "WATCHMAN",
+            "BRUTE_FORCE",
+            "KQUEUE"
+          ]
         }]
       ]
     }

scripts/build-npm.js

@@ -48,6 +48,10 @@ const triples = [
     platform: 'android',
     arch: 'arm64'
   },
+  {
+    platform: 'freebsd',
+    arch: 'x64'
+  }
 ];
 
 let optionalDependencies = {};

src/Backend.cc

@@ -10,6 +10,9 @@
 #ifdef INOTIFY
 #include "linux/InotifyBackend.hh"
 #endif
+#ifdef KQUEUE
+#include "kqueue/KqueueBackend.hh"
+#endif
 #include "shared/BruteForceBackend.hh"
 
 #include "Backend.hh"
@@ -41,6 +44,11 @@ std::shared_ptr<Backend> getBackend(std::string backend) {
       return std::make_shared<InotifyBackend>();
     }
   #endif
+  #ifdef KQUEUE
+    if (backend == "kqueue" || backend == "default") {
+      return std::make_shared<KqueueBackend>();
+    }
+  #endif
   if (backend == "brute-force" || backend == "default") {
     return std::make_shared<BruteForceBackend>();
   }

src/Event.hh

@@ -46,12 +46,7 @@ public:
   void remove(std::string path) {
     std::lock_guard<std::mutex> l(mMutex);
     Event *event = internalUpdate(path);
-    if (event->isCreated) {
-      // Ignore event when rapidly created and removed
-      mEvents.erase(path);
-    } else {
-      event->isDeleted = true;
-    }
+    event->isDeleted = true;
   }
 
   size_t size() {
@@ -63,7 +58,9 @@ public:
     std::lock_guard<std::mutex> l(mMutex);
     std::vector<Event> eventsCloneVector;
     for(auto it = mEvents.begin(); it != mEvents.end(); ++it) {
-      eventsCloneVector.push_back(it->second);
+      if (!(it->second.isCreated && it->second.isDeleted)) {
+        eventsCloneVector.push_back(it->second);
+      }
     }
     return eventsCloneVector;
   }