FlightRadarAPI 1.5.1__tar.gz → 1.5.2__tar.gz

{flightradarapi-1.5.1 → flightradarapi-1.5.2}/.gitignore

@@ -19,6 +19,11 @@ coverage.xml
 # Node.js
 node_modules/
 
+# Version managers (local dev only)
+.tool-versions
+.python-version
+.nvmrc
+
 # Editors / OS
 .idea/
 .vscode/

{flightradarapi-1.5.1 → flightradarapi-1.5.2}/FlightRadarAPI/__init__.py

@@ -12,7 +12,7 @@ https://www.flightradar24.com/terms-and-conditions
 """
 
 __author__ = "Jean Loui Bernard Silva de Jesus"
-__version__ = "1.5.1"
+__version__ = "1.5.2"
 
 from .api import FlightRadar24API
 from .core import Countries

{flightradarapi-1.5.1 → flightradarapi-1.5.2}/FlightRadarAPI/api.py

@@ -14,6 +14,13 @@ from .flight_tracker_config import FlightTrackerConfig
 from .parsers import parse_airlines_html, parse_airports_html
 from .request import APIClient, RetryPolicy
 
+# Some FR24 live-feed backends answer 200 with a well-formed envelope but no
+# flight entries -- indistinguishable from a legitimately empty result. The
+# "AWSALB" cookie then pins the session to that backend, so dropping it is what
+# makes the load balancer re-roll on retry.
+FEED_STICKY_COOKIES = ("AWSALB", "AWSALBCORS")
+FEED_EMPTY_RETRIES = 4
+
 
 class FlightRadar24API:
     """
@@ -342,24 +349,31 @@ class FlightRadar24API:
         if registration is not None: request_params["reg"] = registration
         if aircraft_type is not None: request_params["type"] = aircraft_type
 
-        # Get all flights from Data Live FlightRadar24.
-        response = self.__client.request(
-            Core.real_time_flight_tracker_data_url,
-            params=request_params,
-            headers=Core.json_headers,
-            timeout=self.timeout,
-        )
-        content = response.get_json_content()
-
         flights: List[Flight] = list()
 
-        for flight_id, flight_info in content.items():
+        for _ in range(FEED_EMPTY_RETRIES + 1):
+            # Get all flights from Data Live FlightRadar24.
+            response = self.__client.request(
+                Core.real_time_flight_tracker_data_url,
+                params=request_params,
+                headers=Core.json_headers,
+                timeout=self.timeout,
+            )
+            content = response.get_json_content()
 
             # Get flights only.
-            if not flight_id[0].isnumeric():
-                continue
-
-            flights.append(Flight(flight_id, flight_info))
+            flights = [
+                Flight(flight_id, flight_info)
+                for flight_id, flight_info in content.items()
+                if flight_id[0].isnumeric()
+            ]
+
+            # "full_count": 0 means the feed really has nothing to report.
+            if flights or not content.get("full_count"):
+                break
+
+            for cookie_name in FEED_STICKY_COOKIES:
+                self.__client.delete_cookie(cookie_name)
 
         if details:
             with ThreadPoolExecutor(max_workers=self.max_workers) as executor:

{flightradarapi-1.5.1 → flightradarapi-1.5.2}/FlightRadarAPI/request.py

@@ -122,6 +122,17 @@ class APIClient:
         """Clear all cookies from the session."""
         self.__session.cookies.clear()
 
+    def delete_cookie(self, name: str) -> None:
+        """Drop a single cookie, leaving the rest of the jar intact.
+
+        Sheds load-balancer stickiness without discarding the login session,
+        which lives in the same jar.
+        """
+        try:
+            del self.__session.cookies[name]
+        except KeyError:
+            pass
+
 
 class APIRequest:
     """

{flightradarapi-1.5.1 → flightradarapi-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: FlightRadarAPI
-Version: 1.5.1
+Version: 1.5.2
 Summary: SDK for FlightRadar24
 Project-URL: Homepage, https://github.com/JeanExtreme002/FlightRadarAPI
 Project-URL: Source Code, https://github.com/JeanExtreme002/FlightRadarAPI

flightradarapi-1.5.1/.tool-versions

@@ -1 +0,0 @@
-python 3.11.0