serverwatcher 5.8.1__tar.gz → 5.9__tar.gz

{serverwatcher-5.8.1/src/serverwatcher.egg-info → serverwatcher-5.9}/PKG-INFO

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

{serverwatcher-5.8.1 → serverwatcher-5.9}/pyproject.toml

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

serverwatcher-5.9/src/serverwatcher/__main__.py

@@ -0,0 +1,24 @@
+# serverwatcher/__main__.py
+
+import argparse
+from .watcher import ServerWatcher
+from serverwatcher.validator import validate_all
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--init", action="store_true")
+    args = parser.parse_args()
+
+    if args.init:
+        # Create default configs
+        from .initializer import initialize
+        initialize()
+        return
+
+    validate_all()
+    
+    watcher = ServerWatcher()
+    watcher.run()
+
+if __name__ == "__main__":
+    main()

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

@@ -0,0 +1,28 @@
+from hungerlib import datamap, datamap_api
+
+@datamap(syntax=datamap_api.braces, mode="config")
+class GlobalConfig:
+    timezone: str = "timezone"
+
+    panel_name: str = "panel.name"
+    panel_url: str = "panel.url"
+    panel_api_key: str = "panel.api_key"
+
+    origin_server_id: str = "origin.server_id"
+
+    server_name: str = "server.name"
+    server_id: str = "server.server_id"
+    server_domain: str = "server.domain"
+    server_port: int = "server.port"
+
+    tps_command: str = "server.tps_command"
+
+    bridge_token: str = "hungerbridge.token"
+    bridge_url: str = "hungerbridge.url"
+    bridge_port: int = "hungerbridge.port"
+
+    enable_logging: bool = "logger.enabled"
+    logger_name: str = "logger.name"
+    log_path: str = "logger.log_path"
+
+    clear_terminal: bool = "terminal.enable_clearing"

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

@@ -0,0 +1,56 @@
+from hungerlib import datamap, datamap_api
+
+@datamap(syntax=datamap_api.braces, mode="config")
+class MessagesConfig:
+    prefix: str = "prefix"
+    bullet: str = "bullet"
+
+    broadcast_restart_at: str = "broadcast_restart_at"
+
+    minute_120: str = "broadcast_minutes.120"
+    minute_60: str = "broadcast_minutes.60"
+    minute_45: str = "broadcast_minutes.45"
+    minute_30: str = "broadcast_minutes.30"
+    minute_15: str = "broadcast_minutes.15"
+    minute_5:  str = "broadcast_minutes.5"
+    minute_1:  str = "broadcast_minutes.1"
+
+    second_10: str = "broadcast_seconds.10"
+    second_9:  str = "broadcast_seconds.9"
+    second_8:  str = "broadcast_seconds.8"
+    second_7:  str = "broadcast_seconds.7"
+    second_6:  str = "broadcast_seconds.6"
+    second_5:  str = "broadcast_seconds.5"
+    second_4:  str = "broadcast_seconds.4"
+    second_3:  str = "broadcast_seconds.3"
+    second_2:  str = "broadcast_seconds.2"
+    second_1:  str = "broadcast_seconds.1"
+
+    status_check: str = "logging.status_check"
+    validation_fail: str = "logging.validation_fail"
+    validation_ok: str = "logging.validation_ok"
+    shutdown: str = "logging.shutdown"
+    immediate_restart: str = "logging.immediate_restart"
+    no_restart: str = "logging.no_restart"
+    scheduled: str = "logging.scheduled"
+    gap_low: str = "logging.gap_low"
+    gap_high: str = "logging.gap_high"
+
+    pro_restart_splash: str = "reasons.pro_splash"
+    anti_restart_splash: str = "reasons.anti_splash"
+
+    reason_restart_soon: str = "reasons.restart_soon"
+    reason_ram: str = "reasons.ram"
+    reason_cpu: str = "reasons.cpu"
+    reason_uptime: str = "reasons.uptime"
+    reason_tps: str = "reasons.tps"
+    reason_low_uptime: str = "reasons.low_uptime"
+    reason_players: str = "reasons.players"
+
+    pro_restart_number: str = "reasons.pro_restart_number"
+    anti_restart_number: str = "reasons.anti_restart_number"
+
+    restart_action_sent: str = "restarts.restart_action_sent"
+    server_back_online: str = "restarts.back_online"
+    server_back_online_broadcast: str = "restarts.back_online_broadcast"
+    server_failed_restart: str = "restarts.failed_restart"

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

