Add Authentication and Polling for next request Short Timeouts

source/Halibut.Tests/HalibutTimeoutsAndLimitsForTestsBuilder.cs

@@ -6,6 +6,8 @@ namespace Halibut.Tests
     public class HalibutTimeoutsAndLimitsForTestsBuilder
     {
         public static readonly TimeSpan HalfTheTcpReceiveTimeout = TimeSpan.FromSeconds(22.5);
+        static readonly TimeSpan PollingQueueWaitTimeout = TimeSpan.FromSeconds(20);
+        static readonly TimeSpan ShortTimeout = TimeSpan.FromSeconds(15);
 
         public HalibutTimeoutsAndLimits Build()
         {
@@ -22,10 +24,17 @@ public HalibutTimeoutsAndLimits Build()
                 TcpClientSendTimeout = HalfTheTcpReceiveTimeout + HalfTheTcpReceiveTimeout,
                 TcpClientReceiveTimeout = HalfTheTcpReceiveTimeout + HalfTheTcpReceiveTimeout,
 
-                TcpClientHeartbeatSendTimeout = TimeSpan.FromSeconds(15),
-                TcpClientHeartbeatReceiveTimeout = TimeSpan.FromSeconds(15),
+                TcpClientHeartbeatSendTimeout = ShortTimeout,
+                TcpClientHeartbeatReceiveTimeout = ShortTimeout,
+
+                TcpClientAuthenticationSendTimeout = ShortTimeout,
+                TcpClientAuthenticationReceiveTimeout = ShortTimeout,
+
+                TcpClientPollingForNextRequestSendTimeout = ShortTimeout,
+                TcpClientPollingForNextRequestReceiveTimeout = PollingQueueWaitTimeout + ShortTimeout,
+
                 TcpClientConnectTimeout = TimeSpan.FromSeconds(20),
-                PollingQueueWaitTimeout = TimeSpan.FromSeconds(20)
+                PollingQueueWaitTimeout = PollingQueueWaitTimeout
             };
         }
     }

source/Halibut.Tests/Support/SerilogLoggerBuilder.cs

@@ -57,18 +57,18 @@ public ILogger Build()
             var testHash = CurrentTestHash();
             var logger = Logger.ForContext("TestHash", testHash);
 
-            if (!HasLoggedTestHash.Contains(testName))
-            {
-                HasLoggedTestHash.Add(testName);
-                logger.Information($"Test: {TestContext.CurrentContext.Test.Name} has hash {testHash}");
-            }
-
             if (traceFileLogger != null)
             {
                 TraceLoggers.AddOrUpdate(testName, traceFileLogger, (_, _) => throw new Exception("This should never be updated. If it is, it means that a test is being run multiple times in a single test run"));
                 traceFileLogger.SetTestHash(testHash);
             }
 
+            if (!HasLoggedTestHash.Contains(testName))
+            {
+                HasLoggedTestHash.Add(testName);
+                logger.Information($"Test: {TestContext.CurrentContext.Test.Name} has hash {testHash}");
+            }
+
             return logger;
         }
 

source/Halibut.Tests/Timeouts/TimeoutsApplyDuringHandShake.cs

@@ -64,7 +64,7 @@ int writeNumberToPauseOn // Ie pause on the first or second write
                 }
 
                 sw.Stop();
-                sw.Elapsed.Should().BeCloseTo(clientAndService.Service.TimeoutsAndLimits.TcpClientReceiveTimeout, TimeSpan.FromSeconds(15), "Since a paused connection early on should not hang forever.");
+                sw.Elapsed.Should().BeCloseTo(clientAndService.Service.TimeoutsAndLimits.TcpClientAuthenticationSendTimeout, TimeSpan.FromSeconds(15), "Since a paused connection early on should not hang forever.");
 
                 await echo.SayHelloAsync("The pump wont be paused here so this should work.");
             }

source/Halibut.Tests/Transport/Protocol/ProtocolFixture.cs

@@ -121,22 +121,32 @@ public async Task ShouldExchangeAsSubscriber()
             AssertOutput(@"
 --> MX-SUBSCRIBE subscriptionId
 <-- MX-SERVER
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> ResponseMessage
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> ResponseMessage
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> ResponseMessage
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED");
         }
@@ -179,37 +189,57 @@ public async Task ShouldExchangeAsSubscriberWithPooling()
             AssertOutput(@"
 --> MX-SUBSCRIBE subscriptionId
 <-- MX-SERVER
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> ResponseMessage
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> ResponseMessage
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> ResponseMessage
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED
+|-- Set Timeout PollingForNextRequestShortTimeout
 <-- RequestMessage
+|-- Revert Timeout PollingForNextRequestShortTimeout
 --> NEXT
 <-- PROCEED");
         }
@@ -279,17 +309,12 @@ public void SetNumberOfReads(int reads)
                 numberOfReads = reads;
             }
 
