serverwatcher 5.8.dev11__tar.gz → 5.8.dev13__tar.gz

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

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

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev13}/pyproject.toml

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

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

@@ -1,11 +1,11 @@
-from dataclasses import dataclass, field
+from dataclasses import field
+from hungerlib.datamap import datamap, Syntax
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@dataclass
+@datamap(syntax=Syntax.braces)
 class GlobalConfig:
-    watch_interval: int = yaml_key("watch_interval")
     timezone: str = yaml_key("timezone")
 
     panel_name: str = yaml_key("panel.name")
@@ -28,4 +28,4 @@ class GlobalConfig:
     log_path: str = yaml_key("logger.log_path")
 
     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.8.dev13/src/serverwatcher/configclasses/messages.py

@@ -0,0 +1,61 @@
+from dataclasses import field
+from hungerlib.datamap import datamap, Syntax
+
+def yaml_key(path: str, default=None):
+    return field(default=default, metadata={"yaml_key": path})
+
+@datamap(syntax=Syntax.braces)
+class MessagesConfig:
+    prefix: str = yaml_key("prefix", "<aqua>[Server Watcher]")
+    bullet: str = yaml_key("bullet")
+
+    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
+
+    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!")
+
+    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")
+
+    pro_restart_splash: str = yaml_key("reasons.pro_splash")
+    anti_restart_splash: str = yaml_key("reasons.anti_splash")
+
+    reason_restart_soon: str = yaml_key("reasons.restart_soon")
+    reason_ram: str = yaml_key("reasons.ram")
+    reason_cpu: str = yaml_key("reasons.cpu")
+    reason_uptime: str = yaml_key("reasons.uptime")
+    reason_tps: str = yaml_key("reasons.tps")
+    reason_low_uptime: str = yaml_key("reasons.low_uptime")
+    reason_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")
+
+    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.8.dev11 → serverwatcher-5.8.dev13}/src/serverwatcher/configclasses/watcher.py

@@ -1,10 +1,12 @@
-from dataclasses import dataclass, field
+from dataclasses import field
+from hungerlib.datamap import datamap, Syntax
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@dataclass
+@datamap(syntax=Syntax.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.8.dev11 → serverwatcher-5.8.dev13}/src/serverwatcher/defaultconfigs/config.yaml

@@ -1,4 +1,3 @@
-watch_interval: 300
 timezone: 'America/Chicago'
 
 panel:

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

@@ -3,26 +3,8 @@ bullet: '-'
 
 broadcast_restart_at: '{prefix} The server will restart at {time} CDT.'
 
-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_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!'

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev13}/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.8.dev11 → serverwatcher-5.8.dev13}/src/serverwatcher/validator.py

@@ -50,8 +50,8 @@ def validate_dataclass(config_obj, schema, 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 watcher.watch_interval < 1:
+        errors.append(f"watch_interval: must be >= 1 (got {watcher.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})")

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev13}/src/serverwatcher/watcher.py

@@ -1,9 +1,9 @@
 import os
 import time
-import re
 from zoneinfo import ZoneInfo
 
-from hungerlib import Panel, MessageRouter
+from hungerlib import Panel, MessageRouter, mapit, set_default_maps
+from hungerlib.datamaps import ASCII_COLOR_MAP, MC_COLOR_MAP
 from hungerlib.servers import MinecraftServer, GenericServer
 from hungerlib.addons import (
     clearTerminal,
@@ -18,22 +18,10 @@ from hungerlib.addons import (
 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):
-    # evaluate inline expressions inside message templates
-    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):
@@ -55,6 +43,13 @@ class ServerWatcher:
             WatcherConfig
         )
 
+        set_default_maps(
+            ASCII_COLOR_MAP,
+            self.config,
+            self.messages,
+            self.watcherconfig
+        )
+
         self.panel = Panel(
             name=self.config.panel_name,
             url=self.config.panel_url,
@@ -78,40 +73,30 @@ class ServerWatcher:
             tpsCommand=self.config.tps_command,
         )
 
-        # formatted logger name
-        logger_name = self.config.logger_name.format(
-            server_name=self.config.server_name
-        )
-
-        # initialize message router
+        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,
+            formatter=self._fmt,
             console_backspaces=self.config.console_backspaces,
         )
 
