hungerlib 3.2.dev13__py3-none-any.whl → 3.2.dev14__py3-none-any.whl

hungerlib/__init__.py

@@ -13,7 +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 HungerBridgeClient
+from .bridgeclient import BridgeClient
 from .utils import (
     ColorMap,
     ASCII_COLOR_MAP,
@@ -94,7 +94,7 @@ __all__ = [
     'Snapshot',
     'clearTerminal',
     'validateAll',
-    'HungerBridgeClient',
+    'BridgeClient',
 
     # namespaces
     'utils',

hungerlib/bridgeclient.py

@@ -1,42 +1,41 @@
 import requests
+import json
 
-class HungerBridgeClient:
-    def __init__(self, base_url: str, token: str):
-        self.base = base_url.rstrip("/")
+class BridgeClient:
+    def __init__(self, url, token):
+        self.base = url.rstrip("/")
         self.headers = {
-            "Authorization": f"Bearer {token}",
+            "X-Auth-Key": token,
             "Content-Type": "application/json"
         }
 
-    def _post(self, path: str, payload: dict):
+    def _post(self, path, payload):
         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):
+    def _get(self, path):
         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", {
+    def runCommand(self, command, show_console=False, silent=False):
+        return self._post("/v1/run", {
             "command": command,
-            "silent": silent
+            "silent": silent,
+            "show_console": show_console
         })
 
-    def log(self, message: str, level: str = "info"):
-        return self._post("/log", {
+    def log(self, message, level="info"):
+        return self._post("/v1/log", {
             "level": level,
             "message": message
         })
+
+    def getStatus(self):
+        return self._get("/v1/status")
+
+    def getVersion(self):
+        return self._get("/v1/version")

hungerlib/messagerouter.py

@@ -10,11 +10,6 @@ class MessageRouter:
         server,
         log_path,
         formatter=None,
-        console_backspaces=0,
-
-        info_prefix="<white>[INFO]: ",
-        warn_prefix="<yellow>[WARN]: ",
-        error_prefix="<red>[ERROR]: "
     ):
         self.name = name
         self.server = server
@@ -23,12 +18,6 @@ class MessageRouter:
         self.log_path = Path(log_path)
         self.log_path.mkdir(parents=True, exist_ok=True)
 
-        self.console_backspaces = "\b" * console_backspaces
-
-        self.info_prefix = info_prefix
-        self.warn_prefix = warn_prefix
-        self.error_prefix = error_prefix
-
         self.logger = logging.getLogger(name)
         self.logger.setLevel(logging.DEBUG)
         self._init_file_logger()
@@ -45,44 +34,21 @@ class MessageRouter:
             self.logger.addHandler(handler)
 
     # routing primitives
-    def origin(self, msg):
+    def _log_origin(self, msg):
         print(msg)
 
-    def destination(self, msg):
-        if not self.server:
-            return
-
-        # 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)
+    def _log_destination(self, msg):
+        if hasattr(self.server, "bridge"):
+            self.server.bridge.log(msg)
 
+    def _log_file(self, msg, level="INFO"):
         {
             "INFO": self.logger.info,
             "WARN": self.logger.warning,
             "ERROR": self.logger.error
         }[level](msg)
 
-    def broadcast(self, msg):
+    def _broadcast(self, msg):
         if hasattr(self.server, "sendBroadcast"):
             self.server.sendBroadcast(msg)
 
@@ -100,36 +66,29 @@ class MessageRouter:
         if not template:
             return
 
-        if level == "info":
-            template = self.info_prefix + template
-        elif level == "warn":
-            template = self.warn_prefix + template
-        elif level == "error":
-            template = self.error_prefix + template
-
         if self.formatter:
             msg = self.formatter(template, **fmt)
         else:
             msg = template
 
         if origin:
-            self.origin(msg)
+            self._log_origin(msg)
 
         if destination:
-            self.destination(msg)
+            self._log_destination(msg)
 
         if log:
-            self.log(msg, level=level.upper())
+            self._log_file(msg, level=level.upper())
 
         if broadcast:
-            self.broadcast(msg)
+            self._broadcast(msg)
 
     # level helpers
     def info(self, template, **fmt):
-        self.say(self.info_prefix + template, level="info", **fmt)
+        self.say(template, level="info", **fmt)
 
     def warn(self, template, **fmt):
-        self.say(self.warn_prefix + template, level="warn", **fmt)
+        self.say(template, level="warn", **fmt)
 
     def error(self, template, **fmt):
-        self.say(self.error_prefix + template, level="error", **fmt)
+        self.say(template, level="error", **fmt)

hungerlib/servers/minecraft.py

@@ -1,11 +1,11 @@
 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.bridgeclient import HungerBridgeClient
+from hungerlib.bridgeclient import BridgeClient
+from hungerlib.datamap import mapit
 
 
 class MinecraftServer(GenericServer):
@@ -16,12 +16,8 @@ class MinecraftServer(GenericServer):
         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,
+        bridge_url,
+        bridge_token,
         tpsCommand='tt20 tps',
     ):
         mc_map = (
@@ -46,33 +42,15 @@ class MinecraftServer(GenericServer):
         # Minecraft-specific fields
         self.server_domain = server_domain
         self.server_port = server_port
-        self.rcon_port = rcon_port
-        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)
+        # HungerBridge client
+        self.bridge = BridgeClient(bridge_url, bridge_token)
 
-    # rcon handler (fallback path)
-    def _rcon_send(self, command):
-        if not self.server_domain or not self.rcon_password:
-            return None
-        try:
-            with mcrcon.MCRcon(self.server_domain, self.rcon_password, port=self.rcon_port) as m:
-                resp1 = m.command(command)
-                time.sleep(0.05)
-                resp2 = m.command("")  # fetch buffered packets
-                return (resp1 or "") + (resp2 or "")
-        except Exception as e:
-            print("RCON error:", e)
-            return None
 
     # getter methods
     def getPlayers(self):
-        # Prefer bridge if we ever add an endpoint; for now still RCON
-        output = self._rcon_send("list")
+        output = self.bridge.runCommand("list")
         if not output:
             return None
         m = re.search(r"There are (\d+)", output)
@@ -84,7 +62,7 @@ class MinecraftServer(GenericServer):
         Example: /tt20 tps
         This parser WILL NOT WORK with other configurations!
         """
-        output = self._rcon_send(self.tpsCommand)
+        output = self.sendCommand(self.tpsCommand)
         if not output:
             return None
         clean = re.sub(r"§.", "", output)
@@ -100,28 +78,11 @@ class MinecraftServer(GenericServer):
         return round(value, rounding) if rounding else value
 
     # commands
-    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 sendConsoleCommand(self, command, show_console=False, silent=False):
+        return self.bridge.runCommand(command, show_console, silent)
 
-    def sendBroadcast(self, message: str):
-        translated = self._translate_mc_colors(message)
+    def sendBroadcast(self, message):
+        translated = mapit(message, MC_COLOR_MAP)
         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)
+        return self.bridge.runCommand(cmd)

{hungerlib-3.2.dev13.dist-info → hungerlib-3.2.dev14.dist-info}/METADATA

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

{hungerlib-3.2.dev13.dist-info → hungerlib-3.2.dev14.dist-info}/RECORD

@@ -1,8 +1,8 @@
-hungerlib/__init__.py,sha256=us1xv2omVi-zEk-PfpiWL3sWYwscgPxvne6sYAHWQZw,2218
-hungerlib/bridgeclient.py,sha256=-6i5QsloXGt57ayj5-W0WAPbkwxwOyw9noeSabX4EVE,1283
+hungerlib/__init__.py,sha256=wESqR_U2a-Y86CUOQvqXkLKYSoffzlaXRhLkQtWNnac,2206
+hungerlib/bridgeclient.py,sha256=LQThA82geuuMVI38x7cmi4YrLI0Z7FULWm21cUO-_DM,1210
 hungerlib/configloader.py,sha256=TdEFqk2zG5nT-vJqdjA36DrbRinY66n0rgI8Z-EZmAk,2548
 hungerlib/datamap.py,sha256=Tvcjc-n-tNO9SNQeh0k3dWzbxrRnnNVUmPnq0gap_8w,2807
-hungerlib/messagerouter.py,sha256=zd3OvU_ag7ELyU4PHJCeUjnHk8ElN5smMyGd099w8QQ,3827
+hungerlib/messagerouter.py,sha256=zwtGvezCTVPFUoWaeKr5XYkEf4y4MlC-SWEWmUx6V_A,2384
 hungerlib/panel.py,sha256=LljDy3FZoabWotdrNhN89xHd2VcvbiQDshtZgMa0g08,2013
 hungerlib/api/__init__.py,sha256=xuPbWBXVTkr9Jtcmvk8PPiVvi8HDxrIOmb_gOcDZy-M,336
 hungerlib/api/backups.py,sha256=eJEaCot9QpyvaqB3qne6e94CYmjJahj9Tf9r8ogUQr0,642
@@ -13,13 +13,13 @@ hungerlib/api/schedule.py,sha256=7MmfmSxTs4fgtJBfUQbc2nvvhPLrs2jQ50I73HHvS5s,797
 hungerlib/api/startup.py,sha256=YX6y7ZXG6DRNLvUjQFk4Cx7J5Ny4ym6OIWyyQsV5bwE,381
 hungerlib/servers/__init__.py,sha256=ApApJ18N_V6vTxDRVekj98Vdf80JhefYQkTH-5Ow9co,132
 hungerlib/servers/generic.py,sha256=vbAt85YKABwExNNAw8g9eAp-laeKQmgGJ0Qs1L6tNjk,8649
-hungerlib/servers/minecraft.py,sha256=FHBcBQdWxps6dPQMtlpv_FhxGHW_lzUiGsXbxOTs3hU,4113
+hungerlib/servers/minecraft.py,sha256=cSJ6Hym9ONvERgNLvbuB8u40dPk-TZQvI2qwNnBuQBE,2638
 hungerlib/utils/__init__.py,sha256=xyUldIwkVopZrp0Yp5g18vqGDUp3OOT4KknntLU4oes,504
 hungerlib/utils/colormaps.py,sha256=88eIDSI1hZYbtXmd7XujgmR1nhOXAkyB8ospQTqSHns,1240
 hungerlib/utils/time.py,sha256=lhLHMkL5NEP9f7j5k24k5brr1ZvAL22t07eV2rxTZ50,2354
 hungerlib/utils/utils.py,sha256=rGVXiK-ZaN1riNL_1QHKJZdOAX53vGlSDUzEP1Aqle4,1404
-hungerlib-3.2.dev13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-hungerlib-3.2.dev13.dist-info/METADATA,sha256=W1K_-q4GocCOabkjDHFUPyxGP9HIW6RqZmf0RH0GaxQ,1536
-hungerlib-3.2.dev13.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-hungerlib-3.2.dev13.dist-info/top_level.txt,sha256=uHBMIM8b2Gt6daNkDF4uw-M2Hm2IpIVw1jOK9wC0fNQ,10
-hungerlib-3.2.dev13.dist-info/RECORD,,
+hungerlib-3.2.dev14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+hungerlib-3.2.dev14.dist-info/METADATA,sha256=ls-7FYUhpQm1XkkLI4JtF1ARajQEpvjOSyEUVm1SlMo,1536
+hungerlib-3.2.dev14.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+hungerlib-3.2.dev14.dist-info/top_level.txt,sha256=uHBMIM8b2Gt6daNkDF4uw-M2Hm2IpIVw1jOK9wC0fNQ,10
+hungerlib-3.2.dev14.dist-info/RECORD,,