Update at-extender.py

**Version 1.1.8 released**

Changelog 1.1.8:
- Community+ Unterstützung integriert (Anordnung des Datenvolumen ändert sich dadurch, kein auslesen des Community+ Volumens // nachbuchen noch nicht getestet)

- Auf Wunsch Emoji Änderung beim Nachbuchen.

- System-Ressourcen Erkennung eingebaut unter 2GB Ram, werden extra Settings für den browser geladen.

- Webkit Unterstützung gefixt. 


Es wird " import psutil" benötigt, wer es nicht installiert hat, installiert das script automatisch über pip nach.

Author: Dinobeiser

at-extender.py

@@ -8,8 +8,28 @@
 import sys
 import io
 import re
+try:
+    import psutil
+except ImportError:
+    import subprocess
+    import sys
+    subprocess.check_call([sys.executable, "-m", "pip", "install", "psutil"])
+    import psutil
 from playwright.sync_api import sync_playwright, TimeoutError
 
+def is_low_memory():
+    #Erkennt schwache Server (unter 2 GB RAM)
+    total_ram = psutil.virtual_memory().total / (1024**3)
+    return total_ram <= 2.0
+
+def get_launch_args(browser):
+    if browser == "chromium" and is_low_memory():
+        return ["--no-sandbox", "--disable-dev-shm-usage"]
+    else:
+        return []
+
+
+
 # Logging einrichten
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
 sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
@@ -18,14 +38,14 @@
 LOGIN_URL = "https://login.alditalk-kundenbetreuung.de/signin/XUI/#login/"
 DASHBOARD_URL = "https://www.alditalk-kundenportal.de/portal/auth/uebersicht/"
 
-VERSION = "1.1.6"  # Deine aktuelle Version
+VERSION = "1.1.8"  # Deine aktuelle Version
 
 REMOTE_VERSION_URL = "https://raw.githubusercontent.com/Dinobeiser/AT-Extender/main/version.txt"  # Link zur Version
 REMOTE_SCRIPT_URL = "https://raw.githubusercontent.com/Dinobeiser/AT-Extender/main/at-extender.py"  # Link zum neuesten Skript
 
 USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:137.0) Gecko/20100101 Firefox/139.0"
 HEADLESS = True
-
+browser = None
 
 def load_config():
     with open("config.json", "r") as f:
@@ -73,7 +93,6 @@ def load_config():
         logging.error(f"Konnte 'state.json' nicht neu erstellen: {save_error}")
 
 
-
 def send_telegram_message(message, retries=3):
     if TELEGRAM == "1":
         for attempt in range(retries):
@@ -145,21 +164,80 @@ def wait_and_click(page, selector, timeout=5000, retries=5):
     logging.error(f"Konnte {selector} nicht klicken.")
     return False
 
+
+def get_datenvolumen(page):
+    logging.info("Lese Datenvolumen aus...")
+
+    try:
+        label_selector = 'one-stack.usage-meter:nth-child(1) > one-usage-meter:nth-child(1) > one-button:nth-child(2)'
+        label_element = page.query_selector(label_selector)
+        label_text = label_element.text_content().strip() if label_element else ""
+
+        if "Inland & EU" in label_text:
+            logging.info("Community+")
+            GB_selectors = [
+                'one-stack.usage-meter:nth-child(2) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)',
+                'one-stack.usage-meter:nth-child(2) > one-stack:nth-child(1) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)'
+            ]
+        else:
+            logging.info("Kein Community+ erkannt")
+            GB_selectors = [
+                'one-stack.usage-meter:nth-child(1) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)',
+                'one-stack.usage-meter:nth-child(1) > one-stack:nth-child(1) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)'
+            ]
+    except Exception as e:
+        logging.warning(f"Fehler bei der Erkennung von Community+: {e}")
+        GB_selectors = [
+            'one-stack.usage-meter:nth-child(1) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)',
+            'one-stack.usage-meter:nth-child(1) > one-stack:nth-child(1) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)'
+        ]
+
+    GB_text_raw = None
+    for sel in GB_selectors:
+        try:
+            element = page.query_selector(sel)
+            if element:
+                GB_text_raw = element.text_content()
+                if GB_text_raw:
+                    break
+        except Exception as e:
+            logging.warning(f"Selector {sel} nicht verfügbar: {e}")
+            continue
+
+    if not GB_text_raw:
+        raise Exception("Konnte das Datenvolumen nicht auslesen – kein gültiger Selector gefunden.")
+
+    match = re.search(r"([\d\.,]+)\s?(GB|MB)", GB_text_raw)
+    if not match:
+        raise ValueError(f"Unerwartetes Format beim Datenvolumen: {GB_text_raw}")
+
+    value, unit = match.groups()
+    value = value.replace(",", ".")
+
+    if unit == "MB":
+        GB = float(value) / 1024
+    else:
+        GB = float(value)
+
+    return GB
+
+
 def login_and_check_data():
     global LAST_GB
     with sync_playwright() as p:
         for attempt in range(3):  # 3 Versuche, falls Playwright abstürzt
             try:
                 COOKIE_FILE = "cookies.json"
                 logging.info(f"Starte {BROWSER}...")
