Files
element-x-ios/ElementX/Sources/Other/CurrentValuePublisher.swift
Matthew Hodgson d8a2ac75a8 Fix CurrentValuePublisher.map dropping updates when the mapped publisher is chained inline (#5870)
* Fix CurrentValuePublisher.map dropping updates when the mapped publisher is chained inline

The eager implementation bridged through a second CurrentValueSubject fed by
a sink whose AnyCancellable was stored on the returned struct. Combine
consumes publisher structs when building a subscription, so chaining the
mapped publisher inline (e.g. `publisher.map { … }.removeDuplicates(…)
.sink { … }`, as RoomScreenViewModel and RoomDetailsScreenViewModel do for
knock requests) dropped the only copy holding that cancellable: the feeding
sink was cancelled and subscribers only ever received the initial value.

In practice this meant a room admin viewing a knockable room never saw the
"wants to join" banner (or a live "Requests to join" badge) for a knock
arriving while the room was open — it only appeared when the knock predated
opening the room. Caught by a live cross-client knocking test; the
double-execution of the transform at subscription time (eager transform +
current-value replay) was the giveaway.

Make map lazy instead: keep the transformed AnyPublisher and a value
provider, so subscribers attach straight through to the source subject (which
replays its current value itself) and no keep-alive is needed. Adds a
regression test chaining a mapped publisher inline.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* swiftformat

* better docs

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Mauro Romito <mauro.romito@element.io>
2026-07-14 15:02:56 +02:00

59 lines
2.1 KiB
Swift

//
// Copyright 2025 Element Creations Ltd.
// Copyright 2023-2025 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
// Please see LICENSE files in the repository root for full details.
//
import Combine
/// A wrapper of CurrentValueSubject.
/// The purpose of this type is to remove the possibility to send new values on the underlying subject.
///
/// `CurrentValueSubject` is documented as thread-safe but is not formally `Sendable`, hence `@unchecked`.
nonisolated struct CurrentValuePublisher<Output, Failure: Error>: Publisher, @unchecked Sendable {
private let upstream: AnyPublisher<Output, Failure>
private let valueProvider: () -> Output
init(_ subject: CurrentValueSubject<Output, Failure>) {
upstream = subject.eraseToAnyPublisher()
valueProvider = { subject.value }
}
init(_ value: Output) {
self.init(CurrentValueSubject(value))
}
private init(upstream: AnyPublisher<Output, Failure>, valueProvider: @escaping () -> Output) {
self.upstream = upstream
self.valueProvider = valueProvider
}
func receive<S: Subscriber>(subscriber: S) where Failure == S.Failure, Output == S.Input {
upstream.receive(subscriber: subscriber)
}
var value: Output {
valueProvider()
}
}
nonisolated extension CurrentValuePublisher where Failure == Never {
/// Transforms the published values and ``value``.
///
/// The transform runs lazily, once per subscriber and per ``value`` read. It must stay lazy:
/// this struct is discarded when the mapped publisher is chained inline, so anything eager
/// (a live subscription feeding a second subject) would be cancelled and stop the updates.
func map<T>(_ transform: @escaping (Output) -> T) -> CurrentValuePublisher<T, Never> {
.init(upstream: upstream.map(transform).eraseToAnyPublisher(),
valueProvider: { transform(value) })
}
}
nonisolated extension CurrentValueSubject {
func asCurrentValuePublisher() -> CurrentValuePublisher<Output, Failure> {
.init(self)
}
}