-        # timezone for scheduling
         self.tz = ZoneInfo(self.config.timezone)
 
-    def fmt(self, template: str, **fmt):
-        simple = {
-            "prefix": self.messages.prefix,
-            "bullet": self.messages.bullet,
-        }
-        for key, value in simple.items():
-            template = template.replace(f"{{{key}}}", value)
-        return t_eval(template, self=self, **fmt)
-    
-    def say(self, template, level="info", **fmt):
+    def _fmt(self, template: str, **ctx):
+        return mapit(template, **ctx)
+
+    def say(self, template, level="info", **ctx):
         if not template:
             return
+        msg = mapit(template, **ctx)
         self.router.say(
-            template,
+            msg,
             level=level,
             log=self.config.enable_logging,
-            **fmt
+            **ctx
         )
 
     def shutdown(self):
@@ -119,16 +104,13 @@ class ServerWatcher:
         raise SystemExit
 
     def restart_and_wait(self):
-        # disable schedule if configured
         if self.watcherconfig.schedule_control:
             self.origin.disableSchedule(self.watcherconfig.restart_soon_id)
 
-        # send restart command
         self.server.restart()
         self.say(self.messages.restart_action_sent)
         time.sleep(self.watcherconfig.restart_wait_seconds)
 
-        # check server status
         self.say(self.messages.status_check, level="warn")
         alive = waitForOnline(
             self.server,
@@ -136,7 +118,6 @@ class ServerWatcher:
             interval=self.watcherconfig.restart_online_interval,
         )
 
-        # handle restart result
         if alive:
             self.say(self.messages.server_back_online)
             self.say(self.messages.server_back_online_broadcast, broadcast=True)
@@ -144,38 +125,32 @@ class ServerWatcher:
             self.say(self.messages.server_failed_restart, level="error")
 
     def schedule_restart(self, minutes):
-        # compute scheduled restart time
         info = snapSchedule(minimumMinutes=minutes)
         scheduled = info["scheduled"]
 
-        # format local time
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        # broadcast restart time
-        self.router.broadcast(self.fmt(self.messages.broadcast_restart_at, time=time_str))
+        self.router.broadcast(mapit(self.messages.broadcast_restart_at, time=time_str))
 
-        # build minute callbacks
         minute_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=self.fmt(getattr(self.messages, k)):
+                lambda msg=mapit(getattr(self.messages, k)):
                     self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("minute_")
         }
 
-        # build second callbacks
         second_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=self.fmt(getattr(self.messages, k)):
+                lambda msg=mapit(getattr(self.messages, k)):
                     self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("second_")
         }
 
-        # run countdown events
         runCountdownEvents(
             target_time=scheduled,
             minute_callbacks=minute_callbacks,
@@ -183,98 +158,78 @@ class ServerWatcher:
         )
 
     def evaluate(self):
-        # announce evaluation start
         self.say(self.messages.startup)
 
-        # validate panel and server
         if not validateAll(self.panel, self.server):
             self.say(self.messages.validation_fail, level="error")
             self.shutdown()
 
-        # refresh server state
         self.server.refresh()
         snap = Snapshot(self.server, 2, True)
 
-        # scoring variables
         pro = 0
         anti = 0
         restart_reasons = []
         no_restart_reasons = []
 
-        # check schedule flag
         if self.watcherconfig.schedule_control and self.server.getSchedule(self.watcherconfig.restart_soon_id)["is_active"]:
             restart_reasons.append(self.messages.reason_restart_soon)
             pro += self.watcherconfig.weight_restart_soon
 
-        # check RAM threshold
         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))
 
-        # check CPU threshold
         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
 
-        # check uptime threshold
         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
 
-        # check TPS threshold
         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
 
-        # check low uptime penalty
         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
 
-        # check player count penalty
         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
 
-        # output pro-restart reasons
         if restart_reasons:
             self.say(self.messages.pro_restart_splash, level="warn")
             for r in restart_reasons:
                 self.say(f"{self.messages.bullet} {r}", level="warn")
 
-        # output anti-restart reasons
         if no_restart_reasons:
             self.say(self.messages.anti_restart_splash, level="warn")
             for r in no_restart_reasons:
                 self.say(f"{self.messages.bullet} {r}", level="warn")
 
