hungerlib 3.2.dev13__tar.gz → 3.2.1__tar.gz

{hungerlib-3.2.dev13/src/hungerlib.egg-info → hungerlib-3.2.1}/PKG-INFO

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

{hungerlib-3.2.dev13 → hungerlib-3.2.1}/pyproject.toml

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

{hungerlib-3.2.dev13 → hungerlib-3.2.1}/src/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-3.2.1/src/hungerlib/bridgeclient.py

@@ -0,0 +1,41 @@
+import requests
+import json
+
+class BridgeClient:
+    def __init__(self, url, token):
+        self.base = url.rstrip("/")
+        self.headers = {
+            "X-Auth-Key": token,
+            "Content-Type": "application/json"
+        }
+
+    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):
+        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()
+
+    def runCommand(self, command, show_console=False, silent=False):
+        return self._post("/v1/run", {
+            "command": command,
+            "silent": silent,
+            "show_console": show_console
+        })
+
+    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-3.2.dev13 → hungerlib-3.2.1}/src/hungerlib/configloader.py

@@ -81,6 +81,12 @@ def loadConfig(path, default_path, schema):
                 values[f.name] = convert_value(value, f.type)
             continue
 
+        # --- UNIVERSAL YAML LOOKUP ---
+        yaml_value = raw.get(f.name)
+        if yaml_value is not None:
+            values[f.name] = convert_value(yaml_value, f.type)
+            continue
+
         # --- FALLBACK: use dataclass default ---
         if default is not MISSING:
             values[f.name] = default

hungerlib-3.2.1/src/hungerlib/messagerouter.py

@@ -0,0 +1,94 @@
+import logging
+from pathlib import Path
+from datetime import datetime
+
+
+class MessageRouter:
+    def __init__(
+        self,
+        name,
+        server,
+        log_path,
+        formatter=None,
+    ):
+        self.name = name
+        self.server = server
+        self.formatter = formatter
+
+        self.log_path = Path(log_path)
+        self.log_path.mkdir(parents=True, exist_ok=True)
+
+        self.logger = logging.getLogger(name)
+        self.logger.setLevel(logging.DEBUG)
+        self._init_file_logger()
+
+    def _init_file_logger(self):
+        log_file = self.log_path / f"{self.name}_{datetime.now().strftime('%Y-%m-%d')}.log"
+        if not self.logger.handlers:
+            handler = logging.FileHandler(str(log_file))
+            formatter = logging.Formatter(
+                "[%(asctime)s] [%(levelname)s] %(message)s",
+                datefmt="%H:%M:%S"
+            )
+            handler.setFormatter(formatter)
+            self.logger.addHandler(handler)
+
+    # routing primitives
+    def _log_origin(self, msg):
+        print(msg)
+
+    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):
+        if hasattr(self.server, "sendBroadcast"):
+            self.server.sendBroadcast(msg)
+
+    # high level router
+    def say(
+        self,
+        template,
+        level="info",
+        destination=False,
+        broadcast=False,
+        log=True,
+        origin=True,
+        **fmt
+    ):
+        if not template:
+            return
+
+        if self.formatter:
+            msg = self.formatter(template, **fmt)
+        else:
+            msg = template
+
+        if origin:
+            self._log_origin(msg)
+
+        if destination:
+            self._log_destination(msg)
+
+        if log:
+            self._log_file(msg, level=level.upper())
+
+        if broadcast:
+            self._broadcast(msg)
+
+    # level helpers
+    def info(self, template, **fmt):
+        self.say(template, level="info", **fmt)
+
+    def warn(self, template, **fmt):
+        self.say(template, level="warn", **fmt)
+
+    def error(self, template, **fmt):
+        self.say(template, level="error", **fmt)

hungerlib-3.2.1/src/hungerlib/servers/minecraft.py

