serverwatcher 5.0__tar.gz → 5.1__tar.gz

{serverwatcher-5.0/src/serverwatcher.egg-info → serverwatcher-5.1}/PKG-INFO

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

{serverwatcher-5.0 → serverwatcher-5.1}/pyproject.toml

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

{serverwatcher-5.0 → serverwatcher-5.1}/src/serverwatcher/configclasses/__init__.py

@@ -1,4 +1,4 @@
-from .global_config import GlobalConfig
+from .config import GlobalConfig
 from .messages import MessagesConfig
 from .watcher import WatcherConfig
 

serverwatcher-5.1/src/serverwatcher/configclasses/config.py

@@ -0,0 +1,31 @@
+from dataclasses import dataclass, field
+
+def yaml_key(path: str):
+    return field(metadata={"yaml_key": path})
+
+@dataclass
+class GlobalConfig:
+    watch_interval: int = yaml_key("watch_interval")
+
+    panel_name: str = yaml_key("panel.name")
+    panel_url: str = yaml_key("panel.url")
+    panel_api_key: str = yaml_key("panel.api_key")
+
+    origin_server_id: str = yaml_key("origin.server_id")
+
+    server_name: str = yaml_key("server.name")
+    server_id: str = yaml_key("server.server_id")
+    server_domain: str = yaml_key("server.domain")
+    server_port: int = yaml_key("server.port")
+
+    rcon_port: int = yaml_key("server.rcon_port")
+    rcon_password: str = yaml_key("server.rcon_password")
+    tps_command: str = yaml_key("server.tps_command")
+
+    enable_logging: bool = yaml_key("logger.enabled")
+    logger_name: str = yaml_key("logger.name")
+    log_path: str = yaml_key("logger.log_path")
+    timezone: str = yaml_key("logger.timezone")
+
+    console_backspaces: int = yaml_key("terminal.backspaces")
+    clear_terminal: bool = yaml_key("terminal.enable_clearing")

serverwatcher-5.1/src/serverwatcher/configclasses/messages.py

@@ -0,0 +1,62 @@
+from dataclasses import dataclass, field
+
+def yaml_key(path: str):
+    return field(metadata={"yaml_key": path})
+
+@dataclass
+class MessagesConfig:
+    prefix: str = yaml_key("prefix")
+    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
+    bullet: str = yaml_key("bullet")
+
+    # minute messages
+    minute_120: str = yaml_key("broadcast_minutes.120")
+    minute_60: str = yaml_key("broadcast_minutes.60")
+    minute_45: str = yaml_key("broadcast_minutes.45")
+    minute_30: str = yaml_key("broadcast_minutes.30")
+    minute_15: str = yaml_key("broadcast_minutes.15")
+
+    # second messages
+    second_10: str = yaml_key("broadcast_seconds.10")
+    second_9: str = yaml_key("broadcast_seconds.9")
+    second_8: str = yaml_key("broadcast_seconds.8")
+    second_7: str = yaml_key("broadcast_seconds.7")
+    second_6: str = yaml_key("broadcast_seconds.6")
+    second_5: str = yaml_key("broadcast_seconds.5")
+    second_4: str = yaml_key("broadcast_seconds.4")
+    second_3: str = yaml_key("broadcast_seconds.3")
+    second_2: str = yaml_key("broadcast_seconds.2")
+    second_1: str = yaml_key("broadcast_seconds.1")
+
+    # logging
+    startup: str = yaml_key("logging.startup")
+    status_check: str = yaml_key("logging.status_check")
+    validation_fail: str = yaml_key("logging.validation_fail")
+    validation_ok: str = yaml_key("logging.validation_ok")
+    shutdown: str = yaml_key("logging.shutdown")
+    immediate_restart: str = yaml_key("logging.immediate_restart")
+    no_restart: str = yaml_key("logging.no_restart")
+    scheduled: str = yaml_key("logging.scheduled")
+    gap_low: str = yaml_key("logging.gap_low")
+    gap_high: str = yaml_key("logging.gap_high")
+
+    # reasons
+    pro_restart_splash: str = yaml_key("reasons.pro_restart_splash")
+    anti_restart_splash: str = yaml_key("reasons.anti_restart_splash")
+
+    reasons.restart_soon: str = yaml_key("reasons.restart_soon")
+    reasons.ram: str = yaml_key("reasons.ram")
+    reasons.cpu: str = yaml_key("reasons.cpu")
+    reasons.uptime: str = yaml_key("reasons.uptime")
+    reasons.tps: str = yaml_key("reasons.tps")
+    reasons.low_uptime: str = yaml_key("reasons.low_uptime")
+    reasons.players: str = yaml_key("reasons.players")
+
+    pro_restart_number: str = yaml_key("reasons.pro_restart_number")
+    anti_restart_number: str = yaml_key("reasons.anti_restart_number")
+
+    # restarts
+    restart_action_sent: str = yaml_key("restarts.restart_action_sent")
+    server_back_online: str = yaml_key("restarts.back_online")
+    server_back_online_broadcast: str = yaml_key("restarts.back_online_broadcast")
+    server_failed_restart: str = yaml_key("restarts.failed_restart")

