serverwatcher 5.7__tar.gz → 5.8__tar.gz

{serverwatcher-5.7/src/serverwatcher.egg-info → serverwatcher-5.8}/PKG-INFO

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

{serverwatcher-5.7 → serverwatcher-5.8}/pyproject.toml

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

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/configclasses/config.py

@@ -1,11 +1,12 @@
-from dataclasses import dataclass, field
+from dataclasses import field
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@dataclass
+@datamap(syntax=datamap_api.braces)
 class GlobalConfig:
-    watch_interval: int = yaml_key("watch_interval")
+    timezone: str = yaml_key("timezone")
 
     panel_name: str = yaml_key("panel.name")
     panel_url: str = yaml_key("panel.url")
@@ -25,7 +26,6 @@ class GlobalConfig:
     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")
+    clear_terminal: bool = yaml_key("terminal.enable_clearing")

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/configclasses/messages.py

@@ -1,36 +1,35 @@
-from dataclasses import dataclass, field
+from dataclasses import field
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@dataclass
+@datamap(syntax=datamap_api.braces)
 class MessagesConfig:
-    prefix: str = yaml_key("prefix")
-    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
+    prefix: str = yaml_key("prefix", "<aqua>[Server Watcher]")
     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")
-    minute_5: str = yaml_key("broadcast_minutes.5")
-    minute_1: str = yaml_key("broadcast_minutes.1")
+    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
 
-    # 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")
+    minute_120: str = yaml_key("broadcast_minutes.120", "{prefix} Restart in 2 hours!")
+    minute_60: str = yaml_key("broadcast_minutes.60", "{prefix} Restart in 1 hour!")
+    minute_45: str = yaml_key("broadcast_minutes.45", "{prefix} Restart in 45 minutes!")
+    minute_30: str = yaml_key("broadcast_minutes.30", "{prefix} Restart in 30 minutes!")
+    minute_15: str = yaml_key("broadcast_minutes.15", "{prefix} Restart in 15 minutes!")
+    minute_5: str = yaml_key("broadcast_minutes.5", "{prefix} Restart in 5 minutes!")
+    minute_1: str = yaml_key("broadcast_minutes.1", "{prefix} Restart in 1 minute!")
+
+    second_10: str = yaml_key("broadcast_seconds.10", "{prefix} Restart in 10 seconds!")
+    second_9:  str = yaml_key("broadcast_seconds.9",  "{prefix} Restart in 9 seconds!")
+    second_8:  str = yaml_key("broadcast_seconds.8",  "{prefix} Restart in 8 seconds!")
+    second_7:  str = yaml_key("broadcast_seconds.7",  "{prefix} Restart in 7 seconds!")
+    second_6:  str = yaml_key("broadcast_seconds.6",  "{prefix} Restart in 6 seconds!")
+    second_5:  str = yaml_key("broadcast_seconds.5",  "{prefix} Restart in 5 seconds!")
+    second_4:  str = yaml_key("broadcast_seconds.4",  "{prefix} Restart in 4 seconds!")
+    second_3:  str = yaml_key("broadcast_seconds.3",  "{prefix} Restart in 3 seconds!")
+    second_2:  str = yaml_key("broadcast_seconds.2",  "{prefix} Restart in 2 seconds!")
+    second_1:  str = yaml_key("broadcast_seconds.1",  "{prefix} Restart in 1 second!")
 
-    # logging
     startup: str = yaml_key("logging.startup")
     status_check: str = yaml_key("logging.status_check")
     validation_fail: str = yaml_key("logging.validation_fail")
@@ -42,7 +41,6 @@ class MessagesConfig:
     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_splash")
     anti_restart_splash: str = yaml_key("reasons.anti_splash")
 
@@ -57,7 +55,6 @@ class MessagesConfig:
     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")

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/configclasses/watcher.py

@@ -1,10 +1,12 @@
-from dataclasses import dataclass, field
+from dataclasses import field
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@dataclass
+@datamap(syntax=datamap_api.braces)
 class WatcherConfig:
