@farm.js/core 0.1.38 → 0.1.40

package/dist/{chunk-CXEN47J3.mjs → chunk-73WX6PRY.mjs}

@@ -304,6 +304,13 @@ function appendOpenGraph(tags, input, metadataBase, page) {
     appendMetaProperty(tags, "og:image:alt", image.alt);
     appendMetaProperty(tags, "og:image:type", image.type);
   }
+  for (const video of normalizeMetadataVideos(openGraph.videos, metadataBase)) {
+    appendMetaProperty(tags, "og:video", video.url);
+    appendMetaProperty(tags, "og:video:secure_url", video.secureUrl);
+    appendMetaProperty(tags, "og:video:type", video.type);
+    appendMetaProperty(tags, "og:video:width", video.width);
+    appendMetaProperty(tags, "og:video:height", video.height);
+  }
   if (openGraph.type === "article") {
     appendMetaProperty(tags, "article:published_time", normalizeDate(openGraph.publishedTime));
     appendMetaProperty(tags, "article:modified_time", normalizeDate(openGraph.modifiedTime));
@@ -432,6 +439,24 @@ function normalizeMetadataImages(value, metadataBase) {
   }).filter((item) => item !== null);
 }
 __name(normalizeMetadataImages, "normalizeMetadataImages");
+function normalizeMetadataVideos(value, metadataBase) {
+  return normalizeArray(value).map((item) => {
+    if (typeof item === "string") {
+      return { url: resolveMetadataUrl(item, metadataBase) || item };
+    }
+    if (!isRecord(item)) return null;
+    const url = resolveMetadataUrl(item.url, metadataBase);
+    if (!url) return null;
+    return {
+      url,
+      secureUrl: resolveMetadataUrl(item.secureUrl, metadataBase) || void 0,
+      width: normalizeNumber(item.width),
+      height: normalizeNumber(item.height),
+      type: typeof item.type === "string" ? item.type : void 0
+    };
+  }).filter((item) => item !== null);
+}
+__name(normalizeMetadataVideos, "normalizeMetadataVideos");
 function normalizeArray(value) {
   if (value == null) return [];
   return Array.isArray(value) ? value : [value];

package/dist/{chunk-RW63BOV7.cjs → chunk-7FHZ3E6D.cjs}

@@ -34,7 +34,7 @@ var _chunkS3A45T7Fcjs = require('./chunk-S3A45T7F.cjs');
 var _chunkZEG3OPIBcjs = require('./chunk-ZEG3OPIB.cjs');
 
 
-var _chunkULASELLAcjs = require('./chunk-ULASELLA.cjs');
+var _chunkDATEWH3Wcjs = require('./chunk-DATEWH3W.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -1119,7 +1119,7 @@ function createApiClients(options = {}) {
           "api is server-only. Use apiClient from createApiClients() in the browser."
         );
       }
