From 6dd348230fe466827aebd0d71f6e2ea16714a031 Mon Sep 17 00:00:00 2001 From: RoyceDa Date: Tue, 17 Mar 2026 15:02:57 +0200 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B4=D0=B8=D0=BD=D0=B0=D0=BC=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=B0=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D1=81=D0=B0=20=D1=82=D1=80=D0=B0=D0=BD=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D1=80=D1=82=D0=BD=D1=8B=D1=85=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=B2=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20=D1=81=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=B2?= =?UTF-8?q?=20g365sfu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/providers/CallProvider/CallProvider.tsx | 7 +---- .../protocol/packets/packet.ice.servers.ts | 27 ++++++++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/providers/CallProvider/CallProvider.tsx b/app/providers/CallProvider/CallProvider.tsx index d948a4a..9aeb389 100644 --- a/app/providers/CallProvider/CallProvider.tsx +++ b/app/providers/CallProvider/CallProvider.tsx @@ -92,12 +92,7 @@ export function CallProvider(props : CallProviderProps) { for(let i = 0; i < iceServers.length; i++){ let server = iceServers[i]; formattedIceServers.push({ - urls: "turn:" + server.urls + "?transport=udp", - username: server.username, - credential: server.credential - }); - formattedIceServers.push({ - urls: "turn:" + server.urls + "?transport=tcp", + urls: "turn:" + server.url + "?transport=" + server.transport, username: server.username, credential: server.credential }); diff --git a/app/providers/ProtocolProvider/protocol/packets/packet.ice.servers.ts b/app/providers/ProtocolProvider/protocol/packets/packet.ice.servers.ts index 69a598b..2a8bacd 100644 --- a/app/providers/ProtocolProvider/protocol/packets/packet.ice.servers.ts +++ b/app/providers/ProtocolProvider/protocol/packets/packet.ice.servers.ts @@ -1,8 +1,15 @@ import Packet from "../packet"; import Stream from "../stream"; +export interface G365IceServer { + url: string; + username: string; + credential: string; + transport: string; +} + export class PacketIceServers extends Packet { - private iceServers: RTCIceServer[] = []; + private iceServers: G365IceServer[] = []; public getPacketId(): number { return 28; @@ -12,13 +19,15 @@ export class PacketIceServers extends Packet { const serversCount = stream.readInt16(); this.iceServers = []; for(let i = 0; i < serversCount; i++){ - const urls = stream.readString(); + const url = stream.readString(); const username = stream.readString(); const credential = stream.readString(); + const transport = stream.readString(); this.iceServers.push({ - urls, + url, username, - credential + credential, + transport }); } } @@ -29,21 +38,19 @@ export class PacketIceServers extends Packet { stream.writeInt16(this.iceServers.length); for(let i = 0; i < this.iceServers.length; i++){ const server = this.iceServers[i]; - /** - * Не поддерживает массив urls!!! - */ - stream.writeString((server.urls as string)); + stream.writeString(server.url); stream.writeString(server.username || ""); stream.writeString(server.credential || ""); + stream.writeString(server.transport || ""); } return stream; } - public getIceServers(): RTCIceServer[] { + public getIceServers(): G365IceServer[] { return this.iceServers; } - public setIceServers(servers: RTCIceServer[]) { + public setIceServers(servers: G365IceServer[]) { this.iceServers = servers; }