stream: Support FileHandle in Read/WriteStream

Include remarks by @addaleax and @aduh95
Move the double inheritance class generator to
the internal event_target
Restore deleted commas
Fix a slightly flaky test

Refs: #35922

lib/events.js

@@ -28,7 +28,6 @@ const {
   ErrorCaptureStackTrace,
   MathMin,
   NumberIsNaN,
-  Object,
   ObjectCreate,
   ObjectDefineProperty,
   ObjectDefineProperties,
@@ -42,7 +41,7 @@ const {
   String,
   Symbol,
   SymbolFor,
-  SymbolAsyncIterator
+  SymbolAsyncIterator,
 } = primordials;
 const kRejection = SymbolFor('nodejs.rejection');
 
@@ -897,17 +896,3 @@ function on(emitter, event, options) {
     iterator.return();
   }
 }
-
-const EventEmitterMixin = (Superclass) => {
-  class MixedEventEmitter extends Superclass {
-    constructor(...args) {
-      super(...args);
-      EventEmitter.call(this);
-    }
-  }
-  const protoProps = Object.getOwnPropertyDescriptors(EventEmitter.prototype);
-  delete protoProps.constructor;
-  Object.defineProperties(MixedEventEmitter.prototype, protoProps);
-  return MixedEventEmitter;
-};
-module.exports.EventEmitterMixin = EventEmitterMixin;

lib/internal/event_target.js

@@ -9,6 +9,7 @@ const {
   ObjectDefineProperties,
   ObjectDefineProperty,
   ObjectGetOwnPropertyDescriptor,
+  ObjectGetOwnPropertyDescriptors,
   ReflectApply,
   SafeMap,
   String,
@@ -30,6 +31,7 @@ const { validateObject } = require('internal/validators');
 
 const { customInspectSymbol } = require('internal/util');
 const { inspect } = require('util');
+const EventEmitter = require('events');
 
 const kIsEventTarget = SymbolFor('nodejs.event_target');
 
@@ -646,8 +648,23 @@ function defineEventHandler(emitter, name) {
     enumerable: true
   });
 }
+
+const EventEmitterMixin = (Superclass) => {
+  class MixedEventEmitter extends Superclass {
+    constructor(...args) {
+      super(...args);
+      EventEmitter.call(this);
+    }
+  }
+  const protoProps = ObjectGetOwnPropertyDescriptors(EventEmitter.prototype);
+  delete protoProps.constructor;
+  ObjectDefineProperties(MixedEventEmitter.prototype, protoProps);
+  return MixedEventEmitter;
+};
+
 module.exports = {
   Event,
+  EventEmitterMixin,
   EventTarget,
   NodeEventTarget,
   defineEventHandler,

lib/internal/fs/promises.js

@@ -20,7 +20,7 @@ const {
   PromisePrototypeThen,
   PromiseResolve,
   Symbol,
-  Uint8Array
+  Uint8Array,
 } = primordials;
 
 const {
@@ -71,7 +71,7 @@ const {
 } = require('internal/validators');
 const pathModule = require('path');
 const { promisify } = require('internal/util');
-const EventEmitter = require('events');
+const { EventEmitterMixin } = require('internal/event_target');
 
 const kHandle = Symbol('kHandle');
 const kFd = Symbol('kFd');
@@ -97,7 +97,7 @@ const lazyDOMException = hideStackFrames((message, name) => {
   return new DOMException(message, name);
 });
 
-class FileHandle extends EventEmitter.EventEmitterMixin(JSTransferable) {
+class FileHandle extends EventEmitterMixin(JSTransferable) {
   constructor(filehandle) {
     super();
     this[kHandle] = filehandle;
@@ -229,7 +229,6 @@ class FileHandle extends EventEmitter.EventEmitterMixin(JSTransferable) {
   [kDeserialize]({ handle }) {
     this[kHandle] = handle;
     this[kFd] = handle.fd;
-    EventEmitter.call(this);
   }
 
   [kRef]() {
@@ -727,5 +726,5 @@ module.exports = {
 
   FileHandle,
   kRef,
-  kUnref
+  kUnref,
 };

lib/internal/fs/streams.js

@@ -14,7 +14,7 @@ const {
 const {
   ERR_INVALID_ARG_TYPE,
   ERR_OUT_OF_RANGE,
-  ERR_METHOD_NOT_IMPLEMENTED
+  ERR_METHOD_NOT_IMPLEMENTED,
 } = require('internal/errors').codes;
 const { deprecate } = require('internal/util');
 const { validateInteger } = require('internal/validators');

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

@@ -61,4 +61,5 @@ fs.promises.open(file, 'r').then((handle) => {
     name: 'Error',
     message: 'The FileHandle with fs method is not implemented'
   });
+  handle.close();
 });