Merge branch 'livekit' into toger5/dont-trap-in-invalid-config

2026-01-13 18:01:30 +01:00
parent 582d1d8495 4b7dc8a290
commit 93c9225e8a
89 changed files with 3831 additions and 3811 deletions
--- a/src/settings/DeveloperSettingsTab.module.css
+++ b/src/settings/DeveloperSettingsTab.module.css
@@ -8,3 +8,14 @@ Please see LICENSE in the repository root for full details.
 pre {
  font-size: var(--font-size-micro);
 }
+
+.livekit_room_box {
+  border: 3px solid var(--cpd-color-bg-subtle-secondary);
+  border-radius: var(--cpd-space-8x);
+  padding: var(--cpd-space-4x);
+  margin-bottom: var(--cpd-space-4x);
+  margin-top: var(--cpd-space-4x);
+  li {
+    font-size: var(--font-size-micro);
+  }
+}
--- a/src/settings/DeveloperSettingsTab.test.tsx
+++ b/src/settings/DeveloperSettingsTab.test.tsx
@@ -12,7 +12,6 @@ import { TooltipProvider } from "@vector-im/compound-web";

 import type { MatrixClient } from "matrix-js-sdk";
 import type { Room as LivekitRoom } from "livekit-client";
-// import { DeveloperSettingsTab } from "./DeveloperSettingsTab";
 import { DeveloperSettingsTab } from "./DeveloperSettingsTab";
 import { getSFUConfigWithOpenID } from "../livekit/openIDSFU";
 import { customLivekitUrl as customLivekitUrlSetting } from "./settings";
