serverwatcher 2.1.2__tar.gz → 2.2.3__tar.gz

{serverwatcher-2.1.2/src/serverwatcher.egg-info → serverwatcher-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 2.1.2
+Version: 2.2.3
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: MIT

{serverwatcher-2.1.2 → serverwatcher-2.2.3}/pyproject.toml

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

{serverwatcher-2.1.2 → serverwatcher-2.2.3}/src/serverwatcher/messages.py

@@ -18,7 +18,8 @@ class WatcherMessages:
     })
 
     broadcast_second: dict = field(default_factory=lambda: {
-        s: "{prefix} Restart in " + str(s) + " seconds!" for s in range(10, 0, -1)
+        s: "{prefix} Restart in " + str(s) + " seconds!"
+        for s in range(10, 0, -1)
     })
 
     # log messages

{serverwatcher-2.1.2 → serverwatcher-2.2.3}/src/serverwatcher/watcher.py

@@ -1,23 +1,90 @@
 import time
 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
+    runCountdownEvents,
 )
+from hungerlib.addons import configloader
+
+from .config import WatcherConfig
+from .messages import WatcherMessages
+
+
+DEFAULT_CONFIG = {
+    "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": "example.com",
+        "port": 25565,
+        "rcon_port": 25575,
+        "rcon_password": "password",
+        "tps_command": "ticks",
+    },
+    "watcher": {},
+    "messages": {},
+}
 
 
 class ServerWatcher:
-    def __init__(self, server, origin, panel, logger, config, messages):
-        self.server = server
-        self.origin = origin
-        self.panel = panel
-        self.log = logger
-        self.cfg = config
-        self.msg = messages
+    def __init__(self, config_path: str = "config.yaml"):
+        # ensure config exists, then load it
+        ensure_yaml(config_path, DEFAULT_CONFIG)
+        raw = load_yaml(config_path)
+
+        # map watcher + messages sections into your dataclasses
+        self.cfg: WatcherConfig = map_to_dataclass(raw.get("watcher", {}), WatcherConfig)
+        self.msg: WatcherMessages = map_to_dataclass(
+            raw.get("messages", {}), WatcherMessages
+        )
+
+        # panel / origin / server wiring from YAML
+        p = raw["panel"]
+        self.panel = Panel(
+            name=p["name"],
+            url=p["url"],
+            api_key=p["api_key"],
+        )
+
+        o = raw["origin"]
+        self.origin = GenericServer(
+            name="Origin",
+            panel=self.panel,
+            server_id=o["server_id"],
+        )
+
+        s = raw["server"]
+        self.server = MinecraftServer(
+            name=s["name"],
+            panel=self.panel,
+            server_id=s["server_id"],
+            server_domain=s["domain"],
+            server_port=s["port"],
+            rcon_port=s["rcon_port"],
+            rcon_password=s["rcon_password"],
+            tpsCommand=s["tps_command"],
+        )
+
+        self.log = HungerLogger(
+            name=f"ServerWatcher-{s['name']}",
+            server=self.server,
+            log_path="/home/container/logs/",
+            console_backspaces=8,
+        )
 
     def fmt(self, template: str, **kwargs):
         return template.format(prefix=self.msg.prefix, **kwargs)
@@ -36,12 +103,12 @@ class ServerWatcher:
         alive = waitForOnline(
             self.server,
             timeout=self.cfg.restart_online_timeout,
-            interval=self.cfg.restart_online_interval
+            interval=self.cfg.restart_online_interval,
         )
 
         if alive:
             self.log.info("Server is back online!")
-            self.server.sendBroadcast(f'{self.msg.prefix}<green>Restart successful!')
+            self.server.sendBroadcast(f"{self.msg.prefix}<green>Restart successful!")
             self.origin.enableSchedule(self.cfg.origin_disable_schedule_id)
         else:
             self.log.error("Server failed to restart!")
