serverwatcher 5.32__tar.gz → 5.33a2__tar.gz

{serverwatcher-5.32/src/serverwatcher.egg-info → serverwatcher-5.33a2}/PKG-INFO

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

{serverwatcher-5.32 → serverwatcher-5.33a2}/pyproject.toml

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

{serverwatcher-5.32 → serverwatcher-5.33a2}/src/serverwatcher/configclasses/config.py

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

{serverwatcher-5.32 → serverwatcher-5.33a2}/src/serverwatcher/defaultconfigs/config.yaml

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

serverwatcher-5.33a2/src/serverwatcher/discord_bot_webook.py

@@ -0,0 +1,13 @@
+import requests
+
+class DiscordBotWebhook:
+    def __init__(self, url: str, token: str):
+        self.url = url
+        self.token = token
+    
+    def send(self, content: str, **ctx):
+        requests.post(
+            self.url,
+            json={"content": content, **ctx},
+            timeout=5
+        ).raise_for_status()

{serverwatcher-5.32 → serverwatcher-5.33a2}/src/serverwatcher/watcher.py

@@ -1,7 +1,7 @@
-import os
 import time
 from zoneinfo import ZoneInfo
 
+from .discord_bot_webook import DiscordBotWebhook
 from hungerlib import servers, MessageRouter, loadConfig, utils
 from mapres import MapResolver, maps
 
@@ -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,
         )
 
@@ -99,6 +99,7 @@ class ServerWatcher:
         )
 
         self.tz = ZoneInfo(self.config.timezone)
+        self.Webhook = DiscordBotWebhook(url = self.config.discord_url, token = self.config.discord_token)
 
     def clearTerminal(self):
         if self.config.clear_terminal:
@@ -194,9 +195,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
@@ -208,7 +206,7 @@ class ServerWatcher:
             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.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))
@@ -266,11 +264,14 @@ class ServerWatcher:
         if gap <= self.watcherconfig.threshold_low_gap:
             self.router.warn(self.messages.gap_low, gap=gap)
             self.schedule_restart(self.watcherconfig.low_gap_minutes)
+            # send discord message
         else:
             self.router.warn(self.messages.gap_high, gap=gap)
             self.schedule_restart(self.watcherconfig.high_gap_minutes)
+            # send discord message
 
         self.restart_and_wait()
+        # send discord message
 
     def run(self):
         if self.config.handle_keyboard_interrupt:

{serverwatcher-5.32 → serverwatcher-5.33a2/src/serverwatcher.egg-info}/PKG-INFO

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

{serverwatcher-5.32 → serverwatcher-5.33a2}/src/serverwatcher.egg-info/SOURCES.txt

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