From a49cc8a04f6d1aa1c9c74e434cb7fba14ad0c1ea Mon Sep 17 00:00:00 2001
From: Rahul Sethi <5822355+RamIdeas@users.noreply.github.com>
Date: Wed, 8 Nov 2023 18:25:36 +0000
Subject: [PATCH] only proxy consoleAPICalled events in remote mode

---
 .../wrangler/src/api/startDevWorker/ProxyController.ts   | 9 +++++++--
 packages/wrangler/src/api/startDevWorker/events.ts       | 1 +
 .../templates/startDevWorker/InspectorProxyWorker.ts     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/wrangler/src/api/startDevWorker/ProxyController.ts b/packages/wrangler/src/api/startDevWorker/ProxyController.ts
index 7f4ec1bb44c3..1e07690be537 100644
--- a/packages/wrangler/src/api/startDevWorker/ProxyController.ts
+++ b/packages/wrangler/src/api/startDevWorker/ProxyController.ts
@@ -328,14 +328,19 @@ export class ProxyController extends EventEmitter {
 		this.latestConfig = data.config;
 		this.latestBundle = data.bundle;
 
+		const proxyData = {
+			proxyLogsToController: data.config.dev?.remote, // in local mode, workerd logs to terminal directly
+			...data.proxyData,
+		};
+
 		void this.sendMessageToProxyWorker({
 			type: "play",
-			proxyData: data.proxyData,
+			proxyData,
 		});
 
 		void this.sendMessageToInspectorProxyWorker({
 			type: "reloadComplete",
-			proxyData: data.proxyData,
+			proxyData,
 		});
 	}
 	onProxyWorkerMessage(message: ProxyWorkerOutgoingRequestBody) {
diff --git a/packages/wrangler/src/api/startDevWorker/events.ts b/packages/wrangler/src/api/startDevWorker/events.ts
index 25eb8931da55..fa7022769a0f 100644
--- a/packages/wrangler/src/api/startDevWorker/events.ts
+++ b/packages/wrangler/src/api/startDevWorker/events.ts
@@ -138,4 +138,5 @@ export type ProxyData = {
 	userWorkerInnerUrlOverrides: Partial<UrlOriginParts>;
 	headers: Record<string, string>;
 	liveReload?: boolean;
+	proxyLogsToController?: boolean;
 };
diff --git a/packages/wrangler/templates/startDevWorker/InspectorProxyWorker.ts b/packages/wrangler/templates/startDevWorker/InspectorProxyWorker.ts
index 70ef234be9e0..f9f6e6543bec 100644
--- a/packages/wrangler/templates/startDevWorker/InspectorProxyWorker.ts
+++ b/packages/wrangler/templates/startDevWorker/InspectorProxyWorker.ts
@@ -208,8 +208,11 @@ export class InspectorProxyWorker implements DurableObject {
 			| DevToolsEvents;
 		this.sendDebugLog("RUNTIME INCOMING MESSAGE", msg);
 
+		if (isDevToolsEvent(msg, "Runtime.exceptionThrown")) {
+			this.sendProxyControllerMessage(event.data);
+		}
 		if (
-			isDevToolsEvent(msg, "Runtime.exceptionThrown") ||
+			this.proxyData?.proxyLogsToController &&
 			isDevToolsEvent(msg, "Runtime.consoleAPICalled")
 		) {
 			this.sendProxyControllerMessage(event.data);