fix error

Author: edmundhung

packages/miniflare/src/http/fetch.ts

@@ -197,11 +197,8 @@ export class DispatchFetchDispatcher extends undici.Dispatcher {
 		path: string // Including query parameters
 	) {
 		// Reconstruct URL using runtime origin specified with `dispatchFetch()`
-		// Only set if not already present (e.g., set by #fetcherFetchCall in proxy client)
-		if (!headers.has(CoreHeaders.ORIGINAL_URL)) {
-			const originalURL = this.userRuntimeOrigin + path;
-			headers.set(CoreHeaders.ORIGINAL_URL, originalURL);
-		}
+		const originalURL = this.userRuntimeOrigin + path;
+		headers.set(CoreHeaders.ORIGINAL_URL, originalURL);
 		headers.set(CoreHeaders.DISABLE_PRETTY_ERROR, "true");
 		if (this.cfBlobJson !== undefined) {
 			// Only add this header if a `cf` override was set

packages/miniflare/src/plugins/core/proxy/client.ts

@@ -728,7 +728,7 @@ class ProxyStubHandler<T extends object>
 		const request = new Request(this.bridge.url, userRequest);
 		// If adding new headers here, remember to `delete()` them in `ProxyServer`
 		// before calling `fetch()`.
-		request.headers.set(CoreHeaders.ORIGINAL_URL, userRequest.url);
+		request.headers.set(CoreHeaders.OP_ORIGINAL_URL, userRequest.url);
 		request.headers.set(CoreHeaders.OP_SECRET, PROXY_SECRET_HEX);
 		request.headers.set(CoreHeaders.OP, ProxyOps.CALL);
 		request.headers.set(CoreHeaders.OP_TARGET, this.#stringifiedTarget);

packages/miniflare/src/workers/core/constants.ts

@@ -46,6 +46,7 @@ export const CoreHeaders = {
 	OP_SYNC: "MF-Op-Sync",
 	OP_STRINGIFIED_SIZE: "MF-Op-Stringified-Size",
 	OP_RESULT_TYPE: "MF-Op-Result-Type",
+	OP_ORIGINAL_URL: "MF-Op-Original-URL",
 } as const;
 
 export const CoreBindings = {

packages/miniflare/src/workers/core/proxy.worker.ts

@@ -270,14 +270,17 @@ export class ProxyServer implements DurableObject {
 
 			// See `isFetcherFetch()` comment for why this special
 			if (isFetcherFetch(targetName, keyHeader)) {
-				const originalUrl = request.headers.get(CoreHeaders.ORIGINAL_URL);
+				const originalUrl =
+					request.headers.get(CoreHeaders.OP_ORIGINAL_URL) ??
+					request.headers.get(CoreHeaders.ORIGINAL_URL);
 				const url = new URL(originalUrl ?? request.url);
 				// Create a new request to allow header mutation and use original URL
 				request = new Request(url, request);
 				request.headers.delete(CoreHeaders.OP_SECRET);
 				request.headers.delete(CoreHeaders.OP);
 				request.headers.delete(CoreHeaders.OP_TARGET);
 				request.headers.delete(CoreHeaders.OP_KEY);
+				request.headers.delete(CoreHeaders.OP_ORIGINAL_URL);
 				request.headers.delete(CoreHeaders.ORIGINAL_URL);
 				request.headers.delete(CoreHeaders.DISABLE_PRETTY_ERROR);
 				return func.call(target, request);