-      const currentRequest = _chunkULASELLAcjs._resolveCurrentRequest.call(void 0, );
+      const currentRequest = _chunkDATEWH3Wcjs._resolveCurrentRequest.call(void 0, );
       const runtime = _chunk72ADZ6GQcjs.resolveAPIRequestRuntime.call(void 0, );
       if (!currentRequest || !runtime) {
         throw new Error(

package/dist/chunk-7GNWGLWB.mjs

@@ -0,0 +1,14 @@
+import {
+  __name
+} from "./chunk-LPEX4YW6.mjs";
+
+// src/utils/file-module.ts
+import { pathToFileURL } from "url";
+function toFileModuleUrl(filePath) {
+  return pathToFileURL(filePath).href;
+}
+__name(toFileModuleUrl, "toFileModuleUrl");
+
+export {
+  toFileModuleUrl
+};

package/dist/{chunk-34UCJRQO.cjs → chunk-7RNAKBWF.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkEKN7NSZOcjs = require('./chunk-EKN7NSZO.cjs');
+var _chunkSZLNU3GJcjs = require('./chunk-SZLNU3GJ.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -11,7 +11,7 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _url = require('url');
 async function createFarmMarkdownRouteModuleFromFile(filePath, options = {}) {
   const source = await _promises.readFile.call(void 0, filePath, "utf8");
-  return _chunkEKN7NSZOcjs.createFarmMarkdownRouteModule.call(void 0, {
+  return _chunkSZLNU3GJcjs.createFarmMarkdownRouteModule.call(void 0, {
     source,
     filePath,
     components: options.components,

package/dist/{chunk-MSSFIQGM.mjs → chunk-7VAJSSPG.mjs}

@@ -1,6 +1,6 @@
 import {
   emitFarmEvent
-} from "./chunk-FUZEBRP3.mjs";
+} from "./chunk-4GP3XZ4Z.mjs";
 import {
   getActiveFarmI18nSnapshot
 } from "./chunk-C4NCTZLM.mjs";
@@ -15,6 +15,9 @@ import {
   notifyFarmCacheTask,
   subscribeFarmCacheInvalidation
 } from "./chunk-4SIYUGRY.mjs";
+import {
+  _runInSharedCacheScope
+} from "./chunk-Y6LRPO2K.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -208,6 +211,7 @@ async function encodeStorageKeySegment(value) {
 }
 __name(encodeStorageKeySegment, "encodeStorageKeySegment");
 var MIN_STALE_RETENTION_MS = 6e4;
+var PPR_SHELL_ADAPTER_TTL_SECONDS = 86400;
 function getFarmCacheEntryExpiresAt(createdAt, revalidate, now = Date.now()) {
   if (typeof revalidate !== "number") return void 0;
   const revalidateMs = revalidate * 1e3;
@@ -232,6 +236,8 @@ var _FarmDataCache = class _FarmDataCache {
     this.namespace = "farm";
     this.local = true;
     this.maxEntries = 1024;
+    this.config = {};
+    this.isShellCache = false;
     this.lease = {
       enabled: true,
       ttlMs: 1e4,
@@ -241,6 +247,8 @@ var _FarmDataCache = class _FarmDataCache {
     this.configure(config);
   }
   configure(config = {}) {
+    this.config = config;
+    this.shells?.configure(config);
     this.generation++;
     this.entries.clear();
     this.entriesByTag.clear();
@@ -267,6 +275,19 @@ var _FarmDataCache = class _FarmDataCache {
       )
     };
   }
+  /**
+   * Where PPR shells live: the same adapter and namespace, so path and tag invalidation
+   * reaches them, but their own in-memory LRU of `maxEntries`.
+   * @internal
+   */
+  get pprShellCache() {
+    if (this.isShellCache) return this;
+    if (!this.shells) {
+      this.shells = new _FarmDataCache(this.config);
+      this.shells.isShellCache = true;
+    }
+    return this.shells;
+  }
   get adapterName() {
     return this.adapter?.name || (this.adapter ? "custom" : "memory");
   }
@@ -396,7 +417,7 @@ var _FarmDataCache = class _FarmDataCache {
     const tags = normalizeCacheOptionsTags(options);
     const capturedVersions = tagVersions ?? await this.getAdapterTagVersions(Array.from(tags.values()));
     const createdAt = options.createdAt ?? Date.now();
-    const expiresAt = getFarmCacheEntryExpiresAt(createdAt, revalidate);
+    const expiresAt = getFarmCacheEntryExpiresAt(createdAt, revalidate) ?? (this.isShellCache && this.adapter ? createdAt + PPR_SHELL_ADAPTER_TTL_SECONDS * 1e3 : void 0);
     const entry = {
       key,
       value,
@@ -435,6 +456,11 @@ var _FarmDataCache = class _FarmDataCache {
     return this.adapter ? true : deleted;
   }
   clear() {
+    const count = this.entries.size + (this.shells?.resetLocal() ?? 0);
+    this.resetLocal();
+    emitFarmEvent({ type: "cache.clear", count });
+  }
+  resetLocal() {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
@@ -443,7 +469,7 @@ var _FarmDataCache = class _FarmDataCache {
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
     this.version = 0;
-    emitFarmEvent({ type: "cache.clear", count });
+    return count;
   }
   async clearAsync() {
     this.clear();
@@ -469,7 +495,7 @@ var _FarmDataCache = class _FarmDataCache {
   }
   revalidateTag(tag, options = {}) {
     const normalized = normalizeCacheTag(tag);
-    const count = this.invalidateTag(normalized);
+    const count = this.invalidateTag(normalized) + (this.shells?.invalidateTag(normalized) ?? 0);
     emitFarmEvent(
       options.source === "updateTag" ? { type: "cache.updateTag", tag: normalized, count } : { type: "cache.revalidateTag", tag: normalized, profile: options.profile, count }
     );
@@ -477,7 +503,7 @@ var _FarmDataCache = class _FarmDataCache {
   }
   async revalidateTagAsync(tag, options = {}) {
     const normalized = normalizeCacheTag(tag);
-    const count = this.invalidateTag(normalized);
+    const count = this.invalidateTag(normalized) + (this.shells?.invalidateTag(normalized) ?? 0);
     await this.adapter?.invalidateTags?.([this.createAdapterTag(normalized)]);
     emitFarmEvent(
       options.source === "updateTag" ? { type: "cache.updateTag", tag: normalized, count } : { type: "cache.revalidateTag", tag: normalized, profile: options.profile, count }
@@ -487,8 +513,8 @@ var _FarmDataCache = class _FarmDataCache {
   revalidatePath(routePath) {
     const normalizedPath = normalizeRevalidatePath(routePath);
     const pathTag = createPathCacheTag(normalizedPath);
-    const pprCount = this.countEntriesForTags([pathTag, "ppr"]);
-    const count = this.invalidateTag(pathTag);
+    const pprCount = this.countEntriesForTags([pathTag, "ppr"]) + (this.shells?.countEntriesForTags([pathTag, "ppr"]) ?? 0);
+    const count = this.invalidateTag(pathTag) + (this.shells?.invalidateTag(pathTag) ?? 0);
     emitFarmEvent({ type: "cache.revalidatePath", path: normalizedPath, count });
     if (pprCount > 0) {
       emitFarmEvent({
@@ -503,8 +529,8 @@ var _FarmDataCache = class _FarmDataCache {
   async revalidatePathAsync(routePath) {
     const normalizedPath = normalizeRevalidatePath(routePath);
     const pathTag = createPathCacheTag(normalizedPath);
-    const pprCount = this.countEntriesForTags([pathTag, "ppr"]);
-    const count = this.invalidateTag(pathTag);
+    const pprCount = this.countEntriesForTags([pathTag, "ppr"]) + (this.shells?.countEntriesForTags([pathTag, "ppr"]) ?? 0);
+    const count = this.invalidateTag(pathTag) + (this.shells?.invalidateTag(pathTag) ?? 0);
     await this.adapter?.invalidateTags?.([this.createAdapterTag(pathTag)]);
     emitFarmEvent({ type: "cache.revalidatePath", path: normalizedPath, count });
     if (pprCount > 0) {
@@ -785,7 +811,11 @@ function unstable_cache(fn, keyParts = [], options = {}) {
       keyParts,
       args
     ]);
-    return getFarmDataCache().getOrSet(key, () => fn(...args), options);
+    return getFarmDataCache().getOrSet(
+      key,
+      () => _runInSharedCacheScope("unstable_cache()", () => fn(...args)),
+      options
+    );
   };
 }
 __name(unstable_cache, "unstable_cache");
@@ -986,6 +1016,7 @@ export {
   createFarmCacheInvalidationStream,
   defineCacheKey,
   storageCacheAdapter,
+  PPR_SHELL_ADAPTER_TTL_SECONDS,
   FarmDataCache,
   getFarmDataCache,
   configureFarmCache,

package/dist/{chunk-KHKLMNI5.mjs → chunk-ACLPN56I.mjs}

@@ -3,7 +3,7 @@ import {
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-SKVTP5PR.mjs";
+} from "./chunk-TFX4RTH2.mjs";
 import {
   compileMiddlewareConfig,
   compileMiddlewareRoute,
@@ -11,13 +11,16 @@ import {
   matchesMiddlewareConfigAt,
   matchesMiddlewareRouteAt,
   toMiddlewareRoutePathname
-} from "./chunk-HZFM2LWQ.mjs";
+} from "./chunk-HKFBMHCD.mjs";
 import {
   emitFarmEvent
-} from "./chunk-FUZEBRP3.mjs";
+} from "./chunk-4GP3XZ4Z.mjs";
 import {
   createFarmAPIMiddlewarePathnames
 } from "./chunk-BTHHUD7Q.mjs";
+import {
+  withFarmRequestClientAddress
+} from "./chunk-ZZGQD7A4.mjs";
 import {
   _withFarmResponseHeaders
 } from "./chunk-Z3HATSKO.mjs";
@@ -234,18 +237,6 @@ function createResponseShim(headers) {
   };
 }
 __name(createResponseShim, "createResponseShim");
-function withNodeRequestShape(request, trustProxy, clientAddress) {
-  const requestWithShape = request;
-  if (!requestWithShape.socket) {
-    const forwardedFor = trustProxy ? request.headers.get("x-forwarded-for")?.split(",")[0]?.trim() : void 0;
-    try {
-      requestWithShape.socket = { remoteAddress: forwardedFor || clientAddress || void 0 };
-    } catch {
-    }
-  }
-  return requestWithShape;
-}
-__name(withNodeRequestShape, "withNodeRequestShape");
 function createHandledResponse(body, init, headers) {
   const responseHeaders = new Headers();
   for (const [key, value] of headers) {
@@ -262,7 +253,7 @@ function createHandledResponse(body, init, headers) {
 }
 __name(createHandledResponse, "createHandledResponse");
 function createWebMiddlewareContext(request, parent, trustProxy = false, clientAddress, toRoutePathname) {
-  let currentRequest = withNodeRequestShape(request, trustProxy, clientAddress);
+  let currentRequest = withFarmRequestClientAddress(request, trustProxy, clientAddress);
   let handledResponse = null;
   const url = new URL(currentRequest.url);
   const data = parent?.data ? new Map(parent.data) : /* @__PURE__ */ new Map();
@@ -317,7 +308,7 @@ function createWebMiddlewareContext(request, parent, trustProxy = false, clientA
     rewrite(rewriteUrl) {
       ctx._rewriteUrl = rewriteUrl;
       const nextUrl = new URL(rewriteUrl, currentRequest.url);
-      currentRequest = withNodeRequestShape(
+      currentRequest = withFarmRequestClientAddress(
         new Request(nextUrl, currentRequest),
         trustProxy,
         clientAddress
@@ -393,8 +384,8 @@ function getConfigHandlers(entry) {
 }
 __name(getConfigHandlers, "getConfigHandlers");
 function toMiddlewareConfig(entry) {
-  const { matcher, exclude, runtime } = entry;
-  return { matcher, exclude, runtime };
+  const { matcher, exclude, runtime, cache } = entry;
+  return { matcher, exclude, runtime, cache };
 }
 __name(toMiddlewareConfig, "toMiddlewareConfig");
 function normalizeConfigMiddleware(config) {
@@ -467,7 +458,8 @@ function emptyResult(request) {
     data: /* @__PURE__ */ new Map(),
     context: /* @__PURE__ */ new Map(),
     headers: new Headers(),
-    handled: false
+    handled: false,
+    guarded: false
   };
 }
 __name(emptyResult, "emptyResult");
@@ -516,6 +508,7 @@ function createProductionMiddlewareRunner(options = {}) {
       }
     }
     const ran = /* @__PURE__ */ new Set();
+    let guarded = false;
     function* applicableMiddleware() {
       for (let pathname = initialPathname, requestPathname = initialRequestPathname, pass = 0; ; pass++) {
         const pathnames = matchPathnames(pathname, requestPathname);
@@ -541,6 +534,7 @@ function createProductionMiddlewareRunner(options = {}) {
         continue;
       }
       ran.add(entry);
+      if (entry.config?.cache !== "public") guarded = true;
       if (parentData) {
         contextState = createWebMiddlewareContext(
           currentRequest,
@@ -583,7 +577,8 @@ function createProductionMiddlewareRunner(options = {}) {
             data: new Map(ctx.data),
             context: new Map(ctx.locals),
             headers: mapToHeaders(contextState.headers),
-            handled: true
+            handled: true,
+            guarded
           };
         }
         if (ctx._handled || ctx.response.headersSent || ctx.response.writableEnded) {
@@ -599,7 +594,8 @@ function createProductionMiddlewareRunner(options = {}) {
             data: new Map(ctx.data),
             context: new Map(ctx.locals),
             headers: mapToHeaders(contextState.headers),
-            handled: true
+            handled: true,
+            guarded
           };
         }
         emitFarmEvent({
@@ -626,7 +622,8 @@ function createProductionMiddlewareRunner(options = {}) {
             data: new Map(ctx.data),
             context: new Map(ctx.locals),
             headers: mapToHeaders(contextState.headers),
-            handled: true
+            handled: true,
+            guarded
           };
         }
         if (isFarmNotFoundError(error)) {
@@ -638,6 +635,7 @@ function createProductionMiddlewareRunner(options = {}) {
             context: new Map(ctx.locals),
             headers: mapToHeaders(contextState.headers),
             handled: true,
+            guarded,
             notFound: true
           };
         }
@@ -661,7 +659,8 @@ function createProductionMiddlewareRunner(options = {}) {
       data: new Map(ctx.data),
       context: new Map(ctx.locals),
       headers: mapToHeaders(contextState.headers),
-      handled: false
+      handled: false,
+      guarded
     };
   }, "runProductionMiddleware");
 }
@@ -684,9 +683,28 @@ function applyProductionMiddlewareHeaders(response, middlewareHeaders) {
   });
 }
 __name(applyProductionMiddlewareHeaders, "applyProductionMiddlewareHeaders");
+var PRIVATE_CACHE_DIRECTIVE = /(?:^|,)\s*(?:private|no-store)\s*(?:[,=]|$)/i;
+var CDN_CACHE_CONTROL_HEADERS = [
+  "cdn-cache-control",
+  "vercel-cdn-cache-control",
+  "netlify-cdn-cache-control",
+  "cloudflare-cdn-cache-control"
+];
+function _withFarmGuardedResponseCache(response) {
+  const shareable = !PRIVATE_CACHE_DIRECTIVE.test(response.headers.get("cache-control") ?? "");
+  if (!shareable && !CDN_CACHE_CONTROL_HEADERS.some((name) => response.headers.has(name))) {
+    return response;
+  }
+  return _withFarmResponseHeaders(response, (headers) => {
+    if (shareable) headers.set("Cache-Control", "private, no-store");
+    for (const name of CDN_CACHE_CONTROL_HEADERS) headers.delete(name);
+  });
+}
+__name(_withFarmGuardedResponseCache, "_withFarmGuardedResponseCache");
 
 export {
   matchesMiddlewareConfig2 as matchesMiddlewareConfig,
   createProductionMiddlewareRunner,
-  applyProductionMiddlewareHeaders
+  applyProductionMiddlewareHeaders,
+  _withFarmGuardedResponseCache
 };

package/dist/{chunk-JCYYXBAJ.cjs → chunk-AGR7F3LA.cjs}

@@ -12,7 +12,7 @@ var _chunkDVM4FKZLcjs = require('./chunk-DVM4FKZL.cjs');
 var _chunkOX6O6WVAcjs = require('./chunk-OX6O6WVA.cjs');
 
 
-var _chunk6XWDE2P2cjs = require('./chunk-6XWDE2P2.cjs');
+var _chunkXVIEGKTTcjs = require('./chunk-XVIEGKTT.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -41,7 +41,7 @@ function createRedirectsPlugin(redirects, {
       if (overrideBeforeRequest) {
         await overrideBeforeRequest(req, res, context);
       }
-      const url = _chunk6XWDE2P2cjs.resolveFarmRequestURL.call(void 0, req);
+      const url = _chunkXVIEGKTTcjs.resolveFarmRequestURL.call(void 0, req);
       const routePath = _chunkDVM4FKZLcjs.resolveConfigRoutePathname.call(void 0, url.pathname, i18n);
       const pathname = routePath.pathname;
       for (const { redirect, pattern } of compiledRedirects) {
@@ -153,7 +153,7 @@ function createHeadersPlugin(headers, {
       if (overrideBeforeRequest) {
         await overrideBeforeRequest(req, res, context);
       }
-      const url = _chunk6XWDE2P2cjs.resolveFarmRequestURL.call(void 0, req);
+      const url = _chunkXVIEGKTTcjs.resolveFarmRequestURL.call(void 0, req);
       const pathname = _chunkDVM4FKZLcjs.resolveConfigRoutePathname.call(void 0, url.pathname, i18n).pathname;
       const matchedHeaders = compiledHeaders.filter(({ pattern }) => pattern.regex.test(pathname)).map(({ config }) => config.headers);
       applyResponseHeaders(res, matchedHeaders);

package/dist/{chunk-4GWRFP22.cjs → chunk-ALPWLT27.cjs}

@@ -66,6 +66,37 @@ function parseColonParam(segment) {
   };
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, parseColonParam, "parseColonParam");
+var MATCHER_PARAM_NAME = /^[\p{L}\p{N}_$-]+$/u;
+var MATCHER_UNSUPPORTED_LITERAL = /[()[\]|\\{}^$?:]|\.[*+]/;
+var MATCHER_BRACKET_PARAM = /^\[\[\.\.\.(.+)\]\]$|^\[\.\.\.(.+)\]$|^\[(.+)\]$/;
+function isSupportedMatcherSegment(segment) {
+  if (segment === "*" || segment === "**") return true;
+  if (segment.startsWith(":")) return MATCHER_PARAM_NAME.test(parseColonParam(segment).name);
+  const bracket = MATCHER_BRACKET_PARAM.exec(segment);
+  if (bracket) return MATCHER_PARAM_NAME.test(_nullishCoalesce(_nullishCoalesce(bracket[1], () => ( bracket[2])), () => ( bracket[3])));
+  return !MATCHER_UNSUPPORTED_LITERAL.test(segment);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isSupportedMatcherSegment, "isSupportedMatcherSegment");
+function isLiteralMatcherSegment(segment) {
+  return !MATCHER_UNSUPPORTED_LITERAL.test(segment) && !segment.includes("*");
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isLiteralMatcherSegment, "isLiteralMatcherSegment");
+function assertSupportedMiddlewareMatcher(pattern) {
+  if (pattern === "*" || pattern === "/(.*)") return;
+  const subtree = pattern.endsWith("(.*)");
+  const path = subtree ? pattern.slice(0, -4) : pattern;
+  const segments = path.split("/").filter(Boolean);
+  if (segments.every(subtree ? isLiteralMatcherSegment : isSupportedMatcherSegment)) return;
+  throw new Error(
+    `Middleware matcher "${pattern}" is not a supported string pattern, so it would never match a request and the middleware would not run. String matchers do not accept regular-expression syntax such as groups, alternation, character classes, lookaheads, or \`.*\`, or a param after literal text such as \`/user-:id\`. Pass a RegExp instead, for example \`matcher: /^\\/(?!api|_next).*/\`, or use the supported forms: /path/:param, /path/:param*, /path/[param], /path/[...param], /path/*, /path/**, or a trailing (.*) such as /path(.*).`
+  );
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, assertSupportedMiddlewareMatcher, "assertSupportedMiddlewareMatcher");
+function compileConfigPattern(pattern, compile) {
+  if (typeof pattern === "string") assertSupportedMiddlewareMatcher(pattern);
+  return compile(pattern);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, compileConfigPattern, "compileConfigPattern");
 function compilePathPattern(pattern, trailingSlash = false) {
   const params = [];
   const segments = pattern.split("/").filter(Boolean);
@@ -140,9 +171,9 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, compilePattern, "compilePattern");
 function compileMiddlewareConfig(config) {
   const compiled = {
     matcher: config.matcher ? toMatcherList(config.matcher).map(
-      (matcher) => typeof matcher === "function" ? matcher : compileMatcherPattern(matcher)
+      (matcher) => typeof matcher === "function" ? matcher : compileConfigPattern(matcher, compileMatcherPattern)
     ) : void 0,
-    exclude: _optionalChain([config, 'access', _2 => _2.exclude, 'optionalAccess', _3 => _3.map, 'call', _4 => _4(compilePattern)])
+    exclude: _optionalChain([config, 'access', _2 => _2.exclude, 'optionalAccess', _3 => _3.map, 'call', _4 => _4((pattern) => compileConfigPattern(pattern, compilePattern))])
   };
   compiledConfigCache.set(config, {
     compiled,
@@ -256,4 +287,5 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, matchesMiddlewareConfigAt, "matchesMiddlew
 
 
 
-exports.compileMiddlewareRoute = compileMiddlewareRoute; exports.matchesMiddlewareRoute = matchesMiddlewareRoute; exports.matchesMiddlewareRouteAt = matchesMiddlewareRouteAt; exports.compileMiddlewareConfig = compileMiddlewareConfig; exports.matchesMiddlewarePredicate = matchesMiddlewarePredicate; exports.toMiddlewareRoutePathname = toMiddlewareRoutePathname; exports.matchesCompiledMiddlewareConfig = matchesCompiledMiddlewareConfig; exports.matchesMiddlewareConfig = matchesMiddlewareConfig; exports.matchesMiddlewareConfigAt = matchesMiddlewareConfigAt;
+
+exports.compileMiddlewareRoute = compileMiddlewareRoute; exports.matchesMiddlewareRoute = matchesMiddlewareRoute; exports.matchesMiddlewareRouteAt = matchesMiddlewareRouteAt; exports.assertSupportedMiddlewareMatcher = assertSupportedMiddlewareMatcher; exports.compileMiddlewareConfig = compileMiddlewareConfig; exports.matchesMiddlewarePredicate = matchesMiddlewarePredicate; exports.toMiddlewareRoutePathname = toMiddlewareRoutePathname; exports.matchesCompiledMiddlewareConfig = matchesCompiledMiddlewareConfig; exports.matchesMiddlewareConfig = matchesMiddlewareConfig; exports.matchesMiddlewareConfigAt = matchesMiddlewareConfigAt;

package/dist/{chunk-IBUQWVYA.mjs → chunk-AX7S67YV.mjs}

@@ -1,22 +1,17 @@
+import {
+  setFarmPluginIntegrationContext
+} from "./chunk-H3EGVQE5.mjs";
 import {
   defineSchema
 } from "./chunk-44SYJEG3.mjs";
 import {
+  assertSupportedMiddlewareMatcher,
   compileMiddlewareConfig,
   matchesCompiledMiddlewareConfig
-} from "./chunk-HZFM2LWQ.mjs";
+} from "./chunk-HKFBMHCD.mjs";
 import {
-  bufferFarmRequestBody,
-  clearRequestContext,
-  createFarmRequestBodyErrorResponse,
-  deleteRequestContext,
-  getRequestContext,
-  getRequestContextSnapshot,
-  hasRequestContext,
-  readNodeRequestBody,
-  resolveFarmServerConfig,
-  setRequestContext
-} from "./chunk-ZMMBIVQM.mjs";
+  toPublicValidationIssues
+} from "./chunk-MGMF4VP7.mjs";
 import {
   applyWebResponseHeaders,
   sendWebResponse
@@ -25,6 +20,21 @@ import {
   createFarmAPIMiddlewarePathnames,
   resolveFarmAPIServerBasePath
 } from "./chunk-BTHHUD7Q.mjs";
+import {
+  bufferFarmRequestBody,
+  createFarmRequestBodyErrorResponse,
+  readNodeRequestBody,
+  resolveFarmServerConfig,
+  withFarmRequestClientAddress
+} from "./chunk-ZZGQD7A4.mjs";
+import {
+  clearRequestContext,
+  deleteRequestContext,
+  getRequestContext,
+  getRequestContextSnapshot,
+  hasRequestContext,
+  setRequestContext
+} from "./chunk-P7XDC7UJ.mjs";
 import {
   api,
   defineIntegrationAPIOperation
@@ -52,20 +62,6 @@ import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
 
-// src/plugin-integration-context.ts
-var FARM_PLUGIN_INTEGRATION_CONTEXT = /* @__PURE__ */ Symbol.for("@farm.js/core/plugin-integration-context");
-function setFarmPluginIntegrationContext(plugin, integration) {
-  Object.defineProperty(plugin, FARM_PLUGIN_INTEGRATION_CONTEXT, {
-    value: integration
-  });
-}
-__name(setFarmPluginIntegrationContext, "setFarmPluginIntegrationContext");
-function getFarmPluginIntegrationContext(plugin) {
-  const value = plugin[FARM_PLUGIN_INTEGRATION_CONTEXT];
-  return value && typeof value === "object" ? value : void 0;
-}
-__name(getFarmPluginIntegrationContext, "getFarmPluginIntegrationContext");
-
 // src/integrations.ts
 var FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY = "farm.integration.internalDispatch";
 var FARM_INTEGRATION_SET_COOKIES_KEY = "farm:integration:set-cookies";
@@ -285,6 +281,15 @@ function resolveIntegrationPlugins(integrations) {
     if (!integration || !isFarmIntegration(integration)) {
       continue;
     }
+    for (const entry of integration.middleware || []) {
+      if (!entry.matcher) continue;
+      const matchers = Array.isArray(entry.matcher) ? entry.matcher : [entry.matcher];
+      try {
+        matchers.forEach(assertSupportedMiddlewareMatcher);
+      } catch (error) {
+        throw new Error(`Integration "${key}": ${error.message}`);
+      }
+    }
     const owner = createIntegrationPluginOwner(key, integration, "lifecycle");
     plugins.push(withIntegrationPluginOwner(createIntegrationPlugin(key, integration), owner));
     plugins.push(...resolveIntegrationPluginContributions(key, integration));
@@ -853,7 +858,11 @@ function createIntegrationPlugin(integrationKey, integration) {
       }, "getRequestBody");
       const createHandlerRequest = /* @__PURE__ */ __name(async () => {
         try {
-          return createWebRequest(req, fullUrl, await getRequestBody());
+          return withFarmRequestClientAddress(
+            createWebRequest(req, fullUrl, await getRequestBody()),
+            resolveFarmServerConfig(context.config.server).trustProxy,
+            req.socket?.remoteAddress
+          );
         } catch (error) {
           const response = createFarmRequestBodyErrorResponse(error);
           if (!response) throw error;
@@ -1343,18 +1352,13 @@ function createIntegrationValidationResponse(issues) {
 __name(createIntegrationValidationResponse, "createIntegrationValidationResponse");
 function normalizeIntegrationValidationIssues(source, error) {
   if (Array.isArray(error.issues) && error.issues.length > 0) {
-    return error.issues.map((issue) => ({
-      source,
-      path: normalizeIntegrationValidationPath(issue.path),
-      code: issue.code,
-      message: issue.message || "Invalid input"
-    }));
+    return toPublicValidationIssues(error).map((issue) => ({ source, ...issue }));
   }
   return [
     {
       source,
       path: [],
-      message: error.message || "Invalid input"
+      message: "Invalid input"
     }
   ];
 }
@@ -1431,7 +1435,7 @@ function createIntegrationRouteArgs(input) {
         `Integration "${input.integration.type}" does not define a schema for ctx.args.db.`
       );
     }
-    ormPromise ?? (ormPromise = import("./integration-orm-KV5B3BGZ.mjs").then(
+    ormPromise ?? (ormPromise = import("./integration-orm-RBKCIQYZ.mjs").then(
       ({ createIntegrationOrm }) => createIntegrationOrm({
         schema: input.integration.schema,
         config: input.config
@@ -1561,16 +1565,15 @@ function createFormInput(formData) {
 }
 __name(createFormInput, "createFormInput");
 async function dispatchIntegrationRequest(runtime, request, options = {}) {
+  const serverConfig = resolveFarmServerConfig(runtime.config.server);
   try {
-    request = await bufferFarmRequestBody(
-      request,
-      resolveFarmServerConfig(runtime.config.server).bodySizeLimit
-    );
+    request = await bufferFarmRequestBody(request, serverConfig.bodySizeLimit);
   } catch (error) {
     const response = createFarmRequestBodyErrorResponse(error);
     if (response) return response;
     throw error;
   }
+  request = withFarmRequestClientAddress(request, serverConfig.trustProxy, options.clientAddress);
   const integration = runtime.integration;
   const url = new URL(request.url);
   const pathname = url.pathname;
@@ -1852,6 +1855,7 @@ async function dispatchIntegrationRequests(integrations, runtime, request, optio
       {
         currentRequest: options.currentRequest,
         ranMiddleware: options.ranMiddleware,
+        clientAddress: options.clientAddress,
         onForwardedCookies: /* @__PURE__ */ __name((cookies) => setCookies.push(...cookies), "onForwardedCookies")
       }
     );
@@ -2174,7 +2178,6 @@ function normalizeMatcher(matcher) {
 __name(normalizeMatcher, "normalizeMatcher");
 
 export {
-  getFarmPluginIntegrationContext,
   FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY,
   FARM_INTEGRATION_SET_COOKIES_KEY,
   forwardIntegrationSetCookies,

package/dist/{chunk-CUM5NYL5.mjs → chunk-AXB5P7BK.mjs}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-JM5XPKWH.mjs";
 import {
   getCurrentRequestOrNull
-} from "./chunk-POSPE3IO.mjs";
+} from "./chunk-ZOABCQGT.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";