serverwatcher 5.18__tar.gz → 5.20__tar.gz

{serverwatcher-5.18/src/serverwatcher.egg-info → serverwatcher-5.20}/PKG-INFO

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

{serverwatcher-5.18 → serverwatcher-5.20}/pyproject.toml

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

{serverwatcher-5.18 → serverwatcher-5.20}/src/serverwatcher/configclasses/config.py

@@ -11,8 +11,6 @@ class GlobalConfig:
     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'
@@ -32,6 +30,7 @@ class GlobalConfig:
     error_prefix: str = 'logger.prefixes.error'
 
     clear_terminal: bool = 'terminal.enable_clearing'
+    handle_keyboard_interrupt: bool = 'terminal.handle_keyboard_interrupt'
 
 
 class fallbacks:
@@ -41,8 +40,6 @@ class fallbacks:
     panel_url = 'https://example.com'
     panel_api_key = 'CHANGE_ME'
 
-    origin_server_id = 'CHANGE_ME'
-
     server_name = 'My SMP'
     server_id = 'CHANGE_ME'
     server_domain = 'mc.example.com'
@@ -62,3 +59,4 @@ class fallbacks:
     error_prefix = '<red>[ERROR]: '
 
     clear_terminal = True
+    handle_keyboard_interrupt = True

{serverwatcher-5.18 → serverwatcher-5.20}/src/serverwatcher/configclasses/watcher.py

@@ -14,6 +14,8 @@ class WatcherConfig:
     threshold_cpu: int = 'thresholds.cpu'
     threshold_uptime: int = 'thresholds.uptime'
     threshold_tps: float = 'thresholds.tps'
+    threshold_min_uptime: int = 'thresholds.min_uptime'
+    threshold_low_gap: int = 'thresholds.low_gap'
 
     weight_restart_soon: int = 'weights.restart_soon'
     weight_ram: int = 'weights.ram'
@@ -27,6 +29,8 @@ class WatcherConfig:
     low_gap_minutes: int = 'gaps.low_gap_minutes'
     high_gap_minutes: int = 'gaps.high_gap_minutes'
 
+    snap_minutes: list = 'snap_minutes'
+
     restart_wait_seconds: int = 'restart.wait_seconds'
     restart_timeout: int = 'restart.online_timeout'
     restart_online_interval: int = 'restart.online_interval'
@@ -42,6 +46,8 @@ class fallbacks:
     threshold_cpu = 150
     threshold_uptime = 12
     threshold_tps = 19.5
+    threshold_min_uptime = 30
+    threshold_low_gap = 2
 
     weight_restart_soon = 3
     weight_ram = 1
@@ -55,6 +61,8 @@ class fallbacks:
     low_gap_minutes = 120
     high_gap_minutes = 60
 
+    snap_minutes = [0, 30]
+
     restart_wait_seconds = 30
     restart_timeout = 120
     restart_online_interval = 2

{serverwatcher-5.18 → serverwatcher-5.20}/src/serverwatcher/defaultconfigs/config.yaml

@@ -5,9 +5,6 @@ panel:
   url: 'https://example.com'
   api_key: 'CHANGE_ME'
 
-origin:
-  server_id: 'CHANGE_ME'
-
 server:
   name: 'My SMP'
   server_id: 'CHANGE_ME'
@@ -30,4 +27,5 @@ logger:
     error: "<red>[%hh%:%mm%:%ss%] [ERROR]: "
 
 terminal:
-  enable_clearing: True
+  enable_clearing: True
+  handle_keyboard_interrupt: True

{serverwatcher-5.18 → serverwatcher-5.20}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,4 +1,4 @@
-watch_interval: 300
+watch_interval: 300      # in seconds
 
 schedule_control:
   enabled: False
@@ -9,6 +9,8 @@ thresholds:
   cpu: 150
   uptime: 12
   tps: 19.5
+  min_uptime: 30         # will not restart the server if the total uptime is less than 30 minutes
+  low_gap: 2
 
 weights:
   restart_soon: 3
@@ -23,6 +25,8 @@ gaps:
   low_gap_minutes: 120
   high_gap_minutes: 60
 
+snap_minutes: [0, 30]    # will snap the scheduled time to the nearest hour or half hour
+
 restart:
   wait_seconds: 30
   online_timeout: 120

{serverwatcher-5.18 → serverwatcher-5.20}/src/serverwatcher/validator.py

@@ -50,12 +50,15 @@ def validate_global_config(config, errors):
     if config.bridge_port <= 0 or config.bridge_port > 65535:
         errors.append(f'bridge_port: must be 1–65535 (got {config.bridge_port})')
 
