From 8d92619e6c2db6351df7301b6aaa1fcfe702c867 Mon Sep 17 00:00:00 2001
From: lukasIO <mail@lukasseiler.de>
Date: Tue, 10 Sep 2024 13:17:14 +0200
Subject: [PATCH 1/3] Add prepareConnection option to LiveKitRoom

---
 packages/react/etc/components-react.api.md    |  1 +
 packages/react/src/components/LiveKitRoom.tsx |  5 +++++
 packages/react/src/hooks/useLiveKitRoom.ts    | 19 +++++++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/react/etc/components-react.api.md b/packages/react/etc/components-react.api.md
index bbd2c00cd..0547ee89d 100644
--- a/packages/react/etc/components-react.api.md
+++ b/packages/react/etc/components-react.api.md
@@ -344,6 +344,7 @@ export interface LiveKitRoomProps extends Omit<React_2.HTMLAttributes<HTMLDivEle
     // (undocumented)
     onMediaDeviceFailure?: (failure?: MediaDeviceFailure) => void;
     options?: RoomOptions;
+    prepareConnection?: boolean;
     room?: Room;
     screen?: ScreenShareCaptureOptions | boolean;
     serverUrl: string | undefined;
diff --git a/packages/react/src/components/LiveKitRoom.tsx b/packages/react/src/components/LiveKitRoom.tsx
index 71f89415e..5834e9270 100644
--- a/packages/react/src/components/LiveKitRoom.tsx
+++ b/packages/react/src/components/LiveKitRoom.tsx
@@ -77,6 +77,11 @@ export interface LiveKitRoomProps extends Omit<React.HTMLAttributes<HTMLDivEleme
 
   simulateParticipants?: number | undefined;
 
+  /**
+   * If set to `true` (default) an initial HTTP request will be sent to the serverURL even before connecting to prewarm the connection
+   */
+  prepareConnection?: boolean;
+
   /**
    * @internal
    */
diff --git a/packages/react/src/hooks/useLiveKitRoom.ts b/packages/react/src/hooks/useLiveKitRoom.ts
index 6fa161142..e0eb62449 100644
--- a/packages/react/src/hooks/useLiveKitRoom.ts
+++ b/packages/react/src/hooks/useLiveKitRoom.ts
@@ -10,6 +10,7 @@ const defaultRoomProps: Partial<LiveKitRoomProps> = {
   connect: true,
   audio: false,
   video: false,
+  prepareConnection: true,
 };
 
 /**
@@ -45,6 +46,7 @@ export function useLiveKitRoom<T extends HTMLElement>(
     onMediaDeviceFailure,
     onEncryptionError,
     simulateParticipants,
+    prepareConnection,
     ...rest
   } = { ...defaultRoomProps, ...props };
   if (options && passedRoom) {
@@ -59,6 +61,13 @@ export function useLiveKitRoom<T extends HTMLElement>(
     setRoom(passedRoom ?? new Room(options));
   }, [passedRoom]);
 
+  const prewarm = React.useMemo(() => {
+    if (room && serverUrl && prepareConnection) {
+      return room.prepareConnection(serverUrl, token);
+    }
+    return new Promise<void>((resolve) => resolve(undefined));
+  }, [serverUrl, prepareConnection, token, room]);
+
   const htmlProps = React.useMemo(() => {
     const { className } = setupLiveKitRoom();
     return mergeProps(rest, { className }) as HTMLAttributes<T>;
@@ -126,10 +135,12 @@ export function useLiveKitRoom<T extends HTMLElement>(
     }
     if (connect) {
       log.debug('connecting');
-      room.connect(serverUrl, token, connectOptions).catch((e) => {
-        log.warn(e);
-        onError?.(e as Error);
-      });
+      prewarm.then(() =>
+        room.connect(serverUrl, token, connectOptions).catch((e) => {
+          log.warn(e);
+          onError?.(e as Error);
+        }),
+      );
     } else {
       log.debug('disconnecting because connect is false');
       room.disconnect();

From 4a5d2e6346df862a7545d4f4e26d02fafae3bc39 Mon Sep 17 00:00:00 2001
From: lukasIO <mail@lukasseiler.de>
Date: Tue, 10 Sep 2024 13:20:50 +0200
Subject: [PATCH 2/3] ensure token is set

---
 packages/react/src/hooks/useLiveKitRoom.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/hooks/useLiveKitRoom.ts b/packages/react/src/hooks/useLiveKitRoom.ts
index e0eb62449..03491f452 100644
--- a/packages/react/src/hooks/useLiveKitRoom.ts
+++ b/packages/react/src/hooks/useLiveKitRoom.ts
@@ -62,7 +62,7 @@ export function useLiveKitRoom<T extends HTMLElement>(
   }, [passedRoom]);
 
   const prewarm = React.useMemo(() => {
-    if (room && serverUrl && prepareConnection) {
+    if (room && serverUrl && prepareConnection && token) {
       return room.prepareConnection(serverUrl, token);
     }
     return new Promise<void>((resolve) => resolve(undefined));

From 587e4a8edb0b85093b45f389499a0306c7fa1e00 Mon Sep 17 00:00:00 2001
From: lukasIO <mail@lukasseiler.de>
Date: Tue, 10 Sep 2024 13:21:35 +0200
Subject: [PATCH 3/3] Create cool-nails-exist.md

---
 .changeset/cool-nails-exist.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/cool-nails-exist.md

diff --git a/.changeset/cool-nails-exist.md b/.changeset/cool-nails-exist.md
new file mode 100644
index 000000000..647d2e27f
--- /dev/null
+++ b/.changeset/cool-nails-exist.md
@@ -0,0 +1,5 @@
+---
+"@livekit/components-react": minor
+---
+
+Add prepareConnection option to LiveKitRoom (enabled by default)