mirror of
https://github.com/wolfswolke/DeathGarden_API_Rebirth.git
synced 2026-03-21 17:54:09 -05:00
Fixed Matchmaking!
This commit is contained in:
ZKWolf
parent
d0de4a0ba0
commit
06e69bcba9
|
|
@ -12,7 +12,7 @@ import uuid
|
|||
def match_making_regions_raw():
|
||||
check_for_game_client("strict")
|
||||
try:
|
||||
return jsonify(["EU", "DEV"])
|
||||
return jsonify(["EU"])
|
||||
except TimeoutError:
|
||||
return jsonify({"status": "error"})
|
||||
except Exception as e:
|
||||
|
|
@ -29,8 +29,8 @@ def queue_info():
|
|||
category = sanitize_input(request.args.get("category"))
|
||||
game_mode = sanitize_input(request.args.get("gameMode"))
|
||||
region = sanitize_input(request.args.get("region"))
|
||||
count_a = request.args.get("countA") # Hunter Count
|
||||
count_b = request.args.get("countB") # Runner Count
|
||||
count_a = request.args.get("countA") # Hunter Count
|
||||
count_b = request.args.get("countB") # Runner Count
|
||||
side = sanitize_input(request.args.get("side", ""))
|
||||
session = matchmaking_queue.getSession(userid)
|
||||
if not side:
|
||||
|
|
@ -67,7 +67,6 @@ def queue():
|
|||
region = sanitize_input(request.json.get("region"))
|
||||
count_a = request.json.get("countA")
|
||||
count_b = request.json.get("countB")
|
||||
spoofed_match_id = "0051681e-72ce-46f0-bda2-752e471d0d08"
|
||||
epoch = datetime.now().timestamp()
|
||||
|
||||
logger.graylog_logger(level="info", handler="logging_queue_DUMP", message=request.get_json())
|
||||
|
|
@ -98,6 +97,8 @@ def queue():
|
|||
except Exception as e:
|
||||
logger.graylog_logger(level="error", handler="queue", message=e)
|
||||
return jsonify({"message": "Internal Server Error"}), 500
|
||||
|
||||
|
||||
# if region == "DEV":
|
||||
# all_users = [userid]
|
||||
# if additional_user_ids:
|
||||
|
|
@ -116,7 +117,7 @@ def queue():
|
|||
# "Schema": 11122334455666}})
|
||||
# else:
|
||||
# return {"status": "QUEUED", "queueData": {"ETA": -10000, "position": 0, "stable": False}}
|
||||
# eta, position = match_manager.find_eta_and_position(data["_match_uuid"])
|
||||
# eta, position = match_manager.find_eta_and_position(data["_match_uuid"])
|
||||
|
||||
|
||||
@app.route("/api/v1/queue/cancel", methods=["POST"])
|
||||
|
|
@ -140,14 +141,14 @@ def match(matchid_unsanitized):
|
|||
check_for_game_client("strict")
|
||||
session_cookie = sanitize_input(request.cookies.get("bhvrSession"))
|
||||
userid = session_manager.get_user_id(session_cookie)
|
||||
if matchid == "0051681e-72ce-46f0-bda2-752e471d0d08":
|
||||
return jsonify({"MatchId": matchid, "Category": "Steam-te-18f25613-36778-ue4-374f864b", "Rank": 1})
|
||||
try:
|
||||
response_data = matchmaking_queue.createMatchResponse(matchId=matchid)
|
||||
logger.graylog_logger(level="debug", handler="match", message=response_data)
|
||||
# logger.graylog_logger(level="debug", handler="match", message=response_data)
|
||||
if response_data == "null":
|
||||
logger.graylog_logger(level="error", handler="match", message=f"MatchResponse is null for MatchID: {matchid}")
|
||||
response_data = matchmaking_queue.getKilledLobbyById(matchid)
|
||||
logger.graylog_logger(level="debug", handler="match", message=response_data)
|
||||
# logger.graylog_logger(level="debug", handler="match", message=response_data)
|
||||
logger.graylog_logger(level="debug", handler="match", message=f"DEBUG MatchResponse: {response_data}")
|
||||
return jsonify(response_data)
|
||||
except Exception as e:
|
||||
logger.graylog_logger(level="error", handler="match", message=e)
|
||||
|
|
@ -196,6 +197,31 @@ def match_register(match_id_unsanitized):
|
|||
response = matchmaking_queue.registerMatch(match_id, session_settings, userid)
|
||||
|
||||
if response:
|
||||
if discord_mm_use:
|
||||
game_mode = response["props"]["gameMode"]
|
||||
if game_mode == "789c81dfb11fe39b7247c7e488e5b0d4-Default":
|
||||
game_mode = "Default"
|
||||
match_configuration = response["props"]["MatchConfiguration"]
|
||||
if match_configuration == "/Game/Configuration/MatchConfig/MatchConfig_Demo_HarvestYourExit_1v5.MatchConfig_Demo_HarvestYourExit_1v5":
|
||||
match_configuration = "Harvest Your Exit 1v5"
|
||||
webhook_data = {
|
||||
"content": "",
|
||||
"embeds": [
|
||||
{
|
||||
"title": f"Match Registered by {userid}",
|
||||
"description": f"MatchID: {match_id} \n GameMode: {game_mode} \n MatchConfiguration: {match_configuration}",
|
||||
"color": 7932020
|
||||
}
|
||||
],
|
||||
"attachments": []
|
||||
}
|
||||
try:
|
||||
discord_webhook(discord_mm_url, webhook_data)
|
||||
discord_webhook(discord_public_url, webhook_data)
|
||||
discord_webhook(discord_rebirth_url, webhook_data)
|
||||
except Exception as e:
|
||||
logger.graylog_logger(level="error", handler="discord_webhook_message", message=e)
|
||||
|
||||
return jsonify(response)
|
||||
|
||||
else:
|
||||
|
|
@ -209,6 +235,7 @@ def match_register(match_id_unsanitized):
|
|||
@app.route("/api/v1/match/<match_id_unsanitized>/Quit", methods=["PUT"])
|
||||
def match_quit(match_id_unsanitized):
|
||||
try:
|
||||
# todo If OWNER Crash -> Runner sends QUIT acknowledge when players less then 2
|
||||
check_for_game_client("strict")
|
||||
session_cookie = sanitize_input(request.cookies.get("bhvrSession"))
|
||||
userid = session_manager.get_user_id(session_cookie)
|
||||
|
|
@ -247,8 +274,12 @@ def close_lobby(match_id_unsanitized):
|
|||
|
||||
if lobby:
|
||||
if matchmaking_queue.isOwner(match_id, userid):
|
||||
matchmaking_queue.deleteMatch(match_id)
|
||||
return "", 204
|
||||
#matchmaking_queue.deleteMatch(match_id)
|
||||
#return "", 204
|
||||
# set lobby.status to "Closed"
|
||||
matchmaking_queue.closeMatch(match_id)
|
||||
data = matchmaking_queue.createMatchResponse(matchId=match_id, killed=False, userId=userid)
|
||||
return jsonify(data), 200
|
||||
else:
|
||||
return jsonify({"message": "Unauthorized"}), 401
|
||||
|
||||
|
|
@ -856,7 +887,6 @@ def metrics_end_of_match_event():
|
|||
|
||||
# Keys lobby_analytics
|
||||
|
||||
|
||||
logger.graylog_logger(level="info", handler="logging_endOfMatch_Event", message=data)
|
||||
return jsonify({"Success": True})
|
||||
except TimeoutError:
|
||||
|
|
@ -865,7 +895,6 @@ def metrics_end_of_match_event():
|
|||
logger.graylog_logger(level="error", handler="logging_endOfMatch_Event", message=e)
|
||||
|
||||
|
||||
|
||||
@app.route("/file/<game_version_unsanitized>/<seed_unsanitized>/<map_name_unsanitized>", methods=["POST", "GET"])
|
||||
def file_gold_rush(seed_unsanitized, map_name_unsanitized, game_version_unsanitized):
|
||||
check_for_game_client("strict")
|
||||
|
|
|
|||
|
|
@ -25,21 +25,22 @@ class QueuedPlayer:
|
|||
|
||||
|
||||
class Lobby:
|
||||
def __init__(self, isReady, host, nonHosts, id, isPrepared, hasStarted):
|
||||
def __init__(self, isReady, host, nonHosts, id, isPrepared, hasStarted, status):
|
||||
self.isReady = isReady
|
||||
self.host = host
|
||||
self.nonHosts = nonHosts
|
||||
self.id = id
|
||||
self.isPrepared = isPrepared
|
||||
self.hasStarted = hasStarted
|
||||
self.status = "OPENED"
|
||||
self.status = status
|
||||
|
||||
|
||||
class KilledLobby:
|
||||
def __init__(self, id, reason, killedTime):
|
||||
def __init__(self, id, reason, killedTime, host):
|
||||
self.id = id
|
||||
self.reason = reason
|
||||
self.killedTime = killedTime
|
||||
self.host = host
|
||||
|
||||
|
||||
class MatchmakingQueue:
|
||||
|
|
@ -55,6 +56,8 @@ class MatchmakingQueue:
|
|||
current_timestamp, expiration_timestamp = get_time()
|
||||
queuedPlayer = QueuedPlayer(userId, side,
|
||||
current_timestamp)
|
||||
if userId in [player.userId for player in self.queuedPlayers]:
|
||||
return
|
||||
self.queuedPlayers.append(queuedPlayer)
|
||||
except Exception as e:
|
||||
logger.graylog_logger(level="error", handler="matchmaking_queuePlayer", message=e)
|
||||
|
|
@ -79,7 +82,7 @@ class MatchmakingQueue:
|
|||
for openLobby in self.openLobbies:
|
||||
if not openLobby.isReady or openLobby.hasStarted:
|
||||
continue
|
||||
if len(openLobby.nonHosts) < 4:
|
||||
if len(openLobby.nonHosts) < 5:
|
||||
openLobby.nonHosts.append(queuedPlayer)
|
||||
self.queuedPlayers.pop(index)
|
||||
return self.createQueueResponseMatched(openLobby.host, openLobby.id, userId)
|
||||
|
|
@ -96,9 +99,11 @@ class MatchmakingQueue:
|
|||
}
|
||||
else:
|
||||
matchId = self.genMatchUUID()
|
||||
lobby = Lobby(False, queuedPlayer, [], matchId, False, False)
|
||||
lobby = Lobby(isReady=False, host=queuedPlayer, nonHosts=[], id=matchId, isPrepared=False,
|
||||
hasStarted=False, status="OPENED")
|
||||
self.openLobbies.append(lobby)
|
||||
return self.createQueueResponseMatched(userId, matchId, region)
|
||||
self.queuedPlayers.pop(index)
|
||||
return self.createQueueResponseMatched(userId, matchId, region=region)
|
||||
except Exception as e:
|
||||
logger.graylog_logger(level="error", handler="matchmaking_getQueueStatus", message=e)
|
||||
return None
|
||||
|
|
@ -136,11 +141,10 @@ class MatchmakingQueue:
|
|||
|
||||
def deleteMatch(self, matchId):
|
||||
lobby, index = self.getLobbyById(matchId)
|
||||
logger.graylog_logger(level="info", handler="deleteMatch", message=f"Deleting Match: {matchId}")
|
||||
if lobby:
|
||||
self.openLobbies.pop(index)
|
||||
current_timestamp, expiration_timestamp = get_time()
|
||||
killedLobby = KilledLobby(lobby.id, "killed_by_host", current_timestamp)
|
||||
killedLobby = KilledLobby(lobby.id, "killed_by_host", current_timestamp, lobby.host)
|
||||
self.killedLobbies.append(killedLobby)
|
||||
|
||||
def isOwner(self, matchId, userid):
|
||||
|
|
@ -161,10 +165,19 @@ class MatchmakingQueue:
|
|||
else:
|
||||
countA = 1
|
||||
countB = 5
|
||||
lobby = self.getLobbyById(matchId)[0] or self.getKilledLobbyById(matchId)
|
||||
lobby, id = self.getLobbyById(matchId)
|
||||
if not lobby:
|
||||
return {}
|
||||
lobby = self.getKilledLobbyById(matchId)
|
||||
host = lobby.host
|
||||
if type(host) == QueuedPlayer:
|
||||
host = host.userId
|
||||
non_host = []
|
||||
for item in lobby.nonHosts:
|
||||
if type(item) == QueuedPlayer:
|
||||
non_host.append(item.userId)
|
||||
else:
|
||||
non_host.append(item)
|
||||
|
||||
if killed:
|
||||
lobby.status = "KILLED"
|
||||
current_timestamp, expiration_timestamp = get_time()
|
||||
|
|
@ -183,16 +196,15 @@ class MatchmakingQueue:
|
|||
"props": {
|
||||
"countA": countA,
|
||||
"countB": countB,
|
||||
"EncryptionKey": "Rpqy9fgpIWrHxjJpiwnJJtoZ2hbUZZ4paU+0n4K/iZI=",
|
||||
"gameMode": "MatchConfig_NewMaps",
|
||||
"MatchConfiguration": "Game/Content/Configuration/MatchConfig/MatchConfig_NewMaps.MatchConfig_NewMaps",
|
||||
"gameMode": "789c81dfb11fe39b7247c7e488e5b0d4-Default",
|
||||
"MatchConfiguration": "/Game/Configuration/MatchConfig/MatchConfig_Demo_HarvestYourExit_1v5.MatchConfig_Demo_HarvestYourExit_1v5",
|
||||
"platform": "Windows",
|
||||
},
|
||||
"rank": 1,
|
||||
"Schema": 3,
|
||||
"sideA": [host],
|
||||
"sideB": [player.userId for player in lobby.nonHosts],
|
||||
"Players": [host] + [player.userId for player in lobby.nonHosts],
|
||||
"Players": [host] + non_host,
|
||||
"status": lobby.status
|
||||
}
|
||||
except Exception as e:
|
||||
|
|
@ -218,9 +230,8 @@ class MatchmakingQueue:
|
|||
"props": {
|
||||
"countA": countA,
|
||||
"countB": countB,
|
||||
"EncryptionKey": "Rpqy9fgpIWrHxjJpiwnJJtoZ2hbUZZ4paU+0n4K/iZI=",
|
||||
"gameMode": "MatchConfig_NewMaps",
|
||||
"MatchConfiguration": "/Game/Configuration/MatchConfig/MatchConfig_NewMaps.MatchConfig_NewMaps",
|
||||
"gameMode": "789c81dfb11fe39b7247c7e488e5b0d4-Default",
|
||||
"MatchConfiguration": "/Game/Configuration/MatchConfig/MatchConfig_Demo_HarvestYourExit_1v5.MatchConfig_Demo_HarvestYourExit_1v5",
|
||||
"platform": "Windows",
|
||||
},
|
||||
"rank": 1,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user