- Add size limits to websocket msg cache and background S3 uploader

Author: x64-dev

GenOnlineService/BackgroundS3Uploader.cs

@@ -20,7 +20,8 @@ public enum ES3QueueUploadResult
     Success,
     Failed_InvalidUploadType,
     Failed_InvalidImage_Size,
-    Failed_InvalidImage_Header
+    Failed_InvalidImage_Header,
+    Failed_QueueFull
 }
 
 class S3QueuedUploadEntry
@@ -245,6 +246,13 @@ public static ES3QueueUploadResult QueueUpload(ES3UploadType uploadType, byte[]
             return ES3QueueUploadResult.Failed_InvalidUploadType;
         }
 
+        const int maxQueueSize = 5000;
+        if (m_queueUploads.Count >= maxQueueSize)
+        {
+            Console.WriteLine($"Warning: S3 upload queue full ({maxQueueSize}), dropping upload for match {match_id}");
+            return ES3QueueUploadResult.Failed_QueueFull;
+        }
+
         // queue it
         S3QueuedUploadEntry newUploadEntry = new S3QueuedUploadEntry(uploadType, fileBytes, match_id, user_id, slotIndexInLobby, screenshotTypeIfScreenshot); ;
         m_queueUploads.Enqueue(newUploadEntry);

GenOnlineService/Constants.cs

@@ -637,7 +637,15 @@ public void QueueWebsocketSend(byte[] bytesJSON)
 			}
 			else
 			{
-				m_lstPendingWebsocketSends.Enqueue(bytesJSON);
+				const int maxQueueSize = 1000;
+				if (m_lstPendingWebsocketSends.Count < maxQueueSize)
+				{
+					m_lstPendingWebsocketSends.Enqueue(bytesJSON);
+				}
+				else
+				{
+					Console.WriteLine($"Warning: Websocket send queue full for user {m_UserID}, dropping message");
+				}
 			}
 		}
 
@@ -679,7 +687,6 @@ public async Task TickWebsocket()
 			}
 		}
 
-		// TODO_CACHE: Size limit this?
 		ConcurrentQueue<byte[]> m_lstPendingWebsocketSends = new ConcurrentQueue<byte[]>();
 
 		public void NotifyFriendslistDirty()