pysportbot 0.0.16__py3-none-any.whl → 0.0.17__py3-none-any.whl

pysportbot/authenticator.py

@@ -30,6 +30,27 @@ class Authenticator:
         self.user_id = None
         # Centre selected by the user
         self.centre = centre
+        # Timeout of requests
+        self.timeout = (5, 10)
+
+    def is_session_valid(self) -> bool:
+        """
+        Check if the current session is still valid.
+
+        Returns:
+            bool: True if session is valid, False otherwise.
+        """
+        try:
+            response = self.session.post(Endpoints.USER, headers=self.headers, timeout=self.timeout)
+            if response.status_code == 200:
+                response_dict = json.loads(response.content.decode("utf-8"))
+                return bool(response_dict.get("user"))
+            else:
+                logger.debug(f"Session validation failed with status code: {response.status_code}")
+                return False
+        except Exception as e:
+            logger.debug(f"Session validation failed with exception: {e}")
+            return False
 
     def login(self, email: str, password: str) -> None:
         """
@@ -46,11 +67,12 @@ class Authenticator:
 
         # Step 1: Fetch CSRF token
         logger.debug(f"GET {Endpoints.USER_LOGIN} | Headers: {json.dumps(self.headers, indent=2)}")
-        response = self.session.get(Endpoints.USER_LOGIN, headers=self.headers)
+        response = self.session.get(Endpoints.USER_LOGIN, headers=self.headers, timeout=self.timeout)
         if response.status_code != 200:
             logger.error(f"Failed to fetch login popup: {response.status_code}")
             raise RuntimeError(ErrorMessages.failed_fetch("login popup"))
         logger.debug("Login popup fetched successfully.")
+
         soup = BeautifulSoup(response.text, "html.parser")
         csrf_tag = soup.find("input", {"name": "_csrf_token"})
         if csrf_tag is None:
@@ -70,7 +92,7 @@ class Authenticator:
             f"POST {Endpoints.LOGIN_CHECK} | Headers: {json.dumps(self.headers, indent=2)} | "
             f"Payload: {json.dumps(payload, indent=2)}"
         )
-        response = self.session.post(Endpoints.LOGIN_CHECK, data=payload, headers=self.headers)
+        response = self.session.post(Endpoints.LOGIN_CHECK, data=payload, headers=self.headers, timeout=self.timeout)
         if response.status_code != 200:
             logger.error(f"Login failed: {response.status_code}, {response.text}")
             raise ValueError(ErrorMessages.failed_login())
@@ -79,7 +101,7 @@ class Authenticator:
         # Step 3: Retrieve credentials for Nubapp
         cred_endpoint = Endpoints.get_cred_endpoint(self.centre)
         logger.debug(f"GET {cred_endpoint} | Headers: {json.dumps(self.headers, indent=2)}")
-        response = self.session.get(cred_endpoint, headers=self.headers)
+        response = self.session.get(cred_endpoint, headers=self.headers, timeout=self.timeout)
         if response.status_code != 200:
             logger.error(f"Failed to retrieve Nubapp credentials: {response.status_code}")
             raise RuntimeError(ErrorMessages.failed_fetch("credentials"))
@@ -94,14 +116,16 @@ class Authenticator:
             f"GET {Endpoints.NUBAP_LOGIN} | Headers: {json.dumps(self.headers, indent=2)} | "
             f"Params: {json.dumps(nubapp_creds, indent=2)}"
         )
-        response = self.session.get(Endpoints.NUBAP_LOGIN, headers=self.headers, params=nubapp_creds)
+        response = self.session.get(
+            Endpoints.NUBAP_LOGIN, headers=self.headers, params=nubapp_creds, timeout=self.timeout
+        )
         if response.status_code != 200:
             logger.error(f"Login to Nubapp failed: {response.status_code}, {response.text}")
             raise ValueError(ErrorMessages.failed_login_nubapp())
         logger.info("Login to Nubapp successful!")
 
         # Step 5: Get user information
-        response = self.session.post(Endpoints.USER, headers=self.headers, allow_redirects=True)
+        response = self.session.post(Endpoints.USER, headers=self.headers, allow_redirects=True, timeout=self.timeout)
 
         if response.status_code == 200:
             response_dict = json.loads(response.content.decode("utf-8"))

pysportbot/service/booking.py

@@ -117,19 +117,23 @@ def schedule_bookings(
             logger.debug(f"Re-authenticating in {reauth_time:.2f} seconds.")
             time.sleep(reauth_time)
 
-        # Re-authenticate before booking
-        logger.info("Re-authenticating before booking.")
+        # Re-authenticate before booking if necessary
         try:
-            bot.login(config["email"], config["password"], config["centre"])
-        except Exception:
-            logger.warning("Re-authentication failed before booking execution.")
+            if bot._auth and bot._auth.is_session_valid():
+                logger.info("Session still valid. Skipping re-authentication.")
+            else:
+                logger.info("Attempting re-authenticating before booking.")
+                bot.login(config["email"], config["password"], config["centre"])
+
+        except Exception as e:
+            logger.warning(f"Re-authentication failed before booking execution with {e}.")
 
         # Wait the remaining time until execution
         now = datetime.now(pytz.timezone(time_zone))
         remaining_time = (execution_time - now).total_seconds()
         if remaining_time > 0:
             logger.info(f"Waiting {remaining_time:.2f} seconds until booking execution.")
-            time.sleep(remaining_time)
+        time.sleep(max(0, remaining_time))
 
     # Global booking delay
     if booking_delay > 0:

{pysportbot-0.0.16.dist-info → pysportbot-0.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysportbot
-Version: 0.0.16
+Version: 0.0.17
 Summary: A python-based bot for automatic resasports slot booking
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch

{pysportbot-0.0.16.dist-info → pysportbot-0.0.17.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pysportbot/__init__.py,sha256=tZwOIuLO1-a3d4KKA5nNfXfN6PjJxem_hxyuff9utk4,6425
 pysportbot/activities.py,sha256=MATA0feSsDSoeFnHa4Y_dLv3gw4P6MFg-0kAEybqVIY,4991
-pysportbot/authenticator.py,sha256=t_5x9anmsfh0SwpN9JSemzqKv72Hwt__Q8mQBowIOIo,5183
+pysportbot/authenticator.py,sha256=rs3QG9aEFxG0THMm-7STqnfMlvBG3a56KnBYMYNvSmQ,6142
 pysportbot/bookings.py,sha256=W91AYGPu0sCpGliuiVdlENsoGYzH8P6v-SyKisbSb7g,3127
 pysportbot/centres.py,sha256=FTK-tXUOxiJvLCHP6Bk9XEQKODQZOwwkYLlioSJPBEk,3399
 pysportbot/endpoints.py,sha256=ANh5JAbdzyZQ-i4ODrhYlskPpU1gkBrw9UhMC7kRSvU,1353
 pysportbot/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pysportbot/service/__main__.py,sha256=gsKfDMOmsVC3LHCQs0Dmp7YWJBlZeGcTsX-Mx4mk6ro,1496
-pysportbot/service/booking.py,sha256=oNLdY3nhs3ulAD-yFoc6YhgohbSN16xRYjEL8iyHkZg,5695
+pysportbot/service/booking.py,sha256=ifeo1LbtPvls-hpQOZW5TvoqeZ1MJxIipim4RHTH7nI,5908
 pysportbot/service/config_loader.py,sha256=t086yaAyAKkCJTpxedwhyJ7QqSf5XROGDzjrFLsUxJE,179
 pysportbot/service/config_validator.py,sha256=0P_pcXU7s3T3asODqFtv3mSp1HyPoVBphE4Qe1mxcps,2615
 pysportbot/service/scheduling.py,sha256=trz4zweZB2W9rwWAnW9Y6YkCo-f4dqtKyhaY_yqpJ-Y,2024
@@ -17,7 +17,7 @@ pysportbot/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 pysportbot/utils/errors.py,sha256=IRarfGtk1tETxUGAhPAIbeits_u2tJvVCGTtkHIdYFQ,5146
 pysportbot/utils/logger.py,sha256=ANayMEeeAIVGKvITAxOFm2EdCbzBBTpNywuytAr4Z90,5366
 pysportbot/utils/time.py,sha256=VZSW8AxFIoFD5ZSmLUPcwawp6PmpkcxNjP3Db-Hl_fw,1244
-pysportbot-0.0.16.dist-info/LICENSE,sha256=6ov3DypdEVYpp2pn_B1MniKWO5C9iDA4O6PGcbork6c,1077
-pysportbot-0.0.16.dist-info/METADATA,sha256=vpDzfb3iMcE8y0_YCpbNDntjRA9Gn8bAym06HDe6D8I,8045
-pysportbot-0.0.16.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pysportbot-0.0.16.dist-info/RECORD,,
+pysportbot-0.0.17.dist-info/LICENSE,sha256=6ov3DypdEVYpp2pn_B1MniKWO5C9iDA4O6PGcbork6c,1077
+pysportbot-0.0.17.dist-info/METADATA,sha256=PW2ipkWtyRp83h_Zd1fTre_5LTuKFfGR2AT-96pnmno,8045
+pysportbot-0.0.17.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pysportbot-0.0.17.dist-info/RECORD,,