-            public void IdentifyAsClient()
-            {
-                output.AppendLine("--> MX-CLIENT");
-                output.AppendLine("<-- MX-SERVER");
-            }
-
             public async Task IdentifyAsClientAsync(CancellationToken cancellationToken)
             {
                 await Task.CompletedTask;
 
-                IdentifyAsClient();
+                output.AppendLine("--> MX-CLIENT");
+                output.AppendLine("<-- MX-SERVER");
             }
 
             public async Task SendNextAsync(CancellationToken cancellationToken)
@@ -371,6 +396,22 @@ public async Task<T> ReceiveAsync<T>(CancellationToken cancellationToken)
                 return (T)(nextReadQueue.Count > 0 ? nextReadQueue.Dequeue() : default(T));
             }
 
+            public async Task WithTimeout(MessageExchangeStreamTimeout timeout, Func<Task> func)
+            {
+                output.AppendLine("|-- Set Timeout " + timeout);
+                await func();
+                output.AppendLine("|-- Revert Timeout " + timeout);
+            }
+
+            public async Task<T> WithTimeout<T>(MessageExchangeStreamTimeout timeout, Func<Task<T>> func)
+            {
+                output.AppendLine("|-- Set Timeout " + timeout);
+                var response = await func();
+                output.AppendLine("|-- Revert Timeout " + timeout);
+
+                return response;
+            }
+
             public override string ToString()
             {
                 return output.ToString();

source/Halibut/Diagnostics/HalibutTimeoutsAndLimits.cs

@@ -47,21 +47,26 @@ public HalibutTimeoutsAndLimits() { }
         /// <summary>
         ///     Amount of time to wait for a TCP or SslStream write to complete successfully
         /// </summary>
-        public TimeSpan TcpClientSendTimeout { get; set; } = TimeSpan.FromMinutes(10);
+        public TimeSpan TcpClientSendTimeout { get; set; } = TimeSpan.FromMinutes(1);
 
         /// <summary>
         ///     Amount of time to wait for a TCP or SslStream read to complete successfully
         /// </summary>
-        public TimeSpan TcpClientReceiveTimeout { get; set; } = TimeSpan.FromMinutes(10);
+        public TimeSpan TcpClientReceiveTimeout { get; set; } = TimeSpan.FromMinutes(5);
 
         /// <summary>
         ///     Amount of time a connection can stay in the pool
         /// </summary>
-        public TimeSpan TcpClientPooledConnectionTimeout { get; set; } = TimeSpan.FromMinutes(9);
+        public TimeSpan TcpClientPooledConnectionTimeout { get; set; } = TimeSpan.FromMinutes(4.5);
 
         public TimeSpan TcpClientHeartbeatSendTimeout { get; set; } = TimeSpan.FromSeconds(60);
         public TimeSpan TcpClientHeartbeatReceiveTimeout { get; set; } = TimeSpan.FromSeconds(60);
 
+        public TimeSpan TcpClientAuthenticationSendTimeout { get; set; } = TimeSpan.FromSeconds(60);
+        public TimeSpan TcpClientAuthenticationReceiveTimeout { get; set; } = TimeSpan.FromSeconds(60);
+        public TimeSpan TcpClientPollingForNextRequestSendTimeout { get; set; } = TimeSpan.FromSeconds(60);
+        public TimeSpan TcpClientPollingForNextRequestReceiveTimeout { get; set; } = TimeSpan.FromSeconds(60);
+
         /// <summary>
         ///     Amount of time to wait for a successful TCP or WSS connection
         /// </summary>

source/Halibut/Transport/Protocol/IMessageExchangeStream.cs

@@ -26,5 +26,8 @@ public interface IMessageExchangeStream
         Task SendAsync<T>(T message, CancellationToken cancellationToken);
 
         Task<T> ReceiveAsync<T>(CancellationToken cancellationToken);
+
+        Task WithTimeout(MessageExchangeStreamTimeout timeout, Func<Task> func);
+        Task<T> WithTimeout<T>(MessageExchangeStreamTimeout timeout, Func<Task<T>> func);
     }
 }

source/Halibut/Transport/Protocol/MessageExchangeProtocol.cs

@@ -93,7 +93,9 @@ public async Task ExchangeAsSubscriberAsync(Uri subscriptionId, Func<RequestMess
 
         static async Task ReceiveAndProcessRequestAsync(IMessageExchangeStream stream, Func<RequestMessage, Task<ResponseMessage>> incomingRequestProcessor, CancellationToken cancellationToken)
         {
-            var request = await stream.ReceiveAsync<RequestMessage>(cancellationToken);
+            var request = await stream.WithTimeout(
+                MessageExchangeStreamTimeout.PollingForNextRequestShortTimeout,
+                async () => await stream.ReceiveAsync<RequestMessage>(cancellationToken));
 
             if (request != null)
             {