From 7bada37794bcbc0cbb3f0d3c9ba7f2862f8ed7c1 Mon Sep 17 00:00:00 2001
From: Bene <bene@degnedict.de>
Date: Tue, 11 Jun 2024 16:12:39 +0200
Subject: [PATCH] Keep connection open instead of reconnecting every time

---
 __pycache__/main.cpython-312.pyc | Bin 3352 -> 4092 bytes
 main.py                          |  63 +++++++++++++++++++------------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc
index 70d9475af5c3416c3503ac42dfa636065f15d23e..3636ba8a0b9e40a29c435bd251efe14fdb957e47 100644
GIT binary patch
literal 4092
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
L{=Q2d?D75^N^CB~

literal 3352
zcmdT`UuYCZ7@yfcw|BX}xywHziRVS5hc#DQQ>eAV>8TZKj7imc4=$VAjb7Z_z0Pj5
z7ZQk=QVT+r77_?Tgn|ueAwogulY$SHKJ?)Fa9!&|X<z!58X=IUezW(-OGpg%rR^;D
z-8VD8Z|0ltH#6V-==IhiD7VjC96aVg=yzJF6sX%}v7JF^63Ix$D$3v_##CoiCc`FK
zTW3`+!zX!L=Tt}10sWjRBn1X3c&<E5(kb&v7qrwVF4-{$W75)%l5S{o47HT%wNi1<
z;Zi;6l{xxVtT0l%Lv6L#k}eCfvw}(b*TJ}CRK*0=!PM1^Q_rBINOn&k*`u&?Y}uor
z;#|`MZ^dWXH-V~a4*@#5hQIzQI-mpx8M%IftJ*ZKV-s9u6RNRkTF0iLYSUQbRr5ON
zrYgF*2Hle5I?x_u;42J9=MaYP#-oqfbLa|=w){yK7sZxvL^8~H?=eta2PH!}q05R2
z6~`ept!QS?NFYTN8ML&d8eKz%u34B^zW&2~XAbv?@kFBUaDTsrEO)u3_hjD(mbdTF
z$sVyc-rs-rWM3jx8^<yoXz?{@okR*sVi_fw(@0?zPR9G8)z%nW<DreET8@kImZw*h
zatev3%rv+m7^Wg+(z4|sibVZ#%ELsWT|H5U<rGCt$|#~})rn$8mxooVdqnZ0VM#6b
zu!c!2zbHzYrkl2<0T?!|nX_n-I=#FrcG^&g5j&`8O6)?~yf{1%OGvroZj#cq-PxRZ
zQP*M_DXn#7bHoD{wg`e^)Pwj06}^FL?-xD(YsZVe`iT>yxq=yS#<KQmj1}RbXPAa)
z@dk)VWR}kpLT35=fyP0XUChdfN8jMeKJP|jXcP^(Dwr4lGE><lV_0TKaT=!>IQQ^X
zP8UY~X!VZCq4JL5dS+o)WF^D6B3nY)cgsl>BdcqMGRqSl<{|<Wbap~7DvKq<+AL!^
zQub~l^a?QOO2T16FA&S4rVUdpk47TUL?g8L4v2B|hs*z^?<@CrCw_JvTtE!p`CzaZ
z+BCWE*1oB9A++<lvlwWddN1$azQjZ45=A_tVtJ7|Fx|M1{hp7r!U!L`luli;9Fo0p
zQq`COh`MXX`vEBbFy43+uN`mT!M?3w=$bN(Ao^&C?v_<$8r|lq95FIC%Df^+d=F`b
zF-Lg1-taOG+X0UXYf(eC0FrpA@PU|R$#$x5rNX9(h9z9#$xTNr^F*T1V?$1X@-muc
z_?f}G+8r&wy?g%D{N?*&_r~V+eEX3?=;-?78EzPLIu>tWA2#suHerN|4M^Gw)@W31
z)_w)$-)9Y&LPIo&s|qm9-xg{Zb-Xg8LYYwxLJ%f9V1f}Q99hPZ60^<?nDv8!O)uFA
znz4e?IvBFTD7}n3C_)7BQbxI%Gk4G5IiKIQcRoHpcwfJ#=ev(Q7<k<DQ`--1kNx?x
zALiT76++34_<c7XVIM~L_%2~Yhz)D1p1PERxvS;Bd=Zuonb1*k+h&5agXbg+V#W35
zEkQ&`B9|3Hx}cvP9ztVHwt;}V>3_I%zJogbvW2@Tpt9`OVWBbj85>^f7Yd=y^>>aP
zvFIjC7=$;AluZ-5pDkxLCrj`?NfC}#y)-p<4M?V`D)3mKNy*~ucMGE%7As}5R_&8U
z989Z<#pzi^v$&G3>XK}^Yo0w8dqFW*WwuhbrwPmAvN}8@Y+mU(vRNi{&7_G6JLS`4
zx9r?sdWak#2cSyRkntwS1r}rc6m5Qr+MlBE6Xbq^T)#QI*V5zcf&(>l=274m-j%Ow
zojO$D!wU%G$V{Rb+<bG}Wb{^aD)B{Z{P+@#5dn0tZF0-4E%~i`=HDpPzcubF`Zj&8
zf2L1mzCKm(#m3#mz~)K+E&q&vK3E9s9rr%xSRB0h_HzV(3w4k@KW)C+e7&`R8~$Qg
z+_}girg4F4rOuYCE!TGx07{#tJkP+)#)MX3It#eoZn`;I#gvR*j1%2xlBx$GTU$B~
WVT#zxU$%3^x1j{fK4STVNBA2<B#Z(8

diff --git a/main.py b/main.py
index a880789..0d61206 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,7 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Depends
 from pydantic import BaseModel
-from rcon.battleye import Client
 import json
-import os
+from rcon.battleye import Client
 
 app = FastAPI()
 
@@ -15,37 +14,53 @@ SERVER_ADDRESS = credentials.get('SERVER_ADDRESS', '')
 SERVER_PORT = credentials.get('SERVER_PORT', 0)
 RCON_PASSWORD = credentials.get('RCON_PASSWORD', '')
 
+class RCONManager:
+    def __init__(self, address, port, password):
+        self.client = Client(address, port, passwd=password)
+        self.client.connect()
+
+    def run(self, command):
+        return self.client.run(command)
+
+    def close(self):
+        self.client.disconnect()
+
+rcon_manager = RCONManager(SERVER_ADDRESS, SERVER_PORT, RCON_PASSWORD)
+
+@app.on_event("shutdown")
+def shutdown_event():
+    rcon_manager.close()
+
 class PlayerAction(BaseModel):
     steamid: str
     reason: str
     duration: int
 
-@app.get("/players")
-def list_players():
-    with Client(SERVER_ADDRESS, SERVER_PORT, passwd=RCON_PASSWORD) as client:
-        response = client.run('players')
-        return {"response": response}
+def get_rcon_manager():
+    return rcon_manager
 
+@app.get("/players")
+def list_players(rcon: RCONManager = Depends(get_rcon_manager)):
+    response = rcon.run('players')
+    return {"response": response}
+
+# Ähnliche Änderungen für die anderen Endpunkte anwenden
 @app.post("/kick")
-def kick_player(action: PlayerAction):
-    with Client(SERVER_ADDRESS, SERVER_PORT, passwd=RCON_PASSWORD) as client:
-        response = client.run(f'kick {action.steamid} {action.reason}')
-        return {"response": response}
+def kick_player(action: PlayerAction, rcon: RCONManager = Depends(get_rcon_manager)):
+    response = rcon.run(f'kick {action.steamid} {action.reason}')
+    return {"response": response}
 
 @app.post("/ban")
-def ban_player(action: PlayerAction):
-    with Client(SERVER_ADDRESS, SERVER_PORT, passwd=RCON_PASSWORD) as client:
-        response = client.run(f'ban {action.steamid} {action.duration} "{action.reason}"')
-        return {"response": response}
+def ban_player(action: PlayerAction, rcon: RCONManager = Depends(get_rcon_manager)):
+    response = rcon.run(f'ban {action.steamid} {action.duration} "{action.reason}"')
+    return {"response": response}
 
 @app.post("/unlock")
-def unlock_server():
-    with Client(SERVER_ADDRESS, SERVER_PORT, passwd=RCON_PASSWORD) as client:
-        response = client.run('#unlock')
-        return {"response": response}
+def unlock_server(rcon: RCONManager = Depends(get_rcon_manager)):
+    response = rcon.run('#unlock')
+    return {"response": response}
 
 @app.post("/lock")
-def lock_server():
-    with Client(SERVER_ADDRESS, SERVER_PORT, passwd=RCON_PASSWORD) as client:
-        response = client.run('#lock')
-        return {"response": response}
+def lock_server(rcon: RCONManager = Depends(get_rcon_manager)):
+    response = rcon.run('#lock')
+    return {"response": response}