fsevents 2.0.5 → 2.1.1

package/LICENSE

@@ -1,7 +1,7 @@
 MIT License
 -----------
 
-Copyright (C) 2010-2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar
+Copyright (C) 2010-2019 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -11,6 +11,8 @@ uses fsevents, check out [Chokidar](https://github.com/paulmillr/chokidar).
 
 ## Installation
 
+Supports only **Node.js v8.16 and higher**.
+
 ```sh
 npm install fsevents
 ```
@@ -28,13 +30,15 @@ stop(); // To end observation
 The callback passed as the second parameter to `.watch` get's called whenever the operating system detects a
 a change in the file system. It takes three arguments:
 
-`(path: String, flags: Number, id: String) => {}`
+###### `fsevents.watch(dirname: string, (path: string, flags: number, id: string) => void): Function`
 
- * `path` - the item in the filesystem that have been changed
- * `flags` - a numeric value describing what the change was
- * `id` - an unique-id identifying this specific event
+ * `path: string` - the item in the filesystem that have been changed
+ * `flags: number` - a numeric value describing what the change was
+ * `id: string` - an unique-id identifying this specific event
+ 
+ Returns closer callback.
 
-###### `fsevents.getInfo(path, flags, id): FsEventInfo => {}`
+###### `fsevents.getInfo(path: string, flags: number, id: string): FsEventInfo`
 
 The `getInfo` function takes the `path`, `flags` and `id` arguments and converts those parameters into a structure
 that is easier to digest to determine what the change was.
@@ -62,6 +66,6 @@ The `FsEventsInfo` has the following shape:
 
 ## License
 
-The MIT License Copyright (C) 2010-2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar — see LICENSE file.
+The MIT License Copyright (C) 2010-2019 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller — see LICENSE file.
 
 Visit our [GitHub page](https://github.com/fsevents/fsevents) and [NPM Page](https://npmjs.org/package/fsevents)

package/fsevents.js

@@ -1,7 +1,7 @@
 /*
-** © 2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar
-** Licensed under MIT License.
-*/
+ ** © 2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller
+ ** Licensed under MIT License.
+ */
 
 /* jshint node:true */
 'use strict';
@@ -11,11 +11,15 @@ if (process.platform !== 'darwin') {
 }
 
 const Native = require('./fsevents.node');
-const con = Native.constants;
+const events = Native.constants;
 
 function watch(path, handler) {
-  if ('string' !== typeof path) throw new TypeError(`argument 1 must be a string and not a ${typeof path}`);
-  if ('function' !== typeof handler) throw new TypeError(`argument 2 must be a function and not a ${typeof handler}`);
+  if (typeof path !== 'string') {
+    throw new TypeError(`fsevents argument 1 must be a string and not a ${typeof path}`);
+  }
+  if (typeof handler !== 'function') {
+    throw new TypeError(`fsevents argument 2 must be a function and not a ${typeof handler}`);
+  }
 
   let instance = Native.start(path, handler);
   if (!instance) throw new Error(`could not watch: ${path}`);
@@ -25,9 +29,11 @@ function watch(path, handler) {
     return result;
   };
 }
+
 function getInfo(path, flags) {
   return {
-    path, flags,
+    path,
+    flags,
     event: getEventType(flags),
     type: getFileType(flags),
     changes: getFileChanges(flags)
@@ -35,28 +41,35 @@ function getInfo(path, flags) {
 }
 
 function getFileType(flags) {
-  if (con.kFSEventStreamEventFlagItemIsFile & flags) return 'file';
-  if (con.kFSEventStreamEventFlagItemIsDir & flags) return 'directory';
-  if (con.kFSEventStreamEventFlagItemIsSymlink & flags) return 'symlink';
+  if (events.ItemIsFile & flags) return 'file';
+  if (events.ItemIsDir & flags) return 'directory';
+  if (events.ItemIsSymlink & flags) return 'symlink';
+}
+function anyIsTrue(obj) {
+  for (let key in obj) {
+    if (obj[key]) return true;
+  }
+  return false;
 }
 function getEventType(flags) {
-  if (con.kFSEventStreamEventFlagItemRemoved & flags) return 'deleted';
-  if (con.kFSEventStreamEventFlagItemRenamed & flags) return 'moved';
-  if (con.kFSEventStreamEventFlagItemCreated & flags) return 'created';
-  if (con.kFSEventStreamEventFlagItemModified & flags) return 'modified';
-  if (con.kFSEventStreamEventFlagRootChanged & flags) return 'root-changed';
-
+  if (events.ItemRemoved & flags) return 'deleted';
+  if (events.ItemRenamed & flags) return 'moved';
+  if (events.ItemCreated & flags) return 'created';
+  if (events.ItemModified & flags) return 'modified';
+  if (events.RootChanged & flags) return 'root-changed';
+  if (events.ItemCloned & flags) return 'cloned';
+  if (anyIsTrue(flags)) return 'modified';
   return 'unknown';
 }
 function getFileChanges(flags) {
   return {
-    inode: !!(con.kFSEventStreamEventFlagItemInodeMetaMod & flags),
-    finder: !!(con.kFSEventStreamEventFlagItemFinderInfoMod & flags),
-    access: !!(con.kFSEventStreamEventFlagItemChangeOwner & flags),
-    xattrs: !!(con.kFSEventStreamEventFlagItemXattrMod & flags)
+    inode: !!(events.ItemInodeMetaMod & flags),
+    finder: !!(events.ItemFinderInfoMod & flags),
+    access: !!(events.ItemChangeOwner & flags),
+    xattrs: !!(events.ItemXattrMod & flags)
   };
 }
 
 exports.watch = watch;
 exports.getInfo = getInfo;
-exports.constants = con;
+exports.constants = events;

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "fsevents",
-  "version": "2.0.5",
-  "description": "Native Access to Mac OS-X FSEvents",
+  "version": "2.1.1",
+  "description": "Native Access to MacOS FSEvents",
   "main": "fsevents.js",
   "os": [
     "darwin"
   ],
+  "files": ["fsevents.js", "fsevents.node"],
   "engines": {
     "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
   },
   "scripts": {
     "clean": "node-gyp clean && rm -f fsevents.node",
-    "install": "[ -f fsevents.node ] || npm run prepublishOnly",
+    "build": "node-gyp clean && rm -f fsevents.node && node-gyp rebuild && node-gyp clean",
     "test": "/bin/bash ./test.sh 2>/dev/null",
-    "prepublishOnly": "node-gyp clean && rm -f fsevents.node && node-gyp rebuild && node-gyp clean"
+    "prepublishOnly": "npm run build"
   },
   "repository": {
     "type": "git",
@@ -39,12 +40,15 @@
     {
       "name": "Miroslav Bajtoš",
       "email": "mbajtoss@gmail.com"
+    },
+    {
+      "name": "Paul Miller",
+      "url": "https://paulmillr.com"
     }
   ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/fsevents/fsevents/issues"
   },
-  "homepage": "https://github.com/fsevents/fsevents",
-  "devDependencies": {}
+  "homepage": "https://github.com/fsevents/fsevents"
 }

package/ISSUE_TEMPLATE.md

@@ -1,8 +0,0 @@
-If you are NOT on OS X and have come here to file an issue about compatibility problems, 
-please stop and go to #115 for your answer.
-
-You can look through many other similar closed issues as well if you're interested:
-https://github.com/strongloop/fsevents/search?utf8=%E2%9C%93&q=%22notsup%22+OR+%22EBADPLATFORM%22&type=Issues.
-
-If you are here to report an issue observed while using this module on OS X, please delete
-all this pre-filled text then go ahead and submit your report.

package/binding.gyp

@@ -1,24 +0,0 @@
-{
-  "conditions": [
-    ['OS=="mac"', {
-      "targets": [{
-        "target_name": "fsevents",
-        "sources": [ "src/fsevents.c", "src/rawfsevents.c" ],
-        "xcode_settings": {
-          "OTHER_LDFLAGS": [
-            "-Wl,-bind_at_load",
-            "-framework CoreFoundation -framework CoreServices"
-          ]
-        }
-      }, {
-        "target_name": "action_after_build",
-        "type": "none",
-        "dependencies": ["fsevents"],
-        "copies": [{
-          "files": ["<(PRODUCT_DIR)/fsevents.node"],
-          "destination": "./"
-        }]
-      }]
-    }]
-  ]
-}

package/src/constants.h

@@ -1,112 +0,0 @@
-#ifndef __constants_h
-#define __constants_h
-
-#include "CoreFoundation/CoreFoundation.h"
-
-// constants from https://developer.apple.com/library/mac/documentation/Darwin/Reference/FSEvents_Ref/index.html#//apple_ref/doc/constant_group/FSEventStreamEventFlags
-#ifndef kFSEventStreamEventFlagNone
-#define kFSEventStreamEventFlagNone 0x00000000
-#endif
-
-#ifndef kFSEventStreamEventFlagMustScanSubDirs
-#define kFSEventStreamEventFlagMustScanSubDirs 0x00000001
-#endif
-
-#ifndef kFSEventStreamEventFlagUserDropped
-#define kFSEventStreamEventFlagUserDropped 0x00000002
-#endif
-
-#ifndef kFSEventStreamEventFlagKernelDropped
-#define kFSEventStreamEventFlagKernelDropped 0x00000004
-#endif
-
-#ifndef kFSEventStreamEventFlagEventIdsWrapped
-#define kFSEventStreamEventFlagEventIdsWrapped 0x00000008
-#endif
-
-#ifndef kFSEventStreamEventFlagHistoryDone
-#define kFSEventStreamEventFlagHistoryDone 0x00000010
-#endif
-
-#ifndef kFSEventStreamEventFlagRootChanged
-#define kFSEventStreamEventFlagRootChanged 0x00000020
-#endif
-
-#ifndef kFSEventStreamEventFlagMount
-#define kFSEventStreamEventFlagMount 0x00000040
-#endif
-
-#ifndef kFSEventStreamEventFlagUnmount
-#define kFSEventStreamEventFlagUnmount 0x00000080
-#endif
-
-#ifndef kFSEventStreamEventFlagItemCreated
-#define kFSEventStreamEventFlagItemCreated 0x00000100
-#endif
-
-#ifndef kFSEventStreamEventFlagItemRemoved
-#define kFSEventStreamEventFlagItemRemoved 0x00000200
-#endif
-
-#ifndef kFSEventStreamEventFlagItemInodeMetaMod
-#define kFSEventStreamEventFlagItemInodeMetaMod 0x00000400
-#endif
-
-#ifndef kFSEventStreamEventFlagItemRenamed
-#define kFSEventStreamEventFlagItemRenamed 0x00000800
-#endif
-
-#ifndef kFSEventStreamEventFlagItemModified
-#define kFSEventStreamEventFlagItemModified 0x00001000
-#endif
-
-#ifndef kFSEventStreamEventFlagItemFinderInfoMod
-#define kFSEventStreamEventFlagItemFinderInfoMod 0x00002000
-#endif
-
-#ifndef kFSEventStreamEventFlagItemChangeOwner
-#define kFSEventStreamEventFlagItemChangeOwner 0x00004000
-#endif
-
-#ifndef kFSEventStreamEventFlagItemXattrMod
-#define kFSEventStreamEventFlagItemXattrMod 0x00008000
-#endif
-
-#ifndef kFSEventStreamEventFlagItemIsFile
-#define kFSEventStreamEventFlagItemIsFile 0x00010000
-#endif
-
-#ifndef kFSEventStreamEventFlagItemIsDir
-#define kFSEventStreamEventFlagItemIsDir 0x00020000
-#endif
-
-#ifndef kFSEventStreamEventFlagItemIsSymlink
-#define kFSEventStreamEventFlagItemIsSymlink 0x00040000
-#endif
-
-// constants from https://developer.apple.com/library/mac/documentation/Darwin/Reference/FSEvents_Ref/index.html#//apple_ref/doc/constant_group/FSEventStreamCreateFlags
-#ifndef kFSEventStreamCreateFlagNone
-#define kFSEventStreamCreateFlagNone 0x00000000
-#endif
-
-#ifndef kFSEventStreamCreateFlagUseCFTypes
-#define kFSEventStreamCreateFlagUseCFTypes 0x00000001
-#endif
-
-#ifndef kFSEventStreamCreateFlagNoDefer
-#define kFSEventStreamCreateFlagNoDefer 0x00000002
-#endif
-
-#ifndef kFSEventStreamCreateFlagWatchRoot
-#define kFSEventStreamCreateFlagWatchRoot 0x00000004
-#endif
-
-#ifndef kFSEventStreamCreateFlagIgnoreSelf
-#define kFSEventStreamCreateFlagIgnoreSelf 0x00000008
-#endif
-
-#ifndef kFSEventStreamCreateFlagFileEvents
-#define kFSEventStreamCreateFlagFileEvents 0x00000010
-#endif
-
-#endif

package/src/fsevents.c

@@ -1,155 +0,0 @@
-/*
-** © 2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar
-** Licensed under MIT License.
-*/
-
-#include <assert.h>
-
-#define NAPI_VERSION 4
-#include <node_api.h>
-
-#include "rawfsevents.h"
-#include "constants.h"
-
-#ifndef CHECK
-#ifdef NDEBUG
-#define CHECK(x) do { if (!(x)) abort(); } while (0)
-#else
-#define CHECK assert
-#endif
-#endif
-
-
-typedef struct {
-  size_t count;
-  fse_event_t *events;
-} fse_js_event;
-
-void fse_propagate_event(void *callback, size_t numevents, fse_event_t *events) {
-  fse_js_event *event = malloc(sizeof(*event));
-  CHECK(event);
-  event->count = numevents;
-  event->events = events;
-  CHECK(napi_call_threadsafe_function((napi_threadsafe_function)callback, event, napi_tsfn_blocking) == napi_ok);
-}
-
-void fse_dispatch_events(napi_env env, napi_value callback, void* context, void* data) {
-  fse_js_event *event = data;
-  napi_value recv, args[3];
-  size_t idx;
-  CHECK(napi_get_null(env, &recv) == napi_ok);
-
-  for (idx = 0; idx < event->count; idx++) {
-    CHECK(napi_create_string_utf8(env, event->events[idx].path, NAPI_AUTO_LENGTH, &args[0]) == napi_ok);
-    CHECK(napi_create_uint32(env, event->events[idx].flags, &args[1]) == napi_ok);
-    CHECK(napi_create_int64(env, event->events[idx].id, &args[2]) == napi_ok);
-    CHECK(napi_call_function(env, recv, callback, 3, args, &recv) == napi_ok);
-  }
-
-  free(event->events);
-  free(event);
-}
-
-void fse_free_watcher(napi_env env, void* watcher, void* callback) {
-  fse_free(watcher);
-}
-
-void fse_watcher_started(void *context) {
-  if (context == NULL) {
-    return;
-  }
-  napi_threadsafe_function callback = (napi_threadsafe_function)context;
-  CHECK(napi_acquire_threadsafe_function(callback) == napi_ok);
-}
-void fse_watcher_ended(void *context) {
-  if (context == NULL) {
-    return;
-  }
-  napi_threadsafe_function callback = (napi_threadsafe_function)context;
-  CHECK(napi_release_threadsafe_function(callback, napi_tsfn_abort) == napi_ok);
-}
-
-static napi_value FSEStart(napi_env env, napi_callback_info info) {
-  size_t argc = 2;
-  napi_value argv[argc];
-  char path[PATH_MAX];
-  napi_threadsafe_function callback = NULL;
-  napi_value asyncResource, asyncName;
-
-  CHECK(napi_get_cb_info(env, info, &argc, argv,  NULL, NULL) == napi_ok);
-  CHECK(napi_get_value_string_utf8(env, argv[0], path, PATH_MAX, &argc) == napi_ok);
-  CHECK(napi_create_object(env, &asyncResource) == napi_ok);
-  CHECK(napi_create_string_utf8(env, "fsevents", NAPI_AUTO_LENGTH, &asyncName) == napi_ok);
-  CHECK(napi_create_threadsafe_function(env, argv[1], asyncResource, asyncName, 0, 2, NULL, NULL, NULL, fse_dispatch_events, &callback) == napi_ok);
-  CHECK(napi_ref_threadsafe_function(env, callback) == napi_ok);
-
-  napi_value result;
-  if (!callback) {
-    CHECK(napi_get_undefined(env, &result) == napi_ok);
-    return result;
-  }
-  fse_watcher_t watcher = fse_alloc();
-  CHECK(watcher);
-  fse_watch(path, fse_propagate_event, callback, fse_watcher_started, fse_watcher_ended, watcher);
-
-  CHECK(napi_create_external(env, watcher, fse_free_watcher, callback, &result) == napi_ok);
-  return result;
-}
-static napi_value FSEStop(napi_env env, napi_callback_info info) {
-  size_t argc = 1;
-  napi_value external;
-  fse_watcher_t watcher;
-  CHECK(napi_get_cb_info(env, info, &argc, &external,  NULL, NULL) == napi_ok);
-  CHECK(napi_get_value_external(env, external, (void**)&watcher) == napi_ok);
-  napi_threadsafe_function callback = (napi_threadsafe_function)fse_context_of(watcher);
-  if (callback) {
-    CHECK(napi_unref_threadsafe_function(env, callback) == napi_ok);
-  }
-  fse_unwatch(watcher);
-  napi_value result;
-  CHECK(napi_get_undefined(env, &result) == napi_ok);
-  return result;
-}
-
-#define CONSTANT(name) do {\
-  CHECK(napi_create_int32(env, name, &value) == napi_ok);\
-  CHECK(napi_set_named_property(env, constants, #name, value) == napi_ok);\
-} while (0)
-
-napi_value Init(napi_env env, napi_value exports) {
-  fse_init();
-  napi_value value, constants;
-
-  CHECK(napi_create_object(env, &constants) == napi_ok);
-  napi_property_descriptor descriptors[] = {
-    { "start",     NULL,  FSEStart, NULL, NULL,  NULL, napi_default, NULL },
-    { "stop",      NULL,  FSEStop,  NULL, NULL,  NULL, napi_default, NULL },
-    { "constants", NULL,  NULL,     NULL, NULL,  constants, napi_default, NULL }
-  };
-  CHECK(napi_define_properties(env, exports, 3, descriptors) == napi_ok);
-
-  CONSTANT(kFSEventStreamEventFlagNone);
-  CONSTANT(kFSEventStreamEventFlagMustScanSubDirs);
-  CONSTANT(kFSEventStreamEventFlagUserDropped);
-  CONSTANT(kFSEventStreamEventFlagKernelDropped);
-  CONSTANT(kFSEventStreamEventFlagEventIdsWrapped);
-  CONSTANT(kFSEventStreamEventFlagHistoryDone);
-  CONSTANT(kFSEventStreamEventFlagRootChanged);
-  CONSTANT(kFSEventStreamEventFlagMount);
-  CONSTANT(kFSEventStreamEventFlagUnmount);
-  CONSTANT(kFSEventStreamEventFlagItemCreated);
-  CONSTANT(kFSEventStreamEventFlagItemRemoved);
-  CONSTANT(kFSEventStreamEventFlagItemInodeMetaMod);
-  CONSTANT(kFSEventStreamEventFlagItemRenamed);
-  CONSTANT(kFSEventStreamEventFlagItemModified);
-  CONSTANT(kFSEventStreamEventFlagItemFinderInfoMod);
-  CONSTANT(kFSEventStreamEventFlagItemChangeOwner);
-  CONSTANT(kFSEventStreamEventFlagItemXattrMod);
-  CONSTANT(kFSEventStreamEventFlagItemIsFile);
-  CONSTANT(kFSEventStreamEventFlagItemIsDir);
-  CONSTANT(kFSEventStreamEventFlagItemIsSymlink);
-
-  return exports;
-}
-
-NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)

package/src/rawfsevents.c

@@ -1,151 +0,0 @@
-#include "rawfsevents.h"
-#include "CoreFoundation/CoreFoundation.h"
-#include "CoreServices/CoreServices.h"
-#include <pthread.h>
-#include <assert.h>
-
-#ifndef CHECK
-#ifdef NDEBUG
-#define CHECK(x) do { if (!(x)) abort(); } while (0)
-#else
-#define CHECK assert
-#endif
-#endif
-
-typedef struct {
-  pthread_t thread;
-  CFRunLoopRef loop;
-  pthread_mutex_t lock;
-  pthread_cond_t init;
-} fse_loop_t;
-
-struct fse_watcher_s {
-  char path[PATH_MAX];
-  FSEventStreamRef stream;
-  fse_event_handler_t handler;
-  fse_thread_hook_t hookend;
-  void *context;
-};
-
-static fse_loop_t fsevents;
-
-void fse_init() {
-  fsevents.thread = NULL;
-  fsevents.loop = NULL;
-  pthread_mutex_init(&fsevents.lock, NULL);
-  pthread_cond_init(&fsevents.init, NULL);
-}
-
-void *fse_run_loop(void *data) {
-
-  fsevents.loop = CFRunLoopGetCurrent();
-  pthread_mutex_unlock(&fsevents.lock);
-
-  pthread_cond_signal(&fsevents.init);
-  pthread_mutex_lock(&fsevents.lock);
-  CFRunLoopPerformBlock(fsevents.loop, kCFRunLoopDefaultMode, ^(void){
-    pthread_mutex_unlock(&fsevents.lock);
-  });
-  CFRunLoopRun();
-
-  pthread_mutex_lock(&fsevents.lock);
-  fsevents.loop = NULL;
-  pthread_mutex_unlock(&fsevents.lock);
-
-  return NULL;
-}
-
-void fse_handle_events(
-  ConstFSEventStreamRef stream,
-  void *data,
-  size_t numEvents,
-  void *eventPaths,
-  const FSEventStreamEventFlags eventFlags[],
-  const FSEventStreamEventId eventIds[]
-) {
-  fse_watcher_t watcher = data;
-  if (!watcher->handler) return;
-  fse_event_t *events = malloc(sizeof(*events) * numEvents);
-  CHECK(events);
-  size_t idx;
-  for (idx=0; idx < numEvents; idx++) {
-    fse_event_t *event = &events[idx];
-    CFStringRef path = (CFStringRef)CFArrayGetValueAtIndex((CFArrayRef)eventPaths, idx);
-    strncpy(event->path, CFStringGetCStringPtr(path, kCFStringEncodingUTF8), sizeof(event->path));
-    event->id = eventIds[idx];
-    event->flags = eventFlags[idx];
-  }
-  if (!watcher->handler) {
-    free(events);
-  } else {
-    watcher->handler(watcher->context, numEvents, events);
-  }
-}
-
-void fse_clear(fse_watcher_t watcher) {
-  watcher->path[0] = 0;
-  watcher->handler = NULL;
-  watcher->stream = NULL;
-  watcher->context = NULL;
-  watcher->hookend = NULL;
-}
-
-fse_watcher_t fse_alloc() {
-  fse_watcher_t watcher = malloc(sizeof(*watcher));
-  CHECK(watcher);
-  fse_clear(watcher);
-  return watcher;
-}
-
-void fse_free(fse_watcher_t watcher) {
-  fse_unwatch(watcher);
-  free(watcher);
-}
-
-void fse_watch(const char *path, fse_event_handler_t handler, void *context, fse_thread_hook_t hookstart, fse_thread_hook_t hookend, fse_watcher_t watcher) {
-  pthread_mutex_lock(&fsevents.lock);
-  if (!fsevents.loop) {
-    pthread_create(&fsevents.thread, NULL, fse_run_loop, NULL);
-    pthread_mutex_unlock(&fsevents.lock);
-    pthread_cond_wait(&fsevents.init, &fsevents.lock);
-  }
-
-  strncpy(watcher->path, path, PATH_MAX);
-  watcher->handler = handler;
-  watcher->context = context;
-  CFRunLoopPerformBlock(fsevents.loop, kCFRunLoopDefaultMode, ^(void){
-    if (hookstart) hookstart(watcher->context);
-    FSEventStreamContext streamcontext = { 0, watcher, NULL, NULL, NULL };
-    CFStringRef dirs[] = { CFStringCreateWithCString(NULL, watcher->path, kCFStringEncodingUTF8) };
-    watcher->stream = FSEventStreamCreate(NULL, &fse_handle_events, &streamcontext, CFArrayCreate(NULL, (const void **)&dirs, 1, NULL), kFSEventStreamEventIdSinceNow, (CFAbsoluteTime) 0.1, kFSEventStreamCreateFlagNone | kFSEventStreamCreateFlagWatchRoot | kFSEventStreamCreateFlagFileEvents | kFSEventStreamCreateFlagUseCFTypes);
-    FSEventStreamScheduleWithRunLoop(watcher->stream, fsevents.loop, kCFRunLoopDefaultMode);
-    FSEventStreamStart(watcher->stream);
-  });
-  CFRunLoopWakeUp(fsevents.loop);
-  pthread_mutex_unlock(&fsevents.lock);
-}
-
-void fse_unwatch(fse_watcher_t watcher) {
-  FSEventStreamRef stream = watcher->stream;
-  fse_thread_hook_t hookend = watcher->hookend;
-  void *context = watcher->context;
-  fse_clear(watcher);
-
-  pthread_mutex_lock(&fsevents.lock);
-  if (fsevents.loop) {
-    CFRunLoopPerformBlock(fsevents.loop, kCFRunLoopDefaultMode, ^(void){
-      if (stream) {
-        FSEventStreamStop(stream);
-        FSEventStreamUnscheduleFromRunLoop(stream, fsevents.loop, kCFRunLoopDefaultMode);
-        FSEventStreamInvalidate(stream);
-        FSEventStreamRelease(stream);
-      }
-      if (hookend) hookend(context);
-    });
-  }
-  pthread_mutex_unlock(&fsevents.lock);
-}
-
-void *fse_context_of(fse_watcher_t watcher) {
-  return watcher->context;
-}

package/src/rawfsevents.h

@@ -1,23 +0,0 @@
-#ifndef __loop_h
-#define __loop_h
-
-#include <stdlib.h>
-#include <limits.h>
-
-typedef struct {
-  unsigned long long id;
-  char path[PATH_MAX];
-  unsigned int flags;
-} fse_event_t;
-
-typedef void (*fse_event_handler_t)(void *context, size_t numevents, fse_event_t *events);
-typedef void (*fse_thread_hook_t)(void *context);
-typedef struct fse_watcher_s* fse_watcher_t;
-
-void fse_init();
-fse_watcher_t fse_alloc();
-void fse_free(fse_watcher_t watcherp);
-void fse_watch(const char *path, fse_event_handler_t handler, void *context, fse_thread_hook_t hookstart, fse_thread_hook_t hookend, fse_watcher_t watcher_p);
-void fse_unwatch(fse_watcher_t watcher);
-void *fse_context_of(fse_watcher_t watcher);
-#endif

package/test/01_native.js

@@ -1,34 +0,0 @@
-const native = require('../fsevents.node');
-const { rm, touch, rename } = require('./utils/fs.js');
-const { run, sleep } = require('./utils/misc.js');
-const path = require('path');
-const assert = require('assert');
-
-const DIR = process.argv[2];
-
-run(async () => {
-  const events = [];
-  const listener = native.start(DIR, (...args) => events.push(args));
-
-  await touch(path.join(DIR, 'created'));
-  await sleep(250);
-  await rename(path.join(DIR, 'created'), path.join(DIR, 'renamed'));
-  await sleep(250);
-  await rm(path.join(DIR, 'renamed'));
-  await sleep(500);
-
-  native.stop(listener);
-
-  const expected = [
-    [path.join(DIR, 'created'), 66816, 80865],
-    [path.join(DIR, 'created'), 68864, 80887],
-    [path.join(DIR, 'renamed'), 67584, 80888],
-    [path.join(DIR, 'renamed'), 68096, 80910]
-  ];
-  assert.equal(events.length, expected.length);
-  for (let idx = 0; idx < events.length; idx++) {
-    assert.equal(events[idx].length, expected[idx].length);
-    assert.equal(events[idx][0], expected[idx][0]);
-    assert.equal(events[idx][1], expected[idx][1]);
-  }
-});

package/test/02_interleaved.js

@@ -1,40 +0,0 @@
-const native = require('../fsevents.node');
-const { mkdir, rm, touch, rename } = require('./utils/fs.js');
-const { run, sleep } = require('./utils/misc.js');
-const path = require('path');
-const assert = require('assert');
-
-const DIR = process.argv[2];
-
-run(async () => {
-  await mkdir(`${DIR}/A`);
-  await mkdir(`${DIR}/B`);
-  await sleep(100);
-  const events = [];
-
-  const listenerA = native.start(`${DIR}/A`, (...args) => events.push(args));
-
-  await touch(path.join(`${DIR}/A`, 'created'));
-  await sleep(500);
-  const listenerB = native.start(`${DIR}/B`, (...args) => events.push(args));
-  await sleep(500);
-  native.stop(listenerA);
-  await rename(path.join(`${DIR}/A`, 'created'), path.join(`${DIR}/B`, 'renamed'));
-  await sleep(500);
-  await rm(path.join(`${DIR}/B`, 'renamed'));
-  await sleep(500);
-
-  native.stop(listenerB);
-
-  const expected = [
-    [path.join(`${DIR}/A`, 'created'), 66816, 80865],
-    [path.join(`${DIR}/B`, 'renamed'), 67584, 80888],
-    [path.join(`${DIR}/B`, 'renamed'), 68096, 80910]
-  ];
-  assert.equal(events.length, expected.length);
-  for (let idx = 0; idx < events.length; idx++) {
-    assert.equal(events[idx].length, expected[idx].length);
-    assert.equal(events[idx][0], expected[idx][0]);
-    assert.equal(events[idx][1], expected[idx][1]);
-  }
-});

package/test/02_structure.js

@@ -1,30 +0,0 @@
-/*
-** © 2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar
-** Licensed under MIT License.
-*/
-
-/* jshint node:true */
-'use strict';
-
-const assert = require('assert');
-const fsevents = require('../fsevents');
-const { run } = require('./utils/misc.js');
-
-run(async ()=>{
-  assert.equal('object', typeof fsevents);
-  assert.equal('function', typeof fsevents.watch);
-  assert.equal('function', typeof fsevents.getInfo);
-  assert.equal('object', typeof fsevents.constants);
-
-  assert.equal('file', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagItemIsFile).type);
-  assert.equal('directory', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagItemIsDir).type);
-  assert.equal('symlink', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagItemIsSymlink).type);
-
-  assert.equal('deleted', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagItemRemoved).event);
-  assert.equal('moved', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagItemRenamed).event);
-  assert.equal('created', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagItemCreated).event);
-  assert.equal('modified', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagItemModified).event);
-  assert.equal('root-changed', fsevents.getInfo('path', fsevents.constants.kFSEventStreamEventFlagRootChanged).event);
-
-  assert.deepEqual()
-});

