Better avoidance of 403/429

.dockerignore

@@ -20,3 +20,4 @@ pyproject.toml
 setup.cfg
 tests/
 venv
+cached_headers.json

.gitignore

@@ -13,3 +13,4 @@ venv/
 
 # From SeleniumBase
 downloaded_files/
+cached_headers.json

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
   - repo: https://github.com/pycqa/flake8
     rev: 7.1.1
     hooks:
-      -  id: flake8
+      - id: flake8
   - repo: https://github.com/PyCQA/isort
     rev: 5.13.2
     hooks:

Dockerfile

@@ -1,17 +1,19 @@
-FROM python:3.12-rc-alpine
+FROM python:3.13.0rc2-alpine3.19
 
 WORKDIR /app
 
 # Define so the script knows not to download a new driver version, as
 # this Docker image already downloads a compatible chromedriver
 ENV AUTO_SOUTHWEST_CHECK_IN_DOCKER=1
+ENV PATH="/app/.local/bin:${PATH}"
 
-RUN apk add --update --no-cache chromium chromium-chromedriver
+RUN apk add --update --no-cache chromium chromium-chromedriver xvfb xauth
 
 RUN adduser -D auto-southwest-check-in -h /app
+RUN chown -R auto-southwest-check-in:auto-southwest-check-in /app
 USER auto-southwest-check-in
 
-COPY requirements.txt requirements.txt
+COPY requirements.txt .
 RUN pip3 install --upgrade pip && pip3 install --no-cache-dir -r requirements.txt
 
 COPY . .

lib/reservation_monitor.py

@@ -187,42 +187,53 @@ def _check(self) -> bool:
         # this scope
         return False
 
-    def _get_reservations(self) -> Tuple[List[Dict[str, Any]], bool]:
+    def _get_reservations(self, max_retries: int = 2) -> Tuple[List[Dict[str, Any]], bool]:
         """
-        Returns a list of reservations and a boolean indicating if reservation
-        scheduling should be skipped.
+        Attempts to retrieve a list of reservations and returns a tuple containing the list
+        of reservations and a boolean indicating whether reservation scheduling should be skipped.
 
-        Reservation scheduling will be skipped if a Too Many Requests error or timeout occurs
-        because new headers might not be valid and a list of reservations could not be retrieved.
+        The method will retry fetching reservations once in case of a timeout
+        or a Too Many Requests error. If the retry fails, reservation scheduling will be
+        skipped until the next scheduled attempt.
         """
         logger.debug("Retrieving reservations for account")
-        webdriver = WebDriver(self.checkin_scheduler)
 
-        try:
-            reservations = webdriver.get_reservations(self)
-        except DriverTimeoutError:
-            logger.debug(
-                "Timeout while retrieving reservations during login. Skipping reservation retrieval"
-            )
-            self.notification_handler.timeout_during_retrieval("account")
-            return [], True
-        except LoginError as err:
-            if err.status_code == TOO_MANY_REQUESTS_CODE:
-                # Don't exit when a Too Many Requests error happens. Instead, just skip the
-                # retrieval until the next time.
+        for attempt in range(max_retries + 1):
+            webdriver = WebDriver(self.checkin_scheduler)
+
+            try:
+                reservations = webdriver.get_reservations(self)
                 logger.debug(
-                    "Encountered a Too Many Requests error while logging in. Skipping reservation "
-                    "retrieval"
+                    "Successfully retrieved %d reservations after %d attempts",
+                    len(reservations),
+                    attempt + 1,
                 )
-                self.notification_handler.too_many_requests_during_login()
-                return [], True
-
-            logger.debug("Error logging in. %s. Exiting", err)
-            self.notification_handler.failed_login(err)
-            sys.exit(1)
-
-        logger.debug("Successfully retrieved %d reservations", len(reservations))
-        return reservations, False
+                return reservations, False
+
+            except DriverTimeoutError:
+                if attempt < max_retries:
+                    logger.debug("Timeout while retrieving reservations during login. Retrying")
+                else:
+                    logger.debug("Timeout persisted after retries. Skipping reservation retrieval")
+                    self.notification_handler.timeout_during_retrieval("account")
+
+            except LoginError as err:
+                if err.status_code == TOO_MANY_REQUESTS_CODE:
+                    if attempt < max_retries:
+                        logger.debug(
+                            "Encountered a Too Many Requests error while logging in. Retrying"
+                        )
+                    else:
+                        logger.debug(
+                            "Too Many Requests error persists. Skipping reservation retrieval"
+                        )
+                        self.notification_handler.too_many_requests_during_login()
+                else:
+                    logger.debug("Error logging in. %s. Exiting", err)
+                    self.notification_handler.failed_login(err)
+                    sys.exit(1)
+
+        return [], True
 
     def _stop_monitoring(self) -> None:
         print(f"\nStopping monitoring for account with username {self.username}")

lib/utils.py

@@ -1,5 +1,6 @@
 import json
 import random
+import re
 import socket
 import time
 from datetime import datetime, timezone
@@ -54,27 +55,27 @@ def make_request(
     server is not in sync with our NTP server or local computer).
     """
     # Ensure the URL is not malformed
-    site = site.replace("//", "/").lstrip("/")
+    site = re.sub(r"(?<!:)//+", "/", site).lstrip("/")
     url = BASE_URL + site
 
     attempts = 0
     while attempts < max_attempts:
         attempts += 1
-        if method == "POST":
-            response = requests.post(url, headers=headers, json=info)
-        else:
-            response = requests.get(url, headers=headers, params=info)
+        try:
+            if method.upper() == "POST":
+                response = requests.post(url, headers=headers, json=info)
+            else:
+                response = requests.get(url, headers=headers, params=info)
 
-        if response.status_code == 200:
-            logger.debug("Successfully made request after %d attempts", attempts)
-            return response.json()
+            if response.status_code == 200:
+                logger.debug("Successfully made request after %d attempts", attempts)
+                return response.json()
 
-        # Request did not succeed
-        response_body = response.content.decode()
-        error_msg = response.reason + " " + str(response.status_code)
-        error = RequestError(error_msg, response_body)
+            # Handle unsuccessful responses
+            response_body = response.content.decode()
+            error_msg = f"{response.reason} ({response.status_code})"
+            error = RequestError(error_msg, response_body)
 
-        try:
             _handle_southwest_error_code(error)
         except (RequestError, AirportCheckInError) as err:
             # Stop requesting after one attempt for special codes, as the requests won't succeed