@react-router/node 7.18.2 → 7.18.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `@react-router/node`
 
+## v7.18.3
+
+### Patch Changes
+
+- fix: Prevent client disconnects during streaming from crashing the Node process ([#15437](https://github.com/remix-run/react-router/pull/15437))
+- Updated dependencies:
+  - [`react-router@7.18.3`](https://github.com/remix-run/react-router/releases/tag/react-router@7.18.3)
+
 ## v7.18.2
 
 ### Patch Changes

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v7.18.2
+ * @react-router/node v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -164,11 +164,11 @@ 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();
@@ -178,8 +178,20 @@ async function writeReadableStreamToWritable(stream, writable) {
     }
   }
 }
+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((_, reject2) => {
@@ -188,6 +200,9 @@ function monitorWritableError(writable) {
   writableErrorPromise.catch(() => {
   });
   function cleanup() {
+    if (!writableStartedDestroyed && writable.destroyed && writable.errored && !writableErrorEmitted) {
+      return;
+    }
     writable.off("error", onError);
     writable.off("close", onClose);
   }
@@ -201,10 +216,11 @@ function monitorWritableError(writable) {
     rejectWritableError(error);
   }
   function onError(error) {
+    writableErrorEmitted = true;
     reject(error);
   }
   function onClose() {
-    reject(new Error("Writable closed before stream finished"));
+    reject(new WritableClosedError("Writable closed before stream finished"));
   }
   writable.once("error", onError);
   writable.once("close", onClose);
@@ -218,7 +234,9 @@ function monitorWritableError(writable) {
         throw writableError;
       }
       if (writable.destroyed || writable.writableEnded) {
-        throw new Error("Cannot write to a destroyed or ended writable stream");
+        throw new WritableClosedError(
+          "Cannot write to a destroyed or ended writable stream"
+        );
       }
     }
   };
@@ -265,7 +283,7 @@ async function writeAsyncIterableToWritable(iterable, writable) {
       } catch {
       }
     }
-    writable.destroy(error);
+    destroyWritable(writable, error);
     throw error;
   } finally {
     writableError.cleanup();

package/dist/index.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v7.18.2
+ * @react-router/node v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -124,11 +124,11 @@ 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();
@@ -138,8 +138,20 @@ async function writeReadableStreamToWritable(stream, writable) {
     }
   }
 }
+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((_, reject2) => {
@@ -148,6 +160,9 @@ function monitorWritableError(writable) {
   writableErrorPromise.catch(() => {
   });
   function cleanup() {
+    if (!writableStartedDestroyed && writable.destroyed && writable.errored && !writableErrorEmitted) {
+      return;
+    }
     writable.off("error", onError);
     writable.off("close", onClose);
   }
@@ -161,10 +176,11 @@ function monitorWritableError(writable) {
     rejectWritableError(error);
   }
   function onError(error) {
+    writableErrorEmitted = true;
     reject(error);
   }
   function onClose() {
-    reject(new Error("Writable closed before stream finished"));
+    reject(new WritableClosedError("Writable closed before stream finished"));
   }
   writable.once("error", onError);
   writable.once("close", onClose);
@@ -178,7 +194,9 @@ function monitorWritableError(writable) {
         throw writableError;
       }
       if (writable.destroyed || writable.writableEnded) {
-        throw new Error("Cannot write to a destroyed or ended writable stream");
+        throw new WritableClosedError(
+          "Cannot write to a destroyed or ended writable stream"
+        );
       }
     }
   };
@@ -225,7 +243,7 @@ async function writeAsyncIterableToWritable(iterable, writable) {
       } catch {
       }
     }
-    writable.destroy(error);
+    destroyWritable(writable, error);
     throw error;
   } finally {
     writableError.cleanup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/node",
-  "version": "7.18.2",
+  "version": "7.18.3",
   "description": "Node.js platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -53,11 +53,11 @@
     "tsup": "^8.3.0",
     "typescript": "^5.4.5",
     "wireit": "0.14.9",
-    "react-router": "7.18.2"
+    "react-router": "7.18.3"
   },
   "peerDependencies": {
     "typescript": "^5.1.0 || ^6.0.0",
-    "react-router": "7.18.2"
+    "react-router": "7.18.3"
   },
   "peerDependenciesMeta": {
     "typescript": {