From 1fd446331496a25cca31e762a52ac1a8a7a0e198 Mon Sep 17 00:00:00 2001 From: kbe Date: Sun, 20 Jul 2025 03:43:27 +0200 Subject: [PATCH] chore: moved out classes to files --- .env.example | 7 + .gitignore | 177 +++++++++++++++ book_crossfit.py | 510 +----------------------------------------- crossfit_booker.py | 523 ++++++++++++++++++++++++++++++++++++++++++++ requirements.txt | 6 + session_notifier.py | 2 +- 6 files changed, 718 insertions(+), 507 deletions(-) create mode 100644 crossfit_booker.py diff --git a/.env.example b/.env.example index cfc1581..4424a4a 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,10 @@ # Configuration CROSSFIT_USERNAME=Kevin8407 CROSSFIT_PASSWORD=9vx03OSE + +EMAIL_FROM=kevin@mistergeek.fr +EMAIL_TO=kbataille@vivaldi.net +EMAIL_PASSWORD= + +TELEGRAM_TOKEN= +TELEGRAM_CHAT_ID \ No newline at end of file diff --git a/.gitignore b/.gitignore index 25c7260..c925db7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,180 @@ .env log/ !log/.gitkeep + +# Created by https://www.toptal.com/developers/gitignore/api/python +# Edit at https://www.toptal.com/developers/gitignore?templates=python + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +### Python Patch ### +# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration +poetry.toml + +# ruff +.ruff_cache/ + +# LSP config files +pyrightconfig.json + +# End of https://www.toptal.com/developers/gitignore/api/python diff --git a/book_crossfit.py b/book_crossfit.py index b93b376..9d98b3b 100755 --- a/book_crossfit.py +++ b/book_crossfit.py @@ -1,516 +1,14 @@ #!/usr/bin/env python3 - -# Native modules -import json import logging -from datetime import datetime, timedelta -import os -import sys -import time -import difflib - -# Third-party modules -import requests -from dateutil.parser import parse -import pytz -from dotenv import load_dotenv -from urllib.parse import urlencode -from typing import List, Dict, Optional, Any - -load_dotenv() - -# Configuration -USERNAME = os.environ.get("CROSSFIT_USERNAME") -PASSWORD = os.environ.get("CROSSFIT_PASSWORD") - -if not all([USERNAME, PASSWORD]): - raise ValueError("Missing environment variables: CROSSFIT_USERNAME and/or CROSSFIT_PASSWORD") - -APPLICATION_ID = "81560887" -CATEGORY_ID = "677" # Activity category ID for CrossFit -TIMEZONE = "Europe/Paris" # Adjust to your timezone -# TARGET_RESERVATION_TIME = "20:01" # When bookings open (8 PM) -TARGET_RESERVATION_TIME = "21:40" # When bookings open (8 PM) -DEVICE_TYPE = "3" - -# Retry configuration -RETRY_MAX = 3 -RETRY_BACKOFF = 1 -APP_VERSION = "5.09.21" - -# Define your preferred sessions -# Format: List of tuples (day_of_week, start_time, session_name_contains) -# day_of_week: 0=Monday, 6=Sunday -PREFERRED_SESSIONS = [ - (4, "17:00", "WEIGHTLIFTING"), # Friday 17:00 WEIGHTLIFTING - (5, "12:30", "HYROX"), # Saturday 12:30 HYROX - (2, "18:30", "CONDITIONING"), # Wednesday 18:30 CONDITIONING - # (5, "15:15", "BIG WOD") # Saturday 15:15 BIG WOD -] - -# Configure logging once at script startup -logging.basicConfig( - level=logging.DEBUG, # Change to DEBUG for more detailed logs - format='%(asctime)s - %(levelname)s - %(message)s', - handlers=[ - logging.FileHandler("log/crossfit_booking.log"), - logging.StreamHandler() - ] -) -logging.getLogger("requests").setLevel(logging.WARNING) -logging.info("Logging enhanced with request library noise reduction") - - -class CrossFitBooker: - def __init__(self) -> None: - """ - Initialize the CrossFitBooker with necessary attributes. - """ - self.auth_token: Optional[str] = None - self.user_id: Optional[str] = None - self.session: requests.Session = requests.Session() - self.base_headers: Dict[str, str] = { - "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:140.0) Gecko/20100101 Firefox/140.0", - "Content-Type": "application/x-www-form-urlencoded", - "Nubapp-Origin": "user_apps", - } - self.session.headers.update(self.base_headers) - - # Define mandatory parameters for API calls - self.mandatory_params: Dict[str, str] = { - "app_version": APP_VERSION, - "device_type": DEVICE_TYPE, - "id_application": APPLICATION_ID, - "id_category_activity": CATEGORY_ID - } - - def get_auth_headers(self) -> Dict[str, str]: - """ - Return headers with authorization if available. - - Returns: - Dict[str, str]: Headers dictionary with authorization if available. - """ - headers: Dict[str, str] = self.base_headers.copy() - if self.auth_token: - headers["Authorization"] = f"Bearer {self.auth_token}" - return headers - - def login(self) -> bool: - """ - Authenticate and get the bearer token. - - Returns: - bool: True if login is successful, False otherwise. - """ - try: - # First login endpoint - login_params: Dict[str, str] = { - "app_version": APP_VERSION, - "device_type": DEVICE_TYPE, - "username": USERNAME, - "password": PASSWORD - } - - response: requests.Response = self.session.post( - "https://sport.nubapp.com/api/v4/users/checkUser.php", - headers={"Content-Type": "application/x-www-form-urlencoded"}, - data=urlencode(login_params)) - - if not response.ok: - logging.error(f"First login step failed: {response.status_code} - {response.text} - Response: {response.text[:100]}") - return False - - try: - login_data: Dict[str, Any] = response.json() - self.user_id = str(login_data["data"]["user"]["id_user"]) - except KeyError as ke: - logging.error(f"Key error during login: {str(ke)} - Response: {response.text}") - return False - except ValueError as ve: - logging.error(f"Value error during login: {str(ve)} - Response: {response.text}") - return False - - # Second login endpoint - response: requests.Response = self.session.post( - "https://sport.nubapp.com/api/v4/login", - headers={"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"}, - data=urlencode({ - "device_type": DEVICE_TYPE, - "username": USERNAME, - "password": PASSWORD - })) - - if response.ok: - try: - login_data: Dict[str, Any] = response.json() - self.auth_token = login_data.get("token") - except KeyError as ke: - logging.error(f"Key error during login: {str(ke)} - Response: {response.text}") - return False - except ValueError as ve: - logging.error(f"Value error during login: {str(ve)} - Response: {response.text}") - return False - - if self.auth_token and self.user_id: - logging.info("Successfully logged in") - return True - else: - logging.error(f"Login failed: {response.status_code} - {response.text} - Response: {response.text[:100]}") - return False - - except requests.exceptions.JSONDecodeError: - logging.error("Failed to decode JSON response during login") - return False - except requests.exceptions.RequestException as e: - logging.error(f"Request error during login: {str(e)}") - return False - except Exception as e: - logging.error(f"Unexpected error during login: {str(e)}") - return False - - def get_available_sessions(self, start_date: datetime, end_date: datetime) -> Optional[Dict[str, Any]]: - """ - Fetch available sessions from the API with comprehensive error handling. - - Args: - start_date (datetime): Start date for fetching sessions. - end_date (datetime): End date for fetching sessions. - - Returns: - Optional[Dict[str, Any]]: Dictionary containing available sessions if successful, None otherwise. - """ - if not self.auth_token or not self.user_id: - logging.error("Authentication required - missing token or user ID") - return None - - url: str = "https://sport.nubapp.com/api/v4/activities/getActivitiesCalendar.php" - - # Prepare request with mandatory parameters - request_data: Dict[str, str] = self.mandatory_params.copy() - request_data.update({ - "id_user": self.user_id, - "start_timestamp": start_date.strftime("%d-%m-%Y"), - "end_timestamp": end_date.strftime("%d-%m-%Y") - }) - - # Add retry logic with exponential backoff and more informative error messages - for retry in range(RETRY_MAX): - try: - try: - response: requests.Response = self.session.post( - url, - headers=self.get_auth_headers(), - data=urlencode(request_data), - timeout=10 - ) - except requests.exceptions.Timeout: - logging.error(f"Request timed out after 10 seconds for URL: {url}. Retry {retry+1}/{RETRY_MAX}") - return None - except requests.exceptions.ConnectionError as e: - logging.error(f"Connection error for URL: {url} - Error: {str(e)}") - return None - except requests.exceptions.RequestException as e: - logging.error(f"Request failed for URL: {url} - Error: {str(e)}") - return None - break # Success, exit retry loop - except requests.exceptions.JSONDecodeError: - logging.error("Failed to decode JSON response") - return None - except requests.exceptions.RequestException as e: - if retry == RETRY_MAX - 1: - logging.error(f"Final retry failed: {str(e)}") - raise # Propagate error - wait_time: int = RETRY_BACKOFF * (2 ** retry) - logging.warning(f"Request failed (attempt {retry+1}/{RETRY_MAX}): {str(e)}. Retrying in {wait_time}s...") - time.sleep(wait_time) - else: - # All retries exhausted - logging.error(f"Failed after {RETRY_MAX} attempts") - return None - - # Handle response - if response.status_code == 200: - try: - json_response: Dict[str, Any] = response.json() - return json_response - except ValueError: - logging.error("Failed to decode JSON response") - return None - elif response.status_code == 400: - logging.error("400 Bad Request - likely missing or invalid parameters") - logging.error(f"Request Data: {request_data}") - logging.error(f"Response: {response.text[:100]}") - return None - elif response.status_code == 401: - logging.error("401 Unauthorized - token may be expired or invalid") - logging.error(f"Response: {response.text[:100]}") - return None - elif 500 <= response.status_code < 600: - logging.error(f"Server error {response.status_code} - Response: {response.text[:100]}") - raise requests.exceptions.ConnectionError(f"Server error {response.status_code}") - else: - logging.error(f"Unexpected status code: {response.status_code}") - return None - def book_session(self, session_id: str) -> bool: - """ - Book a specific session with debug logging. - - Args: - session_id (str): ID of the session to book. - - Returns: - bool: True if booking is successful, False otherwise. - """ - return self._make_request( - url="https://sport.nubapp.com/api/v4/activities/bookActivityCalendar.php", - data=self._prepare_booking_data(session_id), - success_msg=f"Successfully booked session {session_id}" - ) - - def _prepare_booking_data(self, session_id: str) -> Dict[str, str]: - """ - Prepare request data for booking a session. - - Args: - session_id (str): ID of the session to book. - - Returns: - Dict[str, str]: Dictionary containing request data for booking a session. - """ - return { - **self.mandatory_params, - "id_activity_calendar": session_id, - "id_user": self.user_id, - "action_by": self.user_id, - "n_guests": "0", - "booked_on": "3" - } - - def _make_request(self, url: str, data: Dict[str, str], success_msg: str) -> bool: - """ - Handle API requests with retry logic and response processing. - - Args: - url (str): URL for the API request. - data (Dict[str, str]): Data to send with the request. - success_msg (str): Message to log on successful request. - - Returns: - bool: True if request is successful, False otherwise. - """ - for retry in range(RETRY_MAX): - try: - response: requests.Response = self.session.post( - url, - headers=self.get_auth_headers(), - data=urlencode(data), - timeout=10 - ) - - if response.status_code == 200: - json_response: Dict[str, Any] = response.json() - if json_response.get("success", False): - logging.info(success_msg) - return True - logging.error(f"API returned success:false: {json_response}") - return False - - logging.error(f"HTTP {response.status_code}: {response.text[:100]}") - return False - - except requests.exceptions.JSONDecodeError: - logging.error("Failed to decode JSON response") - return False - except requests.exceptions.RequestException as e: - if retry == RETRY_MAX - 1: - logging.error(f"Final retry failed: {str(e)}") - raise # Propagate error - wait_time: int = RETRY_BACKOFF * (2 ** retry) - logging.warning(f"Request failed (attempt {retry+1}/{RETRY_MAX}): {str(e)}. Retrying in {wait_time}s...") - time.sleep(wait_time) - - logging.error(f"Failed to complete request after {RETRY_MAX} attempts") - return False - - def is_session_bookable(self, session: Dict[str, Any], current_time: datetime) -> bool: - """ - Check if a session is bookable based on user_info, ignoring error codes. - - Args: - session (Dict[str, Any]): Session data. - current_time (datetime): Current time for comparison. - - Returns: - bool: True if the session is bookable, False otherwise. - """ - user_info: Dict[str, Any] = session.get("user_info", {}) - - # First check if can_join is true (primary condition) - if user_info.get("can_join", False): - logging.debug("Session is bookable: can_join is True") - return True - - # If can_join is False, check if there's a booking window - booking_date_str: str = user_info.get("unableToBookUntilDate", "") - booking_time_str: str = user_info.get("unableToBookUntilTime", "") - - if booking_date_str and booking_time_str: - try: - booking_datetime: datetime = datetime.strptime( - f"{booking_date_str} {booking_time_str}", - "%d-%m-%Y %H:%M" - ) - booking_datetime = pytz.timezone(TIMEZONE).localize(booking_datetime) - - if current_time >= booking_datetime: - logging.debug(f"Session is bookable: current_time {current_time} >= booking_datetime {booking_datetime}") - return True # Booking window is open - else: - return False # Still waiting for booking to open - except ValueError: - pass # Ignore invalid date formats - - # Default case: not bookable - return False - - def matches_preferred_session(self, session: Dict[str, Any], current_time: datetime) -> bool: - """ - Check if session matches one of your preferred sessions with fuzzy matching. - - Args: - session (Dict[str, Any]): Session data. - current_time (datetime): Current time for comparison. - - Returns: - bool: True if the session matches a preferred session, False otherwise. - """ - try: - session_time: datetime = parse(session["start_timestamp"]) - if not session_time.tzinfo: - session_time = pytz.timezone(TIMEZONE).localize(session_time) - - day_of_week: int = session_time.weekday() - session_time_str: str = session_time.strftime("%H:%M") - session_name: str = session.get("name_activity", "").upper() - - for preferred_day, preferred_time, preferred_name in PREFERRED_SESSIONS: - # Exact match first - if (day_of_week == preferred_day and - session_time_str == preferred_time and - preferred_name in session_name): - return True - - # Fuzzy match fallback (80% similarity) - ratio: float = difflib.SequenceMatcher( - None, - session_name.lower(), - preferred_name.lower() - ).ratio() - - if (day_of_week == preferred_day and - abs(session_time.hour - int(preferred_time.split(':')[0])) <= 1 and - ratio >= 0.8): - logging.debug(f"Fuzzy match: {session_name} → {preferred_name} ({ratio:.2%})") - return True - - return False - - except Exception as e: - logging.error(f"Failed to check session: {str(e)} - Session: {session}") - return False - - def run_booking_cycle(self, current_time: datetime) -> None: - """ - Run one cycle of checking and booking sessions. - - Args: - current_time (datetime): Current time for comparison. - """ - # Calculate date range to check (next 3 days) - start_date: date = current_time.date() - end_date: date = start_date + timedelta(days=3) - - # Get available sessions - sessions_data: Optional[Dict[str, Any]] = self.get_available_sessions(start_date, end_date) - if not sessions_data or not sessions_data.get("success", False): - logging.error("No sessions available or error fetching sessions - Sessions Data: {sessions_data}") - return - - activities: List[Dict[str, Any]] = sessions_data.get("data", {}).get("activities_calendar", []) - - # Find sessions to book (prefered only) - sessions_to_book: List[Tuple[str, Dict[str, Any]]] = [] - for session in activities: - if not self.is_session_bookable(session, current_time): - continue - - if self.matches_preferred_session(session, current_time): - sessions_to_book.append(("Preferred", session)) - - if not sessions_to_book: - logging.info("No matching sessions found to book") - return - - # Book sessions (preferred first) - sessions_to_book.sort(key=lambda x: 0 if x[0] == "Preferred" else 1) - for session_type, session in sessions_to_book: - session_time: datetime = datetime.strptime(session["start_timestamp"], "%Y-%m-%d %H:%M:%S") - logging.info(f"Attempting to book {session_type} session at {session_time} ({session['name_activity']})") - if self.book_session(session["id_activity_calendar"]): - logging.info(f"Successfully booked {session_type} session at {session_time}") - else: - logging.error(f"Failed to book {session_type} session at {session_time} - Session: {session}") - - def run(self) -> None: - """ - Main execution loop. - """ - # Set up timezone - tz: pytz.timezone = pytz.timezone(TIMEZONE) - - # Initial login - if not self.login(): - logging.error("Authentication failed - exiting program") - return - - try: - while True: - try: - current_time: datetime = datetime.now(tz) - logging.info(f"Current time: {current_time}") - - # Run booking cycle at the target time or if it's a test, with optimized checking - if current_time.strftime("%H:%M") == TARGET_RESERVATION_TIME: - self.run_booking_cycle(current_time) - # Wait until the next booking window - wait_until = current_time + timedelta(minutes=60) - time.sleep((wait_until - current_time).total_seconds()) - else: - # Check again in 5 minutes - time.sleep(300) - except Exception as e: - logging.error(f"Unexpected error in booking cycle: {str(e)} - Traceback: {traceback.format_exc()}") - time.sleep(60) # Wait before retrying after error - except KeyboardInterrupt: - self.quit() - - def quit(self) -> None: - """ - Clean up resources and exit the script. - """ - logging.info("Script interrupted by user. Quitting...") - # Add any cleanup code here - exit(0) - +import traceback +from crossfit_booker import CrossFitBooker if __name__ == "__main__": booker = CrossFitBooker() if not booker.login(): - logging.error("Failed to login - Traceback: {traceback.format_exc()}") + logging.error("Failed to login - Traceback: %s", traceback.format_exc()) exit(1) - + # Start continuous booking loop booker.run() logging.info("Script completed") - diff --git a/crossfit_booker.py b/crossfit_booker.py new file mode 100644 index 0000000..f9b69f6 --- /dev/null +++ b/crossfit_booker.py @@ -0,0 +1,523 @@ +# Native modules +import json +import logging +from datetime import datetime, timedelta +import os +import sys +import time +import difflib + +# Third-party modules +import requests +from dateutil.parser import parse +import pytz +from dotenv import load_dotenv +from urllib.parse import urlencode +from typing import List, Dict, Optional, Any + +# Import the SessionNotifier class +from session_notifier import SessionNotifier + +load_dotenv() + +# Configuration +USERNAME = os.environ.get("CROSSFIT_USERNAME") +PASSWORD = os.environ.get("CROSSFIT_PASSWORD") + +if not all([USERNAME, PASSWORD]): + raise ValueError("Missing environment variables: CROSSFIT_USERNAME and/or CROSSFIT_PASSWORD") + +APPLICATION_ID = "81560887" +CATEGORY_ID = "677" # Activity category ID for CrossFit +TIMEZONE = "Europe/Paris" # Adjust to your timezone +# TARGET_RESERVATION_TIME = "20:01" # When bookings open (8 PM) +TARGET_RESERVATION_TIME = "21:40" # When bookings open (8 PM) +DEVICE_TYPE = "3" + +# Retry configuration +RETRY_MAX = 3 +RETRY_BACKOFF = 1 +APP_VERSION = "5.09.21" + +# Define your preferred sessions +# Format: List of tuples (day_of_week, start_time, session_name_contains) +# day_of_week: 0=Monday, 6=Sunday +PREFERRED_SESSIONS = [ + (4, "17:00", "WEIGHTLIFTING"), # Friday 17:00 WEIGHTLIFTING + (5, "12:30", "HYROX"), # Saturday 12:30 HYROX + (2, "18:30", "CONDITIONING"), # Wednesday 18:30 CONDITIONING + # (5, "15:15", "BIG WOD") # Saturday 15:15 BIG WOD +] + +# Configure logging once at script startup +logging.basicConfig( + level=logging.DEBUG, # Change to DEBUG for more detailed logs + format='%(asctime)s - %(levelname)s - %(message)s', + handlers=[ + logging.FileHandler("log/crossfit_booking.log"), + logging.StreamHandler() + ] +) + +logging.getLogger("requests").setLevel(logging.WARNING) +logging.info("Logging enhanced with request library noise reduction") + +class CrossFitBooker: + def __init__(self) -> None: + """ + Initialize the CrossFitBooker with necessary attributes. + """ + self.auth_token: Optional[str] = None + self.user_id: Optional[str] = None + self.session: requests.Session = requests.Session() + self.base_headers: Dict[str, str] = { + "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:140.0) Gecko/20100101 Firefox/140.0", + "Content-Type": "application/x-www-form-urlencoded", + "Nubapp-Origin": "user_apps", + } + self.session.headers.update(self.base_headers) + + # Define mandatory parameters for API calls + self.mandatory_params: Dict[str, str] = { + "app_version": APP_VERSION, + "device_type": DEVICE_TYPE, + "id_application": APPLICATION_ID, + "id_category_activity": CATEGORY_ID + } + + # Initialize the SessionNotifier with credentials from environment variables + email_credentials = { + "from": os.environ.get("EMAIL_FROM"), + "to": os.environ.get("EMAIL_TO"), + "password": os.environ.get("EMAIL_PASSWORD") + } + + telegram_credentials = { + "token": os.environ.get("TELEGRAM_TOKEN"), + "chat_id": os.environ.get("TELEGRAM_CHAT_ID") + } + + self.notifier = SessionNotifier(email_credentials, telegram_credentials) + + def get_auth_headers(self) -> Dict[str, str]: + """ + Return headers with authorization if available. + + Returns: + Dict[str, str]: Headers dictionary with authorization if available. + """ + headers: Dict[str, str] = self.base_headers.copy() + if self.auth_token: + headers["Authorization"] = f"Bearer {self.auth_token}" + return headers + + def login(self) -> bool: + """ + Authenticate and get the bearer token. + + Returns: + bool: True if login is successful, False otherwise. + """ + try: + # First login endpoint + login_params: Dict[str, str] = { + "app_version": APP_VERSION, + "device_type": DEVICE_TYPE, + "username": USERNAME, + "password": PASSWORD + } + + response: requests.Response = self.session.post( + "https://sport.nubapp.com/api/v4/users/checkUser.php", + headers={"Content-Type": "application/x-www-form-urlencoded"}, + data=urlencode(login_params)) + + if not response.ok: + logging.error(f"First login step failed: {response.status_code} - {response.text} - Response: {response.text[:100]}") + return False + + try: + login_data: Dict[str, Any] = response.json() + self.user_id = str(login_data["data"]["user"]["id_user"]) + except KeyError as ke: + logging.error(f"Key error during login: {str(ke)} - Response: {response.text}") + return False + except ValueError as ve: + logging.error(f"Value error during login: {str(ve)} - Response: {response.text}") + return False + + # Second login endpoint + response: requests.Response = self.session.post( + "https://sport.nubapp.com/api/v4/login", + headers={"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"}, + data=urlencode({ + "device_type": DEVICE_TYPE, + "username": USERNAME, + "password": PASSWORD + })) + + if response.ok: + try: + login_data: Dict[str, Any] = response.json() + self.auth_token = login_data.get("token") + except KeyError as ke: + logging.error(f"Key error during login: {str(ke)} - Response: {response.text}") + return False + except ValueError as ve: + logging.error(f"Value error during login: {str(ve)} - Response: {response.text}") + return False + + if self.auth_token and self.user_id: + logging.info("Successfully logged in") + return True + else: + logging.error(f"Login failed: {response.status_code} - {response.text} - Response: {response.text[:100]}") + return False + + except requests.exceptions.JSONDecodeError: + logging.error("Failed to decode JSON response during login") + return False + except requests.exceptions.RequestException as e: + logging.error(f"Request error during login: {str(e)}") + return False + except Exception as e: + logging.error(f"Unexpected error during login: {str(e)}") + return False + + def get_available_sessions(self, start_date: datetime, end_date: datetime) -> Optional[Dict[str, Any]]: + """ + Fetch available sessions from the API with comprehensive error handling. + + Args: + start_date (datetime): Start date for fetching sessions. + end_date (datetime): End date for fetching sessions. + + Returns: + Optional[Dict[str, Any]]: Dictionary containing available sessions if successful, None otherwise. + """ + if not self.auth_token or not self.user_id: + logging.error("Authentication required - missing token or user ID") + return None + + url: str = "https://sport.nubapp.com/api/v4/activities/getActivitiesCalendar.php" + + # Prepare request with mandatory parameters + request_data: Dict[str, str] = self.mandatory_params.copy() + request_data.update({ + "id_user": self.user_id, + "start_timestamp": start_date.strftime("%d-%m-%Y"), + "end_timestamp": end_date.strftime("%d-%m-%Y") + }) + + # Add retry logic with exponential backoff and more informative error messages + for retry in range(RETRY_MAX): + try: + try: + response: requests.Response = self.session.post( + url, + headers=self.get_auth_headers(), + data=urlencode(request_data), + timeout=10 + ) + except requests.exceptions.Timeout: + logging.error(f"Request timed out after 10 seconds for URL: {url}. Retry {retry+1}/{RETRY_MAX}") + return None + except requests.exceptions.ConnectionError as e: + logging.error(f"Connection error for URL: {url} - Error: {str(e)}") + return None + except requests.exceptions.RequestException as e: + logging.error(f"Request failed for URL: {url} - Error: {str(e)}") + return None + break # Success, exit retry loop + except requests.exceptions.JSONDecodeError: + logging.error("Failed to decode JSON response") + return None + except requests.exceptions.RequestException as e: + if retry == RETRY_MAX - 1: + logging.error(f"Final retry failed: {str(e)}") + raise # Propagate error + wait_time: int = RETRY_BACKOFF * (2 ** retry) + logging.warning(f"Request failed (attempt {retry+1}/{RETRY_MAX}): {str(e)}. Retrying in {wait_time}s...") + time.sleep(wait_time) + else: + # All retries exhausted + logging.error(f"Failed after {RETRY_MAX} attempts") + return None + + # Handle response + if response.status_code == 200: + try: + json_response: Dict[str, Any] = response.json() + return json_response + except ValueError: + logging.error("Failed to decode JSON response") + return None + elif response.status_code == 400: + logging.error("400 Bad Request - likely missing or invalid parameters") + logging.error(f"Request Data: {request_data}") + logging.error(f"Response: {response.text[:100]}") + return None + elif response.status_code == 401: + logging.error("401 Unauthorized - token may be expired or invalid") + logging.error(f"Response: {response.text[:100]}") + return None + elif 500 <= response.status_code < 600: + logging.error(f"Server error {response.status_code} - Response: {response.text[:100]}") + raise requests.exceptions.ConnectionError(f"Server error {response.status_code}") + else: + logging.error(f"Unexpected status code: {response.status_code}") + return None + + def book_session(self, session_id: str) -> bool: + """ + Book a specific session with debug logging. + + Args: + session_id (str): ID of the session to book. + + Returns: + bool: True if booking is successful, False otherwise. + """ + return self._make_request( + url="https://sport.nubapp.com/api/v4/activities/bookActivityCalendar.php", + data=self._prepare_booking_data(session_id), + success_msg=f"Successfully booked session {session_id}" + ) + + def _prepare_booking_data(self, session_id: str) -> Dict[str, str]: + """ + Prepare request data for booking a session. + + Args: + session_id (str): ID of the session to book. + + Returns: + Dict[str, str]: Dictionary containing request data for booking a session. + """ + return { + **self.mandatory_params, + "id_activity_calendar": session_id, + "id_user": self.user_id, + "action_by": self.user_id, + "n_guests": "0", + "booked_on": "3" + } + + def _make_request(self, url: str, data: Dict[str, str], success_msg: str) -> bool: + """ + Handle API requests with retry logic and response processing. + + Args: + url (str): URL for the API request. + data (Dict[str, str]): Data to send with the request. + success_msg (str): Message to log on successful request. + + Returns: + bool: True if request is successful, False otherwise. + """ + for retry in range(RETRY_MAX): + try: + response: requests.Response = self.session.post( + url, + headers=self.get_auth_headers(), + data=urlencode(data), + timeout=10 + ) + + if response.status_code == 200: + json_response: Dict[str, Any] = response.json() + if json_response.get("success", False): + logging.info(success_msg) + return True + logging.error(f"API returned success:false: {json_response}") + return False + + logging.error(f"HTTP {response.status_code}: {response.text[:100]}") + return False + + except requests.exceptions.JSONDecodeError: + logging.error("Failed to decode JSON response") + return False + except requests.exceptions.RequestException as e: + if retry == RETRY_MAX - 1: + logging.error(f"Final retry failed: {str(e)}") + raise # Propagate error + wait_time: int = RETRY_BACKOFF * (2 ** retry) + logging.warning(f"Request failed (attempt {retry+1}/{RETRY_MAX}): {str(e)}. Retrying in {wait_time}s...") + time.sleep(wait_time) + + logging.error(f"Failed to complete request after {RETRY_MAX} attempts") + return False + + def is_session_bookable(self, session: Dict[str, Any], current_time: datetime) -> bool: + """ + Check if a session is bookable based on user_info, ignoring error codes. + + Args: + session (Dict[str, Any]): Session data. + current_time (datetime): Current time for comparison. + + Returns: + bool: True if the session is bookable, False otherwise. + """ + user_info: Dict[str, Any] = session.get("user_info", {}) + + # First check if can_join is true (primary condition) + if user_info.get("can_join", False): + logging.debug("Session is bookable: can_join is True") + return True + + # If can_join is False, check if there's a booking window + booking_date_str: str = user_info.get("unableToBookUntilDate", "") + booking_time_str: str = user_info.get("unableToBookUntilTime", "") + + if booking_date_str and booking_time_str: + try: + booking_datetime: datetime = datetime.strptime( + f"{booking_date_str} {booking_time_str}", + "%d-%m-%Y %H:%M" + ) + booking_datetime = pytz.timezone(TIMEZONE).localize(booking_datetime) + + if current_time >= booking_datetime: + logging.debug(f"Session is bookable: current_time {current_time} >= booking_datetime {booking_datetime}") + return True # Booking window is open + else: + return False # Still waiting for booking to open + except ValueError: + pass # Ignore invalid date formats + + # Default case: not bookable + return False + + def matches_preferred_session(self, session: Dict[str, Any], current_time: datetime) -> bool: + """ + Check if session matches one of your preferred sessions with fuzzy matching. + + Args: + session (Dict[str, Any]): Session data. + current_time (datetime): Current time for comparison. + + Returns: + bool: True if the session matches a preferred session, False otherwise. + """ + try: + session_time: datetime = parse(session["start_timestamp"]) + if not session_time.tzinfo: + session_time = pytz.timezone(TIMEZONE).localize(session_time) + + day_of_week: int = session_time.weekday() + session_time_str: str = session_time.strftime("%H:%M") + session_name: str = session.get("name_activity", "").upper() + + for preferred_day, preferred_time, preferred_name in PREFERRED_SESSIONS: + # Exact match first + if (day_of_week == preferred_day and + session_time_str == preferred_time and + preferred_name in session_name): + return True + + # Fuzzy match fallback (80% similarity) + ratio: float = difflib.SequenceMatcher( + None, + session_name.lower(), + preferred_name.lower() + ).ratio() + + if (day_of_week == preferred_day and + abs(session_time.hour - int(preferred_time.split(':')[0])) <= 1 and + ratio >= 0.8): + logging.debug(f"Fuzzy match: {session_name} → {preferred_name} ({ratio:.2%})") + return True + + return False + + except Exception as e: + logging.error(f"Failed to check session: {str(e)} - Session: {session}") + return False + + def run_booking_cycle(self, current_time: datetime) -> None: + """ + Run one cycle of checking and booking sessions. + + Args: + current_time (datetime): Current time for comparison. + """ + # Calculate date range to check (next 3 days) + start_date: date = current_time.date() + end_date: date = start_date + timedelta(days=3) + + # Get available sessions + sessions_data: Optional[Dict[str, Any]] = self.get_available_sessions(start_date, end_date) + if not sessions_data or not sessions_data.get("success", False): + logging.error("No sessions available or error fetching sessions - Sessions Data: {sessions_data}") + return + + activities: List[Dict[str, Any]] = sessions_data.get("data", {}).get("activities_calendar", []) + + # Find sessions to book (prefered only) + sessions_to_book: List[Tuple[str, Dict[str, Any]]] = [] + for session in activities: + if not self.is_session_bookable(session, current_time): + continue + + if self.matches_preferred_session(session, current_time): + sessions_to_book.append(("Preferred", session)) + + if not sessions_to_book: + logging.info("No matching sessions found to book") + return + + # Book sessions (preferred first) + sessions_to_book.sort(key=lambda x: 0 if x[0] == "Preferred" else 1) + for session_type, session in sessions_to_book: + session_time: datetime = datetime.strptime(session["start_timestamp"], "%Y-%m-%d %H:%M:%S") + logging.info(f"Attempting to book {session_type} session at {session_time} ({session['name_activity']})") + if self.book_session(session["id_activity_calendar"]): + # Send notification after successful booking + session_details = f"{session['name_activity']} at {session_time.strftime('%Y-%m-%d %H:%M')}" + self.notifier.notify_session_booking(session_details) + logging.info(f"Successfully booked {session_type} session at {session_time}") + else: + logging.error(f"Failed to book {session_type} session at {session_time} - Session: {session}") + + def run(self) -> None: + """ + Main execution loop. + """ + # Set up timezone + tz: pytz.timezone = pytz.timezone(TIMEZONE) + + # Initial login + if not self.login(): + logging.error("Authentication failed - exiting program") + return + + try: + while True: + try: + current_time: datetime = datetime.now(tz) + logging.info(f"Current time: {current_time}") + + # Run booking cycle at the target time or if it's a test, with optimized checking + if current_time.strftime("%H:%M") == TARGET_RESERVATION_TIME: + self.run_booking_cycle(current_time) + # Wait until the next booking window + wait_until = current_time + timedelta(minutes=60) + time.sleep((wait_until - current_time).total_seconds()) + else: + # Check again in 5 minutes + time.sleep(300) + except Exception as e: + logging.error(f"Unexpected error in booking cycle: {str(e)} - Traceback: {traceback.format_exc()}") + time.sleep(60) # Wait before retrying after error + except KeyboardInterrupt: + self.quit() + + def quit(self) -> None: + """ + Clean up resources and exit the script. + """ + logging.info("Script interrupted by user. Quitting...") + # Add any cleanup code here + exit(0) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 95da2be..5e5e25f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,19 @@ +anyio==4.9.0 certifi==2025.7.14 charset-normalizer==3.4.2 DateTime==5.5 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 idna==3.10 python-dateutil==2.9.0.post0 python-dotenv==1.1.1 +python-telegram-bot==22.2 pytz==2025.2 requests==2.32.4 setuptools==80.9.0 six==1.17.0 +sniffio==1.3.1 telegram==0.0.1 typing==3.7.4.3 urllib3==2.5.0 diff --git a/session_notifier.py b/session_notifier.py index f6b063d..40d590d 100644 --- a/session_notifier.py +++ b/session_notifier.py @@ -56,7 +56,7 @@ class SessionNotifier: message (str): The message content to be sent in the Telegram chat """ # Create a Bot instance with the provided token - bot = Bot(token=self.telegram_credentials['token']) + bot = Bot(token=self.telegram_credentials['token'], base_url=self.telegram_credentials.get('base_url', 'https://api.telegram.org')) # Send the message to the specified chat ID bot.send_message(chat_id=self.telegram_credentials['chat_id'], text=message)