hungerlib 4.24.dev14__tar.gz → 4.24.2__tar.gz

{hungerlib-4.24.dev14/src/hungerlib.egg-info → hungerlib-4.24.2}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 4.24.dev14
+Version: 4.24.2
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT
-Project-URL: Homepage, https://github.com/iFamishedX/HungerLib
-Project-URL: Documentation, https://github.com/iFamishedX/HungerLib
-Project-URL: Source, https://github.com/iFamishedX/HungerLib
-Project-URL: Issues, https://github.com/iFamishedX/HungerLib/issues
+Project-URL: Homepage, https://github.com/iFamished/HungerLib
+Project-URL: Documentation, https://github.com/iFamished/HungerLib
+Project-URL: Source, https://github.com/iFamished/HungerLib
+Project-URL: Issues, https://github.com/iFamished/HungerLib/issues
 Keywords: pterodactyl,minecraft,automation,rcon,server-management,hungerlib,hungernet
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -23,10 +23,12 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
-Requires-Dist: mcrcon
 Requires-Dist: PyYaml
 Requires-Dist: mapres
 Requires-Dist: jinja2
+Requires-Dist: cloudflare
+Requires-Dist: uvicorn
+Requires-Dist: fastapi
 Dynamic: license-file
 
 # HungerLib

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hungerlib"
-version = "4.24-dev.14"
+version = "4.24.2"
 description = "Powerful automation library for Pterodactyl."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -25,10 +25,12 @@ keywords = [
 ]
 dependencies = [
     "requests",
-    "mcrcon",
     "PyYaml",
     "mapres",
     "jinja2",
+    "cloudflare",
+    "uvicorn",
+    "fastapi",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -47,10 +49,10 @@ classifiers = [
 text = "MIT"
 
 [project.urls]
-Homepage = "https://github.com/iFamishedX/HungerLib"
-Documentation = "https://github.com/iFamishedX/HungerLib"
-Source = "https://github.com/iFamishedX/HungerLib"
-Issues = "https://github.com/iFamishedX/HungerLib/issues"
+Homepage = "https://github.com/iFamished/HungerLib"
+Documentation = "https://github.com/iFamished/HungerLib"
+Source = "https://github.com/iFamished/HungerLib"
+Issues = "https://github.com/iFamished/HungerLib/issues"
 
 [tool.setuptools]
 include-package-data = true

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/src/hungerlib/__init__.py

@@ -13,8 +13,8 @@ from .messagerouter import MessageRouter
 from .panel import Panel
 from .servers import GenericServer, MinecraftServer
 from .bridgeclient import BridgeClient
-from .discord_bot_webhook import DiscordBotWebhook
 from .email import Email, EmailManager, EmailClient
+from .webhook import WebhookClient, WebhookServer
 from .validator import (
     Validator,
     ValidationError,
@@ -34,6 +34,8 @@ from .utils import (
     Snapshot,
     clearTerminal,
     validateAll,
+    Buffer,
+    convert,
 
     # exceptions
     HungerLibError,
@@ -53,6 +55,8 @@ utils = SimpleNamespace(
     Snapshot = Snapshot,
     clearTerminal = clearTerminal,
     validateAll = validateAll,
+    Buffer = Buffer,
+    convert = convert,
 )
 
 servers = SimpleNamespace(
@@ -61,6 +65,10 @@ servers = SimpleNamespace(
     Minecraft = MinecraftServer,
 )
 
+webhook = SimpleNamespace(
+    Client = WebhookClient,
+    Server = WebhookServer,
+)
 
 
 __all__ = [
@@ -73,7 +81,6 @@ __all__ = [
     'GenericServer',
     'MinecraftServer',
     'BridgeClient',
-    'DiscordBotWebhook',
     'Validator',
     'Email',
     'EmailManager',
@@ -89,6 +96,10 @@ __all__ = [
     'Snapshot',
     'clearTerminal',
     'validateAll',
+    'WebhookServer',
+    'WebhookClient',
+    'Buffer',
+    'convert',
 
     # errors
     'ValidationError',
@@ -105,4 +116,5 @@ __all__ = [
     # namespaces
     'utils',
     'servers',
+    'webhook',
 ]

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/src/hungerlib/email/manager.py

@@ -3,26 +3,24 @@ import pathlib
 from cloudflare import Cloudflare
 from .message import Email
 
-# Templates live in: src/hungerlib/email/email_templates
 TEMPLATE_DIR = pathlib.Path(__file__).resolve().parent / "email_templates"
 
 class EmailManager:
-    """
+    '''
     Backend email system.
     Holds API token and account ID.
     Sends emails created by EmailClient.
-    """
-
+    '''
     def __init__(self, api_token: str, account_id: str):
         self.client = Cloudflare(api_token=api_token)
         self.account_id = account_id
 
-        # Jinja2 environment configured for HTML emails
+        # Jinja2 configured to NOT alter whitespace or escape HTML
         self.jinja = Environment(
             loader=FileSystemLoader(str(TEMPLATE_DIR)),
-            autoescape=False,        # Cloudflare rejects escaped HTML
-            trim_blocks=False,       # preserve whitespace
-            lstrip_blocks=False      # preserve indentation
+            autoescape=False,
+            trim_blocks=False,
+            lstrip_blocks=False
         )
 
     def render_template(self, template: str, ctx: dict) -> str:
@@ -45,9 +43,6 @@ class EmailManager:
             payload["text"] = email.text
 
         if email.html:
-            print("=== FINAL HTML SENT TO CLOUDFLARE ===")
-            print(email.html)
-            print("=====================================")
             payload["html"] = email.html
 
         if email.cc:

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/src/hungerlib/messagerouter.py

@@ -3,6 +3,7 @@ import logging
 from pathlib import Path
 from datetime import datetime
 from .utils.exceptions import InvalidLevelError
+from .utils.buffer import Buffer
 
 class MessageRouter:
     def __init__(
@@ -20,6 +21,9 @@ class MessageRouter:
         info_prefix  = '<white>[%hh%:%mm%:%ss%] [INFO]: ',
         warn_prefix  = '<yellow>[%hh%:%mm%:%ss%] [WARN]: ',
         error_prefix = '<red>[%hh%:%mm%:%ss%] [ERROR]: ',
+
+        buffer_enabled = False,
+        origin_output = True
     ):
         self.name = name
         self.Servers = Servers
@@ -59,6 +63,14 @@ class MessageRouter:
             'filelog': self.filelog
         }
 
+        # buffering
+        self.buffer = Buffer(enabled=buffer_enabled)
+        self.origin_output = origin_output
+
+    
+    def enableOriginOutput(self): self.origin_output = True
+    def disableOriginOutput(self): self.origin_output = False
+
     def registerLevel(self, name, prefix, file_method=None, routes=None):
         lvl = name.lower()
         self.custom_levels[lvl] = {
@@ -139,7 +151,15 @@ class MessageRouter:
         mapped = self._format(text, maps, **ctx)
         prefix = self._resolve_prefix(level, ctx)
         msg = prefix + mapped
-        print(msg)
+        
+        # buffer logic
+        if self.buffer.enabled:
+            self.buffer.captured.append(msg)
+        
+        # origin output check
+        if self.origin_output:
+            print(msg)
+
         return msg
 
     def destination(self, text, level='info', extra_maps=None, override_maps=None, **ctx):

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/src/hungerlib/servers/generic.py

@@ -69,9 +69,10 @@ class GenericServer:
         uptime = self.resources().get('uptime')
         if uptime is None:
             return None
-        seconds = uptime // 1000
         if not formatted:
-            return seconds
+            # return seconds # returns seconds
+            return uptime # returns miliseconds
+        seconds = uptime // 1000
         hours = seconds // 3600
         minutes = (seconds % 3600) // 60
         secs = seconds % 60

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/src/hungerlib/utils/__init__.py

@@ -1,4 +1,6 @@
+from .buffer import Buffer
 from .utils import Snapshot, clearTerminal, validateAll
+from .convert import convert
 from .exceptions import (
     HungerLibError,
     InvalidLevelError,
@@ -24,6 +26,8 @@ __all__ = [
     'Snapshot',
     'clearTerminal',
     'validateAll',
+    'Buffer',
+    'convert',
 
     # exceptions
     'HungerLibError',

hungerlib-4.24.2/src/hungerlib/utils/buffer.py

@@ -0,0 +1,20 @@
+class Buffer:
+    def __init__(self, enabled=True):
+        self.enabled = enabled
+        self.captured = []
+
+    def enable(self): self.enabled = True
+
+    def disable(self): self.enabled = False
+
+    def toggle(self): self.enabled = not self.enabled
+
+    def clear(self): self.captured = []
+
+    def printCaptured(self):
+        for msg in self.captured:
+            print(msg)
+    
+    def flush(self):
+        self.printCaptured()
+        self.clear()

hungerlib-4.24.2/src/hungerlib/utils/convert.py

@@ -0,0 +1,61 @@
+from types import SimpleNamespace
+from mapres import datamap, res
+
+
+@datamap.pipes
+class TimeUnits:
+    ns: float = 1e-9
+    us: float = 1e-6
+    ms: float = 1e-3
+    s:  float = 1
+    min: float = 60
+    h: float = 3600
+    day: float = 86400
+time_units = TimeUnits()
+
+
+@datamap.pipes
+class ByteUnits:
+    # decimal
+    b: int = 1
+    kb: int = 1_000
+    mb: int = 1_000_000
+    gb: int = 1_000_000_000
+    tb: int = 1_000_000_000_000
+
+    # binary
+    kib: int = 1024
+    mib: int = 1024**2
+    gib: int = 1024**3
+    tib: int = 1024**4
+byte_units = ByteUnits()
+
+
+def _time(value, src, dst, rounding=None):
+    value = float(value)
+
+    src_factor = float(getattr(time_units, src))
+    dst_factor = float(getattr(time_units, dst))
+
+    base = value * src_factor
+    result = base / dst_factor
+
+    return round(result, rounding) if rounding is not None else result
+
+
+def _byte(value, src, dst, rounding=None):
+    value = float(value)
+
+    src_factor = float(getattr(byte_units, src))
+    dst_factor = float(getattr(byte_units, dst))
+
+    base = value * src_factor
+    result = base / dst_factor
+
+    return round(result, rounding) if rounding is not None else result
+
+
+convert = SimpleNamespace(
+    time=_time,
+    byte=_byte,
+)

hungerlib-4.24.2/src/hungerlib/webhook/__init__.py

@@ -0,0 +1,4 @@
+from .server import WebhookServer
+from .client import WebhookClient
+
+__all__ = ["WebhookServer", "WebhookClient"]

hungerlib-4.24.2/src/hungerlib/webhook/client.py

@@ -0,0 +1,20 @@
+import requests
+
+class WebhookClient:
+    def __init__(self, url: str, token: str, timeout: int = 5):
+        self.url = url
+        self.token = token
+        self.timeout = timeout
+
+    def send(self, event: str, **ctx):
+        payload = {'event': event, **ctx}
+
+        resp = requests.post(
+            self.url,
+            json=payload,
+            headers={'x-webhook-token': self.token},
+            timeout=self.timeout
+        )
+
+        resp.raise_for_status()
+        return resp.json()

hungerlib-4.24.2/src/hungerlib/webhook/server.py

@@ -0,0 +1,56 @@
+import uvicorn
+from fastapi import FastAPI, Request, Header, HTTPException
+
+class WebhookServer:
+    def __init__(self, port: int, token: str, host: str = "0.0.0.0", logLevel: str = "info"):
+        self.port = port
+        self.token = token
+        self.host = host
+        self.logLevel = logLevel
+
+        self.app = FastAPI()
+        self._server = None
+
+        # routing tables
+        self._endpointHandlers: dict[str, callable] = {}
+        self._eventHandlers: dict[str, callable] = {}
+
+    def addEndpoint(self, path: str, handler: callable):
+        # register endpoint
+        self._endpointHandlers[path] = handler
+
+        @self.app.post(path)
+        async def _endpoint(request: Request, x_webhook_token: str | None = Header(None)):
+            if x_webhook_token != self.token:
+                raise HTTPException(status_code=401, detail="invalid token")
+
+            data = await request.json()
+            event = (data.get("event") or "").lower()
+
+            # endpoint handler
+            await handler(event, data)
+
+            # event handler
+            if event in self._eventHandlers:
+                await self._eventHandlers[event](data)
+
+            return {"status": "ok"}
+
+    def addHandler(self, event: str, handler: callable):
+        # register event handler
+        self._eventHandlers[event.lower()] = handler
+
+    async def start(self):
+        config = uvicorn.Config(
+            self.app,
+            host=self.host,
+            port=self.port,
+            log_level=self.logLevel
+        )
+        self._server = uvicorn.Server(config)
+        await self._server.serve()
+
+    async def stop(self):
+        # stop server
+        if self._server:
+            self._server.should_exit = True

{hungerlib-4.24.dev14 → hungerlib-4.24.2/src/hungerlib.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 4.24.dev14
+Version: 4.24.2
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT
-Project-URL: Homepage, https://github.com/iFamishedX/HungerLib
-Project-URL: Documentation, https://github.com/iFamishedX/HungerLib
-Project-URL: Source, https://github.com/iFamishedX/HungerLib
-Project-URL: Issues, https://github.com/iFamishedX/HungerLib/issues
+Project-URL: Homepage, https://github.com/iFamished/HungerLib
+Project-URL: Documentation, https://github.com/iFamished/HungerLib
+Project-URL: Source, https://github.com/iFamished/HungerLib
+Project-URL: Issues, https://github.com/iFamished/HungerLib/issues
 Keywords: pterodactyl,minecraft,automation,rcon,server-management,hungerlib,hungernet
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -23,10 +23,12 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
-Requires-Dist: mcrcon
 Requires-Dist: PyYaml
 Requires-Dist: mapres
 Requires-Dist: jinja2
+Requires-Dist: cloudflare
+Requires-Dist: uvicorn
+Requires-Dist: fastapi
 Dynamic: license-file
 
 # HungerLib

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/src/hungerlib.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ pyproject.toml
 src/hungerlib/__init__.py
 src/hungerlib/bridgeclient.py
 src/hungerlib/configloader.py
-src/hungerlib/discord_bot_webhook.py
 src/hungerlib/messagerouter.py
 src/hungerlib/panel.py
 src/hungerlib/validator.py
@@ -29,6 +28,11 @@ src/hungerlib/servers/__init__.py
 src/hungerlib/servers/generic.py
 src/hungerlib/servers/minecraft.py
 src/hungerlib/utils/__init__.py
+src/hungerlib/utils/buffer.py
+src/hungerlib/utils/convert.py
 src/hungerlib/utils/exceptions.py
 src/hungerlib/utils/time.py
-src/hungerlib/utils/utils.py
+src/hungerlib/utils/utils.py
+src/hungerlib/webhook/__init__.py
+src/hungerlib/webhook/client.py
+src/hungerlib/webhook/server.py

{hungerlib-4.24.dev14 → hungerlib-4.24.2}/src/hungerlib.egg-info/requires.txt

@@ -1,5 +1,7 @@
 requests
-mcrcon
 PyYaml
 mapres
 jinja2
+cloudflare
+uvicorn
+fastapi

hungerlib-4.24.dev14/src/hungerlib/discord_bot_webhook.py

@@ -1,14 +0,0 @@
-import requests
-
-class DiscordBotWebhook:
-    def __init__(self, url: str, token: str):
-        self.url = url
-        self.token = token
-    
-    def send(self, event: str, **ctx):
-        requests.post(
-            self.url,
-            json={"event": event, **ctx},
-            headers={"X-Webhook-Token": self.token},
-            timeout=5
-        ).raise_for_status()