+    if len(config.bridge_token) < 8:
+        errors.append(f'bridge_token: must be 8 or more characters (got {config.bridge_token}, {len(config.bridge_token)} characters)')
+
 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})')
+        errors.append(f'restart_wait_seconds: must be > 0 (got {watcherconfig.restart_wait_seconds})')
 
     if watcherconfig.threshold_cpu <= 0:
-        errors.append(f'threshold_cpu: must not be less than 1 (got {watcherconfig.threshold_cpu})')
+        errors.append(f'threshold_cpu: must be > 0 (got {watcherconfig.threshold_cpu})')
 
     if watcherconfig.threshold_ram <= 0:
         errors.append(f'threshold_ram: must be > 0 (got {watcherconfig.threshold_ram})')
@@ -80,9 +83,6 @@ def ensure_no_global_defaults(config, defaults):
     if config.panel_api_key == fb.panel_api_key:
         defaults.append('panel_api_key')
 
-    if config.origin_server_id == fb.origin_server_id:
-        defaults.append('origin_server_id')
-
     if config.server_id == fb.server_id:
         defaults.append('server_id')
 

{serverwatcher-5.18 → serverwatcher-5.20}/src/serverwatcher/watcher.py

@@ -93,7 +93,7 @@ class ServerWatcher:
             self.router.error(self.messages.server_failed_restart)
 
     def schedule_restart(self, minutes):
-        info = utils.snapSchedule(minimumMinutes=minutes)
+        info = utils.snapSchedule(minimumMinutes=minutes, snapMinutes=tuple(sorted(self.watcherconfig.snap_minutes)))
         scheduled = info["scheduled"]
 
         local_time = scheduled.astimezone(self.tz)
@@ -104,7 +104,8 @@ class ServerWatcher:
         minute_callbacks = {
             int(k.split("_")[1]): (
                 lambda raw=self.messages.as_map()[k]:
-                    self.router.broadcast(mapit(raw))
+                    self.router.broadcast(mapit(raw)),
+                    self.router.origin(raw)
             )
             for k in self.messages.as_map()
             if k.startswith("minute_")
@@ -113,17 +114,14 @@ class ServerWatcher:
         second_callbacks = {
             int(k.split("_")[1]): (
                 lambda raw=self.messages.as_map()[k]:
-                    self.router.broadcast(mapit(raw))
+                    self.router.broadcast(mapit(raw)),
+                    self.router.origin(raw)
             )
             for k in self.messages.as_map()
             if k.startswith("second_")
         }
 
-        utils.runCountdownEvents(
-            target_time=scheduled,
-            minute_callbacks=minute_callbacks,
-            second_callbacks=second_callbacks,
-        )
+        utils.runCountdownEvents(target_time=scheduled, minute_callbacks=minute_callbacks, second_callbacks=second_callbacks)
 
     def evaluate(self):
         # Lets Pterodactyl know the server is online, then clears terminal and uses user-defined startup key
@@ -167,7 +165,7 @@ class ServerWatcher:
             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:
+        if snap.uptime // 60 < self.watcherconfig.threshold_min_uptime:
             no_restart_reasons.append(mapit(self.messages.reason_low_uptime, uptime=snap.uptime_formatted))
             anti += self.watcherconfig.weight_low_uptime
 
@@ -203,7 +201,7 @@ class ServerWatcher:
 
         self.router.info(self.messages.scheduled)
 
-        if gap <= 2:
+        if gap <= self.watcherconfig.threshold_low_gap:
             self.router.warn(self.messages.gap_low, gap=gap)
             self.schedule_restart(self.watcherconfig.low_gap_minutes)
         else:
@@ -213,10 +211,18 @@ class ServerWatcher:
         self.restart_and_wait()
 
     def run(self):
-        if self.config.clear_terminal:
-            utils.clearTerminal()
-        while True:
-            if self.config.clear_terminal:
-                utils.clearTerminal()
-            self.evaluate()
-            time.sleep(self.watcherconfig.watch_interval)
+        if self.config.handle_keyboard_interrupt:
+            try:
+                while True:
+                    if self.config.clear_terminal:
+                        utils.clearTerminal()
+                    self.evaluate()
+                    time.sleep(self.watcherconfig.watch_interval)
+            except KeyboardInterrupt:
+                self.shutdown()
+        else:
+            while True:
+                if self.config.clear_terminal:
+                    utils.clearTerminal()
+                self.evaluate()
+                time.sleep(self.watcherconfig.watch_interval)

{serverwatcher-5.18 → serverwatcher-5.20/src/serverwatcher.egg-info}/PKG-INFO

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