@react-router/node 8.3.0 → 8.4.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # `@react-router/node`
 
+## v8.4.0
+
+### Patch Changes
+
+- Fix a memory leak in `writeReadableStreamToWritable` and `writeAsyncIterableToWritable` that retained memory for the lifetime of a long-running stream ([#15500](https://github.com/remix-run/react-router/pull/15500))
+  - Preserve error handling when a producer closes the destination while reading the next chunk
+- Updated dependencies:
+  - [`react-router@8.4.0`](https://github.com/remix-run/react-router/releases/tag/react-router@8.4.0)
+
+## v8.3.1
+
+### Patch Changes
+
+- Bump `@remix-run/node-fetch-server` dependency ([#15447](https://github.com/remix-run/react-router/pull/15447))
+- fix: Prevent client disconnects during streaming from crashing the Node process ([#15324](https://github.com/remix-run/react-router/pull/15324))
+- Updated dependencies:
+  - [`react-router@8.3.1`](https://github.com/remix-run/react-router/releases/tag/react-router@8.3.1)
+
 ## v8.3.0
 
 ### Patch Changes

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v8.3.0
+ * @react-router/node v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -123,9 +123,9 @@ async function writeReadableStreamToWritable(stream, writable) {
 		}
 	} catch (error) {
 		try {
-			reader.cancel(error).catch(() => {});
+			reader.cancel(error instanceof WritableClosedError ? void 0 : error).catch(() => {});
 		} catch {}
-		writable.destroy(error);
+		destroyWritable(writable, error);
 		throw error;
 	} finally {
 		writableError.cleanup();
@@ -134,15 +134,20 @@ async function writeReadableStreamToWritable(stream, writable) {
 		} catch {}
 	}
 }
+var WritableClosedError = class extends Error {};
+function destroyWritable(writable, error) {
+	if (error instanceof WritableClosedError || writable.destroyed) return;
+	writable.once("error", () => {});
+	writable.destroy(error);
+}
 function monitorWritableError(writable) {
+	let writableStartedDestroyed = writable.destroyed;
 	let settled = false;
+	let writableErrorEmitted = false;
 	let writableError;
-	let rejectWritableError;
-	let writableErrorPromise = new Promise((_, reject) => {
-		rejectWritableError = reject;
-	});
-	writableErrorPromise.catch(() => {});
+	let pendingRejections = /* @__PURE__ */ new Set();
 	function cleanup() {
+		if (!writableStartedDestroyed && writable.destroyed && writable.errored && !writableErrorEmitted) return;
 		writable.off("error", onError);
 		writable.off("close", onClose);
 	}
@@ -151,24 +156,36 @@ function monitorWritableError(writable) {
 		settled = true;
 		writableError = error;
 		cleanup();
-		rejectWritableError(error);
+		let rejections = [...pendingRejections];
+		pendingRejections.clear();
+		for (let rejectPending of rejections) rejectPending(error);
 	}
 	function onError(error) {
+		writableErrorEmitted = true;
 		reject(error);
 	}
 	function onClose() {
-		reject(/* @__PURE__ */ new Error("Writable closed before stream finished"));
+		reject(new WritableClosedError("Writable closed before stream finished"));
 	}
 	writable.once("error", onError);
 	writable.once("close", onClose);
 	return {
 		cleanup,
 		race(promise) {
-			return Promise.race([promise, writableErrorPromise]);
+			if (writableError) return Promise.race([promise, Promise.reject(writableError)]);
+			let rejectPending;
+			let pendingPromise = new Promise((_, reject) => {
+				rejectPending = reject;
+			});
+			pendingPromise.catch(() => {});
+			pendingRejections.add(rejectPending);
+			return Promise.race([promise, pendingPromise]).finally(() => {
+				pendingRejections.delete(rejectPending);
+			});
 		},
 		throwIfClosed() {
 			if (writableError) throw writableError;
-			if (writable.destroyed || writable.writableEnded) throw new Error("Cannot write to a destroyed or ended writable stream");
+			if (writable.destroyed || writable.writableEnded) throw new WritableClosedError("Cannot write to a destroyed or ended writable stream");
 		}
 	};
 }
@@ -206,7 +223,7 @@ async function writeAsyncIterableToWritable(iterable, writable) {
 		if (!completed) try {
 			Promise.resolve(iterator.return?.()).catch(() => {});
 		} catch {}
-		writable.destroy(error);
+		destroyWritable(writable, error);
 		throw error;
 	} finally {
 		writableError.cleanup();
@@ -265,7 +282,7 @@ var StreamPump = class {
 			let available = (this.controller.desiredSize || 0) - bytes.byteLength;
 			this.controller.enqueue(bytes);
 			if (available <= 0) this.pause();
-		} catch (e) {
+		} catch {
 			this.controller.error(/* @__PURE__ */ new Error("Could not create Buffer, chunk must be of type string or an instance of Buffer, ArrayBuffer, or Array or an Array-like Object"));
 			this.cancel();
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-router/node",
   "type": "module",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "Node.js platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -38,18 +38,18 @@
     }
   },
   "dependencies": {
-    "@remix-run/node-fetch-server": "^0.13.3"
+    "@remix-run/node-fetch-server": "^0.14.1"
   },
   "devDependencies": {
     "@types/node": "^22.19.19",
     "tsdown": "^0.22.0",
     "typescript": "^6.0.3",
     "wireit": "0.14.12",
-    "react-router": "8.3.0"
+    "react-router": "8.4.0"
   },
   "peerDependencies": {
     "typescript": "^5.1.0 || ^6.0.0 || ^7.0.0",
-    "react-router": "8.3.0"
+    "react-router": "8.4.0"
   },
   "peerDependenciesMeta": {
     "typescript": {