@farm.js/core 0.1.39 → 0.1.41

package/dist/{chunk-6XWDE2P2.cjs → chunk-ZTP3BJG6.cjs}

@@ -2,7 +2,8 @@
 
 
 
-var _chunkULASELLAcjs = require('./chunk-ULASELLA.cjs');
+
+var _chunk6IZWX6EScjs = require('./chunk-6IZWX6ES.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -23,6 +24,26 @@ function getRequestStore() {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, getRequestStore, "getRequestStore");
 var requestStore = getRequestStore();
+var SHARED_CACHE_SCOPE_KEY = /* @__PURE__ */ Symbol.for("@farm.js/core/shared-cache-scope");
+function getSharedCacheScopeStore() {
+  const runtime = globalThis;
+  const existing = runtime[SHARED_CACHE_SCOPE_KEY];
+  if (existing instanceof _async_hooks.AsyncLocalStorage) return existing;
+  const storage = new (0, _async_hooks.AsyncLocalStorage)();
+  runtime[SHARED_CACHE_SCOPE_KEY] = storage;
+  return storage;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getSharedCacheScopeStore, "getSharedCacheScopeStore");
+var sharedCacheScope = getSharedCacheScopeStore();
+_chunk6IZWX6EScjs._setSharedCacheScopeRunner.call(void 0, (label, fn) => sharedCacheScope.run(label, fn));
+function _assertRequestReadAllowed(api) {
+  const scope = sharedCacheScope.getStore();
+  if (!scope) return;
+  throw new Error(
+    `${api} cannot be called inside ${scope}: its result is cached and shared by every request, so one visitor's request data would be served to others. Read it outside the cached function and pass the value in as an argument, which also makes it part of the cache key.`
+  );
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, _assertRequestReadAllowed, "_assertRequestReadAllowed");
 var REQUEST_READS_KEY = /* @__PURE__ */ Symbol.for("@farm.js/core/request-reads");
 function getRequestReads() {
   const runtime = globalThis;
@@ -42,32 +63,49 @@ function getAppRequestView(request) {
   if (request.method !== "GET" && request.method !== "HEAD") {
     countRequestRead(request);
     view = request;
+    try {
+      guardRequestReads(view, request, request.headers, request.clone);
+    } catch (e) {
+    }
   } else {
     view = new Request(request);
-    Object.defineProperties(view, {
-      // The rendered request's own signal, so aborting it reaches the handler unchanged.
-      signal: { configurable: true, get: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => request.signal, "get") },
-      headers: {
-        configurable: true,
-        get() {
-          countRequestRead(request);
-          return request.headers;
-        }
-      },
-      clone: {
-        configurable: true,
-        value() {
-          countRequestRead(request);
-          return request.clone();
-        }
-      }
-    });
+    Object.defineProperty(view, "signal", { configurable: true, get: /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, () => request.signal, "get") });
+    guardRequestReads(view, request, request.headers, request.clone);
   }
   appRequestViews.set(request, view);
   return view;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, getAppRequestView, "getAppRequestView");
