Revert "Merge electron-userland#195"

This reverts commit 7f00a68.

Author: fasterthanlime

package.json

@@ -37,7 +37,6 @@
     "@types/node": "^7.0.12",
     "btoa": "^1.1.2",
     "debug": "^2.5.1",
-    "gaze": "^1.1.2",
     "lru-cache": "^4.0.1",
     "mkdirp": "^0.5.1",
     "pify": "^2.3.0",

src/custom-operators.js

@@ -24,6 +24,12 @@ function retryWithDelayOrError(errors, maxRetries) {
 }
 
 const newCoolOperators = {
+  guaranteedThrottle: function(time, scheduler = async) {
+    return this
+      .map((x) => Observable.timer(time, scheduler).map(() => x))
+      .switch();
+  },
+
   retryAtIntervals: function(maxRetries = 3) {
     return this.retryWhen((errors) => retryWithDelayOrError(errors, maxRetries));
   },

src/live-reload.js

@@ -52,7 +52,8 @@ function enableLiveReloadNaive() {
     .filter(x => !FileChangedCache.isInNodeModules(x.filePath));
 
   let weShouldReload = filesWeCareAbout
-    .mergeMap(x => watchPath(x.filePath).map(() => x));
+    .mergeMap(x => watchPath(x.filePath).map(() => x))
+    .guaranteedThrottle(1*1000);
 
   return weShouldReload
     .switchMap(() => Observable.defer(() => Observable.fromPromise(reloadAllWindows()).timeout(5*1000).catch(() => Observable.empty())))
@@ -76,7 +77,8 @@ function enableReactHMR(blacklist) {
     .filter(x => !FileChangedCache.isInNodeModules(x.filePath));
 
   let weShouldReload = filesWeCareAbout
-    .mergeMap(x => watchPath(x.filePath).map(() => x));
+    .mergeMap(x => watchPath(x.filePath).map(() => x))
+    .guaranteedThrottle(1*1000);
 
   return weShouldReload
     .switchMap(() => Observable.defer(() => Observable.fromPromise(triggerHMRInRenderers()).catch(() => Observable.empty())))

src/pathwatcher-rx.js

@@ -1,26 +1,35 @@
+import fs from 'fs';
 import {Observable} from 'rxjs/Observable';
 import {Subscription} from 'rxjs/Subscription';
-import {Gaze} from 'gaze';
 import LRU from 'lru-cache';
 
 import 'rxjs/add/operator/publish';
 
 export function watchPathDirect(directory) {
   return Observable.create((subj) => {
+    let watcher = null;
     let dead = false;
 
-    const watcher = new Gaze();
-    watcher.on('error', (err) => {
-      dead = true;
-      subj.error(err);
-    });
-    watcher.add(directory);
-    watcher.on('changed', (fileName) => {
-      if (dead) return;
-      subj.next({fileName, eventType: 'changed'});
-    });
+    try {
+      watcher = fs.watch(directory, {}, (eventType, fileName) => {
+        if (dead) return;
+        subj.next({eventType, fileName});
+      });
 
-    return new Subscription(() => { if (!dead) { watcher.close(); } });
+      watcher.on('error', (e) => {
+        dead = true;
+        subj.error(e);
+      });
+    } catch (e) {
+      dead = true;
+      if (e.code === "ENOENT") {
+        // that's ok, we just won't watch the non-existent directory
+      } else {
+        // if it's not that, let's log and continue
+        console.warn(e.message);
+      }
+    }
+    return new Subscription(() => { if (!dead && watcher) { watcher.close(); } });
   });
 }