From 9bd7eb283eaaaa291d26e21fd22341c292cd8d80 Mon Sep 17 00:00:00 2001 From: jheaps Date: Fri, 3 Oct 2025 10:42:57 -0600 Subject: [PATCH 1/4] Remove bad test --- JoshHeaps.Net.UiTests/MultiplayerTests.cs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/JoshHeaps.Net.UiTests/MultiplayerTests.cs b/JoshHeaps.Net.UiTests/MultiplayerTests.cs index 510b53d..cbd2660 100644 --- a/JoshHeaps.Net.UiTests/MultiplayerTests.cs +++ b/JoshHeaps.Net.UiTests/MultiplayerTests.cs @@ -81,18 +81,4 @@ public class MultiplayerTests : PageTest // Should see SignalR connected message in console Assert.That(consoleLogs, Does.Contain("βœ… SignalR connected").Or.Contain("SignalR connected")); } - - [Test] - public async Task Move_Updates_Are_Sent_Via_SignalR() - { - // This would require more complex setup with two players - // For now, just verify the SignalR methods exist in the JavaScript - var jsContent = await Page.EvaluateAsync(@" - () => { - return document.querySelector('script[src*=""chessLogic.js""]') ? 'chessLogic.js loaded' : 'not found'; - } - "); - - Assert.That(jsContent, Is.EqualTo("chessLogic.js loaded")); - } } \ No newline at end of file From c2622132bc31361b102cf2c958b7ffc57123f450 Mon Sep 17 00:00:00 2001 From: jheaps Date: Fri, 3 Oct 2025 10:43:15 -0600 Subject: [PATCH 2/4] Revert site back to normal, add memory lane --- .claude/settings.local.json | 3 +- JoshHeaps.Net/Pages/Index.cshtml | 327 ++++-------------- JoshHeaps.Net/Pages/MemoryLane.cshtml | 54 +++ JoshHeaps.Net/Pages/MemoryLane.cshtml.cs | 12 + .../MemoryLane/FifthTempleAnniversary.cshtml | 69 ++++ .../FifthTempleAnniversary.cshtml.cs | 12 + .../wwwroot/css/anniversary/page.css | 218 ++++++++++++ JoshHeaps.Net/wwwroot/css/home/site.css | 4 +- JoshHeaps.Net/wwwroot/css/memoryLane/page.css | 162 +++++++++ JoshHeaps.Net/wwwroot/js/anniversary/page.js | 7 + JoshHeaps.Net/wwwroot/js/site.js | 2 +- JoshHeaps.Net/wwwroot/js/utils.js | 5 +- 12 files changed, 618 insertions(+), 257 deletions(-) create mode 100644 JoshHeaps.Net/Pages/MemoryLane.cshtml create mode 100644 JoshHeaps.Net/Pages/MemoryLane.cshtml.cs create mode 100644 JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml create mode 100644 JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml.cs create mode 100644 JoshHeaps.Net/wwwroot/css/anniversary/page.css create mode 100644 JoshHeaps.Net/wwwroot/css/memoryLane/page.css create mode 100644 JoshHeaps.Net/wwwroot/js/anniversary/page.js diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 5efc564..b5c47f5 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -2,7 +2,8 @@ "permissions": { "allow": [ "Bash(dotnet test:*)", - "Bash(dotnet build)" + "Bash(dotnet build)", + "Bash(dir:*)" ], "deny": [], "ask": [] diff --git a/JoshHeaps.Net/Pages/Index.cshtml b/JoshHeaps.Net/Pages/Index.cshtml index f3ce34d..da8f1ea 100644 --- a/JoshHeaps.Net/Pages/Index.cshtml +++ b/JoshHeaps.Net/Pages/Index.cshtml @@ -1,270 +1,93 @@ ο»Ώ@page @model JoshHeaps.Net.Pages.IndexModel @{ - ViewData["Title"] = "Happy 5th Anniversary, Morgan!"; + ViewData["Title"] = "JoshHeaps.Net"; Layout = "_Layout"; } - - -
-

Happy 5th Anniversary, Morgan!

- -
- -
πŸ’– πŸ’• πŸ’—
- -
-
-
- Morgan with our beautiful baby -
-
The most amazing mother to our precious child
+
+
+
+ + +
- -
-
- Josh and Morgan together -
-
My best friend and eternal companion
+
+