+    watch_interval: int = yaml_key("watch_interval")
     schedule_control: bool = yaml_key("schedule_control.enabled")
     restart_soon_id: int = yaml_key("schedule_control.restart_soon_id")
 

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/defaultconfigs/config.yaml

@@ -1,4 +1,4 @@
-watch_interval: 300
+timezone: 'America/Chicago'
 
 panel:
   name: 'My Panel'
@@ -21,7 +21,6 @@ logger:
   enabled: True
   name: 'Server Watcher'
   log_path: '/home/container/logs/'
-  timezone: 'America/Chicago'
 
 terminal:
   backspaces: 8

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,28 +1,10 @@
 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!'
-  '45': '{prefix} Restart in 45 minutes!'
-  '30': '{prefix} Restart in 30 minutes!'
-  '15': '{prefix} Restart in 15 minutes!'
-  '5': '{prefix} Restart in 5 minutes!'
-  '1': '{prefix} Restart in 1 minute!'
+broadcast_restart_at: '{prefix} The server will restart at {time} CDT.'
 
-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!'
+broadcast_minutes: {}
+broadcast_seconds: {}
 
 logging:
   startup: 'ServerWatcher is running!'
@@ -46,7 +28,7 @@ reasons:
   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'
+  players: 'There {verb} {count} {plural} online'         # produces: "There are 2 players online" or "There is 1 player online"
 
   pro_restart_number: 'Pro-restart: '
   anti_restart_number: 'Anti-restart:'

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,3 +1,5 @@
+watch_interval: 300
+
 schedule_control:
   enabled: False
   restart_soon_id: 0     # replace this with a real schedule id

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/validator.py

@@ -1,13 +1,12 @@
 import sys
 from dataclasses import fields
-
-from hungerlib.addons import loadConfig, clearTerminal
+from hungerlib import utils, loadConfig
 
 from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
 from serverwatcher.configclasses.watcher import WatcherConfig
 
-clearTerminal()
+utils.clearTerminal()
 
 def deep_get_attr(obj, dotted):
     parts = dotted.split(".")
@@ -18,22 +17,18 @@ def deep_get_attr(obj, dotted):
         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
@@ -48,18 +43,13 @@ def validate_dataclass(config_obj, schema, 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})")
@@ -73,13 +63,12 @@ def validate_watcher_config(watcherconfig, errors):
     if watcherconfig.threshold_tps <= 0 or watcherconfig.threshold_tps > 20:
         errors.append(f"threshold_tps: must be 1–20 (got {watcherconfig.threshold_tps})")
 
-
 def validate_messages_config(messages, errors):
-    for name, value in vars(messages).items():
+    for f in fields(MessagesConfig):
+        value = getattr(messages, f.name)
         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')
@@ -99,12 +88,10 @@ def ensure_no_global_defaults(config, defaults):
     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 = []
@@ -140,6 +127,5 @@ def validate_all():
 
     print("✅ All configs are valid.")
 
-
 if __name__ == "__main__":
     validate_all()

{serverwatcher-5.7 → serverwatcher-5.8}/src/serverwatcher/watcher.py

@@ -1,43 +1,19 @@
 import os
 import time
-import re
 from zoneinfo import ZoneInfo
 
-from hungerlib import Panel, HungerLogger
-from hungerlib.servers import MinecraftServer, GenericServer
-from hungerlib.addons import (
-    clearTerminal,
-    Snapshot,
-    snapSchedule,
-    waitForOnline,
-    validateAll,
-    runCountdownEvents,
-    loadConfig,
-)
+from hungerlib import servers, MessageRouter, loadConfig, utils, datamap_api, mapit
 
 from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
 from serverwatcher.configclasses.watcher import WatcherConfig
-
 from serverwatcher.validator import validate_all
 
 validate_all()
 
