Remove LegacyCallHandler singleton (#34086)

* Remove dead code * Remove LegacyCallHandler singleton Route via SDKContext to cut import cycles * Remove unused setting * Fix tests * Fix tests * Cascade SDKContext through PersistedElement * Improve coverage * Iterate * Improve coverage * Improve coverage
2026-07-07 12:29:54 +00:00
parent 48bd69a8b6
commit 4ec8f1edcd
40 changed files with 639 additions and 348 deletions
@@ -6,12 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */

-import { type MatrixClient, type MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
 import { CallState } from "matrix-js-sdk/src/webrtc/call";

 import { stubClient } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import LegacyCallEventGrouper from "../../../../src/components/structures/LegacyCallEventGrouper";
+import { SDKContextClass } from "../../../../src/contexts/SDKContextClass.ts";

 const MY_USER_ID = "@me:here";
 const THEIR_USER_ID = "@they:here";
@@ -145,4 +146,83 @@ describe("LegacyCallEventGrouper", () => {

        expect(grouper.isVoice).toBe(false);
    });
+
+    it("should be able to answer call", () => {
+        const grouper = new LegacyCallEventGrouper();
+        grouper.add(
+            new MatrixEvent({
+                content: {
+                    call_id: "callId",
+                },
+                type: EventType.CallInvite,
+                sender: THEIR_USER_ID,
+                room_id: "!room:server",
+            }),
+        );
+
+        jest.spyOn(SDKContextClass.instance.legacyCallHandler, "answerCall");
+        grouper.answerCall();
+        expect(SDKContextClass.instance.legacyCallHandler.answerCall).toHaveBeenCalledWith("!room:server");
+    });
+
+    it("should be able to reject call", () => {
+        const grouper = new LegacyCallEventGrouper();
+        grouper.add(
+            new MatrixEvent({
+                content: {
+                    call_id: "callId",
+                },
+                type: EventType.CallInvite,
+                sender: THEIR_USER_ID,
+                room_id: "!room:server",
+            }),
+        );
+
+        jest.spyOn(SDKContextClass.instance.legacyCallHandler, "hangupOrReject");
+        grouper.rejectCall();
+        expect(SDKContextClass.instance.legacyCallHandler.hangupOrReject).toHaveBeenCalledWith("!room:server", true);
+    });
+
+    it("should be able to callback call", () => {
+        const grouper = new LegacyCallEventGrouper();
+        grouper.add(
+            new MatrixEvent({
+                content: {
+                    call_id: "callId",
+                },
+                type: EventType.CallHangup,
+                sender: THEIR_USER_ID,
+                room_id: "!room:server",
+            }),
+        );
+
+        jest.spyOn(SDKContextClass.instance.legacyCallHandler, "placeCall");
+        grouper.callBack();
+        expect(SDKContextClass.instance.legacyCallHandler.placeCall).toHaveBeenCalledWith("!room:server", "video");
+    });
+
+    it("should be able to toggle call silenced", () => {
+        const grouper = new LegacyCallEventGrouper();
+        grouper.add(
+            new MatrixEvent({
+                content: {
+                    call_id: "callId",
+                },
+                type: EventType.CallHangup,
+                sender: THEIR_USER_ID,
+                room_id: "!room:server",
+            }),
+        );
+
+        jest.spyOn(SDKContextClass.instance.legacyCallHandler, "unSilenceCall");
+        jest.spyOn(SDKContextClass.instance.legacyCallHandler, "silenceCall");
+
+        jest.spyOn(SDKContextClass.instance.legacyCallHandler, "isCallSilenced").mockReturnValue(false);
+        grouper.toggleSilenced();
+        expect(SDKContextClass.instance.legacyCallHandler.silenceCall).toHaveBeenCalledWith("callId");
+
+        jest.spyOn(SDKContextClass.instance.legacyCallHandler, "isCallSilenced").mockReturnValue(true);
+        grouper.toggleSilenced();
+        expect(SDKContextClass.instance.legacyCallHandler.unSilenceCall).toHaveBeenCalledWith("callId");
+    });
 });
@@ -46,7 +46,6 @@ import {
 } from "../../../test-utils";
 import * as leaveRoomUtils from "../../../../src/utils/leave-behaviour";
 import { OidcClientError } from "../../../../src/utils/oidc/error";
-import LegacyCallHandler from "../../../../src/LegacyCallHandler";
 import { CallStore } from "../../../../src/stores/CallStore";
 import { type Call } from "../../../../src/models/Call";
 import { PosthogAnalytics } from "../../../../src/PosthogAnalytics";
@@ -1109,7 +1108,7 @@ describe("<MatrixChat />", () => {

                beforeEach(() => {
                    // stub out various cleanup functions
-                    jest.spyOn(LegacyCallHandler.instance, "hangupAllCalls")
+                    jest.spyOn(SDKContextClass.instance.legacyCallHandler, "hangupAllCalls")
                        .mockClear()
                        .mockImplementation(() => {});
                    jest.spyOn(PosthogAnalytics.instance, "logout").mockImplementation(() => {});
@@ -1134,7 +1133,7 @@ describe("<MatrixChat />", () => {
                it("should hangup all legacy calls", async () => {
                    await getComponentAndWaitForReady();
                    await dispatchLogoutAndWait();
-                    expect(LegacyCallHandler.instance.hangupAllCalls).toHaveBeenCalled();
+                    expect(SDKContextClass.instance.legacyCallHandler.hangupAllCalls).toHaveBeenCalled();
                });

                it("should disconnect all calls", async () => {