-        # output scores
         self.say(f"{self.messages.pro_restart_number} {pro}", level="warn")
         self.say(f"{self.messages.anti_restart_number} {anti}", level="warn")
 
-        # compute gap
         gap = abs(pro - anti)
 
-        # no restart case
         if pro == 0:
             self.say(self.messages.no_restart)
             return
 
-        # immediate restart case
         if pro > anti and snap.players == 0:
             self.say(self.messages.immediate_restart)
             self.restart_and_wait()
             return
 
-        # scheduled restart case
         self.say(self.messages.scheduled)
 
-        # choose schedule window
         if gap <= 2:
             self.say(self.messages.gap_low, level="warn", gap=gap)
             self.schedule_restart(self.watcherconfig.low_gap_minutes)
@@ -282,10 +237,8 @@ class ServerWatcher:
             self.say(self.messages.gap_high, level="warn", gap=gap)
             self.schedule_restart(self.watcherconfig.high_gap_minutes)
 
-        # perform restart
         self.restart_and_wait()
 
-    # main loop
     def run(self):
         if self.config.clear_terminal:
             clearTerminal()
@@ -293,4 +246,4 @@ class ServerWatcher:
             if self.config.clear_terminal:
                 clearTerminal()
             self.evaluate()
-            time.sleep(self.config.watch_interval)
+            time.sleep(self.watcher.watch_interval)

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

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

serverwatcher-5.8.dev11/src/serverwatcher/configclasses/messages.py

@@ -1,65 +0,0 @@
-from dataclasses import dataclass, field
-
-def yaml_key(path: str, default=None):
-    return field(default=default, metadata={"yaml_key": path})
-
-@dataclass
-class MessagesConfig:
-    prefix: str = yaml_key("prefix", default="<aqua>[Server Watcher]")
-    bullet: str = yaml_key("bullet")
-    
-    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
-
-    # minute messages
-    minute_120: str = yaml_key("broadcast_minutes.120", default="{prefix} Restart in 2 hours!")
-    minute_60: str = yaml_key("broadcast_minutes.60", default="{prefix} Restart in 1 hour!")
-    minute_45: str = yaml_key("broadcast_minutes.45", default="{prefix} Restart in 45 minutes!")
-    minute_30: str = yaml_key("broadcast_minutes.30", default="{prefix} Restart in 30 minutes!")
-    minute_15: str = yaml_key("broadcast_minutes.15", default="{prefix} Restart in 15 minutes!")
-    minute_5: str = yaml_key("broadcast_minutes.5", default="{prefix} Restart in 5 minutes!")
-    minute_1: str = yaml_key("broadcast_minutes.1", default="{prefix} Restart in 1 minute!")
-
-    # second messages
-    second_10: str = yaml_key("broadcast_seconds.10", default="{prefix} Restart in 10 seconds!")
-    second_9:  str = yaml_key("broadcast_seconds.9",  default="{prefix} Restart in 9 seconds!")
-    second_8:  str = yaml_key("broadcast_seconds.8",  default="{prefix} Restart in 8 seconds!")
-    second_7:  str = yaml_key("broadcast_seconds.7",  default="{prefix} Restart in 7 seconds!")
-    second_6:  str = yaml_key("broadcast_seconds.6",  default="{prefix} Restart in 6 seconds!")
-    second_5:  str = yaml_key("broadcast_seconds.5",  default="{prefix} Restart in 5 seconds!")
-    second_4:  str = yaml_key("broadcast_seconds.4",  default="{prefix} Restart in 4 seconds!")
-    second_3:  str = yaml_key("broadcast_seconds.3",  default="{prefix} Restart in 3 seconds!")
-    second_2:  str = yaml_key("broadcast_seconds.2",  default="{prefix} Restart in 2 seconds!")
-    second_1:  str = yaml_key("broadcast_seconds.1",  default="{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")
-    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_splash")
-    anti_restart_splash: str = yaml_key("reasons.anti_splash")
-
-    reason_restart_soon: str = yaml_key("reasons.restart_soon")
-    reason_ram: str = yaml_key("reasons.ram")
-    reason_cpu: str = yaml_key("reasons.cpu")
-    reason_uptime: str = yaml_key("reasons.uptime")
-    reason_tps: str = yaml_key("reasons.tps")
-    reason_low_uptime: str = yaml_key("reasons.low_uptime")
-    reason_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")