-_T_EXPR = re.compile(r"{([^{}]+)}")
-
-def t_eval(template: str, /, **ctx):
-    def repl(match):
-        expr = match.group(1).strip()
-        try:
-            return str(eval(expr, {}, ctx))
-        except Exception as e:
-            return f"<err:{e}>"
-
-    return _T_EXPR.sub(repl, template)
 
 class ServerWatcher:
     def __init__(self):
-
         self.config = loadConfig(
             "config/config.yaml",
             "/defaultconfigs/config.yaml",
@@ -56,19 +32,26 @@ class ServerWatcher:
             WatcherConfig
         )
 
-        self.panel = Panel(
+        datamap_api.set_default_maps(
+            utils.ASCII_COLOR_MAP,
+            self.config,
+            self.messages,
+            self.watcherconfig
+        )
+
+        self.panel = servers.Panel(
             name=self.config.panel_name,
             url=self.config.panel_url,
             api_key=self.config.panel_api_key,
         )
 
-        self.origin = GenericServer(
+        self.origin = servers.Generic(
             name="Origin",
             panel=self.panel,
             server_id=self.config.origin_server_id
         )
 
-        self.server = MinecraftServer(
+        self.server = servers.Minecraft(
             name=self.config.server_name,
             panel=self.panel,
             server_id=self.config.server_id,
@@ -79,27 +62,31 @@ class ServerWatcher:
             tpsCommand=self.config.tps_command,
         )
 
-        logger_name = self.config.logger_name.format(
-            server_name=self.config.server_name
-        )
-
-        self.log = HungerLogger(
-            name=self.config.logger_name,
+        logger_name = mapit(self.config.logger_name, server_name=self.config.server_name)
+        
+        self.router = MessageRouter(
+            name=logger_name,
             server=self.server,
             log_path=self.config.log_path,
+            formatter=self._fmt,
             console_backspaces=self.config.console_backspaces,
         )
 
         self.tz = ZoneInfo(self.config.timezone)
 
-    def fmt(self, template: str, **fmt):
-        return t_eval(template, self=self, **fmt)
+    def _fmt(self, template: str, **ctx):
+        return mapit(template, **ctx)
 
-    def say(self, template, level="info", **fmt):
+    def say(self, template, level="info", **ctx):
         if not template:
             return
-        text = self.fmt(template, **fmt)
-        getattr(self.log, level)(text)
+        msg = mapit(template, **ctx)
+        self.router.say(
+            msg,
+            level=level,
+            log=self.config.enable_logging,
+            **ctx
+        )
 
     def shutdown(self):
         self.say(self.messages.shutdown)
@@ -108,12 +95,13 @@ class ServerWatcher:
     def restart_and_wait(self):
         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.watcherconfig.restart_wait_seconds)
 
         self.say(self.messages.status_check, level="warn")
-        alive = waitForOnline(
+        alive = utils.waitForOnline(
             self.server,
             timeout=self.watcherconfig.restart_timeout,
             interval=self.watcherconfig.restart_online_interval,
@@ -121,7 +109,7 @@ class ServerWatcher:
 
         if alive:
             self.say(self.messages.server_back_online)
-            self.say(self.messages.server_back_online_broadcast)
+            self.say(self.messages.server_back_online_broadcast, broadcast=True)
         else:
             self.say(self.messages.server_failed_restart, level="error")
 
@@ -132,12 +120,12 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        self.server.sendBroadcast(self.fmt(self.messages.broadcast_restart_at, time=time_str))
+        self.router.broadcast(mapit(self.messages.broadcast_restart_at, time=time_str))
 
         minute_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg)
+                lambda msg=mapit(getattr(self.messages, k)):
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("minute_")
@@ -145,8 +133,8 @@ class ServerWatcher:
 
         second_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg)
+                lambda msg=mapit(getattr(self.messages, k)):
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("second_")
@@ -161,12 +149,12 @@ class ServerWatcher:
     def evaluate(self):
         self.say(self.messages.startup)
 
-        if not validateAll(self.panel, self.server):
+        if not utils.validateAll(self.panel, self.server):
             self.say(self.messages.validation_fail, level="error")
             self.shutdown()
 
         self.server.refresh()
-        snap = Snapshot(self.server, 2, True)
+        snap = utils.Snapshot(self.server, 2, True)
 
         pro = 0
         anti = 0
@@ -178,46 +166,45 @@ class ServerWatcher:
             pro += self.watcherconfig.weight_restart_soon
 
         if snap.ram >= self.watcherconfig.threshold_ram:
-            restart_reasons.append(self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.watcherconfig.threshold_ram))
+            restart_reasons.append(mapit(self.messages.reason_ram, ram=snap.ram, threshold=self.watcherconfig.threshold_ram))
             pro += int(round(snap.ram, 0) - (self.watcherconfig.threshold_ram - 1))
 
         if snap.cpu >= self.watcherconfig.threshold_cpu:
-            restart_reasons.append(self.fmt(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.watcherconfig.threshold_cpu))
+            restart_reasons.append(mapit(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.watcherconfig.threshold_cpu))
             pro += self.watcherconfig.weight_cpu
 
         if snap.uptime // 3600 >= self.watcherconfig.threshold_uptime:
             restart_reasons.append(
-                self.fmt(self.messages.reason_uptime, uptime=snap.uptime_formatted,
-                         threshold=self.watcherconfig.threshold_uptime)
+                mapit(self.messages.reason_uptime, uptime=snap.uptime_formatted, threshold=self.watcherconfig.threshold_uptime)
             )
             pro += self.watcherconfig.weight_uptime
 
         if (snap.tps if snap.tps is not None else 20) <= self.watcherconfig.threshold_tps:
-            restart_reasons.append(self.fmt(self.messages.reason_tps, tps=snap.tps, threshold=self.watcherconfig.threshold_tps))
+            restart_reasons.append(mapit(self.messages.reason_tps, tps=snap.tps, threshold=self.watcherconfig.threshold_tps))
             pro += self.watcherconfig.weight_tps
 
         if snap.uptime // 60 < 30:
-            no_restart_reasons.append(self.fmt(self.messages.reason_low_uptime, uptime=snap.uptime_formatted))
+            no_restart_reasons.append(mapit(self.messages.reason_low_uptime, uptime=snap.uptime_formatted))
             anti += self.watcherconfig.weight_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))
