From abb80e4e8793824499eeaf3d1f621ce02b9d9e79 Mon Sep 17 00:00:00 2001
From: Timo K <toger5@hotmail.de>
Date: Mon, 19 Jan 2026 10:35:46 +0100
Subject: [PATCH] Fix event reemitting types The callback args for reemitting
 will change to an array including the originals emitter.

---
 src/state/CallViewModel/CallViewModel.ts           | 14 ++++++++++++--
 .../CallViewModel/localMember/LocalTransport.ts    |  3 +++
 yarn.lock                                          |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/state/CallViewModel/CallViewModel.ts b/src/state/CallViewModel/CallViewModel.ts
index 554060bf..026b354c 100644
--- a/src/state/CallViewModel/CallViewModel.ts
+++ b/src/state/CallViewModel/CallViewModel.ts
@@ -142,6 +142,7 @@ import {
 import { Publisher } from "./localMember/Publisher.ts";
 import { type Connection } from "./remoteMembers/Connection.ts";
 import { createLayoutModeSwitch } from "./LayoutSwitch.ts";
+import { IMembershipManager } from "matrix-js-sdk/lib/matrixrtc/IMembershipManager";
 
 const logger = rootLogger.getChild("[CallViewModel]");
 //TODO
@@ -445,8 +446,17 @@ 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]) => {
+          logger.debug(
+            "DelayId change emitted from matrixRTCSession: ",
+            delayId,
+          );
+          return delayId ?? null;
+        }),
+      ),
       matrixRTCSession.delayId ?? null,
     ),
     roomId: matrixRoom.roomId,
diff --git a/src/state/CallViewModel/localMember/LocalTransport.ts b/src/state/CallViewModel/localMember/LocalTransport.ts
index 7e1c4155..3857f8f8 100644
--- a/src/state/CallViewModel/localMember/LocalTransport.ts
+++ b/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(
diff --git a/yarn.lock b/yarn.lock
index 167ab618..b65a5cf3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11453,8 +11453,8 @@ __metadata:
   linkType: hard
 
 "matrix-js-sdk@matrix-org/matrix-js-sdk#develop":
-  version: 39.4.0
-  resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=4d0d32307eb4f1ce1fb65080fcca704f5bdedc31"
+  version: 40.0.0
+  resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=899cdb0e1da4933d3eaf4c7337c1846e1ec8174c"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@matrix-org/matrix-sdk-crypto-wasm": "npm:^17.0.0"
@@ -11470,7 +11470,7 @@ __metadata:
     sdp-transform: "npm:^3.0.0"
     unhomoglyph: "npm:^1.0.6"
     uuid: "npm:13"
-  checksum: 10c0/59c9d81ccf823584dc783502cb5c928562e3490c63f5ce98ee3232a603545d6278e90dc951c1fd0bae2792ba732ec5171e03596fd396bb2150d596cebb7fbac9
+  checksum: 10c0/2476eb0bfed0b74fe5dcae25022a28d53d69297570d93f6121893246a9fd22452c48477fa605e99f25405f0249b14ffcaed0fd7cbf3318ad4cee20458689f40e
   languageName: node
   linkType: hard