Chess

+

+ As someone who loves chess, I wanted to create a chess game that I could play with my friends and family. This project is a work in progress, as currently it can only be played locally. It was built in C# on .NET 8.0, using winforms, because I like a challenge. I plan to add online multiplayer functionality in the future. +

-
-

Five Years of Forever

-

- Five years ago today, on October 2nd, 2020, I knelt across the altar from you in the temple - and we were sealed for time and all eternity. It was the best decision I ever made. -

-

- Morgan, you are everything I could have ever hoped for and so much more. You're not just - my wifeβ€”you're my best friend, my partner in every adventure, and the love of my life. -

-

- You make me laugh every single day. Your kindness touches everyone around you. Your - strength amazes me. Your beauty, inside and out, takes my breath away. Watching you - become a mother has shown me depths of love and dedication I never knew existed. -

-

- Thank you for five incredible years of love, laughter, growth, and joy. Thank you for - choosing me, for believing in me, and for building this beautiful life with me. -

-

- Here's to five years down and an eternity to go. I love you more today than yesterday, - and I'll love you even more tomorrow. -

-

- I love you, Morgan. Forever and always. πŸ’– -

+
+
+

Compiler

+

+ I love solving problems, and figuring out how things work. What better way to do both than writing a compiler myself? This project is a compiler that I wrote in C# on .NET 8.0. It takes in a simple language that I created, outputs the corresponding common intermediate language (CIL), and executes it. I plan to add more features in the future. +

+
+
+ + + +
- -
πŸ’ πŸ’ž πŸ’“
+
+

Demos

