Update app.py

app.py

@@ -1,27 +1,32 @@
 from fastapi import FastAPI, Request
 from user_agents import parse
-import ipinfo
+import geoip2.database
 import os
+from pathlib import Path
 
 app = FastAPI()
 
-# Get your free IPinfo token from ipinfo.io and set as environment variable
-IPINFO_TOKEN = os.getenv("IPINFO_TOKEN", "your_token_here")  # Replace with your token
+# Paths to your downloaded databases (adjust if needed)
+BASE_DIR = Path(__file__).resolve().parent
+CITY_DB_PATH = BASE_DIR / "databases" / "GeoLite2-City.mmdb"
+ASN_DB_PATH  = BASE_DIR / "databases" / "GeoLite2-ASN.mmdb"
 
-handler = ipinfo.getHandler(IPINFO_TOKEN)
+# Load databases (do this once at startup)
+city_reader = geoip2.database.Reader(str(CITY_DB_PATH))
+asn_reader  = geoip2.database.Reader(str(ASN_DB_PATH))
 
 @app.get("/track")
 async def track_ip(request: Request):
     # Get client IP (handle proxies)
     client_ip = request.headers.get("X-Forwarded-For")
     if client_ip:
-        client_ip = client_ip.split(",")[0].strip()  # Take the first IP in the chain
+        client_ip = client_ip.split(",")[0].strip()
     else:
         client_ip = request.client.host
-    
-    # Get User-Agent and parse browser/device info
-    user_agent_str = request.headers.get("User-Agent", "Unknown")
-    ua = parse(user_agent_str)
+
+    # Browser / Device info
+    ua_string = request.headers.get("User-Agent", "Unknown")
+    ua = parse(ua_string)
     browser_info = {
         "browser": ua.browser.family,
         "version": ua.browser.version_string,
@@ -31,22 +36,50 @@ async def track_ip(request: Request):
         "is_mobile": ua.is_mobile,
         "is_bot": ua.is_bot
     }
-    
-    # Get IP details (geolocation, etc.)
+
+    # Geolocation lookup (offline!)
+    geo_data = {"error": "IP not found"}
+    asn_data = {}
+
     try:
-        ip_details = handler.getDetails(client_ip).all
+        city_response = city_reader.city(client_ip)
+        geo_data = {
+            "country": city_response.country.name,
+            "country_code": city_response.country.iso_code,
+            "city": city_response.city.name,
+            "region": city_response.subdivisions.most_specific.name,
+            "region_code": city_response.subdivisions.most_specific.iso_code,
+            "postal": city_response.postal.code,
+            "location": {
+                "latitude": city_response.location.latitude,
+                "longitude": city_response.location.longitude,
+                "accuracy_radius": city_response.location.accuracy_radius,
+                "timezone": city_response.location.time_zone
+            }
+        }
+    except geoip2.errors.AddressNotFoundError:
+        pass
     except Exception as e:
-        ip_details = {"error": str(e)}
-    
-    # Compile all info
-    tracked_data = {
+        geo_data = {"error": str(e)}
+
+    try:
+        asn_response = asn_reader.asn(client_ip)
+        asn_data = {
+            "asn": asn_response.autonomous_system_number,
+            "org": asn_response.autonomous_system_organization
+        }
+    except:
+        pass
+
+    return {
         "ip": client_ip,
         "browser": browser_info,
-        "geolocation": ip_details
+        "geolocation": geo_data,
+        "asn": asn_data
     }
-    
-    return tracked_data
 
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+# Optional: close readers on shutdown (good practice)
+@app.on_event("shutdown")
+def close_readers():
+    city_reader.close()
+    asn_reader.close()