switch to selectolax, clean up, etc

Author: iiPythonx

pyproject.toml

@@ -6,10 +6,10 @@ authors = [
     { name = "iiPython", email = "[email protected]" }
 ]
 dependencies = [
-    "beautifulsoup4>=4.12.3",
     "click>=8.1.7",
     "requests>=2.32.3",
     "rich>=13.8.1",
+    "selectolax>=0.3.26",
     "selenium>=4.25.0",
     "typer>=0.12.5",
 ]

usps/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.0"
+__version__ = "0.9.1"

usps/tracking/__init__.py

@@ -6,6 +6,8 @@
 from datetime import datetime
 from dataclasses import dataclass
 
+from requests import Session
+
 # Typing
 @dataclass
 class Step:
@@ -32,14 +34,28 @@ class StatusNotAvailable(Exception):
 # Constants
 USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.3"
 
+SESSION = Session()
+SESSION.headers.update({
+    "Accept-Encoding": "gzip, deflate, br, zstd",
+    "Accept-Language": "en-US,en;q=0.5",
+    "Sec-Fetch-Dest": "document",
+    "Sec-Fetch-Site": "none",
+    "Sec-Fetch-User": "?1",
+    "Sec-GPC": "1",
+    "User-Agent": USER_AGENT,
+})
+
 # Handle actual tracking
-from .ups import UPSTracking  # noqa: E402
+from .ups import UPSTracking    # noqa: E402
 from .usps import USPSTracking  # noqa: E402
 
-UPS_PACKAGE_REGEX = re.compile(r"1Z[A-Z0-9]{6}[0-9]{10}")
+UPS_PACKAGE_REGEX = re.compile(r"^1Z[A-Z0-9]{6}[0-9]{10}$")
 
 def get_service(tracking_number: str) -> str:
-    return "UPS" if re.match(UPS_PACKAGE_REGEX, tracking_number) else "USPS"
+    if re.match(UPS_PACKAGE_REGEX, tracking_number):
+        return "UPS"
+
+    return "USPS"
 
 def track_package(tracking_number: str) -> Package:
-    return (UPSTracking if get_service(tracking_number) == "UPS" else USPSTracking).track_package(tracking_number)
+    return {"UPS": UPSTracking, "USPS": USPSTracking}[get_service(tracking_number)].track_package(tracking_number)

usps/tracking/ups.py

@@ -6,23 +6,9 @@
 from requests import Session
 
 from usps.timezones import LOCAL_TIMEZONE
-from usps.tracking import USER_AGENT, Package, Step, StatusNotAvailable
+from usps.tracking import Package, Step, StatusNotAvailable
 
 # Handle mapping
-UPS_CMS_MAPPINGS = {
-    "cms.stapp.jan": "January",
-    "cms.stapp.feb": "February",
-    "cms.stapp.mar": "March",
-    "cms.stapp.apr": "April",
-    "cms.stapp.may": "May",
-    "cms.stapp.jun": "June",
-    "cms.stapp.jul": "July",
-    "cms.stapp.aug": "August",
-    "cms.stapp.sep": "September",
-    "cms.stapp.oct": "October",
-    "cms.stapp.nov": "November",
-    "cms.stapp.dec": "December"
-}
 UPS_MILESTONE_MAPPINGS = {
     "we have your package": "Has Package",
     "departed from facility": "Left Facility",
@@ -31,18 +17,6 @@
     "out for delivery": "Delivering"
 }
 
-# Headers that need to exist for UPS to respond
-# I'm not sure why they check *these* headers, but ¯\_(ツ)_/¯
-UPS_HEADERS = {
-    "Accept-Encoding": "gzip, deflate, br, zstd",
-    "Accept-Language": "en-US,en;q=0.5",
-    "Sec-Fetch-Dest": "document",
-    "Sec-Fetch-Site": "none",
-    "Sec-Fetch-User": "?1",
-    "Sec-GPC": "1",
-    "User-Agent": USER_AGENT,
-}
-
 # Main class
 class UPSTracking:
     _session: Session | None = None
@@ -59,12 +33,12 @@ def track_package(cls, tracking_number: str) -> Package:
 
         try:
             if not cls._session.cookies:
-                cls._session.get("https://www.ups.com/track", headers = UPS_HEADERS, timeout = 1)
+                cls._session.get("https://www.ups.com/track", timeout = 1)
 
             response = cls._session.post(
                 "https://webapis.ups.com/track/api/Track/GetStatus?loc=en_US",
                 json = {"Locale": "en_US", "TrackingNumber": [tracking_number]},
-                headers = UPS_HEADERS | {
+                headers = {
                     "X-XSRF-TOKEN": cls._session.cookies["X-XSRF-TOKEN-ST"]
                 },
                 timeout = 1
@@ -87,9 +61,11 @@ def track_package(cls, tracking_number: str) -> Package:
         estimated_delivery = None
         if data["scheduledDeliveryDateDetail"]:
             delivery = data["scheduledDeliveryDateDetail"]
-            month, year = UPS_CMS_MAPPINGS[delivery["monthCMSKey"]], datetime.now().year
             estimated_delivery = [
-                datetime.strptime(f"{month} {delivery['dayNum']} {time.replace('.', '')}", "%B %d %I:%M %p").replace(year = year)
+                datetime.strptime(
+                    f"{delivery['monthCMSKey'].split('.')[-1]} {delivery['dayNum']} {time.replace('.', '')}",
+                    "%b %d %I:%M %p"
+                ).replace(year = datetime.now().year)
                 for time in data["packageStatusTime"].split(" - ")
             ]