serverwatcher-5.1/src/serverwatcher/configclasses/watcher.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass, field
+
+def yaml_key(path: str):
+    return field(metadata={"yaml_key": path})
+
+@dataclass
+class WatcherConfig:
+    schedule_control: bool = yaml_key("schedule_control.enabled")
+    restart_soon_id: int = yaml_key("schedule_control.restart_soon_id")
+
+    thresholds.ram: int = yaml_key("thresholds.ram")
+    thresholds.cpu: int = yaml_key("thresholds.cpu")
+    thresholds.uptime_hours: int = yaml_key("thresholds.uptime")
+    thresholds.tps: float = yaml_key("thresholds.tps")
+
+    weights.restart_soon: int = yaml_key("weights.restart_soon")
+    weights.ram: int = yaml_key("weights.ram")
+    weights.cpu: int = yaml_key("weights.cpu")
+    weights.uptime: int = yaml_key("weights.uptime")
+    weights.tps: int = yaml_key("weights.tps")
+
+    weights.low_uptime: int = yaml_key("weights.low_uptime")
+    weights.per_player: int = yaml_key("weights.per_player")
+
+    low_gap_minutes: int = yaml_key("gaps.low_gap_minutes")
+    high_gap_minutes: int = yaml_key("gaps.high_gap_minutes")
+
+    restart.wait_seconds: int = yaml_key("restart.wait_seconds")
+    restart.timeout: int = yaml_key("restart.online_timeout")
+    restart.online_interval: int = yaml_key("restart.online_interval")

serverwatcher-5.1/src/serverwatcher/defaultconfigs/config.yaml

@@ -0,0 +1,28 @@
+watch_interval: 300
+
+panel:
+  name: "My Panel"
+  url: "https://example.com"
+  api_key: "CHANGE_ME"
+
+origin:
+  server_id: "CHANGE_ME"
+
+server:
+  name: "My SMP"
+  server_id: "CHANGE_ME"
+  domain: "mc.example.com"
+  port: 25565
+  rcon_port: 25575
+  rcon_password: "password"
+  tps_command: "ticks"
+
+logger:
+  enabled: True
+  name: "Server Watcher"
+  log_path: "/home/container/logs/"
+  timezone: "America/Chicago"
+
+terminal:
+  backspaces: 8
+  enable_clearing: True

serverwatcher-5.1/src/serverwatcher/defaultconfigs/messages.yaml

@@ -0,0 +1,58 @@
+prefix: "<aqua>[Server Watcher]"
+
+broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
+bullet: "-"
+
+broadcast_minutes:
+  120: "{prefix} Restart in 2 hours!"
+  60: "{prefix} Restart in 1 hour!"
+  5: "{prefix} Restart in 45 minutes!"
+  30: "{prefix} Restart in 30 minutes!"
+  15: "{prefix} Restart in 15 minutes!"
+  10: "{prefix} Restart in 5 minutes!"
+  1: "{prefix} Restart in 1 minute!"
+
+broadcast_seconds:
+  10: "{prefix} Restart in 10 seconds!"
+  9: "{prefix} Restart in 9 seconds!"
+  8: "{prefix} Restart in 8 seconds!"
+  7: "{prefix} Restart in 7 seconds!"
+  6: "{prefix} Restart in 6 seconds!"
+  5: "{prefix} Restart in 5 seconds!"
+  4: "{prefix} Restart in 4 seconds!"
+  3: "{prefix} Restart in 3 seconds!"
+  2: "{prefix} Restart in 2 seconds!"
+  1: "{prefix} Restart in 1 second!"
+
+logging:
+  startup: "ServerWatcher is running!"
+  status_check: "Checking server status..."
+  validation_fail: "Validation FAILED."
+  validation_ok: "All validation checks succeeded."
+  shutdown: "Shutting down ServerWatcher."
+  immediate_restart: "Restarting immediately."
+  no_restart: "The server does not need to restart."
+  scheduled: "Restart needed, but anti-restart factors outweigh it."
+  gap_low: "Gap {gap}. Scheduling restart in 2 hours."
+  gap_high: "Gap {gap}. Scheduling restart in 1 hour."
+
+reasons:
+  pro_splash: "PRO-RESTART REASONS:"
+  anti_splash: "ANTI-RESTART REASONS:"
+
+  restart_soon: "The server is set to restart soon"
+  ram: "RAM usage ({ram}) is higher than {threshold} GB"
+  cpu: "CPU usage ({cpu}) is higher than {threshold}%"
+  uptime: "Uptime {uptime} exceeds {threshold}h"
+  tps: "TPS {tps} is lower than {threshold}"
+  low_uptime: "Uptime {uptime} is shorter than 30m"
+  players: "There {verb} {count} {plural} online"
+
+  pro_restart_number: "Pro-restart: "
+  anti_restart_number: "Anti-restart:"
+
+restarts:
+  restart_action_sent: "Restart action sent. Waiting..."
+  back_online: "Server is back online!"
+  back_online_broadcast: "{prefix} <green>Restart successful!"
+  failed_restart: "Server failed to restart!"

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

@@ -0,0 +1,27 @@
+schedule_control:
+  enabled: False
+  restart_soon_id: 0     # replace this with a real schedule id
+
+thresholds:
+  ram: 6
+  cpu: 150
+  uptime: 12
+  tps: 19.5
+
+weights:
+  restart_soon: 3
+  ram: 1
+  cpu: 1
+  uptime: 1
+  tps: 1
+  low_uptime: 5
+  per_player: 1
+
+gaps:
+  low_gap_minutes: 120
+  high_gap_minutes: 60
+
+restart:
+  wait_seconds: 30
+  online_timeout: 120
+  online_interval: 2

