@cloudflare/vite-plugin 1.9.6 → 1.10.0

package/dist/asset-workers/router-worker.js

@@ -6143,7 +6143,6 @@ var worker_default = {
           userWorkerAhead: config.invoke_user_worker_ahead_of_assets
         });
       }
-      const maybeSecondRequest = request.clone();
       const routeToUserWorker = async ({
         asset
       }) => {
@@ -6154,7 +6153,7 @@ var worker_default = {
         }
         if (eyeballConfig.limitedAssetsOnly) {
           analytics.setData({ userWorkerFreeTierLimiting: true });
-          return new Response(renderLimitedResponse(maybeSecondRequest), {
+          return new Response(renderLimitedResponse(request), {
             status: 429,
             headers: {
               "Content-Type": "text/html"
@@ -6169,12 +6168,12 @@ var worker_default = {
             asset,
             dispatchType: "worker" /* WORKER */
           });
-          let shouldBlockNonImageResponse = false;
+          let shouldCheckContentType = false;
           if (url.pathname.endsWith("/_next/image")) {
             const queryURLParam = url.searchParams.get("url");
             if (queryURLParam && !queryURLParam.startsWith("/")) {
-              if (maybeSecondRequest.method !== "GET" || maybeSecondRequest.headers.get("sec-fetch-dest") !== "image") {
-                shouldBlockNonImageResponse = true;
+              if (request.method !== "GET" || request.headers.get("sec-fetch-dest") !== "image") {
+                shouldCheckContentType = true;
                 analytics.setData({ abuseMitigationURLHost: queryURLParam });
               }
             }
@@ -6182,18 +6181,15 @@ var worker_default = {
           analytics.setData({
             timeToDispatch: performance.now() - startTimeMs
           });
-          if (shouldBlockNonImageResponse) {
-            const resp = await env.USER_WORKER.fetch(maybeSecondRequest);
-            const contentType = resp.headers.get("content-type") || "";
-            const isImageOrPlainText = contentType.startsWith("image/") || // Matches "text/plain", "text/plain;charset=UTF-8"
-            contentType.split(";")[0] === "text/plain";
-            if (!isImageOrPlainText && resp.status !== 304) {
+          if (shouldCheckContentType) {
+            const response = await env.USER_WORKER.fetch(request);
+            if (response.status !== 304 && shouldBlockContentType(response)) {
               analytics.setData({ abuseMitigationBlocked: true });
               return new Response("Blocked", { status: 403 });
             }
-            return resp;
+            return response;
           }
-          return env.USER_WORKER.fetch(maybeSecondRequest);
+          return env.USER_WORKER.fetch(request);
         });
       };
       const routeToAssets = async ({
@@ -6209,7 +6205,7 @@ var worker_default = {
           analytics.setData({
             timeToDispatch: performance.now() - startTimeMs
           });
-          return env.ASSET_WORKER.fetch(maybeSecondRequest);
+          return env.ASSET_WORKER.fetch(request);
         });
       };
       if (config.static_routing) {
@@ -6247,7 +6243,12 @@ var worker_default = {
       if (config.invoke_user_worker_ahead_of_assets) {
         return await routeToUserWorker({ asset: "static_routing" });
       }
-      const assetsExist = await env.ASSET_WORKER.unstable_canFetch(request);
+      const assetsExist = await env.ASSET_WORKER.unstable_canFetch(
+        new Request(request.url, {
+          headers: request.headers,
+          method: request.method
+        })
+      );
       if (config.has_user_worker && !assetsExist) {
         return await routeToUserWorker({ asset: "none" });
       }
@@ -6268,6 +6269,16 @@ var worker_default = {
     }
   }
 };
+function shouldBlockContentType(response) {
+  const contentType = response.headers.get("content-type");
+  if (contentType === null) {
+    return true;
+  }
+  if (contentType.includes(",")) {
+    return true;
+  }
+  return !(contentType.startsWith("image/") || contentType.split(";")[0] === "text/plain");
+}
 export {
   worker_default as default
 };