Catch OperationCanceledException explicitly (#1294)

Universalis-FFXIV · Jul 18, 2024 · 70627ea · 70627ea
1 parent 0c36de5
commit 70627ea
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 51 deletions.
diff --git a/src/Universalis.Application/Controllers/V1/CurrentlyShownController.cs b/src/Universalis.Application/Controllers/V1/CurrentlyShownController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using UAParser;
 using Universalis.Application.Common;
 using Universalis.Application.Swagger;
@@ -98,14 +99,6 @@ public async Task<IActionResult> Get(
             return NotFound();
         }
 
-        if (worldDc.IsRegion)
-        {
-            return BadRequest(new
-            {
-                Message = "Region-wide calls are temporarily disabled due to load.",
-            });
-        }
-
         if (!TryGetWorldIds(worldDc, out var worldIds))
         {
             return NotFound();
@@ -167,23 +160,30 @@ public async Task<IActionResult> Get(
                 itemsSerializableProperties,
                 cts.Token))
             .ToList();
-        var currentlyShownViews = await Task.WhenAll(currentlyShownViewTasks);
-        var unresolvedItems = currentlyShownViews
-            .Where(cs => !cs.Item1)
-            .Select(cs => cs.Item2.ItemId)
-            .ToArray();
-        return Ok(new CurrentlyShownMultiView
+        try
         {
-            ItemIds = itemIdsArray.ToList(),
-            Items = currentlyShownViews
-                .Where(cs => cs.Item1)
-                .Select(cs => cs.Item2)
-                .ToList(),
-            WorldId = worldDc.IsWorld ? worldDc.WorldId : null,
-            WorldName = worldDc.IsWorld ? worldDc.WorldName : null,
-            DcName = worldDc.IsDc ? worldDc.DcName : null,
-            UnresolvedItemIds = unresolvedItems,
-            SerializableProperties = serializableProperties,
-        });
+            var currentlyShownViews = await Task.WhenAll(currentlyShownViewTasks);
+            var unresolvedItems = currentlyShownViews
+                .Where(cs => !cs.Item1)
+                .Select(cs => cs.Item2.ItemId)
+                .ToArray();
+            return Ok(new CurrentlyShownMultiView
+            {
+                ItemIds = itemIdsArray.ToList(),
+                Items = currentlyShownViews
+                    .Where(cs => cs.Item1)
+                    .Select(cs => cs.Item2)
+                    .ToList(),
+                WorldId = worldDc.IsWorld ? worldDc.WorldId : null,
+                WorldName = worldDc.IsWorld ? worldDc.WorldName : null,
+                DcName = worldDc.IsDc ? worldDc.DcName : null,
+                UnresolvedItemIds = unresolvedItems,
+                SerializableProperties = serializableProperties,
+            });
+        }
+        catch (OperationCanceledException)
+        {
+            return StatusCode(StatusCodes.Status504GatewayTimeout);
+        }
     }
 }
diff --git a/src/Universalis.Application/Controllers/V2/CurrentlyShownController.cs b/src/Universalis.Application/Controllers/V2/CurrentlyShownController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using UAParser;
 using Universalis.Application.Common;
 using Universalis.Application.Swagger;
@@ -97,14 +98,6 @@ public async Task<IActionResult> Get(
             return NotFound();
         }
 
-        if (worldDc.IsRegion)
-        {
-            return BadRequest(new
-            {
-                Message = "Region-wide calls are temporarily disabled due to load.",
-            });
-        }
-
         if (!TryGetWorldIds(worldDc, out var worldIds))
         {
             return NotFound();
@@ -165,24 +158,31 @@ public async Task<IActionResult> Get(
                 itemsSerializableProperties,
                 cts.Token))
             .ToList();
-        var currentlyShownViews = await Task.WhenAll(currentlyShownViewTasks);
-        var unresolvedItems = currentlyShownViews
-            .Where(cs => !cs.Item1)
-            .Select(cs => cs.Item2.ItemId)
-            .ToArray();
-        return Ok(new CurrentlyShownMultiViewV2
+        try
         {
-            ItemIds = itemIdsArray.ToList(),
-            Items = currentlyShownViews
-                .Where(cs => cs.Item1)
-                .Select(cs => cs.Item2)
-                .ToDictionary(item => item.ItemId, item => item),
-            WorldId = worldDc.IsWorld ? worldDc.WorldId : null,
-            WorldName = worldDc.IsWorld ? worldDc.WorldName : null,
-            DcName = worldDc.IsDc ? worldDc.DcName : null,
-            RegionName = worldDc.IsRegion ? worldDc.RegionName : null,
-            UnresolvedItemIds = unresolvedItems,
-            SerializableProperties = serializableProperties,
-        });
+            var currentlyShownViews = await Task.WhenAll(currentlyShownViewTasks);
+            var unresolvedItems = currentlyShownViews
+                .Where(cs => !cs.Item1)
+                .Select(cs => cs.Item2.ItemId)
+                .ToArray();
+            return Ok(new CurrentlyShownMultiViewV2
+            {
+                ItemIds = itemIdsArray.ToList(),
+                Items = currentlyShownViews
+                    .Where(cs => cs.Item1)
+                    .Select(cs => cs.Item2)
+                    .ToDictionary(item => item.ItemId, item => item),
+                WorldId = worldDc.IsWorld ? worldDc.WorldId : null,
+                WorldName = worldDc.IsWorld ? worldDc.WorldName : null,
+                DcName = worldDc.IsDc ? worldDc.DcName : null,
+                RegionName = worldDc.IsRegion ? worldDc.RegionName : null,
+                UnresolvedItemIds = unresolvedItems,
+                SerializableProperties = serializableProperties,
+            });
+        }
+        catch (OperationCanceledException)
+        {
+            return StatusCode(StatusCodes.Status504GatewayTimeout);
+        }
     }
 }