serverwatcher-5.1/src/serverwatcher/validator.py

@@ -0,0 +1,144 @@
+import sys
+from dataclasses import fields
+
+from hungerlib.addons import loadConfig
+
+from serverwatcher.configclasses.config import GlobalConfig
+from serverwatcher.configclasses.messages import MessagesConfig
+from serverwatcher.configclasses.watcher import WatcherConfig
+
+
+def deep_get_attr(obj, dotted):
+    parts = dotted.split(".")
+    cur = obj
+    for p in parts:
+        if not hasattr(cur, p):
+            return None
+        cur = getattr(cur, p)
+    return cur
+
+
+def validate_type(name, value, expected_type, errors):
+    if not isinstance(value, expected_type):
+        errors.append(f"{name}: expected {expected_type.__name__}, got {type(value).__name__}")
+
+
+def validate_positive(name, value, errors):
+    if isinstance(value, (int, float)) and value < 0:
+        errors.append(f"{name}: must be >= 0 (got {value})")
+
+
+def validate_nonempty(name, value, errors):
+    if isinstance(value, str) and value.strip() == "":
+        errors.append(f"{name}: cannot be empty")
+
+
+def validate_dataclass(config_obj, schema, errors):
+    for f in fields(schema):
+        name = f.name
+        expected_type = f.type
+        value = deep_get_attr(config_obj, name)
+
+        validate_type(name, value, expected_type, errors)
+
+        if expected_type is str:
+            validate_nonempty(name, value, errors)
+
+        if expected_type in (int, float):
+            validate_positive(name, value, errors)
+
+
+def validate_global_config(config, errors):
+    if config.watch_interval < 1:
+        errors.append(f"watch_interval: must be >= 1 (got {config.watch_interval})")
+
+    if config.server_port <= 0 or config.server_port > 65535:
+        errors.append(f"server_port: must be 1–65535 (got {config.server_port})")
+
+    if config.rcon_port <= 0 or config.rcon_port > 65535:
+        errors.append(f"rcon_port: must be 1–65535 (got {config.rcon_port})")
+
+
+def validate_watcher_config(watcherconfig, errors):
+    if watcherconfig.restart.wait_seconds < 1:
+        errors.append(f"restart.wait_seconds: must be >= 1 (got {watcherconfig.restart.wait_seconds})")
+
+    if watcherconfig.thresholds.cpu <= 0:
+        errors.append(f"thresholds.cpu: must not be less than 1 (got {watcherconfig.thresholds.cpu})")
+
+    if watcherconfig.thresholds.ram <= 0:
+        errors.append(f"thresholds.ram: must be > 0 (got {watcherconfig.thresholds.ram})")
+
+    if watcherconfig.thresholds.tps <= 0 or watcherconfig.thresholds.tps > 20:
+        errors.append(f"thresholds.tps: must be 1–20 (got {watcherconfig.thresholds.tps})")
+
+
+def validate_messages_config(messages, errors):
+    for name, value in vars(messages).items():
+        if isinstance(value, str) and "{prefix}" not in value:
+            pass
+
+
+def ensure_no_global_defaults(config, defaults):
+    if config.panel_url == "https://example.com":
+        defaults.append('panel_url')
+    
+    if config.panel_api_key == 'CHANGE_ME':
+        defaults.append('panel_api_key')
+
+    if config.origin_server_id == 'CHANGE_ME':
+        defaults.append('origin_server_id')
+
+    if config.server_id == 'CHANGE_ME':
+        defaults.append('server_id')
+
+    if config.server_domain == 'mc.example.com':
+        defaults.append('server_domain')
+
+    if config.rcon_password == 'password':
+        defaults.append('rcon_password')
+
+
+def ensure_no_watcher_defaults(watcherconfig, defaults):
+    if watcherconfig.schedule_control and watcherconfig.restart_soon_id == 0:
+        defaults.append('restart_soon_id')
+
+
+def validate_all():
+    errors = []
+    defaults = []
+
+    config = loadConfig("config/global.yaml", "/defaultconfigs/global.yaml", GlobalConfig)
+    messages = loadConfig("config/messages.yaml", "/defaultconfigs/messages.yaml", MessagesConfig)
+    watcher = loadConfig("config/watcher.yaml", "/defaultconfigs/watcher.yaml", WatcherConfig)
+
+    validate_dataclass(config, GlobalConfig, errors)
+    validate_dataclass(messages, MessagesConfig, errors)
+    validate_dataclass(watcher, WatcherConfig, errors)
+
+    validate_global_config(config, errors)
+    validate_messages_config(messages, errors)
+    validate_watcher_config(watcher, errors)
+
+    ensure_no_global_defaults(config, defaults)
+    ensure_no_watcher_defaults(watcher, defaults)
+
+    if len(defaults) >= 7:
+        print("❌ CONFIG VALIDATION FAILED:\nIt looks like you haven't configured this yet! Please change these defaults:")
+        for d in defaults:
+            print(" -", d)
+        sys.exit(1)
+
+    if errors or defaults:
+        print("❌ CONFIG VALIDATION FAILED:")
+        for e in errors:
+            print(" -", e)
+        for d in defaults:
+            print(" -", d, ": must not be left default")
+        sys.exit(1)
+
+    print("✅ All configs are valid.")
+
+
+if __name__ == "__main__":
+    validate_all()