package/test/03_simple.js

@@ -1,61 +0,0 @@
-/*
-** © 2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar
-** Licensed under MIT License.
-*/
-
-/* jshint node:true */
-'use strict';
-
-const { rm, touch, rename } = require('./utils/fs.js');
-const { sleep, capture, run } = require('./utils/misc.js');
-
-const path = require('path');
-const assert = require('assert');
-const fsevents = require('../fsevents');
-
-const DIR = process.argv[2];
-
-run(async ()=>{
-  const events = capture();
-  const stop = fsevents.watch(DIR, events.callback);
-
-  await touch(path.join(DIR, 'created'));
-  await sleep(250);
-  await rename(path.join(DIR, 'created'), path.join(DIR, 'renamed'));
-  await sleep(250);
-  await rm(path.join(DIR, 'renamed'));
-  await sleep(1500);
-
-  await stop();
-
-  const expected = [
-    {
-      path: path.join(DIR, 'created'),
-      event: 'created',
-      type: 'file'
-    },
-    {
-      path: path.join(DIR, 'created'),
-      event: 'moved',
-      type: 'file'
-    },
-    {
-      path: path.join(DIR, 'renamed'),
-      event: 'moved',
-      type: 'file'
-    },
-    {
-      path: path.join(DIR, 'renamed'),
-      event: 'deleted',
-      type: 'file'
-    }
-  ];
-
-  const parsed = events.map((args) => fsevents.getInfo(...args));
-  parsed.forEach((actual, idx)=>{
-    const expect = expected[idx];
-    assert.equal(actual.path, expect.path);
-    assert.equal(actual.type, expect.type);
-    assert.equal(actual.event, expect.event);
-  })
-});

