From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 31 Oct 2020 21:48:09 +0000 (+0100)
Subject: Allow serving different protocols on different ports at the same time.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=commitdiff_plain;h=61e7b58cf8be7a0c24d78a1336e54fdbf088deea;p=plomrogue2-experiments

Allow serving different protocols on different ports at the same time.
---

diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index 6295f8d..d90aa0b 100755
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -94,7 +94,12 @@ class Game(GameBase):
     def run_tick(self):
         to_delete = []
         for connection_id in self.sessions:
-            if not connection_id in self.io.server.clients:
+            connection_id_found = False
+            for server in self.io.servers:
+                if connection_id in server.clients:
+                    connection_id_found = True
+                    break
+            if not connection_id_found:
                 t = self.get_thing(self.sessions[connection_id], create_unfound=False)
                 self.things.remove(t)
                 to_delete += [connection_id]
diff --git a/new2/plomrogue/io.py b/new2/plomrogue/io.py
index acf58d4..5450c34 100644
--- a/new2/plomrogue/io.py
+++ b/new2/plomrogue/io.py
@@ -1,4 +1,5 @@
 import queue
+import threading
 
 
 
@@ -6,10 +7,10 @@ class GameIO():
 
     def __init__(self, game, save_file='savefile'):
         from plomrogue.parser import Parser
-        self.clients = {}
         self.parser = Parser(game)
         self.game = game
         self.save_file = save_file
+        self.servers = []
 
     def loop(self, q):
         """Handle commands coming through queue q, run game, send results back."""
@@ -20,30 +21,24 @@ class GameIO():
             except queue.Empty:
                 self.game.run_tick()
 
-    def run_loop_with_server(self, port, server_class):
-        """Run connection of server talking to clients and game IO loop.
+    def start_loop(self):
+        """Start game loop, set up self.queue to communicate with it.
 
-        We have a server of self.server_class and we have the game IO loop,
-        a thread running self.loop. Both communicate with each other via a
-        queue.Queue. While the server may spawn parallel threads to many
-        clients, the IO loop works sequentially through game commands
-        received from the server's client connections.  A processed command
-        may trigger messages to the commanding client or to all clients,
-        delivered from the IO loop to the server via the queue.
+        The game loop works sequentially through game commands received
+        via self.queue from connected servers' clients."""
+        self.queue = queue.Queue()
+        c = threading.Thread(target=self.loop, args=(self.queue,))
+        c.start()
+
+    def start_server(self, port, server_class):
+        """Start server of server_class in talk with game loop.
 
+        The server communicates with the game loop via self.queue.
         """
-        import threading
-        q = queue.Queue()
-        c = threading.Thread(target=self.loop, daemon=True, args=(q,))
+        server = server_class(self.queue, port)
+        self.servers += [server]
+        c = threading.Thread(target=server.serve_forever)
         c.start()
-        self.server = server_class(q, port)
-        try:
-            self.server.serve_forever()
-        except KeyboardInterrupt:
-            pass
-        finally:
-            print('Killing server')
-            self.server.server_close()
 
     def handle_input(self, input_, connection_id=None, god_mode=False):
         """Process input_ to command grammar, call command handler if found.
@@ -82,15 +77,21 @@ class GameIO():
             answer(connection_id, 'GAME_ERROR ' + quote(str(e)))
 
     def send(self, msg, connection_id=None):
-        """Send message msg to server's client(s).
+        """Send message msg to servers' client(s).
 
         If a specific client is identified by connection_id, only
-        sends msg to that one. Else, sends it to all clients.
+        sends msg to that one. Else, sends it to all client sessions.
 
         """
         if connection_id:
-            self.server.clients[connection_id].put(msg)
+            for server in self.servers:
+                 if connection_id in server.clients:
+                    client = server.clients[connection_id]
+                    client.put(msg)
         else:
             for c_id in self.game.sessions:
-                client = self.server.clients[c_id]
-                client.put(msg)
+                for server in self.servers:
+                    if c_id in server.clients:
+                        client = server.clients[c_id]
+                        client.put(msg)
+                        break
diff --git a/new2/rogue_chat.py b/new2/rogue_chat.py
index afaeef9..832adcd 100755
--- a/new2/rogue_chat.py
+++ b/new2/rogue_chat.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 from plomrogue.game import Game 
 from plomrogue.io_websocket import PlomWebSocketServer
+from plomrogue.io_tcp import PlomTCPServer
 import sys
 
 if len(sys.argv) != 2:
@@ -8,4 +9,6 @@ if len(sys.argv) != 2:
     exit(1)
 savefile = sys.argv[1]
 game = Game(savefile)
-game.io.run_loop_with_server(8000, PlomWebSocketServer)
+game.io.start_loop()
+game.io.start_server(8000, PlomWebSocketServer)
+#game.io.start_server(8001, PlomTCPServer)