Add participant sid when resume (#478)

livekit · Sep 6, 2024 · 9f2c180 · 9f2c180
1 parent 491a4e8
commit 9f2c180
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/Sources/LiveKit/Core/Room+Engine.swift b/Sources/LiveKit/Core/Room+Engine.swift
@@ -295,6 +295,7 @@ extension Room {
                                                                  token,
                                                                  connectOptions: _state.connectOptions,
                                                                  reconnectMode: _state.isReconnectingWithMode,
+                                                                 participantSid: localParticipant.sid,
                                                                  adaptiveStream: _state.roomOptions.adaptiveStream)
             try Task.checkCancellation()
 

diff --git a/Sources/LiveKit/Core/SignalClient.swift b/Sources/LiveKit/Core/SignalClient.swift
@@ -114,6 +114,7 @@ actor SignalClient: Loggable {
                  _ token: String,
                  connectOptions: ConnectOptions? = nil,
                  reconnectMode: ReconnectMode? = nil,
+                 participantSid: Participant.Sid? = nil,
                  adaptiveStream: Bool) async throws -> ConnectResponse
     {
         await cleanUp()
@@ -126,6 +127,7 @@ actor SignalClient: Loggable {
                                      token,
                                      connectOptions: connectOptions,
                                      reconnectMode: reconnectMode,
+                                     participantSid: participantSid,
                                      adaptiveStream: adaptiveStream)
 
         if reconnectMode != nil {
@@ -179,6 +181,7 @@ actor SignalClient: Loggable {
             let validateUrl = try Utils.buildUrl(url,
                                                  token,
                                                  connectOptions: connectOptions,
+                                                 participantSid: participantSid,
                                                  adaptiveStream: adaptiveStream,
                                                  validate: true)
 

diff --git a/Sources/LiveKit/Support/Utils.swift b/Sources/LiveKit/Support/Utils.swift
@@ -140,6 +140,7 @@ class Utils {
         _ token: String,
         connectOptions: ConnectOptions? = nil,
         reconnectMode: ReconnectMode? = nil,
+        participantSid: Participant.Sid? = nil,
         adaptiveStream: Bool,
         validate: Bool = false,
         forceSecure: Bool = false
@@ -198,7 +199,13 @@ class Utils {
         }
 
         // only for quick-reconnect
-        queryItems.append(URLQueryItem(name: "reconnect", value: reconnectMode == .quick ? "1" : "0"))
+        if reconnectMode == .quick {
+            queryItems.append(URLQueryItem(name: "reconnect", value: "1"))
+            if let sid = participantSid {
+                queryItems.append(URLQueryItem(name: "sid", value: sid.stringValue))
+            }
+        }
+
         queryItems.append(URLQueryItem(name: "auto_subscribe", value: connectOptions.autoSubscribe ? "1" : "0"))
         queryItems.append(URLQueryItem(name: "adaptive_stream", value: adaptiveStream ? "1" : "0"))