Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #654 working on adding feature fs.watchFile() #748

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 53 additions & 0 deletions src/filesystem/interface.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,59 @@ function FileSystem(options, callback) {
return watcher;
};

//Object that uses filenames as keys
const statWatchers = new Map();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to flip back and forth on this, but I'm not clear what benefit we're gaining from Map here over {} for potential loss in compatibility. Can we switch back to {} instead?


this.watchFile = function (filename, options, listener) {
let prevStat, currStat;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably call Path.normalize(filename) on filename before we use it internally.


if (Path.isNull(filename)) {
throw new Error('Path must be a string without null bytes.');
}
// Checks to see if there were options passed in and if not, the callback function will be set here
if (typeof options === 'function') {
listener = options;
options = {};
}
// default 5007ms interval, persistent is not used this project
const interval = options.interval || 5007;
listener = listener || nop;

let intervalValue = statWatchers.get(filename);

// Checks to see if there's a pre-existing watcher on the file
if (intervalValue === undefined) {
andrewkoung marked this conversation as resolved.
Show resolved Hide resolved
// Stores initial prev value to compare
fs.stat(filename, function (err, stats) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some kind of timing bug here. You do a stat, and then inside the callback you start your interval, but never seem to call stat again in that interval's callback. Each interval should recall stat, so you have updated values for prev/currStat.

Also, this raises the question about the interval's lower bounds. There is some amount of time that a stat will take to execute. We shouldn't trigger another one before it's done. Probably we should ignore requests for interval to be lower than 5007 and just use that as our floor.

var value = setInterval(function () {
prevStat = currStat;

//Conditional check for first run to set initial state for prevStat
if(prevStat === undefined) {
andrewkoung marked this conversation as resolved.
Show resolved Hide resolved
prevStat = stats;
}

currStat = stats;

if (err) {
clearInterval(value);
console.warn('[Filer Error] fs.watchFile encountered an error: ' + err);
andrewkoung marked this conversation as resolved.
Show resolved Hide resolved
}
if (JSON.stringify(prevStat) !== JSON.stringify(currStat)) {
listener(prevStat, currStat);
}
// Set a new prevStat based on previous
prevStat = currStat;
},
interval
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indents here seem wrong, these 3 lines shouldn't all line up.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought so too, but I checked the spacings and it looked right, also the linting will fail if I change it.


// Stores interval return values
statWatchers.set(filename, value);
});
}
};

// Deal with various approaches to node ID creation
function wrappedGuidFn(context) {
return function (callback) {
Expand Down
1 change: 1 addition & 0 deletions tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ require('./spec/trailing-slashes.spec');
require('./spec/times.spec');
require('./spec/time-flags.spec');
require('./spec/fs.watch.spec');
require('./spec/fs.watchFile.spec');
require('./spec/fs.unwatchFile.spec');
require('./spec/errors.spec');
require('./spec/fs.shell.spec');
Expand Down
34 changes: 34 additions & 0 deletions tests/spec/fs.watchFile.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

var util = require('../lib/test-utils.js');
var expect = require('chai').expect;

describe('fs.watchFile', function() {
beforeEach(util.setup);
afterEach(util.cleanup);

it('should be a function', function() {
const fs = util.fs();
expect(typeof fs.watchFile).to.equal('function');
});

it('should throw an error if a file path is not defined', function() {
const fs = util.fs();

const fn = () => fs.watchFile(undefined);
expect(fn).to.throw();
});

it('prev and curr should be populated', function() {
const fs = util.fs();

fs.writeFile('/myfile', 'data', function(error) {
if(error) throw error;
});

fs.watchFile('/myfile', function(prev, curr) {
expect(prev).to.exist;
expect(curr).to.exist;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's do more than just check if the objects exist. We'd expect them to exist, and also to match what a stat object looks like, see https://github.com/filerjs/filer/blob/master/src/stats.js#L10.

Some other tests that I can think of:

  • if you watchFile a file, and then write to it, your listener should get called
  • We'd want to see that the stats (prev vs. curr) do in fact change as the file changes.
  • What happens if we delete a file?
  • Does watchFile work across symlinks?
  • Is the interval value passed by the user honoured in the tests? What if they set another value, do we stick to that timing?

There are more we could do, but at the very least, we need proof that this is working as expected.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've worked on creating some tests for half the points mentioned, but I'm going to have to figure out the logic to test the ones I haven't covered.

});
});
});