fs: handle fixes

lib/internal/fs/promises.js

@@ -224,7 +224,10 @@ class FileHandle extends EventEmitterMixin(JSTransferable) {
  this[kFd] = -1;
  this[kClosePromise] = SafePromisePrototypeFinally(
  this[kHandle].close(),
- () => { this[kClosePromise] = undefined; }
+ () => {
+ this[kClosePromise] = undefined;
+ this.emit('close');
+ }
  );
  } else {
  this[kClosePromise] = SafePromisePrototypeFinally(
@@ -239,7 +242,6 @@ class FileHandle extends EventEmitterMixin(JSTransferable) {
  );
  }
 
- this.emit('close');
  return this[kClosePromise];
  };
 
@@ -336,10 +338,12 @@ class FileHandle extends EventEmitterMixin(JSTransferable) {
  }
 
  [kRef]() {
+ assert(this[kFd] !== -1);
  this[kRefs]++;
  }
 
  [kUnref]() {
+ assert(this[kFd] !== -1);
  this[kRefs]--;
  if (this[kRefs] === 0) {
  this[kFd] = -1;

lib/internal/fs/streams.js

@@ -80,15 +80,22 @@ function _construct(callback) {
 }
 
 // This generates an fs operations structure for a FileHandle
-const FileHandleOperations = (handle) => {
+const FileHandleOperations = (handle, closeHandler) => {
  return {
  open: (path, flags, mode, cb) => {
  throw new ERR_METHOD_NOT_IMPLEMENTED('open()');
  },
  close: (fd, cb) => {
+ handle.off('close', closeHandler);
+
  handle[kUnref]();
- PromisePrototypeThen(handle.close(),
- () => cb(), cb);
+ if (handle[kFd] !== -1) {
+ // Someone else has a ref to the handle.
+ process.nextTick(cb);
+ } else {
+ PromisePrototypeThen(handle.close(),
+ () => cb(), cb);
+ }
  },
  read: (fd, buf, offset, length, pos, cb) => {
  PromisePrototypeThen(handle.read(buf, offset, length, pos),
@@ -134,11 +141,14 @@ function importFd(stream, options) {
  // FileHandle is not supported with custom fs operations
  throw new ERR_METHOD_NOT_IMPLEMENTED('FileHandle with fs');
  }
+
+ const closeHandler = FunctionPrototypeBind(stream.close, stream);
  stream[kHandle] = options.fd;
- stream[kFs] = FileHandleOperations(stream[kHandle]);
+ stream[kFs] = FileHandleOperations(stream[kHandle], closeHandler);
  stream[kHandle][kRef]();
- options.fd.on('close', FunctionPrototypeBind(stream.close, stream));
- return options.fd.fd;
+ stream[kHandle].on('close', closeHandler);
+
+ return stream[kHandle].fd;
  }
 
  throw ERR_INVALID_ARG_TYPE('options.fd',

test/parallel/test-fs-read-stream-file-handle.js

@@ -23,7 +23,9 @@ fs.promises.open(file, 'r').then((handle) => {
  assert.strictEqual(output, input);
  }));
 
- stream.on('close', common.mustCall());
+ stream.on('close', common.mustCall(() => {
+ assert(handle.listenerCount('close') === 0);
+ }));
 }).then(common.mustCall());
 
 fs.promises.open(file, 'r').then((handle) => {