home · contact · privacy
Minor refactoring.
[plomrogue2-experiments] / server.py
index 215317dd6714cfdd97c59b3f980781414e5b269e..d51487d2f4a2ee303489f54b1cda7ffe5130d4bc 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -3,6 +3,8 @@
 import socketserver
 import threading
 import queue
+from parser import ArgError, Parser
+
 
 # Avoid "Address already in use" errors.
 socketserver.TCPServer.allow_reuse_address = True
@@ -90,7 +92,8 @@ class Task:
 
 class Thing:
 
-    def __init__(self, position):
+    def __init__(self, type_, position):
+        self.type = type_
         self.position = position
         self.task = Task('wait')
 
@@ -102,9 +105,18 @@ class Thing:
             self.position[0] -= 1
         elif direction == 'DOWN':
             self.position[0] += 1
+        elif direction == 'RIGHT':
+            self.position[1] += 1
+        elif direction == 'LEFT':
+            self.position[1] -= 1
 
     def decide_task(self):
-        self.set_task('wait')
+        if self.position[1] > 1:
+            self.set_task('move', 'LEFT')
+        elif self.position[1] < 3:
+            self.set_task('move', 'RIGHT')
+        else:
+            self.set_task('wait')
 
     def set_task(self, task, *args, **kwargs):
         self.task = Task(task, args, kwargs)
@@ -118,7 +130,7 @@ class Thing:
         """
         self.task.todo -= 1
         if self.task.todo <= 0:
-            task= getattr(self, 'task_' + self.task.name)
+            task = getattr(self, 'task_' + self.task.name)
             task(*self.task.args, **self.task.kwargs)
             self.task = None
         if is_AI and self.task is None:
@@ -130,12 +142,12 @@ class World:
     def __init__(self):
         self.turn = 0
         self.map_size = (5, 5)
-        self.map_ = 'xxxxx\n'+\
-                    'x...x\n'+\
-                    'x.X.x\n'+\
-                    'x...x\n'+\
+        self.map_ = 'xxxxx\n' +\
+                    'x...x\n' +\
+                    'x.X.x\n' +\
+                    'x...x\n' +\
                     'xxxxx'
-        self.things = [Thing(position=[3, 3]), Thing([1, 1])]
+        self.things = [Thing('human', [3, 3]), Thing('monster', [1, 1])]
         self.player_i = 0
         self.player = self.things[self.player_i]
 
@@ -148,16 +160,13 @@ def fib(n):
         return fib(n-1) + fib(n-2)
 
 
-class ArgumentError(Exception):
-    pass
-
-
 class CommandHandler:
 
     def __init__(self, queues_out):
         from multiprocessing import Pool
         self.queues_out = queues_out
         self.world = World()
+        self.parser = Parser(self)
         # self.pool and self.pool_result are currently only needed by the FIB
         # command and the demo of a parallelized game loop in cmd_inc_p.
         self.pool = Pool()
@@ -176,6 +185,26 @@ class CommandHandler:
         """Transform tuple (y,x) into string 'Y:'+str(y)+',X:'+str(x)."""
         return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1])
 
+    def quoted(self, string):
+        """Quote and escape string so client interprets it as single token."""
+        quoted = []
+        quoted += ['"']
+        for c in string:
+            if c in {'"', '\\'}:
+                quoted += ['\\']
+            quoted += [c]
+        quoted += ['"']
+        return ''.join(quoted)
+
+    def send_all_gamestate(self):
+        """Send out game state data relevant to clients."""
+        self.send_all('NEW_TURN ' + str(self.world.turn))
+        self.send_all('MAP_SIZE ' + self.stringify_yx(self.world.map_size))
+        self.send_all('TERRAIN\n' + self.quoted(self.world.map_))
+        for thing in self.world.things:
+            self.send_all('THING TYPE:' + thing.type + ' '
+                          + self.stringify_yx(thing.position))
+
     def proceed_to_next_player_turn(self, connection_id):
         """Run game world turns until player can decide their next step.
 
@@ -193,35 +222,26 @@ class CommandHandler:
             for thing in self.world.things[self.world.player_i+1:]:
                 thing.proceed()
             self.world.turn += 1
-            for thing  in self.world.things[:self.world.player_i]:
+            for thing in self.world.things[:self.world.player_i]:
                 thing.proceed()
             self.world.player.proceed(is_AI=False)
             if self.world.player.task is None:
                 break
-        self.send_all('NEW_TURN ' + str(self.world.turn))
-        self.send_all('MAP_SIZE ' + self.stringify_yx(self.world.map_size))
-        self.send_all('TERRAIN\n' + self.world.map_)
-        self.send_all('POSITION ' + self.stringify_yx(self.world.player.position))
+        self.send_all_gamestate()
 
-    def cmd_fib(self, tokens, connection_id):
+    def cmd_FIB(self, numbers, connection_id):
         """Reply with n-th Fibonacci numbers, n taken from tokens[1:].
 
         Numbers are calculated in parallel as far as possible, using fib().
         A 'CALCULATING …' message is sent to caller before the result.
         """
