remove onRTCSessionMemberUpdate

Signed-off-by: Timo K <[email protected]>

Author: toger5

spec/unit/matrixrtc/MatrixRTCSession.spec.ts

@@ -568,7 +568,7 @@ describe("MatrixRTCSession", () => {
             sess!.joinRoomSession([mockFocus], mockFocus, { notificationType: "ring" });
             await Promise.race([sentStateEvent, new Promise((resolve) => setTimeout(resolve, 5000))]);
             mockRoomState(mockRoom, [{ ...membershipTemplate, user_id: client.getUserId()! }]);
-            sess!.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
             const ownMembershipId = sess?.memberships[0].eventId;
 
             expect(client.sendEvent).toHaveBeenCalledWith(mockRoom!.roomId, EventType.RTCNotification, {
@@ -638,7 +638,7 @@ describe("MatrixRTCSession", () => {
                 },
             ]);
 
-            sess!.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
             const ownMembershipId = sess?.memberships[0].eventId;
             expect(sess!.getConsensusCallIntent()).toEqual("audio");
 
@@ -689,13 +689,13 @@ describe("MatrixRTCSession", () => {
         it("doesn't send a notification when joining an existing call", async () => {
             // Add another member to the call so that it is considered an existing call
             mockRoomState(mockRoom, [membershipTemplate]);
-            sess!.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
 
             // Simulate a join, including the update to the room state
             sess!.joinRoomSession([mockFocus], mockFocus, { notificationType: "ring" });
             await Promise.race([sentStateEvent, new Promise((resolve) => setTimeout(resolve, 5000))]);
             mockRoomState(mockRoom, [membershipTemplate, { ...membershipTemplate, user_id: client.getUserId()! }]);
-            sess!.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
 
             expect(client.sendEvent).not.toHaveBeenCalled();
         });
@@ -707,9 +707,9 @@ describe("MatrixRTCSession", () => {
             // But this time we want to simulate a race condition in which we receive a state event
             // from someone else, starting the call before our own state event has been sent
             mockRoomState(mockRoom, [membershipTemplate]);
-            sess!.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
             mockRoomState(mockRoom, [membershipTemplate, { ...membershipTemplate, user_id: client.getUserId()! }]);
-            sess!.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
 
             // We assume that the responsibility to send a notification, if any, lies with the other
             // participant that won the race
@@ -724,7 +724,7 @@ describe("MatrixRTCSession", () => {
 
             const onMembershipsChanged = jest.fn();
             sess.on(MatrixRTCSessionEvent.MembershipsChanged, onMembershipsChanged);
-            sess.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
 
             expect(onMembershipsChanged).not.toHaveBeenCalled();
         });
@@ -737,7 +737,7 @@ describe("MatrixRTCSession", () => {
             sess.on(MatrixRTCSessionEvent.MembershipsChanged, onMembershipsChanged);
 
             mockRoomState(mockRoom, []);
-            sess.onRTCSessionMemberUpdate();
+            (sess as any).recalculateSessionMembers();
 
             expect(onMembershipsChanged).toHaveBeenCalled();
         });
@@ -921,14 +921,14 @@ describe("MatrixRTCSession", () => {
 
                     // member2 leaves triggering key rotation
                     mockRoomState(mockRoom, [membershipTemplate]);
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
 
                     // member2 re-joins which should trigger an immediate re-send
                     const keysSentPromise2 = new Promise<EncryptionKeysEventContent>((resolve) => {
                         sendEventMock.mockImplementation((_roomId, _evType, payload) => resolve(payload));
                     });
                     mockRoomState(mockRoom, [membershipTemplate, member2]);
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
                     // but, that immediate resend is throttled so we need to wait a bit
                     jest.advanceTimersByTime(1000);
                     const { keys } = await keysSentPromise2;
@@ -979,7 +979,7 @@ describe("MatrixRTCSession", () => {
                     });
 
                     mockRoomState(mockRoom, [membershipTemplate, member2]);
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
 
                     await keysSentPromise2;
 
@@ -1026,7 +1026,7 @@ describe("MatrixRTCSession", () => {
                     sendEventMock.mockClear();
 
                     // these should be a no-op:
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
                     expect(sendEventMock).toHaveBeenCalledTimes(0);
                     expect(sess!.statistics.counters.roomEventEncryptionKeysSent).toEqual(1);
                 } finally {
@@ -1071,7 +1071,7 @@ describe("MatrixRTCSession", () => {
                     sendEventMock.mockClear();
 
                     // this should be a no-op:
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
                     expect(sendEventMock).toHaveBeenCalledTimes(0);
 
                     // advance time to avoid key throttling
@@ -1086,7 +1086,7 @@ describe("MatrixRTCSession", () => {
                     });
 
                     // this should re-send the key
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
 
                     await keysSentPromise2;
 
@@ -1144,7 +1144,7 @@ describe("MatrixRTCSession", () => {
                     });
 
                     mockRoomState(mockRoom, [membershipTemplate]);
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
 
                     jest.advanceTimersByTime(KEY_DELAY);
                     expect(sendKeySpy).toHaveBeenCalledTimes(1);
@@ -1211,7 +1211,7 @@ describe("MatrixRTCSession", () => {
                             mockRoomState(mockRoom, members.slice(0, membersToTest - i));
                         }
 
-                        sess!.onRTCSessionMemberUpdate();
+                        (sess as any).recalculateSessionMembers();
 
                         // advance time to avoid key throttling
                         jest.advanceTimersByTime(10000);
@@ -1250,7 +1250,7 @@ describe("MatrixRTCSession", () => {
                     });
 
                     mockRoomState(mockRoom, [membershipTemplate, member2]);
-                    sess.onRTCSessionMemberUpdate();
+                    (sess as any).recalculateSessionMembers();
 
                     await new Promise((resolve) => {
                         realSetTimeout(resolve);
@@ -1277,7 +1277,8 @@ describe("MatrixRTCSession", () => {
                         manageMediaKeys: true,
                         useExperimentalToDeviceTransport: true,
                     });
-                    sess.onRTCSessionMemberUpdate();
+
+                    (sess as any).recalculateSessionMembers();
 
                     await keySentPromise;
 

src/matrixrtc/MatrixRTCSession.ts

@@ -775,7 +775,7 @@ export class MatrixRTCSession extends TypedEventEmitter<
         }
 
         if (soonestExpiry != undefined) {
-            this.expiryTimeout = setTimeout(this.onRTCSessionMemberUpdate, soonestExpiry);
+            this.expiryTimeout = setTimeout(this.recalculateSessionMembers, soonestExpiry);
         }
     }
 
@@ -868,12 +868,12 @@ export class MatrixRTCSession extends TypedEventEmitter<
         this.recalculateSessionMembers();
     };
 
-    /**
-     * Call this when something changed that may impacts the current MatrixRTC members in this session.
-     */
-    public onRTCSessionMemberUpdate = (): void => {
-        this.recalculateSessionMembers();
-    };
+    // /**
+    //  * Call this when something changed that may impacts the current MatrixRTC members in this session.
+    //  */
+    // public onRTCSessionMemberUpdate = (): void => {
+    //     this.recalculateSessionMembers();
+    // };
 
     /**
      * Call this when anything that could impact rtc memberships has changed: Room Members or RTC members.