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

package/dist/renderer-client.d.mts

@@ -1,5 +1,5 @@
 import { FarmRouterRouteInput } from './router.mjs';
-import { F as FarmNavigationState, a as FarmNavigateOptions } from './spa-router-BM-OHflh.mjs';
+import { F as FarmNavigationState, a as FarmNavigateOptions } from './spa-router-Cr39oWnX.mjs';
 import { F as FarmClientCacheStatus } from './client-cache-CopR_MaI.mjs';
 import { ServerFn } from './server-fn.mjs';
 import { ServerQuery } from './server-query.mjs';
@@ -8,8 +8,8 @@ import { F as FarmThemeSnapshot, a as FarmThemePreference } from './types-DQnyD3
 import { F as FarmI18nClientSnapshot, a as FarmTranslator, b as FarmI18nLocale } from './types-mP6R6CzS.mjs';
 import './lifecycle-De0vQG45.mjs';
 import './island-CfGru1MO.mjs';
-import './render-plan-HL0ChBbH.mjs';
-import './client-plugins-BtfLE4dW.mjs';
+import './render-plan-D3TuPEmY.mjs';
+import './client-plugins-HizW0gLc.mjs';
 import './renderer.mjs';
 import 'http';
 import './types-D1A6-XvH.mjs';

package/dist/renderer-client.d.ts

@@ -1,5 +1,5 @@
 import { FarmRouterRouteInput } from './router.js';
-import { F as FarmNavigationState, a as FarmNavigateOptions } from './spa-router-DMKCWHT5.js';
+import { F as FarmNavigationState, a as FarmNavigateOptions } from './spa-router-C7RwU8o-.js';
 import { F as FarmClientCacheStatus } from './client-cache-Djy_TlE8.js';
 import { ServerFn } from './server-fn.js';
 import { ServerQuery } from './server-query.js';
@@ -8,8 +8,8 @@ import { F as FarmThemeSnapshot, a as FarmThemePreference } from './types-DQnyD3
 import { F as FarmI18nClientSnapshot, a as FarmTranslator, b as FarmI18nLocale } from './types-mP6R6CzS.js';
 import './lifecycle-De0vQG45.js';
 import './island-CfGru1MO.js';
-import './render-plan-DZ0LA8wX.js';
-import './client-plugins-C4me5UPd.js';
+import './render-plan-C62oFdVD.js';
+import './client-plugins-w_b1wA8e.js';
 import './renderer.js';
 import 'http';
 import './types-D1A6-XvH.js';

package/dist/renderer-client.mjs

