serverwatcher 5.33a2__tar.gz → 5.33a4__tar.gz

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

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

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

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

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

@@ -51,11 +51,11 @@ class fallbacks:
     server_port = 25565
 
     bridge_token = 'CHANGE_ME'
-    bridge_url = 'https://api.example.com:1913'
+    bridge_url = 'https://api.example.com'
 
     discord_enabled = True
     discord_token = 'CHANGE_ME'
-    discord_url = 'https://bot.example.com'
+    discord_url = 'https://bot.example.com/webhook'
 
     enable_logging = True
     logger_name = 'Server Watcher'

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

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

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

@@ -1,8 +1,7 @@
 import time
 from zoneinfo import ZoneInfo
 
-from .discord_bot_webook import DiscordBotWebhook
-from hungerlib import servers, MessageRouter, loadConfig, utils
+from hungerlib import servers, MessageRouter, loadConfig, DiscordBotWebhook, utils
 from mapres import MapResolver, maps
 
 from serverwatcher.configclasses.config import GlobalConfig
@@ -99,7 +98,11 @@ class ServerWatcher:
         )
 
         self.tz = ZoneInfo(self.config.timezone)
-        self.Webhook = DiscordBotWebhook(url = self.config.discord_url, token = self.config.discord_token)
+        self.Webhook = DiscordBotWebhook(url=self.config.discord_url, token=self.config.discord_token)
+
+    def webhookSend(self, event: str, **ctx):
+        if self.config.discord_enabled:
+            self.Webhook.send(event=event, **ctx)
 
     def clearTerminal(self):
         if self.config.clear_terminal:
@@ -111,7 +114,10 @@ class ServerWatcher:
 
     def restart_and_wait(self):
         self.server.restart()
+
         self.router.info(self.messages.restart_action_sent)
+        self.webhookSend(event='restart_action_sent', server=self.config.server_name)
+
         time.sleep(self.watcherconfig.restart_wait_seconds)
 
         self.router.warn(self.messages.status_check)
@@ -124,8 +130,10 @@ class ServerWatcher:
         if alive:
             self.router.info(self.messages.server_back_online)
             self.router.destination(self.messages.server_back_online_log)
+            self.webhookSend(event='server_back_online', server=self.config.server_name)
         else:
             self.router.error(self.messages.server_failed_restart)
+            self.webhookSend(event='server_failed_restart', server=self.config.server_name)
 
     def schedule_restart(self, minutes):
         info = utils.snapSchedule(
@@ -138,6 +146,7 @@ class ServerWatcher:
         time_str = local_time.strftime('%I:%M %p')
 
         self.router.broadcast(self.messages.broadcast_restart_at, time=time_str)
+        self.webhookSend(event="restart_scheduled", server=self.config.server_name, time=time_str)
 
         def plural(n):
             return '' if n == 1 else 's'
@@ -189,6 +198,7 @@ class ServerWatcher:
             time.sleep(2)
         else:
             self.router.error(self.messages.validation_fail)
+            self.webhookSend(event="validation_fail", server=self.config.server_name)
             return
 
         sample_duration_formatted = int(self.watcherconfig.sample_duration) if self.watcherconfig.sample_duration.is_integer() else self.watcherconfig.sample_duration
@@ -264,11 +274,9 @@ 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

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

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

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

@@ -3,7 +3,6 @@ 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

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

@@ -1,13 +0,0 @@
-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()