Sets autoclient long webcall timeout

Author: benbierens

ProjectPlugins/CodexClient/CodexNodeFactory.cs

@@ -22,8 +22,13 @@ public CodexNodeFactory(ILog log, IFileManager fileManager, CodexHooksFactory ho
             this.processControlFactory = processControlFactory;
         }
 
+        public CodexNodeFactory(ILog log, HttpFactory httpFactory, string dataDir)
+            : this(log, new FileManager(log, dataDir), new CodexHooksFactory(), httpFactory, new DoNothingProcessControlFactory())
+        {
+        }
+
         public CodexNodeFactory(ILog log, string dataDir)
-            : this(log, new FileManager(log, dataDir), new CodexHooksFactory(), new HttpFactory(log), new DoNothingProcessControlFactory())
+            : this(log, new HttpFactory(log), dataDir)
         {
         }
 

Tools/AutoClient/App.cs

@@ -1,6 +1,7 @@
 using AutoClient.Modes.FolderStore;
 using CodexClient;
 using Logging;
+using WebUtils;
 
 namespace AutoClient
 {
@@ -30,7 +31,9 @@ public App(Configuration config)
                 FolderWorkDispatcher = null!;
             }
 
-            CodexNodeFactory = new CodexNodeFactory(log: Log, dataDir: Config.DataPath);
+            var httpFactory = new HttpFactory(Log, new AutoClientWebTimeSet());
+
+            CodexNodeFactory = new CodexNodeFactory(log: Log, httpFactory: httpFactory, dataDir: Config.DataPath);
         }
 
         public Configuration Config { get; }
@@ -50,4 +53,25 @@ private IFileGenerator CreateGenerator()
             return new ImageGenerator(Log);
         }
     }
+
+    public class AutoClientWebTimeSet : IWebCallTimeSet
+    {
+        public TimeSpan HttpCallTimeout()
+        {
+            return TimeSpan.FromMinutes(30.0);
+        }
+
+        public TimeSpan HttpRetryTimeout()
+        {
+            return HttpCallTimeout() * 2.2;
+        }
+
+        /// <summary>
+        /// After a failed HTTP call, wait this long before trying again.
+        /// </summary>
+        public TimeSpan HttpCallRetryDelay()
+        {
+            return TimeSpan.FromMinutes(1.0);
+        }
+    }
 }

Tools/AutoClient/Modes/FolderStore/FileStatus.cs

@@ -12,6 +12,11 @@ public FileStatus(App app, string folder, string filePath, PurchaseInfo purchase
             this.purchaseInfo = purchaseInfo;
         }
 
+        protected override void OnNewState(WorkerStatus newState)
+        {
+            newState.LastUpdate = DateTime.MinValue;
+        }
+
         public bool IsBusy()
         {
             if (!State.Purchases.Any()) return false;
@@ -48,7 +53,7 @@ public bool IsCurrentlyFailed()
             return mostRecent.Expiry.HasValue;
         }
 
-        protected WorkerPurchase? GetMostRecent()
+        public WorkerPurchase? GetMostRecent()
         {
             if (!State.Purchases.Any()) return null;
             var maxCreated = State.Purchases.Max(p => p.Created);

Tools/AutoClient/Modes/FolderStore/FileWorker.cs

@@ -11,17 +11,17 @@ public interface IWorkEventHandler
         void OnPurchaseStarted();
     }
 
-    public class FileWorker : FileStatus
+    public class FileWorker
     {
         private readonly App app;
         private readonly CodexWrapper node;
         private readonly ILog log;
         private readonly PurchaseInfo purchaseInfo;
         private readonly string sourceFilename;
         private readonly IWorkEventHandler eventHandler;
+        private readonly FileStatus status;
 
         public FileWorker(App app, CodexWrapper node, PurchaseInfo purchaseInfo, string folder, FileIndex fileIndex, IWorkEventHandler eventHandler)
-            : base(app, folder, fileIndex.File + ".json", purchaseInfo)
         {
             this.app = app;
             this.node = node;
@@ -30,18 +30,17 @@ public FileWorker(App app, CodexWrapper node, PurchaseInfo purchaseInfo, string
             sourceFilename = fileIndex.File;
             if (sourceFilename.ToLowerInvariant().EndsWith(".json")) throw new Exception("Not an era file.");
             this.eventHandler = eventHandler;
-        }
 
-        protected override void OnNewState(WorkerStatus newState)
-        {
-            newState.LastUpdate = DateTime.MinValue;
+            status = new FileStatus(app, folder, fileIndex.File, purchaseInfo);
         }
 
+        public bool IsBusy => status.IsBusy();
+
         public void Update()
         {
             try
             {
-                if (IsCurrentlyRunning() && UpdatedRecently()) return;
+                if (status.IsCurrentlyRunning() && UpdatedRecently()) return;
 
                 Log($"Updating for '{sourceFilename}'...");
                 EnsureRecentPurchase();
@@ -271,6 +270,18 @@ private void Log(string msg)
             log.Log(msg);
         }
 
+        private WorkerStatus State => status.State;
+
+        private void SaveState()
+        {
+            status.SaveState();
+        }
+
+        private WorkerPurchase? GetMostRecent()
+        {
+            return status.GetMostRecent();
+        }
+
         private string GetFileTag(FileIndex filename)
         {
             return $"({filename.Index.ToString("00000")}) ";

Tools/AutoClient/Modes/FolderStore/JsonBacked.cs

@@ -36,13 +36,13 @@ private void LoadState()
 
         protected string Folder { get; }
         protected string FilePath { get; }
-        protected T State { get; private set; } = default!;
+        public T State { get; private set; } = default!;
 
         protected virtual void OnNewState(T newState)
         {
         }
 
-        protected void SaveState()
+        public void SaveState()
         {
             try
             {

Tools/AutoClient/Modes/FolderStoreMode.cs

@@ -62,7 +62,7 @@ private FileWorker ProcessWorkItem(CodexWrapper instance)
             var file = app.FolderWorkDispatcher.GetFileToCheck();
             var worker = new FileWorker(app, instance, purchaseInfo, folder, file, this);
             worker.Update();
-            if (worker.IsBusy()) app.FolderWorkDispatcher.WorkerIsBusy();
+            if (worker.IsBusy) app.FolderWorkDispatcher.WorkerIsBusy();
             return worker;
         }