@@ -58,21 +125,19 @@ class ServerWatcher:
         )
 
         minute_callbacks = {
-            m: (lambda msg=self.fmt(self.msg.broadcast_minute[m]):
-                self.server.sendBroadcast(msg))
+            m: (lambda msg=self.fmt(self.msg.broadcast_minute[m]): self.server.sendBroadcast(msg))
             for m in self.msg.broadcast_minute
         }
 
         second_callbacks = {
-            s: (lambda msg=self.fmt(self.msg.broadcast_second[s]):
-                self.server.sendBroadcast(msg))
+            s: (lambda msg=self.fmt(self.msg.broadcast_second[s]): self.server.sendBroadcast(msg))
             for s in self.msg.broadcast_second
         }
 
         runCountdownEvents(
             target_time=scheduled,
             minute_callbacks=minute_callbacks,
-            second_callbacks=second_callbacks
+            second_callbacks=second_callbacks,
         )
 
     def evaluate(self):
@@ -97,32 +162,51 @@ class ServerWatcher:
 
         if snap.ram >= self.cfg.ram_threshold:
             restart_reasons.append(
-                self.fmt(self.msg.reason_ram, ram=snap.ram, threshold=self.cfg.ram_threshold)
+                self.fmt(
+                    self.msg.reason_ram,
+                    ram=snap.ram,
+                    threshold=self.cfg.ram_threshold,
+                )
             )
             pro += round(snap.ram, 0) - 5
 
         if snap.cpu >= self.cfg.cpu_threshold:
             restart_reasons.append(
-                self.fmt(self.msg.reason_cpu, cpu=snap.cpu, threshold=self.cfg.cpu_threshold)
+                self.fmt(
+                    self.msg.reason_cpu,
+                    cpu=snap.cpu,
+                    threshold=self.cfg.cpu_threshold,
+                )
             )
             pro += self.cfg.weight_cpu
 
         if snap.uptime // 3600 >= self.cfg.uptime_hours_threshold:
             restart_reasons.append(
-                self.fmt(self.msg.reason_uptime, uptime=snap.uptime_formatted, threshold=self.cfg.uptime_hours_threshold)
+                self.fmt(
+                    self.msg.reason_uptime,
+                    uptime=snap.uptime_formatted,
+                    threshold=self.cfg.uptime_hours_threshold,
+                )
             )
             pro += self.cfg.weight_uptime
 
         if snap.tps <= self.cfg.tps_threshold:
             restart_reasons.append(
-                self.fmt(self.msg.reason_tps, tps=snap.tps, threshold=self.cfg.tps_threshold)
+                self.fmt(
+                    self.msg.reason_tps,
+                    tps=snap.tps,
+                    threshold=self.cfg.tps_threshold,
+                )
             )
             pro += self.cfg.weight_tps
 
         # ANTI-RESTART
         if snap.uptime // 60 < 30:
             no_restart_reasons.append(
-                self.fmt(self.msg.reason_low_uptime, uptime=snap.uptime_formatted)
+                self.fmt(
+                    self.msg.reason_low_uptime,
+                    uptime=snap.uptime_formatted,
+                )
             )
             anti += self.cfg.weight_low_uptime
 
@@ -130,7 +214,12 @@ class ServerWatcher:
             verb = "are" if snap.players != 1 else "is"
             plural = "players" if snap.players != 1 else "player"
             no_restart_reasons.append(
-                self.fmt(self.msg.reason_players, verb=verb, count=snap.players, plural=plural)
+                self.fmt(
+                    self.msg.reason_players,
+                    verb=verb,
+                    count=snap.players,
+                    plural=plural,
+                )
             )
             anti += snap.players * self.cfg.weight_per_player
 
@@ -164,3 +253,9 @@ class ServerWatcher:
             self.schedule_restart(self.cfg.high_gap_minutes)
 
         self.restart_and_wait()
+
+    def run(self):
+        clearTerminal()
+        while True:
+            self.evaluate()
+            time.sleep(60)

{serverwatcher-2.1.2 → serverwatcher-2.2.3/src/serverwatcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 2.1.2
+Version: 2.2.3
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: MIT