Merge pull request #1683 from longfin/hotfix/disable-dap-subscription

Throttle DAP subscription
planetarium · Nov 14, 2022 · 709c1bf · 709c1bf
2 parents 3f2b772 + c975a9d
commit 709c1bf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs b/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs
@@ -75,6 +75,7 @@ public GraphQLTestBase(ITestOutputHelper output)
             StandaloneContextFx = new StandaloneContext
             {
                 KeyStore = keyStore,
+                DifferentAppProtocolVersionEncounterInterval = TimeSpan.FromSeconds(1),
             };
             ncService.ConfigureContext(StandaloneContextFx);
 

diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs
@@ -172,9 +172,13 @@ public async Task SubscribeDifferentAppProtocolVersionEncounter()
             var apv1 = AppProtocolVersion.Sign(apvPrivateKey, 1);
             var apv2 = AppProtocolVersion.Sign(apvPrivateKey, 0);
             var peer = new BoundPeer(apvPrivateKey.PublicKey, new DnsEndPoint("0.0.0.0", 0));
-            StandaloneContextFx.DifferentAppProtocolVersionEncounterSubject.OnNext(
-                new DifferentAppProtocolVersionEncounter(peer, apv1, apv2)
-            );
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(TimeSpan.FromSeconds(1));
+                StandaloneContextFx.DifferentAppProtocolVersionEncounterSubject.OnNext(
+                    new DifferentAppProtocolVersionEncounter(peer, apv1, apv2)
+                );
+            });
             var rawEvents = await stream.Take(1);
             var rawEvent = (Dictionary<string, object>)((ExecutionNode)rawEvents.Data!).ToValue()!;
             var differentAppProtocolVersionEncounter =

diff --git a/NineChronicles.Headless/GraphTypes/StandaloneSubscription.cs b/NineChronicles.Headless/GraphTypes/StandaloneSubscription.cs
@@ -137,7 +137,10 @@ public StandaloneSubscription(StandaloneContext standaloneContext)
                 Resolver = new FuncFieldResolver<DifferentAppProtocolVersionEncounter>(context =>
                     (DifferentAppProtocolVersionEncounter)context.Source!),
                 Subscriber = new EventStreamResolver<DifferentAppProtocolVersionEncounter>(context =>
-                    StandaloneContext.DifferentAppProtocolVersionEncounterSubject.AsObservable()),
+                    StandaloneContext.DifferentAppProtocolVersionEncounterSubject
+                        .Sample(standaloneContext.DifferentAppProtocolVersionEncounterInterval)
+                        .AsObservable()
+                    ),
             });
             AddField(new EventStreamFieldType
             {

diff --git a/NineChronicles.Headless/StandaloneContext.cs b/NineChronicles.Headless/StandaloneContext.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Concurrent;
 using System.Reactive.Subjects;
 using Libplanet;
@@ -22,8 +23,8 @@ public class StandaloneContext
         public bool IsMining { get; set; }
         public ReplaySubject<NodeStatusType> NodeStatusSubject { get; } = new ReplaySubject<NodeStatusType>();
         public ReplaySubject<PreloadState> PreloadStateSubject { get; } = new ReplaySubject<PreloadState>();
-        public ReplaySubject<DifferentAppProtocolVersionEncounter> DifferentAppProtocolVersionEncounterSubject { get; }
-            = new ReplaySubject<DifferentAppProtocolVersionEncounter>();
+        public Subject<DifferentAppProtocolVersionEncounter> DifferentAppProtocolVersionEncounterSubject { get; }
+            = new Subject<DifferentAppProtocolVersionEncounter>();
         public ReplaySubject<Notification> NotificationSubject { get; } = new ReplaySubject<Notification>(1);
         public ReplaySubject<NodeException> NodeExceptionSubject { get; } = new ReplaySubject<NodeException>();
         public ReplaySubject<MonsterCollectionState> MonsterCollectionStateSubject { get; } = new ReplaySubject<MonsterCollectionState>();
@@ -44,5 +45,7 @@ public class StandaloneContext
         };
 
         public IStore? Store { get; internal set; }
+
+        internal TimeSpan DifferentAppProtocolVersionEncounterInterval { get; set; } = TimeSpan.FromSeconds(30);
     }
 }