fixup

nodejs · Aug 12, 2020 · fd5ca60 · fd5ca60
1 parent 6a3c7bb
commit fd5ca60
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/doc/api/errors.md b/doc/api/errors.md
@@ -928,12 +928,6 @@ added: v14.0.0
 Used when a feature that is not available
 to the current platform which is running Node.js is used.
 
-<a id="ERR_FS_FILE_CLOSED"></a>
-### `ERR_FS_FILE_CLOSED`
-
-An attempt has been made to use a
-closed file handle.
-
 <a id="ERR_FS_FILE_TOO_LARGE"></a>
 ### `ERR_FS_FILE_TOO_LARGE`
 

diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -838,7 +838,6 @@ E('ERR_FEATURE_UNAVAILABLE_ON_PLATFORM',
   'The feature %s is unavailable on the current platform' +
   ', which is being used to run Node.js',
   TypeError);
-E('ERR_FS_FILE_CLOSED', 'File is closed', Error);
 E('ERR_FS_FILE_TOO_LARGE', 'File size (%s) is greater than 2 GB', RangeError);
 E('ERR_FS_INVALID_SYMLINK_TYPE',
   'Symlink type must be one of "dir", "file", or "junction". Received "%s"',

diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
@@ -14,6 +14,7 @@ const {
   MathMin,
   NumberIsSafeInteger,
   Symbol,
+  Error,
   Promise,
 } = primordials;
 
@@ -28,7 +29,6 @@ const binding = internalBinding('fs');
 const { Buffer } = require('buffer');
 const {
   ERR_FS_FILE_TOO_LARGE,
-  ERR_FS_FILE_CLOSED,
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ARG_VALUE,
   ERR_METHOD_NOT_IMPLEMENTED
@@ -158,15 +158,14 @@ class FileHandle extends JSTransferable {
     }
 
     this[kRefs]--;
-
-    if (this[kRefs]) {
+    if (this[kRefs] === 0) {
+      this[kFd] = -1;
+      this[kClosePromise] = this[kHandle].close();
+    } else {
       this[kClosePromise] = new Promise((resolve, reject) => {
         this[kCloseResolve] = resolve;
         this[kCloseReject] = reject;
       });
-    } else {
-      this[kFd] = -1;
-      this[kClosePromise] = this[kHandle].close();
     }
 
     return this[kClosePromise];
@@ -194,12 +193,16 @@ class FileHandle extends JSTransferable {
 }
 
 async function fsCall(fn, handle, ...args) {
-  if (!(handle instanceof FileHandle)) {
+  if (handle[kRefs] === undefined) {
     throw new ERR_INVALID_ARG_TYPE('filehandle', 'FileHandle', handle);
   }
 
-  if (handle.fd === -1 || handle[kRefs] === 0) {
-    throw new ERR_FS_FILE_CLOSED();
+  if (handle.fd === -1) {
+    // eslint-disable-next-line no-restricted-syntax
+    const err = new Error('file closed');
+    err.code = 'EBADF';
+    err.syscall = fn.name;
+    throw err;
   }
 
   try {