Some fixes for maintenance mode.

README.md

@@ -43,6 +43,19 @@ doUpdate: true # set it to true to enable updater
 domains: [] # subdomains that you want auto-update (Example: { "name": "www.example.com", "proxied": true })
 zone: null # zone of your domain name (such as example.com)
 ddnsBroadcastCode: code-here # IMPORTANT: Replace it that only you know
+maintenancePageDNS: "" # Maintenance page DNS name, such as maintenance.example.com
+maintenancePageURL: "" # Deprecated fallback. Use maintenancePageDNS instead.
 ```
 
-Remember to restart the tool after you save the config file.
+For dns item, use this template:
+
+```
+{
+  "name": "www.example.com", # DNS name
+  "proxied": false, # Enable proxy (Enable this if you want to hide your server's real IP)
+  "type": "A", # or "CNAME", "AAA", "TEXT", "MX"
+  "allowMaintenance": true # Redirect to maintenancePageDNS if maintenance mode is enabled.
+}
+```
+
+Remember to restart the tool after you save the config file.

helper.py

@@ -4,6 +4,7 @@ import os
 import sys
 import threading
 import time
+from urllib.parse import urlparse
 import requests
 from utils.yaml import yaml_parser, yaml_writer
 from settings import CONFIG_DIR
@@ -31,6 +32,7 @@ cf_config = {
     "allowedBroadcastServer": [
     ],
     "ddnsBroadcastCode": "code-here",
+    "maintenancePageDNS": "",
     "maintenancePageURL": ""
 }
 
@@ -92,7 +94,7 @@ class CloudflareHelper(Helper):
             )
             await message.channel.send(result)
 
-        @self.dc.handle_command("/cf:enable-maintenance", help="Enable maintenance mode")
+        @self.dc.handle_command("/cf:maintenance", help="Toggle maintenance mode")
         async def enable_maintenance(client, message):
             guild = getattr(message, "guild", None)
             if guild is None:
@@ -100,7 +102,14 @@ class CloudflareHelper(Helper):
                 return
 
             if self.is_allowed_broadcast_server(guild.name):
-                await message.channel.send(f"Updating DDNS...")
+                if not self.is_maintenance:
+                    self.is_maintenance = True
+                    self.update_ddns()
+                    await message.channel.send(f"Maintenance mode is enabled. Updating DDNS...")
+                else:
+                    self.is_maintenance = False
+                    self.update_ddns()
+                    await message.channel.send(f"Maintenance mode is disabled. Updating DDNS...")
             else:
                 await message.channel.send(f"Unsupported server: {guild.name}")
 
@@ -224,14 +233,14 @@ class CloudflareHelper(Helper):
             self.logger.error("An error occurred while getting DNS records: {}".format(e))
             return
 
-        maintenance_url = self.config.get('maintenancePageURL')
+        maintenance_dns = self.get_maintenance_page_dns()
         start_maintenance = False
 
-        if self.is_maintenance and maintenance_url is not None:
+        if self.is_maintenance and maintenance_dns:
             self.logger.info("Maintenance mode is on. Redirecting support dns records to maintenance page...")
             start_maintenance = True
-        elif self.is_maintenance and not maintenance_url:
+        elif self.is_maintenance:
-            self.logger.warning("Maintenance mode is on but maintenancePageURL is not set yet. Ignoring...")
+            self.logger.warning("Maintenance mode is on but maintenancePageDNS is not set yet. Ignoring...")
 
         for item in domains:
             domain = item.get("name", None)
@@ -262,7 +271,7 @@ class CloudflareHelper(Helper):
             request_data = {
                 "type": domain_type if not start_maintenance or not allow_maintenance else "CNAME",
                 "name": domain,
-                "content": self.ip if not start_maintenance or not allow_maintenance else maintenance_url,
+                "content": self.ip if not start_maintenance or not allow_maintenance else maintenance_dns,
                 "ttl": 120,
                 "proxied": proxied
             }
@@ -286,6 +295,22 @@ class CloudflareHelper(Helper):
                 self.logger.error(f"Unable to update dns record for domain name {domain}: {e}")
                 continue
 
+    def get_maintenance_page_dns(self):
+        value = self.config.get("maintenancePageDNS") or self.config.get("maintenancePageURL")
+
+        if value is None:
+            return None
+
+        value = str(value).strip()
+        if value == "":
+            return None
+
+        parsed = urlparse(value)
+        if parsed.hostname:
+            return parsed.hostname
+
+        return value.rstrip("/")
+
     def parse_allowed_broadcast_channels(self):
         raw = self.config.get("allowedBroadcastServer", [])
         allowed = {}