Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/disable-ice-lite-connect-option.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'livekit-client': patch
---

Add `disableIceLite` connect option to request full ICE from a server running ICE lite.
68 changes: 68 additions & 0 deletions src/api/SignalClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,74 @@ describe('SignalClient.connect', () => {
ClientInfo_Capability.CAP_PACKET_TRAILER,
]);
});

it('does not request full ICE by default', async () => {
const joinResponse = createJoinResponse();
const signalResponse = createSignalResponse('join', joinResponse);
const mockReadable = createMockReadableStream([signalResponse]);
const mockConnection = createMockConnection(mockReadable);
let capturedUrl = '';

mockWebSocketStream({
connection: mockConnection,
onUrl: (url) => {
capturedUrl = url;
},
});

await signalClient.join('wss://test.livekit.io', 'test-token', defaultOptions);

const joinRequest = await decodeJoinRequestFromUrl(capturedUrl);
expect(joinRequest.connectionSettings?.disableIceLite).toBe(false);
});

it('requests full ICE in the join request when disableIceLite is set', async () => {
const joinResponse = createJoinResponse();
const signalResponse = createSignalResponse('join', joinResponse);
const mockReadable = createMockReadableStream([signalResponse]);
const mockConnection = createMockConnection(mockReadable);
let capturedUrl = '';

mockWebSocketStream({
connection: mockConnection,
onUrl: (url) => {
capturedUrl = url;
},
});

await signalClient.join('wss://test.livekit.io', 'test-token', {
...defaultOptions,
disableIceLite: true,
});

const joinRequest = await decodeJoinRequestFromUrl(capturedUrl);
expect(joinRequest.connectionSettings?.disableIceLite).toBe(true);
});

it('requests full ICE on the v0 path when disableIceLite is set', async () => {
const joinResponse = createJoinResponse();
const signalResponse = createSignalResponse('join', joinResponse);
const mockReadable = createMockReadableStream([signalResponse]);
const mockConnection = createMockConnection(mockReadable);
let capturedUrl = '';

mockWebSocketStream({
connection: mockConnection,
onUrl: (url) => {
capturedUrl = url;
},
});

await signalClient.join(
'wss://test.livekit.io',
'test-token',
{ ...defaultOptions, disableIceLite: true },
undefined,
true,
);

expect(new URL(capturedUrl).searchParams.get('disable_ice_lite')).toBe('1');
});
});

describe('Happy Path - Reconnect', () => {
Expand Down
6 changes: 6 additions & 0 deletions src/api/SignalClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ interface ConnectOpts extends SignalOptions {
export interface SignalOptions {
autoSubscribe: boolean;
adaptiveStream?: boolean;
disableIceLite?: boolean;
clientInfoCapabilities?: ClientInfo_Capability[];
maxRetries: number;
e2eeEnabled: boolean;
Expand Down Expand Up @@ -1394,6 +1395,10 @@ function createConnectionParams(
params.set('adaptive_stream', '1');
}

if (opts.disableIceLite) {
params.set('disable_ice_lite', '1');
}

if (opts.reconnectReason) {
params.set('reconnect_reason', opts.reconnectReason.toString());
}
Expand Down Expand Up @@ -1421,6 +1426,7 @@ async function createJoinRequestConnectionParams(
connectionSettings: new ConnectionSettings({
autoSubscribe: !!opts.autoSubscribe,
adaptiveStream: !!opts.adaptiveStream,
disableIceLite: !!opts.disableIceLite,
}),
reconnect: !!opts.reconnect,
participantSid: opts.sid ? opts.sid : undefined,
Expand Down
6 changes: 6 additions & 0 deletions src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ export interface InternalRoomConnectOptions {
*/
rtcConfig?: RTCConfiguration;

/**
* when the server runs ICE lite, asks it to use a full ICE agent for this participant.
* this is a server-side setting that the server may ignore, defaults to false
*/
disableIceLite?: boolean;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(with rtcConfig above being the exception) the way default values are handled within the SDK is to make the field in InternalRoomConnectOptions non optional and declare a default in defaults.ts.


/** specifies how often an initial join connection is allowed to retry (only applicable if server is not reachable) */
maxRetries: number;

Expand Down
1 change: 1 addition & 0 deletions src/room/Room.ts
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
autoSubscribe: connectOptions.autoSubscribe,
adaptiveStream:
typeof roomOptions.adaptiveStream === 'object' ? true : roomOptions.adaptiveStream,
disableIceLite: connectOptions.disableIceLite,
clientInfoCapabilities: this.getClientInfoCapabilities(roomOptions),
maxRetries: connectOptions.maxRetries,
e2eeEnabled: !!this.e2eeManager,
Expand Down
Loading