package/test/03_waiting.js

@@ -1,28 +0,0 @@
-/*
-** © 2018 by Philipp Dunkel, Ben Noordhuis, Elan Shankar
-** Licensed under MIT License.
-*/
-
-/* jshint node:true */
-'use strict';
-
-const path = require('path');
-const assert = require('assert');
-const fsevents = require('../fsevents');
-const { run, sleep } = require('./utils/misc.js');
-const { touch } = require('./utils/fs.js');
-
-const DIR = process.argv[2];
-
-run(async ()=>{
-  const events = [];
-  const stopWatching = fsevents.watch(DIR, (...args)=>events.push(args));
-  await sleep(500);
-  for (let idx = 0; idx < 10; idx++) {
-    await touch(path.join(DIR, `${idx + 1}.touch`));
-    await sleep(250);
-  }
-  await sleep(500);
-  assert.equal(events.length, 10)
-  await stopWatching();
-});

package/test/utils/fs.js

@@ -1,51 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-exports.rmrf = async (file) => {
-  let stat;
-  try {
-    stat = await exports.stat(file);
-  } catch(err) {
-    //ignore
-  }
-  if (!stat) return;
-  if (stat.isDirectory()) {
-    const files = await exports.readdir(file);
-    await Promise.all(files.map(exports.rmrf));
-  }
-  await exports.rm(file, stat);
-}
-
-exports.rm = async (file, stat) => {
-  stat = stat || await exports.stat(file);
-  return await new Promise((resolve, reject) => {
-    fs[stat.isDirectory() ? 'rmdir' : 'unlink'](file, (err) => {
-      if (err) return reject(err);
-      resolve();
-    });
-  });
-};
-exports.readdir = async (dir) => {
-  const files = await fs.promises.readdir(dir);
-  return files.map((child) => path.join(file, child));
-};
-exports.stat = fs.promises.stat;
-exports.mkdir = fs.promises.mkdir;
-exports.write = fs.promises.writeFile;
-exports.read = fs.promises.readFile;
-exports.chmod = fs.promises.chmod
-exports.touch = async (file) => {
-  try {
-    await exports.stat(file);
-  } catch(err) {
-    await exports.write(file, '');
-  }
-
-  return await new Promise((resolve, reject) => {
-    fs.utimes(file, Date.now(), Date.now(), (err) => {
-      if (err) return reject(err);
-      resolve();
-    });
-  });
-};
-exports.rename = fs.promises.rename;

