X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server.py;h=e289e0a73a03ea123aa4ab1524cef8ea792a2616;hb=7a02f223961c532d9423433427c0e1b3e1cdb871;hp=6e3564b8cf59563fb15b30862e8a91f07dbdbfbb;hpb=c54df60b10ad8eec9eb216b3ffc6c6692c3975cb;p=plomrogue2-experiments
diff --git a/server.py b/server.py
index 6e3564b..e289e0a 100755
--- a/server.py
+++ b/server.py
@@ -3,6 +3,12 @@
import socketserver
import threading
import queue
+import sys
+import os
+from parser import ArgError, Parser
+from server_.game import World, GameError
+from game_common import Commander
+
# Avoid "Address already in use" errors.
socketserver.TCPServer.allow_reuse_address = True
@@ -17,14 +23,6 @@ class Server(socketserver.ThreadingTCPServer):
self.daemon_threads = True # Else, server's threads have daemon=False.
-def fib(n):
- """Calculate n-th Fibonacci number. Very inefficiently."""
- if n in (1, 2):
- return 1
- else:
- return fib(n-1) + fib(n-2)
-
-
class IO_Handler(socketserver.BaseRequestHandler):
def handle(self):
@@ -83,12 +81,168 @@ class IO_Handler(socketserver.BaseRequestHandler):
self.server.queue_out.put(('COMMAND', connection_id, message))
self.server.queue_out.put(('KILL_QUEUE', connection_id))
thread_alive[0] = False
- print('CONNECTION CLOSED:', str(self.client_address))
+ print('CONNECTION CLOSED FROM:', str(self.client_address))
self.request.close()
-def io_loop(q):
- """Handle commands coming through queue q, send results back.
+def fib(n):
+ """Calculate n-th Fibonacci number. Very inefficiently."""
+ if n in (1, 2):
+ return 1
+ else:
+ return fib(n-1) + fib(n-2)
+
+
+class CommandHandler(Commander):
+
+ def __init__(self):
+ from multiprocessing import Pool
+ self.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()
+ self.pool_result = None
+
+ def handle_input(self, input_, connection_id=None, abort_on_error=False):
+ """Process input_ to command grammar, call command handler if found."""
+ from inspect import signature
+ try:
+ command = self.parser.parse(input_)
+ if command is None:
+ self.send_to(connection_id, 'UNHANDLED INPUT')
+ else:
+ if 'connection_id' in list(signature(command).parameters):
+ command(connection_id=connection_id)
+ else:
+ command()
+ except ArgError as e:
+ self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e))
+ if abort_on_error:
+ exit(1)
+ except GameError as e:
+ self.send_to(connection_id, 'GAME ERROR: ' + str(e))
+ if abort_on_error:
+ exit(1)
+
+ def send_to(self, connection_id, msg):
+ """Send msg to client of connection_id; if no later, print instead."""
+ if connection_id:
+ self.queues_out[connection_id].put(msg)
+ else:
+ print(msg)
+
+ def send_all(self, msg):
+ """Send msg to all clients."""
+ for connection_id in self.queues_out:
+ self.send_to(connection_id, msg)
+
+ def send_all_gamestate(self):
+ """Send out game state data relevant to clients."""
+
+ def stringify_yx(tuple_):
+ """Transform tuple (y,x) into string 'Y:'+str(y)+',X:'+str(x)."""
+ return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1])
+
+ def quoted(string):
+ """Quote & 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)
+
+ self.send_all('NEW_TURN ' + str(self.world.turn))
+ self.send_all('MAP_SIZE ' + stringify_yx(self.world.map_size))
+ for y in range(self.world.map_size[0]):
+ width = self.world.map_size[1]
+ terrain_line = self.world.terrain_map[y * width:(y + 1) * width]
+ self.send_all('TERRAIN_LINE %5s %s' % (y, quoted(terrain_line)))
+ for thing in self.world.things:
+ self.send_all('THING_TYPE %s %s' % (thing.id_, thing.type_))
+ self.send_all('THING_POS %s %s' % (thing.id_,
+ stringify_yx(thing.position)))
+
+ def proceed(self):
+ """Send turn finish signal, run game world, send new world data.
+
+ First sends 'TURN_FINISHED' message, then runs game world
+ until new player input is needed, then sends game state.
+ """
+ self.send_all('TURN_FINISHED ' + str(self.world.turn))
+ self.world.proceed_to_next_player_turn()
+ self.send_all_gamestate()
+
+ def cmd_MOVE(self, direction):
+ """Set player task to 'move' with direction arg, finish player turn."""
+ if direction not in {'UP', 'DOWN', 'RIGHT', 'LEFT'}:
+ raise ArgError('Move argument must be one of: '
+ 'UP, DOWN, RIGHT, LEFT')
+ self.world.get_player().set_task('move', direction=direction)
+ self.proceed()
+ cmd_MOVE.argtypes = 'string'
+
+ def cmd_WAIT(self):
+ """Set player task to 'wait', finish player turn."""
+ self.world.get_player().set_task('wait')
+ self.proceed()
+
+ def cmd_GET_TURN(self, connection_id):
+ """Send world.turn to caller."""
+ self.send_to(connection_id, str(self.world.turn))
+
+ 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, msg, connection_id):
+ """Send msg to all clients."""
+ self.send_all(msg)
+ cmd_ALL.argtypes = 'string'
+
+ 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.
+ """
+ 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):
+ """Increment world.turn, send game turn data to everyone.
+
+ To simulate game processing waiting times, a one second delay between
+ TURN_FINISHED and NEW_TURN occurs; after NEW_TURN, some expensive
+ calculations are started as pool processes that need to be finished
+ until a further INC finishes the turn.
+
+ This is just a demo structure for how the game loop could work when
+ parallelized. One might imagine a two-step game turn, with a non-action
+ step determining actor tasks (the AI determinations would take the
+ place of the fib calculations here), and an action step wherein these
+ tasks are performed (where now sleep(1) is).
+ """
+ from time import sleep
+ if self.pool_result is not None:
+ self.pool_result.wait()
+ self.send_all('TURN_FINISHED ' + str(self.world.turn))
+ sleep(1)
+ self.world.turn += 1
+ self.send_all_gamestate()
+ self.pool_result = self.pool.map_async(fib, (35, 35))
+
+
+def io_loop(q, commander):
+ """Handle commands coming through queue q, send results back.
Commands from q are expected to be tuples, with the first element either
'ADD_QUEUE', 'COMMAND', or 'KILL_QUEUE', the second element a UUID, and
@@ -101,69 +255,50 @@ def io_loop(q):
which to send replies.
A 'COMMAND' command is specified in greater detail by a string that is the
- tuple's third element. Here, the following commands are understood:
- - A string starting with 'PRIVMSG' returns the space-separated tokens
- following 'PRIVMSG' to the sender via its receiver queue.
- - A string starting with 'ALL' sends the space-separated tokens following
- 'ALL' to all receiver queues.
- - A string starting with 'FIB' followed by space-separated positive
- integers returns to the receiver queue first a 'CALCULATING â¦' messsage,
- and afterwards for each such integer n the n-th Fibonacci number as a
- space-separated sequence of integers. Fibonacci numbers are calculated
- in parallel if possible.
+ tuple's third element. The commander CommandHandler takes care of processing
+ this and sending out replies.
"""
- from multiprocessing import Pool
- queues_out = {}
while True:
x = q.get()
command_type = x[0]
connection_id = x[1]
content = None if len(x) == 2 else x[2]
if command_type == 'ADD_QUEUE':
- queues_out[connection_id] = content
+ commander.queues_out[connection_id] = content
elif command_type == 'COMMAND':
- tokens = [token for token in content.split(' ') if len(token) > 0]
- if len(tokens) == 0:
- queues_out[connection_id].put('EMPTY COMMAND')
- continue
- if tokens[0] == 'PRIVMSG':
- reply = ' '.join(tokens[1:])
- queues_out[connection_id].put(reply)
- elif tokens[0] == 'ALL':
- reply = ' '.join(tokens[1:])
- for key in queues_out:
- queues_out[key].put(reply)
- elif tokens[0] == 'FIB':
- fib_fail = 'MALFORMED FIB REQUEST'
- if len(tokens) < 2:
- queues_out[connection_id].put(fib_fail)
- continue
- numbers = []
- fail = False
- for token in tokens[1:]:
- if token != '0' and token.isdigit():
- numbers += [int(token)]
- else:
- queues_out[connection_id].put(fib_fail)
- fail = True
- break
- if fail:
- continue
- queues_out[connection_id].put('CALCULATING â¦')
- reply = ''
- # this blocks the whole loop, BAD
- with Pool(len(numbers)) as p:
- results = p.map(fib, numbers)
- reply = ' '.join([str(r) for r in results])
- queues_out[connection_id].put(reply)
- else:
- queues_out[connection_id].put('UNKNOWN COMMAND')
+ commander.handle_input(content, connection_id)
elif command_type == 'KILL_QUEUE':
- del queues_out[connection_id]
+ del commander.queues_out[connection_id]
+if len(sys.argv) != 2:
+ print('wrong number of arguments, expected one (game file)')
+ exit(1)
+game_file_name = sys.argv[1]
+commander = CommandHandler()
+if os.path.exists(game_file_name):
+ if not os.path.isfile(game_file_name):
+ print('game file name does not refer to a valid game file')
+ else:
+ with open(game_file_name, 'r') as f:
+ lines = f.readlines()
+ for i in range(len(lines)):
+ line = lines[i]
+ print("FILE INPUT LINE %s: %s" % (i, line), end='')
+ commander.handle_input(line, abort_on_error=True)
+else:
+ commander.handle_input('MAP_SIZE Y:5,X:5')
+ commander.handle_input('TERRAIN_LINE 0 "xxxxx"')
+ commander.handle_input('TERRAIN_LINE 1 "x...x"')
+ commander.handle_input('TERRAIN_LINE 2 "x.X.x"')
+ commander.handle_input('TERRAIN_LINE 3 "x...x"')
+ commander.handle_input('TERRAIN_LINE 4 "xxxxx"')
+ commander.handle_input('THING_TYPE 0 human')
+ commander.handle_input('THING_POS 0 Y:3,X:3')
+ commander.handle_input('THING_TYPE 1 monster')
+ commander.handle_input('THING_POS 1 Y:1,X:1')
q = queue.Queue()
-c = threading.Thread(target=io_loop, daemon=True, args=(q,))
+c = threading.Thread(target=io_loop, daemon=True, args=(q, commander))
c.start()
server = Server(q, ('localhost', 5000), IO_Handler)
try: