]> de.git.xonotic.org Git - xonotic/xonstat.git/blobdiff - xonstat/views/submission.py
Add a function to determine the Elo category.
[xonotic/xonstat.git] / xonstat / views / submission.py
index 12e1c65d67d4f435947115a48d1f1fc94f033f2d..b942f09821675bf437ff466744f826a8199b3025 100644 (file)
+import calendar
+import collections
 import datetime
 import logging
-import os
-import pyramid.httpexceptions
 import re
-import time
-import sqlalchemy.sql.expression as expr
-from pyramid.response import Response
+
+import pyramid.httpexceptions
 from sqlalchemy import Sequence
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
-from xonstat.elo import process_elos
-from xonstat.models import *
+from xonstat.elo import EloProcessor
+from xonstat.models import DBSession, Server, Map, Game, PlayerGameStat, PlayerWeaponStat
+from xonstat.models import PlayerRank, PlayerCaptime
+from xonstat.models import TeamGameStat, PlayerGameAnticheat, Player, Hashkey, PlayerNick
 from xonstat.util import strip_colors, qfont_decode, verify_request, weapon_map
 
-
 log = logging.getLogger(__name__)
 
 
+def is_real_player(events):
+    """
+    Determines if a given set of events correspond with a non-bot
+    """
+    if not events['P'].startswith('bot'):
+        return True
+    else:
+        return False
+
+
+def played_in_game(events):
+    """
+    Determines if a given set of player events correspond with a player who
+    played in the game (matches 1 and scoreboardvalid 1)
+    """
+    if 'matches' in events and 'scoreboardvalid' in events:
+        return True
+    else:
+        return False
+
+
+class Submission(object):
+    """Parses an incoming POST request for stats submissions."""
+
+    def __init__(self, body, headers):
+        # a copy of the HTTP headers
+        self.headers = headers
+
+        # a copy of the HTTP POST body
+        self.body = body
+
+        # game metadata
+        self.meta = {}
+
+        # raw player events
+        self.players = []
+
+        # raw team events
+        self.teams = []
+
+        # distinct weapons that we have seen fired
+        self.weapons = set()
+
+        # number of real players in the match
+        self.real_players = 0
+
+        # the parsing deque (we use this to allow peeking)
+        self.q = collections.deque(self.body.split("\n"))
+
+    def next_item(self):
+        """Returns the next key:value pair off the queue."""
+        try:
+            items = self.q.popleft().strip().split(' ', 1)
+            if len(items) == 1:
+                # Some keys won't have values, like 'L' records where the server isn't actually
+                # participating in any ladders. These can be safely ignored.
+                return None, None
+            else:
+                return items
+        except:
+            return None, None
+
+    def check_for_new_weapon_fired(self, sub_key):
+        """Checks if a given player key (subkey, actually) is a new weapon fired in the match."""
+        if sub_key.endswith("cnt-fired"):
+            weapon = sub_key.split("-")[1]
+            if weapon not in self.weapons:
+                self.weapons.add(weapon)
+
+    def parse_player(self, key, pid):
+        """Construct a player events listing from the submission."""
+
+        # all of the keys related to player records
+        player_keys = ['i', 'n', 't', 'e']
+
+        player = {key: pid}
+
+        # Consume all following 'i' 'n' 't'  'e' records
+        while len(self.q) > 0:
+            (key, value) = self.next_item()
+            if key is None and value is None:
+                continue
+            elif key == 'e':
+                (sub_key, sub_value) = value.split(' ', 1)
+                player[sub_key] = sub_value
+
+                # keep track of the distinct weapons fired during the match
+                self.check_for_new_weapon_fired(sub_key)
+            elif key == 'n':
+                player[key] = unicode(value, 'utf-8')
+            elif key in player_keys:
+                player[key] = value
+            else:
+                # something we didn't expect - put it back on the deque
+                self.q.appendleft("{} {}".format(key, value))
+                break
+
+        if is_real_player(player) and played_in_game(player):
+            self.real_players += 1
+
+        self.players.append(player)
+
+    def parse_team(self, key, tid):
+        """Construct a team events listing from the submission."""
+        team = {key: tid}
+
+        # Consume all following 'e' records
+        while len(self.q) > 0 and self.q[0].startswith('e'):
+            (_, value) = self.next_item()
+            (sub_key, sub_value) = value.split(' ', 1)
+            team[sub_key] = sub_value
+
+        self.teams.append(team)
+
+    def parse(self):
+        """Parses the request body into instance variables."""
+        while len(self.q) > 0:
+            (key, value) = self.next_item()
+            if key is None and value is None:
+                continue
+            elif key == 'S':
+                self.meta[key] = unicode(value, 'utf-8')
+            elif key == 'P':
+                self.parse_player(key, value)
+            elif key == 'Q':
+                self.parse_team(key, value)
+            else:
+                self.meta[key] = value
+
+        return self
+
+
+def elo_submission_category(submission):
+    """Determines the Elo category purely by what is in the submission data."""
+    mod = submission.meta.get("O", "None")
+
+    vanilla_allowed_weapons = {"shotgun", "devastatorblaster", "mortar", "vortex", "electro",
+                               "arc", "hagar", "crylink", "machinegun"}
+    insta_allowed_weapons = {"vaporizer", "blaster"}
+    overkill_allowed_weapons = {"hmg", "vortex", "shotgun blaster", "machinegun", "rpc"}
+
+    if mod == "Xonotic":
+        if len(submission.weapons - vanilla_allowed_weapons) == 0:
+            return "vanilla"
+    elif mod == "InstaGib":
+        if len(submission.weapons - insta_allowed_weapons) == 0:
+            return "insta"
+    elif mod == "Overkill":
+        if len(submission.weapons - overkill_allowed_weapons) == 0:
+            return "overkill"
+    else:
+        return "general"
+
+    return "general"
+
+
 def parse_stats_submission(body):
     """
     Parses the POST request body for a stats submission
@@ -150,6 +306,7 @@ def is_supported_gametype(gametype, version):
             'cts',
             'dm',
             'dom',
+            'duel',
             'ft', 'freezetag',
             'ka', 'keepaway',
             'kh',
@@ -176,47 +333,46 @@ def do_precondition_checks(request, game_meta, raw_players):
     """Precondition checks for ALL gametypes.
        These do not require a database connection."""
     if not has_required_metadata(game_meta):
-        log.debug("ERROR: Required game meta missing")
-        raise pyramid.httpexceptions.HTTPUnprocessableEntity("Missing game meta")
+        msg = "Missing required game metadata"
+        log.debug(msg)
+        raise pyramid.httpexceptions.HTTPUnprocessableEntity(
+            body=msg,
+            content_type="text/plain"
+        )
 
     try:
         version = int(game_meta['V'])
     except:
-        log.debug("ERROR: Required game meta invalid")
-        raise pyramid.httpexceptions.HTTPUnprocessableEntity("Invalid game meta")
+        msg = "Invalid or incorrect game metadata provided"
+        log.debug(msg)
+        raise pyramid.httpexceptions.HTTPUnprocessableEntity(
+            body=msg,
+            content_type="text/plain"
+        )
 
     if not is_supported_gametype(game_meta['G'], version):
-        log.debug("ERROR: Unsupported gametype")
-        raise pyramid.httpexceptions.HTTPOk("OK")
+        msg = "Unsupported game type ({})".format(game_meta['G'])
+        log.debug(msg)
+        raise pyramid.httpexceptions.HTTPOk(
+            body=msg,
+            content_type="text/plain"
+        )
 
     if not has_minimum_real_players(request.registry.settings, raw_players):
-        log.debug("ERROR: Not enough real players")
-        raise pyramid.httpexceptions.HTTPOk("OK")
+        msg = "Not enough real players"
+        log.debug(msg)
+        raise pyramid.httpexceptions.HTTPOk(
+            body=msg,
+            content_type="text/plain"
+        )
 
     if is_blank_game(game_meta['G'], raw_players):
-        log.debug("ERROR: Blank game")
-        raise pyramid.httpexceptions.HTTPOk("OK")
-
-
-def is_real_player(events):
-    """
-    Determines if a given set of events correspond with a non-bot
-    """
-    if not events['P'].startswith('bot'):
-        return True
-    else:
-        return False
-
-
-def played_in_game(events):
-    """
-    Determines if a given set of player events correspond with a player who
-    played in the game (matches 1 and scoreboardvalid 1)
-    """
-    if 'matches' in events and 'scoreboardvalid' in events:
-        return True
-    else:
-        return False
+        msg = "Blank game"
+        log.debug(msg)
+        raise pyramid.httpexceptions.HTTPOk(
+            body=msg,
+            content_type="text/plain"
+        )
 
 
 def num_real_players(player_events):
@@ -279,7 +435,7 @@ def should_do_weapon_stats(game_type_cd):
         return True
 
 
-def should_do_elos(game_type_cd):
+def gametype_elo_eligible(game_type_cd):
     """True of the game type should process Elos. False otherwise."""
     elo_game_types = ('duel', 'dm', 'ca', 'ctf', 'tdm', 'ka', 'ft')
 
@@ -350,86 +506,94 @@ def update_fastest_cap(session, player_id, game_id, map_id, captime, mod):
         session.flush()
 
 
-def get_or_create_server(session, name, hashkey, ip_addr, revision, port,
-        impure_cvars):
+def update_server(server, name, hashkey, ip_addr, port, revision, impure_cvars):
     """