@@ -16,7 +16,7 @@ import {
   getRouter,
   readPageState,
   subscribeHistoryChange
-} from "./chunk-3HIATXA4.mjs";
+} from "./chunk-XSUYR4Q3.mjs";
 import {
   createFarmClientTranslator,
   getFarmI18nClientState,

package/dist/{request-8__ppqcz.d.ts → request-C-ZYE89s.d.ts}

@@ -1,4 +1,4 @@
-import './client-plugins-C4me5UPd.js';
+import './client-plugins-w_b1wA8e.js';
 
 declare function _runWithCurrentRequest<T>(request: Request, fn: () => Promise<T> | T): Promise<T>;
 declare function getCurrentRequest(): Request;

package/dist/{request-DAZMscB9.d.mts → request-DPMdCOtv.d.mts}

@@ -1,4 +1,4 @@
-import './client-plugins-BtfLE4dW.mjs';
+import './client-plugins-HizW0gLc.mjs';
 
 declare function _runWithCurrentRequest<T>(request: Request, fn: () => Promise<T> | T): Promise<T>;
 declare function getCurrentRequest(): Request;

package/dist/request.d.mts

@@ -1,5 +1,5 @@
-export { g as getCurrentRequest } from './request-DAZMscB9.mjs';
-import './client-plugins-BtfLE4dW.mjs';
+export { g as getCurrentRequest } from './request-DPMdCOtv.mjs';
+import './client-plugins-HizW0gLc.mjs';
 import './lifecycle-De0vQG45.mjs';
 import './renderer.mjs';
 import 'http';

package/dist/request.d.ts

@@ -1,5 +1,5 @@
-export { g as getCurrentRequest } from './request-8__ppqcz.js';
-import './client-plugins-C4me5UPd.js';
+export { g as getCurrentRequest } from './request-C-ZYE89s.js';
+import './client-plugins-w_b1wA8e.js';
 import './lifecycle-De0vQG45.js';
 import './renderer.js';
 import 'http';

package/dist/routes.d.mts

@@ -3,7 +3,7 @@ import { ComponentType } from 'react';
 import { RouteDataCacheKey } from './cache.mjs';
 import { ServerFn } from './server-fn.mjs';
 import { FarmServerRendererRuntime } from './renderer.mjs';
-import { n as LayoutProps, y as Metadata, i as FarmAppContext, l as PageProps, k as PluginContextProps, u as RouteModule, H as ParsedRoute } from './client-plugins-BtfLE4dW.mjs';
+import { n as LayoutProps, y as Metadata, i as FarmAppContext, l as PageProps, k as PluginContextProps, u as RouteModule, H as ParsedRoute } from './client-plugins-HizW0gLc.mjs';
 import './server-fn-error-DDh14a0V.mjs';
 import './lifecycle-De0vQG45.mjs';
 import 'http';

package/dist/routes.d.ts

@@ -3,7 +3,7 @@ import { ComponentType } from 'react';
 import { RouteDataCacheKey } from './cache.js';
 import { ServerFn } from './server-fn.js';
 import { FarmServerRendererRuntime } from './renderer.js';
-import { n as LayoutProps, y as Metadata, i as FarmAppContext, l as PageProps, k as PluginContextProps, u as RouteModule, H as ParsedRoute } from './client-plugins-C4me5UPd.js';
+import { n as LayoutProps, y as Metadata, i as FarmAppContext, l as PageProps, k as PluginContextProps, u as RouteModule, H as ParsedRoute } from './client-plugins-w_b1wA8e.js';
 import './server-fn-error-DDh14a0V.js';
 import './lifecycle-De0vQG45.js';
 import 'http';

package/dist/server-plugins.d.mts

@@ -1,5 +1,5 @@
-import { bq as RedirectConfig, z as FarmRequest, B as FarmResponse, aO as FarmPluginContext, a7 as FarmPlugin, br as HeaderConfig, bs as RewriteConfig } from './client-plugins-BtfLE4dW.mjs';
-export { aQ as FarmPluginLifecycle, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-BtfLE4dW.mjs';
+import { bq as RedirectConfig, z as FarmRequest, B as FarmResponse, aO as FarmPluginContext, a7 as FarmPlugin, br as HeaderConfig, bs as RewriteConfig } from './client-plugins-HizW0gLc.mjs';
+export { aQ as FarmPluginLifecycle, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-HizW0gLc.mjs';
 import { R as ResolvedFarmI18nConfig } from './types-mP6R6CzS.mjs';
 import './lifecycle-De0vQG45.mjs';
 import './renderer.mjs';

package/dist/server-plugins.d.ts

@@ -1,5 +1,5 @@
-import { bq as RedirectConfig, z as FarmRequest, B as FarmResponse, aO as FarmPluginContext, a7 as FarmPlugin, br as HeaderConfig, bs as RewriteConfig } from './client-plugins-C4me5UPd.js';
-export { aQ as FarmPluginLifecycle, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-C4me5UPd.js';
+import { bq as RedirectConfig, z as FarmRequest, B as FarmResponse, aO as FarmPluginContext, a7 as FarmPlugin, br as HeaderConfig, bs as RewriteConfig } from './client-plugins-w_b1wA8e.js';
+export { aQ as FarmPluginLifecycle, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-w_b1wA8e.js';
 import { R as ResolvedFarmI18nConfig } from './types-mP6R6CzS.js';
 import './lifecycle-De0vQG45.js';
 import './renderer.js';

package/dist/server.cjs

@@ -22303,7 +22303,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;
@@ -28330,7 +28330,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)) {
@@ -28341,10 +28341,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) => {
@@ -29628,7 +29656,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
@@ -29643,7 +29675,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();
@@ -29722,7 +29755,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
@@ -29746,7 +29779,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