{serverwatcher-5.0 → serverwatcher-5.1}/src/serverwatcher/watcher.py

@@ -14,7 +14,7 @@ from hungerlib.addons import (
     loadConfig,
 )
 
-from serverwatcher.configclasses.global_config import GlobalConfig
+from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
 from serverwatcher.configclasses.watcher import WatcherConfig
 
@@ -25,9 +25,9 @@ validate_all()
 class ServerWatcher:
     def __init__(self):
 
-        self.global_cfg = loadConfig(
-            "config/global.yaml",
-            "/defaultconfigs/global.yaml",
+        self.config = loadConfig(
+            "config/config.yaml",
+            "/defaultconfigs/config.yaml",
             GlobalConfig
         )
 
@@ -37,47 +37,47 @@ class ServerWatcher:
             MessagesConfig
         )
 
-        self.cfg = loadConfig(
+        self.watcherconfig = loadConfig(
             "config/watcher.yaml",
             "/defaultconfigs/watcher.yaml",
             WatcherConfig
         )
 
         self.panel = Panel(
-            name=self.global_cfg.panel_name,
-            url=self.global_cfg.panel_url,
-            api_key=self.global_cfg.panel_api_key,
+            name=self.config.panel_name,
+            url=self.config.panel_url,
+            api_key=self.config.panel_api_key,
         )
 
         self.origin = GenericServer(
             name="Origin",
             panel=self.panel,
-            server_id=self.global_cfg.origin_server_id
+            server_id=self.config.origin_server_id
         )
 
         self.server = MinecraftServer(
-            name=self.global_cfg.server_name,
+            name=self.config.server_name,
             panel=self.panel,
-            server_id=self.global_cfg.server_id,
-            server_domain=self.global_cfg.server_domain,
-            server_port=self.global_cfg.server_port,
-            rcon_port=self.global_cfg.rcon_port,
-            rcon_password=self.global_cfg.rcon_password,
-            tpsCommand=self.global_cfg.tps_command,
+            server_id=self.config.server_id,
+            server_domain=self.config.server_domain,
+            server_port=self.config.server_port,
+            rcon_port=self.config.rcon_port,
+            rcon_password=self.config.rcon_password,
+            tpsCommand=self.config.tps_command,
         )
 
-        logger_name = self.global_cfg.logger_name.format(
-            server_name=self.global_cfg.server_name
+        logger_name = self.config.logger_name.format(
+            server_name=self.config.server_name
         )
 
         self.log = HungerLogger(
-            name=logger_name,
+            name=self.config.logger_name,
             server=self.server,
-            log_path=self.global_cfg.log_path,
-            console_backspaces=self.global_cfg.console_backspaces,
+            log_path=self.config.log_path,
+            console_backspaces=self.config.console_backspaces,
         )
 
-        self.tz = ZoneInfo(self.global_cfg.timezone)
+        self.tz = ZoneInfo(self.config.timezone)
 
     def fmt(self, template: str, **kwargs):
         return template.format(prefix=self.messages.prefix, **kwargs)
@@ -89,21 +89,21 @@ class ServerWatcher:
         getattr(self.log, level)(text)
 
     def shutdown(self):
-        self.say(self.messages.log_shutdown)
+        self.say(self.messages.shutdown)
         raise SystemExit
 
     def restart_and_wait(self):
-        if self.cfg.schedule_control:
-            self.origin.disableSchedule(self.cfg.restart_soon_id)
+        if self.watcherconfig.schedule_control:
+            self.origin.disableSchedule(self.watcherconfig.restart_soon_id)
         self.server.restart()
         self.say(self.messages.restart_action_sent)
-        time.sleep(self.cfg.restart_wait_seconds)
+        time.sleep(self.watcherconfig.restart.wait_seconds)
 
         self.say(self.messages.log_status_check, level="warn")
         alive = waitForOnline(
             self.server,
-            timeout=self.cfg.restart_online_timeout,
-            interval=self.cfg.restart_online_interval,
+            timeout=self.watcherconfig.restart.timeout,
+            interval=self.watcherconfig.restart.online_interval,
         )
 
         if alive:
@@ -146,10 +146,10 @@ class ServerWatcher:
         )
 
     def evaluate(self):
-        self.say(self.messages.log_start)
+        self.say(self.messages.startup)
 
         if not validateAll(self.panel, self.server):
-            self.say(self.messages.log_validation_fail, level="error")
+            self.say(self.messages.validation_fail, level="error")
             self.shutdown()
 
         self.server.refresh()
@@ -160,38 +160,38 @@ class ServerWatcher:
         restart_reasons = []
         no_restart_reasons = []
 
-        if self.cfg.schedule_control and self.server.getSchedule(self.cfg.restart_soon_id)["is_active"]:
-            restart_reasons.append(self.messages.reason_restart_soon)
-            pro += self.cfg.weight_restart_soon
+        if self.watcherconfig.schedule_control and self.server.getSchedule(self.watcherconfig.restart_soon_id)["is_active"]:
+            restart_reasons.append(self.messages.reasons.restart_soon)
+            pro += self.watcherconfig.weights.restart_soon
 
-        if snap.ram >= self.cfg.ram_threshold:
-            restart_reasons.append(self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.cfg.ram_threshold))
-            pro += int(round(snap.ram, 0) - (self.cfg.ram_threshold - 1))
+        if snap.ram >= self.watcherconfig.thresholds.ram:
+            restart_reasons.append(self.fmt(self.messages.reasons.ram, ram=snap.ram, threshold=self.watcherconfig.thresholds.ram))
+            pro += int(round(snap.ram, 0) - (self.watcherconfig.thresholds.ram - 1))
 
