fixup! emitting outbound key before anyone registered

Author: BillCarsonFr

spec/unit/matrixrtc/MatrixRTCSession.spec.ts

@@ -1013,6 +1013,7 @@ describe("MatrixRTCSession", () => {
                         useNewMembershipManager: true,
                         useExperimentalToDeviceTransport: true,
                     });
+                    sess.onRTCSessionMemberUpdate();
 
                     await keySentPromise;
 

spec/unit/matrixrtc/RTCEncrytionManager.spec.ts

@@ -77,7 +77,9 @@ describe("RTCEncryptionManager", () => {
             getMembershipMock.mockReturnValue([]);
 
             encryptionManager.join(undefined);
-
+            // After join it is too early, key might be lost as no one is listening yet
+            expect(onEncryptionKeysChanged).not.toHaveBeenCalled();
+            encryptionManager.onMembershipsUpdate([]);
             // The key should have been rolled out immediately
             expect(onEncryptionKeysChanged).toHaveBeenCalled();
         });
@@ -91,6 +93,7 @@ describe("RTCEncryptionManager", () => {
             getMembershipMock.mockReturnValue(members);
 
             encryptionManager.join(undefined);
+            encryptionManager.onMembershipsUpdate([]);
 
             expect(mockTransport.sendKey).toHaveBeenCalledTimes(1);
             expect(mockTransport.sendKey).toHaveBeenCalledWith(
@@ -114,6 +117,7 @@ describe("RTCEncryptionManager", () => {
             getMembershipMock.mockReturnValue(members);
 
             encryptionManager.join(undefined);
+            encryptionManager.onMembershipsUpdate([]);
 
             expect(mockTransport.sendKey).toHaveBeenCalledTimes(1);
             expect(mockTransport.sendKey).toHaveBeenCalledWith(
@@ -169,6 +173,7 @@ describe("RTCEncryptionManager", () => {
 
             // initial rollout
             encryptionManager.join(undefined);
+            encryptionManager.onMembershipsUpdate([]);
             await jest.runOnlyPendingTimersAsync();
 
             expect(mockTransport.sendKey).toHaveBeenCalledTimes(1);
@@ -217,6 +222,7 @@ describe("RTCEncryptionManager", () => {
 
             // initial rollout
             encryptionManager.join(undefined);
+            encryptionManager.onMembershipsUpdate([]);
             await jest.runOnlyPendingTimersAsync();
 
             expect(mockTransport.sendKey).toHaveBeenCalledTimes(1);
@@ -246,6 +252,7 @@ describe("RTCEncryptionManager", () => {
             getMembershipMock.mockReturnValue(members);
 
             encryptionManager.join(undefined);
+            encryptionManager.onMembershipsUpdate([]);
             await jest.advanceTimersByTimeAsync(10);
 
             expect(mockTransport.sendKey).toHaveBeenCalledTimes(1);
@@ -324,6 +331,7 @@ describe("RTCEncryptionManager", () => {
             getMembershipMock.mockReturnValue(members);
 
             encryptionManager.join(undefined);
+            encryptionManager.onMembershipsUpdate([]);
             await jest.advanceTimersByTimeAsync(10);
 
             mockTransport.emit(
@@ -431,6 +439,7 @@ describe("RTCEncryptionManager", () => {
 
         // Let's join
         encryptionManager.join(undefined);
+        encryptionManager.onMembershipsUpdate([]);
         await jest.advanceTimersByTimeAsync(10);
 
         // The initial rollout

src/matrixrtc/RTCEncryptionManager.ts

@@ -96,8 +96,6 @@ export class RTCEncryptionManager implements IEncryptionManager {
         this.delayRolloutTimeMillis = joinConfig?.useKeyDelay ?? 1000;
         this.transport.on(KeyTransportEvents.ReceivedKeys, this.onNewKeyReceived);
         this.transport.start();
-
-        this.ensureMediaKey();
     }
 
     public leave(): void {