hungerlib 3.2.dev10__tar.gz → 3.2.dev11__tar.gz

{hungerlib-3.2.dev10/src/hungerlib.egg-info → hungerlib-3.2.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 3.2.dev10
+Version: 3.2.dev11
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT

{hungerlib-3.2.dev10 → hungerlib-3.2.dev11}/pyproject.toml

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

{hungerlib-3.2.dev10 → hungerlib-3.2.dev11}/src/hungerlib/__init__.py

@@ -13,6 +13,7 @@ from .datamap import set_default_maps, get_default_maps, Syntax, DataMap, datama
 from .messagerouter import MessageRouter
 from .panel import Panel
 from .servers import GenericServer, MinecraftServer
+from .bridgeclient import health, ping, runCommand, log
 from .utils import (
     ColorMap,
     ASCII_COLOR_MAP,
@@ -93,6 +94,10 @@ __all__ = [
     'Snapshot',
     'clearTerminal',
     'validateAll',
+    'health',
+    'ping',
+    'runCommand',
+    'log',
 
     # namespaces
     'utils',

hungerlib-3.2.dev11/src/hungerlib/bridgeclient.py

@@ -0,0 +1,42 @@
+import requests
+
+class HungerBridgeClient:
+    def __init__(self, base_url: str, token: str):
+        self.base = base_url.rstrip("/")
+        self.headers = {
+            "Authorization": f"Bearer {token}",
+            "Content-Type": "application/json"
+        }
+
+    def _post(self, path: str, payload: dict):
+        r = requests.post(f"{self.base}{path}", headers=self.headers, json=payload)
+        if not r.ok:
+            raise RuntimeError(f"HungerBridge error {r.status_code}: {r.text}")
+        return r.json()
+
+    def _get(self, path: str):
+        r = requests.get(f"{self.base}{path}", headers=self.headers)
+        if not r.ok:
+            raise RuntimeError(f"HungerBridge error {r.status_code}: {r.text}")
+        return r.json()
+
+    # -----------------------------
+    # Public API
+    # -----------------------------
+    def health(self):
+        return self._get("/health")
+
+    def ping(self):
+        return self._get("/ping")
+
+    def runCommand(self, command: str, silent: bool = False):
+        return self._post("/run", {
+            "command": command,
+            "silent": silent
+        })
+
+    def log(self, message: str, level: str = "info"):
+        return self._post("/log", {
+            "level": level,
+            "message": message
+        })

{hungerlib-3.2.dev10 → hungerlib-3.2.dev11}/src/hungerlib/messagerouter.py

@@ -2,6 +2,7 @@ import logging
 from pathlib import Path
 from datetime import datetime
 
+
 class MessageRouter:
     def __init__(
         self,
@@ -48,13 +49,33 @@ class MessageRouter:
         print(msg)
 
     def destination(self, msg):
-        if not self.server or not hasattr(self.server, "_rcon_send"):
+        if not self.server:
             return
-        self.server._rcon_send(
-            f'logtellraw targetless "{self.console_backspaces}{msg}"'
-        )
+
+        # Prefer HungerBridge client if present
+        bridge = getattr(self.server, "bridge", None)
+        if bridge is not None:
+            try:
+                bridge.log(self.console_backspaces + msg, level="info")
+                return
+            except Exception as e:
+                print("Bridge destination error, falling back to RCON:", e)
+
+        # Fallback to RCON/logtellraw
+        if hasattr(self.server, "_rcon_send"):
+            self.server._rcon_send(
+                f'logtellraw targetless "{self.console_backspaces}{msg}"'
+            )
 
     def log(self, msg, level="INFO"):
+        # Prefer HungerBridge client for server log
+        bridge = getattr(self.server, "bridge", None)
+        if bridge is not None:
+            try:
+                bridge.log(msg, level=level.lower())
+            except Exception as e:
+                print("Bridge log error, falling back to file log:", e)
+
         {
             "INFO": self.logger.info,
             "WARN": self.logger.warning,

{hungerlib-3.2.dev10 → hungerlib-3.2.dev11}/src/hungerlib/servers/minecraft.py

@@ -1,21 +1,25 @@
 import time
 import re
 import mcrcon
+
 from hungerlib.panel import Panel
 from hungerlib.utils.colormaps import MC_COLOR_MAP, ASCII_COLOR_MAP
 from hungerlib.servers import GenericServer
+from hungerlib.bridge import HungerBridgeClient
 
 
 class MinecraftServer(GenericServer):
     def __init__(
         self,
         name,
-        panel,
+        panel: Panel,
         server_id,
         server_domain,
         server_port,
         rcon_port,
         rcon_password,
+        bridge_url=None,
+        bridge_token=None,
         mc_color_map=MC_COLOR_MAP,
         ascii_color_map=ASCII_COLOR_MAP,
         tpsCommand='tt20 tps',
@@ -31,7 +35,6 @@ class MinecraftServer(GenericServer):
             else ascii_color_map
         )
 
-        # Pass normalized maps to GenericServer
         super().__init__(
             name,
             panel,
@@ -47,9 +50,12 @@ class MinecraftServer(GenericServer):
         self.rcon_password = rcon_password
         self.tpsCommand = tpsCommand
 
+        # Optional HungerBridge client
+        self.bridge: HungerBridgeClient | None = None
+        if bridge_url and bridge_token:
+            self.bridge = HungerBridgeClient(bridge_url, bridge_token)
 
-
-    # rcon handler
+    # rcon handler (fallback path)
     def _rcon_send(self, command):
         if not self.server_domain or not self.rcon_password:
             return None
@@ -65,17 +71,19 @@ class MinecraftServer(GenericServer):
 
     # getter methods
     def getPlayers(self):
+        # Prefer bridge if we ever add an endpoint; for now still RCON
         output = self._rcon_send("list")
         if not output:
             return None
         m = re.search(r"There are (\d+)", output)
         return int(m.group(1)) if m else None
+
     def getTPS(self, type="raw", rounding=10):
-        '''
+        """
         This has limitations and is not yet complete. It currently ONLY parses TT20's tps command.
         Example: /tt20 tps
         This parser WILL NOT WORK with other configurations!
-        '''
+        """
         output = self._rcon_send(self.tpsCommand)
         if not output:
             return None
@@ -91,12 +99,29 @@ class MinecraftServer(GenericServer):
         value = table.get(type, avg)
         return round(value, rounding) if rounding else value
 
-
     # commands
-    def sendConsoleCommand(self, command):
+    def sendConsoleCommand(self, command: str):
+        # Prefer HungerBridge
+        if self.bridge is not None:
+            try:
+                return self.bridge.runCommand(command)
+            except Exception as e:
+                print("Bridge command error, falling back to panel:", e)
+
+        # Fallback to panel (which may use RCON or other transport)
         return self.panel.commands.send(self.server_id, command)
-    def sendBroadcast(self, message):
+
+    def sendBroadcast(self, message: str):
         translated = self._translate_mc_colors(message)
         safe = translated.replace('"', '\\"')
         cmd = f'tellraw @a {{"text":"{safe}"}}'
+
+        # Prefer HungerBridge
+        if self.bridge is not None:
+            try:
+                return self.bridge.runCommand(cmd)
+            except Exception as e:
+                print("Bridge broadcast error, falling back to panel:", e)
+
+        # Fallback
         return self.sendConsoleCommand(cmd)

{hungerlib-3.2.dev10 → hungerlib-3.2.dev11/src/hungerlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 3.2.dev10
+Version: 3.2.dev11
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT

{hungerlib-3.2.dev10 → hungerlib-3.2.dev11}/src/hungerlib.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 src/hungerlib/__init__.py
+src/hungerlib/bridgeclient.py
 src/hungerlib/configloader.py
 src/hungerlib/datamap.py
 src/hungerlib/messagerouter.py