diff --git a/Assets/Plugins/StreamChat/Core/Configs/IStreamClientConfig.cs b/Assets/Plugins/StreamChat/Core/Configs/IStreamClientConfig.cs
index 69887678..054bafcd 100644
--- a/Assets/Plugins/StreamChat/Core/Configs/IStreamClientConfig.cs
+++ b/Assets/Plugins/StreamChat/Core/Configs/IStreamClientConfig.cs
@@ -36,5 +36,13 @@ public interface IStreamClientConfig
/// Does not change server history. See .
///
MessageCacheWindow DefaultMessageCacheWindow { get; set; }
+
+ ///
+ /// How the client restores local state after the websocket reconnects. Defaults to
+ /// , which preserves the per-event
+ /// callback behaviour of earlier SDK versions. See
+ /// for when to pick each option.
+ ///
+ StateRecoveryStrategy StateRecoveryStrategy { get; set; }
}
}
\ No newline at end of file
diff --git a/Assets/Plugins/StreamChat/Core/Configs/StateRecoveryStrategy.cs b/Assets/Plugins/StreamChat/Core/Configs/StateRecoveryStrategy.cs
new file mode 100644
index 00000000..4029c10a
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Core/Configs/StateRecoveryStrategy.cs
@@ -0,0 +1,64 @@
+namespace StreamChat.Core.Configs
+{
+ ///
+ /// How restores local state after the websocket reconnects.
+ /// Set through .
+ ///
+ ///
+ /// Regardless of the strategy, a reconnect always drops the server-side watches that were
+ /// established before the disconnect. and
+ /// re-establish them; leaves that to you.
+ ///
+ public enum StateRecoveryStrategy
+ {
+ ///
+ /// Default, and the behaviour of every SDK version before this option existed.
+ ///
+ /// The client calls /sync for the channels it was watching and replays each missed
+ /// event through the normal event pipeline, so every per-event callback
+ /// ( ,
+ /// , and so on) fires exactly as it
+ /// would for a live event. It then re-queries and re-watches those channels unconditionally,
+ /// which is new: previously a failed or skipped /sync left the channels stale and
+ /// unwatched for the rest of the connection.
+ ///
+ /// Choose this when your UI is driven by per-event callbacks. The cost is that a long outage
+ /// on a busy channel replays up to ~1000 events in a single frame, which is visible as a
+ /// hitch on mobile.
+ ///
+ ReplayEvents = 0,
+
+ ///
+ /// Same recovery pipeline as , but the /sync events are
+ /// applied to local state without raising the per-event callbacks whose effect is observable
+ /// in model state afterwards. Subscribe to and
+ /// rebuild from and friends instead.
+ ///
+ /// Callbacks that carry information the SDK cannot reconstruct from state are still raised
+ /// per event: ,
+ /// , and the local-user membership and invite
+ /// notifications.
+ ///
+ /// Choose this when a long outage causes a frame hitch on resume. This is the cheapest
+ /// recovery the SDK offers.
+ ///
+ BatchStateUpdate = 1,
+
+ ///
+ /// The SDK performs no recovery after a reconnect: no /sync , no re-query, no re-watch,
+ /// and no . Local state is left exactly as it
+ /// was and is left untouched, so it remains
+ /// the list of what you were watching before the drop.
+ ///
+ /// Choose this only if you own recovery. Subscribe to
+ /// , and on the transition to
+ /// re-hydrate and re-watch yourself with
+ /// QueryChannelsAsync(new[] { ChannelFilter.Cid.In(cids) }, limit: 30) - that single
+ /// call both refreshes state and re-establishes the watches. Note that
+ /// is a no-op for a channel whose
+ /// is still true , which is the
+ /// case here, so use the query.
+ ///
+ Disabled = 2,
+ }
+}
diff --git a/Assets/Plugins/StreamChat/Core/Configs/StateRecoveryStrategy.cs.meta b/Assets/Plugins/StreamChat/Core/Configs/StateRecoveryStrategy.cs.meta
new file mode 100644
index 00000000..5ce3c44b
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Core/Configs/StateRecoveryStrategy.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: deb96db72983f9e4ca61a28cb444a7be
\ No newline at end of file
diff --git a/Assets/Plugins/StreamChat/Core/Configs/StreamClientConfig.cs b/Assets/Plugins/StreamChat/Core/Configs/StreamClientConfig.cs
index 54b698f9..a48396d2 100644
--- a/Assets/Plugins/StreamChat/Core/Configs/StreamClientConfig.cs
+++ b/Assets/Plugins/StreamChat/Core/Configs/StreamClientConfig.cs
@@ -12,5 +12,7 @@ public class StreamClientConfig : IStreamClientConfig
public bool OptimisticMessageInsert { get; set; } = true;
public MessageCacheWindow DefaultMessageCacheWindow { get; set; } = null;
+
+ public StateRecoveryStrategy StateRecoveryStrategy { get; set; } = Configs.StateRecoveryStrategy.ReplayEvents;
}
}
\ No newline at end of file
diff --git a/Assets/Plugins/StreamChat/Core/IStreamChatClient.cs b/Assets/Plugins/StreamChat/Core/IStreamChatClient.cs
index e72e016b..e3c44f99 100644
--- a/Assets/Plugins/StreamChat/Core/IStreamChatClient.cs
+++ b/Assets/Plugins/StreamChat/Core/IStreamChatClient.cs
@@ -33,6 +33,27 @@ public interface IStreamChatClient : IDisposable, IStreamChatClientEventsListene
///
event Action Disconnected;
+ ///
+ /// Raised once after reconnect recovery finishes, on every path: full success, partial
+ /// success, and a reconnect where there was nothing to recover. Not raised on the initial
+ /// login, and not raised when
+ /// is
+ /// .
+ ///
+ /// When it fires, the channels in
+ /// have fresh state and live watches
+ /// again. Anything in is
+ /// still stale and no longer watched.
+ ///
+ /// This is the signal to rebuild from state after an outage. It is required rather than
+ /// merely convenient under
+ /// , where the per-event callbacks
+ /// are suppressed during recovery, and it is worth handling under
+ /// too, because the re-query that
+ /// follows the event replay merges channel state without raising per-message callbacks.
+ ///
+ event StateRecoveredHandler StateRecovered;
+
///
/// Event fired when connection state with Stream Chat server has changed
///
@@ -129,6 +150,12 @@ public interface IStreamChatClient : IDisposable, IStreamChatClientEventsListene
/// methods may not be watched - check on a specific
/// channel to know its state.
///
+ ///
+ /// Emptied when the connection drops, because the server drops every watch with it, and
+ /// repopulated by reconnect recovery. If you enumerate this to decide what to restore
+ /// yourself, read it before the disconnect or use
+ /// , which leaves it untouched.
+ ///
///
IReadOnlyList WatchedChannels { get; }
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/HistorySyncApplyResult.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/HistorySyncApplyResult.cs
new file mode 100644
index 00000000..591cb5fb
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Core/LowLevelClient/HistorySyncApplyResult.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace StreamChat.Core.LowLevelClient
+{
+ ///
+ /// Outcome of one silent /sync history batch. See
+ /// .
+ ///
+ internal sealed class HistorySyncApplyResult
+ {
+ ///
+ /// created_at of the newest event that was applied successfully, or null when
+ /// nothing was applied. This is what the /sync watermark advances to.
+ ///
+ public DateTimeOffset? MaxAppliedCreatedAt { get; set; }
+
+ ///
+ /// Events that threw while being applied. They are skipped, not retried within the batch.
+ ///
+ public int FailedEventCount { get; set; }
+ }
+}
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/HistorySyncApplyResult.cs.meta b/Assets/Plugins/StreamChat/Core/LowLevelClient/HistorySyncApplyResult.cs.meta
new file mode 100644
index 00000000..f131c2ae
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Core/LowLevelClient/HistorySyncApplyResult.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 59eb11f6ed758d54fa5b796cd4f8a5c7
\ No newline at end of file
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/StreamChatLowLevelClient.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/StreamChatLowLevelClient.cs
index 45a29261..a96f7e43 100644
--- a/Assets/Plugins/StreamChat/Core/LowLevelClient/StreamChatLowLevelClient.cs
+++ b/Assets/Plugins/StreamChat/Core/LowLevelClient/StreamChatLowLevelClient.cs
@@ -425,7 +425,7 @@ public void Update(float deltaTime)
#if STREAM_DEBUG_ENABLED
_logs.Info(_authCredentials.UserId + " WS message: " + msg);
#endif
- HandleNewWebsocketMessage(msg);
+ HandleNewWebsocketMessage(msg, isLiveEvent: true);
}
}
@@ -443,44 +443,172 @@ public void SetReconnectStrategySettings(ReconnectStrategy reconnectStrategy, fl
public async Task FetchAndProcessEventsSinceLastReceivedEvent(IEnumerable channelCids)
{
- if (!channelCids.Any() || !_disconnectionLastEventReceivedAt.HasValue)
+ var response = await TrySyncHistoryAsync(channelCids);
+ ReplayHistoryEvents(response?.Events);
+ }
+
+ ///
+ /// The /sync endpoint counts events summed across every requested cid against a
+ /// server-side ceiling of roughly 1000 and refuses the whole request once it is exceeded, so
+ /// asking about fewer channels makes a successful catch-up more likely. Swift and Android both
+ /// cap the request at 100 cids; this matches them.
+ ///
+ internal const int MaxSyncChannelCids = 100;
+
+ ///
+ /// Best-effort /sync for up to channels. Returns
+ /// null when catch-up is skipped, which happens when there is no sync point to catch up
+ /// from or when the sync point is older than the 30 days the server accepts.
+ ///
+ internal async Task TrySyncHistoryAsync(IEnumerable channelCids)
+ {
+ if (channelCids == null || !_disconnectionLastEventReceivedAt.HasValue)
{
- return;
+ return null;
}
var lastEventReceivedAt = _disconnectionLastEventReceivedAt.Value;
- // Check if less than 30 days. Past that the server rejects LastSyncAt, so this only
- // skips a request that was certain to fail — it is not a recovery path. The SDK has no
- // re-hydrate fallback of its own, so bridging a gap this large is the consumer's job.
- TimeSpan diff = _timeService.Now - lastEventReceivedAt;
- if (diff.TotalDays > 30)
+ if ((_timeService.Now - lastEventReceivedAt).TotalDays > 30)
+ {
+ return null;
+ }
+
+ // Released only once the request has completed: the request body is serialized from this
+ // list, and an auth retry re-serializes it after the first attempt has already awaited.
+ using (new ListPoolScope(out var cids))
+ {
+ foreach (var cid in channelCids)
+ {
+ if (cids.Count == MaxSyncChannelCids)
+ {
+ break;
+ }
+
+ cids.Add(cid);
+ }
+
+ if (cids.Count == 0)
+ {
+ return null;
+ }
+
+ return await ChannelApi.SyncAsync(new SyncRequest
+ {
+ ChannelCids = cids,
+ LastSyncAt = lastEventReceivedAt,
+ Watch = true,
+
+ // Lets the caller tell "the server will never return this channel again" apart from
+ // "the query happened to omit it", so recovery can stop retrying channels that were
+ // deleted or that the local user lost access to while offline.
+ WithInaccessibleCids = true,
+ });
+ }
+ }
+
+ ///
+ /// Replay history events through the live event pipeline, so every per-event public callback
+ /// fires exactly as it would for a real-time event. This is
+ /// and the behaviour of
+ /// .
+ ///
+ internal void ReplayHistoryEvents(IEnumerable events)
+ {
+ if (events == null)
{
return;
}
- //StreamTodo: according to Android SDK there's an error if there are > 1000 events
+ foreach (var e in events)
+ {
+ // Each event is isolated by the try/catch inside the registered handler, so one
+ // malformed event cannot abandon the rest of the replay.
+ HandleNewWebsocketMessage(SerializeHistoryEvent(e));
+ }
+ }
- var response = await ChannelApi.SyncAsync(new SyncRequest
+ ///
+ /// Apply history events to local state without raising the per-event public callbacks whose
+ /// effect is observable in model state afterwards. This is
+ /// . Mirrors Android's
+ /// isFromHistorySync and Swift's postNotifications: false .
+ ///
+ internal HistorySyncApplyResult ApplyHistoryEvents(IEnumerable events)
+ {
+ var result = new HistorySyncApplyResult();
+ if (events == null)
{
- ChannelCids = channelCids.ToList(),
- LastSyncAt = lastEventReceivedAt,
- Watch = true,
- });
+ return result;
+ }
+
+ _isApplyingHistoryEvents = true;
+ _historyMaxAppliedCreatedAt = null;
- if (response.Events.Count == 0)
+ try
+ {
+ foreach (var e in events)
+ {
+ try
+ {
+ HandleNewWebsocketMessage(SerializeHistoryEvent(e));
+ }
+ catch (Exception ex)
+ {
+ // Only count and log. Abandoning the batch would leave state half-applied,
+ // and the watermark below only ever advances to the newest event that was
+ // actually applied, so a partial batch is retried on the next reconnect.
+ result.FailedEventCount++;
+ _logs.Exception(ex);
+ }
+ }
+ }
+ finally
+ {
+ result.MaxAppliedCreatedAt = _historyMaxAppliedCreatedAt;
+ _historyMaxAppliedCreatedAt = null;
+ _isApplyingHistoryEvents = false;
+
+ if (result.MaxAppliedCreatedAt.HasValue)
+ {
+ TryAdvanceLastEventReceivedAt(result.MaxAppliedCreatedAt.Value, HistorySyncWatermarkSource);
+ }
+ }
+
+ return result;
+ }
+
+ ///
+ /// True while is running.
+ ///
+ internal bool IsApplyingHistoryEvents => _isApplyingHistoryEvents;
+
+ private const string HistorySyncWatermarkSource = "history.sync";
+
+ // The batch advances the watermark once, at the end, and only to the newest event it managed
+ // to apply. Advancing per event would let a throwing event in the middle leave a watermark
+ // claiming a catch-up that did not happen.
+ private void RecordHistoryWatermark(DateTimeOffset createdAt)
+ {
+ if (createdAt == DateTimeOffset.MinValue)
{
return;
}
- foreach (var e in response.Events)
+ if (!_historyMaxAppliedCreatedAt.HasValue || createdAt > _historyMaxAppliedCreatedAt.Value)
{
- // StreamTodo: check if we can not serialized this again. Investigate adding a custom EventsJsonConverter that would populate the list as serialized strings
- var serializedMsg = _serializer.Serialize(e);
+ _historyMaxAppliedCreatedAt = createdAt;
+ }
+ }
- //StreamTodo: try block?
- HandleNewWebsocketMessage(serializedMsg);
+ private string SerializeHistoryEvent(object e)
+ {
+ if (e is string serialized)
+ {
+ return serialized;
}
+
+ return _serializer.Serialize(e);
}
public void Dispose()
@@ -615,6 +743,9 @@ internal async Task ConnectUserAsync(string apiKey, string u
///
private DateTimeOffset? _disconnectionLastEventReceivedAt;
+ private bool _isApplyingHistoryEvents;
+ private DateTimeOffset? _historyMaxAppliedCreatedAt;
+
private async Task RefreshAuthTokenFromProvider()
{
#if STREAM_DEBUG_ENABLED
@@ -996,13 +1127,34 @@ private void RegisterEventType(string key,
#endif
var eventObj = DeserializeEvent(serializedContent, out var dto);
postprocess?.Invoke(dto);
- TryAdvanceLastEventReceivedAt(eventObj.CreatedAt, key);
- handler?.Invoke(eventObj, dto);
+
+ if (_isApplyingHistoryEvents)
+ {
+ RecordHistoryWatermark(eventObj.CreatedAt);
+ }
+ else
+ {
+ TryAdvanceLastEventReceivedAt(eventObj.CreatedAt, key);
+
+ // The low-level client is event-only, so it has no state a consumer could read
+ // after a silent batch. Suppressing its callbacks keeps a low-level subscriber
+ // consistent with the stateful client's BatchStateUpdate contract.
+ handler?.Invoke(eventObj, dto);
+ }
+
+ // Always applied - this is what mutates local state.
internalHandler?.Invoke(dto);
}
catch (Exception e)
{
_logs.Exception(e);
+
+ // A silent batch counts its failures and advances the watermark only to the newest
+ // event it applied, so it needs to see the throw. Live events stay isolated here.
+ if (_isApplyingHistoryEvents)
+ {
+ throw;
+ }
}
});
}
@@ -1025,7 +1177,7 @@ private TEvent DeserializeEvent(string content, out TDto dto)
return response;
}
- private void HandleNewWebsocketMessage(string msg)
+ private void HandleNewWebsocketMessage(string msg, bool isLiveEvent = false)
{
const string ErrorKey = "error";
@@ -1046,7 +1198,16 @@ private void HandleNewWebsocketMessage(string msg)
return;
}
- if (EventReceived != null)
+ // Stamp liveness here rather than from the health check handler: the handler runs after
+ // every consumer callback registered ahead of it, so a slow consumer could push the gap
+ // past HealthCheckMaxWaitingTime and make the client disconnect itself. Only events that
+ // came off the live socket count - a health check replayed from /sync proves nothing.
+ if (isLiveEvent && type == WSEventType.HealthCheck)
+ {
+ _lastHealthCheckReceivedTime = _timeService.Time;
+ }
+
+ if (EventReceived != null && !_isApplyingHistoryEvents)
{
var time = DateTime.Now.TimeOfDay.ToString(@"hh\:mm\:ss");
EventReceived.Invoke($"{time} - Event received: {type} ");
@@ -1081,8 +1242,22 @@ private bool TryHandleCustomChannelEvent(string serializedContent, string eventT
try
{
var dto = _serializer.Deserialize(serializedContent);
- TryAdvanceLastEventReceivedAt(dto.CreatedAt, eventType);
+ if (_isApplyingHistoryEvents)
+ {
+ RecordHistoryWatermark(dto.CreatedAt);
+ }
+ else
+ {
+ TryAdvanceLastEventReceivedAt(dto.CreatedAt, eventType);
+ }
+
+ // Custom events are the one category with no representation in local state, so a
+ // consumer cannot reconstruct them from IStreamChannel after a silent batch. They are
+ // therefore delivered per event even during history sync - dropping them would be
+ // silent data loss, and deferring them into the recovery signal would arrive after
+ // the re-query and out of chronological order. The reference SDKs discard custom
+ // events from /sync entirely; an app porting between SDKs must not rely on this.
var evt = new EventCustom();
((ILoadableFrom)evt).LoadFromDto(dto);
CustomEventReceived?.Invoke(evt);
@@ -1133,8 +1308,6 @@ private void PingHealthCheck()
private void HandleHealthCheckEvent(EventHealthCheck healthCheckEvent, HealthCheckEventInternalDTO dto)
{
- _lastHealthCheckReceivedTime = _timeService.Time;
-
if (ConnectionState == ConnectionState.Connecting)
{
OnConnectionConfirmed(healthCheckEvent, dto);
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamStateRecoveredEventArgs.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamStateRecoveredEventArgs.cs
new file mode 100644
index 00000000..b683b6d4
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Core/Responses/StreamStateRecoveredEventArgs.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using StreamChat.Core.StatefulModels;
+
+namespace StreamChat.Core.Responses
+{
+ ///
+ /// Payload for .
+ ///
+ public sealed class StreamStateRecoveredEventArgs
+ {
+ public StreamStateRecoveredEventArgs(IReadOnlyList channels,
+ IReadOnlyList unrecoveredChannelCids)
+ {
+ Channels = channels ?? Array.Empty();
+ UnrecoveredChannelCids = unrecoveredChannelCids ?? Array.Empty();
+ }
+
+ ///
+ /// Channels whose state was refreshed and whose watch was re-established. Their
+ /// and other collections are up to date as of the
+ /// moment this event is raised.
+ ///
+ /// Note that the recovery query returns the channel's latest page of messages and merges it
+ /// into what was already loaded. If more messages arrived during the outage than fit in one
+ /// page, the list contains the pre-disconnect messages followed by the latest page with a
+ /// hole in between, and cannot reach into
+ /// that hole because it pages back from the oldest loaded message.
+ ///
+ public IReadOnlyList Channels { get; }
+
+ ///
+ /// Channels that were being watched before the disconnect but could not be recovered - the
+ /// server no longer returns them (deleted, or the local user lost access while offline), or
+ /// every attempt to re-query them failed. Their local state is still stale and they are no
+ /// longer watched, so they will not receive realtime updates.
+ ///
+ /// Empty on a fully successful recovery. Use it to tear down or flag the corresponding UI
+ /// rather than leaving it silently frozen.
+ ///
+ public IReadOnlyList UnrecoveredChannelCids { get; }
+
+ ///
+ /// true when every channel that was being watched before the disconnect was recovered.
+ ///
+ public bool IsComplete => UnrecoveredChannelCids.Count == 0;
+ }
+}
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamStateRecoveredEventArgs.cs.meta b/Assets/Plugins/StreamChat/Core/Responses/StreamStateRecoveredEventArgs.cs.meta
new file mode 100644
index 00000000..ed989ec5
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Core/Responses/StreamStateRecoveredEventArgs.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 343e17afd03f6814b9154f5e482fbfcb
\ No newline at end of file
diff --git a/Assets/Plugins/StreamChat/Core/State/StreamStatefulModelBase.cs b/Assets/Plugins/StreamChat/Core/State/StreamStatefulModelBase.cs
index bc7e6e67..676c162e 100644
--- a/Assets/Plugins/StreamChat/Core/State/StreamStatefulModelBase.cs
+++ b/Assets/Plugins/StreamChat/Core/State/StreamStatefulModelBase.cs
@@ -51,6 +51,17 @@ internal StreamStatefulModelBase(string uniqueId, ICacheRepository Repository { get; }
+ ///
+ /// True while a /sync history batch is being applied under
+ /// . State mutations still run;
+ /// public per-event notifications must not, when their effect is observable in model state once
+ /// the batch finishes. Consumers observe instead.
+ ///
+ /// Notifications carrying information the SDK cannot reconstruct from state - custom events,
+ /// channel deletion, local-user membership and invite notifications - are raised regardless.
+ ///
+ protected bool IsSilentHistorySync => Client.IsApplyingHistorySync;
+
protected void LoadAdditionalProperties(Dictionary additionalProperties)
{
//StreamTodo: investigate if there's a case we don't want to clear here
diff --git a/Assets/Plugins/StreamChat/Core/StatefulModels/StreamChannel.cs b/Assets/Plugins/StreamChat/Core/StatefulModels/StreamChannel.cs
index a1bba234..c1054cfb 100644
--- a/Assets/Plugins/StreamChat/Core/StatefulModels/StreamChannel.cs
+++ b/Assets/Plugins/StreamChat/Core/StatefulModels/StreamChannel.cs
@@ -116,7 +116,7 @@ public bool Hidden
get => _hidden;
internal set
{
- if (TrySet(ref _hidden, value))
+ if (TrySet(ref _hidden, value) && !IsSilentHistorySync)
{
VisibilityChanged?.Invoke(this, Hidden);
}
@@ -148,7 +148,10 @@ internal set
}
_muted = value;
- MuteChanged?.Invoke(this, value);
+ if (!IsSilentHistorySync)
+ {
+ MuteChanged?.Invoke(this, value);
+ }
}
}
@@ -873,7 +876,10 @@ internal void HandleMessageUpdatedEvent(MessageUpdatedEventInternalDTO dto)
}
message.TryUpdateFromDto(dto.Message, Cache);
- MessageUpdated?.Invoke(this, message);
+ if (!IsSilentHistorySync)
+ {
+ MessageUpdated?.Invoke(this, message);
+ }
}
internal void HandleMessageDeletedEvent(MessageDeletedEventInternalDTO dto)
@@ -898,7 +904,10 @@ internal void HandleMessageDeletedEvent(MessageDeletedEventInternalDTO dto)
message.InternalHandleSoftDelete();
}
- MessageDeleted?.Invoke(this, message, isHardDelete);
+ if (!IsSilentHistorySync)
+ {
+ MessageDeleted?.Invoke(this, message, isHardDelete);
+ }
}
internal void HandleChannelUpdatedEvent(ChannelUpdatedEventInternalDTO eventDto)
@@ -908,7 +917,10 @@ internal void HandleChannelUpdatedEvent(ChannelUpdatedEventInternalDTO eventDto)
UpdateChannelFieldsFromDtoOverwrite(eventDto.Channel, Cache);
MemberCount = eventDto.ChannelMemberCount;
- Updated?.Invoke(this);
+ if (!IsSilentHistorySync)
+ {
+ Updated?.Invoke(this);
+ }
}
internal void HandleChannelTruncatedEvent(ChannelTruncatedEventInternalDTO eventDto)
@@ -933,8 +945,11 @@ internal void InternalAddMember(StreamChannelMember member)
}
_members.Add(member);
- MemberAdded?.Invoke(this, member);
- MembersChanged?.Invoke(this, member, OperationType.Added);
+ if (!IsSilentHistorySync)
+ {
+ MemberAdded?.Invoke(this, member);
+ MembersChanged?.Invoke(this, member, OperationType.Added);
+ }
}
internal void InternalRemoveMember(StreamChannelMember member)
@@ -945,8 +960,11 @@ internal void InternalRemoveMember(StreamChannelMember member)
}
_members.Remove(member);
- MemberRemoved?.Invoke(this, member);
- MembersChanged?.Invoke(this, member, OperationType.Removed);
+ if (!IsSilentHistorySync)
+ {
+ MemberRemoved?.Invoke(this, member);
+ MembersChanged?.Invoke(this, member, OperationType.Removed);
+ }
}
internal void InternalUpdateMember(StreamChannelMember member)
@@ -956,8 +974,11 @@ internal void InternalUpdateMember(StreamChannelMember member)
_members.Add(member);
}
- MemberUpdated?.Invoke(this, member);
- MembersChanged?.Invoke(this, member, OperationType.Updated);
+ if (!IsSilentHistorySync)
+ {
+ MemberUpdated?.Invoke(this, member);
+ MembersChanged?.Invoke(this, member, OperationType.Updated);
+ }
}
protected override StreamChannel Self => this;
@@ -1037,37 +1058,42 @@ private bool InternalAppendOrUpdateMessage(MessageInternalDTO dto, out StreamMes
_messages.Sort(MessageCreatedAtComparer.Instance);
}
- MessageReceived?.Invoke(this, streamMessage);
+ if (!IsSilentHistorySync)
+ {
+ MessageReceived?.Invoke(this, streamMessage);
+ }
- // Trim after MessageReceived so a message is never removed from cache before it is received.
+ // Trim after MessageReceived so a message is never removed from cache before it is
+ // received. Trimming still runs during a silent history batch: it only ever removes the
+ // oldest contiguous prefix, which the batch is appending newer messages ahead of, and
+ // skipping it would let a batch push a windowed channel past its MaxMessages.
TrimMessageCacheIfNeeded();
return true;
}
+ ///
+ /// A query response merges through UpdateFromDto , which appends to
+ /// without going through
+ /// and therefore never trims. Reconnect recovery calls this after its merge.
+ ///
+ internal void InternalTrimMessageCache() => TrimMessageCacheIfNeeded();
+
//StreamTodo: This deleteBeforeCreatedAt date is the date of event, it does not equal the passed TruncatedAt
//Therefore the only way to detect partial truncate in the past would be to query the history
private void InternalTruncateMessages(DateTimeOffset? deleteBeforeCreatedAt = null,
MessageInternalDTO systemMessageDto = null)
{
- if (deleteBeforeCreatedAt.HasValue)
+ for (int i = _messages.Count - 1; i >= 0; i--)
{
- for (int i = _messages.Count - 1; i >= 0; i--)
+ var msg = _messages[i];
+ if (deleteBeforeCreatedAt.HasValue && msg.CreatedAt >= deleteBeforeCreatedAt)
{
- var msg = _messages[i];
- if (msg.CreatedAt < deleteBeforeCreatedAt)
- {
- _messages.RemoveAt(i);
- Cache.Messages.Remove(msg);
- }
- }
- }
- else
- {
- for (int i = _messages.Count - 1; i >= 0; i--)
- {
- _messages.RemoveAt(i);
- Cache.Messages.Remove(_messages[i]);
+ continue;
}
+
+ _messages.RemoveAt(i);
+ _pinnedMessages.Remove(msg);
+ Cache.Messages.Remove(msg);
}
if (systemMessageDto != null)
@@ -1075,7 +1101,10 @@ private void InternalTruncateMessages(DateTimeOffset? deleteBeforeCreatedAt = nu
InternalAppendOrUpdateMessage(systemMessageDto, out _);
}
- Truncated?.Invoke(this);
+ if (!IsSilentHistorySync)
+ {
+ Truncated?.Invoke(this);
+ }
}
private void TrimMessageCacheIfNeeded()
@@ -1380,17 +1409,34 @@ internal void InternalHandleCustomEvent(CustomEventInternalDTO dto)
var customEvent = new StreamCustomEvent(dto.Type, user, dto.CreatedAt,
new StreamCustomData(custom, Serializer));
+ // Deliberately not gated on IsSilentHistorySync: a custom event has no representation in
+ // channel state, so suppressing it would lose the payload with no way to recover it.
CustomEventReceived?.Invoke(this, customEvent);
}
internal void InternalNotifyReactionReceived(StreamMessage message, StreamReaction reaction)
- => ReactionAdded?.Invoke(this, message, reaction);
+ {
+ if (!IsSilentHistorySync)
+ {
+ ReactionAdded?.Invoke(this, message, reaction);
+ }
+ }
internal void InternalNotifyReactionUpdated(StreamMessage message, StreamReaction reaction)
- => ReactionUpdated?.Invoke(this, message, reaction);
+ {
+ if (!IsSilentHistorySync)
+ {
+ ReactionUpdated?.Invoke(this, message, reaction);
+ }
+ }
public void InternalNotifyReactionDeleted(StreamMessage message, StreamReaction reaction)
- => ReactionRemoved?.Invoke(this, message, reaction);
+ {
+ if (!IsSilentHistorySync)
+ {
+ ReactionRemoved?.Invoke(this, message, reaction);
+ }
+ }
//StreamTodo: implement some timeout for typing users in case we dont' receive, this could be configurable
private readonly List _typingUsers = new List();
diff --git a/Assets/Plugins/StreamChat/Core/StatefulModels/StreamMessage.cs b/Assets/Plugins/StreamChat/Core/StatefulModels/StreamMessage.cs
index 5e5e4382..32ecdd36 100644
--- a/Assets/Plugins/StreamChat/Core/StatefulModels/StreamMessage.cs
+++ b/Assets/Plugins/StreamChat/Core/StatefulModels/StreamMessage.cs
@@ -409,7 +409,10 @@ internal void HandleReactionNewEvent(ReactionNewEventInternalDTO eventDto, Strea
//StreamTodo: verify if this how we should update the message + what about events for customer to get notified
Cache.TryCreateOrUpdate(eventDto.Message);
- ReactionAdded?.Invoke(channel, this, reaction);
+ if (!IsSilentHistorySync)
+ {
+ ReactionAdded?.Invoke(channel, this, reaction);
+ }
}
internal void HandleReactionUpdatedEvent(ReactionUpdatedEventInternalDTO eventDto, StreamChannel channel, StreamReaction reaction)
@@ -422,7 +425,10 @@ internal void HandleReactionUpdatedEvent(ReactionUpdatedEventInternalDTO eventDt
eventDto.Message.OwnReactions = null;
Cache.TryCreateOrUpdate(eventDto.Message);
- ReactionUpdated?.Invoke(channel, this, reaction);
+ if (!IsSilentHistorySync)
+ {
+ ReactionUpdated?.Invoke(channel, this, reaction);
+ }
}
internal void HandleReactionDeletedEvent(ReactionDeletedEventInternalDTO eventDto, StreamChannel channel, StreamReaction reaction)
@@ -435,7 +441,10 @@ internal void HandleReactionDeletedEvent(ReactionDeletedEventInternalDTO eventDt
eventDto.Message.OwnReactions = null;
Cache.TryCreateOrUpdate(eventDto.Message);
- ReactionRemoved?.Invoke(channel, this, reaction);
+ if (!IsSilentHistorySync)
+ {
+ ReactionRemoved?.Invoke(channel, this, reaction);
+ }
}
protected override StreamMessage Self => this;
diff --git a/Assets/Plugins/StreamChat/Core/StatefulModels/StreamThread.cs b/Assets/Plugins/StreamChat/Core/StatefulModels/StreamThread.cs
index f562e38a..b659dd81 100644
--- a/Assets/Plugins/StreamChat/Core/StatefulModels/StreamThread.cs
+++ b/Assets/Plugins/StreamChat/Core/StatefulModels/StreamThread.cs
@@ -427,7 +427,10 @@ internal void HandleMarkReadByUser(string userId, DateTimeOffset createdAt)
}
}
- ReadStateChanged?.Invoke(this);
+ if (!IsSilentHistorySync)
+ {
+ ReadStateChanged?.Invoke(this);
+ }
}
// Mirrors Android's Thread.markAsUnreadByUser. notification.mark_unread carries no
@@ -452,7 +455,10 @@ internal void HandleMarkUnreadByUser(string userId, DateTimeOffset? lastReadAt)
}
}
- ReadStateChanged?.Invoke(this);
+ if (!IsSilentHistorySync)
+ {
+ ReadStateChanged?.Invoke(this);
+ }
}
protected override string InternalUniqueId
@@ -521,7 +527,7 @@ private void IncrementUnreadForOtherReaders(StreamMessage reply)
}
}
- if (anyChanged)
+ if (anyChanged && !IsSilentHistorySync)
{
ReadStateChanged?.Invoke(this);
}
diff --git a/Assets/Plugins/StreamChat/Core/StreamChatClient.cs b/Assets/Plugins/StreamChat/Core/StreamChatClient.cs
index cec74b01..d753d87e 100644
--- a/Assets/Plugins/StreamChat/Core/StreamChatClient.cs
+++ b/Assets/Plugins/StreamChat/Core/StreamChatClient.cs
@@ -67,6 +67,9 @@ namespace StreamChat.Core
///
public delegate void ChannelMemberRemovedHandler(IStreamChannel channel, IStreamChannelMember member);
+ ///
+ public delegate void StateRecoveredHandler(StreamStateRecoveredEventArgs eventArgs);
+
///
public sealed class StreamChatClient : IStreamChatClient
{
@@ -90,6 +93,8 @@ public sealed class StreamChatClient : IStreamChatClient
public event StreamThreadChangeHandler ThreadTracked;
public event StreamThreadChangeHandler ThreadUntracked;
+ public event StateRecoveredHandler StateRecovered;
+
public const int QueryUsersLimitMaxValue = 30;
public const int QueryUsersOffsetMaxValue = 1000;
@@ -222,6 +227,11 @@ var ownUserDto
public Task DisconnectUserAsync()
{
TryCancelWaitingForUserConnection();
+
+ // Ends the session, so the next Connected transition is a fresh login rather than a
+ // reconnect and must not run recovery or raise StateRecovered.
+ _hasConnectedBefore = false;
+
return InternalLowLevelClient.DisconnectAsync(permanent: true);
}
@@ -967,6 +977,43 @@ internal Task RefreshChannelState(string cid)
private readonly StreamPollsApi _pollsApi;
private readonly List _watchedChannels = new List();
+ ///
+ /// Cids that were being watched when the connection dropped, most recently active first.
+ /// Reconnect recovery restores state and watches from this, not from
+ /// , which is cleared on the disconnect.
+ ///
+ private readonly List _recoveryChannelCids = new List();
+
+ ///
+ /// Cids the /sync response reported as inaccessible - deleted, or no longer readable by
+ /// the local user. Never re-queried again for the lifetime of the client.
+ ///
+ private readonly HashSet _inaccessibleCids = new HashSet();
+
+ private int _recoveryGeneration;
+ private bool _hasConnectedBefore;
+
+ ///
+ /// Recovering more channels than this would mean an unbounded number of sequential queries on
+ /// every reconnect, which invites rate limiting. Matches the /sync cid cap so both
+ /// halves of recovery cover the same set. JS and Android both cap lower, at 30.
+ ///
+ internal const int MaxRecoveredChannels = StreamChatLowLevelClient.MaxSyncChannelCids;
+
+ ///
+ /// QueryChannelsAsync asserts a limit of at most 30, so a longer recovery set has to be
+ /// chunked. Same chunk size as .
+ ///
+ private const int MaxChannelsPerRecoveryQuery = 30;
+
+ // Ties are broken arbitrarily - List.Sort is unstable - which only matters for channels with
+ // an equal LastMessageAt, where there is no meaningful "more recently active" anyway.
+ private static readonly Comparison ByLastMessageAtDescending = (a, b)
+ => (b.LastMessageAt ?? DateTimeOffset.MinValue).CompareTo(a.LastMessageAt ?? DateTimeOffset.MinValue);
+
+ ///
+ internal bool IsApplyingHistorySync => InternalLowLevelClient.IsApplyingHistoryEvents;
+
private TaskCompletionSource _connectUserTaskSource;
private CancellationToken _connectUserCancellationToken;
private CancellationTokenSource _connectUserCancellationTokenSource;
@@ -1041,7 +1088,16 @@ private void MarkChannelWatched(StreamChannel channel)
// after the server confirms the unwatch. Idempotent.
internal void InternalMarkChannelUnwatched(StreamChannel channel)
{
- if (channel == null || !channel.IsWatched)
+ if (channel == null)
+ {
+ return;
+ }
+
+ // Drop it from the recovery snapshot as well, or an unwatch performed while disconnected
+ // would be undone by the next reconnect re-watching it.
+ _recoveryChannelCids.Remove(channel.Cid);
+
+ if (!channel.IsWatched)
{
return;
}
@@ -1050,7 +1106,11 @@ internal void InternalMarkChannelUnwatched(StreamChannel channel)
_watchedChannels.Remove(channel);
}
- private void OnChannelLeftCache(StreamChannel channel) => _watchedChannels.Remove(channel);
+ private void OnChannelLeftCache(StreamChannel channel)
+ {
+ _watchedChannels.Remove(channel);
+ _recoveryChannelCids.Remove(channel.Cid);
+ }
private void TryCancelWaitingForUserConnection()
{
@@ -1143,20 +1203,341 @@ private void OnConnected(HealthCheckEventInternalDTO dto)
RestoreStateLostDuringDisconnect().LogIfFailed();
}
- private Task RestoreStateLostDuringDisconnect()
+ ///
+ /// Watches are bound to a websocket connection, and a reconnect always gets a new one, so a
+ /// reconnected client is watching nothing until something re-watches for it. Without this the
+ /// channels stay in local state but stop receiving events - the chat looks alive and silently
+ /// never updates again.
+ ///
+ /// This holds no matter how briefly the socket was down. The handshake payload
+ /// (ConnectPayload ) carries only the user and token plus
+ /// server_determines_connection_id ; there is no session or resume token, so the client
+ /// cannot ask the server to continue a previous connection, and the server mints a fresh
+ /// connection_id that every subsequent request is then tagged with. Do not confuse this
+ /// with the server-side health check grace period: that governs when the server notices a
+ /// silently dropped socket, which affects presence and the cleanup of the stale watcher entry.
+ /// It does not hand the old connection's watches to the new one - if anything a fast reconnect
+ /// is the worse case, because for a while the channel counts you as a watcher twice while the
+ /// connection you are actually reading receives nothing.
+ ///
+ /// Runs after every reconnect, in this order:
+ ///
+ /// 1. /sync catch-up, best effort. This is what makes a short outage recover with no
+ /// hole in the message list. It has to run first because a replayed channel.truncated
+ /// wipes the local message list, and doing that after step 2 would discard the page step 2
+ /// just fetched.
+ /// 2. Re-query and re-watch, unconditionally, whatever step 1 did. One query per 30 cids, with
+ /// State and Watch set, so a single request both re-hydrates and re-watches.
+ /// 3. Raise once.
+ ///
+ /// Steps 1 and 2 are individually fault-tolerant: a failure in one channel or one request must
+ /// not abandon the others, because this is the only recovery this reconnect gets.
+ ///
+ private async Task RestoreStateLostDuringDisconnect()
{
- if (!WatchedChannels.Any())
+ // A fresh login is not a recovery: there is no prior state to restore and no consumer
+ // expects a recovery signal for it. Anything left in the snapshot belongs to the previous
+ // session, and possibly to a different user, so drop it.
+ if (!_hasConnectedBefore)
{
- return Task.CompletedTask;
+ _hasConnectedBefore = true;
+ _recoveryChannelCids.Clear();
+ _inaccessibleCids.Clear();
+ return;
+ }
+
+ if (InternalLowLevelClient.Config.StateRecoveryStrategy == StateRecoveryStrategy.Disabled)
+ {
+ return;
+ }
+
+ var generation = ++_recoveryGeneration;
+
+ // Pooled - never leaves this method and the steps below only read it. The two collections
+ // handed to StateRecovered are not pooled, because subscribers keep them for as long as
+ // they like.
+ using (new ListPoolScope(out var recoverSet))
+ {
+ FillRecoverySet(recoverSet);
+
+ var refreshedChannels = new List();
+
+ try
+ {
+ if (recoverSet.Count > 0)
+ {
+ await TryCatchUpWithHistoryAsync(recoverSet, generation);
+ if (!IsRecoveryGenerationCurrent(generation))
+ {
+ return;
+ }
+
+ await RehydrateAndRewatchChannelsAsync(recoverSet, generation, refreshedChannels);
+ if (!IsRecoveryGenerationCurrent(generation))
+ {
+ return;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ // Defence in depth - every step already handles its own failures. Whatever happened,
+ // the consumer still gets told that recovery finished and which channels are stale.
+ _logs.Exception(e);
+ }
+
+ if (!IsRecoveryGenerationCurrent(generation))
+ {
+ return;
+ }
+
+ var unrecovered = new List();
+
+ using (new HashSetPoolScope(out var recovered))
+ {
+ for (var i = 0; i < refreshedChannels.Count; i++)
+ {
+ recovered.Add(refreshedChannels[i].Cid);
+ }
+
+ for (var i = 0; i < recoverSet.Count; i++)
+ {
+ if (!recovered.Contains(recoverSet[i]))
+ {
+ unrecovered.Add(recoverSet[i]);
+ }
+ }
+ }
+
+ if (unrecovered.Count > 0)
+ {
+ _logs.Warning(
+ $"Reconnect recovery could not restore {unrecovered.Count} channel(s): {string.Join(", ", unrecovered)}. " +
+ "Their local state is stale and they are no longer watched. See " +
+ nameof(StreamStateRecoveredEventArgs) + "." + nameof(StreamStateRecoveredEventArgs.UnrecoveredChannelCids));
+ }
+
+ StateRecovered?.Invoke(new StreamStateRecoveredEventArgs(refreshedChannels, unrecovered));
+ }
+ }
+
+ ///
+ /// Copy the most recently active cids from the snapshot
+ /// captured on the disconnect into .
+ ///
+ private void FillRecoverySet(List recoverSet)
+ {
+ if (_recoveryChannelCids.Count > MaxRecoveredChannels)
+ {
+ _logs.Warning(
+ $"{_recoveryChannelCids.Count} channels were being watched when the connection dropped, but reconnect " +
+ $"recovery restores at most {MaxRecoveredChannels}. The {MaxRecoveredChannels} most recently active are " +
+ "recovered; the rest keep stale state and are not re-watched. Watch fewer channels concurrently, or set " +
+ nameof(IStreamClientConfig) + "." + nameof(IStreamClientConfig.StateRecoveryStrategy) + " to " +
+ nameof(StateRecoveryStrategy.Disabled) + " and recover them yourself.");
+ }
+
+ var count = Math.Min(_recoveryChannelCids.Count, MaxRecoveredChannels);
+ for (var i = 0; i < count; i++)
+ {
+ recoverSet.Add(_recoveryChannelCids[i]);
+ }
+ }
+
+ private async Task TryCatchUpWithHistoryAsync(IReadOnlyList recoverSet, int generation)
+ {
+ try
+ {
+ var response = await InternalLowLevelClient.TrySyncHistoryAsync(recoverSet);
+
+ // null means the catch-up was skipped: no sync point, or one older than the 30 days
+ // the server accepts. Both used to return before any recovery ran; now step 2 still
+ // runs, which is the whole point of making it unconditional.
+ if (response?.Events == null || response.Events.Count == 0)
+ {
+ return;
+ }
+
+ if (!IsRecoveryGenerationCurrent(generation))
+ {
+ return;
+ }
+
+ if (response.InaccessibleCids != null)
+ {
+ // The server is telling us these will never come back. Recording them keeps the
+ // re-query from asking about deleted channels and stops us reporting them as a
+ // recovery failure every reconnect.
+ foreach (var cid in response.InaccessibleCids)
+ {
+ _inaccessibleCids.Add(cid);
+ }
+ }
+
+ if (InternalLowLevelClient.Config.StateRecoveryStrategy == StateRecoveryStrategy.BatchStateUpdate)
+ {
+ InternalLowLevelClient.ApplyHistoryEvents(response.Events);
+ }
+ else
+ {
+ InternalLowLevelClient.ReplayHistoryEvents(response.Events);
+ }
+ }
+ catch (StreamApiException ex) when (ex.IsInputError())
+ {
+ // HTTP 400 / code 4, "too many events to sync". The server counts events summed across
+ // every requested cid against a ceiling of roughly 1000 and refuses the whole request,
+ // so this is the normal outcome of a long outage on busy channels, not an anomaly.
+ // The re-query below is the fallback and recovers the same state minus the events that
+ // did not fit in the latest page.
+ _logs.Warning("The /sync catch-up was refused because too many events accumulated during the outage. " +
+ "Recovering channel state with a re-query instead. " + ex.Message);
+ }
+ catch (Exception ex)
+ {
+ _logs.Warning("The /sync catch-up failed. Recovering channel state with a re-query instead. " +
+ ex.Message);
+ }
+ }
+
+ ///
+ /// Re-hydrate and re-watch in one request per cids.
+ ///
+ ///
+ /// Unlike Android, this does not follow up with a per-channel re-watch for cids the query did
+ /// not return. Android needs that because it recovers through the customer's own channel-list
+ /// queries, which need not cover every active cid; this queries the recovery set by cid, so it
+ /// is exhaustive by construction. A cid the query omits is one the server will not return at
+ /// all - deleted, or no longer readable - and the only per-channel watch primitive available
+ /// is get-or-create, which would recreate a channel that was deleted while we were offline.
+ /// Such cids are reported through
+ /// instead.
+ ///
+ private async Task RehydrateAndRewatchChannelsAsync(IReadOnlyList recoverSet, int generation,
+ List refreshed)
+ {
+ var sort = ChannelSort.OrderByDescending(ChannelSortFieldName.LastMessageAt);
+
+ for (var i = 0; i < recoverSet.Count; i += MaxChannelsPerRecoveryQuery)
+ {
+ if (!IsRecoveryGenerationCurrent(generation))
+ {
+ return;
+ }
+
+ // Released only once the query has completed: the filter holds this list and the
+ // request body is serialized from it.
+ using (new ListPoolScope(out var chunk))
+ {
+ var chunkEnd = Math.Min(i + MaxChannelsPerRecoveryQuery, recoverSet.Count);
+ for (var j = i; j < chunkEnd; j++)
+ {
+ if (!_inaccessibleCids.Contains(recoverSet[j]))
+ {
+ chunk.Add(recoverSet[j]);
+ }
+ }
+
+ if (chunk.Count == 0)
+ {
+ continue;
+ }
+
+ var filters = new IFieldFilterRule[]
+ {
+ ChannelFilter.Cid.In(chunk),
+ };
+
+ IEnumerable channels;
+ try
+ {
+ channels = await QueryChannelsAsync(filters, sort, limit: chunk.Count);
+ }
+ catch (Exception e)
+ {
+ // One failed chunk (a rate limit part-way through a long watch list, a channel
+ // torn down while offline) must not cost the remaining chunks their recovery -
+ // there is no later retry this connection.
+ _logs.Warning($"Recovery query failed for {chunk.Count} channel(s). Continuing with the rest. " +
+ e.Message);
+ continue;
+ }
+
+ if (!IsRecoveryGenerationCurrent(generation))
+ {
+ return;
+ }
+
+ foreach (var channel in channels)
+ {
+ // The query merge path goes through UpdateFromDto, which does not trim, so a
+ // recovery merge can push Messages past MessageCacheWindow.MaxMessages.
+ ((StreamChannel)channel).InternalTrimMessageCache();
+ refreshed.Add(channel);
+ }
+ }
+ }
+ }
+
+ private bool IsRecoveryGenerationCurrent(int generation) => generation == _recoveryGeneration;
+
+ ///
+ /// Capture what was being watched when the connection dropped, then stop claiming those
+ /// watches: the server has dropped them, so would
+ /// otherwise report watches that no longer exist. Recovery restores both from the snapshot.
+ ///
+ private void SnapshotRecoverySetAndClearWatches()
+ {
+ // A reconnect attempt that fails transitions Connecting -> Disconnected again, and by then
+ // the watch list is already empty. Overwriting the snapshot at that point would throw away
+ // the only record of what needs recovering, and the reconnect that eventually succeeds
+ // would restore nothing at all - which is exactly the flaky-mobile-network case.
+ if (_watchedChannels.Count == 0)
+ {
+ return;
+ }
+
+ _recoveryChannelCids.Clear();
+
+ using (new ListPoolScope(out var ordered))
+ {
+ ordered.AddRange(_watchedChannels);
+ ordered.Sort(ByLastMessageAtDescending);
+
+ for (var i = 0; i < ordered.Count; i++)
+ {
+ _recoveryChannelCids.Add(ordered[i].Cid);
+ }
+ }
+
+ for (var i = 0; i < _watchedChannels.Count; i++)
+ {
+ ((StreamChannel)_watchedChannels[i]).IsWatched = false;
}
- return LowLevelClient.FetchAndProcessEventsSinceLastReceivedEvent(WatchedChannels.Select(c => c.Cid));
+ _watchedChannels.Clear();
}
private void OnDisconnected() => Disconnected?.Invoke();
private void OnConnectionStateChanged(ConnectionState previous, ConnectionState current)
- => ConnectionStateChanged?.Invoke(previous, current);
+ {
+ if (current == ConnectionState.Disconnected)
+ {
+ // Supersede any recovery still in flight before its responses can land on top of the
+ // state the next recovery is about to fetch. Some channel fields (read state, members,
+ // pinned messages) are replaced wholesale by a query response rather than merged, so a
+ // late response is not merely redundant, it can overwrite newer state.
+ _recoveryGeneration++;
+
+ if (InternalLowLevelClient.Config.StateRecoveryStrategy != StateRecoveryStrategy.Disabled)
+ {
+ SnapshotRecoverySetAndClearWatches();
+ }
+ }
+
+ ConnectionStateChanged?.Invoke(previous, current);
+ }
private void OnMessageDeleted(MessageDeletedEventInternalDTO eventMessageDeleted)
{
@@ -1606,16 +1987,29 @@ var reaction
}
}
+ // Who is currently watching is live presence, like typing: replaying it would leave watchers
+ // listed who left during the outage. The recovery query returns the authoritative watcher set.
private void OnUserWatchingStop(UserWatchingStopEventInternalDTO eventDto)
{
+ if (IsApplyingHistorySync)
+ {
+ return;
+ }
+
if (_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
{
streamChannel.InternalHandleUserWatchingStop(eventDto);
}
}
+ ///
private void OnUserWatchingStart(UserWatchingStartEventInternalDTO eventDto)
{
+ if (IsApplyingHistorySync)
+ {
+ return;
+ }
+
if (_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
{
streamChannel.InternalHandleUserWatchingStartEvent(eventDto);
@@ -1655,14 +2049,28 @@ private void OnUserPresenceChanged(UserPresenceChangedEventInternalDTO eventDto)
private void OnTypingStopped(TypingStopEventInternalDTO eventDto)
{
+ // Typing is live presence with no meaning in a history replay, and applying it is not
+ // merely redundant but wrong: a typing.start whose matching typing.stop fell outside the
+ // synced window would leave a user typing forever. Skipped entirely, state included.
+ if (IsApplyingHistorySync)
+ {
+ return;
+ }
+
if (_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
{
streamChannel.InternalHandleTypingStopped(eventDto);
}
}
+ ///
private void OnTypingStarted(TypingStartEventInternalDTO eventDto)
{
+ if (IsApplyingHistorySync)
+ {
+ return;
+ }
+
if (_cache.Channels.TryGet(eventDto.Cid, out var streamChannel))
{
streamChannel.InternalHandleTypingStarted(eventDto);
diff --git a/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryClientTests.cs b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryClientTests.cs
new file mode 100644
index 00000000..9fe9f9a3
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryClientTests.cs
@@ -0,0 +1,367 @@
+#if STREAM_TESTS_ENABLED
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using NSubstitute;
+using NUnit.Framework;
+using StreamChat.Core;
+using StreamChat.Core.Configs;
+using StreamChat.Core.InternalDTO.Responses;
+using StreamChat.Core.LowLevelClient;
+using StreamChat.Core.Responses;
+using StreamChat.Core.State.Caches;
+using StreamChat.Core.StatefulModels;
+using StreamChat.Libs.AppInfo;
+using StreamChat.Libs.Auth;
+using StreamChat.Libs.ChatInstanceRunner;
+using StreamChat.Libs.Http;
+using StreamChat.Libs.Logs;
+using StreamChat.Libs.NetworkMonitors;
+using StreamChat.Libs.Serialization;
+using StreamChat.Libs.Time;
+using StreamChat.Libs.Websockets;
+
+namespace StreamChat.Tests.StateSync.Unit
+{
+ ///
+ /// Unit tests for reconnect state recovery on , driven entirely
+ /// through mocked transports so connection state transitions can be sequenced exactly.
+ ///
+ internal class StateRecoveryClientTests
+ {
+ [SetUp]
+ public void Up()
+ {
+ _authCredentials = new AuthCredentials("api123", "user123", "token123");
+ _mockWebsocketClient = Substitute.For();
+ _mockHttpClient = Substitute.For();
+ _mockTimeService = Substitute.For();
+ _mockNetworkMonitor = Substitute.For();
+ _mockApplicationInfo = Substitute.For();
+ _mockLogs = Substitute.For();
+ _config = new StreamClientConfig();
+
+ _mockWebsocketClient.ConnectAsync(Arg.Any()).Returns(Task.CompletedTask);
+ _mockWebsocketClient.DisconnectAsync(Arg.Any(),
+ Arg.Any()).Returns(Task.CompletedTask);
+
+ _mockWebsocketClient.TryDequeueMessage(out Arg.Any()).Returns(arg =>
+ {
+ if (_pendingWebsocketMessages.Count == 0)
+ {
+ return false;
+ }
+
+ arg[0] = _pendingWebsocketMessages.Dequeue();
+ return true;
+ });
+
+ RespondWith(SyncEndpoint, "{\"events\":[]}");
+ RespondWith(QueryChannelsEndpoint, "{\"channels\":[]}");
+
+ _client = (StreamChatClient)StreamChatClient.CreateClientWithCustomDependencies(_mockWebsocketClient,
+ _mockHttpClient, new NewtonsoftJsonSerializer(), _mockTimeService, _mockNetworkMonitor,
+ _mockApplicationInfo, _mockLogs, _config);
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ _client.Dispose();
+ _client = null;
+ _pendingWebsocketMessages.Clear();
+ _recoveredEvents.Clear();
+ }
+
+ [Test]
+ public void when_first_connect_expect_no_recovery_and_no_state_recovered_event()
+ {
+ Connect();
+
+ Assert.AreEqual(0, _recoveredEvents.Count,
+ "A fresh login is not a recovery - firing StateRecovered here would make it useless as a signal.");
+ AssertQueryChannelsCallCount(0);
+ }
+
+ [Test]
+ public void when_reconnected_expect_channels_requeried_even_though_sync_was_skipped()
+ {
+ Connect();
+ WatchChannel("messaging:a");
+ WatchChannel("messaging:b");
+
+ DropConnection();
+ Reconnect();
+
+ // The whole point of #227/#232: the re-query is what re-establishes the watches, so it has
+ // to run whether or not the /sync catch-up did anything. Here it was skipped outright,
+ // because the health check carried no created_at so there is no sync point.
+ AssertQueryChannelsCallCount(1);
+ Assert.AreEqual(1, _recoveredEvents.Count);
+ }
+
+ [Test]
+ public void when_connection_drops_expect_watches_released_and_snapshot_taken()
+ {
+ Connect();
+ var channel = WatchChannel("messaging:a");
+
+ DropConnection();
+
+ // The server dropped the watch, so continuing to report it would be a lie - and would make
+ // IStreamChannel.WatchAsync a silent no-op for a channel that is not actually watched.
+ Assert.IsFalse(channel.IsWatched);
+ Assert.AreEqual(0, _client.WatchedChannels.Count);
+ Assert.AreEqual(new[] { "messaging:a" }, RecoverySnapshot());
+ }
+
+ [Test]
+ public void when_reconnect_attempt_fails_expect_recovery_snapshot_preserved()
+ {
+ Connect();
+ WatchChannel("messaging:a");
+ WatchChannel("messaging:b");
+
+ DropConnection();
+ FailReconnectAttempt();
+ FailReconnectAttempt();
+
+ // A failed attempt transitions Connecting -> Disconnected with an already-empty watch list.
+ // Re-snapshotting there would discard the only record of what needs recovering, and the
+ // attempt that eventually succeeds would restore nothing - the flaky-mobile-network case.
+ Assert.AreEqual(new[] { "messaging:a", "messaging:b" }, RecoverySnapshot().OrderBy(_ => _).ToArray());
+
+ Reconnect();
+ AssertQueryChannelsCallCount(1);
+ }
+
+ [Test]
+ public void when_channels_cannot_be_recovered_expect_them_reported_as_unrecovered()
+ {
+ Connect();
+ WatchChannel("messaging:a");
+
+ DropConnection();
+ Reconnect();
+
+ // The mocked query returns no channels, which is what the server does for a channel that
+ // was deleted or that the local user lost access to while offline.
+ Assert.AreEqual(1, _recoveredEvents.Count);
+ Assert.AreEqual(0, _recoveredEvents[0].Channels.Count);
+ Assert.AreEqual(new[] { "messaging:a" }, _recoveredEvents[0].UnrecoveredChannelCids.ToArray());
+ Assert.IsFalse(_recoveredEvents[0].IsComplete);
+ }
+
+ [Test]
+ public void when_recovery_query_fails_expect_remaining_chunks_still_queried()
+ {
+ Connect();
+ for (var i = 0; i < 40; i++)
+ {
+ WatchChannel($"messaging:channel-{i:D2}");
+ }
+
+ var callCount = 0;
+ _mockHttpClient
+ .SendHttpRequestAsync(Arg.Is(HttpMethodType.Post),
+ Arg.Is(uri => uri.AbsolutePath.EndsWith(QueryChannelsEndpoint)), Arg.Any())
+ .Returns(_ =>
+ {
+ callCount++;
+ return callCount == 1
+ ? new HttpResponse(false, 429, "{\"code\":9,\"message\":\"rate limited\"}", null, null)
+ : new HttpResponse(true, 200, "{\"channels\":[]}", null, null);
+ });
+
+ DropConnection();
+ Reconnect();
+
+ // 40 cids is two chunks of 30 and 10. There is no later retry within a connection, so a
+ // failed chunk must not cost the remaining chunks their recovery.
+ Assert.AreEqual(2, callCount);
+ Assert.AreEqual(1, _recoveredEvents.Count);
+ }
+
+ [Test]
+ public void when_recovery_set_exceeds_cap_expect_only_capped_channels_queried()
+ {
+ Connect();
+ for (var i = 0; i < StreamChatClient.MaxRecoveredChannels + 25; i++)
+ {
+ WatchChannel($"messaging:channel-{i:D3}");
+ }
+
+ DropConnection();
+ Reconnect();
+
+ // Capped at 100, chunked by 30 -> 4 requests. Uncapped this would be 5, and would keep
+ // growing with the watch list on every single reconnect.
+ AssertQueryChannelsCallCount(4);
+ }
+
+ [Test]
+ public void when_strategy_is_disabled_expect_no_recovery_and_watches_left_untouched()
+ {
+ _config.StateRecoveryStrategy = StateRecoveryStrategy.Disabled;
+
+ Connect();
+ var channel = WatchChannel("messaging:a");
+
+ DropConnection();
+ Reconnect();
+
+ AssertQueryChannelsCallCount(0);
+ Assert.AreEqual(0, _recoveredEvents.Count);
+
+ // Disabled means the SDK does nothing, so WatchedChannels stays the record of what the
+ // consumer was watching and is theirs to recover from.
+ Assert.IsTrue(channel.IsWatched);
+ Assert.AreEqual(1, _client.WatchedChannels.Count);
+ }
+
+ [Test]
+ public void when_user_disconnects_and_connects_again_expect_no_recovery_of_previous_session()
+ {
+ Connect();
+ WatchChannel("messaging:a");
+
+ _client.DisconnectUserAsync().GetAwaiter().GetResult();
+ DropConnection();
+
+ Connect();
+
+ // A new login must not recover, or re-watch, channels belonging to the session that ended -
+ // possibly for a different user.
+ AssertQueryChannelsCallCount(0);
+ Assert.AreEqual(0, _recoveredEvents.Count);
+ }
+
+ [Test]
+ public void when_channel_unwatched_while_disconnected_expect_it_not_recovered()
+ {
+ Connect();
+ var channel = WatchChannel("messaging:a");
+ WatchChannel("messaging:b");
+
+ DropConnection();
+ InvokeMarkChannelUnwatched(channel);
+ Reconnect();
+
+ Assert.AreEqual(new[] { "messaging:b" }, RecoverySnapshot());
+ }
+
+ private const string SyncEndpoint = "/sync";
+ private const string QueryChannelsEndpoint = "/channels";
+
+ private void RespondWith(string endpointSuffix, string json)
+ {
+ _mockHttpClient
+ .SendHttpRequestAsync(Arg.Is(HttpMethodType.Post),
+ Arg.Is(uri => uri.AbsolutePath.EndsWith(endpointSuffix)), Arg.Any())
+ .Returns(new HttpResponse(true, 200, json, null, null));
+ }
+
+ private void AssertQueryChannelsCallCount(int expected)
+ {
+ _mockHttpClient.Received(expected).SendHttpRequestAsync(Arg.Is(HttpMethodType.Post),
+ Arg.Is(uri => uri.AbsolutePath.EndsWith(QueryChannelsEndpoint)), Arg.Any());
+ }
+
+ private void Connect()
+ {
+ _client.StateRecovered -= OnStateRecovered;
+ _client.StateRecovered += OnStateRecovered;
+
+ var connectTask = _client.ConnectUserAsync(_authCredentials);
+ _pendingWebsocketMessages.Enqueue(HealthCheckJson);
+ Update();
+
+ Assert.IsTrue(connectTask.IsCompleted, "Expected the mocked health check to complete the connect.");
+ Assert.AreEqual(ConnectionState.Connected, _client.ConnectionState);
+ }
+
+ private void Reconnect()
+ {
+ _client.InternalLowLevelClient.Connect();
+ _pendingWebsocketMessages.Enqueue(HealthCheckJson);
+ Update();
+
+ Assert.AreEqual(ConnectionState.Connected, _client.ConnectionState);
+ }
+
+ private void DropConnection()
+ {
+ _mockWebsocketClient.Disconnected += Raise.Event();
+ Update();
+
+ Assert.AreEqual(ConnectionState.Disconnected, _client.ConnectionState);
+ }
+
+ private void FailReconnectAttempt()
+ {
+ _client.InternalLowLevelClient.Connect();
+ Assert.AreEqual(ConnectionState.Connecting, _client.ConnectionState);
+
+ _mockWebsocketClient.ConnectionFailed += Raise.Event();
+ Update();
+
+ Assert.AreEqual(ConnectionState.Disconnected, _client.ConnectionState);
+ }
+
+ private void Update() => ((IStreamChatClientEventsListener)_client).Update();
+
+ private void OnStateRecovered(StreamStateRecoveredEventArgs args) => _recoveredEvents.Add(args);
+
+ private IStreamChannel WatchChannel(string cid)
+ {
+ var separatorIndex = cid.IndexOf(':');
+ var channel = _client.InternalCache.TryCreateOrUpdate(new ChannelResponseInternalDTO
+ {
+ Cid = cid,
+ Type = cid.Substring(0, separatorIndex),
+ Id = cid.Substring(separatorIndex + 1),
+ });
+
+ InvokePrivate("MarkChannelWatched", channel);
+ return channel;
+ }
+
+ private void InvokeMarkChannelUnwatched(IStreamChannel channel)
+ => InvokePrivate("InternalMarkChannelUnwatched", channel);
+
+ private void InvokePrivate(string methodName, object argument)
+ {
+ var method = typeof(StreamChatClient).GetMethod(methodName,
+ BindingFlags.Instance | BindingFlags.NonPublic);
+ Assert.IsNotNull(method, $"Expected {methodName} to exist.");
+ method.Invoke(_client, new[] { argument });
+ }
+
+ private string[] RecoverySnapshot()
+ {
+ var field = typeof(StreamChatClient).GetField("_recoveryChannelCids",
+ BindingFlags.Instance | BindingFlags.NonPublic);
+ Assert.IsNotNull(field, "Expected _recoveryChannelCids to exist.");
+ return ((List)field.GetValue(_client)).ToArray();
+ }
+
+ private const string HealthCheckJson = "{\"connection_id\":\"fakeId\",\"type\":\"health.check\"}";
+
+ private readonly Queue _pendingWebsocketMessages = new Queue();
+ private readonly List _recoveredEvents =
+ new List();
+
+ private StreamChatClient _client;
+ private StreamClientConfig _config;
+ private AuthCredentials _authCredentials;
+ private IWebsocketClient _mockWebsocketClient;
+ private IApplicationInfo _mockApplicationInfo;
+ private ILogs _mockLogs;
+ private ITimeService _mockTimeService;
+ private INetworkMonitor _mockNetworkMonitor;
+ private IHttpClient _mockHttpClient;
+ }
+}
+#endif
diff --git a/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryClientTests.cs.meta b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryClientTests.cs.meta
new file mode 100644
index 00000000..7ae2eba4
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryClientTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 533cd95f3d407dc42934ec9bb226a9e0
\ No newline at end of file
diff --git a/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryLowLevelTests.cs b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryLowLevelTests.cs
new file mode 100644
index 00000000..31466051
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryLowLevelTests.cs
@@ -0,0 +1,326 @@
+#if STREAM_TESTS_ENABLED
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using NSubstitute;
+using NUnit.Framework;
+using StreamChat.Core.Configs;
+using StreamChat.Core.LowLevelClient;
+using StreamChat.Libs.AppInfo;
+using StreamChat.Libs.Auth;
+using StreamChat.Libs.Http;
+using StreamChat.Libs.Logs;
+using StreamChat.Libs.NetworkMonitors;
+using StreamChat.Libs.Serialization;
+using StreamChat.Libs.Time;
+using StreamChat.Libs.Websockets;
+
+namespace StreamChat.Tests.StateSync.Unit
+{
+ ///
+ /// Unit tests for the two history application modes on -
+ /// and
+ /// - and for the /sync request shape.
+ ///
+ internal class StateRecoveryLowLevelTests
+ {
+ [SetUp]
+ public void Up()
+ {
+ _authCredentials = new AuthCredentials("api123", "token123", "user123");
+ _mockWebsocketClient = Substitute.For();
+ _mockHttpClient = Substitute.For();
+ _serializer = new NewtonsoftJsonSerializer();
+ _mockTimeService = Substitute.For();
+ _mockNetworkMonitor = Substitute.For();
+ _mockApplicationInfo = Substitute.For();
+ _mockLogs = Substitute.For();
+ _mockStreamClientConfig = Substitute.For();
+
+ _lowLevelClient = CreateClient();
+ _lowLevelClient.Update(0.1f);
+
+ _mockHttpClient
+ .SendHttpRequestAsync(Arg.Is(HttpMethodType.Post), Arg.Any(), Arg.Any())
+ .Returns(new HttpResponse(true, 200, "{\"events\":[]}", null, null));
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ for (var i = _clientsToDispose.Count - 1; i >= 0; i--)
+ {
+ _clientsToDispose[i].Dispose();
+ }
+
+ _clientsToDispose.Clear();
+ _lowLevelClient = null;
+ }
+
+ [Test]
+ public void when_sync_requested_with_more_than_100_cids_expect_only_100_sent()
+ {
+ var now = new DateTimeOffset(2026, 8, 10, 12, 0, 0, TimeSpan.Zero);
+ _mockTimeService.Now.Returns(now);
+ SetDisconnectionLastEventReceivedAt(_lowLevelClient, now.AddHours(-1));
+
+ var cids = Enumerable.Range(0, 150).Select(i => $"messaging:channel-{i}").ToList();
+
+ _lowLevelClient.TrySyncHistoryAsync(cids).GetAwaiter().GetResult();
+
+ _mockHttpClient.Received(1).SendHttpRequestAsync(
+ Arg.Is(HttpMethodType.Post),
+ Arg.Is(uri => uri.AbsolutePath.EndsWith("/sync")),
+ Arg.Is(body => CountSyncCids(body) == StreamChatLowLevelClient.MaxSyncChannelCids));
+ }
+
+ [Test]
+ public void when_sync_requested_expect_inaccessible_cids_asked_for()
+ {
+ var now = new DateTimeOffset(2026, 8, 10, 12, 0, 0, TimeSpan.Zero);
+ _mockTimeService.Now.Returns(now);
+ SetDisconnectionLastEventReceivedAt(_lowLevelClient, now.AddHours(-1));
+
+ _lowLevelClient.TrySyncHistoryAsync(new[] { "messaging:a" }).GetAwaiter().GetResult();
+
+ // Without this the response cannot distinguish a deleted channel from one the query
+ // happened to omit, and recovery would keep retrying it forever.
+ _mockHttpClient.Received(1).SendHttpRequestAsync(
+ Arg.Is(HttpMethodType.Post),
+ Arg.Is(uri => uri.AbsolutePath.EndsWith("/sync")),
+ Arg.Is(body => GetBoolMember(body, "WithInaccessibleCids") == true));
+ }
+
+ [Test]
+ public void when_history_batch_applied_expect_no_public_message_received()
+ {
+ var received = 0;
+ _lowLevelClient.MessageReceived += _ => received++;
+
+ var result = _lowLevelClient.ApplyHistoryEvents(new List { MessageNewJson("msg-1", NewestCreatedAt) });
+
+ Assert.AreEqual(0, received, "A silent history batch must not raise public per-event callbacks.");
+ Assert.AreEqual(0, result.FailedEventCount);
+ Assert.AreEqual(NewestCreatedAt, result.MaxAppliedCreatedAt);
+ }
+
+ [Test]
+ public void when_history_batch_replayed_expect_public_message_received()
+ {
+ var received = 0;
+ _lowLevelClient.MessageReceived += _ => received++;
+
+ _lowLevelClient.ReplayHistoryEvents(new List { MessageNewJson("msg-1", NewestCreatedAt) });
+
+ Assert.AreEqual(1, received,
+ "ReplayEvents is the default strategy and must keep raising per-event callbacks for back-compat.");
+ }
+
+ [Test]
+ public void when_history_batch_contains_custom_event_expect_it_delivered_per_event()
+ {
+ var received = new List();
+ _lowLevelClient.CustomEventReceived += e => received.Add(e.Type);
+
+ _lowLevelClient.ApplyHistoryEvents(new List
+ {
+ CustomEventJson("game.state", NewestCreatedAt),
+ });
+
+ // Custom events have no representation in local state, so suppressing them would lose the
+ // payload with no way for a consumer to recover it.
+ Assert.AreEqual(new[] { "game.state" }, received.ToArray());
+ }
+
+ [Test]
+ public void when_history_batch_applied_expect_watermark_advanced_once_to_newest_applied_event()
+ {
+ var client = CreateClient();
+
+ client.ApplyHistoryEvents(new List
+ {
+ MessageNewJson("msg-1", NewestCreatedAt.AddMinutes(-10)),
+ MessageNewJson("msg-2", NewestCreatedAt),
+ MessageNewJson("msg-3", NewestCreatedAt.AddMinutes(-5)),
+ });
+
+ Assert.AreEqual(NewestCreatedAt, GetLastEventReceivedAt(client),
+ "The batch must advance the watermark exactly once, to its newest event.");
+ }
+
+ [Test]
+ public void when_history_batch_contains_malformed_event_expect_remaining_events_still_applied()
+ {
+ var client = CreateClient();
+ var newest = NewestCreatedAt;
+
+ var result = client.ApplyHistoryEvents(new List
+ {
+ MessageNewJson("msg-1", newest.AddMinutes(-10)),
+ $"{{\"type\":\"message.new\",\"cid\":\"messaging:test\",\"created_at\":\"{newest.AddMinutes(-1):O}\",\"message\":\"not-an-object\"}}",
+ MessageNewJson("msg-3", newest.AddMinutes(-5)),
+ });
+
+ Assert.AreEqual(1, result.FailedEventCount);
+
+ // The watermark must not claim the failed event was applied, or the next reconnect would
+ // never ask for it again.
+ Assert.AreEqual(newest.AddMinutes(-5), result.MaxAppliedCreatedAt);
+ Assert.AreEqual(newest.AddMinutes(-5), GetLastEventReceivedAt(client));
+ }
+
+ [Test]
+ public void when_history_event_older_than_watermark_expect_watermark_not_regressed()
+ {
+ var client = CreateClient();
+ SetLastEventReceivedAt(client, NewestCreatedAt);
+
+ client.ApplyHistoryEvents(new List { MessageNewJson("msg-1", NewestCreatedAt.AddDays(-1)) });
+
+ Assert.AreEqual(NewestCreatedAt, GetLastEventReceivedAt(client));
+ }
+
+ [Test]
+ public void when_health_check_arrives_on_live_socket_expect_liveness_stamped_before_handlers()
+ {
+ var client = CreateClientWithMessages(HealthCheckJson());
+ client.Connect();
+ client.Update(0.2f);
+
+ _mockTimeService.Time.Returns(12f);
+ EnqueueMessages(HealthCheckJson());
+ client.Update(0.2f);
+
+ Assert.AreEqual(12f, GetLastHealthCheckReceivedTime(client),
+ "Liveness must be stamped when the health check is read, not after consumer handlers run.");
+ }
+
+ [Test]
+ public void when_health_check_arrives_from_history_replay_expect_liveness_not_stamped()
+ {
+ var client = CreateClientWithMessages(HealthCheckJson());
+ client.Connect();
+ client.Update(0.2f);
+
+ var stampedOnConnect = GetLastHealthCheckReceivedTime(client);
+
+ _mockTimeService.Time.Returns(99f);
+ client.ReplayHistoryEvents(new List { HealthCheckJson() });
+
+ Assert.AreEqual(stampedOnConnect, GetLastHealthCheckReceivedTime(client),
+ "A replayed health check proves nothing about the current socket and must not extend liveness.");
+ }
+
+ private static readonly DateTimeOffset NewestCreatedAt =
+ new DateTimeOffset(2026, 8, 10, 11, 0, 0, TimeSpan.Zero);
+
+ private const string TestCid = "messaging:test";
+
+ private static string MessageNewJson(string messageId, DateTimeOffset createdAt)
+ => $"{{\"type\":\"message.new\",\"cid\":\"{TestCid}\",\"created_at\":\"{createdAt:O}\"," +
+ $"\"message\":{{\"id\":\"{messageId}\",\"text\":\"hi\",\"created_at\":\"{createdAt:O}\"," +
+ $"\"updated_at\":\"{createdAt:O}\",\"user\":{{\"id\":\"user-1\"}}}}}}";
+
+ private static string CustomEventJson(string type, DateTimeOffset createdAt)
+ => $"{{\"type\":\"{type}\",\"cid\":\"{TestCid}\",\"created_at\":\"{createdAt:O}\"," +
+ "\"user\":{\"id\":\"user-1\"}}";
+
+ private static string HealthCheckJson()
+ => "{\"connection_id\":\"fakeId\",\"type\":\"health.check\"}";
+
+ private static int CountSyncCids(object requestBody)
+ {
+ var list = GetMember(requestBody, "ChannelCids") as System.Collections.IList;
+ return list?.Count ?? -1;
+ }
+
+ private static bool? GetBoolMember(object requestBody, string name) => GetMember(requestBody, name) as bool?;
+
+ private static object GetMember(object requestBody, string name)
+ {
+ const BindingFlags flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+
+ var property = requestBody.GetType().GetProperty(name, flags);
+ if (property != null)
+ {
+ return property.GetValue(requestBody);
+ }
+
+ return requestBody.GetType().GetField(name, flags)?.GetValue(requestBody);
+ }
+
+ private static void SetDisconnectionLastEventReceivedAt(StreamChatLowLevelClient client, DateTimeOffset value)
+ => GetPrivateField("_disconnectionLastEventReceivedAt").SetValue(client, (DateTimeOffset?)value);
+
+ private static void SetLastEventReceivedAt(StreamChatLowLevelClient client, DateTimeOffset value)
+ => GetPrivateField("_lastEventReceivedAt").SetValue(client, (DateTimeOffset?)value);
+
+ private static DateTimeOffset? GetLastEventReceivedAt(StreamChatLowLevelClient client)
+ => (DateTimeOffset?)GetPrivateField("_lastEventReceivedAt").GetValue(client);
+
+ private static float GetLastHealthCheckReceivedTime(StreamChatLowLevelClient client)
+ => (float)GetPrivateField("_lastHealthCheckReceivedTime").GetValue(client);
+
+ private static FieldInfo GetPrivateField(string name)
+ {
+ var field = typeof(StreamChatLowLevelClient).GetField(name,
+ BindingFlags.Instance | BindingFlags.NonPublic);
+ Assert.IsNotNull(field, $"Expected {name} field to exist.");
+ return field;
+ }
+
+ private StreamChatLowLevelClient CreateClient()
+ {
+ var client = new StreamChatLowLevelClient(_authCredentials, _mockWebsocketClient, _mockHttpClient,
+ _serializer, _mockTimeService, _mockNetworkMonitor, _mockApplicationInfo, _mockLogs,
+ _mockStreamClientConfig);
+
+ _clientsToDispose.Add(client);
+ return client;
+ }
+
+ private StreamChatLowLevelClient CreateClientWithMessages(params string[] websocketMessages)
+ {
+ var client = CreateClient();
+ _mockWebsocketClient.ConnectAsync(Arg.Any()).Returns(System.Threading.Tasks.Task.CompletedTask);
+
+ _mockWebsocketClient.TryDequeueMessage(out Arg.Any()).Returns(arg =>
+ {
+ if (_pendingWebsocketMessages.Count == 0)
+ {
+ return false;
+ }
+
+ arg[0] = _pendingWebsocketMessages.Dequeue();
+ return true;
+ });
+
+ EnqueueMessages(websocketMessages);
+ return client;
+ }
+
+ private void EnqueueMessages(params string[] websocketMessages)
+ {
+ foreach (var message in websocketMessages)
+ {
+ _pendingWebsocketMessages.Enqueue(message);
+ }
+ }
+
+ private readonly List _clientsToDispose = new List();
+ private readonly Queue _pendingWebsocketMessages = new Queue();
+
+ private StreamChatLowLevelClient _lowLevelClient;
+ private AuthCredentials _authCredentials;
+ private IWebsocketClient _mockWebsocketClient;
+ private IApplicationInfo _mockApplicationInfo;
+ private ILogs _mockLogs;
+ private ISerializer _serializer;
+ private ITimeService _mockTimeService;
+ private INetworkMonitor _mockNetworkMonitor;
+ private IHttpClient _mockHttpClient;
+ private IStreamClientConfig _mockStreamClientConfig;
+ }
+}
+#endif
diff --git a/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryLowLevelTests.cs.meta b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryLowLevelTests.cs.meta
new file mode 100644
index 00000000..f6c190db
--- /dev/null
+++ b/Assets/Plugins/StreamChat/Tests/StateSync/StateRecoveryLowLevelTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b019eca0edff8ba44971000de05399a6
\ No newline at end of file