From 6cf859fd9e242501620c3053507d4a669f56004e Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Fri, 13 Feb 2026 12:39:40 +0100
Subject: [PATCH] Fix resource leak due to unsafe scope reference

---
 src/state/CallViewModel/CallViewModel.ts | 51 +++++++++++++-----------
 src/utils/observable.ts                  | 32 +++++++++++++++
 2 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/src/state/CallViewModel/CallViewModel.ts b/src/state/CallViewModel/CallViewModel.ts
index e2c6e46e..90bf71fe 100644
--- a/src/state/CallViewModel/CallViewModel.ts
+++ b/src/state/CallViewModel/CallViewModel.ts
@@ -60,6 +60,7 @@ import {
 import {
   accumulate,
   filterBehavior,
+  generateItem,
   generateItems,
   pauseWhen,
 } from "../../utils/observable";
@@ -446,29 +447,33 @@ export function createCallViewModel$(
 
   const localTransport$ = scope.behavior(
     matrixRTCMode$.pipe(
-      map((mode) =>
-        createLocalTransport$({
-          scope: scope,
-          memberships$: memberships$,
-          ownMembershipIdentity,
-          client,
-          delayId$: scope.behavior(
-            (
-              fromEvent(
-                matrixRTCSession,
-                MembershipManagerEvent.DelayIdChanged,
-                // 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,
-          forceJwtEndpoint:
-            mode === MatrixRTCMode.Matrix_2_0
-              ? JwtEndpointVersion.Matrix_2_0
-              : JwtEndpointVersion.Legacy,
-          useOldestMember: mode === MatrixRTCMode.Legacy,
-        }),
+      generateItem(
+        "CallViewModel localTransport$",
+        // Re-create LocalTransport whenever the mode changes
+        (mode) => ({ keys: [mode], data: undefined }),
+        (scope, _data$, mode) =>
+          createLocalTransport$({
+            scope: scope,
+            memberships$: memberships$,
+            ownMembershipIdentity,
+            client,
+            delayId$: scope.behavior(
+              (
+                fromEvent(
+                  matrixRTCSession,
+                  MembershipManagerEvent.DelayIdChanged,
+                  // 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,
+            forceJwtEndpoint:
+              mode === MatrixRTCMode.Matrix_2_0
+                ? JwtEndpointVersion.Matrix_2_0
+                : JwtEndpointVersion.Legacy,
+            useOldestMember: mode === MatrixRTCMode.Legacy,
+          }),
       ),
     ),
   );
diff --git a/src/utils/observable.ts b/src/utils/observable.ts
index d4182021..2e19748b 100644
--- a/src/utils/observable.ts
+++ b/src/utils/observable.ts
@@ -213,6 +213,38 @@ export function filterBehavior<T, S extends T>(
     );
 }
 
+/**
+ * Maps a changing input value to an item whose lifetime is tied to a certain
+ * computed key. The item may capture some dynamic data from the input.
+ */
+export function generateItem<
+  Input,
+  Keys extends [unknown, ...unknown[]],
+  Data,
+  Item,
+>(
+  name: string,
+  generator: (input: Input) => { keys: readonly [...Keys]; data: Data },
+  factory: (
+    scope: ObservableScope,
+    data$: Behavior<Data>,
+    ...keys: Keys
+  ) => Item,
+): OperatorFunction<Input, Item> {
+  return (input$) =>
+    input$.pipe(
+      generateItemsInternal(
+        name,
+        function* (input) {
+          yield generator(input);
+        },
+        factory,
+        (items) => items,
+      ),
+      map(([item]) => item),
+    );
+}
+
 function generateItemsInternal<
   Input,
   Keys extends [unknown, ...unknown[]],