serverwatcher 3.3__tar.gz → 3.5__tar.gz

{serverwatcher-3.3/src/serverwatcher.egg-info → serverwatcher-3.5}/PKG-INFO

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

{serverwatcher-3.3 → serverwatcher-3.5}/pyproject.toml

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

{serverwatcher-3.3 → serverwatcher-3.5}/src/serverwatcher/__init__.py

@@ -7,7 +7,7 @@ except PackageNotFoundError:
     __version__ = '0.0.0'
 
 from .watcher import ServerWatcher
-from .schema import validate_config_schema, validate_messages_schema
+from .schema import validate_config_schema, validate_messages_schema flatten_nested
 
 
 __all__ = [
@@ -15,4 +15,5 @@ __all__ = [
     'ServerWatcher',
     'validate_config_schema',
     'validate_messages_schema',
+    'flatten_nested',
 ]

serverwatcher-3.5/src/serverwatcher/config/__init__.py

@@ -0,0 +1,9 @@
+from .global_config import GlobalConfig
+from .messages import MessagesConfig
+from .watcher import WatcherConfig
+
+__all__ = [
+    'GlobalConfig',
+    'MessagesConfig',
+    'WatcherConfig',
+]

{serverwatcher-3.3 → serverwatcher-3.5}/src/serverwatcher/config/watcher.py

@@ -30,3 +30,7 @@ class WatcherConfig:
     log_path: str
     console_backspaces: int
     timezone: str
+
+    # New values (will reorder later)
+    watch_interval: int
+    clear_terminal: bool

{serverwatcher-3.3 → serverwatcher-3.5}/src/serverwatcher/defaultconfigs/global.yaml

@@ -9,7 +9,7 @@ origin:
 server:
   name: My SMP
   server_id: CHANGE_ME
-  domain: mc.hungersmp.com
+  domain: mc.example.com
   port: 25565
   rcon_port: 25575
   rcon_password: password

serverwatcher-3.5/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -0,0 +1,39 @@
+logging:
+  logger_name_template: "Server Watcher"
+  log_path: "/home/container/logs/"
+  timezone: "America/Chicago"
+
+terminal_settings:
+  console_backspaces: 8
+  clear_terminal: True
+
+schedules:
+  restart_soon_schedule_id: 0     # replace this with real schedule id
+  origin_disable_schedule_id: 0   # replace this with real schedule id
+
+thresolds:
+  ram_threshold: 6
+  cpu_threshold: 150
+  uptime_hours_threshold: 12
+  tps_threshold: 19.5
+
+weights:
+  weight_restart_soon: 3
+  weight_ram: 1
+  weight_cpu: 1
+  weight_uptime: 1
+  weight_tps: 1
+  weight_low_uptime: 5
+  weight_per_player: 1
+
+gaps:
+  low_gap_minutes: 120
+  high_gap_minutes: 60
+
+restart_intervals:
+  restart_wait_seconds: 45
+  restart_online_timeout: 120
+  restart_online_interval: 2
+
+watcher_intervals:
+  watch_interval: 60 

{serverwatcher-3.3 → serverwatcher-3.5}/src/serverwatcher/schema.py

@@ -43,3 +43,28 @@ def validate_messages_schema(raw: Dict[str, Any]) -> 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

{serverwatcher-3.3 → serverwatcher-3.5}/src/serverwatcher/watcher.py

@@ -15,19 +15,13 @@ from hungerlib.addons import (
     map_to_dataclass,
 )
 
-# NEW CONFIG DATACLASSES
-from serverwatcher.config.global_config import GlobalConfig
-from serverwatcher.config.messages import MessagesConfig
-from serverwatcher.config.watcher import WatcherConfig
-
-# BASE DIRECTORY OF THIS PACKAGE
-# BASE_DIR = os.path.dirname(__file__)                               # OLD VERSION, may use later
-BASE_DIR = os.getcwd()                                               # NEW VERSION
+from serverwatcher.config import GlobalConfig, MessagesConfig, WatcherConfig
+
+# Set directory
+BASE_DIR = os.getcwd()
 PACKAGE_DIR = os.path.dirname(__file__)   
 
-# ---------------------------------------------------------
-# Utility: load config or copy default from defaultconfigs/
-# ---------------------------------------------------------
+# Load configs
 def load_or_default(path: str, default_path: str, schema):
     """
     Loads YAML from path. If missing, copies default_path → path.
@@ -43,15 +37,14 @@ def load_or_default(path: str, default_path: str, schema):
             dst.write(src.read())
 
     raw = load_yaml(abs_path)
+    raw = flatten_nested(raw)
     return map_to_dataclass(raw, schema)
+    
 
 
-# ---------------------------------------------------------
-# Main Watcher
-# ---------------------------------------------------------
+# Main watcher
 class ServerWatcher:
     def __init__(self):
-        # Load all 3 configs
         self.global_cfg: GlobalConfig = load_or_default(
             "config/global.yaml",
             "defaultconfigs/global.yaml",
@@ -70,7 +63,7 @@ class ServerWatcher:
             WatcherConfig
         )
 
-        # PANEL
+        # panel
         p = self.global_cfg.panel
         self.panel = Panel(
             name=p["name"],
@@ -78,7 +71,7 @@ class ServerWatcher:
             api_key=p["api_key"],
         )
 
-        # ORIGIN
+        # origin
         o = self.global_cfg.origin
         self.origin = GenericServer(
             name="Origin",
@@ -86,7 +79,7 @@ class ServerWatcher:
             server_id=o["server_id"],
         )
 
-        # SERVER
+        # server
         s = self.global_cfg.server
         self.server = MinecraftServer(
             name=s["name"],
@@ -99,7 +92,7 @@ class ServerWatcher:
             tpsCommand=s["tps_command"],
         )
 
-        # LOGGER (fully configurable)
+        # logger
         logger_name = self.cfg.logger_name_template.format(
             server_name=s["name"]
         )
@@ -111,25 +104,19 @@ class ServerWatcher:
             console_backspaces=self.cfg.console_backspaces,
         )
 
-        # TIMEZONE
+        # timezone
         self.tz = ZoneInfo(self.cfg.timezone)
 
-    # -----------------------------------------------------
-    # Utility: format messages with prefix
-    # -----------------------------------------------------
+    # format messages with prefix
     def fmt(self, template: str, **kwargs):
         return template.format(prefix=self.messages.prefix, **kwargs)
 
-    # -----------------------------------------------------
-    # Shutdown
-    # -----------------------------------------------------
+    # simple shutdown
     def shutdown(self):
         self.log.info("Shutting down ServerWatcher.")
         raise SystemExit
 
-    # -----------------------------------------------------
-    # Restart logic
-    # -----------------------------------------------------
+    # restart logic
     def restart_and_wait(self):
         self.origin.disableSchedule(self.cfg.restart_soon_schedule_id)
         self.server.restart()
@@ -152,9 +139,7 @@ class ServerWatcher:
         else:
             self.log.error(f"{self.messages.server_failed_restart}")
 
-    # -----------------------------------------------------
-    # Schedule restart
-    # -----------------------------------------------------
+    # schedule restart
     def schedule_restart(self, minutes):
         info = snapSchedule(minimumMinutes=minutes)
         scheduled = info["scheduled"]
@@ -184,9 +169,7 @@ class ServerWatcher:
             second_callbacks=second_callbacks,
         )
 
-    # -----------------------------------------------------
-    # Main evaluation logic
-    # -----------------------------------------------------
+    # main evaluation logic
     def evaluate(self):
         self.log.info(self.messages.log_start)
 
@@ -202,7 +185,7 @@ class ServerWatcher:
         restart_reasons = []
         no_restart_reasons = []
 
-        # PRO-RESTART
+        # pro-restart
         if self.server.getSchedule(self.cfg.restart_soon_schedule_id)["is_active"]:
             restart_reasons.append(self.messages.reason_restart_soon)
             pro += self.cfg.weight_restart_soon
@@ -211,7 +194,7 @@ class ServerWatcher:
             restart_reasons.append(
                 self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.cfg.ram_threshold)
             )
-            pro += round(snap.ram, 0) - 5
+            pro += int(round(snap.ram, 0) - 5)
 
         if snap.cpu >= self.cfg.cpu_threshold:
             restart_reasons.append(
@@ -232,7 +215,7 @@ class ServerWatcher:
             )
             pro += self.cfg.weight_tps
 
-        # ANTI-RESTART
+        # anti-restart
         if snap.uptime // 60 < 30:
             no_restart_reasons.append(
                 self.fmt(self.messages.reason_low_uptime, uptime=snap.uptime_formatted)
@@ -247,7 +230,7 @@ class ServerWatcher:
             )
             anti += snap.players * self.cfg.weight_per_player
 
-        # LOGGING
+        # logging
         for r in restart_reasons:
             self.log.warn(f"- {r}")
         for r in no_restart_reasons:
@@ -282,7 +265,10 @@ class ServerWatcher:
     # Main loop
     # -----------------------------------------------------
     def run(self):
-        clearTerminal()
+        if self.cfg.clear_terminal:
+            clearTerminal()
         while True:
+            if self.cfg.clear_terminal:
+                clearTerminal()
             self.evaluate()
-            time.sleep(60)
+            time.sleep(self.cfg.watch_interval)

{serverwatcher-3.3 → serverwatcher-3.5/src/serverwatcher.egg-info}/PKG-INFO

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

{serverwatcher-3.3 → serverwatcher-3.5}/src/serverwatcher.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/serverwatcher.egg-info/SOURCES.txt
 src/serverwatcher.egg-info/dependency_links.txt
 src/serverwatcher.egg-info/requires.txt
 src/serverwatcher.egg-info/top_level.txt
+src/serverwatcher/config/__init__.py
 src/serverwatcher/config/global_config.py
 src/serverwatcher/config/messages.py
 src/serverwatcher/config/watcher.py

serverwatcher-3.3/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,28 +0,0 @@
-restart_soon_schedule_id: 13
-origin_disable_schedule_id: 11
-
-ram_threshold: 6
-cpu_threshold: 150
-uptime_hours_threshold: 12
-tps_threshold: 19.5
-
-weight_restart_soon: 3
-weight_ram: 1
-weight_cpu: 1
-weight_uptime: 1
-weight_tps: 1
-
-weight_low_uptime: 5
-weight_per_player: 1
-
-low_gap_minutes: 120
-high_gap_minutes: 60
-
-restart_wait_seconds: 45
-restart_online_timeout: 120
-restart_online_interval: 2
-
-logger_name_template: "Server Watcher"
-log_path: "/home/container/logs/"
-console_backspaces: 8
-timezone: "America/Chicago"