wrangler 2.0.23 → 2.0.24

package/templates/{static-asset-facade.js → serve-static-assets.ts}

@@ -1,25 +1,40 @@
-// DO NOT IMPORT THIS DIRECTLY
+// @ts-expect-error
 import worker from "__ENTRY_POINT__";
 import {
 	getAssetFromKV,
 	NotFoundError,
 	MethodNotAllowedError,
+	// @ts-expect-error
 } from "__KV_ASSET_HANDLER__";
+// @ts-expect-error
 import manifest from "__STATIC_CONTENT_MANIFEST";
+import type * as kvAssetHandler from "@cloudflare/kv-asset-handler";
+
 const ASSET_MANIFEST = JSON.parse(manifest);
 
+// @ts-expect-error
+export * from "__ENTRY_POINT__";
+
 export default {
-	async fetch(request, env, ctx) {
+	async fetch(
+		request: Request,
+		env: { __STATIC_CONTENT: string },
+		ctx: ExecutionContext
+	) {
 		let options = {
 			ASSET_MANIFEST,
 			ASSET_NAMESPACE: env.__STATIC_CONTENT,
+			cacheControl: __CACHE_CONTROL_OPTIONS__,
+			serveSinglePageApp: __SERVE_SINGLE_PAGE_APP__,
 		};
 
 		try {
-			const page = await getAssetFromKV(
+			const page = await (
+				getAssetFromKV as typeof kvAssetHandler.getAssetFromKV
+			)(
 				{
 					request,
-					waitUntil(promise) {
+					waitUntil(promise: Promise<unknown>) {
 						return ctx.waitUntil(promise);
 					},
 				},
@@ -39,11 +54,10 @@ export default {
 		} catch (e) {
 			if (e instanceof NotFoundError || e instanceof MethodNotAllowedError) {
 				// if a known error is thrown then serve from actual worker
-				return worker.fetch(request, env, ctx);
+				return await worker.fetch(request, env, ctx);
 			}
 			// otherwise it's a real error, so throw it
-			console.error(e);
-			return new Response(e.message, { status: 500 });
+			throw e;
 		}
 	},
 };

package/templates/service-bindings-module-facade.js

@@ -0,0 +1,51 @@
+import worker from "__ENTRY_POINT__";
+const Workers = __WORKERS__;
+
+export * from "__ENTRY_POINT__";
+
+export default {
+	async fetch(req, env, ctx) {
+		const facadeEnv = { ...env };
+		// For every Worker definition that's available,
+		// create a fetcher for it on the facade env.
+		// for const [name,  binding] of env
+		// if Workers[name]
+		// const details = Workers[name];
+
+		for (const [name, details] of Object.entries(Workers)) {
+			if (details) {
+				facadeEnv[name] = {
+					async fetch(...reqArgs) {
+						if (details.headers) {
+							const req = new Request(...reqArgs);
+							for (const [key, value] of Object.entries(details.headers)) {
+								// In remote mode, you need to add a couple of headers
+								// to make sure it's talking to the 'dev' preview session
+								// (much like wrangler dev already does via proxy.ts)
+								req.headers.set(key, value);
+							}
+							return env[name].fetch(req);
+						}
+						const url = `${details.protocol}://${details.host}${
+							details.port ? `:${details.port}` : ""
+						}`;
+						const request = new Request(url, ...reqArgs);
+						return fetch(request);
+					},
+				};
+			} else {
+				// This means there's no dev binding available.
+				// Let's use whatever's available, or put a shim with a message.
+				facadeEnv[name] = facadeEnv[name] || {
+					async fetch() {
+						return new Response(
+							`You should start up wrangler dev --local on the ${name} worker`,
+							{ status: 404 }
+						);
+					},
+				};
+			}
+		}
+		return worker.fetch(req, facadeEnv, ctx);
+	},
+};

package/templates/service-bindings-sw-facade.js

@@ -0,0 +1,39 @@
+import "__ENTRY_POINT__";
+const Workers = __WORKERS__;
+
+// For every Worker definition that's available,
+// create a fetcher for it on the facade env.
+for (const [name, details] of Object.entries(Workers)) {
+	if (details) {
+		globalThis[name] = {
+			async fetch(...reqArgs) {
+				if (details.headers) {
+					const req = new Request(...reqArgs);
+					for (const [key, value] of Object.entries(details.headers)) {
+						// In remote mode, you need to add a couple of headers
+						// to make sure it's talking to the 'dev' preview session
+						// (much like wrangler dev already does via proxy.ts)
+						req.headers.set(key, value);
+					}
+					return env[name].fetch(req);
+				}
+				const url = `${details.protocol}://${details.host}${
+					details.port ? `:${details.port}` : ""
+				}`;
+				const request = new Request(url, ...reqArgs);
+				return fetch(request);
+			},
+		};
+	} else {
+		// This means it's a local mode binding
+		// but hasn't started up locally yet.
+		globalThis[name] = {
+			async fetch() {
+				return new Response(
+					`You should start up wrangler dev --local on the ${name} worker`,
+					{ status: 404 }
+				);
+			},
+		};
+	}
+}