fsevents 1.2.2 → 1.2.7

package/node_modules/tar/lib/header.js

@@ -6,13 +6,14 @@
 
 const Buffer = require('./buffer.js')
 const types = require('./types.js')
-const pathModule = require('path')
+const pathModule = require('path').posix
 const large = require('./large-numbers.js')
 
+const SLURP = Symbol('slurp')
 const TYPE = Symbol('type')
 
 class Header {
-  constructor (data, off) {
+  constructor (data, off, ex, gex) {
     this.cksumValid = false
     this.needPax = false
     this.nullBlock = false
@@ -35,12 +36,12 @@ class Header {
     this.ctime = null
 
     if (Buffer.isBuffer(data))
-      this.decode(data, off || 0)
+      this.decode(data, off || 0, ex, gex)
     else if (data)
       this.set(data)
   }
 
-  decode (buf, off) {
+  decode (buf, off, ex, gex) {
     if (!off)
       off = 0
 
@@ -55,6 +56,11 @@ class Header {
     this.mtime = decDate(buf, off + 136, 12)
     this.cksum = decNumber(buf, off + 148, 12)
 
+    // if we have extended or global extended headers, apply them now
+    // See https://github.com/npm/node-tar/pull/187
+    this[SLURP](ex)
+    this[SLURP](gex, true)
+
     // old tar versions marked dirs as a file with a trailing /
     this[TYPE] = decString(buf, off + 156, 1)
     if (this[TYPE] === '')
@@ -101,6 +107,16 @@ class Header {
       this.nullBlock = true
   }
 
+  [SLURP] (ex, global) {
+    for (let k in ex) {
+      // we slurp in everything except for the path attribute in
+      // a global extended header, because that's weird.
+      if (ex[k] !== null && ex[k] !== undefined &&
+          !(global && k === 'path'))
+        this[k] = ex[k]
+    }
+  }
+
   encode (buf, off) {
     if (!buf) {
       buf = this.block = Buffer.alloc(512)

package/node_modules/tar/lib/mode-fix.js

@@ -0,0 +1,14 @@
+'use strict'
+module.exports = (mode, isDir) => {
+  mode &= 0o7777
+  // if dirs are readable, then they should be listable
+  if (isDir) {
+    if (mode & 0o400)
+      mode |= 0o100
+    if (mode & 0o40)
+      mode |= 0o10
+    if (mode & 0o4)
+      mode |= 0o1
+  }
+  return mode
+}

package/node_modules/tar/lib/pack.js

@@ -71,6 +71,7 @@ const Pack = warner(class Pack extends MiniPass {
     this.linkCache = opt.linkCache || new Map()
     this.statCache = opt.statCache || new Map()
     this.readdirCache = opt.readdirCache || new Map()
+
     this[WRITEENTRYCLASS] = WriteEntry
     if (typeof opt.onwarn === 'function')
       this.on('warn', opt.onwarn)

package/node_modules/tar/lib/parse.js

@@ -29,6 +29,7 @@ const maxMetaEntrySize = 1024 * 1024
 const Entry = require('./read-entry.js')
 const Pax = require('./pax.js')
 const zlib = require('minizlib')
+const Buffer = require('./buffer.js')
 
 const gzipHeader = Buffer.from([0x1f, 0x8b])
 const STATE = Symbol('state')
@@ -101,7 +102,7 @@ module.exports = warner(class Parser extends EE {
   }
 
   [CONSUMEHEADER] (chunk, position) {
-    const header = new Header(chunk, position)
+    const header = new Header(chunk, position, this[EX], this[GEX])
 
     if (header.nullBlock)
       this[EMIT]('nullBlock')

package/node_modules/tar/lib/unpack.js

@@ -12,6 +12,7 @@ const wc = require('./winchars.js')
 
 const ONENTRY = Symbol('onEntry')
 const CHECKFS = Symbol('checkFs')
+const ISREUSABLE = Symbol('isReusable')
 const MAKEFS = Symbol('makeFs')
 const FILE = Symbol('file')
 const DIRECTORY = Symbol('directory')
@@ -32,6 +33,45 @@ const SKIP = Symbol('skip')
 const DOCHOWN = Symbol('doChown')
 const UID = Symbol('uid')
 const GID = Symbol('gid')
+const crypto = require('crypto')
+
+// Unlinks on Windows are not atomic.
+//
+// This means that if you have a file entry, followed by another
+// file entry with an identical name, and you cannot re-use the file
+// (because it's a hardlink, or because unlink:true is set, or it's
+// Windows, which does not have useful nlink values), then the unlink
+// will be committed to the disk AFTER the new file has been written
+// over the old one, deleting the new file.
+//
+// To work around this, on Windows systems, we rename the file and then
+// delete the renamed file.  It's a sloppy kludge, but frankly, I do not
+// know of a better way to do this, given windows' non-atomic unlink
+// semantics.
+//
+// See: https://github.com/npm/node-tar/issues/183
+/* istanbul ignore next */
+const unlinkFile = (path, cb) => {
+  if (process.platform !== 'win32')
+    return fs.unlink(path, cb)
+
+  const name = path + '.DELETE.' + crypto.randomBytes(16).toString('hex')
+  fs.rename(path, name, er => {
+    if (er)
+      return cb(er)
+    fs.unlink(name, cb)
+  })
+}
+
+/* istanbul ignore next */
+const unlinkFileSync = path => {
+  if (process.platform !== 'win32')
+    return fs.unlinkSync(path)
+
+  const name = path + '.DELETE.' + crypto.randomBytes(16).toString('hex')
+  fs.renameSync(path, name)
+  fs.unlinkSync(name)
+}
 
 // this.gid, entry.gid, this.processUid
 const uint32 = (a, b, c) =>
@@ -138,6 +178,12 @@ class Unpack extends Parser {
       if (parts.length < this.strip)
         return false
       entry.path = parts.slice(this.strip).join('/')
+
+      if (entry.type === 'Link') {
+        const linkparts = entry.linkpath.split(/\/|\\/)
+        if (linkparts.length >= this.strip)
+          entry.linkpath = linkparts.slice(this.strip).join('/')
+      }
     }
 
     if (!this.preservePaths) {
@@ -291,8 +337,10 @@ class Unpack extends Parser {
     })
 
     const tx = this.transform ? this.transform(entry) || entry : entry
-    if (tx !== entry)
+    if (tx !== entry) {
+      tx.on('error', er => this[ONERROR](er, entry))
       entry.pipe(tx)
+    }
     tx.pipe(stream)
   }
 
@@ -351,6 +399,17 @@ class Unpack extends Parser {
     entry.resume()
   }
 
+  // Check if we can reuse an existing filesystem entry safely and
+  // overwrite it, rather than unlinking and recreating
+  // Windows doesn't report a useful nlink, so we just never reuse entries
+  [ISREUSABLE] (entry, st) {
+    return entry.type === 'File' &&
+      !this.unlink &&
+      st.isFile() &&
+      st.nlink <= 1 &&
+      process.platform !== 'win32'
+  }
+
   // check if a thing is there, and if so, try to clobber it
   [CHECKFS] (entry) {
     this[PEND]()
@@ -360,7 +419,7 @@ class Unpack extends Parser {
       fs.lstat(entry.absolute, (er, st) => {
         if (st && (this.keep || this.newer && st.mtime > entry.mtime))
           this[SKIP](entry)
-        else if (er || (entry.type === 'File' && !this.unlink && st.isFile()))
+        else if (er || this[ISREUSABLE](entry, st))
           this[MAKEFS](null, entry)
         else if (st.isDirectory()) {
           if (entry.type === 'Directory') {
@@ -371,7 +430,7 @@ class Unpack extends Parser {
           } else
             fs.rmdir(entry.absolute, er => this[MAKEFS](er, entry))
         } else
-          fs.unlink(entry.absolute, er => this[MAKEFS](er, entry))
+          unlinkFile(entry.absolute, er => this[MAKEFS](er, entry))
       })
     })
   }
@@ -422,7 +481,7 @@ class UnpackSync extends Unpack {
       const st = fs.lstatSync(entry.absolute)
       if (this.keep || this.newer && st.mtime > entry.mtime)
         return this[SKIP](entry)
-      else if (entry.type === 'File' && !this.unlink && st.isFile())
+      else if (this[ISREUSABLE](entry, st))
         return this[MAKEFS](null, entry)
       else {
         try {
@@ -433,7 +492,7 @@ class UnpackSync extends Unpack {
             } else
               fs.rmdirSync(entry.absolute)
           } else
-            fs.unlinkSync(entry.absolute)
+            unlinkFileSync(entry.absolute)
           return this[MAKEFS](null, entry)
         } catch (er) {
           return this[ONERROR](er, entry)
@@ -461,8 +520,10 @@ class UnpackSync extends Unpack {
       return oner(er)
     }
     const tx = this.transform ? this.transform(entry) || entry : entry
-    if (tx !== entry)
+    if (tx !== entry) {
+      tx.on('error', er => this[ONERROR](er, entry))
       entry.pipe(tx)
+    }
 
     tx.on('data', chunk => {
       try {

package/node_modules/tar/lib/write-entry.js

@@ -23,9 +23,12 @@ const ONREADLINK = Symbol('onreadlink')
 const OPENFILE = Symbol('openfile')
 const ONOPENFILE = Symbol('onopenfile')
 const CLOSE = Symbol('close')
+const MODE = Symbol('mode')
 const warner = require('./warn-mixin.js')
 const winchars = require('./winchars.js')
 
+const modeFix = require('./mode-fix.js')
+
 const WriteEntry = warner(class WriteEntry extends MiniPass {
   constructor (p, opt) {
     opt = opt || {}
@@ -104,6 +107,10 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
     }
   }
 
+  [MODE] (mode) {
+    return modeFix(mode, this.type === 'Directory')
+  }
+
   [HEADER] () {
     if (this.type === 'Directory' && this.portable)
       this.noMtime = true
@@ -113,7 +120,7 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
       linkpath: this.linkpath,
       // only the permissions and setuid/setgid/sticky bitflags
       // not the higher-order bits that specify file type
-      mode: this.stat.mode & 0o7777,
+      mode: this[MODE](this.stat.mode),
       uid: this.portable ? null : this.stat.uid,
       gid: this.portable ? null : this.stat.gid,
       size: this.stat.size,
@@ -220,11 +227,21 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
 
   [ONREAD] (fd, buf, offset, length, pos, remain, blockRemain, bytesRead) {
     if (bytesRead <= 0 && remain > 0) {
-      const er = new Error('unexpected EOF')
+      const er = new Error('encountered unexpected EOF')
+      er.path = this.absolute
+      er.syscall = 'read'
+      er.code = 'EOF'
+      this[CLOSE](fd)
+      return this.emit('error', er)
+    }
+
+    if (bytesRead > remain) {
+      const er = new Error('did not encounter expected EOF')
       er.path = this.absolute
       er.syscall = 'read'
       er.code = 'EOF'
-      this.emit('error', er)
+      this[CLOSE](fd)
+      return this.emit('error', er)
     }
 
     // null out the rest of the buffer, if we could fit the block padding
@@ -312,9 +329,7 @@ const WriteEntryTar = warner(class WriteEntryTar extends MiniPass {
       this.noMtime = true
 
     this.path = readEntry.path
-    this.mode = readEntry.mode
-    if (this.mode)
-      this.mode = this.mode & 0o7777
+    this.mode = this[MODE](readEntry.mode)
     this.uid = this.portable ? null : readEntry.uid
     this.gid = this.portable ? null : readEntry.gid
     this.uname = this.portable ? null : readEntry.uname
@@ -376,6 +391,10 @@ const WriteEntryTar = warner(class WriteEntryTar extends MiniPass {
     readEntry.pipe(this)
   }
 
+  [MODE] (mode) {
+    return modeFix(mode, this.type === 'Directory')
+  }
+
   write (data) {
     const writeLen = data.length
     if (writeLen > this.blockRemain)

package/node_modules/tar/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "tar@^4",
-  "_id": "tar@4.4.1",
+  "_id": "tar@4.4.8",
   "_inBundle": false,
-  "_integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
+  "_integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
   "_location": "/tar",
   "_phantomChildren": {},
   "_requested": {
@@ -18,10 +18,10 @@
   "_requiredBy": [
     "/node-pre-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz",
-  "_shasum": "b25d5a8470c976fd7a9a8a350f42c59e9fa81749",
+  "_resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+  "_shasum": "b19eec3fde2a96e64666df9fdb40c5ca1bc3747d",
   "_spec": "tar@^4",
-  "_where": "/Users/eshanker/Code/fsevents/node_modules/node-pre-gyp",
+  "_where": "/Users/pdunkel1/Office/fsevents/fsevents/node_modules/node-pre-gyp",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -32,25 +32,25 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "chownr": "^1.0.1",
+    "chownr": "^1.1.1",
     "fs-minipass": "^1.2.5",
-    "minipass": "^2.2.4",
-    "minizlib": "^1.1.0",
+    "minipass": "^2.3.4",
+    "minizlib": "^1.1.1",
     "mkdirp": "^0.5.0",
-    "safe-buffer": "^5.1.1",
+    "safe-buffer": "^5.1.2",
     "yallist": "^3.0.2"
   },
   "deprecated": false,
   "description": "tar for node",
   "devDependencies": {
-    "chmodr": "^1.0.2",
+    "chmodr": "^1.2.0",
     "end-of-stream": "^1.4.1",
     "events-to-array": "^1.1.2",
     "mutate-fs": "^2.1.1",
     "rimraf": "^2.6.2",
-    "tap": "^11.1.3",
-    "tar-fs": "^1.16.0",
-    "tar-stream": "^1.5.2"
+    "tap": "^12.0.1",
+    "tar-fs": "^1.16.3",
+    "tar-stream": "^1.6.2"
   },
   "engines": {
     "node": ">=4.5"
@@ -74,5 +74,5 @@
     "preversion": "npm test",
     "test": "tap test/*.js --100 -J --coverage-report=text -c"
   },
-  "version": "4.4.1"
+  "version": "4.4.8"
 }

package/node_modules/util-deprecate/package.json

@@ -21,7 +21,7 @@
   "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
   "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
   "_spec": "util-deprecate@~1.0.1",
-  "_where": "/Users/eshanker/Code/fsevents/node_modules/readable-stream",
+  "_where": "/Users/pdunkel1/Office/fsevents/fsevents/node_modules/readable-stream",
   "author": {
     "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",

package/node_modules/wide-align/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "wide-align@^1.1.0",
-  "_id": "wide-align@1.1.2",
+  "_id": "wide-align@1.1.3",
   "_inBundle": false,
-  "_integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+  "_integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
   "_location": "/wide-align",
   "_phantomChildren": {},
   "_requested": {
@@ -18,10 +18,10 @@
   "_requiredBy": [
     "/gauge"
   ],
-  "_resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-  "_shasum": "571e0f1b0604636ebc0dfc21b0339bbe31341710",
+  "_resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+  "_shasum": "ae074e6bdc0c14a431e804e624549c633b000457",
   "_spec": "wide-align@^1.1.0",
-  "_where": "/Users/eshanker/Code/fsevents/node_modules/gauge",
+  "_where": "/Users/pdunkel1/Office/fsevents/fsevents/node_modules/gauge",
   "author": {
     "name": "Rebecca Turner",
     "email": "me@re-becca.org",
@@ -32,12 +32,12 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "string-width": "^1.0.2"
+    "string-width": "^1.0.2 || 2"
   },
   "deprecated": false,
   "description": "A wide-character aware text alignment function for use on the console or with fixed width fonts.",
   "devDependencies": {
-    "tap": "^10.3.2"
+    "tap": "10 || 11 || 12"
   },
   "files": [
     "align.js"
@@ -62,5 +62,5 @@
     "test": "tap --coverage test/*.js",
     "version": "perl -pi -e 's/^(  \"version\": $ENV{npm_config_node_version}\").*?\",/$1abc\",/' package-lock.json ; git add package-lock.json"
   },
-  "version": "1.1.2"
+  "version": "1.1.3"
 }

package/node_modules/wrappy/package.json

@@ -22,7 +22,7 @@
   "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
   "_shasum": "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f",
   "_spec": "wrappy@1",
-  "_where": "/Users/eshanker/Code/fsevents/node_modules/inflight",
+  "_where": "/Users/pdunkel1/Office/fsevents/fsevents/node_modules/inflight",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",

package/node_modules/yallist/iterator.js

@@ -1,8 +1,8 @@
 'use strict'
-var Yallist = require('./yallist.js')
-
-Yallist.prototype[Symbol.iterator] = function* () {
-  for (let walker = this.head; walker; walker = walker.next) {
-    yield walker.value
+module.exports = function (Yallist) {
+  Yallist.prototype[Symbol.iterator] = function* () {
+    for (let walker = this.head; walker; walker = walker.next) {
+      yield walker.value
+    }
   }
 }

package/node_modules/yallist/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "yallist@^3.0.2",
-  "_id": "yallist@3.0.2",
+  "_id": "yallist@3.0.3",
   "_inBundle": false,
-  "_integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+  "_integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
   "_location": "/yallist",
   "_phantomChildren": {},
   "_requested": {
@@ -19,10 +19,10 @@
     "/minipass",
     "/tar"
   ],
-  "_resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
-  "_shasum": "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9",
+  "_resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+  "_shasum": "b4b049e314be545e3ce802236d6cd22cd91c3de9",
   "_spec": "yallist@^3.0.2",
-  "_where": "/Users/eshanker/Code/fsevents/node_modules/tar",
+  "_where": "/Users/pdunkel1/Office/fsevents/fsevents/node_modules/tar",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -36,7 +36,7 @@
   "deprecated": false,
   "description": "Yet Another Linked List",
   "devDependencies": {
-    "tap": "^10.3.0"
+    "tap": "^12.1.0"
   },
   "directories": {
     "test": "test"
@@ -59,5 +59,5 @@
     "preversion": "npm test",
     "test": "tap test/*.js --100"
   },
-  "version": "3.0.2"
+  "version": "3.0.3"
 }

package/node_modules/yallist/yallist.js

@@ -371,6 +371,6 @@ function Node (value, prev, next, list) {
 }
 
 try {
-  // add if support or Symbol.iterator is present
-  require('./iterator.js')
+  // add if support for Symbol.iterator is present
+  require('./iterator.js')(Yallist)
 } catch (er) {}

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "fsevents",
-  "version": "1.2.2",
+  "version": "1.2.7",
   "description": "Native Access to Mac OS-X FSEvents",
   "main": "fsevents.js",
   "dependencies": {
     "nan": "^2.9.2",
-    "node-pre-gyp": "^0.9.0"
+    "node-pre-gyp": "^0.10.0"
   },
   "os": [
     "darwin"
   ],
   "engines": {
-    "node": ">=0.8.0"
+    "node": ">=4.0"
   },
   "scripts": {
     "install": "node install",

package/src/async.cc

@@ -11,7 +11,7 @@ void async_propagate(uv_async_t *async) {
   fse_event *event;
   char pathbuf[1024];
   const char *pathptr = NULL;
-  fse->lock();
+  uv_mutex_lock(&fse->mutex);
   cnt = fse->events.size();
   for (idx=0; idx<cnt; idx++) {
     event = fse->events.at(idx);
@@ -22,7 +22,7 @@ void async_propagate(uv_async_t *async) {
     delete event;
   }
   if (cnt>0) fse->events.clear();
-  fse->unlock();
+  uv_mutex_unlock(&fse->mutex);
 }
 
 void FSEvents::asyncStart() {

package/src/methods.cc

@@ -4,28 +4,30 @@
 */
 
 void FSEvents::emitEvent(const char *path, UInt32 flags, UInt64 id) {
-  if (!handler) return;
   Nan::HandleScope handle_scope;
+  v8::Local<v8::Object> object = handle();
+  v8::Local<v8::Value> key = Nan::New<v8::String>("handler").ToLocalChecked();
+  Nan::Callback handler(Nan::To<v8::Function>(Nan::Get(object, key).ToLocalChecked()).ToLocalChecked());
   v8::Local<v8::Value> argv[] = {
     Nan::New<v8::String>(path).ToLocalChecked(),
     Nan::New<v8::Number>(flags),
     Nan::New<v8::Number>(id)
   };
-  handler->Call(3, argv, &async_resource);
+  handler.Call(3, argv, &async_resource);
 }
 
 NAN_METHOD(FSEvents::New) {
-  Nan::Utf8String *path = new Nan::Utf8String(info[0]);
-  Nan::Callback *callback = new Nan::Callback(info[1].As<v8::Function>());
+  Nan::Utf8String path(info[0]);
 
-  FSEvents *fse = new FSEvents(**path, callback);
+  FSEvents *fse = new FSEvents(*path);
   fse->Wrap(info.This());
+  Nan::Set(info.This(), Nan::New<v8::String>("handler").ToLocalChecked(), info[1]);
 
   info.GetReturnValue().Set(info.This());
 }
 
 NAN_METHOD(FSEvents::Stop) {
-  FSEvents* fse = node::ObjectWrap::Unwrap<FSEvents>(info.This());
+  FSEvents* fse = Nan::ObjectWrap::Unwrap<FSEvents>(info.This());
 
   fse->threadStop();
   fse->asyncStop();
@@ -34,7 +36,7 @@ NAN_METHOD(FSEvents::Stop) {
 }
 
 NAN_METHOD(FSEvents::Start) {
-  FSEvents* fse = node::ObjectWrap::Unwrap<FSEvents>(info.This());
+  FSEvents* fse = Nan::ObjectWrap::Unwrap<FSEvents>(info.This());
   fse->asyncStart();
   fse->threadStart();
 

package/src/thread.cc

@@ -30,13 +30,13 @@
 
 void FSEvents::threadStart() {
   if (threadloop) return;
-  pthread_create(&thread, NULL, &FSEvents::threadRun, this);
+  if (uv_thread_create(&thread, &FSEvents::threadRun, this)) abort();
 }
 
 void HandleStreamEvents(ConstFSEventStreamRef stream, void *ctx, size_t numEvents, void *eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]) {
   FSEvents * fse = (FSEvents *)ctx;
   size_t idx;
-  fse->lock();
+  uv_mutex_lock(&fse->mutex);
   for (idx=0; idx < numEvents; idx++) {
     fse_event *event = new fse_event(
         (CFStringRef)CFArrayGetValueAtIndex((CFArrayRef)eventPaths, idx),
@@ -46,10 +46,10 @@ void HandleStreamEvents(ConstFSEventStreamRef stream, void *ctx, size_t numEvent
     fse->events.push_back(event);
   }
   fse->asyncTrigger();
-  fse->unlock();
+  uv_mutex_unlock(&fse->mutex);
 }
 
-void *FSEvents::threadRun(void *ctx) {
+void FSEvents::threadRun(void *ctx) {
   FSEvents *fse = (FSEvents*)ctx;
   FSEventStreamContext context = { 0, ctx, NULL, NULL, NULL };
   fse->threadloop = CFRunLoopGetCurrent();
@@ -62,11 +62,10 @@ void *FSEvents::threadRun(void *ctx) {
   FSEventStreamInvalidate(stream);
   FSEventStreamRelease(stream);
   fse->threadloop = NULL;
-  return NULL;
 }
 
 void FSEvents::threadStop() {
   if (!threadloop) return;
   CFRunLoopStop(threadloop);
-  pthread_join(thread, NULL);
+  if (uv_thread_join(&thread)) abort();
 }

package/.npmignore

@@ -1 +0,0 @@
-test/