package/test/utils/misc.js

@@ -1,21 +0,0 @@
-exports.sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-exports.capture = () => {
-  const events = [];
-  events.callback = (...args) => events.push(args);
-  return events;
-};
-
-exports.run = async (test) => {
-  try {
-    await test();
-    process.exit(0);
-  } catch(err) {
-    console.log('  ---');
-    console.log(`  message: ${err.message}`);
-    console.log(`  actual: ${JSON.stringify(err.actual)}`);
-    console.log(`  expected: ${JSON.stringify(err.expected)}`);
-    console.log(`  source: ${err.stack.split(/\r?\n/)[1].trim()}`);
-    console.log('  ...');
-    process.exit(1);
-  }
-};

package/test.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-N=0
-F=0
-T="$(pwd)/temp"
-V=$(node -v)
-D=$(date +%F_%T)
-
-echo "TAP version 13"
-echo "# Node Version: $V"
-for FILE in $(ls test/*.js); do
-  DIR="$T/$D/$N"
-  rm -rf "$DIR"
-  mkdir -p "$DIR"
-  N=$(($N + 1))
-  echo "# File: $FILE" 1>&2
-  echo "# Directory: $DIR" 1>&2
-  node "$FILE" "$DIR"
-  if [ $? = 0 ]; then
-    echo "ok $N $FILE"
-  else
-    F=$(($F + 1))
-    echo "not ok $N $FILE"
-  fi
-done
-echo "1..$N"
-rm -rf "$T"
-
-exit $F