Revert "[WIP] SDK target improvements"

src/livekit/openIDSFU.ts

@@ -146,7 +146,7 @@ export async function getSFUConfigWithOpenID(
       } else {
         logger?.warn(
           `Failed fetching jwt with matrix 2.0 endpoint other issues ->`,
-          `(not going to try with legacy endpoint if forceMatrix2Jwt is set to false (it is ${forceMatrix2Jwt}), we did not get a not supported error from the sfu)`,
+          `(not going to try with legacy endpoint: forceOldJwtEndpoint is set to false, we did not get a not supported error from the sfu)`,
           e,
         );
         // Make this throw a hard error in case we force the matrix2.0 endpoint.

src/widget.test.ts

@@ -6,11 +6,12 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { beforeAll, describe, expect, vi, it } from "vitest";
-import { createRoomWidgetClient } from "matrix-js-sdk";
+import { createRoomWidgetClient, EventType } from "matrix-js-sdk";
 
 import { getUrlParams } from "./UrlParams";
 import { initializeWidget, widget } from "./widget";
 import { Config } from "./config/Config";
+import { ElementCallReactionEventType } from "./reactions";
 
 vi.mock("matrix-js-sdk", { spy: true });
 const createRoomWidgetClientSpy = vi.mocked(createRoomWidgetClient);
@@ -34,7 +35,7 @@ vi.mock("./UrlParams", () => ({
   })),
 }));
 
-initializeWidget("ANYRTCAPP");
+initializeWidget();
 describe("widget", () => {
   beforeAll(() => {});
 
@@ -51,39 +52,48 @@ describe("widget", () => {
     expect(widget).toBeDefined();
     expect(configInitSpy).toHaveBeenCalled();
     const sendEvent = [
-      "org.matrix.msc4075.call.notify", // Sent as a deprecated fallback
-      "org.matrix.msc4075.rtc.notification",
+      EventType.CallNotify, // Sent as a deprecated fallback
+      EventType.RTCNotification,
     ];
     const sendRecvEvent = [
       "org.matrix.rageshake_request",
-      "io.element.call.encryption_keys",
-      "m.reaction",
-      "m.room.redaction",
-      "io.element.call.reaction",
-      "org.matrix.msc4310.rtc.decline",
-      "org.matrix.msc4143.rtc.member",
+      EventType.CallEncryptionKeysPrefix,
+      EventType.Reaction,
+      EventType.RoomRedaction,
+      ElementCallReactionEventType,
+      EventType.RTCDecline,
+      EventType.RTCMembership,
     ];
 
     const sendState = [
-      { eventType: "org.matrix.msc3401.call.member", stateKey: "myYser" }, // Legacy call membership events
-      {
-        eventType: "org.matrix.msc3401.call.member",
-        stateKey: `_myYser_AAAAA_ANYRTCAPP`,
-      }, // Session membership events
-      {
-        eventType: "org.matrix.msc3401.call.member",
-        stateKey: `myYser_AAAAA_ANYRTCAPP`,
-      }, // The above with no leading underscore, for room versions whose auth rules allow it
-    ];
+      "myYser", // Legacy call membership events
+      `_myYser_AAAAA_m.call`, // Session membership events
+      `myYser_AAAAA_m.call`, // The above with no leading underscore, for room versions whose auth rules allow it
+    ].map((stateKey) => ({
+      eventType: EventType.GroupCallMemberPrefix,
+      stateKey,
+    }));
     const receiveState = [
-      { eventType: "m.room.create" },
-      { eventType: "m.room.name" },
-      { eventType: "m.room.member" },
-      { eventType: "m.room.encryption" },
-      { eventType: "org.matrix.msc3401.call.member" },
+      { eventType: EventType.RoomCreate },
+      { eventType: EventType.RoomName },
+      { eventType: EventType.RoomMember },
+      { eventType: EventType.RoomEncryption },
+      { eventType: EventType.GroupCallMemberPrefix },
     ];
 
-    const sendRecvToDevice = ["io.element.call.encryption_keys"];
+    const sendRecvToDevice = [
+      EventType.CallInvite,
+      EventType.CallCandidates,
+      EventType.CallAnswer,
+      EventType.CallHangup,
+      EventType.CallReject,
+      EventType.CallSelectAnswer,
+      EventType.CallNegotiate,
+      EventType.CallSDPStreamMetadataChanged,
+      EventType.CallSDPStreamMetadataChangedPrefix,
+      EventType.CallReplaces,
+      EventType.CallEncryptionKeysPrefix,
+    ];
 
     expect(createRoomWidgetClientSpy.mock.calls[0][1]).toStrictEqual({
       sendEvent: [...sendEvent, ...sendRecvEvent],

src/widget.ts

@@ -68,10 +68,7 @@ export let widget: WidgetHelpers | null;
  */
 // this needs to be a seperate call and cannot be done on import to allow us to spy on methods in here before
 // execution.
-export const initializeWidget = (
-  rtcApplication: string = "m.call",
-  sendRoomEvents = false,
-): void => {
+export const initializeWidget = (): void => {
   try {
     const {
       widgetId,
@@ -119,9 +116,6 @@ export const initializeWidget = (
         EventType.CallNotify, // Sent as a deprecated fallback
         EventType.RTCNotification,
       ];
-      if (sendRoomEvents) {
-        sendEvent.push(EventType.RoomMessage);
-      }
       const sendRecvEvent = [
         "org.matrix.rageshake_request",
         EventType.CallEncryptionKeysPrefix,
@@ -134,8 +128,8 @@ export const initializeWidget = (
 
       const sendState = [
         userId, // Legacy call membership events
-        `_${userId}_${deviceId}_${rtcApplication}`, // Session membership events
-        `${userId}_${deviceId}_${rtcApplication}`, // The above with no leading underscore, for room versions whose auth rules allow it
+        `_${userId}_${deviceId}_m.call`, // Session membership events
+        `${userId}_${deviceId}_m.call`, // The above with no leading underscore, for room versions whose auth rules allow it
       ].map((stateKey) => ({
         eventType: EventType.GroupCallMemberPrefix,
         stateKey,
@@ -148,7 +142,19 @@ export const initializeWidget = (
         { eventType: EventType.GroupCallMemberPrefix },
       ];
 
-      const sendRecvToDevice = [EventType.CallEncryptionKeysPrefix];
+      const sendRecvToDevice = [
+        EventType.CallInvite,
+        EventType.CallCandidates,
+        EventType.CallAnswer,
+        EventType.CallHangup,
+        EventType.CallReject,
+        EventType.CallSelectAnswer,
+        EventType.CallNegotiate,
+        EventType.CallSDPStreamMetadataChanged,
+        EventType.CallSDPStreamMetadataChangedPrefix,
+        EventType.CallReplaces,
+        EventType.CallEncryptionKeysPrefix,
+      ];
 
       const client = createRoomWidgetClient(
         api,