From cefc87cfdbc14a0c5d49f9c5f59b16efe89a715e Mon Sep 17 00:00:00 2001
From: Kacper Wojciechowski <39823706+jog1t@users.noreply.github.com>
Date: Sat, 26 Apr 2025 12:45:07 +0200
Subject: [PATCH 1/2] fix: apply cors only for non-websocket routes

---
 packages/actor-core/src/manager/router.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/actor-core/src/manager/router.ts b/packages/actor-core/src/manager/router.ts
index e5ba6221b..d4c26ae07 100644
--- a/packages/actor-core/src/manager/router.ts
+++ b/packages/actor-core/src/manager/router.ts
@@ -29,6 +29,20 @@ export function createManagerRouter(
 	const driver = driverConfig.drivers.manager;
 	const app = new Hono();
 
+	// Apply CORS middleware if configured
+	if (appConfig.cors) {
+		app.use("*", async (c, next) => {
+			const path = c.req.path;
+
+			// Don't apply to WebSocket routes, see https://hono.dev/docs/helpers/websocket#upgradewebsocket
+			if (path === "/manager/inspect" && appConfig.inspector.enabled) {
+				return next();
+			}
+
+			return cors(appConfig.cors)(c, next);
+		});
+	}
+
 	// Apply CORS middleware if configured
 	if (appConfig.cors) {
 		app.use("*", cors(appConfig.cors));

From ab5a4e79834e0dbd509c29e50ba02f70cbe1403d Mon Sep 17 00:00:00 2001
From: Kacper Wojciechowski <39823706+jog1t@users.noreply.github.com>
Date: Sat, 26 Apr 2025 12:46:07 +0200
Subject: [PATCH 2/2] fix: removes old cors settings

---
 packages/actor-core/src/manager/router.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/actor-core/src/manager/router.ts b/packages/actor-core/src/manager/router.ts
index d4c26ae07..cca01dfba 100644
--- a/packages/actor-core/src/manager/router.ts
+++ b/packages/actor-core/src/manager/router.ts
@@ -43,11 +43,6 @@ export function createManagerRouter(
 		});
 	}
 
-	// Apply CORS middleware if configured
-	if (appConfig.cors) {
-		app.use("*", cors(appConfig.cors));
-	}
-
 	app.get("/", (c) => {
 		return c.text(
 			"This is an ActorCore server.\n\nLearn more at https://actorcore.org",