Merge pull request #35 from EvickaStudio/dev

Dev: Add minor updates and patches

Author: EvickaStudio

main.py

@@ -9,7 +9,9 @@
 from src.core.service_locator import ServiceLocator
 from src.core.services import initialize_services
 from src.core.utils.retry import with_retry
+from src.infrastructure.http.request_manager import request_manager
 from src.infrastructure.logging.setup import setup_logging
+from src.services.moodle.api import MoodleAPI
 from src.services.moodle.notification_handler import MoodleNotificationHandler
 from src.ui.cli.screen import animate_logo, logo_lines
 
@@ -87,9 +89,27 @@ def calculate_sleep_time(consecutive_errors: int, base_interval: int) -> float:
 def run_main_loop(config, moodle_handler, notification_processor) -> None:
     """Run the main application loop."""
     consecutive_errors = 0
+    # Session refresh interval in hours
+    session_refresh_interval = 24.0
+
+    # Get Moodle API instance from service locator
+    locator = ServiceLocator()
+    moodle_api = locator.get("moodle_api", MoodleAPI)
 
     while True:
         try:
+            # Check if session needs to be refreshed (older than 24 hours)
+            if request_manager.session_age_hours >= session_refresh_interval:
+                logging.info(
+                    f"Session is {request_manager.session_age_hours:.2f} hours old. Refreshing..."
+                )
+                if moodle_api.refresh_session():
+                    logging.info("Session successfully refreshed")
+                else:
+                    logging.error(
+                        "Failed to refresh session. Continuing with existing session."
+                    )
+
             success = fetch_and_process(moodle_handler, notification_processor)
             if success:
                 consecutive_errors = 0

src/core/version.py

@@ -1,3 +1,3 @@
 """Version information for MoodleMate."""
 
-__version__ = "2.0.2"
+__version__ = "2.1.0"

src/infrastructure/http/request_manager.py

@@ -1,3 +1,4 @@
+import time
 from typing import Optional
 
 import requests
@@ -10,6 +11,7 @@ class RequestManager:
 
     _instance: Optional["RequestManager"] = None
     _session: Optional[requests.Session] = None
+    _session_created_at: float = 0
 
     def __new__(cls) -> "RequestManager":
         if cls._instance is None:
@@ -19,13 +21,18 @@ def __new__(cls) -> "RequestManager":
 
     def _setup_session(self) -> None:
         """Setup the global session with default headers."""
+        # Close existing session if it exists
+        if self._session is not None:
+            self._session.close()
+
         self._session = requests.Session()
         self._session.headers.update(
             {
                 "User-Agent": f"MoodleMate/{__version__} (+https://github.com/EvickaStudio/Moodle-Mate)",
                 "Content-Type": "application/x-www-form-urlencoded",
             }
         )
+        self._session_created_at = time.time()
 
     @property
     def session(self) -> requests.Session:
@@ -42,6 +49,17 @@ def update_headers(self, headers: dict) -> None:
         assert self._session is not None
         self._session.headers.update(headers)
 
+    def reset_session(self) -> None:
+        """Reset the session completely, creating a new one."""
+        self._setup_session()
+
+    @property
+    def session_age_hours(self) -> float:
+        """Return the age of the current session in hours."""
+        if self._session_created_at == 0:
+            return 0
+        return (time.time() - self._session_created_at) / 3600
+
 
 # Global instance
 request_manager = RequestManager()

src/services/moodle/api.py

@@ -31,12 +31,16 @@ def _init_api(self, url: Optional[str] = None):
                 "Content-Type": "application/x-www-form-urlencoded",
             }
         )
-        self.token = None
-        self.userid = None
+        self.token: Optional[str] = None
+        self.userid: Optional[int] = None
+        self._username: Optional[str] = None
+        self._password: Optional[str] = None
 
     def login(self, username: str, password: str) -> bool:
         """
         Logs in to the Moodle instance using the provided username and password.
+
+        Stores credentials securely for session refresh if successful.
         """
         if not username:
             raise ValueError("Username is required")
@@ -55,6 +59,9 @@ def login(self, username: str, password: str) -> bool:
 
             if "token" in response.json():
                 self.token = response.json()["token"]
+                # Store credentials for session refresh
+                self._username = username
+                self._password = password
                 logger.info("Login successful")
                 return True
 
@@ -65,6 +72,26 @@ def login(self, username: str, password: str) -> bool:
             logger.error("Request to Moodle failed: %s", e)
             return False
 
+    def refresh_session(self) -> bool:
+        """
+        Refreshes the session by creating a new session and re-authenticating.
+        """
+        if not self._username or not self._password:
+            logger.error("Cannot refresh session: No stored credentials")
+            return False
+
+        logger.info("Refreshing Moodle session...")
+
+        # Reset the request manager's session
+        request_manager.reset_session()
+
+        # Update our session reference
+        self.session = request_manager.session
+
+        # Re-login with stored credentials
+        self.token = None
+        return self.login(self._username, self._password)
+
     def get_site_info(self) -> Optional[dict]:
         """
         Retrieves site information from the Moodle instance.