@@ -10,8 +17,8 @@ A Hypixel Bedwars Overlay in Python, 100% free and open source!
-
-
+
+
# ๐ Table of Contents
- [๐ About](#-about)
diff --git a/dev.py b/dev.py
index 726d944..0ba1ade 100644
--- a/dev.py
+++ b/dev.py
@@ -87,6 +87,15 @@
else:
logger.critical("You are running the development version of the overlay! However, you are not in development mode.")
- print("You are running the development version of the overlay! However, you are not in development mode.")
+ print("\n")
+ print("โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ")
+ print("โ โ")
+ print("โ WARNING ! โ")
+ print("โ โ")
+ print("โ You are running the development version of the overlay! However, you are not in development mode. โ")
+ print("โ Please set the DEV_MODE variable to True in the environment file! Or run the main.py file. โ")
+ print("โ โ")
+ print("โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ")
+ print("\n")
sys.exit(1)
diff --git a/main.py b/main.py
index 2bf85d9..ab3c915 100644
--- a/main.py
+++ b/main.py
@@ -52,7 +52,7 @@
if getattr(sys, 'frozen', False):
- import pyi_splash
+ import pyi_splash # type: ignore
def run(window: Updater, logger: Logger) -> None:
diff --git a/src/PolsuAPI/api.py b/src/PolsuAPI/api.py
index 0512e38..837b5ea 100644
--- a/src/PolsuAPI/api.py
+++ b/src/PolsuAPI/api.py
@@ -42,7 +42,7 @@
import traceback
-from aiohttp import ClientSession, ContentTypeError
+from aiohttp import ClientSession, ContentTypeError, WSMsgType
from json import load
@@ -144,6 +144,124 @@ async def login(self) -> User:
self.logger.error(f"An error occurred while logging in!\n\nTraceback: {traceback.format_exc()} | {e}")
return None
+
+ async def WebSocketConnection(self, setWebSocket, callback, closed) -> None:
+ """
+ Create a WebSocket connection
+
+ :param setWebSocket: A function to set the WebSocket
+ :param callback: A function to call when a player is received
+ :param closed: A function to call when the WebSocket is closed
+ """
+ self.logger.info(f"[WS] Creating a WebSocket connection...")
+
+ # Wait for messages
+ expired = False
+
+ try:
+ # Create a WebSocket connection
+ async with ClientSession() as session:
+ async with session.ws_connect(
+ url=f"{self.api}/internal/overlay/websocket",
+ headers=self.polsuHeaders,
+ timeout=1800,
+ receive_timeout=1800,
+ heartbeat=1800,
+ autoping=True,
+ autoclose=False
+ ) as ws:
+ if not ws.closed:
+ self.logger.info(f"[WS] Starting websocket connection...")
+ self.logger.debug(f"[WS] Sending handshake...")
+
+ # Send a handshake
+ await ws.send_json(
+ {
+ "protocol": "PolsuWebSocketProtocol - 1.0",
+ "handshake": self.key
+ }
+ )
+
+ self.logger.debug(f"[WS] Handshake sent!")
+
+ if not ws.closed:
+ # Wait for the handshake response
+ async for msg in ws:
+ try:
+ data = msg.json()
+ if data.get('success', False) and data.get('data', {}) == "Connection established.":
+ self.logger.info(f"[WS] New WebSocket connection established!")
+ break
+ else:
+ self.logger.debug(f"[WS] Couldn't create a WebSocket connection! {msg}")
+ break
+ except:
+ self.logger.debug(f"[WS] Couldn't create a WebSocket connection! {msg}")
+ break
+
+ if not ws.closed:
+ # Set the WebSocket so the overlay can send messages
+ await setWebSocket(ws)
+
+ self.logger.info(f"[WS] WebSocket connection established!")
+
+ async for msg in ws:
+ if msg.type in (WSMsgType.CLOSED, WSMsgType.ERROR):
+ return
+ else:
+ try:
+ data = msg.json()
+
+ if DEV_MODE:
+ self.logger.debug(f"[WS] Received data: {data}")
+
+ if data.get("data", {}) != {}:
+ if data.get("success", False):
+ player = Player(data.get("data"))
+ player.manual = data.get("data", {}).get("player", {}).get("manual", False)
+ player.websocket = True
+ await callback(player)
+ else:
+ if isinstance(data.get("data", {}), str):
+ if data.get("data", {}) == "Expired websocket!":
+ self.logger.warning(f"[WS] WebSocket connection expired!")
+ expired = True
+
+ raise Exception("Expired websocket!")
+ elif data.get("data", {}) == "Packet limit reached!":
+ self.logger.error(f"[WS] Packet limit reached!")
+ expired = True
+
+ raise Exception("Packet limit reached!")
+ elif data.get("data", {}) == "Malformed JSON" or data.get("data", {}) == "Missing query" or data.get("data", {}) == "Invalid query":
+ self.logger.error(f"[WS] An error occurred while sending some data: {data.get('data', {})}")
+ elif data.get("data", {}) == "Too many players":
+ self.logger.error(f"[WS] Oops we reached the maximum amount of players!")
+ else:
+ self.logger.error(f"[WS] An error occurred with the websocket connection: {data.get('data', {})}")
+ else:
+ if data.get("cause", None).startswith("Rate Limited"):
+ self.logger.error(f"[WS] Rate limited! {data.get('cause', None)}")
+
+ raise Exception("Rate limited!")
+ else:
+ f = open(f"{resource_path('src/PolsuAPI')}/schemas/nicked.json", mode="r", encoding="utf-8")
+ player = Player(load(f))
+ player.username = data.get("data", {}).get("player", {}).get("username")
+ player.rank = f"ยงc{data.get('data', {}).get('player', {}).get('username')}"
+ player.manual = data.get("data", {}).get("player", {}).get("manual", False)
+ player.nicked = True
+ player.websocket = True
+ await callback(player)
+ except Exception as e:
+ self.logger.error(f"An error occurred while receiving a WebSocket message!\n\nTraceback: {traceback.format_exc()} | {e}")
+ except Exception as e:
+ self.logger.error(f"An error occurred while creating a WebSocket connection!\n\nTraceback: {traceback.format_exc()} | {e}")
+
+ closed(expired)
+
+ self.logger.info(f"[WS] WebSocket connection closed!")
+
async def get_stats(self, player: str) -> Player:
"""
@@ -322,15 +440,19 @@ async def load_skin(self, player: Player) -> None:
if DEV_MODE:
self.logger.info(f"GET skins.mcstats.com/face/{player.uuid}")
+ headers = {
+ "User-Agent": __header__["User-Agent"]
+ }
+
async with ClientSession() as session:
- async with session.get(f"https://skins.mcstats.com/face/{player.uuid}", headers=__header__) as response:
+ async with session.get(f"https://skins.mcstats.com/face/{player.uuid}", headers=headers) as response:
if response.status == 200:
return await response.read()
else:
self.logger.error(f"An error occurred while getting the skin of {player.uuid} ({response.status})!")
raise APIError
except ContentTypeError:
- raise APIError
+ return None
except APIError:
return None
except Exception as e:
diff --git a/src/PolsuAPI/client.py b/src/PolsuAPI/client.py
index 05c9c3c..9d425b0 100644
--- a/src/PolsuAPI/client.py
+++ b/src/PolsuAPI/client.py
@@ -169,3 +169,15 @@ async def loadSkin(self, player: Pl) -> None:
return await self.client.load_skin(player)
except asyncio.TimeoutError:
raise APIError
+
+
+ async def WebSocket(self, setWebSocket, callback, closed) -> None:
+ """
+ Get a Player stats with a WebSocket connection
+
+ :param setWebSocket: A setWebSocket function
+ :param callback: A callback function
+ :param closed: A closed function
+ :return: An instance of Pl, representing the Player stats
+ """
+ await self.client.WebSocketConnection(setWebSocket, callback, closed)
diff --git a/src/PolsuAPI/objects/player.py b/src/PolsuAPI/objects/player.py
index 1c59eb7..5fbdb31 100644
--- a/src/PolsuAPI/objects/player.py
+++ b/src/PolsuAPI/objects/player.py
@@ -515,6 +515,9 @@ def __init__(self, data: dict) -> None:
self._ping = Ping(data.get('ping'))
self._local = None
+ self._manual = False
+ self._websocket = False
+
@property
def data(self) -> dict:
@@ -643,6 +646,38 @@ def local(self, value: LocalBlacklisted) -> None:
"""
self._local = value
+
+ @property
+ def manual(self) -> bool:
+ """
+ Whether the Player is manually requested or not
+ """
+ return self._manual
+
+
+ @manual.setter
+ def manual(self, value: bool) -> None:
+ """
+ Set whether the Player is manually requested or not
+ """
+ self._manual = value
+
+
+ @property
+ def websocket(self) -> bool:
+ """
+ Whether the Player was requested through the WebSocket or not
+ """
+ return self._websocket
+
+
+ @websocket.setter
+ def websocket(self, value: bool) -> None:
+ """
+ Set whether the Player was requested through the WebSocket or not
+ """
+ self._websocket = value
+
def __repr__(self) -> str:
return f"