updated queue logic

user now always gets a ticket, but ticket date determines wait behaviour

Author: shukriadams

src/Tetrifact.Web/Controllers/ArchivesController.cs

@@ -2,7 +2,9 @@
 using Microsoft.AspNetCore.Http.Headers;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
@@ -102,9 +104,14 @@ public ActionResult GetArchive(string packageId, [FromQuery(Name = "ticket")] st
                     if (string.IsNullOrEmpty(ticket))
                         return Responses.NoTicket();
 
-                    ProcessItem item = _processManager.GetByCategory(ProcessCategories.ArchiveQueueSlot).FirstOrDefault(i => i.Id == ticket);
-                    if (item == null)
+                    IEnumerable<ProcessItem> userTickets = _processManager.GetByCategory(ProcessCategories.ArchiveQueueSlot);
+                    ProcessItem userTicket = userTickets.FirstOrDefault(i => i.Id == ticket);
+                    if (userTicket == null)
                         return Responses.NoTicket();
+
+                    int count = userTickets.Where(t => t.AddedUTC < userTicket.AddedUTC).Count();
+                    if (count > _settings.MaximumSimultaneousDownloads)
+                        return Responses.QueueFull(count, _settings.MaximumSimultaneousDownloads.Value);
                 }
 
                 string archivePath = _archiveService.GetPackageArchivePath(packageId);

src/Tetrifact.Web/Controllers/TicketsController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Tetrifact.Core;
 
@@ -60,18 +59,9 @@ public ActionResult CreateQueueTicket(string requestIdentifier)
                         }
                     });
 
-                if (_processManager.GetByCategory(ProcessCategories.ArchiveQueueSlot).Count() >= _settings.MaximumSimultaneousDownloads)
-                    return new JsonResult(new
-                    {
-                        error = new
-                        {
-                            code = 1,
-                            message = $"Queue is full ({_settings.MaximumSimultaneousDownloads} slots allowed), please try again later"
-                        }
-                    });
-
                 string ticket = Guid.NewGuid().ToString();
                 _processManager.AddUnique(ProcessCategories.ArchiveQueueSlot, ticket, requestIdentifier, new TimeSpan(0, 0, _settings.DownloadQueueTicketLifespan));
+
                 return new JsonResult(new
                 {
                     success = new
@@ -80,7 +70,7 @@ public ActionResult CreateQueueTicket(string requestIdentifier)
                         clientIdentifier = requestIdentifier,
                         required = true
                     }
-                }); ;
+                });
             }
             catch (Exception ex)
             {

src/Tetrifact.Web/Core/Responses.cs

@@ -23,6 +23,20 @@ public static NotFoundObjectResult NotFoundError(Controller controller, string d
             });
         }
 
+        public static ObjectResult QueueFull(int position, int total) 
+        {
+            return new ObjectResult(new
+            {
+                error = new
+                {
+                    description = $"Queue is full, you are {position} of {total}."
+                }
+            })
+            {
+                StatusCode = 432 // http std code, but way too vague
+            };
+        }
+
         public static ObjectResult NoTicket()
         {
             return new ObjectResult(new
@@ -33,7 +47,7 @@ public static ObjectResult NoTicket()
                 }
             })
             {
-                StatusCode = 432 // http standard code for "resource locked for now" 
+                StatusCode = 403 // http std code, but way too vague
             };
         }