-        if snap.cpu >= self.cfg.cpu_threshold:
-            restart_reasons.append(self.fmt(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.cfg.cpu_threshold))
-            pro += self.cfg.weight_cpu
+        if snap.cpu >= self.watcherconfig.thresholds.cpu:
+            restart_reasons.append(self.fmt(self.messages.reasons.cpu, cpu=snap.cpu, threshold=self.watcherconfig.thresholds.cpu))
+            pro += self.watcherconfig.weights.cpu
 
-        if snap.uptime // 3600 >= self.cfg.uptime_hours_threshold:
+        if snap.uptime // 3600 >= self.watcherconfig.thresholds.uptime:
             restart_reasons.append(
-                self.fmt(self.messages.reason_uptime, uptime=snap.uptime_formatted,
-                         threshold=self.cfg.uptime_hours_threshold)
+                self.fmt(self.messages.reasons.uptime, uptime=snap.uptime_formatted,
+                         threshold=self.watcherconfig.thresholds.uptime)
             )
-            pro += self.cfg.weight_uptime
+            pro += self.watcherconfig.weight_uptime
 
-        if (snap.tps if snap.tps is not None else 0) <= self.cfg.tps_threshold:
-            restart_reasons.append(self.fmt(self.messages.reason_tps, tps=snap.tps, threshold=self.cfg.tps_threshold))
-            pro += self.cfg.weight_tps
+        if (snap.tps if snap.tps is not None else 0) <= self.watcherconfig.thresholds.tps:
+            restart_reasons.append(self.fmt(self.messages.reasons.tps, tps=snap.tps, threshold=self.watcherconfig.thresholds.tps))
+            pro += self.watcherconfig.weights.tps
 
         if snap.uptime // 60 < 30:
-            no_restart_reasons.append(self.fmt(self.messages.reason_low_uptime, uptime=snap.uptime_formatted))
-            anti += self.cfg.weight_low_uptime
+            no_restart_reasons.append(self.fmt(self.messages.reasons.low_uptime, uptime=snap.uptime_formatted))
+            anti += self.watcherconfig.weights.low_uptime
 
         if snap.players > 0:
             verb = "are" if snap.players != 1 else "is"
             plural = "players" if snap.players != 1 else "player"
-            no_restart_reasons.append(self.fmt(self.messages.reason_players, verb=verb, count=snap.players, plural=plural))
-            anti += snap.players * self.cfg.weight_per_player
+            no_restart_reasons.append(self.fmt(self.messages.reasons.players, verb=verb, count=snap.players, plural=plural))
+            anti += snap.players * self.watcherconfig.weights.per_player
 
         if restart_reasons:
             self.say(self.messages.pro_restart_splash, level="warn")
@@ -211,30 +211,30 @@ class ServerWatcher:
         gap = abs(pro - anti)
 
         if pro == 0:
-            self.say(self.messages.log_no_restart)
+            self.say(self.messages.no_restart)
             return
 
         if pro > anti and snap.players == 0:
-            self.say(self.messages.log_immediate_restart)
+            self.say(self.messages.immediate_restart)
             self.restart_and_wait()
             return
 
-        self.say(self.messages.log_scheduled)
+        self.say(self.messages.scheduled)
 
         if gap <= 2:
-            self.say(self.messages.log_gap_low, level="warn", gap=gap)
-            self.schedule_restart(self.cfg.low_gap_minutes)
+            self.say(self.messages.gap_low, level="warn", gap=gap)
+            self.schedule_restart(self.watcherconfig.low_gap_minutes)
         else:
-            self.say(self.messages.log_gap_high, level="warn", gap=gap)
-            self.schedule_restart(self.cfg.high_gap_minutes)
+            self.say(self.messages.gap_high, level="warn", gap=gap)
+            self.schedule_restart(self.watcherconfig.high_gap_minutes)
 
         self.restart_and_wait()
 
     def run(self):
-        if self.global_cfg.clear_terminal:
+        if self.config.clear_terminal:
             clearTerminal()
         while True:
-            if self.global_cfg.clear_terminal:
+            if self.config.clear_terminal:
                 clearTerminal()
             self.evaluate()
-            time.sleep(self.global_cfg.watch_interval)
+            time.sleep(self.config.watch_interval)

{serverwatcher-5.0 → serverwatcher-5.1/src/serverwatcher.egg-info}/PKG-INFO

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

{serverwatcher-5.0 → serverwatcher-5.1}/src/serverwatcher.egg-info/SOURCES.txt

