serverwatcher 3.7.1__tar.gz → 3.8.1__tar.gz

{serverwatcher-3.7.1/src/serverwatcher.egg-info → serverwatcher-3.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.7.1
+Version: 3.8.1
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

{serverwatcher-3.7.1 → serverwatcher-3.8.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "serverwatcher"
-version = "3.7.1"
+version = "3.8.1"
 description = "A HungerLib-powered Minecraft server automation engine."
 readme = "README.md"
 requires-python = ">=3.10"

{serverwatcher-3.7.1 → serverwatcher-3.8.1}/src/serverwatcher/config/messages.py

@@ -29,8 +29,10 @@ class MessagesConfig:
 
     # logging
     log_start: str
+    log_status_check: str
     log_validation_fail: str
     log_validation_ok: str
+    log_shutdown: str
     log_immediate_restart: str
     log_no_restart: str
     log_scheduled: str

{serverwatcher-3.7.1 → serverwatcher-3.8.1}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -25,8 +25,10 @@ broadcast_second:
 
 logging:
   log_start: "ServerWatcher is running!"
+  log_status_check: "Checking server status..."
   log_validation_fail: "Validation FAILED."
   log_validation_ok: "All validation checks succeeded."
+  log_shutdown: "Shutting down ServerWatcher."
   log_immediate_restart: "Restarting immediately."
   log_no_restart: "The server does not need to restart."
   log_scheduled: "Restart needed, but anti-restart factors outweigh it."

serverwatcher-3.8.1/src/serverwatcher/helpers/__init__.py

@@ -0,0 +1,5 @@
+from .loadconfigs import load_or_default
+
+__all__ = [
+    'load_or_default',
+]

serverwatcher-3.8.1/src/serverwatcher/helpers/loadconfigs.py

@@ -0,0 +1,15 @@
+import os
+
+def load_or_default(path: str, default_path: str, schema):
+
+    abs_path = os.path.join(BASE_DIR, path)
+    abs_default = os.path.join(PACKAGE_DIR, default_path)
+
+    if not os.path.exists(abs_path):
+        os.makedirs(os.path.dirname(abs_path), exist_ok=True)
+        with open(abs_default, "r") as src, open(abs_path, "w") as dst:
+            dst.write(src.read())
+
+    raw = load_yaml(abs_path)
+    raw = flatten_nested(raw)
+    return map_to_dataclass(raw, schema)

{serverwatcher-3.7.1 → serverwatcher-3.8.1}/src/serverwatcher/watcher.py

@@ -17,27 +17,12 @@ from hungerlib.addons import (
 
 from serverwatcher.schema import flatten_nested
 from serverwatcher.config import GlobalConfig, MessagesConfig, WatcherConfig
+from serverwatcher.helpers import load_or_default
 
 # Set directory
 BASE_DIR = os.getcwd()
 PACKAGE_DIR = os.path.dirname(__file__)   
 
-# Load configs
-def load_or_default(path: str, default_path: str, schema):
-
-    abs_path = os.path.join(BASE_DIR, path)
-    abs_default = os.path.join(PACKAGE_DIR, default_path)
-
-    if not os.path.exists(abs_path):
-        os.makedirs(os.path.dirname(abs_path), exist_ok=True)
-        with open(abs_default, "r") as src, open(abs_path, "w") as dst:
-            dst.write(src.read())
-
-    raw = load_yaml(abs_path)
-    raw = flatten_nested(raw)
-    return map_to_dataclass(raw, schema)
-    
-
 
 # Main watcher
 class ServerWatcher:
@@ -47,34 +32,26 @@ class ServerWatcher:
             "defaultconfigs/global.yaml",
             GlobalConfig
         )
-
         self.messages: MessagesConfig = load_or_default(
             "config/messages.yaml",
             "defaultconfigs/messages.yaml",
             MessagesConfig
         )
-
         self.cfg: WatcherConfig = load_or_default(
             "config/watcher.yaml",
             "defaultconfigs/watcher.yaml",
             WatcherConfig
         )
-
-        # panel
         self.panel = Panel(
             name=self.global_cfg.panel_name,
             url=self.global_cfg.panel_url,
             api_key=self.global_cfg.panel_api_key,
         )
-
-
-        # origin
         self.origin = GenericServer(
             name="Origin",
             panel=self.panel,
             server_id=self.global_cfg.origin_server_id
         )
-
         self.server = MinecraftServer(
             name=self.global_cfg.server_name,
             panel=self.panel,
@@ -85,21 +62,15 @@ class ServerWatcher:
             rcon_password=self.global_cfg.rcon_password,
             tpsCommand=self.global_cfg.tps_command,
         )
-
-
-        # logger
         logger_name = self.cfg.logger_name_template.format(
             server_name=self.global_cfg.server_name
         )
-
         self.log = HungerLogger(
             name=logger_name,
             server=self.server,
             log_path=self.cfg.log_path,
             console_backspaces=self.cfg.console_backspaces,
         )
-
-        # timezone
         self.tz = ZoneInfo(self.cfg.timezone)
 
     # format messages with prefix
@@ -108,7 +79,7 @@ class ServerWatcher:
 
     # simple shutdown
     def shutdown(self):
-        self.log.info("Shutting down ServerWatcher.")
+        self.log.info(f"{self.messages.log_shutdown}")
         raise SystemExit
 
     # restart logic
@@ -118,7 +89,7 @@ class ServerWatcher:
         self.log.info(f"{self.messages.restart_action_sent}")
         time.sleep(self.cfg.restart_wait_seconds)
 
-        self.log.warn("Checking server status...")
+        self.log.warn(f"{self.messages.log_status_check}")
         alive = waitForOnline(
             self.server,
             timeout=self.cfg.restart_online_timeout,
@@ -127,9 +98,7 @@ class ServerWatcher:
 
         if alive:
             self.log.info(f"{self.messages.server_back_online}")
-            self.server.sendBroadcast(
-                f"{self.messages.server_back_online_broadcast}"
-            )
+            self.server.sendBroadcast(f"{self.messages.server_back_online_broadcast}")
             self.origin.enableSchedule(self.cfg.origin_disable_schedule_id)
         else:
             self.log.error(f"{self.messages.server_failed_restart}")
@@ -143,9 +112,7 @@ class ServerWatcher:
         time_str = local_time.strftime("%I:%M %p")
 
         # Broadcast the scheduled restart time
-        self.server.sendBroadcast(
-            self.fmt(self.messages.broadcast_restart_at, time=time_str)
-        )
+        self.server.sendBroadcast(self.fmt({self.messages.broadcast_restart_at, time=time_str}))
 
         # Collect all minute_* keys
         minute_keys = [
@@ -184,10 +151,10 @@ class ServerWatcher:
 
     # main evaluation logic
     def evaluate(self):
-        self.log.info(self.messages.log_start)
+        self.log.info(f"{self.messages.log_start}")
 
         if not validateAll(self.panel, self.server):
-            self.log.error(self.messages.log_validation_fail)
+            self.log.error(f"{self.messages.log_validation_fail}")
             self.shutdown()
 
         self.server.refresh()
@@ -255,7 +222,7 @@ class ServerWatcher:
         gap = abs(pro - anti)
 
         if pro == 0:
-            self.log.info(self.messages.log_no_restart)
+            self.log.info(f"{self.messages.log_no_restart}")
             return
 
         if pro > anti and snap.players == 0:

{serverwatcher-3.7.1 → serverwatcher-3.8.1/src/serverwatcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.7.1
+Version: 3.8.1
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

{serverwatcher-3.7.1 → serverwatcher-3.8.1}/src/serverwatcher.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ LICENSE
 README.md
 pyproject.toml
 src/serverwatcher/__init__.py
-src/serverwatcher/schema.py
 src/serverwatcher/watcher.py
 src/serverwatcher.egg-info/PKG-INFO
 src/serverwatcher.egg-info/SOURCES.txt
@@ -15,4 +14,6 @@ src/serverwatcher/config/messages.py
 src/serverwatcher/config/watcher.py
 src/serverwatcher/defaultconfigs/global.yaml
 src/serverwatcher/defaultconfigs/messages.yaml
-src/serverwatcher/defaultconfigs/watcher.yaml
+src/serverwatcher/defaultconfigs/watcher.yaml
+src/serverwatcher/helpers/__init__.py
+src/serverwatcher/helpers/loadconfigs.py

serverwatcher-3.7.1/src/serverwatcher/schema.py

@@ -1,70 +0,0 @@
-from typing import Dict, Any, List
-
-from hungerlib.addons import validate_required_keys
-
-
-def validate_config_schema(raw: Dict[str, Any]) -> list[str]:
-    errors: List[str] = []
-
-    # top-level sections
-    errors += validate_required_keys(raw, ["panel", "origin", "server", "watcher"], "root")
-
-    panel = raw.get("panel", {})
-    origin = raw.get("origin", {})
-    server = raw.get("server", {})
-    watcher = raw.get("watcher", {})
-
-    errors += validate_required_keys(panel, ["name", "url", "api_key"], "panel")
-    errors += validate_required_keys(origin, ["server_id"], "origin")
-    errors += validate_required_keys(
-        server,
-        ["name", "server_id", "domain", "port", "rcon_port", "rcon_password", "tps_command"],
-        "server",
-    )
-
-    # simple sanity checks (optional but nice)
-    if "port" in server and not isinstance(server["port"], int):
-        errors.append("[server] 'port' must be an integer")
-    if "rcon_port" in server and not isinstance(server["rcon_port"], int):
-        errors.append("[server] 'rcon_port' must be an integer")
-
-    # watcher numeric sanity
-    if "ram_threshold" in watcher and watcher["ram_threshold"] <= 0:
-        errors.append("[watcher] 'ram_threshold' must be > 0")
-    if "cpu_threshold" in watcher and watcher["cpu_threshold"] <= 0:
-        errors.append("[watcher] 'cpu_threshold' must be > 0")
-
-    return errors
-
-
-def validate_messages_schema(raw: Dict[str, Any]) -> list[str]:
-    # you can make this as strict as you want; for now just ensure prefix exists
-    errors: List[str] = []
-    if "prefix" not in raw:
-        errors.append("[messages] Missing required key: 'prefix'")
-    return errors
-
-def flatten_nested(raw: dict) -> dict:
-    """
-    Recursively flattens a nested YAML dict into a single-level dict.
-    Section names are ignored; only leaf keys matter.
-    """
-    flat = {}
-
-    def walk(node):
-        if isinstance(node, dict):
-            for v in node.values():
-                walk(v)
-        else:
-            # ignore non-dict nodes at this level
-            pass
-
-    def collect(node):
-        for key, value in node.items():
-            if isinstance(value, dict):
-                collect(value)
-            else:
-                flat[key] = value
-
-    collect(raw)
-    return flat