@@ -0,0 +1,28 @@
+from hungerlib import datamap, datamap_api
+
+@datamap(syntax=datamap_api.braces, mode="config")
+class WatcherConfig:
+    watch_interval: int = "watch_interval"
+    schedule_control: bool = "schedule_control.enabled"
+    restart_soon_id: int = "schedule_control.restart_soon_id"
+
+    threshold_ram: int = "thresholds.ram"
+    threshold_cpu: int = "thresholds.cpu"
+    threshold_uptime: int = "thresholds.uptime"
+    threshold_tps: float = "thresholds.tps"
+
+    weight_restart_soon: int = "weights.restart_soon"
+    weight_ram: int = "weights.ram"
+    weight_cpu: int = "weights.cpu"
+    weight_uptime: int = "weights.uptime"
+    weight_tps: int = "weights.tps"
+
+    weight_low_uptime: int = "weights.low_uptime"
+    weight_per_player: int = "weights.per_player"
+
+    low_gap_minutes: int = "gaps.low_gap_minutes"
+    high_gap_minutes: int = "gaps.high_gap_minutes"
+
+    restart_wait_seconds: int = "restart.wait_seconds"
+    restart_timeout: int = "restart.online_timeout"
+    restart_online_interval: int = "restart.online_interval"

{serverwatcher-5.8.1 → serverwatcher-5.9}/src/serverwatcher/defaultconfigs/config.yaml

@@ -13,15 +13,17 @@ server:
   server_id: 'CHANGE_ME'
   domain: 'mc.example.com'
   port: 25565
-  rcon_port: 25575
-  rcon_password: 'password'
   tps_command: 'ticks'
 
+hungerbridge:
+  token: 'CHANGE_ME'
+  url: 'http://example.com'
+  port: 1913
+
 logger:
   enabled: True
   name: 'Server Watcher'
   log_path: '/home/container/logs/'
 
 terminal:
-  backspaces: 8
   enable_clearing: True

{serverwatcher-5.8.1 → serverwatcher-5.9}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -7,7 +7,6 @@ broadcast_minutes: {}
 broadcast_seconds: {}
 
 logging:
-  startup: 'ServerWatcher is running!'
   status_check: 'Checking server status...'
   validation_fail: 'Validation FAILED.'
   validation_ok: 'All validation checks succeeded.'

{serverwatcher-5.8.1 → serverwatcher-5.9}/src/serverwatcher/validator.py

@@ -47,8 +47,8 @@ def validate_global_config(config, errors):
     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})")
+    if config.bridge_port <= 0 or config.rcon_port > 65535:
+        errors.append(f"bridge_port: must be 1–65535 (got {config.bridge_port})")
 
 def validate_watcher_config(watcherconfig, errors):
     if watcherconfig.restart_wait_seconds < 1:

{serverwatcher-5.8.1 → serverwatcher-5.9}/src/serverwatcher/watcher.py

@@ -7,9 +7,7 @@ from hungerlib import servers, MessageRouter, loadConfig, utils, datamap_api, ma
 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()
 
 
 class ServerWatcher:
@@ -57,8 +55,8 @@ class ServerWatcher:
             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,
+            bridge_url=self.config.bridge_url.rstrip("/") + ":" + self.config.bridge_port,
+            bridge_token=self.config.bridge_token,
             tpsCommand=self.config.tps_command,
         )
 
@@ -69,7 +67,6 @@ class ServerWatcher:
             server=self.server,
             log_path=self.config.log_path,
             formatter=self._fmt,
-            console_backspaces=self.config.console_backspaces,
         )
 
         self.tz = ZoneInfo(self.config.timezone)
@@ -77,17 +74,29 @@ class ServerWatcher:
     def _fmt(self, template: str, **ctx):
         return mapit(template, **ctx)
 
