From 279b3604c36b01a5a69b617903678f9ffb1f2cdb Mon Sep 17 00:00:00 2001
From: David Zhao <dz@livekit.io>
Date: Sun, 23 Apr 2023 23:10:00 -0700
Subject: [PATCH] Add back ServerRegion and ServerVersion (#1650)

clients are still dependent on them
---
 pkg/rtc/room.go      | 8 +++++---
 pkg/rtc/room_test.go | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkg/rtc/room.go b/pkg/rtc/room.go
index 5a58ebe3c..7c789cba4 100644
--- a/pkg/rtc/room.go
+++ b/pkg/rtc/room.go
@@ -761,9 +761,11 @@ func (r *Room) createJoinResponseLocked(participant types.LocalParticipant, iceS
 		SubscriberPrimary:   participant.SubscriberAsPrimary(),
 		ClientConfiguration: participant.GetClientConfiguration(),
 		// sane defaults for ping interval & timeout
-		PingInterval: 10,
-		PingTimeout:  20,
-		ServerInfo:   r.serverInfo,
+		PingInterval:  10,
+		PingTimeout:   20,
+		ServerInfo:    r.serverInfo,
+		ServerVersion: r.serverInfo.Version,
+		ServerRegion:  r.serverInfo.Region,
 	}
 }
 
diff --git a/pkg/rtc/room_test.go b/pkg/rtc/room_test.go
index f95fb5e2c..80987785a 100644
--- a/pkg/rtc/room_test.go
+++ b/pkg/rtc/room_test.go
@@ -678,8 +678,8 @@ func TestRoomUpdate(t *testing.T) {
 
 		// p1 should have received an update
 		time.Sleep(2 * defaultDelay)
-		require.Equal(t, 1, p1.SendRoomUpdateCallCount())
-		require.EqualValues(t, 2, p1.SendRoomUpdateArgsForCall(0).NumParticipants)
+		require.GreaterOrEqual(t, p1.SendRoomUpdateCallCount(), 1)
+		require.EqualValues(t, 2, p1.SendRoomUpdateArgsForCall(p1.SendRoomUpdateCallCount()-1).NumParticipants)
 	})
 
 	t.Run("participants should receive metadata update", func(t *testing.T) {