Provides support for run_worker_first option

- Warning for sunsetting of experimental_serve_directly
- Error for using run_worker_first and experimental_serve_directly together
- Sends run_worker_first field to EWC (in production) instead of old `serve_directly`

fixtures/asset-config/html-handling.test.ts

@@ -64,7 +64,7 @@ describe.each(testSuites)("$title", ({ title, suite }) => {
 				return {
 					html_handling,
 					not_found_handling: "none",
-					serve_directly: true,
+					run_worker_first: true,
 				};
 			});
 		});

fixtures/asset-config/redirects.test.ts

@@ -41,7 +41,7 @@ describe("[Asset Worker] `test location rewrite`", () => {
 			return {
 				html_handling: "none",
 				not_found_handling: "none",
-				serve_directly: true,
+				run_worker_first: true,
 			};
 		});
 	});

fixtures/asset-config/url-normalization.test.ts

@@ -41,7 +41,7 @@ describe("[Asset Worker] `test slash normalization`", () => {
 			return {
 				html_handling: "none",
 				not_found_handling: "none",
-				serve_directly: true,
+				run_worker_first: true,
 			};
 		});
 	});

fixtures/workers-with-assets-serve-directly/tests/index.test.ts → fixtures/workers-with-assets-run-worker-first/tests/index.test.ts

@@ -3,7 +3,7 @@ import { fetch } from "undici";
 import { afterAll, beforeAll, describe, it } from "vitest";
 import { runWranglerDev } from "../../shared/src/run-wrangler-long-lived";
 
-describe("[Workers + Assets] serve_directly false", () => {
+describe("[Workers + Assets] run_worker_first true", () => {
 	let ip: string, port: number, stop: (() => Promise<unknown>) | undefined;
 
 	beforeAll(async () => {

fixtures/workers-with-assets-serve-directly/wrangler.toml → fixtures/workers-with-assets-run-worker-first/wrangler.toml

@@ -7,4 +7,4 @@ compatibility_date = "2024-01-01"
 [assets]
 directory = "./public"
 binding="ASSETS"
-experimental_serve_directly = false
+run_worker_first = true

fixtures/workers-with-assets/wrangler.toml

@@ -5,3 +5,4 @@ compatibility_date = "2024-01-01"
 [assets]
 directory = "./public"
 binding="ASSETS"
+experimental_serve_directly = true

packages/workers-shared/asset-worker/src/configuration.ts

@@ -3,9 +3,19 @@ import type { AssetConfig } from "../../utils/types";
 export const applyConfigurationDefaults = (
 	configuration?: AssetConfig
 ): Required<AssetConfig> => {
+	let runWorkerFirst = undefined;
+	if (configuration?.run_worker_first !== undefined) {
+		runWorkerFirst = configuration?.run_worker_first;
+	} else if (configuration?.serve_directly !== undefined) {
+		runWorkerFirst = !configuration.serve_directly;
+	} else {
+		runWorkerFirst = false;
+	}
+
 	return {
 		html_handling: configuration?.html_handling ?? "auto-trailing-slash",
 		not_found_handling: configuration?.not_found_handling ?? "none",
-		serve_directly: configuration?.serve_directly ?? true,
+		run_worker_first: runWorkerFirst,
+		serve_directly: !runWorkerFirst,
 	};
 };

packages/workers-shared/asset-worker/tests/handler.test.ts

@@ -9,6 +9,7 @@ describe("[Asset Worker] `handleRequest`", () => {
 		const configuration: Required<AssetConfig> = {
 			html_handling: "none",
 			not_found_handling: "none",
+			run_worker_first: false,
 			serve_directly: true,
 		};
 		const eTag = "some-etag";
@@ -38,6 +39,7 @@ describe("[Asset Worker] `handleRequest`", () => {
 		const configuration: Required<AssetConfig> = {
 			html_handling: "none",
 			not_found_handling: "none",
+			run_worker_first: false,
 			serve_directly: true,
 		};
 		const eTag = "some-etag";
@@ -69,6 +71,7 @@ describe("[Asset Worker] `handleRequest`", () => {
 		const configuration: Required<AssetConfig> = {
 			html_handling: "none",
 			not_found_handling: "none",
+			run_worker_first: false,
 			serve_directly: true,
 		};
 		const eTag = "some-etag";
@@ -100,6 +103,7 @@ describe("[Asset Worker] `handleRequest`", () => {
 		const configuration: Required<AssetConfig> = {
 			html_handling: "none",
 			not_found_handling: "none",
+			run_worker_first: false,
 			serve_directly: true,
 		};
 		const eTag = "some-etag";
@@ -192,6 +196,7 @@ describe("[Asset Worker] `handleRequest`", () => {
 		const configuration: Required<AssetConfig> = {
 			html_handling: "drop-trailing-slash",
 			not_found_handling: "none",
+			run_worker_first: false,
 			serve_directly: true,
 		};
 

packages/workers-shared/utils/types.ts

@@ -22,6 +22,7 @@ export const AssetConfigSchema = z.object({
 		.enum(["single-page-application", "404-page", "none"])
 		.optional(),
 	serve_directly: z.boolean().optional(),
+	run_worker_first: z.boolean().optional(),
 });
 
 export const InternalConfigSchema = z.object({

packages/wrangler/e2e/deployments.test.ts

@@ -490,7 +490,7 @@ Current Version ID: 00000000-0000-0000-0000-000000000000`);
 		);
 		expect(text).toContain("<h1>404.html</h1>");
 	});
-	it("runs user worker ahead of matching assets when serve_directly = false", async () => {
+	it("runs user worker ahead of matching assets when run_worker_first = true", async () => {
 		await helper.seed({
 			"wrangler.toml": dedent`
 						name = "${workerName}"
@@ -501,7 +501,7 @@ Current Version ID: 00000000-0000-0000-0000-000000000000`);
 						binding = "ASSETS"
 						html_handling = "none"
 						not_found_handling = "404-page"
-						experimental_serve_directly = false
+						run_worker_first = true
 				`,
 			"src/index.ts": dedent`
 						export default {