@promistream/from-node-stream 0.1.4 → 0.1.5

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@promistream/from-node-stream",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "src/index.js",
-  "repository": "http://git.cryto.net/promistream/from-node-stream.git",
+  "repository": "https://codeberg.org/promistream/from-node-stream.git",
   "author": "Sven Slootweg <admin@cryto.net>",
   "license": "WTFPL OR CC0-1.0",
   "dependencies": {
     "@joepie91/consumable": "^1.0.1",
     "@joepie91/unreachable": "^1.0.0",
     "@joepie91/warning": "^1.1.0",
-    "@promistream/end-of-stream": "^0.1.2",
+    "@promistream/end-of-stream": "^0.1.3",
     "@promistream/is-aborted": "^0.1.1",
     "@promistream/is-end-of-stream": "^0.1.1",
     "@promistream/propagate-abort": "^0.1.7",
-    "@promistream/propagate-peek": "^0.1.1",
-    "@promistream/simple-sink": "^0.3.2",
-    "@promistream/simple-source": "^0.1.5",
+    "@promistream/propagate-peek": "^0.1.2",
+    "@promistream/simple-sink": "^0.3.4",
+    "@promistream/simple-source": "^0.1.10",
     "debug-instanced": "^1.0.0",
     "promisify-event": "^1.0.0",
     "push-buffer": "^1.5.5",
@@ -25,10 +25,11 @@
   "devDependencies": {
     "@promistream/buffered-map": "^0.1.1",
     "@promistream/collect": "^0.1.2",
-    "@promistream/debug": "^0.1.0",
-    "@promistream/from-iterable": "^0.1.0",
-    "@promistream/map": "^0.1.5",
-    "@promistream/pipe": "^0.1.6",
+    "@promistream/debug": "^0.1.2",
+    "@promistream/from-iterable": "^0.1.1",
+    "@promistream/map": "^0.1.10",
+    "@promistream/parallelize": "^0.1.8",
+    "@promistream/pipe": "^0.1.8",
     "@promistream/range-numbers": "^0.1.2",
     "bluebird": "^3.7.2",
     "through2": "^4.0.2"

package/src/index.js

@@ -75,6 +75,7 @@ function wireReadable(debug, stream) {
 			// We have run out of values
 			if (isPaused && buffer.countLane().requests > 0) {
 				debug("Resuming underlying Readable stream, as our buffer ran out");
+				isPaused = false;
 				stream.resume();
 			}
 
@@ -213,10 +214,9 @@ function convertFromTransform(stream) {
 				await tryWrite(await lastSource.read());
 			}
 		} catch (error) {
-			if (endMarker == null && (isEndOfStream(error) || isAborted(error))) {
+			if (endMarker == null && (isEndOfStream(error) || isAborted(error))) { // FIXME: isExhausted?
 				endMarker = error;
 
-				// TODO: Is this necessary? Is this not already handled by wiring for the readable/writable interface?
 				if (isAborted(error)) {
 					if (error.cause instanceof Error) {
 						destroy(error);
@@ -228,8 +228,6 @@ function convertFromTransform(stream) {
 					end();
 				}
 			}
-
-			buffer.pushError(error);
 		}
 	});
 

package/test.js

@@ -10,6 +10,7 @@ const pipe = require("@promistream/pipe");
 const fromIterable = require("@promistream/from-iterable");
 const fromNodeStream = require(".");
 const collect = require("@promistream/collect");
+const parallelize = require("@promistream/parallelize");
 const debug = require("@promistream/debug");
 
 test("readable stream", async () => {
@@ -55,9 +56,12 @@ test("transform stream", async () => {
 		fromNodeStream(new stream.Transform({
 			objectMode: true,
 			transform(chunk, _encoding, callback) {
-				this.push(chunk);
-				this.push(chunk * 2);
-				callback();
+				/* Intentionally delay things, to validate that processing in the Node stream fully completes before the pipeline gets torn down */
+				setTimeout(() => {
+					this.push(chunk);
+					this.push(chunk * 2);
+					callback();
+				}, 10);
 			}
 		})),
 		collect()
@@ -65,3 +69,46 @@ test("transform stream", async () => {
 
 	assert.deepStrictEqual(result, [ 0, 0, 1, 2, 2, 4, 3, 6, 4, 8, 5, 10, 6, 12, 7, 14, 8, 16, 9, 18, 10, 20 ]);
 });
+
+test("transform stream with abort", async () => {
+	assert.rejects(async () => {
+		let pipeline = pipe([
+			fromIterable([ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]),
+			fromNodeStream(new stream.Transform({
+				objectMode: true,
+				transform(chunk, _encoding, callback) {
+					setTimeout(() => {
+						this.push(chunk);
+						this.push(chunk * 2);
+						callback();
+					}, 10);
+				}
+			})),
+			collect()
+		]);
+
+		pipeline.abort(new Error("Some arbitrary error"));
+		let result = await pipeline.read();
+	}, { message: "Some arbitrary error" });
+});
+
+test("transform stream, parallel", async () => {
+	let result = await pipe([
+		fromIterable([ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]),
+		fromNodeStream(new stream.Transform({
+			objectMode: true,
+			transform(chunk, _encoding, callback) {
+				/* Intentionally delay things, to validate that processing in the Node stream fully completes before the pipeline gets torn down */
+				setTimeout(() => {
+					this.push(chunk);
+					this.push(chunk * 2);
+					callback();
+				}, 10);
+			}
+		})),
+		parallelize(8),
+		collect()
+	]).read();
+
+	assert.deepStrictEqual(result, [ 0, 0, 1, 2, 2, 4, 3, 6, 4, 8, 5, 10, 6, 12, 7, 14, 8, 16, 9, 18, 10, 20 ]);
+});