@@ -0,0 +1,88 @@
+import time
+import re
+
+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 BridgeClient
+from hungerlib.datamap import mapit
+
+
+class MinecraftServer(GenericServer):
+    def __init__(
+        self,
+        name,
+        panel: Panel,
+        server_id,
+        server_domain,
+        server_port,
+        bridge_url,
+        bridge_token,
+        tpsCommand='tt20 tps',
+    ):
+        mc_map = (
+            mc_color_map.as_dict()
+            if hasattr(mc_color_map, "as_dict")
+            else mc_color_map
+        )
+        ascii_map = (
+            ascii_color_map.as_dict()
+            if hasattr(ascii_color_map, "as_dict")
+            else ascii_color_map
+        )
+
+        super().__init__(
+            name,
+            panel,
+            server_id,
+            mc_color_map=mc_map,
+            ascii_color_map=ascii_map
+        )
+
+        # Minecraft-specific fields
+        self.server_domain = server_domain
+        self.server_port = server_port
+        self.tpsCommand = tpsCommand
+
+        # HungerBridge client
+        self.bridge = BridgeClient(bridge_url, bridge_token)
+
+
+    # getter methods
+    def getPlayers(self):
+        output = self.bridge.runCommand("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.sendCommand(self.tpsCommand)
+        if not output:
+            return None
+        clean = re.sub(r"§.", "", output)
+        m = re.search(
+            r"TPS\s+([0-9]+\.[0-9]+)\s+with average\s+([0-9]+\.[0-9]+)\s+accurate\s+([0-9]+\.[0-9]+)",
+            clean
+        )
+        if not m:
+            return None
+        raw, avg, acc = map(float, m.groups())
+        table = {"raw": raw, "avg": avg, "acc": acc}
+        value = table.get(type, avg)
+        return round(value, rounding) if rounding else value
+
+    # commands
+    def sendConsoleCommand(self, command, show_console=False, silent=False):
+        return self.bridge.runCommand(command, show_console, silent)
+
+    def sendBroadcast(self, message):
+        translated = mapit(message, MC_COLOR_MAP)
+        safe = translated.replace('"', '\\"')
+        cmd = f'tellraw @a {{"text":"{safe}"}}'
+        return self.bridge.runCommand(cmd)

{hungerlib-3.2.dev13 → hungerlib-3.2.1/src/hungerlib.egg-info}/PKG-INFO

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

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

@@ -1,42 +0,0 @@
-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.dev13/src/hungerlib/messagerouter.py

@@ -1,135 +0,0 @@
-import logging
-from pathlib import Path
-from datetime import datetime
-
-
-class MessageRouter:
-    def __init__(
-        self,
-        name,
-        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
-        self.formatter = formatter
-
-        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()
-
-    def _init_file_logger(self):
-        log_file = self.log_path / f"{self.name}_{datetime.now().strftime('%Y-%m-%d')}.log"
-        if not self.logger.handlers:
-            handler = logging.FileHandler(str(log_file))
-            formatter = logging.Formatter(
-                "[%(asctime)s] [%(levelname)s] %(message)s",
-                datefmt="%H:%M:%S"
-            )
-            handler.setFormatter(formatter)
-            self.logger.addHandler(handler)
-
-    # routing primitives
-    def 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)
-
-        {
-            "INFO": self.logger.info,
-            "WARN": self.logger.warning,
-            "ERROR": self.logger.error
-        }[level](msg)
-
-    def broadcast(self, msg):
-        if hasattr(self.server, "sendBroadcast"):
-            self.server.sendBroadcast(msg)
-
-    # high level router
-    def say(
-        self,
-        template,
-        level="info",
-        destination=False,
-        broadcast=False,
-        log=True,
-        origin=True,
-        **fmt
-    ):
-        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)
-
-        if destination:
-            self.destination(msg)
-
-        if log:
-            self.log(msg, level=level.upper())
-
-        if broadcast:
-            self.broadcast(msg)
-
-    # level helpers
-    def info(self, template, **fmt):
-        self.say(self.info_prefix + template, level="info", **fmt)
-
-    def warn(self, template, **fmt):
-        self.say(self.warn_prefix + template, level="warn", **fmt)
-
-    def error(self, template, **fmt):
-        self.say(self.error_prefix + template, level="error", **fmt)

hungerlib-3.2.dev13/src/hungerlib/servers/minecraft.py

@@ -1,127 +0,0 @@
-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
-
-
-class MinecraftServer(GenericServer):
-    def __init__(
-        self,
-        name,
-        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',
-    ):
-        mc_map = (
-            mc_color_map.as_dict()
-            if hasattr(mc_color_map, "as_dict")
-            else mc_color_map
-        )
-        ascii_map = (
-            ascii_color_map.as_dict()
-            if hasattr(ascii_color_map, "as_dict")
-            else ascii_color_map
-        )
-
-        super().__init__(
-            name,
-            panel,
-            server_id,
-            mc_color_map=mc_map,
-            ascii_color_map=ascii_map
-        )
-
-        # 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)
-
-    # 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")
-        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
-        clean = re.sub(r"§.", "", output)
-        m = re.search(
-            r"TPS\s+([0-9]+\.[0-9]+)\s+with average\s+([0-9]+\.[0-9]+)\s+accurate\s+([0-9]+\.[0-9]+)",
-            clean
-        )
-        if not m:
-            return None
-        raw, avg, acc = map(float, m.groups())
-        table = {"raw": raw, "avg": avg, "acc": acc}
-        value = table.get(type, avg)
-        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 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)