-    def say(self, template, level="info", **ctx):
+    def say(self, template, level="info", only_maps=None, disable=None, enable=None, **ctx):
         if not template:
             return
-        msg = mapit(template, **ctx)
+
+        msg = mapit(
+            template,
+            only_maps=only_maps,
+            disable=disable,
+            enable=enable,
+        )
+
         self.router.say(
             msg,
             level=level,
             log=self.config.enable_logging,
-            **ctx
         )
 
+    def say_mc(self, template, level="info", only_maps=None, disable=None, enable=None, **ctx):
+        disable = (disable or []) + [utils.ASCII_COLOR_MAP]
+        enable = (enable or []) + [utils.MC_COLOR_MAP]
+        msg = mapit(template, only_maps=only_maps, disable=disable, enable=enable, **ctx)
+        self.router.broadcast(msg)
+
     def shutdown(self):
         self.say(self.messages.shutdown)
         raise SystemExit
@@ -109,7 +118,7 @@ class ServerWatcher:
 
         if alive:
             self.say(self.messages.server_back_online)
-            self.say(self.messages.server_back_online_broadcast, broadcast=True)
+            self.say_mc(self.messages.server_back_online_broadcast)
         else:
             self.say(self.messages.server_failed_restart, level="error")
 
@@ -120,12 +129,12 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        self.router.broadcast(mapit(self.messages.broadcast_restart_at, time=time_str))
+        self.say_mc(self.messages.broadcast_restart_at, time=time_str)
 
         minute_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=mapit(getattr(self.messages, k)):
-                    self.router.broadcast(msg)
+                    self.say_mc(msg)
             )
             for k in vars(self.messages)
             if k.startswith("minute_")
@@ -134,20 +143,20 @@ class ServerWatcher:
         second_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=mapit(getattr(self.messages, k)):
-                    self.router.broadcast(msg)
+                    self.say_mc(msg)
             )
             for k in vars(self.messages)
             if k.startswith("second_")
         }
 
-        runCountdownEvents(
+        utils.runCountdownEvents(
             target_time=scheduled,
             minute_callbacks=minute_callbacks,
             second_callbacks=second_callbacks,
         )
 
     def evaluate(self):
-        self.say(self.messages.startup)
+        self.say("ServerWatcher is running!")
 
         if not utils.validateAll(self.panel, self.server):
             self.say(self.messages.validation_fail, level="error")

{serverwatcher-5.8.1 → serverwatcher-5.9/src/serverwatcher.egg-info}/PKG-INFO

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

{serverwatcher-5.8.1 → serverwatcher-5.9}/src/serverwatcher.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 src/serverwatcher/__init__.py
+src/serverwatcher/__main__.py
 src/serverwatcher/validator.py
 src/serverwatcher/watcher.py
 src/serverwatcher.egg-info/PKG-INFO

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

@@ -1,31 +0,0 @@
-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})
-
-@datamap(syntax=datamap_api.braces)
-class GlobalConfig:
-    timezone: str = yaml_key("timezone")
-
-    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")
-
-    console_backspaces: int = yaml_key("terminal.backspaces")
-    clear_terminal: bool = yaml_key("terminal.enable_clearing")

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

@@ -1,61 +0,0 @@
-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})
-
-@datamap(syntax=datamap_api.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.1/src/serverwatcher/configclasses/watcher.py

@@ -1,32 +0,0 @@
-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})
-
-@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")
-
-    threshold_ram: int = yaml_key("thresholds.ram")
-    threshold_cpu: int = yaml_key("thresholds.cpu")
-    threshold_uptime: int = yaml_key("thresholds.uptime")
-    threshold_tps: float = yaml_key("thresholds.tps")
-
-    weight_restart_soon: int = yaml_key("weights.restart_soon")
-    weight_ram: int = yaml_key("weights.ram")
-    weight_cpu: int = yaml_key("weights.cpu")
-    weight_uptime: int = yaml_key("weights.uptime")
-    weight_tps: int = yaml_key("weights.tps")
-
-    weight_low_uptime: int = yaml_key("weights.low_uptime")
-    weight_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")