@farm.js/core 0.1.0-beta.80 → 0.1.0-beta.81

package/dist/navigation.mjs

@@ -2,10 +2,10 @@ import {
   usePathname,
   useRouter,
   useSearchParams
-} from "./chunk-DNPQOJQW.mjs";
-import "./chunk-DBG42367.mjs";
+} from "./chunk-CRK3RQ7C.mjs";
+import "./chunk-CVCIL6KH.mjs";
 import "./chunk-TY2RG2XL.mjs";
-import "./chunk-3HIATXA4.mjs";
+import "./chunk-XSUYR4Q3.mjs";
 import "./chunk-EUUCXDW6.mjs";
 import "./chunk-JIT7GXDP.mjs";
 import "./chunk-LM2YNO4U.mjs";

package/dist/plugin.cjs

@@ -19907,7 +19907,7 @@ _setFarmThemeServerSnapshotResolver(() => {
 });
 
 // package.json
-var version = "0.1.0-beta.80";
+var version = "0.1.0-beta.81";
 
 // src/version.ts
 var FARM_VERSION = version;
@@ -25213,7 +25213,7 @@ function getPublicEnvDefine(config) {
   return publicEnv2;
 }
 __name(getPublicEnvDefine, "getPublicEnvDefine");
-function createRequestFromNodeRequest(req, url) {
+function createRequestFromNodeRequest(req, url, signal) {
   const headers = new Headers();
   for (const [key, value] of Object.entries(req.headers)) {
     if (Array.isArray(value)) {
@@ -25224,10 +25224,38 @@ function createRequestFromNodeRequest(req, url) {
   }
   return new Request(url.toString(), {
     method: req.method || "GET",
-    headers
+    headers,
+    signal
   });
 }
 __name(createRequestFromNodeRequest, "createRequestFromNodeRequest");
+function createFarmNodeRequestAbortSignal(req, res) {
+  const controller = new AbortController();
+  let disposed = false;
+  const dispose = /* @__PURE__ */ __name(() => {
+    if (disposed) return;
+    disposed = true;
+    req.off("aborted", abort);
+    res.off("close", abortOnEarlyClose);
+    res.off("finish", dispose);
+    controller.signal.removeEventListener("abort", dispose);
+  }, "dispose");
+  const abort = /* @__PURE__ */ __name(() => controller.abort(), "abort");
+  const abortOnEarlyClose = /* @__PURE__ */ __name(() => {
+    if (!res.writableEnded) abort();
+    dispose();
+  }, "abortOnEarlyClose");
+  if (req.aborted) {
+    controller.abort();
+    return controller.signal;
+  }
+  req.once("aborted", abort);
+  res.once("close", abortOnEarlyClose);
+  res.once("finish", dispose);
+  controller.signal.addEventListener("abort", dispose, { once: true });
+  return controller.signal;
+}
+__name(createFarmNodeRequestAbortSignal, "createFarmNodeRequestAbortSignal");
 function withFarmRequestTracing(handler) {
   const middleware = _withAfterNodeMiddleware(handler);
   return (req, res, next) => {
@@ -26511,7 +26539,11 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             const urlObj = new URL(req.url, `http://${req.headers.host || "localhost:3000"}`);
             const targetPath = urlObj.searchParams.get("path") || "/";
             try {
-              const request = createRequestFromNodeRequest(req, urlObj);
+              const request = createRequestFromNodeRequest(
+                req,
+                urlObj,
+                createFarmNodeRequestAbortSignal(req, res)
+              );
               const deploymentMismatch = getFarmDeploymentMismatch(
                 request,
                 farmConfig.deploymentId
@@ -26526,7 +26558,8 @@ window.__FARM_MANIFEST__ = ${inlineValue({
               const targetRequestUrl = new URL(targetPath, request.url);
               const targetRequest = new Request(targetRequestUrl, {
                 method: "GET",
-                headers: request.headers
+                headers: request.headers,
+                signal: request.signal
               });
               await farmApp.getServerRenderer().runWithRequestContext(targetRequest, async () => {
                 const routeManager3 = farmApp.getRouteManager();
@@ -26605,7 +26638,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                 const targetUrl = new URL(targetPath, "http://localhost");
                 const searchParams = searchParamsToObject(targetUrl.searchParams);
                 const routeContext = await resolveFarmRouteContext(farmApp.getConfig(), {
-                  request,
+                  request: targetRequest,
                   params,
                   search: searchParams,
                   path: targetUrl.pathname
@@ -26629,7 +26662,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                       (entry) => entry.name === slot.name && entry.ownerPattern === slot.ownerPattern && entry.pattern === slot.route.pattern
                     ) ?? getClientModuleMetadata(slot.route.modulePath, server.config.root);
                     const slotContext = await resolveFarmRouteContext(farmApp.getConfig(), {
-                      request,
+                      request: targetRequest,
                       params: slot.params,
                       search: searchParams,
                       path: targetUrl.pathname