+            no_restart_reasons.append(mapit(self.messages.reason_players, verb=verb, count=snap.players, plural=plural))
             anti += snap.players * self.watcherconfig.weight_per_player
 
         if restart_reasons:
             self.say(self.messages.pro_restart_splash, level="warn")
             for r in restart_reasons:
-                self.log.warn(f"{self.messages.bullet} {r}")
+                self.say(f"{self.messages.bullet} {r}", level="warn")
 
         if no_restart_reasons:
             self.say(self.messages.anti_restart_splash, level="warn")
             for r in no_restart_reasons:
-                self.log.warn(f"{self.messages.bullet} {r}")
+                self.say(f"{self.messages.bullet} {r}", level="warn")
 
-        self.log.warn(f"{self.messages.pro_restart_number} {pro}")
-        self.log.warn(f"{self.messages.anti_restart_number} {anti}")
+        self.say(f"{self.messages.pro_restart_number} {pro}", level="warn")
+        self.say(f"{self.messages.anti_restart_number} {anti}", level="warn")
 
         gap = abs(pro - anti)
 
@@ -243,9 +230,9 @@ class ServerWatcher:
 
     def run(self):
         if self.config.clear_terminal:
-            clearTerminal()
+            utils.clearTerminal()
         while True:
             if self.config.clear_terminal:
-                clearTerminal()
+                utils.clearTerminal()
             self.evaluate()
-            time.sleep(self.config.watch_interval)
+            time.sleep(self.watcherconfig.watch_interval)

{serverwatcher-5.7 → serverwatcher-5.8/src/serverwatcher.egg-info}/PKG-INFO

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