@@ -10,9 +10,9 @@ src/serverwatcher.egg-info/dependency_links.txt
 src/serverwatcher.egg-info/requires.txt
 src/serverwatcher.egg-info/top_level.txt
 src/serverwatcher/configclasses/__init__.py
-src/serverwatcher/configclasses/global_config.py
+src/serverwatcher/configclasses/config.py
 src/serverwatcher/configclasses/messages.py
 src/serverwatcher/configclasses/watcher.py
-src/serverwatcher/defaultconfigs/global.yaml
+src/serverwatcher/defaultconfigs/config.yaml
 src/serverwatcher/defaultconfigs/messages.yaml
 src/serverwatcher/defaultconfigs/watcher.yaml

serverwatcher-5.0/src/serverwatcher/configclasses/global_config.py

@@ -1,30 +0,0 @@
-from dataclasses import dataclass, field
-
-def yaml_key(name: str):
-    return field(metadata={"yaml_key": name})
-
-@dataclass
-class GlobalConfig:
-    watch_interval: int = yaml_key("watch_interval")
-
-    panel_name: str = yaml_key("panel_name")
-    panel_url: str = yaml_key("panel_url")
-    panel_api_key: str = yaml_key("panel_api_key")
-
-    origin_server_id: str = yaml_key("origin_server_id")
-
-    server_name: str = yaml_key("server_name")
-    server_id: str = yaml_key("server_id")
-    server_domain: str = yaml_key("server_domain")
-    server_port: int = yaml_key("server_port")
-    rcon_port: int = yaml_key("rcon_port")
-    rcon_password: str = yaml_key("rcon_password")
-    tps_command: str = yaml_key("tps_command")
-    
-    do_logging: bool = yaml_key("do_logging")
-    logger_name: str = yaml_key("logger_name")
-    log_path: str = yaml_key("log_path")
-    timezone: str = yaml_key("timezone")
-
-    console_backspaces: int = yaml_key("console_backspaces")
-    clear_terminal: bool = yaml_key("clear_terminal")

serverwatcher-5.0/src/serverwatcher/configclasses/messages.py

@@ -1,65 +0,0 @@
-from dataclasses import dataclass, field
-
-def yaml_key(name: str):
-    return field(metadata={"yaml_key": name})
-
-@dataclass
-class MessagesConfig:
-    prefix: str = yaml_key("prefix")
-
-    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
-    bullet: str = yaml_key("bullet")
-
-    # minute messages
-    minute_120: str = yaml_key("minute_120")
-    minute_60: str = yaml_key("minute_60")
-    minute_45: str = yaml_key("minute_45")
-    minute_30: str = yaml_key("minute_30")
-    minute_15: str = yaml_key("minute_15")
-    minute_5: str = yaml_key("minute_5")
-    minute_1: str = yaml_key("minute_1")
-
-    # second messages
-    second_10: str = yaml_key("second_10")
-    second_9: str = yaml_key("second_9")
-    second_8: str = yaml_key("second_8")
-    second_7: str = yaml_key("second_7")
-    second_6: str = yaml_key("second_6")
-    second_5: str = yaml_key("second_5")
-    second_4: str = yaml_key("second_4")
-    second_3: str = yaml_key("second_3")
-    second_2: str = yaml_key("second_2")
-    second_1: str = yaml_key("second_1")
-
-    # logging
-    log_start: str = yaml_key("log_start")
-    log_status_check: str = yaml_key("log_status_check")
-    log_validation_fail: str = yaml_key("log_validation_fail")
-    log_validation_ok: str = yaml_key("log_validation_ok")
-    log_shutdown: str = yaml_key("log_shutdown")
-    log_immediate_restart: str = yaml_key("log_immediate_restart")
-    log_no_restart: str = yaml_key("log_no_restart")
-    log_scheduled: str = yaml_key("log_scheduled")
-    log_gap_low: str = yaml_key("log_gap_low")
-    log_gap_high: str = yaml_key("log_gap_high")
-
-    # reasons
-    pro_restart_splash: str = yaml_key("pro_restart_splash")
-    anti_restart_splash: str = yaml_key("anti_restart_splash")
-
-    reason_restart_soon: str = yaml_key("reason_restart_soon")
-    reason_ram: str = yaml_key("reason_ram")
-    reason_cpu: str = yaml_key("reason_cpu")
-    reason_uptime: str = yaml_key("reason_uptime")
-    reason_tps: str = yaml_key("reason_tps")
-    reason_low_uptime: str = yaml_key("reason_low_uptime")
-    reason_players: str = yaml_key("reason_players")
-
-    pro_restart_number: str = yaml_key("pro_restart_number")
-    anti_restart_number: str = yaml_key("anti_restart_number")
-
-    # restarts
-    restart_action_sent: str = yaml_key("restart_action_sent")
-    server_back_online: str = yaml_key("server_back_online")
-    server_back_online_broadcast: str = yaml_key("server_back_online_broadcast")
-    server_failed_restart: str = yaml_key("server_failed_restart")

serverwatcher-5.0/src/serverwatcher/configclasses/watcher.py

