hungerlib 3.2.dev9__py3-none-any.whl → 3.2.dev11__py3-none-any.whl

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/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/messagerouter.py

@@ -1,9 +1,6 @@
-import inspect
 import logging
 from pathlib import Path
 from datetime import datetime
-from hungerlib.utils.colormaps import ASCII_COLOR_MAP, MC_COLOR_MAP
-from hungerlib.datamap import DataMap, Syntax, mapit
 
 
 class MessageRouter:
@@ -15,11 +12,6 @@ class MessageRouter:
         formatter=None,
         console_backspaces=0,
 
-        origin_map=ASCII_COLOR_MAP,
-        destination_map=ASCII_COLOR_MAP,
-        broadcast_map=MC_COLOR_MAP,
-        log_map=None,
-
         info_prefix="<white>[INFO]: ",
         warn_prefix="<yellow>[WARN]: ",
         error_prefix="<red>[ERROR]: "
@@ -33,11 +25,6 @@ class MessageRouter:
 
         self.console_backspaces = "\b" * console_backspaces
 
-        self._origin_map = origin_map
-        self._destination_map = destination_map
-        self._broadcast_map = broadcast_map
-        self._log_map = log_map
-
         self.info_prefix = info_prefix
         self.warn_prefix = warn_prefix
         self.error_prefix = error_prefix
@@ -57,47 +44,47 @@ class MessageRouter:
             handler.setFormatter(formatter)
             self.logger.addHandler(handler)
 
-    # colormap getters/setters
-    def setOriginMap(self, cmap): self._origin_map = cmap
-    def getOriginMap(self): return self._origin_map
-
-    def setDestinationMap(self, cmap): self._destination_map = cmap
-    def getDestinationMap(self): return self._destination_map
-
-    def setBroadcastMap(self, cmap): self._broadcast_map = cmap
-    def getBroadcastMap(self): return self._broadcast_map
-
-    def setLogMap(self, cmap): self._log_map = cmap
-    def getLogMap(self): return self._log_map
-
-    # routing primatives
+    # routing primitives
     def origin(self, msg):
-        colored = mapit(msg, self._origin_map)
-        print(colored)
+        print(msg)
 
     def destination(self, msg):
-        if not self.server or not hasattr(self.server, "_rcon_send"):
+        if not self.server:
             return
-        colored = mapit(msg, self._destination_map)
-        self.server._rcon_send(
-            f'logtellraw targetless "{self.console_backspaces}{colored}"'
-        )
+
+        # 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"):
-        clean = msg
-        if self._log_map:
-            for tag in self._log_map.as_dict().keys():
-                clean = clean.replace(tag, "")
+        # 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,
             "ERROR": self.logger.error
-        }[level](clean)
+        }[level](msg)
 
     def broadcast(self, msg):
         if hasattr(self.server, "sendBroadcast"):
-            colored = mapit(msg, self._broadcast_map)
-            self.server.sendBroadcast(colored)
+            self.server.sendBroadcast(msg)
 
     # high level router
     def say(

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.dev9.dist-info → hungerlib-3.2.dev11.dist-info}/METADATA

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

{hungerlib-3.2.dev9.dist-info → hungerlib-3.2.dev11.dist-info}/RECORD

@@ -1,7 +1,8 @@
-hungerlib/__init__.py,sha256=CTLIet8Tg8Gx3wWUrUNgIsHutv0JS1YzLelp1GLaLTs,2147
+hungerlib/__init__.py,sha256=AtHBFZzOJzVteOLdSe9RA3XPWFvC6H7IyeOHobQnESg,2258
+hungerlib/bridgeclient.py,sha256=-6i5QsloXGt57ayj5-W0WAPbkwxwOyw9noeSabX4EVE,1283
 hungerlib/configloader.py,sha256=TdEFqk2zG5nT-vJqdjA36DrbRinY66n0rgI8Z-EZmAk,2548
 hungerlib/datamap.py,sha256=Tvcjc-n-tNO9SNQeh0k3dWzbxrRnnNVUmPnq0gap_8w,2807
-hungerlib/messagerouter.py,sha256=1-4KeUT6AgTF0F53n3BtWt0ch0lnHHXYPOWvRtvUVKY,4344
+hungerlib/messagerouter.py,sha256=zd3OvU_ag7ELyU4PHJCeUjnHk8ElN5smMyGd099w8QQ,3827
 hungerlib/panel.py,sha256=LljDy3FZoabWotdrNhN89xHd2VcvbiQDshtZgMa0g08,2013
 hungerlib/api/__init__.py,sha256=xuPbWBXVTkr9Jtcmvk8PPiVvi8HDxrIOmb_gOcDZy-M,336
 hungerlib/api/backups.py,sha256=eJEaCot9QpyvaqB3qne6e94CYmjJahj9Tf9r8ogUQr0,642
@@ -12,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=VbzSQqztMB9RZkW9x7R8uWAZgmEbQuT5NnEIPCi0LyU,3166
+hungerlib/servers/minecraft.py,sha256=ijiW8rHUSOcvRzw0sesWD57qwjlFkfTBHq_XbK6-gVk,4107
 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.dev9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-hungerlib-3.2.dev9.dist-info/METADATA,sha256=vAcqjfRaHsF7mCQaaD-lf3FwNpMOJvLr5iPebOpJJ9E,1535
-hungerlib-3.2.dev9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-hungerlib-3.2.dev9.dist-info/top_level.txt,sha256=uHBMIM8b2Gt6daNkDF4uw-M2Hm2IpIVw1jOK9wC0fNQ,10
-hungerlib-3.2.dev9.dist-info/RECORD,,
+hungerlib-3.2.dev11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+hungerlib-3.2.dev11.dist-info/METADATA,sha256=03T6Mp-oxqqHkStae-8Af59p9XoLYWufOdEXgaF3T1g,1536
+hungerlib-3.2.dev11.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+hungerlib-3.2.dev11.dist-info/top_level.txt,sha256=uHBMIM8b2Gt6daNkDF4uw-M2Hm2IpIVw1jOK9wC0fNQ,10
+hungerlib-3.2.dev11.dist-info/RECORD,,