-        if len(tokens) < 2:
-            raise ArgumentError('FIB NEEDS AT LEAST ONE ARGUMENT')
-        numbers = []
-        for token in tokens[1:]:
-            if token == '0' or not token.isdigit():
-                raise ArgumentError('FIB ARGUMENTS MUST BE INTEGERS > 0')
-            numbers += [int(token)]
         self.send_to(connection_id, 'CALCULATING …')
         results = self.pool.map(fib, numbers)
         reply = ' '.join([str(r) for r in results])
         self.send_to(connection_id, reply)
+    cmd_FIB.argtypes = 'seq:int:nonneg'
 
-    def cmd_inc_p(self, connection_id):
+    def cmd_INC_P(self, connection_id):
         """Increment world.turn, send game turn data to everyone.
 
         To simulate game processing waiting times, a one second delay between
@@ -241,62 +261,46 @@ class CommandHandler:
         self.send_all('TURN_FINISHED ' + str(self.world.turn))
         sleep(1)
         self.world.turn += 1
-        self.send_all('NEW_TURN ' + str(self.world.turn))
-        self.send_all('MAP_SIZE ' + self.stringify_yx(self.world.map_size))
-        self.send_all('TERRAIN\n' + self.world.map_)
-        self.send_all('POSITION ' + self.stringify_yx(self.world.player.position))
+        self.send_all_gamestate()
         self.pool_result = self.pool.map_async(fib, (35, 35))
 
-    def cmd_get_turn(self, connection_id):
+    def cmd_GET_TURN(self, connection_id):
         """Send world.turn to caller."""
         self.send_to(connection_id, str(self.world.turn))
 
-    def cmd_move(self, direction, connection_id):
+    def cmd_MOVE(self, direction, connection_id):
         """Set player task to 'move' with direction arg, finish player turn."""
-        if not direction in {'UP', 'DOWN'}:
-            raise ArgumentError('MOVE ARGUMENT MUST BE "UP" or "DOWN"')
+        if direction not in {'UP', 'DOWN', 'RIGHT', 'LEFT'}:
+            raise ArgError('Move argument must be one of: '
+                           'UP, DOWN, RIGHT, LEFT')
         self.world.player.set_task('move', direction=direction)
         self.proceed_to_next_player_turn(connection_id)
+    cmd_MOVE.argtypes = 'string'
 
-    def cmd_wait(self, connection_id):
+    def cmd_WAIT(self, connection_id):
         """Set player task to 'wait', finish player turn."""
         self.world.player.set_task('wait')
         self.proceed_to_next_player_turn(connection_id)
 
-    def cmd_echo(self, tokens, input_, connection_id):
-        """Send message in input_ beyond tokens[0] to caller."""
-        msg = input_[len(tokens[0]) + 1:]
+    def cmd_ECHO(self, msg, connection_id):
+        """Send msg to caller."""
         self.send_to(connection_id, msg)
+    cmd_ECHO.argtypes = 'string'
 
-    def cmd_all(self, tokens, input_):
-        """Send message in input_ beyond tokens[0] to all clients."""
-        msg = input_[len(tokens[0]) + 1:]
+    def cmd_ALL(self, msg, connection_id):
+        """Send msg to all clients."""
         self.send_all(msg)
+    cmd_ALL.argtypes = 'string'
 
     def handle_input(self, input_, connection_id):
         """Process input_ to command grammar, call command handler if found."""
-        tokens = [token for token in input_.split(' ') if len(token) > 0]
         try:
-            if len(tokens) == 0:
-                self.send_to(connection_id, 'EMPTY COMMAND')
-            elif len(tokens) == 1 and tokens[0] == 'INC_P':
-                self.cmd_inc_p(connection_id)
-            elif len(tokens) == 1 and tokens[0] == 'GET_TURN':
-                self.cmd_get_turn(connection_id)
-            elif len(tokens) == 1 and tokens[0] == 'WAIT':
-                self.cmd_wait(connection_id)
-            elif len(tokens) == 2 and tokens[0] == 'MOVE':
-                self.cmd_move(tokens[1], connection_id)
-            elif len(tokens) >= 1 and tokens[0] == 'ECHO':
-                self.cmd_echo(tokens, input_, connection_id)
-            elif len(tokens) >= 1 and tokens[0] == 'ALL':
-                self.cmd_all(tokens, input_)
-            elif len(tokens) >= 1 and tokens[0] == 'FIB':
-                # TODO: Should this really block the whole loop?
-                self.cmd_fib(tokens, connection_id)
+            command = self.parser.parse(input_)
+            if command is None:
+                self.send_to(connection_id, 'UNHANDLED INPUT')
             else:
-                self.send_to(connection_id, 'UNKNOWN COMMAND')
-        except ArgumentError as e:
+                command(connection_id=connection_id)
+        except ArgError as e:
             self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e))