miniflare 0.0.0-05973bba4 → 0.0.0-05b1e8391

package/dist/src/workers/assets/assets.worker.js

@@ -7804,7 +7804,12 @@ function mockJaegerBinding() {
 }
 
 // ../workers-shared/asset-worker/src/analytics.ts
-var Analytics = class {
+var COMPATIBILITY_FLAG_MASKS = {
+  assets_navigation_prefers_asset_serving: 1
+  // next_one: 1 << 1
+  // one_after_that: 1 << 2
+  // etc: 1 << 3
+}, Analytics = class {
   constructor(readyAnalytics) {
     this.data = {};
     this.readyAnalytics = readyAnalytics;
@@ -7816,7 +7821,14 @@ var Analytics = class {
     return this.data[key];
   }
   write() {
-    this.readyAnalytics && this.readyAnalytics.logEvent({
+    if (!this.readyAnalytics)
+      return;
+    let compatibilityFlagsBitmask = 0;
+    for (let compatibilityFlag of this.data.compatibilityFlags || []) {
+      let mask = COMPATIBILITY_FLAG_MASKS[compatibilityFlag];
+      mask && (compatibilityFlagsBitmask += mask);
+    }
+    this.readyAnalytics.logEvent({
       version: 1,
       accountId: this.data.accountId,
       indexId: this.data.scriptId?.toString(),
@@ -7829,8 +7841,10 @@ var Analytics = class {
         // double3
         this.data.coloTier ?? -1,
         // double4
-        this.data.status ?? -1
+        this.data.status ?? -1,
         // double5
+        compatibilityFlagsBitmask
+        // double6
       ],
       blobs: [
         this.data.hostname?.substring(0, 256),
@@ -7912,24 +7926,50 @@ var AssetsManifest = class {
   32
 )].map((b) => b.toString(16).padStart(2, "0")).join("");
 
+// ../workers-shared/asset-worker/src/compatibility-flags.ts
+var SEC_FETCH_MODE_NAVIGATE_HEADER_PREFERS_ASSET_SERVING = {
+  enable: "assets_navigation_prefers_asset_serving",
+  disable: "assets_navigation_has_no_effect",
+  onByDefaultAfter: "2025-04-01"
+}, COMPATIBILITY_FLAGS = [
+  SEC_FETCH_MODE_NAVIGATE_HEADER_PREFERS_ASSET_SERVING
+], resolveCompatibilityOptions = (configuration) => {
+  let compatibilityDate = configuration?.compatibility_date ?? "2021-11-02", resolvedCompatibilityFlags = configuration?.compatibility_flags ?? [];
+  for (let compatibilityFlag of COMPATIBILITY_FLAGS)
+    compatibilityFlag.onByDefaultAfter && compatibilityDate >= compatibilityFlag.onByDefaultAfter && !resolvedCompatibilityFlags.find(
+      (flag) => flag === compatibilityFlag.disable
+    ) && !resolvedCompatibilityFlags.find(
+      (flag) => flag === compatibilityFlag.enable
+    ) && resolvedCompatibilityFlags.push(compatibilityFlag.enable);
+  return {
+    compatibilityDate,
+    compatibilityFlags: resolvedCompatibilityFlags
+  };
+}, flagIsEnabled = (configuration, compatibilityFlag) => !!configuration.compatibility_flags.find(
+  (flag) => flag === compatibilityFlag.enable
+);
+
 // ../workers-shared/asset-worker/src/configuration.ts
-var applyConfigurationDefaults = (configuration) => ({
-  compatibility_date: configuration?.compatibility_date ?? "2021-11-02",
-  compatibility_flags: configuration?.compatibility_flags ?? [],
-  html_handling: configuration?.html_handling ?? "auto-trailing-slash",
-  not_found_handling: configuration?.not_found_handling ?? "none",
-  redirects: configuration?.redirects ?? {
-    version: 1,
-    staticRules: {},
-    rules: {}
-  },
-  headers: configuration?.headers ?? {
-    version: 2,
-    rules: {}
-  },
-  account_id: configuration?.account_id ?? -1,
-  script_id: configuration?.script_id ?? -1
-});
+var normalizeConfiguration = (configuration) => {
+  let compatibilityOptions = resolveCompatibilityOptions(configuration);
+  return {
+    compatibility_date: compatibilityOptions.compatibilityDate,
+    compatibility_flags: compatibilityOptions.compatibilityFlags,
+    html_handling: configuration?.html_handling ?? "auto-trailing-slash",
+    not_found_handling: configuration?.not_found_handling ?? "none",
+    redirects: configuration?.redirects ?? {
+      version: 1,
+      staticRules: {},
+      rules: {}
+    },
+    headers: configuration?.headers ?? {
+      version: 2,
+      rules: {}
+    },
+    account_id: configuration?.account_id ?? -1,
+    script_id: configuration?.script_id ?? -1
+  };
+};
 
 // ../workers-shared/asset-worker/src/experiment-analytics.ts
 var ExperimentAnalytics = class {
@@ -8192,7 +8232,12 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
           return new FoundResponse(location);
       }
     }
-  let decodedPathname = decodePath(pathname), intent = await getIntent(decodedPathname, configuration, exists);
+  let decodedPathname = decodePath(pathname), intent = await getIntent(
+    decodedPathname,
+    request,
+    configuration,
+    exists
+  );
   if (!intent) {
     let response = proxied ? new NotFoundResponse() : new NoIntentResponse();
     return env.JAEGER.enterSpan("no_intent", (span) => (span.setTags({
@@ -8222,7 +8267,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     pathname,
     eTag: assetIntent.eTag,
     status: assetIntent.status
-  }), await getByETag(assetIntent.eTag))), headers = getAssetHeaders(
+  }), await getByETag(assetIntent.eTag, request))), headers = getAssetHeaders(
     assetIntent.eTag,
     asset.contentType,
     asset.cacheStatus,
@@ -8247,15 +8292,18 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
         return new OkResponse(body, { headers });
     }
   });
-}, canFetch = async (request, env, configuration, exists) => !(await getResponseOrAssetIntent(
+}, canFetch = async (request, env, configuration, exists) => (flagIsEnabled(
+  configuration,
+  SEC_FETCH_MODE_NAVIGATE_HEADER_PREFERS_ASSET_SERVING
+) && request.headers.get("Sec-Fetch-Mode") === "navigate" || (configuration = {
+  ...configuration,
+  not_found_handling: "none"
+}), !(await getResponseOrAssetIntent(
   request,
   env,
-  {
-    ...configuration,
-    not_found_handling: "none"
-  },
+  configuration,
   exists
-) instanceof NoIntentResponse), handleRequest = async (request, env, configuration, exists, getByETag, analytics) => {
+) instanceof NoIntentResponse)), handleRequest = async (request, env, configuration, exists, getByETag, analytics) => {
   let responseOrAssetIntent = await getResponseOrAssetIntent(
     request,
     env,
@@ -8269,11 +8317,12 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     analytics
   );
   return attachCustomHeaders(request, response, configuration);
-}, getIntent = async (pathname, configuration, exists, skipRedirects = !1) => {
+}, getIntent = async (pathname, request, configuration, exists, skipRedirects = !1) => {
   switch (configuration.html_handling) {
     case "auto-trailing-slash":
       return htmlHandlingAutoTrailingSlash(
         pathname,
+        request,
         configuration,
         exists,
         skipRedirects
@@ -8281,6 +8330,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     case "force-trailing-slash":
       return htmlHandlingForceTrailingSlash(
         pathname,
+        request,
         configuration,
         exists,
         skipRedirects
@@ -8288,15 +8338,16 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     case "drop-trailing-slash":
       return htmlHandlingDropTrailingSlash(
         pathname,
+        request,
         configuration,
         exists,
         skipRedirects
       );
     case "none":
-      return htmlHandlingNone(pathname, configuration, exists);
+      return htmlHandlingNone(pathname, request, configuration, exists);
   }
-}, htmlHandlingAutoTrailingSlash = async (pathname, configuration, exists, skipRedirects) => {
-  let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
+}, htmlHandlingAutoTrailingSlash = async (pathname, request, configuration, exists, skipRedirects) => {
+  let redirectResult = null, eTagResult = null, exactETag = await exists(pathname, request);
   if (pathname.endsWith("/index")) {
     if (exactETag)
       return {
@@ -8305,6 +8356,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       };
     if (redirectResult = await safeRedirect(
       `${pathname}.html`,
+      request,
       pathname.slice(0, -5),
       configuration,
       exists,
@@ -8313,6 +8365,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       return redirectResult;
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -6)}.html`,
+      request,
       pathname.slice(0, -6),
       configuration,
       exists,
@@ -8322,6 +8375,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
   } else if (pathname.endsWith("/index.html")) {
     if (redirectResult = await safeRedirect(
       pathname,
+      request,
       pathname.slice(0, -10),
       configuration,
       exists,
@@ -8330,6 +8384,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       return redirectResult;
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -11)}.html`,
+      request,
       pathname.slice(0, -11),
       configuration,
       exists,
@@ -8337,13 +8392,14 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     ))
       return redirectResult;
   } else if (pathname.endsWith("/")) {
-    if (eTagResult = await exists(`${pathname}index.html`))
+    if (eTagResult = await exists(`${pathname}index.html`, request))
       return {
         asset: { eTag: eTagResult, status: OkResponse.status },
         redirect: null
       };
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -1)}.html`,
+      request,
       pathname.slice(0, -1),
       configuration,
       exists,
@@ -8353,6 +8409,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
   } else if (pathname.endsWith(".html")) {
     if (redirectResult = await safeRedirect(
       pathname,
+      request,
       pathname.slice(0, -5),
       configuration,
       exists,
@@ -8361,6 +8418,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       return redirectResult;
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -5)}/index.html`,
+      request,
       `${pathname.slice(0, -5)}/`,
       configuration,
       exists,
@@ -8371,18 +8429,19 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
   return exactETag ? {
     asset: { eTag: exactETag, status: OkResponse.status },
     redirect: null
-  } : (eTagResult = await exists(`${pathname}.html`)) ? {
+  } : (eTagResult = await exists(`${pathname}.html`, request)) ? {
     asset: { eTag: eTagResult, status: OkResponse.status },
     redirect: null
   } : (redirectResult = await safeRedirect(
     `${pathname}/index.html`,
+    request,
     `${pathname}/`,
     configuration,
     exists,
     skipRedirects
-  )) ? redirectResult : notFound(pathname, configuration, exists);
-}, htmlHandlingForceTrailingSlash = async (pathname, configuration, exists, skipRedirects) => {
-  let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
+  )) ? redirectResult : notFound(pathname, request, configuration, exists);
+}, htmlHandlingForceTrailingSlash = async (pathname, request, configuration, exists, skipRedirects) => {
+  let redirectResult = null, eTagResult = null, exactETag = await exists(pathname, request);
   if (pathname.endsWith("/index")) {
     if (exactETag)
       return {
@@ -8391,6 +8450,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       };
     if (redirectResult = await safeRedirect(
       `${pathname}.html`,
+      request,
       pathname.slice(0, -5),
       configuration,
       exists,
@@ -8399,6 +8459,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       return redirectResult;
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -6)}.html`,
+      request,
       pathname.slice(0, -5),
       configuration,
       exists,
@@ -8408,6 +8469,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
   } else if (pathname.endsWith("/index.html")) {
     if (redirectResult = await safeRedirect(
       pathname,
+      request,
       pathname.slice(0, -10),
       configuration,
       exists,
@@ -8416,6 +8478,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       return redirectResult;
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -11)}.html`,
+      request,
       pathname.slice(0, -10),
       configuration,
       exists,
@@ -8423,12 +8486,15 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     ))
       return redirectResult;
   } else if (pathname.endsWith("/")) {
-    if (eTagResult = await exists(`${pathname}index.html`))
+    if (eTagResult = await exists(`${pathname}index.html`, request))
       return {
         asset: { eTag: eTagResult, status: OkResponse.status },
         redirect: null
       };
-    if (eTagResult = await exists(`${pathname.slice(0, -1)}.html`))
+    if (eTagResult = await exists(
+      `${pathname.slice(0, -1)}.html`,
+      request
+    ))
       return {
         asset: { eTag: eTagResult, status: OkResponse.status },
         redirect: null
@@ -8436,6 +8502,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
   } else if (pathname.endsWith(".html")) {
     if (redirectResult = await safeRedirect(
       pathname,
+      request,
       `${pathname.slice(0, -5)}/`,
       configuration,
       exists,
@@ -8449,6 +8516,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       };
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -5)}/index.html`,
+      request,
       `${pathname.slice(0, -5)}/`,
       configuration,
       exists,
@@ -8461,19 +8529,21 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     redirect: null
   } : (redirectResult = await safeRedirect(
     `${pathname}.html`,
+    request,
     `${pathname}/`,
     configuration,
     exists,
     skipRedirects
   )) || (redirectResult = await safeRedirect(
     `${pathname}/index.html`,
+    request,
     `${pathname}/`,
     configuration,
     exists,
     skipRedirects
-  )) ? redirectResult : notFound(pathname, configuration, exists);
-}, htmlHandlingDropTrailingSlash = async (pathname, configuration, exists, skipRedirects) => {
-  let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
+  )) ? redirectResult : notFound(pathname, request, configuration, exists);
+}, htmlHandlingDropTrailingSlash = async (pathname, request, configuration, exists, skipRedirects) => {
+  let redirectResult = null, eTagResult = null, exactETag = await exists(pathname, request);
   if (pathname.endsWith("/index")) {
     if (exactETag)
       return {
@@ -8483,6 +8553,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     if (pathname === "/index") {
       if (redirectResult = await safeRedirect(
         "/index.html",
+        request,
         "/",
         configuration,
         exists,
@@ -8492,6 +8563,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     } else {
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -6)}.html`,
+        request,
         pathname.slice(0, -6),
         configuration,
         exists,
@@ -8500,6 +8572,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
         return redirectResult;
       if (redirectResult = await safeRedirect(
         `${pathname}.html`,
+        request,
         pathname.slice(0, -6),
         configuration,
         exists,
@@ -8511,6 +8584,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     if (pathname === "/index.html") {
       if (redirectResult = await safeRedirect(
         "/index.html",
+        request,
         "/",
         configuration,
         exists,
@@ -8520,6 +8594,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     } else {
       if (redirectResult = await safeRedirect(
         pathname,
+        request,
         pathname.slice(0, -11),
         configuration,
         exists,
@@ -8533,6 +8608,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
         };
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -11)}.html`,
+        request,
         pathname.slice(0, -11),
         configuration,
         exists,
@@ -8542,7 +8618,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     }
   else if (pathname.endsWith("/"))
     if (pathname === "/") {
-      if (eTagResult = await exists("/index.html"))
+      if (eTagResult = await exists("/index.html", request))
         return {
           asset: { eTag: eTagResult, status: OkResponse.status },
           redirect: null
@@ -8550,6 +8626,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     } else {
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -1)}.html`,
+        request,
         pathname.slice(0, -1),
         configuration,
         exists,
@@ -8558,6 +8635,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
         return redirectResult;
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -1)}/index.html`,
+        request,
         pathname.slice(0, -1),
         configuration,
         exists,
@@ -8568,6 +8646,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
   else if (pathname.endsWith(".html")) {
     if (redirectResult = await safeRedirect(
       pathname,
+      request,
       pathname.slice(0, -5),
       configuration,
       exists,
@@ -8576,6 +8655,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       return redirectResult;
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -5)}/index.html`,
+      request,
       pathname.slice(0, -5),
       configuration,
       exists,
@@ -8586,23 +8666,23 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
   return exactETag ? {
     asset: { eTag: exactETag, status: OkResponse.status },
     redirect: null
-  } : (eTagResult = await exists(`${pathname}.html`)) ? {
+  } : (eTagResult = await exists(`${pathname}.html`, request)) ? {
     asset: { eTag: eTagResult, status: OkResponse.status },
     redirect: null
-  } : (eTagResult = await exists(`${pathname}/index.html`)) ? {
+  } : (eTagResult = await exists(`${pathname}/index.html`, request)) ? {
     asset: { eTag: eTagResult, status: OkResponse.status },
     redirect: null
-  } : notFound(pathname, configuration, exists);
-}, htmlHandlingNone = async (pathname, configuration, exists) => {
-  let exactETag = await exists(pathname);
+  } : notFound(pathname, request, configuration, exists);
+}, htmlHandlingNone = async (pathname, request, configuration, exists) => {
+  let exactETag = await exists(pathname, request);
   return exactETag ? {
     asset: { eTag: exactETag, status: OkResponse.status },
     redirect: null
-  } : notFound(pathname, configuration, exists);
-}, notFound = async (pathname, configuration, exists) => {
+  } : notFound(pathname, request, configuration, exists);
+}, notFound = async (pathname, request, configuration, exists) => {
   switch (configuration.not_found_handling) {
     case "single-page-application": {
-      let eTag = await exists("/index.html");
+      let eTag = await exists("/index.html", request);
       return eTag ? {
         asset: { eTag, status: OkResponse.status },
         redirect: null
@@ -8612,7 +8692,7 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
       let cwd = pathname;
       for (; cwd; ) {
         cwd = cwd.slice(0, cwd.lastIndexOf("/"));
-        let eTag = await exists(`${cwd}/404.html`);
+        let eTag = await exists(`${cwd}/404.html`, request);
         if (eTag)
           return {
             asset: { eTag, status: NotFoundResponse.status },
@@ -8625,12 +8705,18 @@ var REDIRECTS_VERSION = 1, HEADERS_VERSION = 2, getResponseOrAssetIntent = async
     default:
       return null;
   }
-}, safeRedirect = async (file, destination, configuration, exists, skip) => {
+}, safeRedirect = async (file, request, destination, configuration, exists, skip) => {
   if (skip)
     return null;
-  if (!await exists(destination)) {
-    let intent = await getIntent(destination, configuration, exists, !0);
-    if (intent?.asset && intent.asset.eTag === await exists(file))
+  if (!await exists(destination, request)) {
+    let intent = await getIntent(
+      destination,
+      request,
+      configuration,
+      exists,
+      !0
+    );
+    if (intent?.asset && intent.asset.eTag === await exists(file, request))
       return {
         asset: null,
         redirect: destination
@@ -8721,7 +8807,13 @@ var src_default = class extends WorkerEntrypoint {
         this.env.CONFIG?.account_id,
         this.env.CONFIG?.script_id
       );
-      let config = applyConfigurationDefaults(this.env.CONFIG), userAgent = request.headers.get("user-agent") ?? "UA UNKNOWN", url = new URL(request.url);
+      let config = normalizeConfiguration(this.env.CONFIG);
+      sentry?.setContext("compatibilityOptions", {
+        compatibilityDate: config.compatibility_date,
+        compatibilityFlags: config.compatibility_flags,
+        originalCompatibilityFlags: this.env.CONFIG.compatibility_flags
+      });
+      let userAgent = request.headers.get("user-agent") ?? "UA UNKNOWN", url = new URL(request.url);
       return this.env.COLO_METADATA && this.env.VERSION_METADATA && this.env.CONFIG && analytics.setData({
         accountId: this.env.CONFIG.account_id,
         scriptId: this.env.CONFIG.script_id,
@@ -8733,6 +8825,7 @@ var src_default = class extends WorkerEntrypoint {
         hostname: url.hostname,
         htmlHandling: config.html_handling,
         notFoundHandling: config.not_found_handling,
+        compatibilityFlags: config.compatibility_flags,
         userAgent
       }), await this.env.JAEGER.enterSpan("handleRequest", async (span) => {
         span.setTags({
@@ -8762,11 +8855,11 @@ var src_default = class extends WorkerEntrypoint {
     return this.env.JAEGER ??= mockJaegerBinding(), canFetch(
       request,
       this.env,
-      applyConfigurationDefaults(this.env.CONFIG),
+      normalizeConfiguration(this.env.CONFIG),
       this.unstable_exists.bind(this)
     );
   }
-  async unstable_getByETag(eTag) {
+  async unstable_getByETag(eTag, _request) {
     let performance = new PerformanceTimer(this.env.UNSAFE_PERFORMANCE), startTime = performance.now(), asset = await getAssetWithMetadataFromKV(
       this.env.ASSETS_KV_NAMESPACE,
       eTag
@@ -8784,11 +8877,11 @@ var src_default = class extends WorkerEntrypoint {
       cacheStatus: assetFetchTime <= 100 ? "HIT" : "MISS"
     };
   }
-  async unstable_getByPathname(pathname) {
-    let eTag = await this.unstable_exists(pathname);
-    return eTag ? this.unstable_getByETag(eTag) : null;
+  async unstable_getByPathname(pathname, request) {
+    let eTag = await this.unstable_exists(pathname, request);
+    return eTag ? this.unstable_getByETag(eTag, request) : null;
   }
-  async unstable_exists(pathname) {
+  async unstable_exists(pathname, _request) {
     let analytics = new ExperimentAnalytics(this.env.EXPERIMENT_ANALYTICS), performance = new PerformanceTimer(this.env.UNSAFE_PERFORMANCE);
     this.env.COLO_METADATA && this.env.VERSION_METADATA && this.env.CONFIG && analytics.setData({
       accountId: this.env.CONFIG.account_id,