+                LAUNCH_ARGS = get_launch_args(BROWSER)
 
                 # Browser starten
                 if BROWSER == "firefox":
-                    browser = p.firefox.launch(headless=HEADLESS)
+                    browser = p.firefox.launch(headless=HEADLESS, args=LAUNCH_ARGS)
                 elif BROWSER == "webkit":
-                    browser = p.webkit.launch(headless=HEADLESS)
+                    browser = p.webkit.launch(headless=HEADLESS, args=LAUNCH_ARGS)
                 else:
-                    browser = p.chromium.launch(headless=HEADLESS)
+                    browser = p.chromium.launch(headless=HEADLESS, args=LAUNCH_ARGS)
 
                 # Cookies vorbereiten
                 if os.path.exists(COOKIE_FILE):
@@ -250,43 +328,8 @@ def login_erfolgreich(p):
                     logging.info("Cookies werden erneuert.")
                     context.storage_state(path=COOKIE_FILE)
 
-                # Weiter mit Datenvolumen-Logik
-                logging.info("Lese Datenvolumen aus...")
-
-
-                GB_selectors = [
-                    'one-stack.usage-meter:nth-child(1) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)',
-                    'one-stack.usage-meter:nth-child(1) > one-stack:nth-child(1) > one-usage-meter:nth-child(1) > one-group:nth-child(1) > one-heading:nth-child(2)'
-                ]
-
-                GB_text_raw = None
-                for sel in GB_selectors:
-                    try:
-                        element = page.query_selector(sel)
-                        if element:
-                            GB_text_raw = element.text_content()
-                            if GB_text_raw:
-                                break
-                    except Exception as e:
-                        logging.warning(f"Selector {sel} nicht verfügbar: {e}")
-                        continue
-
-                if not GB_text_raw:
-                    raise Exception("Konnte das Datenvolumen nicht auslesen - kein gültiger Selector gefunden.")
-
-                match = re.search(r"([\d\.,]+)\s?(GB|MB)", GB_text_raw)
-                if not match:
-                    raise ValueError(f"Unerwartetes Format beim Datenvolumen: {GB_text_raw}")
-
-                value, unit = match.groups()
-                value = value.replace(",", ".")
-
-                if unit == "MB":
-                    GB = float(value) / 1024
-                else:
-                    GB = float(value)
-
-                LAST_GB = GB
+                GB = get_datenvolumen(page)
+                GB = LAST_GB
 
                 try:
                     with open("state.json", "w") as f:
@@ -300,7 +343,7 @@ def login_erfolgreich(p):
                 if GB < 1.0:
                     logging.info("Versuche, 1 GB Datenvolumen nachzubuchen...")
                     if wait_and_click(page, 'one-button[slot="action"]'):
-                        message = f"{RUFNUMMER}: Aktuelles Datenvolumen: {GB:.2f} GB - 1 GB wurde erfolgreich nachgebucht. ✅"
+                        message = f"{RUFNUMMER}: Aktuelles Datenvolumen: {GB:.2f} GB - 1 GB wurde erfolgreich nachgebucht. 📲"
                     else:
                         raise Exception("❌ Konnte den Nachbuchungsbutton nicht klicken!")
 
@@ -325,8 +368,9 @@ def login_erfolgreich(p):
                 send_telegram_message(f"{RUFNUMMER}: ❌ Fehler beim Abrufen des Datenvolumens: {e}")
 
             finally:
-                browser.close()
-                logging.info("Browser geschlossen.")
+                if browser:
+                    browser.close()
+                    logging.info("Browser geschlossen.")
 
             time.sleep(2)
         logging.error("Skript hat nach 3 Versuchen aufgegeben.")
@@ -373,6 +417,7 @@ def get_interval(config):
     else:
         return random.randint(300, 500)
 
+
 if __name__ == "__main__":
     while True:
         check_for_update()