Do not wait for ready event if the file descriptor is already opened (

sindresorhus#1289)
jaulz · Jul 6, 2020 · 21286e5 · 21286e5
1 parent 2f49800
commit 21286e5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/source/core/index.ts b/source/core/index.ts
@@ -287,8 +287,12 @@ const waitForOpenFile = async (file: ReadStream): Promise<void> => new Promise((
 		reject(error);
 	};
 
+	if (!file.pending) {
+		resolve();
+	}
+
 	file.once('error', onError);
-	file.once('open', () => {
+	file.once('ready', () => {
 		file.off('error', onError);
 		resolve();
 	});

diff --git a/test/post.ts b/test/post.ts
@@ -4,6 +4,7 @@ import fs = require('fs');
 import path = require('path');
 import test from 'ava';
 import delay = require('delay');
+import pEvent = require('p-event');
 import {Handler} from 'express';
 import getStream = require('get-stream');
 import toReadableStream = require('to-readable-stream');
@@ -318,6 +319,22 @@ test('body - file read stream', withServer, async (t, server, got) => {
 	t.is(toSend, body);
 });
 
+test('body - file read stream, wait for `ready` event', withServer, async (t, server, got) => {
+	server.post('/', defaultEndpoint);
+
+	const fullPath = path.resolve('test/fixtures/ok');
+	const toSend = await getStream(fs.createReadStream(fullPath));
+	const ifStream = fs.createReadStream(fullPath);
+
+	await pEvent(ifStream, 'ready');
+
+	const body = await got.post({
+		body: ifStream
+	}).text();
+
+	t.is(toSend, body);
+});
+
 test('throws on upload error', withServer, async (t, server, got) => {
 	server.post('/', defaultEndpoint);