Skip to content

stream: add FileHandle support to Read/WriteStream #35922

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.

Sign up for GitHub

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

Closed
mmomtchev wants to merge 20 commits into from
Closed

stream: add FileHandle support to Read/WriteStream #35922

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
72873cf
stream: add FileHandle support to Read/WriteStream
mmomtchev Nov 2, 2020
51640a5
stream: support FileHandle in Read/WriteStream
mmomtchev Nov 2, 2020
4a841ac
stream: Add FileHandle support to Read/WriteStream
mmomtchev Nov 2, 2020
6662fb3
stream: support FileHandle for Read/WriteStream
mmomtchev Nov 2, 2020
7713743
stream: support FileHandle for Read/WriteStream
mmomtchev Nov 2, 2020
d43eb37
stream: support FileHandle for Read/WriteStream
mmomtchev Nov 2, 2020
e6eba34
stream: Support FileHandle in Read/WriteStream
mmomtchev Nov 2, 2020
7495c24
stream: Support FileHandle in Read/WriteStream
mmomtchev Nov 2, 2020
be4dc0b
stream: support FileHandle in Read/WriteStream
mmomtchev Nov 3, 2020
b9c8218
fs: add FileHandle support to Read/WriteStream
mmomtchev Nov 13, 2020
bb8f483
fs: add FileHandle support to Read/WriteStream
mmomtchev Nov 13, 2020
9506ec8
fs: support for FileHandle in Read/WriteStream
mmomtchev Nov 13, 2020
cb0c20c
stream: remove duplicate EventTarget after rebase
mmomtchev Nov 24, 2020
96d0198
stream: actually run the unit test
mmomtchev Nov 24, 2020
7095132
stream: throw on invalid args
mmomtchev Nov 24, 2020
ea37dd7
stream: linting
mmomtchev Nov 24, 2020
403a7aa
stream: remove useless initializiation of stream.fd
mmomtchev Nov 25, 2020
c267bc1
stream: create tmpdir only in main thread
mmomtchev Nov 25, 2020
68f98fb
Remove useless `/` from path.join
mmomtchev Nov 26, 2020
8d0a717
stream: compatibility with the --work test
mmomtchev Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stream: linting
  • Loading branch information
@mmomtchev
mmomtchev committed Dec 2, 2020
commit ea37dd7cc2ae106a8b701e59e032aaf2f5732963
9 changes: 5 additions & 4 deletions lib/internal/fs/streams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ const { deprecate } = require('internal/util');
const { validateInteger } = require('internal/validators');
const { errorOrDestroy } = require('internal/streams/destroy');
const fs = require('fs');
const { kRef, kUnref } = require('internal/fs/promises');
const { kRef, kUnref, FileHandle } = require('internal/fs/promises');
const { Buffer } = require('buffer');
const {
copyObject,
getOptions,
} = require('internal/fs/utils');
const { Readable, Writable, finished } = require('stream');
const { FileHandle } = require('internal/fs/promises');
const { toPathIfFileURL } = require('internal/url');
const kIoDone = Symbol('kIoDone');
const kIsPerformingIO = Symbol('kIsPerformingIO');
Expand Down Expand Up @@ -124,7 +123,8 @@ function importFd(stream, options) {
// another one
// https://github.com/nodejs/node/issues/35862
stream.fd = options.fd;

@aduh95 aduh95 Nov 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
stream.fd = options.fd;
this.fd = options.fd;

} else if (typeof options.fd === 'object' && options.fd instanceof FileHandle) {
} else if (typeof options.fd === 'object' &&
options.fd instanceof FileHandle) {
// When fd is a FileHandle we can listen for 'close' events
if (options.fs)
// FileHandle is not supported with custom fs operations
Expand All @@ -135,7 +135,8 @@ function importFd(stream, options) {
stream[kHandle][kRef]();
options.fd.on('close', FunctionPrototypeBind(stream.close, stream));

@aduh95 aduh95 Nov 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
options.fd.on('close', FunctionPrototypeBind(stream.close, stream));
options.fd.on('close', FunctionPrototypeBind(this.close, this));

} else
throw ERR_INVALID_ARG_TYPE('options.fd', ['number', 'FileHandle'], options.fd);
throw ERR_INVALID_ARG_TYPE('options.fd',
['number', 'FileHandle'], options.fd);
}

@aduh95 aduh95 Nov 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
}
} else {
this.fd = null;
}

}

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-fs-promises-file-handle-read.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ let useConf = false;
.then(validateLargeRead)
.then(common.mustCall());
}
})();
})().then(common.mustCall());