Skip to content
Merged
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
12 changes: 0 additions & 12 deletions packages/sdk/src/realtime/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,6 @@ export type PromptMessage = {
enhance_prompt: boolean;
};

export type TurnConfig = {
username: string;
credential: string;
server_url: string;
};

export type IceRestartMessage = {
type: "ice-restart";
turn_config?: TurnConfig;
};

export type PromptAckMessage = {
type: "prompt_ack";
prompt: string;
Expand Down Expand Up @@ -90,7 +79,6 @@ export type IncomingWebRTCMessage =
| OfferMessage
| AnswerMessage
| IceCandidateMessage
| IceRestartMessage
| PromptAckMessage
| ErrorMessage
| SetImageAckMessage
Expand Down
20 changes: 2 additions & 18 deletions packages/sdk/src/realtime/webrtc-connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import type {
PromptAckMessage,
SessionIdMessage,
SetImageAckMessage,
TurnConfig,
} from "./types";

const ICE_SERVERS: RTCIceServer[] = [{ urls: "stun:stun.l.google.com:19302" }];
Expand Down Expand Up @@ -285,13 +284,6 @@ export class WebRTCConnection {
});
}
break;
case "ice-restart": {
const turnConfig = msg.turn_config;
if (turnConfig) {
await this.setupNewPeerConnection(turnConfig);
}
break;
}
}
} catch (error) {
this.logger.error("Signaling handler error", { error: String(error) });
Expand Down Expand Up @@ -401,7 +393,7 @@ export class WebRTCConnection {
}
}

private async setupNewPeerConnection(turnConfig?: TurnConfig): Promise<void> {
Comment thread
cursor[bot] marked this conversation as resolved.
private async setupNewPeerConnection(): Promise<void> {
if (this.pc) {
this.pc.getSenders().forEach((sender) => {
if (sender.track && this.pc) {
Expand All @@ -410,15 +402,7 @@ export class WebRTCConnection {
});
this.pc.close();
}
const iceServers: RTCIceServer[] = [...ICE_SERVERS];
if (turnConfig) {
iceServers.push({
urls: turnConfig.server_url,
credential: turnConfig.credential,
username: turnConfig.username,
});
}
this.pc = new RTCPeerConnection({ iceServers });
this.pc = new RTCPeerConnection({ iceServers: ICE_SERVERS });
this.setState("connecting");

if (this.localStream) {
Expand Down
16 changes: 4 additions & 12 deletions packages/sdk/tests/unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ describe("WebRTCConnection", () => {
});

describe("setupNewPeerConnection", () => {
it("does not persist TURN servers between peer connection recreations", async () => {
it("uses only STUN servers for peer connections", async () => {
const { WebRTCConnection } = await import("../src/realtime/webrtc-connection.js");
const iceServerCounts: number[] = [];

Expand Down Expand Up @@ -1107,24 +1107,16 @@ describe("WebRTCConnection", () => {
const internalConnection = connection as unknown as {
handleSignalingMessage: (msg: unknown) => Promise<void>;
localStream: { getTracks: () => MediaStreamTrack[] };
setupNewPeerConnection: (turnConfig?: {
username: string;
credential: string;
server_url: string;
}) => Promise<void>;
setupNewPeerConnection: () => Promise<void>;
};

vi.spyOn(internalConnection, "handleSignalingMessage").mockResolvedValue(undefined);
internalConnection.localStream = { getTracks: () => [] };

await internalConnection.setupNewPeerConnection({
username: "user",
credential: "secret",
server_url: "turn:turn.example.com",
});
await internalConnection.setupNewPeerConnection();
await internalConnection.setupNewPeerConnection();

expect(iceServerCounts).toEqual([2, 1]);
expect(iceServerCounts).toEqual([1, 1]);
} finally {
vi.unstubAllGlobals();
}
Expand Down
Loading