hungerlib 4.25.dev3__tar.gz → 4.25.dev5__tar.gz

{hungerlib-4.25.dev3/src/hungerlib.egg-info → hungerlib-4.25.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 4.25.dev3
+Version: 4.25.dev5
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT

{hungerlib-4.25.dev3 → hungerlib-4.25.dev5}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hungerlib"
-version = "4.25-dev.3"
+version = "4.25-dev.5"
 description = "Powerful automation library for Pterodactyl."
 readme = "README.md"
 requires-python = ">=3.9"

{hungerlib-4.25.dev3 → hungerlib-4.25.dev5}/src/hungerlib/bridgeclient.py

@@ -46,20 +46,31 @@ class Stream:
             self.timestamped_stream[ts] = clean
 
     def connect(self, keepalive: int = 15):
+        """
+        Connect to the SSE stream. Optionally request recent history lines by
+        passing `history=<n>` which will add the query parameter `?history=n`.
+        """
+        def _build_url_with_history(url: str, history: int | None):
+            if not history:
+                return url
+            sep = '&' if '?' in url else '?'
+            return f"{url}{sep}history={history}"
+
         if self._thread and self._thread.is_alive():
             return
 
         self._stop_event = threading.Event()
         self._session = requests.Session()
 
-        def _run():
+        def _run(history: int | None = None):
             history_phase = True
             history_lines = []
             history_deadline = time.time() + keepalive
 
+            request_url = _build_url_with_history(self.url, history)
             try:
                 with self._session.get(
-                    self.url,
+                    request_url,
                     headers=self.headers,
                     stream=True
                 ) as r:
@@ -105,6 +116,7 @@ class Stream:
 
         self._thread = threading.Thread(
             target=_run,
+            kwargs={"history": None},
             name='HungerBridgeStream',
             daemon=True
         )
@@ -131,7 +143,10 @@ class Stream:
     @staticmethod
     def sanitize(line: str) -> str:
         ansi_re = re.compile(r'\x1b\[[0-9;]*m')
-        return ansi_re.sub('', line).rstrip
+        # remove ANSI sequences, unescape server-escaped newlines, and strip
+        clean = ansi_re.sub('', line)
+        clean = clean.replace('\\n', '\n').replace('\\r', '\r')
+        return clean.rstrip()
 
     @staticmethod
     def extractTimestamp(line: str):

{hungerlib-4.25.dev3 → hungerlib-4.25.dev5}/src/hungerlib/servers/minecraft.py

@@ -36,15 +36,14 @@ class MinecraftServer(GenericServer):
         self.bridge = BridgeClient(bridge_url, bridge_token, history_handler=history_handler, newline_handler=newline_handler)
 
 
-    # basic information properties
-    @property
-    def bridge_version(self) -> str | None:
+    # basic getter methods
+    def getBridgeVersion(self) -> str | None:
         return self.bridge.getVersion()
-    @property
-    def version(self) -> str | None:
+
+    def getVersion(self) -> str | None:
         return self.bridge.getMinecraftVersion()
-    @property
-    def platform(self) -> str | None:
+
+    def getPlatform(self) -> str | None:
         return self.bridge.getPlatform()
 
 
@@ -57,15 +56,7 @@ class MinecraftServer(GenericServer):
         else:
             raise InvalidModeError(f"Invalid mode: '{mode}'")
 
-    @property
-    def player_count(self) -> int:
-        return self.getPlayers(mode='count') or 0
-    @property
-    def player_list(self) -> list[str]:
-        return self.getPlayers('list') or []
-
-    @property
-    def max_players(self) -> int:
+    def getMaxPlayers(self) -> int:
         '''
         Runs the 'list' command and extracts the max player count.
         Expected format:
@@ -99,10 +90,6 @@ class MinecraftServer(GenericServer):
             return None
         return round(value, rounding) if rounding is not None else value
 
-    @property
-    def tps(self) -> float | None:
-        return self.getTPS()
-
 
     # commands
     def sendConsoleCommand(

{hungerlib-4.25.dev3 → hungerlib-4.25.dev5/src/hungerlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 4.25.dev3
+Version: 4.25.dev5
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT