Merge branch 'valere/widget_rtc_transport_action' into valere/rtc/remove_well_known_fallback

src/UrlParams.test.ts

@@ -16,12 +16,15 @@ import {
   HeaderStyle,
   getUrlParams,
 } from "../src/UrlParams";
+import { mockConfig } from "./utils/test";
 
 const ROOM_NAME = "roomNameHere";
 const ROOM_ID = "!d45f138fsd";
 const ORIGIN = "https://call.element.io";
 const HOMESERVER = "localhost";
 
+mockConfig();
+
 describe("UrlParams", () => {
   describe("handles URL with /room/", () => {
     it("and nothing else", () => {

src/config/ConfigOptions.ts

@@ -183,12 +183,6 @@ export interface ConfigOptions {
 // Overrides members from ConfigOptions that are always provided by the
 // default config and are therefore non-optional.
 export interface ResolvedConfigOptions extends ConfigOptions {
-  default_server_config: {
-    ["m.homeserver"]: {
-      base_url: string;
-      server_name: string;
-    };
-  };
   sync_disconnect_grace_period_ms: number;
   ssla: string;
   matrix_rtc_session: {
@@ -202,12 +196,6 @@ export interface ResolvedConfigOptions extends ConfigOptions {
 }
 
 export const DEFAULT_CONFIG: ResolvedConfigOptions = {
-  default_server_config: {
-    ["m.homeserver"]: {
-      base_url: "http://localhost:8008",
-      server_name: "localhost",
-    },
-  },
   features: {
     feature_use_device_session_member_events: true,
   },

src/index.css

@@ -15,8 +15,7 @@ Please see LICENSE in the repository root for full details.
 @import url("@fontsource/inconsolata/700.css");
 
 @import url("normalize.css/normalize.css") layer(normalize);
-@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css")
-layer(compound);
+@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
 @import url("@vector-im/compound-web/dist/style.css") layer(compound.components);
 
 :root {

src/livekit/MatrixAudioRenderer.test.tsx

@@ -99,7 +99,7 @@ function renderTestComponent(
     ),
   } as unknown as Room;
 
-  if (explicitTracks?.length ?? 0 > 0) {
+  if ((explicitTracks?.length ?? 0) > 0) {
     tracks = explicitTracks!.map(({ participantId, source, kind }) => {
       const participant =
         liveKitParticipants.find((p) => p.identity === participantId) ??

src/state/CallViewModel/localMember/LocalTransport.test.ts

@@ -421,42 +421,6 @@ describe("LocalTransport", () => {
       });
     });
 
-    it("Should not call _unstable_getRTCTransports in widget mode but use well-known", async () => {
-      mockConfig({
-        livekit: { livekit_service_url: "https://do-not-use.lk.example.org" },
-      });
-
-      localTransportOpts.client.getDomain.mockReturnValue("example.org");
-
-      fetchMock.getOnce("https://example.org/.well-known/matrix/client", {
-        "org.matrix.msc4143.rtc_foci": [
-          {
-            type: "livekit",
-            livekit_service_url: "https://use-me.jwt.call.example.org",
-          },
-        ],
-      });
-
-      localTransportOpts.client.getAccessToken.mockReturnValue(null);
-      const { advertised$, active$ } =
-        createLocalTransport$(localTransportOpts);
-      openIdResolver.resolve?.(openIdResponse);
-      expect(advertised$.value).toBe(null);
-      expect(active$.value).toBe(null);
-      await flushPromises();
-
-      expect(
-        localTransportOpts.client._unstable_getRTCTransports,
-      ).not.toHaveBeenCalled();
-
-      const expectedTransport = {
-        type: "livekit",
-        livekit_service_url: "https://use-me.jwt.call.example.org",
-      };
-
-      expect(advertised$.value).toStrictEqual(expectedTransport);
-    });
-
     it("fails fast if the openID request fails for backend config", async () => {
       localTransportOpts.client._unstable_getRTCTransports.mockResolvedValue([
         { type: "livekit", livekit_service_url: "https://lk.example.org" },

src/state/CallViewModel/localMember/RtcTransportAutoDiscovery.test.ts

@@ -81,14 +81,12 @@ describe("RtcTransportAutoDiscovery", () => {
         logger: rootLogger,
       });
 
-
-      const discoveredTransport = await  discovery.discoverPreferredTransport();
+      const discoveredTransport = await discovery.discoverPreferredTransport();
 
       expect(discoveredTransport).toStrictEqual(backendTransport);
       expect(discoveredTransport).not.toStrictEqual(configTransport);
 
       expect(client._unstable_getRTCTransports).toHaveBeenCalledTimes(1);
-
     },
   );
 
@@ -107,7 +105,6 @@ describe("RtcTransportAutoDiscovery", () => {
       )
       .mockResolvedValue([backendTransport]);
 
-
     const discovery = new RtcTransportAutoDiscovery({
       client,
       resolvedConfig: makeResolvedConfig("https://config.example.org"),
@@ -140,7 +137,6 @@ describe("RtcTransportAutoDiscovery", () => {
       const discoveredTransport = await discovery.discoverPreferredTransport();
       expect(discoveredTransport).not.toStrictEqual(backendTransport);
       expect(discoveredTransport).toStrictEqual(configTransport);
-
     },
   );
 
@@ -148,7 +144,6 @@ describe("RtcTransportAutoDiscovery", () => {
     const client = makeClient();
     client._unstable_getRTCTransports.mockResolvedValue([]);
 
-
     const discovery = new RtcTransportAutoDiscovery({
       client,
       resolvedConfig: makeResolvedConfig(undefined),

src/state/CallViewModel/localMember/RtcTransportAutoDiscovery.ts

@@ -73,7 +73,7 @@ export class RtcTransportAutoDiscovery {
     this.logger.info("First try to use getRTCTransports end point ...");
     try {
       const transportList = await doNetworkOperationWithRetry(async () =>
-        client._unstable_getRTCTransports()
+        client._unstable_getRTCTransports(),
       );
       const first = transportList.find(isLivekitTransportConfig);
       if (first) {
@@ -81,7 +81,7 @@ export class RtcTransportAutoDiscovery {
       } else {
         this.logger.info(
           `No livekit transport found in getRTCTransports end point`,
-          transportList
+          transportList,
         );
       }
     } catch (ex) {

src/tile/MediaView.module.css

@@ -33,6 +33,9 @@ Please see LICENSE in the repository root for full details.
 
 .media.mirror video {
   transform: scaleX(-1);
+  /* In FF if you add a transform: scale/translate/matrix filter on an element,
+  it'll ignore the parents' border-radius, so force back the radius to avoid UI glitch*/
+  border-radius: inherit;
 }
 
 .media[data-video-fit="cover"] video {

src/tile/SpotlightTile.test.tsx

@@ -32,6 +32,7 @@ import {
 global.IntersectionObserver = class MockIntersectionObserver {
   public observe(): void {}
   public unobserve(): void {}
+  public disconnect(): void {}
 } as unknown as typeof IntersectionObserver;
 
 test("SpotlightTile is accessible", async () => {

src/useEvents.test.tsx

@@ -28,6 +28,10 @@ test("useTypedEventEmitterState reacts to events", async () => {
   const emitter = new TestEmitter();
 
   const Test: FC = () => {
+    // Disable the React Compiler to work around the following bug:
+    // https://github.com/react/react/issues/34901
+    "use no memo";
+
     const value = useTypedEventEmitterState(
       emitter,
       "change",
@@ -51,6 +55,10 @@ test("useTypedEventEmitterState reacts to changes made by an effect mounted on t
   const emitter = new TestEmitter();
 
   const Test: FC = () => {
+    // Disable the React Compiler to work around the following bug:
+    // https://github.com/react/react/issues/34901
+    "use no memo";
+
     useEffect(() => emitter.setState(2), []);
     const value = useTypedEventEmitterState(
       emitter,
@@ -69,6 +77,10 @@ test("useTypedEventEmitterState reacts to changes in getState", async () => {
   const emitter = new TestEmitter();
 
   const Test: FC = () => {
+    // Disable the React Compiler to work around the following bug:
+    // https://github.com/react/react/issues/34901
+    "use no memo";
+
     const [fn, setFn] = useState(() => emitter.getState);
     const value = useTypedEventEmitterState(emitter, "change", fn);
     return (

src/utils/test.ts

@@ -439,6 +439,12 @@ export function mockConfig(
   const spy = vi.spyOn(Config, "get").mockReturnValue({
     ...DEFAULT_CONFIG,
     ...config,
+    default_server_config: {
+      ["m.homeserver"]: {
+        base_url: "http://localhost:8008",
+        server_name: "localhost",
+      },
+    },
   });
   // simulate loading the config
   vi.spyOn(Config, "init").mockResolvedValue(void 0);