@farm.js/core 0.1.16 → 0.1.17

package/dist/api/runtime.cjs

@@ -26,6 +26,7 @@ __export(runtime_exports, {
   createStaticAPIRouteMatcherAtBasePath: () => createStaticAPIRouteMatcherAtBasePath,
   getAllowedAPIRouteMethods: () => getAllowedAPIRouteMethods,
   invokeAPIRouteEndpoint: () => invokeAPIRouteEndpoint,
+  isEndpointFailure: () => isEndpointFailure,
   isFarmAPIPathname: () => isFarmAPIPathname,
   isWebResponse: () => isWebResponse,
   matchAPIRoute: () => matchAPIRoute,
@@ -518,6 +519,8 @@ var _FarmDataCache = class _FarmDataCache {
   constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
     this.inflight = /* @__PURE__ */ new Map();
+    /** Local entries by tag, so tag counts and pruning never scan unrelated entries. */
+    this.entriesByTag = /* @__PURE__ */ new Map();
     this.invalidatedTagVersions = /* @__PURE__ */ new Map();
     this.activeGenerations = /* @__PURE__ */ new Set();
     this.version = 0;
@@ -536,6 +539,7 @@ var _FarmDataCache = class _FarmDataCache {
   configure(config = {}) {
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -702,14 +706,12 @@ var _FarmDataCache = class _FarmDataCache {
     return entry;
   }
   delete(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     emitFarmEvent({ type: "cache.delete", key, deleted });
     return deleted;
   }
   async deleteAsync(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     if (this.adapter) {
       await this.adapter.delete(this.createAdapterKey(key));
     }
@@ -720,6 +722,7 @@ var _FarmDataCache = class _FarmDataCache {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -805,23 +808,32 @@ var _FarmDataCache = class _FarmDataCache {
       return cached.value;
     }
     const inflight = this.inflight.get(key);
-    if (inflight) {
+    if (inflight && !this.wasInvalidatedSince(inflight.tags, inflight.startVersion)) {
       emitFarmEvent({ type: "cache.dedupe", key });
-      return inflight;
+      return inflight.promise;
     }
     const tags = Array.from(normalizeCacheOptionsTags(options));
     const generation = this.generation;
+    const startVersion = this.version;
     const promise = this.fillCacheEntry(key, producer, options, tags, generation).catch((error) => {
       emitFarmEvent({ type: "cache.error", key, operation: "set", error });
       throw error;
     }).finally(() => {
-      if (this.inflight.get(key) === promise) {
+      if (this.inflight.get(key)?.promise === promise) {
         this.inflight.delete(key);
       }
     });
-    this.inflight.set(key, promise);
+    this.inflight.set(key, { promise, tags, startVersion });
     return promise;
   }
+  /** A fill that started before one of its tags was invalidated cannot satisfy later readers. */
+  wasInvalidatedSince(tags, version) {
+    for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion !== void 0 && invalidatedVersion > version) return true;
+    }
+    return false;
+  }
   async fillCacheEntry(key, producer, options, tags, generation) {
     const adapter = this.adapter;
     const namespace = this.namespace;
@@ -862,7 +874,7 @@ var _FarmDataCache = class _FarmDataCache {
       return value;
     } finally {
       this.activeGenerations.delete(activeGeneration);
-      this.pruneInvalidatedTagVersions();
+      this.pruneInvalidatedTagVersions(activeGeneration.tags);
       if (leaseToken && adapter?.releaseLease) {
         try {
           await adapter.releaseLease(leaseKey, leaseToken);
@@ -907,18 +919,9 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return void 0;
   }
-  countEntriesForTag(tag) {
-    let count = 0;
-    for (const entry of this.entries.values()) {
-      if (entry.tags.has(tag)) {
-        count++;
-      }
-    }
-    return count;
-  }
   countEntriesForTags(tags) {
     let count = 0;
-    for (const entry of this.entries.values()) {
+    for (const entry of this.entriesByTag.get(tags[0]) ?? []) {
       if (tags.every((tag) => entry.tags.has(tag))) {
         count++;
       }
@@ -926,10 +929,10 @@ var _FarmDataCache = class _FarmDataCache {
     return count;
   }
   invalidateTag(normalizedTag) {
-    const count = this.countEntriesForTag(normalizedTag);
+    const count = this.entriesByTag.get(normalizedTag)?.size ?? 0;
     this.invalidatedTagVersions.delete(normalizedTag);
     this.invalidatedTagVersions.set(normalizedTag, ++this.version);
-    this.pruneInvalidatedTagVersions();
+    this.pruneInvalidatedTagVersions([normalizedTag]);
     return count;
   }
   toPublicEntry(entry) {
@@ -959,19 +962,51 @@ var _FarmDataCache = class _FarmDataCache {
     this.entries.set(key, entry);
   }
   storeLocalEntry(entry) {
-    this.entries.delete(entry.key);
+    const removed = [];
+    const replaced = this.detachLocalEntry(entry.key);
+    if (replaced) removed.push(replaced);
     this.entries.set(entry.key, entry);
+    for (const tag of entry.tags) {
+      let tagged = this.entriesByTag.get(tag);
+      if (!tagged) this.entriesByTag.set(tag, tagged = /* @__PURE__ */ new Set());
+      tagged.add(entry);
+    }
     while (this.entries.size > this.maxEntries) {
       const oldestKey = this.entries.keys().next().value;
       if (oldestKey === void 0) break;
-      this.entries.delete(oldestKey);
+      removed.push(this.detachLocalEntry(oldestKey));
     }
-    this.pruneInvalidatedTagVersions();
+    for (const removedEntry of removed) this.pruneInvalidatedTagVersions(removedEntry.tags);
+  }
+  deleteLocalEntry(key) {
+    const entry = this.detachLocalEntry(key);
+    if (!entry) return false;
+    this.pruneInvalidatedTagVersions(entry.tags);
+    return true;
+  }
+  detachLocalEntry(key) {
+    const entry = this.entries.get(key);
+    if (!entry) return void 0;
+    this.entries.delete(key);
+    for (const tag of entry.tags) {
+      const tagged = this.entriesByTag.get(tag);
+      if (!tagged) continue;
+      tagged.delete(entry);
+      if (tagged.size === 0) this.entriesByTag.delete(tag);
+    }
+    return entry;
   }
-  pruneInvalidatedTagVersions() {
-    tags: for (const [tag, invalidatedVersion] of this.invalidatedTagVersions) {
-      for (const entry of this.entries.values()) {
-        if (entry.tags.has(tag) && entry.createdVersion < invalidatedVersion) continue tags;
+  /**
+   * Drop invalidation versions that no local entry or active fill can be stale against.
+   * Callers pass only the tags whose dependents just changed, so the cost is bounded by
+   * the entries sharing those tags rather than by the whole cache.
+   */
+  pruneInvalidatedTagVersions(tags) {
+    tags: for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion === void 0) continue;
+      for (const entry of this.entriesByTag.get(tag) ?? []) {
+        if (entry.createdVersion < invalidatedVersion) continue tags;
       }
       for (const generation of this.activeGenerations) {
         if (generation.tags.has(tag) && generation.createdVersion < invalidatedVersion)
@@ -1403,7 +1438,7 @@ function createEndpoint(pathOrOptions, optionsOrHandler, maybeHandler) {
     wrappedHandler
   );
   endpoint.__path = path || void 0;
-  endpoint.__method = options.method || "GET";
+  endpoint.__method = options.method || (path ? "GET" : void 0);
   endpoint.__autoPath = !path;
   endpoint.__handler = wrappedHandler;
   endpoint.__farmInvoke = (ctx) => runEndpointMiddleware(middleware, ctx, handler, error, options.invalidates);
@@ -2672,6 +2707,7 @@ __name(validateInput, "validateInput");
   createStaticAPIRouteMatcherAtBasePath,
   getAllowedAPIRouteMethods,
   invokeAPIRouteEndpoint,
+  isEndpointFailure,
   isFarmAPIPathname,
   isWebResponse,
   matchAPIRoute,

package/dist/api/runtime.d.mts

@@ -1,6 +1,6 @@
-import { e as EndpointFailure } from '../endpoint-Bu3XgeMK.mjs';
-export { p as parseRouteSchema } from '../endpoint-Bu3XgeMK.mjs';
-import { P as PluginRoutesFactory } from '../route-C_eLaFTZ.mjs';
+import { e as EndpointFailure } from '../endpoint-DAc96i93.mjs';
+export { i as isEndpointFailure, p as parseRouteSchema } from '../endpoint-DAc96i93.mjs';
+import { P as PluginRoutesFactory } from '../route-B0XrsrFk.mjs';
 import { a as APIRouteParams, A as APIRouteMatch } from '../route-pattern-W-SsJGSp.mjs';
 export { b as APIRouteParamValue, m as matchAPIRoute } from '../route-pattern-W-SsJGSp.mjs';
 import '../cache.mjs';

package/dist/api/runtime.d.ts

@@ -1,6 +1,6 @@
-import { e as EndpointFailure } from '../endpoint-kSAxE52R.js';
-export { p as parseRouteSchema } from '../endpoint-kSAxE52R.js';
-import { P as PluginRoutesFactory } from '../route-BxNJT447.js';
+import { e as EndpointFailure } from '../endpoint-1zA994xL.js';
+export { i as isEndpointFailure, p as parseRouteSchema } from '../endpoint-1zA994xL.js';
+import { P as PluginRoutesFactory } from '../route-DOEpbyWZ.js';
 import { a as APIRouteParams, A as APIRouteMatch } from '../route-pattern-W-SsJGSp.js';
 export { b as APIRouteParamValue, m as matchAPIRoute } from '../route-pattern-W-SsJGSp.js';
 import '../cache.js';

package/dist/api/runtime.mjs

@@ -11,9 +11,11 @@ import {
   normalizeRouteResponse,
   parseRouteSchema,
   resolveAPIRouteEndpoint
-} from "../chunk-DPZUDPVJ.mjs";
+} from "../chunk-XP777LRD.mjs";
 import "../chunk-I6XDAKWQ.mjs";
-import "../chunk-OWTIOHON.mjs";
+import {
+  isEndpointFailure
+} from "../chunk-SYGGPS4A.mjs";
 import {
   registerAPIRouteShape
 } from "../chunk-W3B4PKAW.mjs";
@@ -24,7 +26,7 @@ import {
 } from "../chunk-O7BH5O46.mjs";
 import "../chunk-EMLAPBEM.mjs";
 import "../chunk-7LTCDQRS.mjs";
-import "../chunk-IGO2HEV7.mjs";
+import "../chunk-F6SJAKFJ.mjs";
 import "../chunk-4SIYUGRY.mjs";
 import "../chunk-C4NCTZLM.mjs";
 import "../chunk-FUZEBRP3.mjs";
@@ -38,6 +40,7 @@ export {
   createStaticAPIRouteMatcherAtBasePath,
   getAllowedAPIRouteMethods,
   invokeAPIRouteEndpoint,
+  isEndpointFailure,
   isFarmAPIPathname,
   isWebResponse,
   matchAPIRoute,

package/dist/{api-client-B-n3pm_Q.d.mts → api-client-Cx54IR5g.d.mts}

@@ -1,8 +1,8 @@
 import { F as FarmIntegrationAPI, f as FarmIntegrationAPIOperation } from './integration-api-BbaiokCC.mjs';
 import { b as FarmClientCacheKey, a as FarmClientCacheEntry } from './client-cache-di_Nasxa.mjs';
 import { DefinedCacheKey, RouteDataCacheKey, InferCacheKeyData } from './cache.mjs';
-import { a as RoutePathParams } from './route-C_eLaFTZ.mjs';
-import { K as FarmAPIStream } from './endpoint-Bu3XgeMK.mjs';
+import { a as RoutePathParams } from './route-B0XrsrFk.mjs';
+import { K as FarmAPIStream } from './endpoint-DAc96i93.mjs';
 
 /** Instance defaults, resolved once per call before cache lookup or dispatch. */
 type ClientHeaders = Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);

package/dist/{api-client-C0_NZEBl.d.ts → api-client-DykpaKcY.d.ts}

@@ -1,8 +1,8 @@
 import { F as FarmIntegrationAPI, f as FarmIntegrationAPIOperation } from './integration-api-BbaiokCC.js';
 import { b as FarmClientCacheKey, a as FarmClientCacheEntry } from './client-cache-Deoqq-nM.js';
 import { DefinedCacheKey, RouteDataCacheKey, InferCacheKeyData } from './cache.js';
-import { a as RoutePathParams } from './route-BxNJT447.js';
-import { K as FarmAPIStream } from './endpoint-kSAxE52R.js';
+import { a as RoutePathParams } from './route-DOEpbyWZ.js';
+import { K as FarmAPIStream } from './endpoint-1zA994xL.js';
 
 /** Instance defaults, resolved once per call before cache lookup or dispatch. */
 type ClientHeaders = Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);

package/dist/api.cjs

@@ -825,6 +825,8 @@ var init_cache = __esm({
       constructor(config = {}) {
         this.entries = /* @__PURE__ */ new Map();
         this.inflight = /* @__PURE__ */ new Map();
+        /** Local entries by tag, so tag counts and pruning never scan unrelated entries. */
+        this.entriesByTag = /* @__PURE__ */ new Map();
         this.invalidatedTagVersions = /* @__PURE__ */ new Map();
         this.activeGenerations = /* @__PURE__ */ new Set();
         this.version = 0;
@@ -843,6 +845,7 @@ var init_cache = __esm({
       configure(config = {}) {
         this.generation++;
         this.entries.clear();
+        this.entriesByTag.clear();
         this.inflight.clear();
         this.invalidatedTagVersions.clear();
         this.activeGenerations.clear();
@@ -1009,14 +1012,12 @@ var init_cache = __esm({
         return entry;
       }
       delete(key) {
-        const deleted = this.entries.delete(key);
-        if (deleted) this.pruneInvalidatedTagVersions();
+        const deleted = this.deleteLocalEntry(key);
         emitFarmEvent({ type: "cache.delete", key, deleted });
         return deleted;
       }
       async deleteAsync(key) {
-        const deleted = this.entries.delete(key);
-        if (deleted) this.pruneInvalidatedTagVersions();
+        const deleted = this.deleteLocalEntry(key);
         if (this.adapter) {
           await this.adapter.delete(this.createAdapterKey(key));
         }
@@ -1027,6 +1028,7 @@ var init_cache = __esm({
         const count = this.entries.size;
         this.generation++;
         this.entries.clear();
+        this.entriesByTag.clear();
         this.inflight.clear();
         this.invalidatedTagVersions.clear();
         this.activeGenerations.clear();
@@ -1112,23 +1114,32 @@ var init_cache = __esm({
           return cached.value;
         }
         const inflight = this.inflight.get(key);
-        if (inflight) {
+        if (inflight && !this.wasInvalidatedSince(inflight.tags, inflight.startVersion)) {
           emitFarmEvent({ type: "cache.dedupe", key });
-          return inflight;
+          return inflight.promise;
         }
         const tags = Array.from(normalizeCacheOptionsTags(options));
         const generation = this.generation;
+        const startVersion = this.version;
         const promise = this.fillCacheEntry(key, producer, options, tags, generation).catch((error) => {
           emitFarmEvent({ type: "cache.error", key, operation: "set", error });
           throw error;
         }).finally(() => {
-          if (this.inflight.get(key) === promise) {
+          if (this.inflight.get(key)?.promise === promise) {
             this.inflight.delete(key);
           }
         });
-        this.inflight.set(key, promise);
+        this.inflight.set(key, { promise, tags, startVersion });
         return promise;
       }
+      /** A fill that started before one of its tags was invalidated cannot satisfy later readers. */
+      wasInvalidatedSince(tags, version) {
+        for (const tag of tags) {
+          const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+          if (invalidatedVersion !== void 0 && invalidatedVersion > version) return true;
+        }
+        return false;
+      }
       async fillCacheEntry(key, producer, options, tags, generation) {
         const adapter = this.adapter;
         const namespace = this.namespace;
@@ -1169,7 +1180,7 @@ var init_cache = __esm({
           return value;
         } finally {
           this.activeGenerations.delete(activeGeneration);
-          this.pruneInvalidatedTagVersions();
+          this.pruneInvalidatedTagVersions(activeGeneration.tags);
           if (leaseToken && adapter?.releaseLease) {
             try {
               await adapter.releaseLease(leaseKey, leaseToken);
@@ -1214,18 +1225,9 @@ var init_cache = __esm({
         }
         return void 0;
       }
-      countEntriesForTag(tag) {
-        let count = 0;
-        for (const entry of this.entries.values()) {
-          if (entry.tags.has(tag)) {
-            count++;
-          }
-        }
-        return count;
-      }
       countEntriesForTags(tags) {
         let count = 0;
-        for (const entry of this.entries.values()) {
+        for (const entry of this.entriesByTag.get(tags[0]) ?? []) {
           if (tags.every((tag) => entry.tags.has(tag))) {
             count++;
           }
@@ -1233,10 +1235,10 @@ var init_cache = __esm({
         return count;
       }
       invalidateTag(normalizedTag) {
-        const count = this.countEntriesForTag(normalizedTag);
+        const count = this.entriesByTag.get(normalizedTag)?.size ?? 0;
         this.invalidatedTagVersions.delete(normalizedTag);
         this.invalidatedTagVersions.set(normalizedTag, ++this.version);
-        this.pruneInvalidatedTagVersions();
+        this.pruneInvalidatedTagVersions([normalizedTag]);
         return count;
       }
       toPublicEntry(entry) {
@@ -1266,19 +1268,51 @@ var init_cache = __esm({
         this.entries.set(key, entry);
       }
       storeLocalEntry(entry) {
-        this.entries.delete(entry.key);
+        const removed = [];
+        const replaced = this.detachLocalEntry(entry.key);
+        if (replaced) removed.push(replaced);
         this.entries.set(entry.key, entry);
+        for (const tag of entry.tags) {
+          let tagged = this.entriesByTag.get(tag);
+          if (!tagged) this.entriesByTag.set(tag, tagged = /* @__PURE__ */ new Set());
+          tagged.add(entry);
+        }
         while (this.entries.size > this.maxEntries) {
           const oldestKey = this.entries.keys().next().value;
           if (oldestKey === void 0) break;
-          this.entries.delete(oldestKey);
+          removed.push(this.detachLocalEntry(oldestKey));
         }
-        this.pruneInvalidatedTagVersions();
+        for (const removedEntry of removed) this.pruneInvalidatedTagVersions(removedEntry.tags);
+      }
+      deleteLocalEntry(key) {
+        const entry = this.detachLocalEntry(key);
+        if (!entry) return false;
+        this.pruneInvalidatedTagVersions(entry.tags);
+        return true;
       }
-      pruneInvalidatedTagVersions() {
-        tags: for (const [tag, invalidatedVersion] of this.invalidatedTagVersions) {
-          for (const entry of this.entries.values()) {
-            if (entry.tags.has(tag) && entry.createdVersion < invalidatedVersion) continue tags;
+      detachLocalEntry(key) {
+        const entry = this.entries.get(key);
+        if (!entry) return void 0;
+        this.entries.delete(key);
+        for (const tag of entry.tags) {
+          const tagged = this.entriesByTag.get(tag);
+          if (!tagged) continue;
+          tagged.delete(entry);
+          if (tagged.size === 0) this.entriesByTag.delete(tag);
+        }
+        return entry;
+      }
+      /**
+       * Drop invalidation versions that no local entry or active fill can be stale against.
+       * Callers pass only the tags whose dependents just changed, so the cost is bounded by
+       * the entries sharing those tags rather than by the whole cache.
+       */
+      pruneInvalidatedTagVersions(tags) {
+        tags: for (const tag of tags) {
+          const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+          if (invalidatedVersion === void 0) continue;
+          for (const entry of this.entriesByTag.get(tag) ?? []) {
+            if (entry.createdVersion < invalidatedVersion) continue tags;
           }
           for (const generation of this.activeGenerations) {
             if (generation.tags.has(tag) && generation.createdVersion < invalidatedVersion)
@@ -2294,6 +2328,7 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
     }
     return rendererRuntime.createElement(...args);
   }, "createElement");
+  const markFunctionComponent = /* @__PURE__ */ __name((component) => rendererRuntime?.markFunctionComponent?.(component) ?? component, "markFunctionComponent");
   const Component = route.component;
   if (route.pending) {
     const PendingComponent = route.pending;
@@ -2315,7 +2350,9 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
         throw error;
       }
     }, "FarmProgrammaticPageContent");
-    const PageContent = FarmProgrammaticPageContent2;
+    const PageContent = markFunctionComponent(
+      FarmProgrammaticPageContent2
+    );
     const FarmProgrammaticPage = /* @__PURE__ */ __name(function FarmProgrammaticPage2(props) {
       return createElement(
         rendererRuntime.Suspense,
@@ -2325,7 +2362,7 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
         createElement(PageContent, props)
       );
     }, "FarmProgrammaticPage");
-    return FarmProgrammaticPage;
+    return markFunctionComponent(FarmProgrammaticPage);
   }
   const FarmProgrammaticPageContent = /* @__PURE__ */ __name(async function FarmProgrammaticPageContent2(props) {
     try {
@@ -2344,7 +2381,7 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
       throw error;
     }
   }, "FarmProgrammaticPageContent");
-  return FarmProgrammaticPageContent;
+  return markFunctionComponent(FarmProgrammaticPageContent);
 }
 function readProgrammaticRouteProps(route, props, resources) {
   if (isProgrammaticRoutePropsResolved(props)) {
@@ -3092,7 +3129,7 @@ function createEndpoint(pathOrOptions, optionsOrHandler, maybeHandler) {
     wrappedHandler
   );
   endpoint.__path = path4 || void 0;
-  endpoint.__method = options.method || "GET";
+  endpoint.__method = options.method || (path4 ? "GET" : void 0);
   endpoint.__autoPath = !path4;
   endpoint.__handler = wrappedHandler;
   endpoint.__farmInvoke = (ctx) => runEndpointMiddleware(middleware, ctx, handler, error, options.invalidates);
@@ -3468,6 +3505,42 @@ function getRequestStore() {
 __name(getRequestStore, "getRequestStore");
 var requestStore = getRequestStore();
 _setCurrentRequestResolver(() => requestStore.getStore());
+function resolveFarmRequestURL(req, options = {}) {
+  if (options.origin) {
+    return new URL(req.url || "/", options.origin);
+  }
+  const forwardedHost = options.trustProxy ? firstForwardedHeaderValue(req.headers["x-forwarded-host"]) : void 0;
+  const fallbackHost = firstForwardedHeaderValue(req.headers.host) || "localhost";
+  const forwardedProto = options.trustProxy ? firstForwardedHeaderValue(req.headers["x-forwarded-proto"]) : void 0;
+  const normalizedProto = forwardedProto?.toLowerCase();
+  const proto = normalizedProto === "https" || normalizedProto === "http" ? normalizedProto : isEncryptedFarmRequest(req) ? "https" : "http";
+  return new URL(req.url || "/", resolveRequestOrigin(proto, forwardedHost, fallbackHost));
+}
+__name(resolveFarmRequestURL, "resolveFarmRequestURL");
+function isEncryptedFarmRequest(req) {
+  return Boolean(req.socket?.encrypted);
+}
+__name(isEncryptedFarmRequest, "isEncryptedFarmRequest");
+function firstForwardedHeaderValue(value) {
+  const first = Array.isArray(value) ? value[0] : value;
+  const token = first?.split(",", 1)[0]?.trim();
+  return token || void 0;
+}
+__name(firstForwardedHeaderValue, "firstForwardedHeaderValue");
+function resolveRequestOrigin(proto, host, fallback) {
+  for (const candidate of [host, fallback, "localhost"]) {
+    if (!candidate) continue;
+    if (/[\s/?#@\\]/u.test(candidate)) continue;
+    try {
+      const url = new URL(`${proto}://${candidate}`);
+      if (url.username || url.password || url.pathname !== "/" || url.search || url.hash) continue;
+      return url.origin;
+    } catch {
+    }
+  }
+  return `${proto}://localhost`;
+}
+__name(resolveRequestOrigin, "resolveRequestOrigin");
 async function _runWithCurrentRequest(request, fn) {
   return requestStore.run(request, fn);
 }
@@ -8221,7 +8294,7 @@ function farmApiPlugin(options = {}) {
             if (currentPathname !== pathname && !matchAPIRouteAtBasePath(apiRoutesCache, currentPathname, basePath)) {
               return next();
             }
-            const fullUrl = `http://${req.headers.host || "localhost:3000"}${currentUrl}`;
+            const fullUrl = resolveFarmRequestURL(req);
             const headers = new Headers();
             for (const [key, value] of Object.entries(req.headers)) {
               if (value) {

package/dist/api.d.mts

@@ -1,10 +1,10 @@
-export { A as AnyEndpointMiddleware, D as DELETE, j as EndpointErrorContracts, h as EndpointErrorDefinition, i as EndpointErrorDefinitions, k as EndpointErrorHandler, g as EndpointErrorSchema, l as EndpointFail, e as EndpointFailure, w as EndpointHandler, t as EndpointInvalidationContext, s as EndpointInvalidationTarget, u as EndpointInvalidations, d as EndpointMCPMetadata, b as EndpointMCPOptions, r as EndpointMiddleware, q as EndpointMiddlewareContext, E as EndpointMiddlewareResult, f as EndpointOpenAPIMetadata, v as EndpointOptions, n as EndpointParamValue, o as EndpointParams, K as FarmAPIStream, J as FarmStreamResponse, G as GET, H as HEAD, I as InferEndpointMiddlewareContext, M as MultipartField, F as MultipartSchema, B as MultipartValues, O as OPTIONS, z as PATCH, P as POST, y as PUT, Q as QUERY, T as TypedEndpoint, C as TypedFormData, x as createEndpoint, m as isEndpointFailure, X as isFarmAPIStream, V as isJSONStreamResponse, N as isMultipartSchema, U as jsonStream, L as multipart, W as readJSONStream, S as toFormData } from './endpoint-Bu3XgeMK.mjs';
+export { A as AnyEndpointMiddleware, D as DELETE, k as EndpointErrorContracts, h as EndpointErrorDefinition, j as EndpointErrorDefinitions, l as EndpointErrorHandler, g as EndpointErrorSchema, m as EndpointFail, e as EndpointFailure, w as EndpointHandler, t as EndpointInvalidationContext, s as EndpointInvalidationTarget, u as EndpointInvalidations, d as EndpointMCPMetadata, b as EndpointMCPOptions, r as EndpointMiddleware, q as EndpointMiddlewareContext, E as EndpointMiddlewareResult, f as EndpointOpenAPIMetadata, v as EndpointOptions, n as EndpointParamValue, o as EndpointParams, K as FarmAPIStream, J as FarmStreamResponse, G as GET, H as HEAD, I as InferEndpointMiddlewareContext, M as MultipartField, F as MultipartSchema, B as MultipartValues, O as OPTIONS, z as PATCH, P as POST, y as PUT, Q as QUERY, T as TypedEndpoint, C as TypedFormData, x as createEndpoint, i as isEndpointFailure, X as isFarmAPIStream, V as isJSONStreamResponse, N as isMultipartSchema, U as jsonStream, L as multipart, W as readJSONStream, S as toFormData } from './endpoint-DAc96i93.mjs';
 export { APIRoute, APIRouteConflictError, APIRouteHandlerOptions, APIRouteManager, APIRouteManagerOptions } from './api/route-manager.mjs';
-export { v as APIClient, h as APIClientError, b as APIClientOptions, i as APIClientSystemError, c as APIClientWithoutIntegrationsOptions, s as APIQueryPrimitive, t as APIQueryValue, g as APIResult, K as APIRouteManifest, A as APIRouteRefMetadata, x as ApiClients, C as CacheKey, n as CacheOptions, l as CachePolicy, m as CacheScope, r as ClientOptions, a as FARM_API_ROUTE_META_SYMBOL, F as FARM_API_ROUTE_REF_SYMBOL, p as InvalidateOptions, I as InvalidateTarget, q as OptimisticOptions, O as OptimisticUpdate, j as RequestEvent, k as ResponseEvent, o as RetryAttemptContext, R as RetryOptions, u as RouteAPIClient, w as ServerAPIClient, S as ServerAPIClientOptions, d as ServerAPIClientWithoutIntegrationsOptions, f as StatusEvent, e as StatusPhase, G as applyServerFnOptimisticUpdates, z as createAPIClient, y as createApiClients, E as createServerAPIClient, D as getAPIRouteRefMetadata, B as isAPIRouteRef, J as resolveServerFnInvalidateTargets, H as settleServerFnOptimisticUpdates } from './api-client-B-n3pm_Q.mjs';
-import { aq as ResolvedFarmAPIConfig } from './client-plugins-CIPRtSsW.mjs';
-export { ec as DEFAULT_FARM_API_BASE_PATH, ef as FarmAPIConfig, ed as FarmAPIConfigResolverContext, ee as FarmAPIConfigValue, ej as getFarmAPIBaseURL, ei as normalizeFarmAPIBasePath, eh as normalizeFarmAPIConfig, eg as resolveFarmAPIConfig, ek as resolveFarmAPIRequestURL } from './client-plugins-CIPRtSsW.mjs';
+export { v as APIClient, h as APIClientError, b as APIClientOptions, i as APIClientSystemError, c as APIClientWithoutIntegrationsOptions, s as APIQueryPrimitive, t as APIQueryValue, g as APIResult, K as APIRouteManifest, A as APIRouteRefMetadata, x as ApiClients, C as CacheKey, n as CacheOptions, l as CachePolicy, m as CacheScope, r as ClientOptions, a as FARM_API_ROUTE_META_SYMBOL, F as FARM_API_ROUTE_REF_SYMBOL, p as InvalidateOptions, I as InvalidateTarget, q as OptimisticOptions, O as OptimisticUpdate, j as RequestEvent, k as ResponseEvent, o as RetryAttemptContext, R as RetryOptions, u as RouteAPIClient, w as ServerAPIClient, S as ServerAPIClientOptions, d as ServerAPIClientWithoutIntegrationsOptions, f as StatusEvent, e as StatusPhase, G as applyServerFnOptimisticUpdates, z as createAPIClient, y as createApiClients, E as createServerAPIClient, D as getAPIRouteRefMetadata, B as isAPIRouteRef, J as resolveServerFnInvalidateTargets, H as settleServerFnOptimisticUpdates } from './api-client-Cx54IR5g.mjs';
+import { aq as ResolvedFarmAPIConfig } from './client-plugins-JXXmZliS.mjs';
+export { ec as DEFAULT_FARM_API_BASE_PATH, ef as FarmAPIConfig, ed as FarmAPIConfigResolverContext, ee as FarmAPIConfigValue, ej as getFarmAPIBaseURL, ei as normalizeFarmAPIBasePath, eh as normalizeFarmAPIConfig, eg as resolveFarmAPIConfig, ek as resolveFarmAPIRequestURL } from './client-plugins-JXXmZliS.mjs';
 import { Plugin } from 'vite';
-export { k as PluginAPIRouter, i as PluginLocalAPI, h as PluginLocalAPIEndpoint, g as PluginRoutes, P as PluginRoutesFactory, d as RouteDefinition, f as RouteFactory, b as RouteInputSchemas, c as RouteJSON, R as RouteMethod, e as RouteOptions, a as RoutePathParams, j as createRouteFactory, r as resolvePluginRoutes } from './route-C_eLaFTZ.mjs';
+export { k as PluginAPIRouter, i as PluginLocalAPI, h as PluginLocalAPIEndpoint, g as PluginRoutes, P as PluginRoutesFactory, d as RouteDefinition, f as RouteFactory, b as RouteInputSchemas, c as RouteJSON, R as RouteMethod, e as RouteOptions, a as RoutePathParams, j as createRouteFactory, r as resolvePluginRoutes } from './route-B0XrsrFk.mjs';
 export { API_ROUTE_METHODS, getAllowedAPIRouteMethods, invokeAPIRouteEndpoint, isWebResponse, normalizeRouteResponse, resolveAPIRouteEndpoint } from './api/runtime.mjs';
 export { A as APIRouteMatch, b as APIRouteParamValue, a as APIRouteParams, m as matchAPIRoute } from './route-pattern-W-SsJGSp.mjs';
 import './cache.mjs';

package/dist/api.d.ts

@@ -1,10 +1,10 @@
-export { A as AnyEndpointMiddleware, D as DELETE, j as EndpointErrorContracts, h as EndpointErrorDefinition, i as EndpointErrorDefinitions, k as EndpointErrorHandler, g as EndpointErrorSchema, l as EndpointFail, e as EndpointFailure, w as EndpointHandler, t as EndpointInvalidationContext, s as EndpointInvalidationTarget, u as EndpointInvalidations, d as EndpointMCPMetadata, b as EndpointMCPOptions, r as EndpointMiddleware, q as EndpointMiddlewareContext, E as EndpointMiddlewareResult, f as EndpointOpenAPIMetadata, v as EndpointOptions, n as EndpointParamValue, o as EndpointParams, K as FarmAPIStream, J as FarmStreamResponse, G as GET, H as HEAD, I as InferEndpointMiddlewareContext, M as MultipartField, F as MultipartSchema, B as MultipartValues, O as OPTIONS, z as PATCH, P as POST, y as PUT, Q as QUERY, T as TypedEndpoint, C as TypedFormData, x as createEndpoint, m as isEndpointFailure, X as isFarmAPIStream, V as isJSONStreamResponse, N as isMultipartSchema, U as jsonStream, L as multipart, W as readJSONStream, S as toFormData } from './endpoint-kSAxE52R.js';
+export { A as AnyEndpointMiddleware, D as DELETE, k as EndpointErrorContracts, h as EndpointErrorDefinition, j as EndpointErrorDefinitions, l as EndpointErrorHandler, g as EndpointErrorSchema, m as EndpointFail, e as EndpointFailure, w as EndpointHandler, t as EndpointInvalidationContext, s as EndpointInvalidationTarget, u as EndpointInvalidations, d as EndpointMCPMetadata, b as EndpointMCPOptions, r as EndpointMiddleware, q as EndpointMiddlewareContext, E as EndpointMiddlewareResult, f as EndpointOpenAPIMetadata, v as EndpointOptions, n as EndpointParamValue, o as EndpointParams, K as FarmAPIStream, J as FarmStreamResponse, G as GET, H as HEAD, I as InferEndpointMiddlewareContext, M as MultipartField, F as MultipartSchema, B as MultipartValues, O as OPTIONS, z as PATCH, P as POST, y as PUT, Q as QUERY, T as TypedEndpoint, C as TypedFormData, x as createEndpoint, i as isEndpointFailure, X as isFarmAPIStream, V as isJSONStreamResponse, N as isMultipartSchema, U as jsonStream, L as multipart, W as readJSONStream, S as toFormData } from './endpoint-1zA994xL.js';
 export { APIRoute, APIRouteConflictError, APIRouteHandlerOptions, APIRouteManager, APIRouteManagerOptions } from './api/route-manager.js';
-export { v as APIClient, h as APIClientError, b as APIClientOptions, i as APIClientSystemError, c as APIClientWithoutIntegrationsOptions, s as APIQueryPrimitive, t as APIQueryValue, g as APIResult, K as APIRouteManifest, A as APIRouteRefMetadata, x as ApiClients, C as CacheKey, n as CacheOptions, l as CachePolicy, m as CacheScope, r as ClientOptions, a as FARM_API_ROUTE_META_SYMBOL, F as FARM_API_ROUTE_REF_SYMBOL, p as InvalidateOptions, I as InvalidateTarget, q as OptimisticOptions, O as OptimisticUpdate, j as RequestEvent, k as ResponseEvent, o as RetryAttemptContext, R as RetryOptions, u as RouteAPIClient, w as ServerAPIClient, S as ServerAPIClientOptions, d as ServerAPIClientWithoutIntegrationsOptions, f as StatusEvent, e as StatusPhase, G as applyServerFnOptimisticUpdates, z as createAPIClient, y as createApiClients, E as createServerAPIClient, D as getAPIRouteRefMetadata, B as isAPIRouteRef, J as resolveServerFnInvalidateTargets, H as settleServerFnOptimisticUpdates } from './api-client-C0_NZEBl.js';
-import { aq as ResolvedFarmAPIConfig } from './client-plugins-CqVtZi5X.js';
-export { ec as DEFAULT_FARM_API_BASE_PATH, ef as FarmAPIConfig, ed as FarmAPIConfigResolverContext, ee as FarmAPIConfigValue, ej as getFarmAPIBaseURL, ei as normalizeFarmAPIBasePath, eh as normalizeFarmAPIConfig, eg as resolveFarmAPIConfig, ek as resolveFarmAPIRequestURL } from './client-plugins-CqVtZi5X.js';
+export { v as APIClient, h as APIClientError, b as APIClientOptions, i as APIClientSystemError, c as APIClientWithoutIntegrationsOptions, s as APIQueryPrimitive, t as APIQueryValue, g as APIResult, K as APIRouteManifest, A as APIRouteRefMetadata, x as ApiClients, C as CacheKey, n as CacheOptions, l as CachePolicy, m as CacheScope, r as ClientOptions, a as FARM_API_ROUTE_META_SYMBOL, F as FARM_API_ROUTE_REF_SYMBOL, p as InvalidateOptions, I as InvalidateTarget, q as OptimisticOptions, O as OptimisticUpdate, j as RequestEvent, k as ResponseEvent, o as RetryAttemptContext, R as RetryOptions, u as RouteAPIClient, w as ServerAPIClient, S as ServerAPIClientOptions, d as ServerAPIClientWithoutIntegrationsOptions, f as StatusEvent, e as StatusPhase, G as applyServerFnOptimisticUpdates, z as createAPIClient, y as createApiClients, E as createServerAPIClient, D as getAPIRouteRefMetadata, B as isAPIRouteRef, J as resolveServerFnInvalidateTargets, H as settleServerFnOptimisticUpdates } from './api-client-DykpaKcY.js';
+import { aq as ResolvedFarmAPIConfig } from './client-plugins-C089bQhN.js';
+export { ec as DEFAULT_FARM_API_BASE_PATH, ef as FarmAPIConfig, ed as FarmAPIConfigResolverContext, ee as FarmAPIConfigValue, ej as getFarmAPIBaseURL, ei as normalizeFarmAPIBasePath, eh as normalizeFarmAPIConfig, eg as resolveFarmAPIConfig, ek as resolveFarmAPIRequestURL } from './client-plugins-C089bQhN.js';
 import { Plugin } from 'vite';
-export { k as PluginAPIRouter, i as PluginLocalAPI, h as PluginLocalAPIEndpoint, g as PluginRoutes, P as PluginRoutesFactory, d as RouteDefinition, f as RouteFactory, b as RouteInputSchemas, c as RouteJSON, R as RouteMethod, e as RouteOptions, a as RoutePathParams, j as createRouteFactory, r as resolvePluginRoutes } from './route-BxNJT447.js';
+export { k as PluginAPIRouter, i as PluginLocalAPI, h as PluginLocalAPIEndpoint, g as PluginRoutes, P as PluginRoutesFactory, d as RouteDefinition, f as RouteFactory, b as RouteInputSchemas, c as RouteJSON, R as RouteMethod, e as RouteOptions, a as RoutePathParams, j as createRouteFactory, r as resolvePluginRoutes } from './route-DOEpbyWZ.js';
 export { API_ROUTE_METHODS, getAllowedAPIRouteMethods, invokeAPIRouteEndpoint, isWebResponse, normalizeRouteResponse, resolveAPIRouteEndpoint } from './api/runtime.js';
 export { A as APIRouteMatch, b as APIRouteParamValue, a as APIRouteParams, m as matchAPIRoute } from './route-pattern-W-SsJGSp.js';
 import './cache.js';

package/dist/api.mjs

@@ -1,6 +1,6 @@
 import {
   farmApiPlugin
-} from "./chunk-LK6FGAQR.mjs";
+} from "./chunk-UDBJCUPA.mjs";
 import {
   APIClientError,
   FARM_API_ROUTE_META_SYMBOL,
@@ -13,17 +13,17 @@ import {
   isAPIRouteRef,
   resolveServerFnInvalidateTargets,
   settleServerFnOptimisticUpdates
-} from "./chunk-KUO3GBPK.mjs";
+} from "./chunk-L6V3P73N.mjs";
 import "./chunk-72AK62H5.mjs";
-import "./chunk-HKLRP3BN.mjs";
+import "./chunk-5SPPCN5J.mjs";
 import "./chunk-QVYLBY73.mjs";
 import "./chunk-R3DS7A2T.mjs";
 import "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteConflictError,
   APIRouteManager
-} from "./chunk-ZHOIQC6U.mjs";
-import "./chunk-VO5SCWF5.mjs";
+} from "./chunk-ATERBVHQ.mjs";
+import "./chunk-BNGS6KJ6.mjs";
 import "./chunk-CU625VAY.mjs";
 import "./chunk-JNGIWIY6.mjs";
 import "./chunk-FV45CKBC.mjs";
@@ -34,7 +34,7 @@ import {
   isWebResponse,
   normalizeRouteResponse,
   resolveAPIRouteEndpoint
-} from "./chunk-DPZUDPVJ.mjs";
+} from "./chunk-XP777LRD.mjs";
 import {
   resolveFarmAPIServerBasePath
 } from "./chunk-I6XDAKWQ.mjs";
@@ -52,7 +52,7 @@ import {
   createRouteFactory,
   isEndpointFailure,
   resolvePluginRoutes
-} from "./chunk-OWTIOHON.mjs";
+} from "./chunk-SYGGPS4A.mjs";
 import "./chunk-W3B4PKAW.mjs";
 import "./chunk-5WI2S4CO.mjs";
 import "./chunk-EA5K5BKU.mjs";
@@ -86,7 +86,7 @@ import {
   resolveFarmAPIRequestURL
 } from "./chunk-7LTCDQRS.mjs";
 import "./chunk-IXUY2F5U.mjs";
-import "./chunk-IGO2HEV7.mjs";
+import "./chunk-F6SJAKFJ.mjs";
 import "./chunk-4SIYUGRY.mjs";
 import "./chunk-C4NCTZLM.mjs";
 import "./chunk-FUZEBRP3.mjs";