Remove legacy Safari/Firefox/IE compatibility aids (#29010)

* Remove legacy Safari prefix compatibility for AudioContext Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove more legacy webkit/ms/moz support Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage, cull dead code Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Simplify Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-05-13 11:51:05 +01:00
parent e235100dd0
commit c84cf3c36c
12 changed files with 109 additions and 124 deletions
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -82,19 +82,10 @@ declare global {
        mxMatrixClientPeg: IMatrixClientPeg;
        mxReactSdkConfig: DeepReadonly<IConfigOptions>;

-        // Needed for Safari, unknown to TypeScript
-        webkitAudioContext: typeof AudioContext;
-
        // https://docs.microsoft.com/en-us/previous-versions/hh772328(v=vs.85)
        // we only ever check for its existence, so we can ignore its actual type
        MSStream?: unknown;

-        // https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1029#issuecomment-869224737
-        // https://developer.mozilla.org/en-US/docs/Web/API/OffscreenCanvas
-        OffscreenCanvas?: {
-            new (width: number, height: number): OffscreenCanvas;
-        };
-
        mxContentMessages: ContentMessages;
        mxToastStore: ToastStore;
        mxDeviceListener: DeviceListener;
@@ -156,31 +147,10 @@ declare global {
        fetchWindowIcons?: boolean;
    }

-    interface Document {
-        // Safari & IE11 only have this prefixed: we used prefixed versions
-        // previously so let's continue to support them for now
-        webkitExitFullscreen(): Promise<void>;
-        msExitFullscreen(): Promise<void>;
-        readonly webkitFullscreenElement: Element | null;
-        readonly msFullscreenElement: Element | null;
-    }
-
-    interface Navigator {
-        userLanguage?: string;
-    }
-
    interface StorageEstimate {
        usageDetails?: { [key: string]: number };
    }

-    interface Element {
-        // Safari & IE11 only have this prefixed: we used prefixed versions
-        // previously so let's continue to support them for now
-        webkitRequestFullScreen(options?: FullscreenOptions): Promise<void>;
-        msRequestFullscreen(options?: FullscreenOptions): Promise<void>;
-        // scrollIntoView(arg?: boolean | _ScrollIntoViewOptions): void;
-    }
-
    // https://github.com/microsoft/TypeScript/issues/28308#issuecomment-650802278
    interface AudioWorkletProcessor {
        readonly port: MessagePort;
@@ -239,11 +209,4 @@ declare global {
    var mx_rage_store: IndexedDBLogStore;
 }

-// add method which is missing from the node typing
-declare module "url" {
-    interface Url {
-        format(): string;
-    }
-}
-
 /* eslint-enable @typescript-eslint/naming-convention */
--- a/src/audio/Playback.ts
+++ b/src/audio/Playback.ts
@@ -163,36 +163,21 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte
            this.element.src = URL.createObjectURL(new Blob([this.buf]));
            await deferred.promise; // make sure the audio element is ready for us
        } else {
-            // Safari compat: promise API not supported on this function
-            this.audioBuf = await new Promise((resolve, reject) => {
-                this.context.decodeAudioData(
-                    this.buf,
-                    (b) => resolve(b),
-                    async (e): Promise<void> => {
-                        try {
-                            // This error handler is largely for Safari as well, which doesn't support Opus/Ogg
-                            // very well.
-                            logger.error("Error decoding recording: ", e);
-                            logger.warn("Trying to re-encode to WAV instead...");
+            try {
+                this.audioBuf = await this.context.decodeAudioData(this.buf);
+            } catch (e) {
+                logger.error("Error decoding recording:", e);
+                logger.warn("Trying to re-encode to WAV instead...");

-                            const wav = await decodeOgg(this.buf);
-
-                            // noinspection ES6MissingAwait - not needed when using callbacks
-                            this.context.decodeAudioData(
-                                wav,
-                                (b) => resolve(b),
-                                (e) => {
-                                    logger.error("Still failed to decode recording: ", e);
-                                    reject(e);
-                                },
-                            );
-                        } catch (e) {
-                            logger.error("Caught decoding error:", e);
-                            reject(e);
-                        }
-                    },
-                );
-            });
+                try {
+                    // This error handler is largely for Safari, which doesn't support Opus/Ogg very well.
+                    const wav = await decodeOgg(this.buf);
+                    this.audioBuf = await this.context.decodeAudioData(wav);
+                } catch (e) {
+                    logger.error("Error decoding recording:", e);
+                    throw e;
+                }
+            }

            // Update the waveform to the real waveform once we have channel data to use. We don't
            // exactly trust the user-provided waveform to be accurate...
--- a/src/audio/compat.ts
+++ b/src/audio/compat.ts
@@ -15,21 +15,15 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { SAMPLE_RATE } from "./VoiceRecording";

 export function createAudioContext(opts?: AudioContextOptions): AudioContext {
-    let ctx: AudioContext;
    if (window.AudioContext) {
-        ctx = new AudioContext(opts);
-    } else if (window.webkitAudioContext) {
-        // While the linter is correct that "a constructor name should not start with
-        // a lowercase letter", it's also wrong to think that we have control over this.
-        // eslint-disable-next-line new-cap
-        ctx = new window.webkitAudioContext(opts);
+        const ctx = new AudioContext(opts);
+        // Initialize in suspended state, as Firefox starts using
+        // CPU/battery right away, even if we don't play any sound yet.
+        void ctx.suspend();
+        return ctx;
    } else {
        throw new Error("Unsupported browser");
    }
-    // Initialize in suspended state, as Firefox starts using
-    // CPU/battery right away, even if we don't play any sound yet.
-    void ctx.suspend();
-    return ctx;
 }

 export function decodeOgg(audioBuffer: ArrayBuffer): Promise<ArrayBuffer> {
--- a/src/components/views/elements/LanguageDropdown.tsx
+++ b/src/components/views/elements/LanguageDropdown.tsx
@@ -11,7 +11,6 @@ import React, { type ReactElement } from "react";
 import classNames from "classnames";

 import * as languageHandler from "../../../languageHandler";
-import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
 import Spinner from "./Spinner";
 import Dropdown from "./Dropdown";
@@ -29,7 +28,7 @@ function languageMatchesSearchQuery(query: string, language: Languages[0]): bool
 interface IProps {
    className?: string;
    onOptionChange: (language: string) => void;
-    value?: string;
+    value: string;
    disabled?: boolean;
 }

@@ -103,17 +102,6 @@ export default class LanguageDropdown extends React.Component<IProps, IState> {
            return <div key={language.value}>{language.labelInTargetLanguage}</div>;
        }) as NonEmptyArray<ReactElement & { key: string }>;

-        // default value here too, otherwise we need to handle null / undefined
-        // values between mounting and the initial value propagating
-        let language = SettingsStore.getValue("language", null, /*excludeDefault:*/ true);
-        let value: string | undefined;
-        if (language) {
-            value = this.props.value || language;
-        } else {
-            language = navigator.language || navigator.userLanguage;
-            value = this.props.value || language;
-        }
-
        return (
            <Dropdown
                id="mx_LanguageDropdown"
@@ -121,7 +109,7 @@ export default class LanguageDropdown extends React.Component<IProps, IState> {
                onOptionChange={this.props.onOptionChange}
                onSearchChange={this.onSearchChange}
                searchEnabled={true}
-                value={value}
+                value={this.props.value}
                label={_t("language_dropdown_label")}
                disabled={this.props.disabled}
            >
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -10,7 +10,6 @@ import React, { type ReactElement } from "react";

 import Dropdown from "../../views/elements/Dropdown";
 import PlatformPeg from "../../../PlatformPeg";
-import SettingsStore from "../../../settings/SettingsStore";
 import { _t, getUserLanguage } from "../../../languageHandler";
 import Spinner from "./Spinner";
 import { type NonEmptyArray } from "../../../@types/common";
@@ -105,17 +104,6 @@ export default class SpellCheckLanguagesDropdown extends React.Component<
            return <div key={language.value}>{language.label}</div>;
        }) as NonEmptyArray<ReactElement & { key: string }>;

-        // default value here too, otherwise we need to handle null / undefined;
-        // values between mounting and the initial value propagating
-        let language = SettingsStore.getValue("language", null, /*excludeDefault:*/ true);
-        let value: string | undefined;
-        if (language) {
-            value = this.props.value || language;
-        } else {
-            language = navigator.language || navigator.userLanguage;
-            value = this.props.value || language;
-        }
-
        return (
            <Dropdown
                id="mx_LanguageDropdown"
@@ -123,7 +111,7 @@ export default class SpellCheckLanguagesDropdown extends React.Component<
                onOptionChange={this.props.onOptionChange}
                onSearchChange={this.onSearchChange}
                searchEnabled={true}
-                value={value}
+                value={this.props.value}
                label={_t("language_dropdown_label")}
                placeholder={_t("settings|general|spell_check_locale_placeholder")}
            >
--- a/src/components/views/voip/LegacyCallView.tsx
+++ b/src/components/views/voip/LegacyCallView.tsx
@@ -66,26 +66,15 @@ interface IState {
 }

 function getFullScreenElement(): Element | null {
-    return (
-        document.fullscreenElement ||
-        // moz omitted because firefox supports this unprefixed now (webkit here for safari)
-        document.webkitFullscreenElement ||
-        document.msFullscreenElement
-    );
+    return document.fullscreenElement;
 }

 function requestFullscreen(element: Element): void {
-    const method =
-        element.requestFullscreen ||
-        // moz omitted since firefox supports unprefixed now
-        element.webkitRequestFullScreen ||
-        element.msRequestFullscreen;
-    if (method) method.call(element);
+    element.requestFullscreen();
 }

 function exitFullscreen(): void {
-    const exitMethod = document.exitFullscreen || document.webkitExitFullscreen || document.msExitFullscreen;
-    if (exitMethod) exitMethod.call(document);
+    document.exitFullscreen();
 }

 export default class LegacyCallView extends React.Component<IProps, IState> {
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -529,8 +529,7 @@ export async function getAllLanguagesWithLabels(): Promise<Language[]> {

 export function getLanguagesFromBrowser(): readonly string[] {
    if (navigator.languages && navigator.languages.length) return navigator.languages;
-    if (navigator.language) return [navigator.language];
-    return [navigator.userLanguage || "en"];
+    return [navigator.language ?? "en"];
 }

 export function getLanguageFromBrowser(): string {