Merge pull request #13 from spherical-go/develop

Add game closing and more cases

Author: mountain

polyclash/server.py

@@ -64,7 +64,6 @@ def player_canceled(game, role):
 
 
 def delayed_start(game_id):
-    time.sleep(3)
     storage.start_game()
     socketio.emit('start', {'message': 'Game has started'}, room=game_id)
     logger.info(f'game started... {game_id}')
@@ -112,7 +111,7 @@ def index():
         table_of_games += f"<li>viewer: {key}</li>"
     html = f"""
     <h1>Welcome to PolyClash</h1>
-    <p>Token: {server_token}</p>
+    <p>Server token: {server_token}</p>
     <h2>List of games</h2>
     <ul>
     {table_of_games}
@@ -122,6 +121,11 @@ def index():
     return html, 200
 
 
+@app.route('/sphgo/list', methods=['GET'])
+def list_games():
+    return jsonify({'rooms': storage.list_rooms()}), 200
+
+
 @app.route('/sphgo/new', methods=['POST'])
 @api_call
 def new():

polyclash/util/storage.py

@@ -135,7 +135,7 @@ def get_plays(self, game_id):
         return self.games[game_id]['plays']
 
     def list_rooms(self):
-        return self.games.keys()
+        return list([key for key in self.games.keys()])
 
     def close_room(self, game_id):
         game = self.games[game_id]
@@ -254,9 +254,13 @@ def create_room(self):
         self.redis.hset(f'games:{game_id}', 'ready:white', str(False))
         self.redis.hset(f'games:{game_id}', 'started', str(False))
 
+        self.redis.expire(f'games:{game_id}', 3600 * 24 * 3)
+
         # self.redis.rpush(f'games:{game_id}:viewers', '')
         # self.redis.rpush(f'games:{game_id}:plays', '')
 
+        self.reaper()
+
         return dict(game_id=game_id, black_key=black_key, white_key=white_key, viewer_key=viewer_key)
 
     def contains(self, key_or_token):
@@ -284,7 +288,23 @@ def list_rooms(self):
         ])
 
     def close_room(self, game_id):
-        pass
+        if self.redis.exists(f'games:{game_id}'):
+            self.redis.hdel('rooms', self.redis.hget(f'games:{game_id}', 'keys:black'))
+            self.redis.hdel('rooms', self.redis.hget(f'games:{game_id}', 'keys:white'))
+            self.redis.hdel('rooms', self.redis.hget(f'games:{game_id}', 'keys:viewer'))
+            self.redis.hdel('rooms', self.redis.hget(f'games:{game_id}', 'players:black'))
+            self.redis.hdel('rooms', self.redis.hget(f'games:{game_id}', 'players:white'))
+        if self.redis.exists(f'games:{game_id}:viewer'):
+            for viewer_id in self.redis.lrange(f'games:{game_id}:viewers', 0, -1):
+                self.redis.hdel('rooms', viewer_id.decode('utf-8'))
+
+        self.redis.delete(f'games:{game_id}')
+        self.redis.lrem('games', 1, game_id)
+
+        if self.redis.exists(f'games:{game_id}:viewer'):
+            self.redis.delete(f'games:{game_id}:viewer')
+        if self.redis.exists(f'games:{game_id}:plays'):
+            self.redis.delete(f'games:{game_id}:plays')
 
     def exists(self, game_id):
         return game_id in list([item.decode('utf-8') for item in self.redis.lrange('games', 0, -1)])
@@ -318,7 +338,8 @@ def create_viewer(self, key):
         token = secrets.token_hex(USER_TOKEN_LENGTH // 2)
         game_id = self.get_game_id(key)
         self.redis.hset('rooms', token, game_id)
-        self.redis.hset(f'games:{game_id}', f'players:viewer', token)
+        self.redis.rpush(f'games:{game_id}:viewer', token)
+        self.redis.expire(f'games:{game_id}:viewer', 3600 * 24 * 3)
 
     def get_role(self, key_or_token):
         game_id = self.get_game_id(key_or_token)
@@ -345,6 +366,14 @@ def is_started(self, game_id):
 
     def add_play(self, game_id, play):
         self.redis.rpush(f'games:{game_id}:plays', json.dumps(play))
+        self.redis.expire(f'games:{game_id}:plays', 3600 * 24 * 3)
+
+    def reaper(self):
+        for game_id in self.list_rooms():
+            # if game_id is not represented in the key of games:{game_id}
+            # then it means the game is over and we should clean up
+            if not self.redis.exists(f'games:{game_id}'):
+                self.close_room(game_id)
 
 
 def test_redis_connection(host='localhost', port=6379, db=0):

tests/test_server.py

@@ -1,5 +1,5 @@
+import time
 import pytest
-
 import polyclash.server as server
 
 from flask_socketio import SocketIO
@@ -110,7 +110,7 @@ def test_game_ready(storage, test_client, socketio_client):
     assert result6.json['status']['black']
 
 
-def test_play_game(storage, test_client, socketio_client):
+def test_game_ready2(storage, test_client, socketio_client):
     result0 = test_client.post('/sphgo/new', json={'key': server_token})
     assert result0.status_code == 200
     assert result0.json['black_key']
@@ -152,5 +152,223 @@ def test_play_game(storage, test_client, socketio_client):
     assert result8.json['status']['white']
 
 
+def test_game_play(storage, test_client, socketio_client):
+    result0 = test_client.post('/sphgo/new', json={'key': server_token})
+    assert result0.status_code == 200
+    assert result0.json['black_key']
+    assert result0.json['white_key']
+
+    result1 = test_client.post('/sphgo/join', json={'token': result0.json['black_key']})
+    assert result1.status_code == 200
+    assert result1.json['status']['black']
+
+    result3 = test_client.post('/sphgo/join', json={'token': result0.json['white_key']})
+    assert result3.status_code == 200
+    assert result3.json['status']['white']
+
+    result5 = test_client.post('/sphgo/ready', json={'token': result0.json['black_key']})
+    assert result5.status_code == 200
+    assert result5.json['status']['black']
+
+    result7 = test_client.post('/sphgo/ready', json={'token': result0.json['white_key']})
+    assert result7.status_code == 200
+    assert result7.json['status']['black']
+
+    result9 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 0, 'play': [5, 6, 7, 8, 9]})
+    assert result9.status_code == 200
+
+    result10 = test_client.post('/sphgo/play', json={'token': result0.json['white_key'], 'role': 'white', 'steps': 1, 'play': [0, 1, 2, 3, 4]})
+    assert result10.status_code == 200
+
+
+def test_game_play_wrong_turn1(storage, test_client, socketio_client):
+    result0 = test_client.post('/sphgo/new', json={'key': server_token})
+    assert result0.status_code == 200
+    assert result0.json['black_key']
+    assert result0.json['white_key']
+
+    result1 = test_client.post('/sphgo/join', json={'token': result0.json['black_key']})
+    assert result1.status_code == 200
+    assert result1.json['status']['black']
+
+    result3 = test_client.post('/sphgo/join', json={'token': result0.json['white_key']})
+    assert result3.status_code == 200
+    assert result3.json['status']['white']
+
+    result5 = test_client.post('/sphgo/ready', json={'token': result0.json['black_key']})
+    assert result5.status_code == 200
+    assert result5.json['status']['black']
+
+    result7 = test_client.post('/sphgo/ready', json={'token': result0.json['white_key']})
+    assert result7.status_code == 200
+    assert result7.json['status']['black']
+
+    result9 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 0, 'play': [5, 6, 7, 8, 9]})
+    assert result9.status_code == 200
+
+    result10 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'white', 'steps': 1, 'play': [0, 1, 2, 3, 4]})
+    assert result10.status_code == 400
+
+
+def test_game_play_wrong_turn2(storage, test_client, socketio_client):
+    result0 = test_client.post('/sphgo/new', json={'key': server_token})
+    assert result0.status_code == 200
+    assert result0.json['black_key']
+    assert result0.json['white_key']
+
+    result1 = test_client.post('/sphgo/join', json={'token': result0.json['black_key']})
+    assert result1.status_code == 200
+    assert result1.json['status']['black']
+
+    result3 = test_client.post('/sphgo/join', json={'token': result0.json['white_key']})
+    assert result3.status_code == 200
+    assert result3.json['status']['white']
+
+    result5 = test_client.post('/sphgo/ready', json={'token': result0.json['black_key']})
+    assert result5.status_code == 200
+    assert result5.json['status']['black']
+
+    result7 = test_client.post('/sphgo/ready', json={'token': result0.json['white_key']})
+    assert result7.status_code == 200
+    assert result7.json['status']['black']
+
+    result9 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 0, 'play': [5, 6, 7, 8, 9]})
+    assert result9.status_code == 200
+
+    result10 = test_client.post('/sphgo/play', json={'token': result0.json['white_key'], 'role': 'white', 'steps': 1, 'play': [0, 1, 2, 3, 4]})
+    assert result10.status_code == 200
+
+    result11 = test_client.post('/sphgo/play', json={'token': result0.json['white_key'], 'role': 'white', 'steps': 2, 'play': [10, 11, 12, 13, 14]})
+    assert result11.status_code == 400
+
+
+
+def test_game_play_wrong_steps1(storage, test_client, socketio_client):
+    result0 = test_client.post('/sphgo/new', json={'key': server_token})
+    assert result0.status_code == 200
+    assert result0.json['black_key']
+    assert result0.json['white_key']
+
+    result1 = test_client.post('/sphgo/join', json={'token': result0.json['black_key']})
+    assert result1.status_code == 200
+    assert result1.json['status']['black']
+
+    result3 = test_client.post('/sphgo/join', json={'token': result0.json['white_key']})
+    assert result3.status_code == 200
+    assert result3.json['status']['white']
+
+    result5 = test_client.post('/sphgo/ready', json={'token': result0.json['black_key']})
+    assert result5.status_code == 200
+    assert result5.json['status']['black']
+
+    result7 = test_client.post('/sphgo/ready', json={'token': result0.json['white_key']})
+    assert result7.status_code == 200
+    assert result7.json['status']['black']
+
+    result9 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 1, 'play': [5, 6, 7, 8, 9]})
+    assert result9.status_code == 400
+
+
+def test_game_play_wrong_steps2(storage, test_client, socketio_client):
+    result0 = test_client.post('/sphgo/new', json={'key': server_token})
+    assert result0.status_code == 200
+    assert result0.json['black_key']
+    assert result0.json['white_key']
+
+    result1 = test_client.post('/sphgo/join', json={'token': result0.json['black_key']})
+    assert result1.status_code == 200
+    assert result1.json['status']['black']
+
+    result3 = test_client.post('/sphgo/join', json={'token': result0.json['white_key']})
+    assert result3.status_code == 200
+    assert result3.json['status']['white']
+
+    result5 = test_client.post('/sphgo/ready', json={'token': result0.json['black_key']})
+    assert result5.status_code == 200
+    assert result5.json['status']['black']
+
+    result7 = test_client.post('/sphgo/ready', json={'token': result0.json['white_key']})
+    assert result7.status_code == 200
+    assert result7.json['status']['black']
+
+    result9 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 0, 'play': [5, 6, 7, 8, 9]})
+    assert result9.status_code == 200
+
+    result10 = test_client.post('/sphgo/play', json={'token': result0.json['white_key'], 'role': 'white', 'steps': 1, 'play': [0, 1, 2, 3, 4]})
+    assert result10.status_code == 200
+
+    result11 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 1, 'play': [10, 11, 12, 13, 14]})
+    assert result11.status_code == 400
+
+
+def test_game_play_no_hang(storage, test_client, socketio_client):
+    result0 = test_client.post('/sphgo/new', json={'key': server_token})
+    assert result0.status_code == 200
+    assert result0.json['black_key']
+    assert result0.json['white_key']
+
+    result1 = test_client.post('/sphgo/join', json={'token': result0.json['black_key']})
+    assert result1.status_code == 200
+    assert result1.json['status']['black']
+
+    result3 = test_client.post('/sphgo/join', json={'token': result0.json['white_key']})
+    assert result3.status_code == 200
+    assert result3.json['status']['white']
+
+    result5 = test_client.post('/sphgo/ready', json={'token': result0.json['black_key']})
+    assert result5.status_code == 200
+    assert result5.json['status']['black']
+
+    result7 = test_client.post('/sphgo/ready', json={'token': result0.json['white_key']})
+    assert result7.status_code == 200
+    assert result7.json['status']['black']
+
+    result9 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 0, 'play': [5, 6, 7, 8, 9]})
+    assert result9.status_code == 200
+
+    result10 = test_client.post('/sphgo/play', json={'token': result0.json['white_key'], 'role': 'white', 'steps': 1, 'play': [0, 1, 2, 3, 4]})
+    assert result10.status_code == 200
+
+    result11 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 1, 'play': [10, 11, 12, 13, 14]})
+    assert result11.status_code == 400
+
+    result12 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 2, 'play': [10, 11, 12, 13, 14]})
+    assert result12.status_code == 200
+
+
+def test_game_close(storage, test_client, socketio_client):
+    result0 = test_client.post('/sphgo/new', json={'key': server_token})
+    assert result0.status_code == 200
+    assert result0.json['black_key']
+    assert result0.json['white_key']
+
+    result1 = test_client.post('/sphgo/join', json={'token': result0.json['black_key']})
+    assert result1.status_code == 200
+    assert result1.json['status']['black']
+
+    result3 = test_client.post('/sphgo/join', json={'token': result0.json['white_key']})
+    assert result3.status_code == 200
+    assert result3.json['status']['white']
+
+    result5 = test_client.post('/sphgo/ready', json={'token': result0.json['black_key']})
+    assert result5.status_code == 200
+    assert result5.json['status']['black']
+
+    result7 = test_client.post('/sphgo/ready', json={'token': result0.json['white_key']})
+    assert result7.status_code == 200
+    assert result7.json['status']['black']
+
+    result9 = test_client.post('/sphgo/play', json={'token': result0.json['black_key'], 'role': 'black', 'steps': 0, 'play': [5, 6, 7, 8, 9]})
+    assert result9.status_code == 200
+
+    result10 = test_client.post('/sphgo/play', json={'token': result0.json['white_key'], 'role': 'white', 'steps': 1, 'play': [0, 1, 2, 3, 4]})
+    assert result10.status_code == 200
+
+    result11 = test_client.post('/sphgo/close', json={'token': result0.json['white_key']})
+    assert result11.status_code == 200
+
+    result12 = test_client.get('/sphgo/list')
+    assert result0.json['game_id'] not in result12.json['rooms']
+
 if __name__ == '__main__':
     pytest.main()