@@ -1,30 +0,0 @@
-from dataclasses import dataclass, field
-
-def yaml_key(name: str):
-    return field(metadata={"yaml_key": name})
-
-@dataclass
-class WatcherConfig:
-    schedule_control: bool = yaml_key("schedule_control")
-    restart_soon_id: int = yaml_key("restart_soon_id")
-
-    ram_threshold: int = yaml_key("ram_threshold")
-    cpu_threshold: int = yaml_key("cpu_threshold")
-    uptime_hours_threshold: int = yaml_key("uptime_hours_threshold")
-    tps_threshold: float = yaml_key("tps_threshold")
-
-    weight_restart_soon: int = yaml_key("weight_restart_soon")
-    weight_ram: int = yaml_key("weight_ram")
-    weight_cpu: int = yaml_key("weight_cpu")
-    weight_uptime: int = yaml_key("weight_uptime")
-    weight_tps: int = yaml_key("weight_tps")
-
-    weight_low_uptime: int = yaml_key("weight_low_uptime")
-    weight_per_player: int = yaml_key("weight_per_player")
-
-    low_gap_minutes: int = yaml_key("low_gap_minutes")
-    high_gap_minutes: int = yaml_key("high_gap_minutes")
-
-    restart_wait_seconds: int = yaml_key("restart_wait_seconds")
-    restart_online_timeout: int = yaml_key("restart_online_timeout")
-    restart_online_interval: int = yaml_key("restart_online_interval")

serverwatcher-5.0/src/serverwatcher/defaultconfigs/global.yaml

@@ -1,28 +0,0 @@
-watch_interval: 300
-
-panel:
-  panel_name: "My Panel"
-  panel_url: "https://example.com"
-  panel_api_key: "CHANGE_ME"
-
-origin:
-  origin_server_id: "CHANGE_ME"
-
-server:
-  server_name: "My SMP"
-  server_id: "CHANGE_ME"
-  server_domain: "mc.example.com"
-  server_port: 25565
-  rcon_port: 25575
-  rcon_password: "password"
-  tps_command: "ticks"
-
-logging:
-  do_logging: True
-  logger_name: "Server Watcher"
-  log_path: "/home/container/logs/"
-  timezone: "America/Chicago"
-
-terminal:
-  console_backspaces: 8
-  clear_terminal: True

serverwatcher-5.0/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,58 +0,0 @@
-prefix: "<reset><aqua>[Server Watcher]"
-
-broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
-bullet: "-"
-
-broadcast_minute:
-  minute_120: "{prefix} Restart in 2 hours!"
-  minute_60: "{prefix} Restart in 1 hour!"
-  minute_45: "{prefix} Restart in 45 minutes!"
-  minute_30: "{prefix} Restart in 30 minutes!"
-  minute_15: "{prefix} Restart in 15 minutes!"
-  minute_5: "{prefix} Restart in 5 minutes!"
-  minute_1: "{prefix} Restart in 1 minute!"
-
-broadcast_second:
-  second_10: "{prefix} Restart in 10 seconds!"
-  second_9: "{prefix} Restart in 9 seconds!"
-  second_8: "{prefix} Restart in 8 seconds!"
-  second_7: "{prefix} Restart in 7 seconds!"
-  second_6: "{prefix} Restart in 6 seconds!"
-  second_5: "{prefix} Restart in 5 seconds!"
-  second_4: "{prefix} Restart in 4 seconds!"
-  second_3: "{prefix} Restart in 3 seconds!"
-  second_2: "{prefix} Restart in 2 seconds!"
-  second_1: "{prefix} Restart in 1 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."
-  log_gap_low: "Gap {gap}. Scheduling restart in 2 hours."
-  log_gap_high: "Gap {gap}. Scheduling restart in 1 hour."
-
-reasons:
-  pro_restart_splash: "PRO-RESTART REASONS:"
-  anti_restart_splash: "ANTI-RESTART REASONS:"
-
-  reason_restart_soon: "The server is set to restart soon"
-  reason_ram: "RAM usage ({ram}) is higher than {threshold} GB"
-  reason_cpu: "CPU usage ({cpu}) is higher than {threshold}%"
-  reason_uptime: "Uptime {uptime} exceeds {threshold}h"
-  reason_tps: "TPS {tps} is lower than {threshold}"
-  reason_low_uptime: "Uptime {uptime} is shorter than 30m"
-  reason_players: "There {verb} {count} {plural} online"
-
-  pro_restart_number: "Pro-restart: "
-  anti_restart_number: "Anti-restart:"
-
-restarts:
-  restart_action_sent: "Restart action sent. Waiting..."
-  server_back_online: "Server is back online!"
-  server_back_online_broadcast: "{prefix} <green>Restart successful!"
-  server_failed_restart: "Server failed to restart!"

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

@@ -1,27 +0,0 @@
-schedules:
-  schedule_control: False
-  restart_soon_id: 0     # replace this with a real schedule id
-
-thresholds:
-  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: 30
-  restart_online_timeout: 120
-  restart_online_interval: 2

serverwatcher-5.0/src/serverwatcher/validator.py

