usps please undo whatever you just did

Author: iiPythonx

usps/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.1"
+__version__ = "0.8.2"

usps/tracking/__init__.py

@@ -21,6 +21,7 @@ class Package:
 
 # Constants
 USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:131.0) Gecko/20100101 Firefox/131.0"
+USER_AGENT_CHROME = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.3"
 
 # Handle actual tracking
 from .ups import UPSTracking  # noqa: E402

usps/tracking/ups.py

@@ -44,10 +44,10 @@ def track_package(cls, tracking_number: str) -> Package:
         if cls._session is None:
             cls._session = Session()
 
-        if not cls._session.cookies:
-            cls._session.get("https://www.ups.com/track", headers = {"User-Agent": USER_AGENT})
-
         try:
+            if not cls._session.cookies:
+                cls._session.get("https://www.ups.com/track", headers = {"User-Agent": USER_AGENT}, timeout = 5)
+
             response = cls._session.post(
                 "https://webapis.ups.com/track/api/Track/GetStatus?loc=en_US",
                 json = {"Locale": "en_US", "TrackingNumber": [tracking_number]},
@@ -65,7 +65,7 @@ def track_package(cls, tracking_number: str) -> Package:
                 raise StatusNotAvailable("API request failed")
 
             cls._failcount += 1
-            cls._session.cookies.clear()
+            cls._session = Session()
             return cls.track_package(tracking_number)
 
         if response["statusCode"] != "200":

usps/tracking/usps.py

@@ -14,7 +14,7 @@
 from selenium.webdriver.firefox.options import Options
 
 from usps.storage import security
-from . import USER_AGENT, Package, Step
+from . import USER_AGENT_CHROME, Package, Step
 from .exceptions import MissingElement, NoTextInElement, InvalidElementType, StatusNotAvailable
 
 # Handle status mappings
@@ -34,7 +34,8 @@
     "arrived at usps facility": "At Facility",
     "departed usps facility": "Left Facility",
     "package acceptance pending": "Accepted",
-    "garage / other door / other location at address": "Delivered"
+    "garage / other door / other location at address": "Delivered",
+    "left with individual": "Delivered"
 }
 
 # BS4 wrappers
@@ -76,6 +77,13 @@ def __generate_security(cls, url: str) -> str:
         with Status("[cyan]Generating cookies...", spinner = "arc"):
             options = Options()
             options.add_argument("--headless")
+
+            # Setup profile with user agent
+            profile = webdriver.FirefoxProfile()
+            profile.set_preference("general.useragent.override", USER_AGENT_CHROME)
+    
+            # Handle instance creation
+            options.profile = profile
             instance = webdriver.Firefox(options = options)
             instance.get(url)
 
@@ -108,7 +116,7 @@ def track_package(cls, tracking_number: str) -> Package:
 
         else:
             page = BeautifulSoup(
-                cls._session.get(url, cookies = cls._cookies, headers = {"User-Agent": USER_AGENT}).text,
+                cls._session.get(url, cookies = cls._cookies, headers = {"User-Agent": USER_AGENT_CHROME}).text,
                 "html.parser"
             )
             if "originalHeaders" in str(page):