-    Find a server by name or create one if not found. Parameters:
-
-    session - SQLAlchemy database session factory
-    name - server name of the server to be found or created
-    hashkey - server hashkey
-    ip_addr - the IP address of the server
-    revision - the xonotic revision number
-    port - the port number of the server
-    impure_cvars - the number of impure cvar changes
+    Updates the server in the given DB session, if needed.
+
+    :param server: The found server instance.
+    :param name: The incoming server name.
+    :param hashkey: The incoming server hashkey.
+    :param ip_addr: The incoming server IP address.
+    :param port: The incoming server port.
+    :param revision: The incoming server revision.
+    :param impure_cvars: The incoming number of impure server cvars.
+    :return: bool
     """
-    server = None
-
+    # ensure the two int attributes are actually ints
     try:
         port = int(port)
     except:
         port = None
 
-    try: 
+    try:
         impure_cvars = int(impure_cvars)
     except:
         impure_cvars = 0
 
-    # finding by hashkey is preferred, but if not we will fall
-    # back to using name only, which can result in dupes
-    if hashkey is not None:
-        servers = session.query(Server).\
-            filter_by(hashkey=hashkey).\
-            order_by(expr.desc(Server.create_dt)).limit(1).all()
-
-        if len(servers) > 0:
-            server = servers[0]
-            log.debug("Found existing server {0} by hashkey ({1})".format(
-                server.server_id, server.hashkey))
-    else:
-        servers = session.query(Server).\
-            filter_by(name=name).\
-            order_by(expr.desc(Server.create_dt)).limit(1).all()
+    updated = False
+    if name and server.name != name:
+        server.name = name
+        updated = True
+    if hashkey and server.hashkey != hashkey:
+        server.hashkey = hashkey
+        updated = True
+    if ip_addr and server.ip_addr != ip_addr:
+        server.ip_addr = ip_addr
+        updated = True
+    if port and server.port != port:
+        server.port = port
+        updated = True
+    if revision and server.revision != revision:
+        server.revision = revision
+        updated = True
+    if impure_cvars and server.impure_cvars != impure_cvars:
+        server.impure_cvars = impure_cvars
+        server.pure_ind = True if impure_cvars == 0 else False
+        updated = True
 
-        if len(servers) > 0:
-            server = servers[0]
-            log.debug("Found existing server {0} by name".format(server.server_id))
+    return updated
 
-    # still haven't found a server by hashkey or name, so we need to create one
-    if server is None:
-        server = Server(name=name, hashkey=hashkey)
-        session.add(server)
-        session.flush()
-        log.debug("Created server {0} with hashkey {1}".format(
-            server.server_id, server.hashkey))
 
-    # detect changed fields
-    if server.name != name:
-        server.name = name
-        session.add(server)
+def get_or_create_server(session, name, hashkey, ip_addr, revision, port, impure_cvars):
+    """
+    Find a server by name or create one if not found. Parameters:
 