@@ -42,6 +41,8 @@ function createMockLivekitRoom(
    serverInfo,
    metadata,
    engine: { client: { ws: { url: wsUrl } } },
+    localParticipant: { identity: "localParticipantIdentity" },
+    remoteParticipants: new Map(),
  } as unknown as LivekitRoom;

  return {
@@ -78,6 +79,8 @@ describe("DeveloperSettingsTab", () => {
      isLocal: false,
      url: "wss://remote-sfu.example.org",
      room: {
+        localParticipant: { identity: "localParticipantIdentity" },
+        remoteParticipants: new Map(),
        serverInfo: { region: "remote", version: "4.5.6" },
        metadata: "remote-metadata",
        engine: { client: { ws: { url: "wss://remote-sfu.example.org" } } },
--- a/src/settings/DeveloperSettingsTab.tsx
+++ b/src/settings/DeveloperSettingsTab.tsx
@@ -30,6 +30,7 @@ import {
  Label,
  RadioControl,
 } from "@vector-im/compound-web";
+import { type Room as LivekitRoom } from "livekit-client";

 import { FieldRow, InputField } from "../input/Input";
 import {
@@ -43,7 +44,6 @@ import {
  customLivekitUrl as customLivekitUrlSetting,
  MatrixRTCMode,
 } from "./settings";
-import type { Room as LivekitRoom } from "livekit-client";
 import styles from "./DeveloperSettingsTab.module.css";
 import { useUrlParams } from "../UrlParams";
 import { getSFUConfigWithOpenID } from "../livekit/openIDSFU";
@@ -301,8 +301,8 @@ export const DeveloperSettingsTab: FC<Props> = ({
          name={matrixRTCModeRadioGroup}
          control={
            <RadioControl
-              checked={matrixRTCMode === MatrixRTCMode.Compatibil}
-              value={MatrixRTCMode.Compatibil}
+              checked={matrixRTCMode === MatrixRTCMode.Compatibility}
+              value={MatrixRTCMode.Compatibility}
              onChange={onMatrixRTCModeChange}
            />
          }
@@ -330,12 +330,12 @@ export const DeveloperSettingsTab: FC<Props> = ({
        </InlineField>
      </Form>
      {livekitRooms?.map((livekitRoom) => (
-        <>
-          <h3>
+        <div className={styles.livekit_room_box}>
+          <h4>
            {t("developer_mode.livekit_sfu", {
              url: livekitRoom.url || "unknown",
            })}
-          </h3>
+          </h4>
          {livekitRoom.isLocal && <p>ws-url: {localSfuUrl?.href}</p>}
          <p>
            {t("developer_mode.livekit_server_info")}(
@@ -347,7 +347,19 @@ export const DeveloperSettingsTab: FC<Props> = ({
              : "undefined"}
            {livekitRoom.room.metadata}
          </pre>
-        </>
+          <p>Local Participant</p>
+          <pre className={styles.pre}>
+            {livekitRoom.room.localParticipant.identity}
+          </pre>
+          <p>Remote Participants</p>
+          <ul>
+            {Array.from(livekitRoom.room.remoteParticipants.keys()).map(
+              (id) => (
+                <li key={id}>{id}</li>
+              ),
+            )}
+          </ul>
+        </div>
      ))}
      <p>{t("developer_mode.environment_variables")}</p>
      <pre>{JSON.stringify(env, null, 2)}</pre>
--- a/src/settings/snapshots/DeveloperSettingsTab.test.tsx.snap
+++ b/src/settings/snapshots/DeveloperSettingsTab.test.tsx.snap
@@ -24,7 +24,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      class="field inputField"
    >
      <input
-        aria-describedby="«r1»"
+        aria-describedby="_r_1_"
        id="duplicateTiles"
        min="0"
        type="number"
@@ -44,7 +44,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      class="field checkboxField"
    >
      <input
-        aria-describedby="«r2»"
+        aria-describedby="_r_2_"
        id="debugTileLayout"
        type="checkbox"
      />
@@ -81,7 +81,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      class="field checkboxField"
    >
      <input
-        aria-describedby="«r3»"
+        aria-describedby="_r_3_"
        id="showConnectionStats"
        type="checkbox"
      />
@@ -118,7 +118,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      class="field checkboxField"
    >
      <input
-        aria-describedby="«r4»"
+        aria-describedby="_r_4_"
        id="muteAllAudio"
        type="checkbox"
      />
@@ -156,7 +156,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      class="field checkboxField"
    >
      <input
-        aria-describedby="«r5»"
+        aria-describedby="_r_5_"
        id="alwaysShowIphoneEarpiece"
        type="checkbox"
      />
@@ -195,7 +195,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
    >
      <label
        class="_label_19upo_59"
-        for="radix-«r6»"
+        for="radix-_r_6_"
      >
        Custom Livekit-url
      </label>
@@ -203,9 +203,9 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
        class="_controls_17lij_8"
      >
        <input
-          aria-describedby="radix-«r7»"
+          aria-describedby="radix-_r_7_"
          class="_control_sqdq4_10"
-          id="radix-«r6»"
+          id="radix-_r_6_"
          name="input"
          title=""
          value=""
@@ -213,7 +213,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      </div>
      <span
        class="_message_19upo_85 _help-message_19upo_91"
-        id="radix-«r7»"
+        id="radix-_r_7_"
      >
        Currently, no overwrite is set. Url from well-known or config is used.
      </span>
@@ -234,20 +234,20 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
        class="_inline-field-control_19upo_44"
      >
        <div
-          class="_container_1e0uz_10"
+          class="_container_1qhtc_10"
        >
          <input
-            aria-describedby="radix-«r9» radix-«rb» radix-«rd»"
+            aria-describedby="radix-_r_9_ radix-_r_b_ radix-_r_d_"
            checked=""
-            class="_input_1e0uz_18"
-            id="radix-«r8»"
-            name="«r0»"
+            class="_input_1qhtc_18"
+            id="radix-_r_8_"
+            name="_r_0_"
            title=""
            type="radio"
            value="legacy"
          />
          <div
-            class="_ui_1e0uz_19"
+            class="_ui_1qhtc_19"
          />
        </div>
      </div>
@@ -256,13 +256,13 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      >
        <label
          class="_label_19upo_59"
-          for="radix-«r8»"
+          for="radix-_r_8_"
        >
          Legacy: state events & oldest membership SFU
        </label>
        <span
          class="_message_19upo_85 _help-message_19upo_91"
-          id="radix-«r9»"
+          id="radix-_r_9_"
        >
          Compatible with old versions of EC that do not support multi SFU
        </span>
@@ -275,19 +275,19 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
        class="_inline-field-control_19upo_44"
      >
        <div
-          class="_container_1e0uz_10"
+          class="_container_1qhtc_10"
        >
          <input
-            aria-describedby="radix-«r9» radix-«rb» radix-«rd»"
-            class="_input_1e0uz_18"
-            id="radix-«ra»"
-            name="«r0»"
+            aria-describedby="radix-_r_9_ radix-_r_b_ radix-_r_d_"
+            class="_input_1qhtc_18"
+            id="radix-_r_a_"
+            name="_r_0_"
            title=""
            type="radio"
-            value="compatibil"
+            value="compatibility"
          />
          <div
-            class="_ui_1e0uz_19"
+            class="_ui_1qhtc_19"
          />
        </div>
      </div>
@@ -296,13 +296,13 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      >
        <label
          class="_label_19upo_59"
-          for="radix-«ra»"
+          for="radix-_r_a_"
        >
          Compatibility: state events & multi SFU
        </label>
        <span
          class="_message_19upo_85 _help-message_19upo_91"
-          id="radix-«rb»"
+          id="radix-_r_b_"
        >
          Compatible with homeservers that do not support sticky events (but all other EC clients are v0.17.0 or later)
        </span>
@@ -315,19 +315,19 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
        class="_inline-field-control_19upo_44"
      >
        <div
-          class="_container_1e0uz_10"
+          class="_container_1qhtc_10"
        >
          <input
-            aria-describedby="radix-«r9» radix-«rb» radix-«rd»"
-            class="_input_1e0uz_18"
-            id="radix-«rc»"
-            name="«r0»"
+            aria-describedby="radix-_r_9_ radix-_r_b_ radix-_r_d_"
+            class="_input_1qhtc_18"
+            id="radix-_r_c_"
+            name="_r_0_"
            title=""
            type="radio"
            value="matrix_2_0"
          />
          <div
-            class="_ui_1e0uz_19"
+            class="_ui_1qhtc_19"
          />
        </div>
      </div>
@@ -336,59 +336,91 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
      >
        <label
          class="_label_19upo_59"
-          for="radix-«rc»"
+          for="radix-_r_c_"
        >
          Matrix 2.0: sticky events & multi SFU
        </label>
        <span
          class="_message_19upo_85 _help-message_19upo_91"
-          id="radix-«rd»"
+          id="radix-_r_d_"
        >
          Compatible only with homservers supporting sticky events and all EC clients v0.17.0 or later
        </span>
      </div>
    </div>
  </form>
-  <h3>
-    LiveKit SFU: wss://local-sfu.example.org
-  </h3>
-  <p>
-    ws-url: 
-    wss://local-sfu.example.org/
-  </p>
-  <p>
-    LiveKit Server Info
-    (
-    local
-    )
-  </p>
-  <pre
-    class="pre"
+  <div
+    class="livekit_room_box"
  >
-    {
+    <h4>
+      LiveKit SFU: wss://local-sfu.example.org
+    </h4>
+    <p>
+      ws-url: 
+      wss://local-sfu.example.org/
+    </p>
+    <p>
+      LiveKit Server Info
+      (
+      local
+      )
+    </p>
+    <pre
+      class="pre"
+    >
+      {
  "region": "local",
  "version": "1.2.3"
 }
-    local-metadata
-  </pre>
-  <h3>
-    LiveKit SFU: wss://remote-sfu.example.org
-  </h3>
-  <p>
-    LiveKit Server Info
-    (
-    remote
-    )
-  </p>
-  <pre
-    class="pre"
+      local-metadata
+    </pre>
+    <p>
+      Local Participant
+    </p>
+    <pre
+      class="pre"
+    >
+      localParticipantIdentity
+    </pre>
+    <p>
+      Remote Participants
+    </p>
+    <ul />
+  </div>
+  <div
+    class="livekit_room_box"
  >
-    {
+    <h4>
+      LiveKit SFU: wss://remote-sfu.example.org
+    </h4>
+    <p>
+      LiveKit Server Info
+      (
+      remote
+      )
+    </p>
+    <pre
+      class="pre"
+    >
+      {
  "region": "remote",
  "version": "4.5.6"
 }
-    remote-metadata
-  </pre>
+      remote-metadata
+    </pre>
+    <p>
+      Local Participant
+    </p>
+    <pre
+      class="pre"
+    >
+      localParticipantIdentity
+    </pre>
+    <p>
+      Remote Participants
+    </p>
+    <ul />
+  </div>
  <p>
    Environment variables
  </p>
--- a/src/settings/settings.ts
+++ b/src/settings/settings.ts
@@ -131,7 +131,13 @@ export const alwaysShowIphoneEarpiece = new Setting<boolean>(

 export enum MatrixRTCMode {
  Legacy = "legacy",
-  Compatibil = "compatibil",
+  Compatibility = "compatibility",
+  /** This implies using
+   *  - sticky events
+   *  - hashed RTC backend identity
+   *  - the new endpoint for the jwt token on the local membership (remote memberships will always try the new jwt endpoint first -> then the legacy one)
+   *  - use the hashed identity for the local membership
+   */
  Matrix_2_0 = "matrix_2_0",
 }

--- a/src/settings/submit-rageshake.ts
+++ b/src/settings/submit-rageshake.ts
@@ -17,7 +17,6 @@ import { type CryptoApi } from "matrix-js-sdk/lib/crypto-api";
 import { getLogsForReport } from "./rageshake";
 import { useClient } from "../ClientContext";
 import { Config } from "../config/Config";
-import { ElementCallOpenTelemetry } from "../otel/otel";
 import { type RageshakeRequestModal } from "../room/RageshakeRequestModal";
 import { getUrlParams } from "../UrlParams";

@@ -274,14 +273,6 @@ export function useSubmitRageshake(
          for (const entry of logs) {
            body.append("compressed-log", await gzip(entry.lines), entry.id);
          }
-
-          body.append(
-            "file",
-            await gzip(
-              ElementCallOpenTelemetry.instance.rageshakeProcessor!.dump(),
-            ),
-            "traces.json.gz",
-          );
        }

        if (opts.rageshakeRequestId) {