From 0dcefdd5837ff69edc67883f6cd081014c42987c Mon Sep 17 00:00:00 2001
From: Kevin Kipp <kkipp@cloudflare.com>
Date: Wed, 28 May 2025 16:32:55 -0500
Subject: [PATCH] Disable lobby for dev env

---
 app/routes/_room.$roomName.room.tsx | 10 ++++++----
 app/types/Env.ts                    |  1 +
 wrangler.development.toml           |  2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/routes/_room.$roomName.room.tsx b/app/routes/_room.$roomName.room.tsx
index 16f8d0b1..6f0dcba8 100644
--- a/app/routes/_room.$roomName.room.tsx
+++ b/app/routes/_room.$roomName.room.tsx
@@ -45,6 +45,7 @@ export const loader = async ({ request, context }: LoaderFunctionArgs) => {
 				context.env.FEEDBACK_QUEUE &&
 				context.env.FEEDBACK_STORAGE
 		),
+		disableLobbyEnforcement: context.env.DISABLE_LOBBY_ENFORCEMENT === 'true',
 		mode: context.mode,
 		hasDb: Boolean(context.env.DB),
 		hasAiCredentials: Boolean(
@@ -58,15 +59,16 @@ export default function Room() {
 	const { joined } = useRoomContext()
 	const navigate = useNavigate()
 	const { roomName } = useParams()
-	const { mode, bugReportsEnabled } = useLoaderData<typeof loader>()
+	const { mode, bugReportsEnabled, disableLobbyEnforcement } =
+		useLoaderData<typeof loader>()
 	const [search] = useSearchParams()
 
 	useEffect(() => {
-		if (!joined && mode !== 'development')
+		if (!joined && mode !== 'development' && !disableLobbyEnforcement)
 			navigate(`/${roomName}${search.size > 0 ? '?' + search.toString() : ''}`)
-	}, [joined, mode, navigate, roomName, search])
+	}, [joined, mode, navigate, roomName, search, disableLobbyEnforcement])
 
-	if (!joined && mode !== 'development') return null
+	if (!joined && mode !== 'development' && !disableLobbyEnforcement) return null
 
 	return (
 		<Toast.Provider>
diff --git a/app/types/Env.ts b/app/types/Env.ts
index cbf7c6fa..39dff482 100644
--- a/app/types/Env.ts
+++ b/app/types/Env.ts
@@ -3,6 +3,7 @@ export type Env = {
 	CALLS_APP_ID: string
 	CALLS_APP_SECRET: string
 	CALLS_API_URL?: string
+	DISABLE_LOBBY_ENFORCEMENT?: string
 	E2EE_ENABLED?: string
 	USER_DIRECTORY_URL?: string
 	FEEDBACK_URL?: string
diff --git a/wrangler.development.toml b/wrangler.development.toml
index a25cbde4..9c6713ae 100644
--- a/wrangler.development.toml
+++ b/wrangler.development.toml
@@ -26,6 +26,8 @@ class_name = "ChatRoom"
 CALLS_APP_ID = "f0ea263009299383d09d44b9fad5316c"
 TURN_SERVICE_ID = "124bb066f462e966159bc4eef4b42048"
 EXPERIMENTAL_SIMULCAST_ENABLED = "true"
+DISABLE_LOBBY_ENFORCEMENT = "true"
+
 
 [[queues.producers]]
  queue = "orange-meets-feedback-queue-development"