-    if server.hashkey != hashkey:
-        server.hashkey = hashkey
-        session.add(server)
+    session - SQLAlchemy database session factory
+    name - server name of the server to be found or created
+    hashkey - server hashkey
+    ip_addr - the IP address of the server
+    revision - the xonotic revision number
+    port - the port number of the server
+    impure_cvars - the number of impure cvar changes
+    """
+    servers_q = DBSession.query(Server).filter(Server.active_ind)
 
-    if server.ip_addr != ip_addr:
-        server.ip_addr = ip_addr
-        session.add(server)
+    if hashkey:
+        # if the hashkey is provided, we'll use that
+        servers_q = servers_q.filter((Server.name == name) or (Server.hashkey == hashkey))
+    else:
+        # otherwise, it is just by name
+        servers_q = servers_q.filter(Server.name == name)
 
-    if server.port != port:
-        server.port = port
-        session.add(server)
+    # order by the hashkey, which means any hashkey match will appear first if there are multiple
+    servers = servers_q.order_by(Server.hashkey, Server.create_dt).all()
 
-    if server.revision != revision:
-        server.revision = revision
+    if len(servers) == 0:
+        server = Server(name=name, hashkey=hashkey)
         session.add(server)
+        session.flush()
+        log.debug("Created server {} with hashkey {}.".format(server.server_id, server.hashkey))
+    else:
+        server = servers[0]
+        if len(servers) == 1:
+            log.info("Found existing server {}.".format(server.server_id))
 
-    if server.impure_cvars != impure_cvars:
-        server.impure_cvars = impure_cvars
-        if impure_cvars > 0:
-            server.pure_ind = False
-        else:
-            server.pure_ind = True
+        elif len(servers) > 1:
+            server_id_list = ", ".join(["{}".format(s.server_id) for s in servers])
+            log.warn("Multiple servers found ({})! Using the first one ({})."
+                     .format(server_id_list, server.server_id))
+
+    if update_server(server, name, hashkey, ip_addr, port, revision, impure_cvars):
         session.add(server)
 
     return server
@@ -486,6 +650,11 @@ def create_game(session, start_dt, game_type_cd, server_id, map_id,
     game.match_id = match_id
     game.mod = mod[:64]
 
+    # There is some drift between start_dt (provided by app) and create_dt
+    # (default in the database), so we'll make them the same until this is 
+    # resolved.
+    game.create_dt = start_dt
+
     try:
         game.duration = datetime.timedelta(seconds=int(round(float(duration))))
     except:
@@ -831,12 +1000,20 @@ def create_weapon_stats(session, game_meta, game, player, pgstat, events):
     return pwstats
 
 
-def create_elos(session, game):
-    """Elo handler for all game types."""
-    try:
-        process_elos(game, session)
-    except Exception as e:
-        log.debug('Error (non-fatal): elo processing failed.')
+def get_ranks(session, player_ids, game_type_cd):
+    """
+    Gets the rank entries for all players in the given list, returning a dict
+    of player_id -> PlayerRank instance. The rank entry corresponds to the
+    game type of the parameter passed in as well.
+    """
+    ranks = {}
+    for pr in session.query(PlayerRank).\
+            filter(PlayerRank.player_id.in_(player_ids)).\
+            filter(PlayerRank.game_type_cd == game_type_cd).\
+            all():
+                ranks[pr.player_id] = pr
+
+    return ranks
 
 
 def submit_stats(request):
@@ -900,6 +1077,8 @@ def submit_stats(request):
 
         # keep track of the players we've seen
         player_ids = []
+        pgstats = []
+        hashkeys = {}
         for events in raw_players:
             player = get_or_create_player(
                 session = session,
@@ -908,11 +1087,14 @@ def submit_stats(request):
 
             pgstat = create_game_stat(session, game_meta, game, server,
                     gmap, player, events)
+            pgstats.append(pgstat)
 
             if player.player_id > 1:
-                anticheats = create_anticheats(session, pgstat, game, player,
-                    events)
+                anticheats = create_anticheats(session, pgstat, game, player, events)
+
+            if player.player_id > 2:
                 player_ids.append(player.player_id)
+                hashkeys[player.player_id] = events['P']
 
             if should_do_weapon_stats(game_type_cd) and player.player_id > 1:
                 pwstats = create_weapon_stats(session, game_meta, game, player,
@@ -927,12 +1109,30 @@ def submit_stats(request):
             except Exception as e:
                 raise e
 
-        if should_do_elos(game_type_cd):
-            create_elos(session, game)
+        if server.elo_ind and gametype_elo_eligible(game_type_cd):
+            ep = EloProcessor(session, game, pgstats)
+            ep.save(session)
 
         session.commit()
         log.debug('Success! Stats recorded.')
-        return Response('200 OK')
+
+        # ranks are fetched after we've done the "real" processing
+        ranks = get_ranks(session, player_ids, game_type_cd)
+
+        # plain text response
+        request.response.content_type = 'text/plain'
+
+        return {
+                "now"        : calendar.timegm(datetime.datetime.utcnow().timetuple()),
+                "server"     : server,
+                "game"       : game,
+                "gmap"       : gmap,
+                "player_ids" : player_ids,
+                "hashkeys"   : hashkeys,
+                "elos"       : ep.wip,
+                "ranks"      : ranks,
+        }
+
     except Exception as e:
         if session:
             session.rollback()