Small refactoring

* Moved `ConnectionGetter` to its own file
* Added method `mapAndRemove` to Server/Client.scala
* Replaced usages of `removeNonSatisfying` with the above
* Added some documentation

1 files changed, 25 insertions, 0 deletions

diff --git a/src/main/scala/Server/ConnectionGetter.scala b/src/main/scala/Server/ConnectionGetter.scala
new file mode 100644
index 0000000..b3246a7
--- /dev/null
+++ b/src/main/scala/Server/ConnectionGetter.scala
@@ -0,0 +1,25 @@
+package o1game.Server
+
+import java.io.IOException
+import java.net.{ServerSocket, Socket}
+import scala.concurrent.Future
+import scala.util.{Failure, Success}
+import scala.concurrent.ExecutionContext.Implicits.global
+
+/** Small helper class for getting new connections using futures */
+class ConnectionGetter(val socket: ServerSocket):
+
+	private var nextClient: Future[Socket] = Future.failed(IOException())
+
+	/** Returns a new socket to a client if there is any new connections. */
+	def newClient(): Option[Socket] =
+		this.nextClient.value match
+			case Some(Success(s)) =>
+				nextClient = Future(socket.accept())
+				Some(s)
+			case Some(Failure(e)) =>
+				nextClient = Future(socket.accept())
+				None
+			case None => None
+
+end ConnectionGetter