Merge pull request #3687 from toger5/toger5/fix-reemitted-event-params

Fix delayId delegation. Use correct event reemitting types.

src/state/CallViewModel/CallViewModel.ts

@@ -48,6 +48,7 @@ import {
 import { type IWidgetApiRequest } from "matrix-widget-api";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
 import { v4 as uuidv4 } from "uuid";
+import { type IMembershipManager } from "matrix-js-sdk/lib/matrixrtc/IMembershipManager";
 
 import {
   LocalUserMediaViewModel,
@@ -445,8 +446,9 @@ export function createCallViewModel$(
         fromEvent(
           matrixRTCSession,
           MembershipManagerEvent.DelayIdChanged,
-        ) as Observable<string | undefined>
-      ).pipe(map((v) => v ?? null)),
+          // The type of reemitted event includes the original emitted as the second arg.
+        ) as Observable<[string | undefined, IMembershipManager]>
+      ).pipe(map(([delayId]) => delayId ?? null)),
       matrixRTCSession.delayId ?? null,
     ),
     roomId: matrixRoom.roomId,

src/state/CallViewModel/localMember/LocalTransport.ts

@@ -177,8 +177,11 @@ export const createLocalTransport$ = ({
       switchMap(([customUrl, delayId, forceEndpoint]) => {
         logger.info(
           "Creating preferred transport based on: ",
+          "customUrl: ",
           customUrl,
+          "delayId: ",
           delayId,
+          "forceEndpoint: ",
           forceEndpoint,
         );
         return from(