serverwatcher 5.9.dev13__tar.gz → 5.9.dev15__tar.gz

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

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

{serverwatcher-5.9.dev13 → serverwatcher-5.9.dev15}/pyproject.toml

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

serverwatcher-5.9.dev15/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.dev13 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/config.py

@@ -15,13 +15,14 @@ class GlobalConfig:
     server_domain: str = "server.domain"
     server_port: int = "server.port"
 
-    rcon_port: int = "server.rcon_port"
-    rcon_password: str = "server.rcon_password"
     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"
 
-    console_backspaces: int = "terminal.backspaces"
     clear_terminal: bool = "terminal.enable_clearing"

{serverwatcher-5.9.dev13 → serverwatcher-5.9.dev15}/src/serverwatcher/configclasses/messages.py

@@ -26,7 +26,6 @@ class MessagesConfig:
     second_2:  str = "broadcast_seconds.2"
     second_1:  str = "broadcast_seconds.1"
 
-    startup: str = "logging.startup"
     status_check: str = "logging.status_check"
     validation_fail: str = "logging.validation_fail"
     validation_ok: str = "logging.validation_ok"

{serverwatcher-5.9.dev13 → serverwatcher-5.9.dev15}/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.9.dev13 → serverwatcher-5.9.dev15}/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.9.dev13 → serverwatcher-5.9.dev15}/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.9.dev13 → serverwatcher-5.9.dev15}/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)
@@ -86,14 +83,12 @@ class ServerWatcher:
             only_maps=only_maps,
             disable=disable,
             enable=enable,
-            **ctx
         )
 
         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):
@@ -161,7 +156,7 @@ class ServerWatcher:
         )
 
     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.9.dev13 → serverwatcher-5.9.dev15/src/serverwatcher.egg-info}/PKG-INFO

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

{serverwatcher-5.9.dev13 → serverwatcher-5.9.dev15}/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