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,20 +3148,32 @@ export class CallingClass {
     function iceServerConfigToList(
       iceServerConfig: GetIceServersResultType
     ): 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) {

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>;