Merge pull request #667 from vector-im/SimonBrandner/feat/ice-fallback

This commit is contained in:
Šimon Brandner 2022-10-26 17:52:44 +02:00 committed by GitHub
commit 66ecb7c4e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions

View File

@ -6,6 +6,7 @@
# Used for determining the homeserver to use for short urls etc.
# VITE_DEFAULT_HOMESERVER=http://localhost:8008
# VITE_FALLBACK_STUN_ALLOWED=false
# Used for submitting debug logs to an external rageshake server
# VITE_RAGESHAKE_SUBMIT_URL=http://localhost:9110/api/submit

View File

@ -34,6 +34,7 @@ import {
initClient,
defaultHomeserver,
CryptoStoreIntegrityError,
fallbackICEServerAllowed,
} from "./matrix-utils";
import { widget } from "./widget";
import { translatedError } from "./TranslatedError";
@ -130,6 +131,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
accessToken: access_token,
userId: user_id,
deviceId: device_id,
fallbackICEServerAllowed: fallbackICEServerAllowed,
},
true
),
@ -145,6 +147,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
accessToken: access_token,
userId: user_id,
deviceId: device_id,
fallbackICEServerAllowed: fallbackICEServerAllowed,
},
false // Don't need the crypto store just to log out
);

View File

@ -22,6 +22,8 @@ import { getUrlParams } from "./UrlParams";
export const defaultHomeserver =
(import.meta.env.VITE_DEFAULT_HOMESERVER as string) ??
`${window.location.protocol}//${window.location.host}`;
export const fallbackICEServerAllowed =
import.meta.env.VITE_FALLBACK_STUN_ALLOWED === "true";
export const defaultHomeserverHost = new URL(defaultHomeserver).host;
@ -146,6 +148,7 @@ export async function initClient(
// so we don't want API calls taking ages, we'd rather they just fail.
localTimeoutMs: 5000,
useE2eForGroupCall: e2eEnabled,
fallbackICEServerAllowed: fallbackICEServerAllowed,
});
try {