+
+ + + + +
+
+ + + @section Styles { diff --git a/JoshHeaps.Net/Pages/MemoryLane.cshtml b/JoshHeaps.Net/Pages/MemoryLane.cshtml new file mode 100644 index 0000000..3b5f2bc --- /dev/null +++ b/JoshHeaps.Net/Pages/MemoryLane.cshtml @@ -0,0 +1,54 @@ +@page +@model JoshHeaps.Net.Pages.MemoryLaneModel +@{ + ViewData["Title"] = "Memory Lane"; + Layout = "_Layout"; +} + +
+

Memory Lane

+

Special moments and celebrations from our life together

+ +
+ +
πŸ’
+
Our 5th Sealing Anniversary
+
+ Celebrating the fifth year of our eternal journey together +
+ + +
+
πŸŽ‚
+
Birthdays & Births
+
+ Welcoming new life and celebrating another year +
+
Coming soon...
+
+ +
+
🌟
+
Milestones
+
+ Big achievements and unforgettable moments +
+
Coming soon...
+
+ +
+
✨
+
More Memories
+
+ Even more special occasions and celebrations +
+
Coming soon...
+
+
+ + ← Back to Home +
+ +@section Styles { + +} \ No newline at end of file diff --git a/JoshHeaps.Net/Pages/MemoryLane.cshtml.cs b/JoshHeaps.Net/Pages/MemoryLane.cshtml.cs new file mode 100644 index 0000000..4db42a1 --- /dev/null +++ b/JoshHeaps.Net/Pages/MemoryLane.cshtml.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace JoshHeaps.Net.Pages +{ + public class MemoryLaneModel() : PageModel + { + public void OnGet() + { + + } + } +} diff --git a/JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml b/JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml new file mode 100644 index 0000000..e9426f5 --- /dev/null +++ b/JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml @@ -0,0 +1,69 @@ +@page +@model JoshHeaps.Net.Pages.MemoryLane.FifthTempleAnniversary +@{ + ViewData["Title"] = "Happy 5th Anniversary, Morgan!"; + Layout = "_Layout"; +} + +
+

Happy 5th Anniversary, Morgan!

+ +
+ +
πŸ’– πŸ’• πŸ’—
+ +
+
+
+ Morgan with our beautiful baby +
+
The most amazing mother to our precious child
+
+ +
+
+ Josh and Morgan together +
+
My best friend and eternal companion
+
+
+ +
+

Five Years of Forever

+

+ Five years ago today, on October 2nd, 2020, I knelt across the altar from you in the temple + and we were sealed for time and all eternity. It was the best decision I ever made. +

+

+ Morgan, you are everything I could have ever hoped for and so much more. You're not just + my wifeβ€”you're my best friend, my partner in every adventure, and the love of my life. +

+

+ You make me laugh every single day. Your kindness touches everyone around you. Your + strength amazes me. Your beauty, inside and out, takes my breath away. Watching you + become a mother has shown me depths of love and dedication I never knew existed. +

+

+ Thank you for five incredible years of love, laughter, growth, and joy. Thank you for + choosing me, for believing in me, and for building this beautiful life with me. +

+

+ Here's to five years down and an eternity to go. I love you more today than yesterday, + and I'll love you even more tomorrow. +

+

+ I love you, Morgan. Forever and always. πŸ’– +

+
+ +
πŸ’ πŸ’ž πŸ’“
+
+ +@section Styles { + +} + +@section Scripts { + + +} diff --git a/JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml.cs b/JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml.cs new file mode 100644 index 0000000..c4b4d44 --- /dev/null +++ b/JoshHeaps.Net/Pages/MemoryLane/FifthTempleAnniversary.cshtml.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace JoshHeaps.Net.Pages.MemoryLane +{ + public class FifthTempleAnniversary() : PageModel + { + public void OnGet() + { + + } + } +} diff --git a/JoshHeaps.Net/wwwroot/css/anniversary/page.css b/JoshHeaps.Net/wwwroot/css/anniversary/page.css new file mode 100644 index 0000000..0601001 --- /dev/null +++ b/JoshHeaps.Net/wwwroot/css/anniversary/page.css @@ -0,0 +1,218 @@ +ο»Ώbody { + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + min-height: 100vh; + margin: 0; + padding: 0; +} + +.anniversary-container { + max-width: 1400px; + margin: 0 auto; + padding: 3rem 2rem; + text-align: center; +} + +.anniversary-header { + color: white; + font-size: 3.5rem; + margin-bottom: 1.5rem; + text-shadow: 2px 2px 4px rgba(0,0,0,0.3); + animation: fadeInDown 1s ease-out; +} + +#WelcomeMessage { + background: rgba(255, 255, 255, 0.95); + border-radius: 20px; + padding: 2rem 2.5rem; + margin: 0 auto 2rem; + max-width: 900px; + font-size: 1.3rem; + line-height: 1.8; + color: #333; + box-shadow: 0 10px 30px rgba(0,0,0,0.2); + animation: fadeIn 2s ease-out; +} + +.hearts { + font-size: 2.5rem; + margin: 1.5rem 0; + animation: heartbeat 1.5s ease-in-out infinite; + width: fit-content; + margin-left: auto; + margin-right: auto; +} + +.photo-gallery { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(400px, 1fr)); + gap: 2rem; + margin: 2rem auto; + max-width: 1200px; + padding: 0 1rem; + align-items: start; +} + +.photo-frame { + background: white; + padding: 1rem; + border-radius: 15px; + box-shadow: 0 15px 40px rgba(0,0,0,0.3); + transition: transform 0.3s ease, box-shadow 0.3s ease; + animation: fadeInUp 1.5s ease-out; + display: flex; + flex-direction: column; +} + +.photo-frame:hover { + transform: translateY(-10px); + box-shadow: 0 20px 50px rgba(0,0,0,0.4); +} + +.photo-wrapper { + width: 100%; + height: 500px; + overflow: hidden; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: center; + background: #f0f0f0; +} + +.photo-frame img { + width: 100%; + height: 100%; + object-fit: cover; + object-position: center; + display: block; +} + +.photo-frame:nth-child(2) img { + object-position: center 30%; +} + +.photo-caption { + margin-top: 1rem; + font-style: italic; + color: #666; + font-size: 1.1rem; + padding: 0.5rem; +} + +.love-message { + background: rgba(255, 255, 255, 0.95); + border-radius: 20px; + padding: 2.5rem 3rem; + margin: 2rem auto; + max-width: 1000px; + color: #444; + box-shadow: 0 10px 30px rgba(0,0,0,0.2); + animation: fadeIn 2.5s ease-out; +} + +.love-message h2 { + color: #764ba2; + margin-bottom: 1.5rem; + font-size: 2.5rem; +} + +.love-message p { + font-size: 1.2rem; + line-height: 1.9; + margin-bottom: 1.2rem; + text-align: left; +} + +.love-message p:last-of-type { + text-align: center; +} + +@keyframes fadeIn { + from { + opacity: 0; + } + + to { + opacity: 1; + } +} + +@keyframes fadeInDown { + from { + opacity: 0; + transform: translateY(-50px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes fadeInUp { + from { + opacity: 0; + transform: translateY(50px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes heartbeat { + 0%, 100% { + transform: scale(1); + } + + 50% { + transform: scale(1.1); + } +} + +@media (max-width: 900px) { + .photo-gallery { + grid-template-columns: 1fr; + max-width: 600px; + } + + .photo-wrapper { + height: 450px; + } +} + +@media (max-width: 768px) { + .anniversary-container { + padding: 2rem 1rem; + } + + .anniversary-header { + font-size: 2.2rem; + } + + #WelcomeMessage { + font-size: 1.1rem; + padding: 1.5rem; + } + + .photo-wrapper { + height: 400px; + } + + .love-message { + padding: 1.5rem; + } + + .love-message h2 { + font-size: 1.8rem; + } + + .love-message p { + font-size: 1rem; + } + + .hearts { + font-size: 2rem; + } +} \ No newline at end of file diff --git a/JoshHeaps.Net/wwwroot/css/home/site.css b/JoshHeaps.Net/wwwroot/css/home/site.css index 42f5ffc..cabdab6 100644 --- a/JoshHeaps.Net/wwwroot/css/home/site.css +++ b/JoshHeaps.Net/wwwroot/css/home/site.css @@ -23,7 +23,7 @@ transition: color 0.5s ease, font 0.5s ease; } -/*#WelcomeMessage { +#WelcomeMessage { font: 3vw arial; width: auto; height: 40vw; @@ -31,7 +31,7 @@ text-align: left; padding-left: 10vw; padding-right: 10vw; -}*/ +} #DemosBox { margin: 10vw; diff --git a/JoshHeaps.Net/wwwroot/css/memoryLane/page.css b/JoshHeaps.Net/wwwroot/css/memoryLane/page.css new file mode 100644 index 0000000..ef3c162 --- /dev/null +++ b/JoshHeaps.Net/wwwroot/css/memoryLane/page.css @@ -0,0 +1,162 @@ +ο»Ώbody { + background: #1a1a1a; + min-height: 100vh; + margin: 0; + padding: 0; +} + +.memory-lane-container { + max-width: 1000px; + margin: 0 auto; + padding: 4rem 2rem; + text-align: center; +} + +.memory-lane-header { + color: #f5f5f5; + font-size: 2.5rem; + margin-bottom: 0.5rem; + font-weight: 300; + letter-spacing: 0.1em; +} + +.memory-lane-subtitle { + color: #a0a0a0; + font-size: 1rem; + margin-bottom: 4rem; + font-weight: 300; +} + +.events-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); + gap: 1.5rem; + margin: 3rem auto; + max-width: 900px; + padding: 0 1rem; +} + +.event-card { + background: #2a2a2a; + border: 1px solid #3a3a3a; + border-radius: 4px; + padding: 2rem 1.5rem; + transition: all 0.3s ease; + cursor: pointer; + text-decoration: none; + color: inherit; + display: flex; + flex-direction: column; + align-items: center; +} + +.event-card:hover { + background: #2f2f2f; + border-color: #4a4a4a; + transform: translateY(-2px); +} + +.event-card.disabled { + opacity: 0.4; + cursor: not-allowed; +} + +.event-card.disabled:hover { + background: #2a2a2a; + border-color: #3a3a3a; + transform: none; +} + +.event-icon { + font-size: 2.5rem; + margin-bottom: 1rem; + opacity: 0.9; +} + +.event-title { + font-size: 1.2rem; + font-weight: 400; + color: #f5f5f5; + margin-bottom: 0.75rem; + letter-spacing: 0.05em; +} + +.event-description { + font-size: 0.9rem; + color: #999; + line-height: 1.6; + font-weight: 300; +} + +.coming-soon { + color: #666; + font-style: italic; + margin-top: 0.5rem; + font-size: 0.85rem; +} + +.home-button { + margin-top: 4rem; + padding: 0.75rem 1.5rem; + font-size: 0.9rem; + background: transparent; + color: #f5f5f5; + border: 1px solid #3a3a3a; + border-radius: 4px; + cursor: pointer; + transition: all 0.3s ease; + text-decoration: none; + display: inline-block; + letter-spacing: 0.05em; +} + +.home-button:hover { + background: #2a2a2a; + border-color: #4a4a4a; +} + +@keyframes fadeInDown { + from { + opacity: 0; + transform: translateY(-50px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes fadeInUp { + from { + opacity: 0; + transform: translateY(50px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@media (max-width: 768px) { + .memory-lane-header { + font-size: 2.5rem; + } + + .memory-lane-subtitle { + font-size: 1.1rem; + } + + .events-grid { + grid-template-columns: 1fr; + } + + .event-icon { + font-size: 3rem; + } + + .event-title { + font-size: 1.6rem; + } +} diff --git a/JoshHeaps.Net/wwwroot/js/anniversary/page.js b/JoshHeaps.Net/wwwroot/js/anniversary/page.js new file mode 100644 index 0000000..7925554 --- /dev/null +++ b/JoshHeaps.Net/wwwroot/js/anniversary/page.js @@ -0,0 +1,7 @@ +ο»Ώwindow.onload = function () { + const element = document.getElementById("WelcomeMessage"); + element.style.display = "none"; // Trigger reflow + element.offsetHeight; // Force reflow + element.style.display = ""; // Restore the original display + typeText("#WelcomeMessage", "Today, October 2nd, marks the 5th anniversary of the day I was sealed for time and all eternity to my wonderful wife. She's the kindest, sweetest, funniest, most beautiful woman I've ever met. I love you Morgan πŸ’–"); +} \ No newline at end of file diff --git a/JoshHeaps.Net/wwwroot/js/site.js b/JoshHeaps.Net/wwwroot/js/site.js index 7925554..398b0be 100644 --- a/JoshHeaps.Net/wwwroot/js/site.js +++ b/JoshHeaps.Net/wwwroot/js/site.js @@ -3,5 +3,5 @@ element.style.display = "none"; // Trigger reflow element.offsetHeight; // Force reflow element.style.display = ""; // Restore the original display - typeText("#WelcomeMessage", "Today, October 2nd, marks the 5th anniversary of the day I was sealed for time and all eternity to my wonderful wife. She's the kindest, sweetest, funniest, most beautiful woman I've ever met. I love you Morgan πŸ’–"); + typeText("#WelcomeMessage", "Hey, you found me...!?``````````````````````No that's stupid````````````````Just````uhhhh`````Hello! My name is Josh. I'm a software engineer, and I try to have a lot of fun with what I do. While I have your attention, why don't I tell you more about myself?"); } \ No newline at end of file diff --git a/JoshHeaps.Net/wwwroot/js/utils.js b/JoshHeaps.Net/wwwroot/js/utils.js index 0b75136..fb14302 100644 --- a/JoshHeaps.Net/wwwroot/js/utils.js +++ b/JoshHeaps.Net/wwwroot/js/utils.js @@ -29,7 +29,10 @@ function changeIntervalTime(element, text) { function simulateTyping(element, text, speed = 50) { intervalId = setInterval(() => { if (index < text.length) { - currentText += text.charAt(index); + if (text.charAt(index) === '`') + currentText = currentText.slice(0, -1); + else + currentText += text.charAt(index); changeIntervalTime(element, text); index++; element.textContent = currentText; From 54e4f25be773d8a09ed8650eb0e1e661f933b6f8 Mon Sep 17 00:00:00 2001 From: jheaps Date: Fri, 3 Oct 2025 10:45:20 -0600 Subject: [PATCH 3/4] Styling --- JoshHeaps.Net/Controllers/ChessController.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/JoshHeaps.Net/Controllers/ChessController.cs b/JoshHeaps.Net/Controllers/ChessController.cs index b19b3a0..e567298 100644 --- a/JoshHeaps.Net/Controllers/ChessController.cs +++ b/JoshHeaps.Net/Controllers/ChessController.cs @@ -9,7 +9,10 @@ namespace JoshHeaps.Net.Controllers; [ApiController] [Route("api/[controller]")] -public class ChessController(IChessService chessService, IHubContext chessHub, IBackgroundTaskQueue queue) : ControllerBase +public class ChessController( + IChessService chessService, + IHubContext chessHub, + IBackgroundTaskQueue queue) : ControllerBase { /// /// Store of ongoing games. From 03dd308449dd643edecf0d8f602d7a049bdfbfb9 Mon Sep 17 00:00:00 2001 From: jheaps Date: Fri, 3 Oct 2025 11:24:02 -0600 Subject: [PATCH 4/4] game removal code cleanup --- JoshHeaps.Net/Controllers/ChessController.cs | 70 ++++++++++---------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/JoshHeaps.Net/Controllers/ChessController.cs b/JoshHeaps.Net/Controllers/ChessController.cs index e567298..157cdd7 100644 --- a/JoshHeaps.Net/Controllers/ChessController.cs +++ b/JoshHeaps.Net/Controllers/ChessController.cs @@ -18,8 +18,12 @@ public class ChessController( /// Store of ongoing games. /// private static readonly ConcurrentDictionary _games = []; + private static readonly ConcurrentDictionary _gameRemovalTasks = []; + private static readonly ConcurrentDictionary _gameRemovalCancellationTokens = []; - private static ConcurrentDictionary _gameRemovalTasks = []; + private static readonly TimeSpan _computerGameTimeout = TimeSpan.FromHours(1); + private static readonly TimeSpan _multiplayerGameTimeout = TimeSpan.FromSeconds(5); + private static readonly TimeSpan _gameCleanupTimeout = TimeSpan.FromMinutes(1); /// /// Create a new chess game and store it in-memory. @@ -57,7 +61,7 @@ public class ChessController( }); } - ScheduleRemoveGame(gameState.GameId, TimeSpan.FromHours(1)); + ScheduleRemoveGame(gameState.GameId, _computerGameTimeout); return Ok(new { @@ -99,7 +103,7 @@ public class ChessController( isWhite = false; } - ScheduleRemoveGame(gameState.GameId, TimeSpan.FromDays(1)); + ScheduleRemoveGame(gameState.GameId, _multiplayerGameTimeout); return Ok(new { @@ -178,18 +182,11 @@ public class ChessController( return BadRequest(result); if (result.IsCheckmate || result.IsStalemate) - { - // queue game removal - ScheduleRemoveGame(gameState.GameId, TimeSpan.FromMinutes(1)); - } + ScheduleRemoveGame(gameState.GameId, _gameCleanupTimeout); + else if (gameState.IsVsComputer) + ScheduleRemoveGame(gameState.GameId, _computerGameTimeout); else - { - // increase timeout if play continues. - if (gameState.IsVsComputer) - ScheduleRemoveGame(gameState.GameId, TimeSpan.FromHours(1)); - else - ScheduleRemoveGame(gameState.GameId, TimeSpan.FromDays(1)); - } + ScheduleRemoveGame(gameState.GameId, _multiplayerGameTimeout); if (gameState.IsVsComputer && gameState.Computer is not null) queue.Queue(() => gameState.Computer.MakeMove(gameState, chessHub, chessService)); @@ -232,31 +229,36 @@ public class ChessController( private static void ScheduleRemoveGame(Guid id, TimeSpan delay) { - if (_gameRemovalTasks.ContainsKey(id)) + if (_gameRemovalCancellationTokens.TryRemove(id, out var oldCts)) { - _gameRemovalTasks[id] = Task.Run(async () => - { - await Task.Delay(delay); - - if (_games[id].Computer is not null) - await _games[id].Computer!.DisposeAsync(); - - _games.Remove(id, out _); - _gameRemovalTasks.Remove(id, out _); - }); - - return; + oldCts.Cancel(); + oldCts.Dispose(); } - _gameRemovalTasks.TryAdd(id, Task.Run(async () => + var cts = new CancellationTokenSource(); + _gameRemovalCancellationTokens[id] = cts; + + _gameRemovalTasks[id] = Task.Run(async () => { - await Task.Delay(delay); + try + { + await Task.Delay(delay, cts.Token); - if (_games[id].Computer is not null) - await _games[id].Computer!.DisposeAsync(); + if (_games.TryGetValue(id, out var game) && game.Computer is not null) + await game.Computer.DisposeAsync(); - _games.Remove(id, out _); - _gameRemovalTasks.Remove(id, out _); - })); + _games.Remove(id, out _); + } + catch (OperationCanceledException) { } + finally + { + if (_gameRemovalCancellationTokens.TryGetValue(id, out var currentCts) && currentCts == cts) + { + _gameRemovalCancellationTokens.TryRemove(id, out _); + } + + cts.Dispose(); + } + }); } }