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

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

Author: HandyS11

src/RustPlusBot.Features.Switches/Relaying/SwitchStateRelay.cs

@@ -1,18 +1,15 @@
 using Microsoft.Extensions.DependencyInjection;
-using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
-using RustPlusBot.Domain.Connections;
 using RustPlusBot.Domain.Switches;
 using RustPlusBot.Features.Switches.Posting;
 using RustPlusBot.Features.Switches.Rendering;
 using RustPlusBot.Features.Workspace.Locating;
-using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.Switches;
 using RustPlusBot.Persistence.Workspace;
 
 namespace RustPlusBot.Features.Switches.Relaying;
 
-/// <summary>Keeps switch embeds in sync: live state changes re-render; a non-Connected server marks them unreachable.</summary>
+/// <summary>Keeps switch embeds in sync: live state changes re-render; a drop from Connected marks them unreachable.</summary>
 /// <param name="scopeFactory">Opens scopes for the scoped stores.</param>
 /// <param name="locator">Resolves the #switches channel id.</param>
 /// <param name="poster">Posts/edits switch embeds.</param>
@@ -119,7 +116,7 @@ await RenderAsync(store, sw, sw.LastIsActive, evt.GuildId, evt.ServerId, culture
         }
     }
 
-    /// <summary>Handles a connection-status change: a non-Connected server marks its switch embeds unreachable.</summary>
+    /// <summary>Handles a connection-status change: a drop from Connected marks its switch 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>
@@ -128,18 +125,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<ISwitchStore>();
             var switches = await store.ListByServerAsync(evt.GuildId, evt.ServerId, cancellationToken)
                 .ConfigureAwait(false);

tests/RustPlusBot.Features.Switches.Tests/Hosting/SwitchesHostedServiceTests.cs

@@ -3,7 +3,6 @@
 using NSubstitute;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
-using RustPlusBot.Domain.Connections;
 using RustPlusBot.Domain.Switches;
 using RustPlusBot.Features.Switches.Hosting;
 using RustPlusBot.Features.Switches.Pairing;
@@ -12,7 +11,6 @@
 using RustPlusBot.Features.Switches.Rendering;
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Localization;
-using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.Switches;
 using RustPlusBot.Persistence.Workspace;
 
@@ -23,13 +21,11 @@ public sealed class SwitchesHostedServiceTests
     private static Harness Create()
     {
         var store = Substitute.For<ISwitchStore>();
-        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>();
@@ -60,7 +56,7 @@ private static Harness Create()
             relay,
             NullLogger<SwitchesHostedService>.Instance);
 
-        return new Harness(service, bus, store, connections, relayPoster, relayLocator, pairingLocator, pairingPoster);
+        return new Harness(service, bus, store, relayPoster, relayLocator, pairingLocator, pairingPoster);
     }
 
     [Fact]
@@ -129,11 +125,6 @@ public async Task ConnectionStatusChangedEvent_non_connected_routes_to_relay_and
         await h.Service.StartAsync(default);
 
         var serverId = Guid.NewGuid();
-        h.Connections.GetStateAsync(10UL, serverId, Arg.Any<CancellationToken>())
-            .Returns(new ConnectionState
-            {
-                GuildId = 10UL, RustServerId = serverId, Status = ConnectionStatus.Unreachable,
-            });
         h.Store.ListByServerAsync(10UL, serverId, Arg.Any<CancellationToken>())
             .Returns(
             [
@@ -266,7 +257,6 @@ private sealed record Harness(
         SwitchesHostedService Service,
         InMemoryEventBus Bus,
         ISwitchStore Store,
-        IConnectionStore Connections,
         ISwitchChannelPoster Poster,
         ISwitchChannelLocator Locator,
         ISwitchChannelLocator PairingLocator,

tests/RustPlusBot.Features.Switches.Tests/SwitchStateRelayTests.cs

@@ -2,14 +2,12 @@
 using NSubstitute;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Abstractions.Events;
-using RustPlusBot.Domain.Connections;
 using RustPlusBot.Domain.Switches;
 using RustPlusBot.Features.Switches.Posting;
 using RustPlusBot.Features.Switches.Relaying;
 using RustPlusBot.Features.Switches.Rendering;
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Localization;
-using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.Switches;
 using RustPlusBot.Persistence.Workspace;
 
@@ -20,13 +18,11 @@ public sealed class SwitchStateRelayTests
     private static Harness Create()
     {
         var store = Substitute.For<ISwitchStore>();
-        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();
 
@@ -39,7 +35,7 @@ private static Harness Create()
 
         var relay = new SwitchStateRelay(provider.GetRequiredService<IServiceScopeFactory>(), locator, poster,
             renderer);
-        return new Harness(relay, store, poster, connections);
+        return new Harness(relay, store, poster);
     }
 
     [Fact]
@@ -70,11 +66,6 @@ public async Task ConnectionStatus_not_connected_marks_switches_unreachable()
     {
         var h = Create();
         var serverId = Guid.NewGuid();
-        h.Connections.GetStateAsync(10UL, serverId, Arg.Any<CancellationToken>())
-            .Returns(new ConnectionState
-            {
-                GuildId = 10UL, RustServerId = serverId, Status = ConnectionStatus.Unreachable
-            });
         h.Store.ListByServerAsync(10UL, serverId, Arg.Any<CancellationToken>())
             .Returns(
             [
@@ -101,11 +92,6 @@ public async Task ConnectionStatus_connected_does_nothing()
     {
         var h = Create();
         var serverId = Guid.NewGuid();
-        h.Connections.GetStateAsync(10UL, serverId, Arg.Any<CancellationToken>())
-            .Returns(new ConnectionState
-            {
-                GuildId = 10UL, RustServerId = serverId, Status = ConnectionStatus.Connected
-            });
 
         await h.Relay.HandleConnectionStatusAsync(
             new ConnectionStatusChangedEvent(10UL, serverId, IsConnected: true, WasConnected: true),
@@ -116,6 +102,34 @@ await h.Poster.DidNotReceive().EnsureAsync(Arg.Any<ulong>(), Arg.Any<ulong?>(),
             Arg.Any<global::Discord.MessageComponent>(), 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 ConnectionStatus_boot_without_prior_connection_does_not_sweep()
+    {
+        var h = Create();
+        var serverId = Guid.NewGuid();
+        h.Store.ListByServerAsync(10UL, serverId, Arg.Any<CancellationToken>())
+            .Returns(
+            [
+                new SmartSwitch
+                {
+                    GuildId = 10UL,
+                    ServerId = serverId,
+                    EntityId = 42UL,
+                    Name = "G",
+                    MessageId = 900UL
+                }
+            ]);
+
+        await h.Relay.HandleConnectionStatusAsync(
+            new ConnectionStatusChangedEvent(10UL, serverId, 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 DeviceTriggered_managed_switch_updates_store_and_rerenders()
     {
@@ -205,6 +219,5 @@ await h.Poster.Received(1).EnsureAsync(777UL, 900UL, Arg.Any<global::Discord.Emb
     private sealed record Harness(
         SwitchStateRelay Relay,
         ISwitchStore Store,
-        ISwitchChannelPoster Poster,
-        IConnectionStore Connections);
+        ISwitchChannelPoster Poster);
 }