replace joining concept with ownMembership

Author: toger5

src/matrixrtc/IMembershipManager.ts

@@ -55,9 +55,13 @@ export interface IMembershipManager {
      * Get the actual connection status of the manager.
      */
     get status(): Status;
+
     /**
-     * The current status while the manager is activated
+     * The Current own state event if the manger is connected.
+     * `undefined` if not connected.
      */
+    get ownMembership(): CallMembership | undefined;
+
     /**
      * Start sending all necessary events to make this user participate in the RTC session.
      * @param fociPreferred the list of preferred foci to use in the joined RTC membership event.

src/matrixrtc/MatrixRTCSession.ts

@@ -194,12 +194,6 @@ export class MatrixRTCSession extends TypedEventEmitter<
     private joinConfig?: SessionConfig;
     private logger: Logger;
 
-    /**
-     * Whether we're trying to join the session but still waiting for room state
-     * to reflect our own membership.
-     */
-    private joining = false;
-
     /**
      * This timeout is responsible to track any expiration. We need to know when we have to start
      * to ignore other call members. There is no callback for this. This timeout will always be configured to
@@ -465,9 +459,6 @@ export class MatrixRTCSession extends TypedEventEmitter<
         }
 
         this.joinConfig = joinConfig;
-        const userId = this.client.getUserId()!;
-        const deviceId = this.client.getDeviceId()!;
-        this.joining = !this.memberships.some((m) => isMyMembership(m, userId, deviceId));
 
         // Join!
         this.membershipManager!.join(fociPreferred, fociActive, (e) => {
@@ -498,7 +489,6 @@ export class MatrixRTCSession extends TypedEventEmitter<
 
         this.logger.info(`Leaving call session in room ${this.roomSubset.roomId}`);
 
-        this.joining = false;
         this.encryptionManager!.leave();
         const leavePromise = this.membershipManager!.leave(timeout);
 
@@ -625,14 +615,15 @@ export class MatrixRTCSession extends TypedEventEmitter<
             });
 
             void this.membershipManager?.onRTCSessionMemberUpdate(this.memberships);
-
-            const userId = this.client.getUserId()!;
-            const deviceId = this.client.getDeviceId()!;
-            if (this.joining && this.memberships.some((m) => isMyMembership(m, userId, deviceId))) {
-                this.joining = false;
+            const ownMembership = this.membershipManager?.ownMembership;
+            if (ownMembership && oldMemberships.length === 0) {
                 // If we're the first member in the call, we're responsible for
                 // sending the notification event
-                if (oldMemberships.length === 0) this.sendCallNotify();
+                if (ownMembership.eventId) {
+                    this.sendCallNotify(ownMembership.eventId);
+                } else {
+                    this.logger.warn("Own membership eventId is undefined, cannot send call notification");
+                }
             }
         }
         // This also needs to be done if `changed` = false

src/matrixrtc/MembershipManager.ts

@@ -221,7 +221,13 @@ export class MembershipManager
     public async onRTCSessionMemberUpdate(memberships: CallMembership[]): Promise<void> {
         const userId = this.client.getUserId();
         const deviceId = this.client.getDeviceId();
-        if (userId && deviceId && this.isJoined() && !memberships.some((m) => isMyMembership(m, userId, deviceId))) {
+        if (!userId || !deviceId) {
+            this.logger.error("MembershipManager.onRTCSessionMemberUpdate called without user or device id");
+            return Promise.resolve();
+        }
+        this._ownMembership = memberships.find((m) => isMyMembership(m, userId, deviceId));
+
+        if (this.isActivated() && !this._ownMembership) {
             // If one of these actions are scheduled or are getting inserted in the next iteration, we should already
             // take care of our missing membership.
             const sendingMembershipActions = [
@@ -310,6 +316,11 @@ export class MembershipManager
         }, this.logger);
     }
 
+    private _ownMembership?: CallMembership;
+    public get ownMembership(): CallMembership | undefined {
+        return this._ownMembership;
+    }
+
     // scheduler
     private oldStatus?: Status;
     private scheduler: ActionScheduler;