calling: add support for multiple ice server groups in GetIceServers

ts/services/calling.ts

@@ -88,7 +88,10 @@ import * as durations from '../util/durations';
 import { clearTimeoutIfNecessary } from '../util/clearTimeoutIfNecessary';
 import { fetchMembershipProof, getMembershipList } from '../groups';
 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 { normalizeGroupCallTimestamp } from '../util/ringrtc/normalizeGroupCallTimestamp';
 import {
@@ -3145,22 +3148,34 @@ export class CallingClass {
     function iceServerConfigToList(
       iceServerConfig: GetIceServersResultType
     ): Array<IceServer> {
+      function mapConfig(
+        iceServerGroup: GetIceServersResultType | IceServerGroupType
+      ): Array<IceServer> {
+        if (!iceServerGroup.username || !iceServerGroup.password) {
+          return [];
+        }
+
         return [
           {
-          hostname: iceServerConfig.hostname ?? '',
+            hostname: iceServerGroup.hostname ?? '',
-          username: iceServerConfig.username,
+            username: iceServerGroup.username,
-          password: iceServerConfig.password,
+            password: iceServerGroup.password,
-          urls: (iceServerConfig.urlsWithIps ?? []).slice(),
+            urls: (iceServerGroup.urlsWithIps ?? []).slice(),
           },
           {
             hostname: '',
-          username: iceServerConfig.username,
+            username: iceServerGroup.username,
-          password: iceServerConfig.password,
+            password: iceServerGroup.password,
-          urls: (iceServerConfig.urls ?? []).slice(),
+            urls: (iceServerGroup.urls ?? []).slice(),
           },
         ];
       }
 
+      return [iceServerConfig]
+        .concat(iceServerConfig.iceServers ?? [])
+        .flatMap(mapConfig);
+    }
+
     if (!window.textsecure.messaging) {
       log.error('handleStartCall: offline!');
       return false;

ts/textsecure/WebAPI.ts

@@ -861,6 +861,15 @@ export type GetAccountForUsernameResultType = z.infer<
 >;
 
 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;
   password: string;
   urls?: ReadonlyArray<string>;