Add receive timeout parameter to client creation. Use longer timeout …

…for bots in consideration of bcrypt hash in etheos. Add timestamp function 'time()'
ethanmoffat · Feb 1, 2022 · ddbaa44 · ddbaa44
1 parent e729a0e
commit ddbaa44
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/EOBot/Interpreter/BuiltInIdentifierConfigurator.cs b/EOBot/Interpreter/BuiltInIdentifierConfigurator.cs
@@ -36,6 +36,7 @@ public void SetupBuiltInFunctions()
             _state.SymbolTable[PredefinedIdentifiers.LEN_FUNC] = Readonly(new Function<ArrayVariable, int>(PredefinedIdentifiers.LEN_FUNC, param1 => param1.Value.Count));
             _state.SymbolTable[PredefinedIdentifiers.ARRAY_FUNC] = Readonly(new Function<int, List<IVariable>>(PredefinedIdentifiers.ARRAY_FUNC, param1 => Enumerable.Repeat(UndefinedVariable.Instance, param1).Cast<IVariable>().ToList()));
             _state.SymbolTable[PredefinedIdentifiers.SLEEP] = Readonly(new VoidFunction<int>(PredefinedIdentifiers.SLEEP, param1 => Thread.Sleep(param1)));
+            _state.SymbolTable[PredefinedIdentifiers.TIME] = Readonly(new Function<string>(PredefinedIdentifiers.TIME, () => DateTime.Now.ToLongTimeString()));
 
             BotDependencySetup();
             _state.SymbolTable[PredefinedIdentifiers.CONNECT_FUNC] = Readonly(new AsyncVoidFunction<string, int>(PredefinedIdentifiers.CONNECT_FUNC, ConnectAsync));
@@ -78,7 +79,9 @@ private void BotDependencySetup()
             var c = DependencyMaster.TypeRegistry[_botIndex];
             var networkClientRepository = c.Resolve<INetworkClientRepository>();
             var networkClientFactory = c.Resolve<INetworkClientFactory>();
-            networkClientRepository.NetworkClient = networkClientFactory.CreateNetworkClient();
+
+            const int LongReceiveTimeout = 15000;
+            networkClientRepository.NetworkClient = networkClientFactory.CreateNetworkClient(LongReceiveTimeout);
         }
 
         private async Task ConnectAsync(string host, int port)

diff --git a/EOBot/Interpreter/Variables/PredefinedIdentifiers.cs b/EOBot/Interpreter/Variables/PredefinedIdentifiers.cs
@@ -22,6 +22,7 @@ public static class PredefinedIdentifiers
         public const string LEN_FUNC = "len";
         public const string ARRAY_FUNC = "array";
         public const string SLEEP = "sleep";
+        public const string TIME = "time";
 
         // game functions
         public const string CONNECT_FUNC = "Connect";

diff --git a/EOLib/Net/Communication/INetworkClient.cs b/EOLib/Net/Communication/INetworkClient.cs
@@ -9,6 +9,8 @@ public interface INetworkClient : IDisposable
 
         bool Started { get; }
 
+        TimeSpan ReceiveTimeout { get; }
+
         Task<ConnectResult> ConnectToServer(string host, int port);
 
         void Disconnect();

diff --git a/EOLib/Net/Communication/INetworkClientFactory.cs b/EOLib/Net/Communication/INetworkClientFactory.cs
@@ -2,6 +2,6 @@
 {
     public interface INetworkClientFactory
     {
-        INetworkClient CreateNetworkClient();
+        INetworkClient CreateNetworkClient(int timeout = Constants.ResponseTimeout);
     }
 }
diff --git a/EOLib/Net/Communication/NetworkClient.cs b/EOLib/Net/Communication/NetworkClient.cs
@@ -27,18 +27,21 @@ public class NetworkClient : INetworkClient
 
         public bool Started { get; private set; }
 
+        public TimeSpan ReceiveTimeout { get; }
+
         public NetworkClient(IPacketProcessActions packetProcessActions,
                              IPacketHandlingActions packetHandlingActions,
                              INumberEncoderService numberEncoderService,
-                             ILoggerProvider loggerProvider)
+                             ILoggerProvider loggerProvider,
+                             TimeSpan receiveTimeout)
         {
             _packetProcessActions = packetProcessActions;
             _packetHandlingActions = packetHandlingActions;
             _numberEncoderService = numberEncoderService;
             _loggerProvider = loggerProvider;
+            ReceiveTimeout = receiveTimeout;
 
             _socket = new AsyncSocket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-
             _backgroundReceiveCTS = new CancellationTokenSource();
         }
 

diff --git a/EOLib/Net/Communication/NetworkClientFactory.cs b/EOLib/Net/Communication/NetworkClientFactory.cs
@@ -3,6 +3,7 @@
 using EOLib.Logger;
 using EOLib.Net.Handlers;
 using EOLib.Net.PacketProcessing;
+using System;
 
 namespace EOLib.Net.Communication
 {
@@ -25,9 +26,9 @@ public class NetworkClientFactory : INetworkClientFactory
             _loggerProvider = loggerProvider;
         }
 
-        public INetworkClient CreateNetworkClient()
+        public INetworkClient CreateNetworkClient(int timeout = Constants.ResponseTimeout)
         {
-            return new NetworkClient(_packetProcessActions, _packetHandlingActions, _numberEncoderService, _loggerProvider);
+            return new NetworkClient(_packetProcessActions, _packetHandlingActions, _numberEncoderService, _loggerProvider, TimeSpan.FromMilliseconds(timeout));
         }
     }
 }
diff --git a/EOLib/Net/Communication/PacketSendService.cs b/EOLib/Net/Communication/PacketSendService.cs
@@ -10,7 +10,7 @@ public class PacketSendService : IPacketSendService
         private readonly IPacketQueueProvider _packetQueueProvider;
 
         public PacketSendService(INetworkClientProvider networkClientProvider,
-            IPacketQueueProvider packetQueueProvider)
+                                 IPacketQueueProvider packetQueueProvider)
         {
             _networkClientProvider = networkClientProvider;
             _packetQueueProvider = packetQueueProvider;
@@ -36,7 +36,7 @@ public async Task<IPacket> SendRawPacketAndWaitAsync(IPacket packet)
             if (bytes == 0)
                 throw new NoDataSentException();
 
-            var responsePacket = await InBandQueue.WaitForPacketAndDequeue();
+            var responsePacket = await InBandQueue.WaitForPacketAndDequeue((int)Client.ReceiveTimeout.TotalMilliseconds);
             if (responsePacket is EmptyPacket)
                 throw new EmptyPacketReceivedException();
 
@@ -49,7 +49,7 @@ public async Task<IPacket> SendEncodedPacketAndWaitAsync(IPacket packet)
             if (bytes == 0)
                 throw new NoDataSentException();
 
-            var responsePacket = await InBandQueue.WaitForPacketAndDequeue();
+            var responsePacket = await InBandQueue.WaitForPacketAndDequeue((int)Client.ReceiveTimeout.TotalMilliseconds);
             if (responsePacket is EmptyPacket)
                 throw new EmptyPacketReceivedException();