mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

calling: add support for multiple ice server groups in GetIceServers

Browse source 
Co-authored-by: adel-signal <adel@signal.org>
This commit is contained in:
automated-signal 2024-10-15 15:14:46 -05:00 committed by GitHub
parent 80d7b0bf29
commit 9da1685dba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
ts/services/calling.ts
View file

@ -88,7 +88,10 @@ import * as durations from '../util/durations';
import { clearTimeoutIfNecessary } from '../util/clearTimeoutIfNecessary'; import { clearTimeoutIfNecessary } from '../util/clearTimeoutIfNecessary';
import { fetchMembershipProof, getMembershipList } from '../groups'; import { fetchMembershipProof, getMembershipList } from '../groups';
import type { ProcessedEnvelope } from '../textsecure/Types.d'; import type { ProcessedEnvelope } from '../textsecure/Types.d';
import type { GetIceServersResultType } from '../textsecure/WebAPI'; import type {
GetIceServersResultType,
IceServerGroupType,
} from '../textsecure/WebAPI';
import { missingCaseError } from '../util/missingCaseError'; import { missingCaseError } from '../util/missingCaseError';
import { normalizeGroupCallTimestamp } from '../util/ringrtc/normalizeGroupCallTimestamp'; import { normalizeGroupCallTimestamp } from '../util/ringrtc/normalizeGroupCallTimestamp';
import { import {
@ -3144,20 +3147,32 @@ export class CallingClass {
function iceServerConfigToList( function iceServerConfigToList(
iceServerConfig: GetIceServersResultType iceServerConfig: GetIceServersResultType
): Array<IceServer> { ): Array<IceServer> {
return [ function mapConfig(
{ iceServerGroup: GetIceServersResultType | IceServerGroupType
hostname: iceServerConfig.hostname ?? '', ): Array<IceServer> {
username: iceServerConfig.username, if (!iceServerGroup.username || !iceServerGroup.password) {
password: iceServerConfig.password, return [];
urls: (iceServerConfig.urlsWithIps ?? []).slice(), }
},
{ return [
hostname: '', {
username: iceServerConfig.username, hostname: iceServerGroup.hostname ?? '',
password: iceServerConfig.password, username: iceServerGroup.username,
urls: (iceServerConfig.urls ?? []).slice(), password: iceServerGroup.password,
}, urls: (iceServerGroup.urlsWithIps ?? []).slice(),
]; },
{
hostname: '',
username: iceServerGroup.username,
password: iceServerGroup.password,
urls: (iceServerGroup.urls ?? []).slice(),
},
];
}
return [iceServerConfig]
.concat(iceServerConfig.iceServers ?? [])
.flatMap(mapConfig);
} }
if (!window.textsecure.messaging) { if (!window.textsecure.messaging) {

9
ts/textsecure/WebAPI.ts
View file

@ -857,6 +857,15 @@ export type GetAccountForUsernameResultType = z.infer<
>; >;
export type GetIceServersResultType = Readonly<{ export type GetIceServersResultType = Readonly<{
username?: string;
password?: string;
urls?: ReadonlyArray<string>;
urlsWithIps?: ReadonlyArray<string>;
hostname?: string;
iceServers?: ReadonlyArray<IceServerGroupType>;
}>;
export type IceServerGroupType = Readonly<{
username: string; username: string;
password: string; password: string;
urls?: ReadonlyArray<string>; urls?: ReadonlyArray<string>;