serverwatcher 5.31.2__tar.gz → 5.33a1__tar.gz

{serverwatcher-5.31.2/src/serverwatcher.egg-info → serverwatcher-5.33a1}/PKG-INFO

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

{serverwatcher-5.31.2 → serverwatcher-5.33a1}/pyproject.toml

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

{serverwatcher-5.31.2 → serverwatcher-5.33a1}/src/serverwatcher/configclasses/config.py

@@ -18,7 +18,7 @@ class GlobalConfig:
     server_port: int = 'server.port'
 
     bridge_token: str = 'hungerbridge.token'
-    bridge_port: int = 'hungerbridge.port'
+    bridge_url: str = 'hungerbridge.url'
 
     enable_logging: bool = 'logger.enabled'
     logger_name: str = 'logger.name'
@@ -47,7 +47,7 @@ class fallbacks:
     server_port = 25565
 
     bridge_token = 'CHANGE_ME'
-    bridge_port = 1913
+    bridge_url = 'https://api.example.com:1913'
 
     enable_logging = True
     logger_name = 'Server Watcher'
@@ -72,6 +72,6 @@ class rules:
     timezone = 'recommended'
     panel_name = 'recommended'
     server_port = 'recommended'
-    bridge_port = 'recommended'
+    bridge_url = 'recommended'
 
     # everything else defaults to optional

{serverwatcher-5.31.2 → serverwatcher-5.33a1}/src/serverwatcher/defaultconfigs/config.yaml

@@ -14,7 +14,7 @@ server:
 
 hungerbridge:
   token: 'CHANGE_ME'
-  port: 1913
+  url: 'https://api.example.com:1913'
 
 logger:
   enabled: True

{serverwatcher-5.31.2 → serverwatcher-5.33a1}/src/serverwatcher/watcher.py

@@ -33,7 +33,7 @@ class ServerWatcher:
             server_id=self.config.server_id,
             server_domain=self.config.server_domain,
             server_port=self.config.server_port,
-            bridge_port=self.config.bridge_port,
+            bridge_url=self.config.bridge_url,
             bridge_token=self.config.bridge_token,
         )
 
@@ -91,6 +91,13 @@ class ServerWatcher:
             error_prefix=self.config.error_prefix,
         )
 
+        self.router.registerLevel(
+            name='debug',
+            prefix=self.config.debug_prefix,
+            file_method='debug',
+            routes=['origin']
+        )
+
         self.tz = ZoneInfo(self.config.timezone)
 
     def clearTerminal(self):
@@ -187,9 +194,6 @@ class ServerWatcher:
         self.router.info(self.messages.sampling_start, duration=sample_duration_formatted)
         self.server.refresh()
         snap = utils.Snapshot(self.server, duration=self.watcherconfig.sample_duration, interval=self.watcherconfig.sample_interval, drop_outliers=self.watcherconfig.sample_outlier_drop, gb=True)
-
-        # get latest player count, do not average
-        snap.players = self.server.getPlayers()
         
         pro = 0
         anti = 0
@@ -197,11 +201,11 @@ class ServerWatcher:
         no_restart_reasons = []
 
         if self.config.debug:
-            self.router.origin(f'RAM: {snap.ram}/{self.watcherconfig.threshold_ram}', level=self.config.debug_prefix)
-            self.router.origin(f'CPU: {snap.cpu}/{self.watcherconfig.threshold_cpu}', level=self.config.debug_prefix)
-            self.router.origin(f'Uptime: {snap.uptime // 3600}/{self.watcherconfig.threshold_uptime}', level=self.config.debug_prefix)
-            self.router.origin(f'TPS: {snap.tps}/{self.watcherconfig.threshold_tps}', level=self.config.debug_prefix)
-            self.router.origin(f'Players: {snap.players}', level=self.config.debug_prefix)
+            self.router.debug(f'RAM: {snap.ram}/{self.watcherconfig.threshold_ram}')
+            self.router.debug(f'CPU: {snap.cpu}/{self.watcherconfig.threshold_cpu}')
+            self.router.debug(f'Uptime: {snap.uptime // 3600}/{self.watcherconfig.threshold_uptime}')
+            self.router.debug(f'TPS: {snap.tps}/{self.watcherconfig.threshold_tps}')
+            self.router.debug(f'Players: {snap.players}/{self.server.max_players}')
 
         if snap.ram >= self.watcherconfig.threshold_ram:
             restart_reasons.append(self.res(self.messages.reason_ram, ram=snap.ram, threshold=self.watcherconfig.threshold_ram))
@@ -271,6 +275,8 @@ class ServerWatcher:
                 while True:
                     utils.clearTerminal()
                     self.evaluate()
+                    if self.config.debug:
+                        self.router.debug(f'Waiting {self.watcherconfig.watch_interval}s until next run...')
                     time.sleep(self.watcherconfig.watch_interval)
             except KeyboardInterrupt:
                 self.shutdown()
@@ -278,4 +284,6 @@ class ServerWatcher:
             while True:
                 utils.clearTerminal()
                 self.evaluate()
+                if self.config.debug:
+                    self.router.debug(f'Waiting {self.watcherconfig.watch_interval}s until next run...')
                 time.sleep(self.watcherconfig.watch_interval)

{serverwatcher-5.31.2 → serverwatcher-5.33a1/src/serverwatcher.egg-info}/PKG-INFO

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