WfP Assets support

cloudflare · Dec 5, 2024 · 6caebe4 · 6caebe4
1 parent bc30823
commit 6caebe4
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 22 deletions.
diff --git a/.changeset/smart-plants-wash.md b/.changeset/smart-plants-wash.md
@@ -0,0 +1,5 @@
+---
+"wrangler": minor
+---
+
+feat: Allow Workers for Platforms scripts (scripts deployed with `--dispatch-namespace`) to bring along `assets`
diff --git a/packages/wrangler/src/__tests__/deploy.test.ts b/packages/wrangler/src/__tests__/deploy.test.ts
@@ -5140,6 +5140,36 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("deploy");
 		});
+
+		it("should be able to upload to a WfP script", async () => {
+			const assets = [
+				{ filePath: "file-1.txt", content: "Content of file-1" },
+				{ filePath: "boop/file-2.txt", content: "Content of file-2" },
+			];
+			writeAssets(assets);
+			writeWorkerSource({ format: "js" });
+			writeWranglerConfig({
+				compatibility_date: "2024-09-27",
+				compatibility_flags: ["nodejs_compat"],
+				assets: {
+					directory: "assets",
+					html_handling: "none",
+				},
+			});
+			await mockAUSRequest(undefined, undefined, undefined, "my-namespace");
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({
+				expectedAssets: {
+					jwt: "<<aus-completion-token>>",
+					config: { html_handling: "none" },
+				},
+				expectedCompatibilityDate: "2024-09-27",
+				expectedCompatibilityFlags: ["nodejs_compat"],
+				expectedMainModule: undefined,
+				expectedDispatchNamespace: "my-namespace",
+			});
+			await runWrangler("deploy --dispatch-namespace my-namespace");
+		});
 	});
 
 	describe("workers_dev setting", () => {
@@ -12542,25 +12572,46 @@ function mockPostQueueHTTPConsumer(
 const mockAUSRequest = async (
 	bodies?: AssetManifest[],
 	buckets: string[][] = [[]],
-	jwt: string = "<<aus-completion-token>>"
+	jwt: string = "<<aus-completion-token>>",
+	dispatchNamespace?: string
 ) => {
-	msw.use(
-		http.post<never, AssetManifest>(
-			`*/accounts/some-account-id/workers/scripts/test-name/assets-upload-session`,
-			async ({ request }) => {
-				bodies?.push(await request.json());
-				return HttpResponse.json(
-					{
-						success: true,
-						errors: [],
-						messages: [],
-						result: { jwt, buckets },
-					},
-					{ status: 201 }
-				);
-			}
-		)
-	);
+	if (dispatchNamespace) {
+		msw.use(
+			http.post<never, AssetManifest>(
+				`*/accounts/some-account-id/workers/dispatch/namespaces/my-namespace/scripts/test-name/assets-upload-session`,
+				async ({ request }) => {
+					bodies?.push(await request.json());
+					return HttpResponse.json(
+						{
+							success: true,
+							errors: [],
+							messages: [],
+							result: { jwt, buckets },
+						},
+						{ status: 201 }
+					);
+				}
+			)
+		);
+	} else {
+		msw.use(
+			http.post<never, AssetManifest>(
+				`*/accounts/some-account-id/workers/scripts/test-name/assets-upload-session`,
+				async ({ request }) => {
+					bodies?.push(await request.json());
+					return HttpResponse.json(
+						{
+							success: true,
+							errors: [],
+							messages: [],
+							result: { jwt, buckets },
+						},
+						{ status: 201 }
+					);
+				}
+			)
+		);
+	}
 };
 
 const mockAssetUploadRequest = async (

diff --git a/packages/wrangler/src/assets.ts b/packages/wrangler/src/assets.ts
@@ -47,19 +47,24 @@ const MAX_UPLOAD_GATEWAY_ERRORS = 5;
 
 export const syncAssets = async (
 	accountId: string | undefined,
+	assetDirectory: string,
 	scriptName: string,
-	assetDirectory: string
+	dispatchNamespace?: string
 ): Promise<string> => {
 	assert(accountId, "Missing accountId");
 
 	// 1. generate asset manifest
 	logger.info("🌀 Building list of assets...");
 	const manifest = await buildAssetManifest(assetDirectory);
 
+	const url = dispatchNamespace
+		? `/accounts/${accountId}/workers/dispatch/namespaces/${dispatchNamespace}/scripts/${scriptName}/assets-upload-session`
+		: `/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`;
+
 	// 2. fetch buckets w/ hashes
 	logger.info("🌀 Starting asset upload...");
 	const initializeAssetsResponse = await fetchResult<InitializeAssetsResponse>(
-		`/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`,
+		url,
 		{
 			headers: { "Content-Type": "application/json" },
 			method: "POST",

diff --git a/packages/wrangler/src/deploy/deploy.ts b/packages/wrangler/src/deploy/deploy.ts
@@ -656,7 +656,12 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		// Upload assets if assets is being used
 		const assetsJwt =
 			props.assetsOptions && !props.dryRun
-				? await syncAssets(accountId, scriptName, props.assetsOptions.directory)
+				? await syncAssets(
+						accountId,
+						props.assetsOptions.directory,
+						scriptName,
+						props.dispatchNamespace
+					)
 				: undefined;
 
 		const legacyAssets = await syncLegacyAssets(

diff --git a/packages/wrangler/src/versions/upload.ts b/packages/wrangler/src/versions/upload.ts
@@ -677,7 +677,12 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		// Upload assets if assets is being used
 		const assetsJwt =
 			props.assetsOptions && !props.dryRun
-				? await syncAssets(accountId, scriptName, props.assetsOptions.directory)
+				? await syncAssets(
+						accountId,
+						props.assetsOptions.directory,
+						scriptName,
+						undefined
+					)
 				: undefined;
 
 		const bindings = getBindings({