Skip to content

Commit

Permalink
fs: use proper .destroy() implementation for SyncWriteStream
Browse files Browse the repository at this point in the history
PR-URL: #26690
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Sakthipriyan Vairamani <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
mcollina committed Mar 18, 2019
1 parent 3610155 commit abafd38
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
16 changes: 5 additions & 11 deletions lib/internal/fs/sync_write_stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ const { Writable } = require('stream');
const { closeSync, writeSync } = require('fs');

function SyncWriteStream(fd, options) {
Writable.call(this);
Writable.call(this, { autoDestroy: true });

options = options || {};

this.fd = fd;
this.readable = false;
this.autoClose = options.autoClose === undefined ? true : options.autoClose;

this.on('end', () => this._destroy());
}

Object.setPrototypeOf(SyncWriteStream.prototype, Writable.prototype);
Expand All @@ -24,22 +22,18 @@ SyncWriteStream.prototype._write = function(chunk, encoding, cb) {
return true;
};

SyncWriteStream.prototype._destroy = function() {
SyncWriteStream.prototype._destroy = function(err, cb) {
if (this.fd === null) // already destroy()ed
return;
return cb(err);

if (this.autoClose)
closeSync(this.fd);

this.fd = null;
return true;
cb(err);
};

SyncWriteStream.prototype.destroySoon =
SyncWriteStream.prototype.destroy = function() {
this._destroy();
this.emit('close');
return true;
};
SyncWriteStream.prototype.destroy;

module.exports = SyncWriteStream;
21 changes: 13 additions & 8 deletions test/parallel/test-internal-fs-syncwritestream.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const filename = path.join(tmpdir.path, 'sync-write-stream.txt');
assert.strictEqual(stream.fd, 1);
assert.strictEqual(stream.readable, false);
assert.strictEqual(stream.autoClose, true);
assert.strictEqual(stream.listenerCount('end'), 1);
}

// Verify constructing the instance with specified options.
Expand All @@ -29,7 +28,6 @@ const filename = path.join(tmpdir.path, 'sync-write-stream.txt');
assert.strictEqual(stream.fd, 1);
assert.strictEqual(stream.readable, false);
assert.strictEqual(stream.autoClose, false);
assert.strictEqual(stream.listenerCount('end'), 1);
}

// Verify that the file will be written synchronously.
Expand All @@ -47,21 +45,28 @@ const filename = path.join(tmpdir.path, 'sync-write-stream.txt');
const fd = fs.openSync(filename, 'w');
const stream = new SyncWriteStream(fd);

stream.on('close', common.mustCall(3));
stream.on('close', common.mustCall());
assert.strictEqual(stream.destroy(), stream);
assert.strictEqual(stream.fd, null);
}

// Verify that the stream will unset the fd after destroySoon().
{
const fd = fs.openSync(filename, 'w');
const stream = new SyncWriteStream(fd);

assert.strictEqual(stream.destroy(), true);
stream.on('close', common.mustCall());
assert.strictEqual(stream.destroySoon(), stream);
assert.strictEqual(stream.fd, null);
assert.strictEqual(stream.destroy(), true);
assert.strictEqual(stream.destroySoon(), true);
}

// Verify that the 'end' event listener will also destroy the stream.
// Verify that calling end() will also destroy the stream.
{
const fd = fs.openSync(filename, 'w');
const stream = new SyncWriteStream(fd);

assert.strictEqual(stream.fd, fd);

stream.emit('end');
stream.end();
assert.strictEqual(stream.fd, null);
}

0 comments on commit abafd38

Please sign in to comment.