Merge pull request #209 from AGrzes/master

Fixing test failures on node 8

.travis.yml

@@ -6,6 +6,7 @@ node_js:
   - "5"
   - "6"
   - "7"
+  - "8"
 cache:
   directories:
     - node_modules

lib/binding.js

@@ -10,6 +10,8 @@ var FSError = require('./error');
 var constants = require('constants');
 var getPathParts = require('./filesystem').getPathParts;
 
+/** Workaround for optimizations in node 8 */
+const statValues = process.binding('fs').getStatValues ? process.binding('fs').getStatValues() : [];
 
 /**
  * Call the provided function and either return the result or call the callback
@@ -44,6 +46,40 @@ function maybeCallback(callback, thisArg, func) {
   }
 }
 
+/**
+ * Call the provided function and either return the result or call the callback
+ * with it (depending on if a callback is provided).
+ * @param {function()} callback Optional callback.
+ * @param {Object} thisArg This argument for the following function.
+ * @param {function()} func Function to call.
+ * @return {*} Return (if callback is not provided).
+ */
+function maybeStatCallback(callback, thisArg, func) {
+  if (callback && (typeof callback === 'function' || typeof callback.oncomplete === 'function')) {
+    var err = null;
+    var val;
+    try {
+      val = func.call(thisArg);
+    } catch (e) {
+      err = e;
+    }
+    // Unpack callback from FSReqWrap
+    if (callback.oncomplete) {
+      callback = callback.oncomplete.bind(callback);
+    }
+    process.nextTick(function() {
+      if (val === undefined) {
+        callback(err);
+      } else {
+        fillStatsArray(val, statValues);
+        callback(err, val);
+      }
+    });
+  } else {
+    return func.call(thisArg);
+  }
+}
+
 function notImplemented() {
   throw new Error('Method not implemented');
 }
@@ -299,7 +335,7 @@ function fillStatsArray(stats, statValues) {
  * @return {Stats|undefined} Stats or undefined (if sync).
  */
 Binding.prototype.stat = function(filepath, callback) {
-  return maybeCallback(callback, this, function() {
+  return maybeStatCallback(callback, this, function() {
     var item = this._system.getItem(filepath);
     if (item instanceof SymbolicLink) {
       item = this._system.getItem(
@@ -316,6 +352,7 @@ Binding.prototype.stat = function(filepath, callback) {
     if (callback instanceof Float64Array) {
       fillStatsArray(stats, callback);
     } else {
+      fillStatsArray(stats, statValues);
       return new Stats(stats);
     }
   });
@@ -330,7 +367,7 @@ Binding.prototype.stat = function(filepath, callback) {
  * @return {Stats|undefined} Stats or undefined (if sync).
  */
 Binding.prototype.fstat = function(fd, callback) {
-  return maybeCallback(callback, this, function() {
+  return maybeStatCallback(callback, this, function() {
     var descriptor = this._getDescriptorById(fd);
     var item = descriptor.getItem();
     var stats = item.getStats();
@@ -341,6 +378,7 @@ Binding.prototype.fstat = function(fd, callback) {
     if (callback instanceof Float64Array) {
       fillStatsArray(stats, callback);
     } else {
+      fillStatsArray(stats, statValues);
       return new Stats(stats);
     }
   });
@@ -1041,7 +1079,7 @@ Binding.prototype.readlink = function(pathname, encoding, callback) {
  * @return {Stats|undefined} Stats or undefined (if sync).
  */
 Binding.prototype.lstat = function(filepath, callback) {
-  return maybeCallback(callback, this, function() {
+  return maybeStatCallback(callback, this, function() {
     var item = this._system.getItem(filepath);
     if (!item) {
       throw new FSError('ENOENT', filepath);
@@ -1054,6 +1092,7 @@ Binding.prototype.lstat = function(filepath, callback) {
     if (callback instanceof Float64Array) {
       fillStatsArray(stats, callback);
     } else {
+      fillStatsArray(stats, statValues);
       return new Stats(item.getStats());
     }
   });