Merge branch 'livekit' into valere/async_error_show_boundary

src/utils/displayname-integration.test.ts

@@ -0,0 +1,40 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE in the repository root for full details.
+*/
+
+import { afterEach, beforeAll, describe, expect, test, vi } from "vitest";
+
+import { shouldDisambiguate } from "./displayname";
+import { alice } from "./test-fixtures";
+import { mockMatrixRoom } from "./test";
+
+// Ideally these tests would be in ./displayname.test.ts but I can't figure out how to
+// just spy on the removeHiddenChars() function without impacting the other tests.
+// So, these tests are in this separate test file.
+vi.mock("matrix-js-sdk/src/utils");
+
+describe("shouldDisambiguate", () => {
+  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+  let jsUtils: typeof import("matrix-js-sdk/src/utils");
+
+  beforeAll(async () => {
+    jsUtils = await import("matrix-js-sdk/src/utils");
+    vi.spyOn(jsUtils, "removeHiddenChars").mockImplementation((str) => str);
+  });
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("should only call removeHiddenChars once for a single displayname", () => {
+    const room = mockMatrixRoom({});
+    shouldDisambiguate(alice, [], room);
+    expect(jsUtils.removeHiddenChars).toHaveBeenCalledTimes(1);
+    for (let i = 0; i < 10; i++) {
+      shouldDisambiguate(alice, [], room);
+    }
+    expect(jsUtils.removeHiddenChars).toHaveBeenCalledTimes(1);
+  });
+});

src/utils/displayname.ts

@@ -7,12 +7,36 @@ Please see LICENSE in the repository root for full details.
 
 import {
   removeDirectionOverrideChars,
-  removeHiddenChars,
+  removeHiddenChars as removeHiddenCharsUncached,
 } from "matrix-js-sdk/src/utils";
 
 import type { Room } from "matrix-js-sdk/src/matrix";
 import type { CallMembership } from "matrix-js-sdk/src/matrixrtc";
 
+// Calling removeHiddenChars() can be slow on Safari, so we cache the results.
+// To illustrate a simple benchmark:
+// Chrome: 10,000 calls took 2.599ms
+// Safari: 10,000 calls took 242ms
+// See: https://github.com/element-hq/element-call/issues/3065
+
+const removeHiddenCharsCache = new Map<string, string>();
+
+/**
+ * Calls removeHiddenCharsUncached and caches the result
+ */
+function removeHiddenChars(str: string): string {
+  if (removeHiddenCharsCache.has(str)) {
+    return removeHiddenCharsCache.get(str)!;
+  }
+  const result = removeHiddenCharsUncached(str);
+  // this is naive but should be good enough for our purposes
+  if (removeHiddenCharsCache.size > 500) {
+    removeHiddenCharsCache.clear();
+  }
+  removeHiddenCharsCache.set(str, result);
+  return result;
+}
+
 // Borrowed from https://github.com/matrix-org/matrix-js-sdk/blob/f10deb5ef2e8f061ff005af0476034382ea128ca/src/models/room-member.ts#L409
 export function shouldDisambiguate(
   member: { rawDisplayName?: string; userId: string },

src/utils/errors.ts

@@ -13,6 +13,7 @@ export enum ErrorCode {
    */
   MISSING_MATRIX_RTC_FOCUS = "MISSING_MATRIX_RTC_FOCUS",
   CONNECTION_LOST_ERROR = "CONNECTION_LOST_ERROR",
+  MEMBERSHIP_MANAGER_UNRECOVERABLE = "MEMBERSHIP_MANAGER_UNRECOVERABLE",
   /** LiveKit indicates that the server has hit its track limits */
   INSUFFICIENT_CAPACITY_ERROR = "INSUFFICIENT_CAPACITY_ERROR",
   E2EE_NOT_SUPPORTED = "E2EE_NOT_SUPPORTED",
@@ -24,6 +25,7 @@ export enum ErrorCategory {
   /** Calling is not supported, server misconfigured (JWT service missing, no MSC support ...)*/
   CONFIGURATION_ISSUE = "CONFIGURATION_ISSUE",
   NETWORK_CONNECTIVITY = "NETWORK_CONNECTIVITY",
+  RTC_SESSION_FAILURE = "RTC_SESSION_FAILURE",
   CLIENT_CONFIGURATION = "CLIENT_CONFIGURATION",
   UNKNOWN = "UNKNOWN",
   // SYSTEM_FAILURE / FEDERATION_FAILURE ..
@@ -82,6 +84,11 @@ export class ConnectionLostError extends ElementCallError {
   }
 }
 
+export class RTCSessionError extends ElementCallError {
+  public constructor(code: ErrorCode, message: string) {
+    super("RTCSession Error", code, ErrorCategory.RTC_SESSION_FAILURE, message);
+  }
+}
 export class E2EENotSupportedError extends ElementCallError {
   public constructor() {
     super(

src/utils/fetch.test.ts

@@ -0,0 +1,30 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE in the repository root for full details.
+*/
+
+import { expect, describe, it } from "vitest";
+
+import { isFailure } from "./fetch";
+
+describe("isFailure", () => {
+  it("returns false for a successful response", () => {
+    expect(isFailure({ ok: true, url: "https://foo.com" } as Response)).toBe(
+      false,
+    );
+  });
+
+  it("returns true for a failed response", () => {
+    expect(isFailure({ ok: false, url: "https://foo.com" } as Response)).toBe(
+      true,
+    );
+  });
+
+  it("returns false for a file:// URL with status 0", () => {
+    expect(
+      isFailure({ ok: false, url: "file://foo", status: 0 } as Response),
+    ).toBe(false);
+  });
+});

src/utils/fetch.ts

@@ -0,0 +1,25 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE in the repository root for full details.
+*/
+
+/**
+ * Check if a fetch response is a failure in a way that works with file:// URLs
+ * @param response the response to check
+ * @returns true if the response is a failure, false otherwise
+ */
+export function isFailure(response: Response): boolean {
+  // if response says it's okay, then it's not a failure
+  if (response.ok) {
+    return false;
+  }
+
+  // fetch will return status === 0 for a success on a file:// URL, so we special case it
+  if (response.url.startsWith("file:") && response.status === 0) {
+    return false;
+  }
+
+  return true;
+}

src/utils/matrix.ts

@@ -71,7 +71,7 @@ async function waitForSync(client: MatrixClient): Promise<void> {
  * otherwise rust crypto will throw since it is not ready to initialize a new session.
  * If another client is running make sure `.logout()` is called before executing this function.
  * @param clientOptions Object of options passed through to the client
- * @param restore If the rust crypto should be reset before the cient initialization or
+ * @param restore If the rust crypto should be reset before the client initialization or
  * if the initialization should try to restore the crypto state from the indexDB.
  * @returns The MatrixClient instance
  */
@@ -162,7 +162,6 @@ export async function initClient(
     );
   }
 
-  client.setGlobalErrorOnUnknownDevices(false);
   // Once startClient is called, syncs are run asynchronously.
   // Also, sync completion is communicated only via events.
   // So, apply the event listener *before* starting the client.