files - await writing to target stream to respect highWaterMark

Benjamin Pasero · Benjamin Pasero · commit 8a0d4f5e6508 · 2020-06-11T15:46:46.000+02:00
diff --git a/src/vs/base/test/common/stream.test.ts b/src/vs/base/test/common/stream.test.ts
@@ -179,6 +179,66 @@ suite('Stream', () => {
 		assert.equal(consumedOrReadable, '1,2,3,4,5');
 	});
 
+	test('peekReadable - error handling', async () => {
+
+		// 0 Chunks
+		let stream = newWriteableStream(data => data);
+
+		let error: Error | undefined = undefined;
+		let promise = (async () => {
+			try {
+				await peekStream(stream, 1);
+			} catch (err) {
+				error = err;
+			}
+		})();
+
+		stream.error(new Error());
+		await promise;
+
+		assert.ok(error);
+
+		// 1 Chunk
+		stream = newWriteableStream(data => data);
+
+		error = undefined;
+		promise = (async () => {
+			try {
+				await peekStream(stream, 1);
+			} catch (err) {
+				error = err;
+			}
+		})();
+
+		stream.write('foo');
+		stream.error(new Error());
+		await promise;
+
+		assert.ok(error);
+
+		// 2 Chunks
+		stream = newWriteableStream(data => data);
+
+		error = undefined;
+		promise = (async () => {
+			try {
+				await peekStream(stream, 1);
+			} catch (err) {
+				error = err;
+			}
+		})();
+
+		stream.write('foo');
+		stream.write('bar');
+		stream.error(new Error());
+		await promise;
+
+		assert.ok(!error);
+
+		stream.on('error', err => error = err);
+		assert.ok(error);
+	});
+
 	function arrayToReadable<T>(array: T[]): Readable<T> {
 		return {
 			read: () => array.shift() || null
diff --git a/src/vs/platform/files/common/io.ts b/src/vs/platform/files/common/io.ts
@@ -85,7 +85,7 @@ async function doReadFileIntoStream<T>(provider: IFileSystemProviderWithOpenRead
 
 			// when buffer full, create a new one and emit it through stream
 			if (posInBuffer === buffer.byteLength) {
-				target.write(transformer(buffer));
+				await target.write(transformer(buffer));
 
 				buffer = VSBuffer.alloc(Math.min(options.bufferSize, typeof allowedRemainingBytes === 'number' ? allowedRemainingBytes : options.bufferSize));
 
@@ -100,7 +100,7 @@ async function doReadFileIntoStream<T>(provider: IFileSystemProviderWithOpenRead
 				lastChunkLength = Math.min(posInBuffer, allowedRemainingBytes);
 			}
 
-			target.write(transformer(buffer.slice(0, lastChunkLength)));
+			await target.write(transformer(buffer.slice(0, lastChunkLength)));
 		}
 	} catch (error) {
 		throw ensureFileSystemProviderError(error);

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ async function doReadFileIntoStream<T>(provider: IFileSystemProviderWithOpenRead`
`85`	`85`
`86`	`86`	`// when buffer full, create a new one and emit it through stream`
`87`	`87`	`if (posInBuffer === buffer.byteLength) {`
`88`		`- target.write(transformer(buffer));`
	`88`	`+ await target.write(transformer(buffer));`
`89`	`89`
`90`	`90`	`buffer = VSBuffer.alloc(Math.min(options.bufferSize, typeof allowedRemainingBytes === 'number' ? allowedRemainingBytes : options.bufferSize));`
`91`	`91`
`@@ -100,7 +100,7 @@ async function doReadFileIntoStream<T>(provider: IFileSystemProviderWithOpenRead`
`100`	`100`	`lastChunkLength = Math.min(posInBuffer, allowedRemainingBytes);`
`101`	`101`	`}`
`102`	`102`
`103`		`- target.write(transformer(buffer.slice(0, lastChunkLength)));`
	`103`	`+ await target.write(transformer(buffer.slice(0, lastChunkLength)));`
`104`	`104`	`}`
`105`	`105`	`} catch (error) {`
`106`	`106`	`throw ensureFileSystemProviderError(error);`