serverwatcher 3.8.4__tar.gz → 3.9.1__tar.gz

{serverwatcher-3.8.4/src/serverwatcher.egg-info → serverwatcher-3.9.1}/PKG-INFO

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

{serverwatcher-3.8.4 → serverwatcher-3.9.1}/pyproject.toml

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

{serverwatcher-3.8.4 → serverwatcher-3.9.1}/src/serverwatcher/watcher.py

@@ -11,36 +11,24 @@ from hungerlib.addons import (
     waitForOnline,
     validateAll,
     runCountdownEvents,
-    load_yaml,
-    map_to_dataclass,
 )
-
-from serverwatcher.config import GlobalConfig, MessagesConfig, WatcherConfig
-from serverwatcher.helpers import load_or_default
+from hungerlib.addons.configmap import load_or_default
 
 # Set directory
 BASE_DIR = os.getcwd()
-PACKAGE_DIR = os.path.dirname(__file__)   
+PACKAGE_DIR = os.path.dirname(__file__)
 
 
-# Main watcher
 class ServerWatcher:
     def __init__(self):
-        self.global_cfg: GlobalConfig = load_or_default(
-            "config/global.yaml",
-            "defaultconfigs/global.yaml",
-            GlobalConfig
-        )
-        self.messages: MessagesConfig = load_or_default(
-            "config/messages.yaml",
-            "defaultconfigs/messages.yaml",
-            MessagesConfig
-        )
-        self.cfg: WatcherConfig = load_or_default(
-            "config/watcher.yaml",
-            "defaultconfigs/watcher.yaml",
-            WatcherConfig
-        )
+        # Load all configs in /config using configmap
+        cfgmap = load_or_default("config", skip_files=[])
+
+        self.global_cfg = cfgmap["global.yaml"]
+        self.messages   = cfgmap["messages.yaml"]
+        self.cfg        = cfgmap["watcher.yaml"]
+
+
         self.panel = Panel(
             name=self.global_cfg.panel_name,
             url=self.global_cfg.panel_url,

{serverwatcher-3.8.4 → serverwatcher-3.9.1/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-3.9.1/src/serverwatcher.egg-info/SOURCES.txt

@@ -0,0 +1,14 @@
+LICENSE
+README.md
+pyproject.toml
+src/serverwatcher/__init__.py
+src/serverwatcher/watcher.py
+src/serverwatcher.egg-info/PKG-INFO
+src/serverwatcher.egg-info/SOURCES.txt
+src/serverwatcher.egg-info/dependency_links.txt
+src/serverwatcher.egg-info/requires.txt
+src/serverwatcher.egg-info/top_level.txt
+src/serverwatcher/configmap/configclasses/__init__.py
+src/serverwatcher/configmap/configclasses/global_config.py
+src/serverwatcher/configmap/configclasses/messages.py
+src/serverwatcher/configmap/configclasses/watcher.py

serverwatcher-3.8.4/src/serverwatcher/defaultconfigs/global.yaml

@@ -1,16 +0,0 @@
-panel:
-  panel_name: My Panel
-  panel_url: https://example.com
-  panel_api_key: CHANGE_ME
-
-origin:
-  origin_server_id: CHANGE_ME
-
-server:
-  server_name: My SMP
-  server_id: CHANGE_ME
-  server_domain: mc.example.com
-  server_port: 25565
-  rcon_port: 25575
-  rcon_password: password
-  tps_command: ticks

serverwatcher-3.8.4/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,51 +0,0 @@
-prefix: "<aqua>[Server Watcher]"
-
-broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
-
-broadcast_minute:
-  minute_120: "{prefix} Restart in 2 hours!"
-  minute_60: "{prefix} Restart in 1 hour!"
-  minute_45: "{prefix} Restart in 45 minutes!"
-  minute_30: "{prefix} Restart in 30 minutes!"
-  minute_15: "{prefix} Restart in 15 minutes!"
-  minute_5: "{prefix} Restart in 5 minutes!"
-  minute_1: "{prefix} Restart in 1 minute!"
-
-broadcast_second:
-  second_10: "{prefix} Restart in 10 seconds!"
-  second_9: "{prefix} Restart in 9 seconds!"
-  second_8: "{prefix} Restart in 8 seconds!"
-  second_7: "{prefix} Restart in 7 seconds!"
-  second_6: "{prefix} Restart in 6 seconds!"
-  second_5: "{prefix} Restart in 5 seconds!"
-  second_4: "{prefix} Restart in 4 seconds!"
-  second_3: "{prefix} Restart in 3 seconds!"
-  second_2: "{prefix} Restart in 2 seconds!"
-  second_1: "{prefix} Restart in 1 second!"
-
-logging:
-  log_start: "ServerWatcher is running!"
-  log_status_check: "Checking server status..."
-  log_validation_fail: "Validation FAILED."
-  log_validation_ok: "All validation checks succeeded."
-  log_shutdown: "Shutting down ServerWatcher."
-  log_immediate_restart: "Restarting immediately."
-  log_no_restart: "The server does not need to restart."
-  log_scheduled: "Restart needed, but anti-restart factors outweigh it."
-  log_gap_low: "Gap {gap}. Scheduling restart in 2 hours."
-  log_gap_high: "Gap {gap}. Scheduling restart in 1 hour."
-
-reasons:
-  reason_restart_soon: "The server is set to restart soon"
-  reason_ram: "RAM usage ({ram}) is higher than {threshold} GB"
-  reason_cpu: "CPU usage ({cpu}) is higher than {threshold}%"
-  reason_uptime: "Uptime {uptime} exceeds {threshold}h"
-  reason_tps: "TPS {tps} is lower than {threshold}"
-  reason_low_uptime: "Uptime {uptime} is shorter than 30m"
-  reason_players: "There {verb} {count} {plural} online"
-
-restarts:
-  restart_action_sent: "Restart action sent. Waiting..."
-  server_back_online: "Server is back online!"
-  server_back_online_broadcast: "{prefix} <green>Restart successful!"
-  server_failed_restart: "Server failed to restart!"

serverwatcher-3.8.4/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,39 +0,0 @@
-logging:
-  logger_name_template: "Server Watcher"
-  log_path: "/home/container/logs/"
-  timezone: "America/Chicago"
-
-terminal_settings:
-  console_backspaces: 8
-  clear_terminal: True
-
-schedules:
-  restart_soon_schedule_id: 0     # replace this with real schedule id
-  origin_disable_schedule_id: 0   # replace this with real schedule id
-
-thresolds:
-  ram_threshold: 6
-  cpu_threshold: 150
-  uptime_hours_threshold: 12
-  tps_threshold: 19.5
-
-weights:
-  weight_restart_soon: 3
-  weight_ram: 1
-  weight_cpu: 1
-  weight_uptime: 1
-  weight_tps: 1
-  weight_low_uptime: 5
-  weight_per_player: 1
-
-gaps:
-  low_gap_minutes: 120
-  high_gap_minutes: 60
-
-restart_intervals:
-  restart_wait_seconds: 45
-  restart_online_timeout: 120
-  restart_online_interval: 2
-
-watcher_intervals:
-  watch_interval: 60 

serverwatcher-3.8.4/src/serverwatcher/helpers/__init__.py

@@ -1,5 +0,0 @@
-from .loadconfigs import load_or_default
-
-__all__ = [
-    'load_or_default',
-]

serverwatcher-3.8.4/src/serverwatcher/helpers/loadconfigs.py

@@ -1,15 +0,0 @@
-import os
-
-def load_or_default(path: str, default_path: str, schema):
-
-    abs_path = os.path.join(BASE_DIR, path)
-    abs_default = os.path.join(PACKAGE_DIR, default_path)
-
-    if not os.path.exists(abs_path):
-        os.makedirs(os.path.dirname(abs_path), exist_ok=True)
-        with open(abs_default, "r") as src, open(abs_path, "w") as dst:
-            dst.write(src.read())
-
-    raw = load_yaml(abs_path)
-    raw = flatten_nested(raw)
-    return map_to_dataclass(raw, schema)

serverwatcher-3.8.4/src/serverwatcher.egg-info/SOURCES.txt

@@ -1,19 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-src/serverwatcher/__init__.py
-src/serverwatcher/watcher.py
-src/serverwatcher.egg-info/PKG-INFO
-src/serverwatcher.egg-info/SOURCES.txt
-src/serverwatcher.egg-info/dependency_links.txt
-src/serverwatcher.egg-info/requires.txt
-src/serverwatcher.egg-info/top_level.txt
-src/serverwatcher/config/__init__.py
-src/serverwatcher/config/global_config.py
-src/serverwatcher/config/messages.py
-src/serverwatcher/config/watcher.py
-src/serverwatcher/defaultconfigs/global.yaml
-src/serverwatcher/defaultconfigs/messages.yaml
-src/serverwatcher/defaultconfigs/watcher.yaml
-src/serverwatcher/helpers/__init__.py
-src/serverwatcher/helpers/loadconfigs.py