Update main.py

main.py

@@ -1,9 +1,8 @@
 import requests
 import random
 import time
-import sys
 import threading
-from flask import Flask, request, jsonify
+from flask import Flask, request, Response
 
 PROXY_LIST_URL = "https://proxies.typegpt.net/ips.txt"
 proxies_cache = []
@@ -28,70 +27,49 @@ def get_random_proxy(proxies):
         return None
     return random.choice(proxies)
 
-def make_request(proxy, target_url):
-    """Send a GET request through the given proxy to target URL."""
-    proxies = {"http": proxy, "https": proxy}
-    try:
-        print(f"[INFO] Using proxy: {proxy}")
-        resp = requests.get(target_url, proxies=proxies, timeout=15)
-        if resp.status_code == 200:
-            print(f"[SUCCESS] Proxy working! Status: {resp.status_code}")
-            return True, resp.text[:200]
-        else:
-            print(f"[WARN] Proxy responded with status {resp.status_code}")
-            return False, f"Status {resp.status_code}"
-    except Exception as e:
-        print(f"[ERROR] Proxy failed: {proxy} | {e}")
-        return False, str(e)
-
-def proxy_loop(target_url):
-    """Background loop to test proxies continuously."""
+def refresh_proxies_loop():
+    """Background thread: refresh proxy list every 5 minutes."""
     global proxies_cache, last_refresh
     while True:
         if time.time() - last_refresh > 300 or not proxies_cache:
             proxies_cache = fetch_proxies()
             last_refresh = time.time()
             print(f"[INFO] Refreshed {len(proxies_cache)} proxies.")
-
-        proxy = get_random_proxy(proxies_cache)
-        if proxy:
-            make_request(proxy, target_url)
-        time.sleep(10)
-
-# ---- Flask Endpoints ----
+        time.sleep(60)
 
 @app.route("/health")
 def health():
     return "Healthy", 200
 
-@app.route("/test")
-def test_proxy():
-    target_url = request.args.get("url")
-    if not target_url:
-        return jsonify({"error": "Missing ?url=<target_url>"}), 400
+@app.route("/<path:target_url>")
+def proxy_request(target_url):
+    """Catch-all route: forward request to target_url using random proxy."""
+    if not target_url.startswith("http"):
+        target_url = "http://" + target_url  # allow shorthand
 
     proxy = get_random_proxy(proxies_cache)
     if not proxy:
-        return jsonify({"error": "No proxies available"}), 500
+        return {"error": "No proxies available"}, 500
 
-    ok, msg = make_request(proxy, target_url)
-    if ok:
-        return jsonify({"status": "Proxy working!", "proxy": proxy, "response_snippet": msg}), 200
-    else:
-        return jsonify({"status": "Proxy failed", "proxy": proxy, "error": msg}), 502
-
-def main():
-    if len(sys.argv) < 2:
-        print("Usage: python main.py <target_url>")
-        sys.exit(1)
+    proxies = {"http": proxy, "https": proxy}
+    try:
+        print(f"[INFO] Forwarding to {target_url} via {proxy}")
+        resp = requests.get(target_url, proxies=proxies, timeout=15)
 
-    target_url = sys.argv[1]
+        return Response(
+            resp.content,
+            status=resp.status_code,
+            headers=dict(resp.headers),
+        )
+    except Exception as e:
+        return {"error": f"Proxy failed: {proxy}", "details": str(e)}, 502
 
-    # Start background thread
-    t = threading.Thread(target=proxy_loop, args=(target_url,), daemon=True)
+def main():
+    # Start proxy refresher thread
+    t = threading.Thread(target=refresh_proxies_loop, daemon=True)
     t.start()
 
-    # Start Flask server
+    # Run Flask server
     app.run(host="0.0.0.0", port=5000)
 
 if __name__ == "__main__":