feat(storage): sweep embeds unreachable only on a drop from Connected

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

Author: HandyS11

src/RustPlusBot.Features.StorageMonitors/Relaying/StorageMonitorStateRelay.cs

@@ -1,12 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
-using RustPlusBot.Domain.Connections;
 using RustPlusBot.Domain.StorageMonitors;
 using RustPlusBot.Features.StorageMonitors.Posting;
 using RustPlusBot.Features.StorageMonitors.Rendering;
 using RustPlusBot.Features.Workspace.Locating;
-using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.StorageMonitors;
 using RustPlusBot.Persistence.Workspace;
 
@@ -98,7 +96,7 @@ await RenderAsync(store, monitor, contents, evt.GuildId, evt.ServerId, culture,
         }
     }
 
-    /// <summary>Handles a connection-status change: a non-Connected server marks its storage monitor embeds unreachable.</summary>
+    /// <summary>Handles a connection-status change: a drop from Connected marks its storage embeds unreachable.</summary>
     /// <param name="evt">The connection-status change.</param>
     /// <param name="cancellationToken">A cancellation token.</param>
     /// <returns>A task that completes when every affected embed has been re-rendered.</returns>
@@ -107,18 +105,17 @@ public async Task HandleConnectionStatusAsync(
         CancellationToken cancellationToken)
     {
         ArgumentNullException.ThrowIfNull(evt);
+        if (evt.IsConnected || !evt.WasConnected)
+        {
+            // Connected: the supervisor's prime path republishes real state — nothing to do.
+            // Never-connected in this process (boot, reconnect-loop repeats): keep the last-run
+            // embeds; only a drop from Connected sweeps them to unreachable.
+            return;
+        }
+
         var scope = scopeFactory.CreateAsyncScope();
         await using (scope.ConfigureAwait(false))
         {
-            var connections = scope.ServiceProvider.GetRequiredService<IConnectionStore>();
-            var state = await connections.GetStateAsync(evt.GuildId, evt.ServerId, cancellationToken)
-                .ConfigureAwait(false);
-            if (state is { Status: ConnectionStatus.Connected })
-            {
-                // The supervisor's prime path republishes real state on connect; nothing to do here.
-                return;
-            }
-
             var store = scope.ServiceProvider.GetRequiredService<IStorageMonitorStore>();
             var monitors = await store.ListByServerAsync(evt.GuildId, evt.ServerId, cancellationToken)
                 .ConfigureAwait(false);

tests/RustPlusBot.Features.StorageMonitors.Tests/Hosting/StorageMonitorsHostedServiceTests.cs

@@ -3,7 +3,6 @@
 using NSubstitute;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
-using RustPlusBot.Domain.Connections;
 using RustPlusBot.Domain.StorageMonitors;
 using RustPlusBot.Features.ItemData.Naming;
 using RustPlusBot.Features.StorageMonitors.Hosting;
@@ -13,7 +12,6 @@
 using RustPlusBot.Features.StorageMonitors.Rendering;
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Localization;
-using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.StorageMonitors;
 using RustPlusBot.Persistence.Workspace;
 
@@ -26,13 +24,11 @@ public sealed class StorageMonitorsHostedServiceTests
     private static Harness Create()
     {
         var store = Substitute.For<IStorageMonitorStore>();
-        var connections = Substitute.For<IConnectionStore>();
         var workspace = Substitute.For<IWorkspaceStore>();
         workspace.GetCultureAsync(Arg.Any<ulong>(), Arg.Any<CancellationToken>()).Returns("en");
 
         var services = new ServiceCollection();
         services.AddScoped(_ => store);
-        services.AddScoped(_ => connections);
         services.AddScoped(_ => workspace);
         var provider = services.BuildServiceProvider();
         var scopeFactory = provider.GetRequiredService<IServiceScopeFactory>();
@@ -66,7 +62,7 @@ private static Harness Create()
             relay,
             NullLogger<StorageMonitorsHostedService>.Instance);
 
-        return new Harness(service, bus, store, connections, relayPoster, relayLocator, pairingLocator, pairingPoster);
+        return new Harness(service, bus, store, relayPoster, relayLocator, pairingLocator, pairingPoster);
     }
 
     [Fact]
@@ -137,11 +133,6 @@ public async Task ConnectionStatusChangedEvent_non_connected_routes_to_relay_and
         await h.Service.StartAsync(default);
 
         var serverId = Guid.NewGuid();
-        h.Connections.GetStateAsync(Guild, serverId, Arg.Any<CancellationToken>())
-            .Returns(new ConnectionState
-            {
-                GuildId = Guild, RustServerId = serverId, Status = ConnectionStatus.Unreachable,
-            });
         h.Store.ListByServerAsync(Guild, serverId, Arg.Any<CancellationToken>())
             .Returns(
             [
@@ -242,7 +233,6 @@ private sealed record Harness(
         StorageMonitorsHostedService Service,
         InMemoryEventBus Bus,
         IStorageMonitorStore Store,
-        IConnectionStore Connections,
         IStorageMonitorChannelPoster Poster,
         IStorageMonitorChannelLocator Locator,
         IStorageMonitorChannelLocator PairingLocator,

tests/RustPlusBot.Features.StorageMonitors.Tests/StorageMonitorStateRelayTests.cs

@@ -2,7 +2,6 @@
 using NSubstitute;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
-using RustPlusBot.Domain.Connections;
 using RustPlusBot.Domain.StorageMonitors;
 using RustPlusBot.Features.ItemData.Naming;
 using RustPlusBot.Features.StorageMonitors.Posting;
@@ -24,13 +23,11 @@ public sealed class StorageMonitorStateRelayTests
     private static Harness Create()
     {
         var store = Substitute.For<IStorageMonitorStore>();
-        var connections = Substitute.For<IConnectionStore>();
         var workspace = Substitute.For<IWorkspaceStore>();
         workspace.GetCultureAsync(Arg.Any<ulong>(), Arg.Any<CancellationToken>()).Returns("en");
 
         var services = new ServiceCollection();
         services.AddScoped(_ => store);
-        services.AddScoped(_ => connections);
         services.AddScoped(_ => workspace);
         var provider = services.BuildServiceProvider();
 
@@ -49,7 +46,7 @@ private static Harness Create()
         var relay = new StorageMonitorStateRelay(
             provider.GetRequiredService<IServiceScopeFactory>(), locator, poster, renderer, query);
 
-        return new Harness(relay, store, poster, connections, query);
+        return new Harness(relay, store, poster, query);
     }
 
     [Fact]
@@ -95,11 +92,6 @@ await h.Poster.Received(1).EnsureAsync(555UL, Arg.Any<ulong?>(),
     public async Task HandleConnectionStatusAsync_NotConnected_PostsUnreachable()
     {
         var h = Create();
-        h.Connections.GetStateAsync(Guild, Server, Arg.Any<CancellationToken>())
-            .Returns(new ConnectionState
-            {
-                GuildId = Guild, RustServerId = Server, Status = ConnectionStatus.Unreachable,
-            });
         h.Store.ListByServerAsync(Guild, Server, Arg.Any<CancellationToken>())
             .Returns(
             [
@@ -126,11 +118,6 @@ await h.Poster.Received(1).EnsureAsync(555UL, Arg.Any<ulong?>(),
     public async Task HandleConnectionStatusAsync_Connected_DoesNothing()
     {
         var h = Create();
-        h.Connections.GetStateAsync(Guild, Server, Arg.Any<CancellationToken>())
-            .Returns(new ConnectionState
-            {
-                GuildId = Guild, RustServerId = Server, Status = ConnectionStatus.Connected,
-            });
 
         await h.Relay.HandleConnectionStatusAsync(
             new ConnectionStatusChangedEvent(Guild, Server, IsConnected: true, WasConnected: true),
@@ -141,6 +128,33 @@ await h.Poster.DidNotReceive().EnsureAsync(Arg.Any<ulong>(), Arg.Any<ulong?>(),
             Arg.Any<CancellationToken>());
     }
 
+    /// <summary>Boot/reconnect-loop statuses (never Connected in this process) must not sweep — embeds keep their last-run state until the prime republishes.</summary>
+    [Fact]
+    public async Task HandleConnectionStatusAsync_BootWithoutPriorConnection_DoesNothing()
+    {
+        var h = Create();
+        h.Store.ListByServerAsync(Guild, Server, Arg.Any<CancellationToken>())
+            .Returns(
+            [
+                new SmartStorageMonitor
+                {
+                    GuildId = Guild,
+                    ServerId = Server,
+                    EntityId = 7UL,
+                    Name = "TC",
+                    MessageId = null,
+                },
+            ]);
+
+        await h.Relay.HandleConnectionStatusAsync(
+            new ConnectionStatusChangedEvent(Guild, Server, IsConnected: false, WasConnected: false),
+            CancellationToken.None);
+
+        await h.Poster.DidNotReceive().EnsureAsync(Arg.Any<ulong>(), Arg.Any<ulong?>(),
+            Arg.Any<global::Discord.Embed>(), Arg.Any<global::Discord.MessageComponent>(),
+            Arg.Any<CancellationToken>());
+    }
+
     [Fact]
     public async Task HandleReachabilityChangedAsync_ForeignEntity_DoesNothing()
     {
@@ -243,6 +257,5 @@ private sealed record Harness(
         StorageMonitorStateRelay Relay,
         IStorageMonitorStore Store,
         IStorageMonitorChannelPoster Poster,
-        IConnectionStore Connections,
         IRustServerQuery Query);
 }