@@ -1,163 +0,0 @@
-import sys
-from dataclasses import fields
-
-from hungerlib.addons import loadConfig
-
-from serverwatcher.configclasses.global_config import GlobalConfig
-from serverwatcher.configclasses.messages import MessagesConfig
-from serverwatcher.configclasses.watcher import WatcherConfig
-
-
-# -----------------------------
-# Generic validation helpers
-# -----------------------------
-
-def validate_type(name, value, expected_type, errors):
-    if not isinstance(value, expected_type):
-        errors.append(f"{name}: expected {expected_type.__name__}, got {type(value).__name__}")
-
-
-def validate_positive(name, value, errors):
-    if isinstance(value, (int, float)) and value < 0:
-        errors.append(f"{name}: must be >= 0 (got {value})")
-
-
-def validate_nonempty(name, value, errors):
-    if isinstance(value, str) and value.strip() == "":
-        errors.append(f"{name}: cannot be empty")
-
-
-def validate_dataclass(config_obj, schema, errors):
-    """
-    Validate all fields in a dataclass:
-    - type correctness
-    - non-negative numbers
-    - non-empty strings
-    """
-    for f in fields(schema):
-        name = f.name
-        expected_type = f.type
-        value = getattr(config_obj, name)
-
-        # Type check
-        validate_type(name, value, expected_type, errors)
-
-        # String checks
-        if expected_type is str:
-            validate_nonempty(name, value, errors)
-
-        # Numeric checks
-        if expected_type in (int, float):
-            validate_positive(name, value, errors)
-
-
-# -----------------------------
-# Config-specific validation
-# -----------------------------
-
-def validate_global_config(cfg, errors):
-    if cfg.watch_interval < 1:
-        errors.append(f"watch_interval: must be >= 1 (got {cfg.watch_interval})")
-
-    # Example: ensure ports are valid
-    if cfg.server_port <= 0 or cfg.server_port > 65535:
-        errors.append(f"server_port: must be 1–65535 (got {cfg.server_port})")
-
-    if cfg.rcon_port <= 0 or cfg.rcon_port > 65535:
-        errors.append(f"rcon_port: must be 1–65535 (got {cfg.rcon_port})")
-
-
-def validate_watcher_config(cfg, errors):
-    if cfg.restart_wait_seconds < 1:
-        errors.append(f"restart_wait_seconds: must be >= 1 (got {cfg.restart_wait_seconds})")
-
-    if cfg.cpu_threshold <= 0:
-        errors.append(f"cpu_threshold: must not be less than 1 (got {cfg.cpu_threshold})")
-
-    if cfg.ram_threshold <= 0:
-        errors.append(f"ram_threshold: must be > 0 (got {cfg.ram_threshold})")
-
-    if cfg.tps_threshold <= 0 or cfg.tps_threshold > 20:
-        errors.append(f"tps_threshold: must be 1–20 (got {cfg.tps_threshold})")
-
-
-def validate_messages_config(cfg, errors):
-    # Ensure all message templates contain {prefix}
-    for name, value in vars(cfg).items():
-        if isinstance(value, str) and "{prefix}" not in value:
-            # Not required for every field, but warn if missing
-            pass
-
-def ensure_no_global_defaults(cfg, defaults):
-    if cfg.panel_url == "https://example.com":
-        defaults.append('panel_url')
-    
-    if cfg.panel_api_key == 'CHANGE_ME':
-        defaults.append('panel_api_key')
-
-    if cfg.origin_server_id == 'CHANGE_ME':
-        defaults.append('origin_server_id')
-
-    if cfg.server_id == 'CHANGE_ME':
-        defaults.append('server_id')
-
-    if cfg.server_domain == 'mc.example.com':
-        defaults.append('server_domain')
-
-    if cfg.rcon_password == 'password':
-        defaults.append('rcon_password')
-
-
-def ensure_no_watcher_defaults(cfg, defaults):
-    if cfg.schedule_control and cfg.restart_soon_id == 0:
-        defaults.append('restart_soon_id')
-
-
-# -----------------------------
-# Main validator
-# -----------------------------
-
-def validate_all():
-    errors = []
-    defaults = []
-
-    # Load configs
-    global_cfg = loadConfig("config/global.yaml", "/defaultconfigs/global.yaml", GlobalConfig)
-    messages_cfg = loadConfig("config/messages.yaml", "/defaultconfigs/messages.yaml", MessagesConfig)
-    watcher_cfg = loadConfig("config/watcher.yaml", "/defaultconfigs/watcher.yaml", WatcherConfig)
-
-    # Generic dataclass validation
-    validate_dataclass(global_cfg, GlobalConfig, errors)
-    validate_dataclass(messages_cfg, MessagesConfig, errors)
-    validate_dataclass(watcher_cfg, WatcherConfig, errors)
-
-    # Config-specific validation
-    validate_global_config(global_cfg, errors)
-    validate_messages_config(messages_cfg, errors)
-    validate_watcher_config(watcher_cfg, errors)
-
-    # Check for defaults
-    ensure_no_global_defaults(global_cfg, defaults)
-    ensure_no_watcher_defaults(watcher_cfg, defaults)
-
-
-    # Print results
-    if len(defaults) >= 7:
-        print("❌ CONFIG VALIDATION FAILED:\nIt looks like you haven't configured this yet! Please change these defaults:")
-        for d in defaults:
-            print(" -", d)
-        sys.exit(1)
-
-    if errors or defaults:
-        print("❌ CONFIG VALIDATION FAILED:")
-        for e in errors:
-            print(" -", e)
-        for d in defaults:
-            print(" -", d, ": must not be left default")
-        sys.exit(1)
-
-    print("✅ All configs are valid.")
-
-
-if __name__ == "__main__":
-    validate_all()