-_chunkULASELLAcjs._setCurrentRequestResolver.call(void 0, () => requestStore.getStore());
+function guardRequestReads(view, request, requestHeaders, clone) {
+  Object.defineProperties(view, {
+    headers: {
+      configurable: true,
+      get() {
+        _assertRequestReadAllowed("request.headers");
+        countRequestRead(request);
+        return requestHeaders;
+      }
+    },
+    clone: {
+      configurable: true,
+      value() {
+        _assertRequestReadAllowed("request.clone()");
+        countRequestRead(request);
+        return clone.call(request);
+      }
+    }
+  });
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, guardRequestReads, "guardRequestReads");
+_chunk6IZWX6EScjs._setCurrentRequestResolver.call(void 0, 
+  () => {
+    _assertRequestReadAllowed(
+      "A helper that reads the current request (such as auth.user() or the server api client)"
+    );
+    return requestStore.getStore();
+  },
+  () => requestStore.getStore()
+);
 var CSP_NONCE_STORAGE_KEY = /* @__PURE__ */ Symbol.for("@farm.js/core/csp-nonce-storage");
 function getCspNonceStore() {
   const runtime = globalThis;
@@ -79,12 +117,12 @@ function getCspNonceStore() {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, getCspNonceStore, "getCspNonceStore");
 var cspNonceStore = getCspNonceStore();
-_chunkULASELLAcjs._setCspNonceResolver.call(void 0, () => cspNonceStore.getStore());
+_chunk6IZWX6EScjs._setCspNonceResolver.call(void 0, () => cspNonceStore.getStore());
 function _runWithFarmCspNonce(nonce, fn) {
   return nonce ? cspNonceStore.run(nonce, fn) : fn();
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, _runWithFarmCspNonce, "_runWithFarmCspNonce");
-_chunkULASELLAcjs._setAppRequestView.call(void 0, getAppRequestView);
+_chunk6IZWX6EScjs._setAppRequestView.call(void 0, getAppRequestView);
 function resolveFarmRequestURL(req, options = {}) {
   if (options.origin) {
     return new URL(req.url || "/", options.origin);
@@ -155,7 +193,7 @@ function resolveRequestOrigin(proto, host, fallback) {
       const url = new URL(`${proto}://${candidate}`);
       if (url.username || url.password || url.pathname !== "/" || url.search || url.hash) continue;
       return url.origin;
-    } catch (e) {
+    } catch (e2) {
     }
   }
   return `${proto}://localhost`;
@@ -166,6 +204,7 @@ async function _runWithCurrentRequest(request, fn) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, _runWithCurrentRequest, "_runWithCurrentRequest");
 function getCurrentRequest() {
+  _assertRequestReadAllowed("getCurrentRequest()");
   const request = requestStore.getStore();
   if (!request) {
     throw new Error(
@@ -194,4 +233,5 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, getCurrentRequestOrNull, "getCurrentReques
 
 
 
-exports._runWithFarmCspNonce = _runWithFarmCspNonce; exports.resolveFarmRequestURL = resolveFarmRequestURL; exports.resolveFarmWebRequestOrigin = resolveFarmWebRequestOrigin; exports.createWebRequestFromFarmRequest = createWebRequestFromFarmRequest; exports._runWithCurrentRequest = _runWithCurrentRequest; exports.getCurrentRequest = getCurrentRequest; exports._getRequestReadCount = _getRequestReadCount; exports.getCurrentRequestOrNull = getCurrentRequestOrNull;
+
+exports._assertRequestReadAllowed = _assertRequestReadAllowed; exports._runWithFarmCspNonce = _runWithFarmCspNonce; exports.resolveFarmRequestURL = resolveFarmRequestURL; exports.resolveFarmWebRequestOrigin = resolveFarmWebRequestOrigin; exports.createWebRequestFromFarmRequest = createWebRequestFromFarmRequest; exports._runWithCurrentRequest = _runWithCurrentRequest; exports.getCurrentRequest = getCurrentRequest; exports._getRequestReadCount = _getRequestReadCount; exports.getCurrentRequestOrNull = getCurrentRequestOrNull;

package/dist/{chunk-ZMMBIVQM.mjs → chunk-ZZGQD7A4.mjs}

@@ -1,3 +1,6 @@
+import {
+  copyRequestContext
+} from "./chunk-P7XDC7UJ.mjs";
 import {
   assertBrowserStableRoutePath
 } from "./chunk-55YI3RRB.mjs";
@@ -5,85 +8,6 @@ import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
 
-// src/request-context.ts
-var REQUEST_CONTEXT_STORE_KEY = /* @__PURE__ */ Symbol.for("farm.requestContextStore");
-function getRequestContextStore() {
-  const globalState = globalThis;
-  if (!globalState[REQUEST_CONTEXT_STORE_KEY]) {
-    globalState[REQUEST_CONTEXT_STORE_KEY] = /* @__PURE__ */ new WeakMap();
-  }
-  return globalState[REQUEST_CONTEXT_STORE_KEY];
-}
-__name(getRequestContextStore, "getRequestContextStore");
-function getBucket(target) {
-  const requestContextStore = getRequestContextStore();
-  let bucket = requestContextStore.get(target);
-  if (!bucket) {
-    bucket = {
-      privateData: /* @__PURE__ */ new Map(),
-      exposedData: /* @__PURE__ */ new Map()
-    };
-    requestContextStore.set(target, bucket);
-  }
-  return bucket;
-}
-__name(getBucket, "getBucket");
-function setRequestContext(target, key, value, options = {}) {
-  const bucket = getBucket(target);
-  bucket.privateData.set(key, value);
-  if (options.exposeToPage) {
-    bucket.exposedData.set(key, value);
-  }
-}
-__name(setRequestContext, "setRequestContext");
-function getRequestContext(target, key) {
-  const requestContextStore = getRequestContextStore();
-  const bucket = requestContextStore.get(target);
-  return bucket?.privateData.get(key);
-}
-__name(getRequestContext, "getRequestContext");
-function hasRequestContext(target, key) {
-  const requestContextStore = getRequestContextStore();
-  const bucket = requestContextStore.get(target);
-  return bucket?.privateData.has(key) ?? false;
-}
-__name(hasRequestContext, "hasRequestContext");
-function deleteRequestContext(target, key) {
-  const requestContextStore = getRequestContextStore();
-  const bucket = requestContextStore.get(target);
-  if (!bucket) return false;
-  const removedPrivate = bucket.privateData.delete(key);
-  bucket.exposedData.delete(key);
-  return removedPrivate;
-}
-__name(deleteRequestContext, "deleteRequestContext");
-function clearRequestContext(target) {
-  const requestContextStore = getRequestContextStore();
-  const bucket = requestContextStore.get(target);
-  if (!bucket) return;
-  bucket.privateData.clear();
-  bucket.exposedData.clear();
-}
-__name(clearRequestContext, "clearRequestContext");
-function getRequestContextSnapshot(target, options = {}) {
-  const requestContextStore = getRequestContextStore();
-  const bucket = requestContextStore.get(target);
-  if (!bucket) return /* @__PURE__ */ new Map();
-  if (options.exposedOnly) {
-    return new Map(bucket.exposedData);
-  }
-  return new Map(bucket.privateData);
-}
-__name(getRequestContextSnapshot, "getRequestContextSnapshot");
-function copyRequestContext(source, target) {
-  const bucket = getRequestContextStore().get(source);
-  if (!bucket || source === target) return;
-  for (const [key, value] of bucket.privateData) {
-    setRequestContext(target, key, value, { exposeToPage: bucket.exposedData.has(key) });
-  }
-}
-__name(copyRequestContext, "copyRequestContext");
-
 // src/server-http.ts
 function createFarmNodeRequestAbortSignal(req, res) {
   const controller = new AbortController();
@@ -310,6 +234,18 @@ function parseBodySizeLimit(value, optionName = "bodySizeLimit") {
   return bytes;
 }
 __name(parseBodySizeLimit, "parseBodySizeLimit");
+function withFarmRequestClientAddress(request, trustProxy, clientAddress) {
+  const requestWithShape = request;
+  if (!requestWithShape.socket) {
+    const forwardedFor = trustProxy ? request.headers.get("x-forwarded-for")?.split(",").at(-1)?.trim() : void 0;
+    try {
+      requestWithShape.socket = { remoteAddress: forwardedFor || clientAddress || void 0 };
+    } catch {
+    }
+  }
+  return requestWithShape;
+}
+__name(withFarmRequestClientAddress, "withFarmRequestClientAddress");
 function cloneFarmRequestWithContext(request) {
   const cloned = request.clone();
   copyRequestContext(request, cloned);
@@ -483,19 +419,13 @@ function throwIfAborted(signal) {
 __name(throwIfAborted, "throwIfAborted");
 
 export {
-  setRequestContext,
-  getRequestContext,
-  hasRequestContext,
-  deleteRequestContext,
-  clearRequestContext,
-  getRequestContextSnapshot,
-  copyRequestContext,
   createFarmNodeRequestAbortSignal,
   DEFAULT_FARM_SERVER_BODY_SIZE_LIMIT,
   createFarmWeakETag,
   matchesFarmIfNoneMatch,
   resolveFarmServerConfig,
   parseBodySizeLimit,
+  withFarmRequestClientAddress,
   cloneFarmRequestWithContext,
   bufferFarmRequestBody,
   readFarmRequestBody,