fix: don't fail on closing fd after reset has been called (#550) (#1081)

adiktofsugar · web-flow · commit ede0f4ff774f · 2024-12-31T07:13:29.000+13:00
* fix: don't fail on closing fd after reset has been called (#550) * fix: only skip EBADF errors on async close and only when aborted * fix: remove abortControllers and just call closeFile asynchronously from close
diff --git a/src/__tests__/volume.test.ts b/src/__tests__/volume.test.ts
@@ -361,6 +361,23 @@ describe('volume', () => {
           '/good': 'bye',
         });
       });
+      it('Open streams should not be affected', async () => {
+        const vol = new Volume();
+        const json = {
+          '/hello': 'world',
+        };
+        vol.fromJSON(json);
+        await new Promise((resolve, reject) => {
+          vol
+            .createReadStream('/hello')
+            .on('data', () => null)
+            .on('close', resolve)
+            .on('end', () => {
+              vol.reset();
+            })
+            .on('error', reject);
+        });
+      });
     });
     describe('.openSync(path, flags[, mode])', () => {
       const vol = new Volume();
diff --git a/src/volume.ts b/src/volume.ts
@@ -825,7 +825,9 @@ export class Volume implements FsCallbackApi, FsSynchronousApi {
 
   close(fd: number, callback: TCallback<void>) {
     validateFd(fd);
-    this.wrapAsync(this.closeSync, [fd], callback);
+    const file = this.getFileByFdOrThrow(fd, 'close');
+    // NOTE: not calling closeSync because we can reset in between close and closeSync
+    this.wrapAsync(this.closeFile, [file], callback);
   }
 
   private openFileOrGetById(id: TFileId, flagsNum: number, modeNum?: number): File {

Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,9 @@ export class Volume implements FsCallbackApi, FsSynchronousApi {`
`825`	`825`
`826`	`826`	`close(fd: number, callback: TCallback<void>) {`
`827`	`827`	`validateFd(fd);`
`828`		`- this.wrapAsync(this.closeSync, [fd], callback);`
	`828`	`+ const file = this.getFileByFdOrThrow(fd, 'close');`
	`829`	`+ // NOTE: not calling closeSync because we can reset in between close and closeSync`
	`830`	`+ this.wrapAsync(this.closeFile, [file], callback);`
`829`	`831`	`}`
`830`	`832`
`831`	`833`	`private openFileOrGetById(id: TFileId, flagsNum: number, modeNum?: number): File {`