proxy-scraper-cli 1.17.0__tar.gz → 1.19.0__tar.gz

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy-scraper-cli
-Version: 1.17.0
+Version: 1.19.0
 Summary: Finds free HTTP, SOCKS4 and SOCKS5 proxies that actually work: 700+ sources, real checks, honeypot filtering and a rotating local proxy server.
 Author: Maximilian Feix
 License-Expression: MIT
@@ -704,6 +704,7 @@ pip download requests   # git, pip, npm & co. now go through the pool
     types: socks5
     https: true
     min-uptime: 90        # on the list for 90 %+ of the week
+    min-speed: 100        # optional: downloaded 100+ KB/s in the last check
     works-on: google      # optional: google, reddit, amazon
     recheck: true         # optional: check them again from the runner
 - run: curl -x "${{ steps.proxies.outputs.proxy }}" https://api.ipify.org
@@ -716,8 +717,12 @@ pip download requests   # git, pip, npm & co. now go through the pool
 ```bash
 curl -x "$(proxy-scraper --pick --https-only --min-uptime 90)" https://api.ipify.org
 proxy-scraper --pick 10 --country DE --works-on google > de.txt
+proxy-scraper --pick 5 --min-speed 200     # only ones that downloaded 200+ KB/s
 ```
 
+"Fastest first" means the first answer plus the download speed measured in the last check – in a test with real
+pages, the 25 fastest by download loaded four times as many pages as the 25 quickest to answer a tiny request.
+
 **Without installing anything** – straight from the live list
 
 ```bash
@@ -762,7 +767,7 @@ curl.exe -x (Get-Content "$run\all.txt" -TotalCount 1) http://api.ipify.org
 | `--discover` | search GitHub for new sources right now |
 | `--no-cache` | download every list again (unchanged ones are normally skipped via ETag) |
 | `--list-sources [N]` | show the source ranking (add `--json` for scripts: url, status, hit rate, checks, last change) |
-| `--pick [N]` | print N proxies (default 1) from the hourly checked list and exit – no scan, same filters, plus `--min-uptime PERCENT` and `--works-on google,reddit,…` |
+| `--pick [N]` | print N proxies (default 1) from the hourly checked list and exit – no scan, same filters, plus `--min-uptime PERCENT`, `--min-speed KBPS` and `--works-on google,reddit,…` |
 | `--serve-host ADDR` | where the proxy server listens (default `127.0.0.1`; `0.0.0.0` for Docker, with a warning) |
 | `--serve-password SECRET` | clients must send this password in the proxy login; better set `PROXY_SCRAPER_SERVE_PASSWORD` |
 | `--rotate STRATEGY` · `--sticky SEC` | how the proxy server picks proxies, see [above](#proxy-server) |

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/README.md

@@ -663,6 +663,7 @@ pip download requests   # git, pip, npm & co. now go through the pool
     types: socks5
     https: true
     min-uptime: 90        # on the list for 90 %+ of the week
+    min-speed: 100        # optional: downloaded 100+ KB/s in the last check
     works-on: google      # optional: google, reddit, amazon
     recheck: true         # optional: check them again from the runner
 - run: curl -x "${{ steps.proxies.outputs.proxy }}" https://api.ipify.org
@@ -675,8 +676,12 @@ pip download requests   # git, pip, npm & co. now go through the pool
 ```bash
 curl -x "$(proxy-scraper --pick --https-only --min-uptime 90)" https://api.ipify.org
 proxy-scraper --pick 10 --country DE --works-on google > de.txt
+proxy-scraper --pick 5 --min-speed 200     # only ones that downloaded 200+ KB/s
 ```
 
+"Fastest first" means the first answer plus the download speed measured in the last check – in a test with real
+pages, the 25 fastest by download loaded four times as many pages as the 25 quickest to answer a tiny request.
+
 **Without installing anything** – straight from the live list
 
 ```bash
@@ -721,7 +726,7 @@ curl.exe -x (Get-Content "$run\all.txt" -TotalCount 1) http://api.ipify.org
 | `--discover` | search GitHub for new sources right now |
 | `--no-cache` | download every list again (unchanged ones are normally skipped via ETag) |
 | `--list-sources [N]` | show the source ranking (add `--json` for scripts: url, status, hit rate, checks, last change) |
-| `--pick [N]` | print N proxies (default 1) from the hourly checked list and exit – no scan, same filters, plus `--min-uptime PERCENT` and `--works-on google,reddit,…` |
+| `--pick [N]` | print N proxies (default 1) from the hourly checked list and exit – no scan, same filters, plus `--min-uptime PERCENT`, `--min-speed KBPS` and `--works-on google,reddit,…` |
 | `--serve-host ADDR` | where the proxy server listens (default `127.0.0.1`; `0.0.0.0` for Docker, with a warning) |
 | `--serve-password SECRET` | clients must send this password in the proxy login; better set `PROXY_SCRAPER_SERVE_PASSWORD` |
 | `--rotate STRATEGY` · `--sticky SEC` | how the proxy server picks proxies, see [above](#proxy-server) |

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxy_scraper_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy-scraper-cli
-Version: 1.17.0
+Version: 1.19.0
 Summary: Finds free HTTP, SOCKS4 and SOCKS5 proxies that actually work: 700+ sources, real checks, honeypot filtering and a rotating local proxy server.
 Author: Maximilian Feix
 License-Expression: MIT
@@ -704,6 +704,7 @@ pip download requests   # git, pip, npm & co. now go through the pool
     types: socks5
     https: true
     min-uptime: 90        # on the list for 90 %+ of the week
+    min-speed: 100        # optional: downloaded 100+ KB/s in the last check
     works-on: google      # optional: google, reddit, amazon
     recheck: true         # optional: check them again from the runner
 - run: curl -x "${{ steps.proxies.outputs.proxy }}" https://api.ipify.org
@@ -716,8 +717,12 @@ pip download requests   # git, pip, npm & co. now go through the pool
 ```bash
 curl -x "$(proxy-scraper --pick --https-only --min-uptime 90)" https://api.ipify.org
 proxy-scraper --pick 10 --country DE --works-on google > de.txt
+proxy-scraper --pick 5 --min-speed 200     # only ones that downloaded 200+ KB/s
 ```
 
+"Fastest first" means the first answer plus the download speed measured in the last check – in a test with real
+pages, the 25 fastest by download loaded four times as many pages as the 25 quickest to answer a tiny request.
+
 **Without installing anything** – straight from the live list
 
 ```bash
@@ -762,7 +767,7 @@ curl.exe -x (Get-Content "$run\all.txt" -TotalCount 1) http://api.ipify.org
 | `--discover` | search GitHub for new sources right now |
 | `--no-cache` | download every list again (unchanged ones are normally skipped via ETag) |
 | `--list-sources [N]` | show the source ranking (add `--json` for scripts: url, status, hit rate, checks, last change) |
-| `--pick [N]` | print N proxies (default 1) from the hourly checked list and exit – no scan, same filters, plus `--min-uptime PERCENT` and `--works-on google,reddit,…` |
+| `--pick [N]` | print N proxies (default 1) from the hourly checked list and exit – no scan, same filters, plus `--min-uptime PERCENT`, `--min-speed KBPS` and `--works-on google,reddit,…` |
 | `--serve-host ADDR` | where the proxy server listens (default `127.0.0.1`; `0.0.0.0` for Docker, with a warning) |
 | `--serve-password SECRET` | clients must send this password in the proxy login; better set `PROXY_SCRAPER_SERVE_PASSWORD` |
 | `--rotate STRATEGY` · `--sticky SEC` | how the proxy server picks proxies, see [above](#proxy-server) |

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxy_scraper_cli.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ proxyscraper/pipeline.py
 proxyscraper/preferences.py
 proxyscraper/proxypages.py
 proxyscraper/publish.py
+proxyscraper/ranking.py
 proxyscraper/report.py
 proxyscraper/runsteps.py
 proxyscraper/sites.py
@@ -109,6 +110,7 @@ tests/test_server_fixes.py
 tests/test_sites.py
 tests/test_sources_json.py
 tests/test_speed.py
+tests/test_speed_ranking.py
 tests/test_tamper.py
 tests/test_targets.py
 tests/test_ui.py

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/__init__.py

@@ -1,7 +1,7 @@
 """proxy-scraper: collects public HTTP/SOCKS4/SOCKS5 proxies from hundreds of sources, checks them
 in parallel with its own protocol handshakes and learns which sources deliver good proxies."""
 
-__version__ = "1.17.0"
+__version__ = "1.19.0"
 
 
 def __getattr__(name):

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/action.py

@@ -63,7 +63,7 @@ def main() -> int:
         filters = {"types": _list("PS_TYPES") or ["http", "socks4", "socks5"],
                    "countries": os.environ.get("PS_COUNTRIES", "").strip(),
                    "https": _flag("PS_HTTPS"), "min_uptime": _number("PS_MIN_UPTIME", 0),
-                   "works_on": _list("PS_WORKS_ON")}
+                   "min_speed": _number("PS_MIN_SPEED", 0), "works_on": _list("PS_WORKS_ON")}
         # a recheck starts from all of them – the limit applies to what still works from here
         found = live_proxies(**filters, limit=0 if recheck else limit)
     except (InputError, ValueError) as e:
@@ -75,7 +75,9 @@ def main() -> int:
     urls = [p.url for p in found]
     if recheck and urls:
         print(f"Checking {len(urls)} proxies again from this runner …")
-        urls = [r.url for r in sorted(check_proxies(urls, https=filters["https"]), key=lambda r: r.latency)]
+        # in the live list's order: it's ranked by page load, the recheck only knows the first answer
+        working = {r.url for r in check_proxies(urls, https=filters["https"])}
+        urls = [u for u in urls if u in working]
     if limit:
         urls = urls[:limit]
     # a file of its own per step: a job may use the action twice (socks5 in one step, http in the next)

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/agent.py

@@ -34,6 +34,7 @@ from .netio import http_get
 from .pages import SITE_URL
 from .parsing import PROXY_TYPES, make_key
 from .publish import RAW_BASE
+from .ranking import best_first
 from .server import ProxyPool, RotatingServer
 from .sites import SITES
 
@@ -180,11 +181,11 @@ def select(rows: Iterable[dict], protocol: str = "any", countries: Iterable[str]
            elite_only: bool = False, exclude_datacenter: bool = False, exclude_blocklisted: bool = False,
            stable_only: bool = False, max_latency_ms: int = 0, run_hours: int = 1, min_uptime: int = 0,
            works_on: Iterable[str] = (), min_speed_kbps: int = 0) -> List[dict]:
-    """The rows that pass every filter, fastest first – the same filters as on the website."""
-    return sorted(matching(rows, protocol, countries, https_only, elite_only, exclude_datacenter,
-                           exclude_blocklisted, stable_only, max_latency_ms, run_hours, min_uptime, works_on,
-                           min_speed_kbps),
-                  key=lambda r: r.get("latency") or 0)
+    """The rows that pass every filter, best first (answer plus download speed) – the same filters as on the
+    website."""
+    return best_first(matching(rows, protocol, countries, https_only, elite_only, exclude_datacenter,
+                               exclude_blocklisted, stable_only, max_latency_ms, run_hours, min_uptime, works_on,
+                               min_speed_kbps))
 
 
 def matching(rows: Iterable[dict], protocol: str = "any", countries: Iterable[str] = (), https_only: bool = False,
@@ -429,7 +430,8 @@ def _as_result(r: dict) -> Optional[CheckResult]:
         return CheckResult(make_key(r["ptype"], r["proxy"]), r["ptype"], r["proxy"], int(r.get("latency") or 0),
                            str(r.get("exit_ip") or ""), https=r.get("https"), anonymity=r.get("anonymity") or "",
                            country=r.get("country") or "", asn=int(r.get("asn") or 0), org=r.get("org") or "",
-                           hosting=r.get("hosting"), blocklisted=r.get("blocklisted"))
+                           hosting=r.get("hosting"), blocklisted=r.get("blocklisted"),
+                           speed_kbps=r["speed_kbps"] if type(r.get("speed_kbps")) is int else None)
     except (KeyError, TypeError, ValueError):
         return None
 

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/api.py

@@ -204,8 +204,9 @@ async def live_proxies_async(*, types: Iterable[str] = PROXY_TYPES, countries: I
                              anonymity: str = "", max_latency: int = 0, no_datacenter: bool = False,
                              no_blocklisted: bool = False, min_uptime: int = 0, works_on: Iterable[str] = (),
                              min_speed: int = 0, limit: int = 0) -> List[LiveProxy]:
-    """The proxies from the hourly list that pass the filters, fastest first. Nothing is checked here: they
-    worked from GitHub's servers in the last run (at most an hour ago). find_proxies checks from your network.
+    """The proxies from the hourly list that pass the filters, fastest first – by first answer plus measured
+    download speed. Nothing is checked here: they worked from GitHub's servers in the last run (at most an hour
+    ago). find_proxies checks from your network.
 
     Same filters as find_proxies, plus
     min_uptime  only proxies listed in at least this share (percent) of the week's runs, e.g. 90
@@ -215,6 +216,7 @@ async def live_proxies_async(*, types: Iterable[str] = PROXY_TYPES, countries: I
     limit       at most this many (0 = all)
     """
     from .agent import AgentError, LiveSource
+    from .ranking import page_ms, typical_speed
     from .sites import SITE
 
     types = _types(types)
@@ -237,9 +239,11 @@ async def live_proxies_async(*, types: Iterable[str] = PROXY_TYPES, countries: I
         data = await LiveSource(fetch=_live_fetch).get()
     except AgentError as e:
         raise ConnectionError(str(e)) from None
-    found = sorted((_live_proxy(r, data.run_hours) for r in data.rows
-                    if r.get("ptype") in types and isinstance(r.get("proxy"), str)),
-                   key=lambda p: p.latency)
+    found = [_live_proxy(r, data.run_hours) for r in data.rows
+             if r.get("ptype") in types and isinstance(r.get("proxy"), str)]
+    # fastest first – by how quickly a page comes through when the list has download speeds (#186)
+    typical = typical_speed(p.speed_kbps for p in found)
+    found.sort(key=lambda p: page_ms(p.latency, p.speed_kbps, p.https, typical))
     found = [p for p in found if opts.filters.accepts(p) and (not min_uptime or (p.uptime_7d or 0) >= min_uptime)
              and all(p.sites.get(s) for s in works_on) and (not min_speed or (p.speed_kbps or 0) >= min_speed)]
     return found[:limit] if limit else found

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/checker.py

@@ -93,6 +93,7 @@ class CheckResult:
     org: str = ""
     hosting: Optional[bool] = None  # exit probably in a datacenter? None = unknown
     blocklisted: Optional[bool] = None  # exit IP on the SpamCop blocklist? None = unknown
+    speed_kbps: Optional[int] = None  # download speed from the live list (KiB/s), None = not measured
 
     @property
     def url(self) -> str:

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/cli.py

@@ -71,7 +71,8 @@ def pick(args) -> int:
         found = live_proxies(types=args.types, countries=args.country or "", https=args.https_only,
                              anonymity=args.anonymity or "", max_latency=args.max_latency,
                              no_datacenter=args.no_datacenter, no_blocklisted=args.no_blocklisted,
-                             min_uptime=args.min_uptime, works_on=args.works_on, limit=args.pick)
+                             min_uptime=args.min_uptime, works_on=args.works_on, min_speed=args.min_speed,
+                             limit=args.pick)
     except (ConnectionError, ValueError) as e:
         print(f"proxy-scraper: {e}", file=sys.stderr)
         return 1
@@ -204,6 +205,8 @@ def parse_args(argv: Optional[List[str]] = None) -> argparse.Namespace:
                            "one URL per line, and exit – e.g. curl -x \"$(proxy-scraper --pick --https-only)\" …")
     live.add_argument("--min-uptime", type=percent, default=0, metavar="PERCENT",
                       help="with --pick: only proxies on the list in at least this share of the week's checks")
+    live.add_argument("--min-speed", type=positive_int, default=0, metavar="KBPS",
+                      help="with --pick: only proxies that downloaded at least this many KB/s in the last check")
     live.add_argument("--works-on", type=site_list, default=[], metavar="SITES",
                       help=f"with --pick: only proxies that got through to these sites in the last check "
                            f"({', '.join(s.name for s in SITES)})")
@@ -251,8 +254,8 @@ def parse_args(argv: Optional[List[str]] = None) -> argparse.Namespace:
     args = p.parse_args(argv)
     if args.json and args.list_sources is None:
         p.error("--json only works together with --list-sources")
-    if (args.min_uptime or args.works_on) and args.pick is None:
-        p.error("--min-uptime and --works-on only work together with --pick")
+    if (args.min_uptime or args.works_on or args.min_speed) and args.pick is None:
+        p.error("--min-uptime, --min-speed and --works-on only work together with --pick")
     if args.pick is not None:  # --pick exits right away: options for a scan or the server would be silently ignored
         scan_only = [flag for dest, flag in (("target", "--target"), ("serve", "--serve"), ("recheck", "--recheck"),
                                              ("want", "--want"), ("output", "-o/--output"), ("export", "--export"))

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/pages.py

@@ -14,6 +14,8 @@ from html import escape
 from pathlib import Path
 from typing import Callable, Dict, List, Sequence, Tuple
 
+from .ranking import best_first
+
 SITE_URL = "https://maximilianfeix.github.io/proxy-scraper/"
 REPO_URL = "https://github.com/maximilianfeix/proxy-scraper"
 ROWS_PER_PAGE = 200
@@ -203,8 +205,8 @@ def _render(path: str, title: str, what: str, rows: List[dict], updated: datetim
                 f"<td>{'yes' if r.get('https') else 'no'}</td><td>{escape(through)}</td>"
                 f"<td>{escape((r.get('org') or '–')[:40])}</td></tr>")
     body_rows = "\n".join(cells(r) for r in rows[:ROWS_PER_PAGE])
-    table = (f"<div class=\"table\"><table><caption>The {min(total, ROWS_PER_PAGE):,} fastest, as ip:port. "
-             f"The download has all {total:,} as type://ip:port.</caption>"
+    table = (f"<div class=\"table\"><table><caption>The {min(total, ROWS_PER_PAGE):,} fastest to load a page, "
+             f"as ip:port. The download has all {total:,} as type://ip:port.</caption>"
              "<thead><tr><th scope=\"col\">Proxy</th><th scope=\"col\">Type</th><th scope=\"col\">Country</th>"
              "<th scope=\"col\">Latency</th><th scope=\"col\">Speed</th><th scope=\"col\">Uptime</th>"
              "<th scope=\"col\">HTTPS</th><th scope=\"col\">Gets through</th>"
@@ -307,7 +309,7 @@ def _nav(specs, counts: Dict[str, int], current: str, root: str) -> str:
 def write_pages(rows: List[dict], out: Path, updated: datetime, extra: Sequence[str] = ()) -> List[str]:
     """Writes every page with its proxies.txt and the sitemap (plus the `extra` paths, e.g. the proxy pages)
     -> the paths listed in the sitemap."""
-    rows = sorted(rows, key=lambda r: r["latency"])
+    rows = best_first(rows)
     specs = page_specs()
     selected = {p: [r for r in rows if keep(r)] for p, _, _, keep in specs}
     counts = {p: len(v) for p, v in selected.items()}

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/publish.py

@@ -25,6 +25,7 @@ from .charts import THEMES, countries_svg, trend_svg
 from .pages import write_pages
 from .parsing import PROXY_TYPES
 from .proxypages import write_proxy_pages
+from .ranking import best_first
 from .report import weekly_facts, write_report
 from .sites import SITES
 
@@ -43,7 +44,7 @@ def is_public(row: dict) -> bool:
 
 def load_rows(run_dir: Path) -> List[dict]:
     rows = json.loads((run_dir / "proxies.json").read_text(encoding="utf-8"))
-    return sorted((r for r in rows if is_public(r)), key=lambda r: r["latency"])
+    return best_first(r for r in rows if is_public(r))
 
 
 def num(n: int) -> str:
@@ -116,7 +117,8 @@ def readme(stats: dict, counts: Dict[str, int]) -> str:
     return f"""# Live proxy list
 
 Generated automatically by [proxy-scraper](https://github.com/maximilianfeix/proxy-scraper) with GitHub Actions.
-Every proxy here really worked in the last run – sorted by latency, fastest first.
+Every proxy here really worked in the last run – fastest first, by first answer plus the download speed measured
+right after the run.
 Browse and filter it on the [website](https://maximilianfeix.github.io/proxy-scraper/).
 
 **Updated:** {updated} · **{num(stats["total"])} proxies** · median latency {num(stats["median_latency"])} ms
@@ -280,10 +282,10 @@ def publish(run_dir: Path, out: Path, minimum: int = 20, now: Optional[datetime]
         base = list(reader.fieldnames or ["proxy"])
         writer = csv.DictWriter(dst, fieldnames=[*base, *(k for k in extra if k not in base)])
         writer.writeheader()
-        by_url = {r["url"]: r for r in rows}
-        for r in reader:
-            if is_public(r):
-                listed_row = by_url.get(r.get("url", ""), {})
+        csv_rows = {r.get("url", ""): r for r in reader if is_public(r)}
+        for listed_row in rows:  # in the order of proxies.json: best first
+            r = csv_rows.get(listed_row.get("url", ""))
+            if r is not None:
                 works = " ".join(name for name, ok in (listed_row.get("sites") or {}).items() if ok)
                 writer.writerow({**r, **{k: listed_row.get(k, "") for k in extra}, "works_with": works})
     stats = stats_for(rows, now)

proxy_scraper_cli-1.19.0/proxyscraper/ranking.py

@@ -0,0 +1,44 @@
+"""Which proxy is "fastest": how quickly a page comes through, not just the first answer (#186).
+
+A quick answer to one tiny request says little about loading a page – in a test on the live list, the 25 HTTPS
+proxies quickest to answer loaded 4 of 50 real pages, the first 25 ranked by answer plus the download speed of the
+hourly speed step 26 of 50. Everything that orders proxies of the live list uses this: the published lists, the
+pages, --pick, live_proxies, the rotating pool.
+"""
+
+from __future__ import annotations
+
+import statistics
+from typing import Iterable, List, Optional
+
+PAGE_KB = 100               # roughly one page – the download the speed step measures
+UNMEASURED_KBPS = 20        # tried in the speed step, no download got through: counted as slow (it passed the checks)
+
+
+def page_ms(latency: float, speed_kbps: Optional[int], https: Optional[bool], typical_kbps: Optional[float]) -> float:
+    """Roughly how long a page takes through a proxy: the first answer plus the download.
+
+    typical_kbps is the median measured speed of the set, None when it has no speeds at all (an own scan) – then
+    latency decides alone. The speed step only tries HTTPS-capable proxies: one of those without a speed didn't
+    get the download through, the others were never tried and count as typical."""
+    if not typical_kbps:
+        return latency
+    kbps = speed_kbps or (UNMEASURED_KBPS if https else typical_kbps)
+    return latency + PAGE_KB * 1000 / kbps
+
+
+def typical_speed(speeds: Iterable[Optional[int]]) -> Optional[float]:
+    measured = [s for s in speeds if s]
+    return statistics.median(measured) if measured else None
+
+
+def best_first(rows: Iterable[dict]) -> List[dict]:
+    """Rows of a run (dicts as in proxies.json), the fastest to load a page first."""
+    rows = list(rows)
+    typical = typical_speed(_speed(r) for r in rows)
+    return sorted(rows, key=lambda r: page_ms(r["latency"], _speed(r), r.get("https") is True, typical))
+
+
+def _speed(row: dict) -> Optional[int]:
+    value = row.get("speed_kbps")
+    return value if type(value) is int and value > 0 else None

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/server/pool.py

@@ -4,6 +4,9 @@ Selection per connection in three steps:
   1. filters from the request (Selection): country, type – via the user name, e.g. "country-de-type-socks5"
   2. sticky: the same session (or with --sticky the same target site) keeps the same proxy for a while
   3. strategy for everything else: weighted (default), random, round-robin, fastest
+
+"Fast" means how quickly a page comes through, not just the first answer: when the proxies come from the live list,
+which measures a download per proxy every hour, that download counts too (#186).
 """
 
 from __future__ import annotations
@@ -14,6 +17,7 @@ import time
 from dataclasses import dataclass
 from typing import Callable, Dict, List, Optional, Set, Tuple
 
+from .. import ranking
 from ..checker import CheckResult
 
 DISABLE_AFTER = 3           # this many failures in a row -> out of the rotation
@@ -22,6 +26,15 @@ SESSION_SECONDS = 600       # how long a session (session-…) keeps its proxy w
 _TOKEN_RE = re.compile(r"(country|type|session)[-_]([A-Za-z0-9]+)")
 
 
+def page_ms(result, typical_kbps: Optional[float]) -> float:
+    """ranking.page_ms for a CheckResult (or anything with latency, speed_kbps and https)."""
+    return ranking.page_ms(result.latency, result.speed_kbps, result.https, typical_kbps)
+
+
+def typical_speed(results) -> Optional[float]:
+    return ranking.typical_speed(r.speed_kbps for r in results)
+
+
 @dataclass(frozen=True)
 class Selection:
     """The client's wishes for this connection – they come from the user name of the proxy login."""
@@ -57,12 +70,17 @@ class PoolEntry:
     fail_streak: int = 0
     active: int = 0
     disabled: bool = False
+    typical_kbps: Optional[float] = None  # set by the pool: median measured speed of its proxies
+
+    @property
+    def cost(self) -> float:
+        return page_ms(self.result, self.typical_kbps)
 
     @property
     def weight(self) -> float:
         # prefer fast and proven ones, but give everyone a chance
         reliability = (self.ok + 1) / (self.ok + self.fail + 2)
-        return reliability / (self.result.latency + 300)
+        return reliability / (self.cost + 300)
 
 
 class ProxyPool:
@@ -71,7 +89,8 @@ class ProxyPool:
                  clock: Callable[[], float] = time.monotonic, strict_tls: bool = False):
         if strategy not in STRATEGIES:
             raise ValueError(f"unknown strategy {strategy!r} (possible: {', '.join(STRATEGIES)})")
-        self.entries = [PoolEntry(r) for r in sorted(results, key=lambda r: r.latency)]
+        typical = typical_speed(results)
+        self.entries = sorted((PoolEntry(r, typical_kbps=typical) for r in results), key=lambda e: e.cost)
         self.rng = rng or random.Random()
         self.strategy = strategy
         self.sticky_seconds = sticky_seconds
@@ -135,8 +154,8 @@ class ProxyPool:
             # the fastest free one; if all are busy, the least busy one (then the faster one)
             idle = [e for e in candidates if not e.active]
             if idle:
-                return min(idle, key=lambda e: (e.result.latency, -e.weight))
-            return min(candidates, key=lambda e: (e.active, e.result.latency))
+                return min(idle, key=lambda e: (e.cost, -e.weight))
+            return min(candidates, key=lambda e: (e.active, e.cost))
         if self.strategy == "round-robin":
             ordered = sorted(candidates, key=lambda e: e.result.key)
             entry = ordered[self._next % len(ordered)]
@@ -186,7 +205,10 @@ class ProxyPool:
         for r in fresh.values():
             kept.append(PoolEntry(r))
             added += 1
-        self.entries = sorted(kept, key=lambda e: e.result.latency)
+        typical = typical_speed([e.result for e in kept])
+        for entry in kept:
+            entry.typical_kbps = typical
+        self.entries = sorted(kept, key=lambda e: e.cost)
         return added
 
     def revive(self, entry: PoolEntry) -> None:

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/proxyscraper/site/index.html

@@ -597,7 +597,7 @@
   <section class="block wrap" id="list" aria-labelledby="list-title">
     <div class="head-row">
       <h2 class="h2" id="list-title">Pick your proxies</h2>
-      <p class="intro-text">Filter, sort, then copy or download exactly the ones you need. Click any address to copy it.</p>
+      <p class="intro-text">Best first: the ones that answer quickly and download fast. Filter, sort, then copy or download exactly the ones you need. Click any address to copy it.</p>
     </div>
     <div class="filters" role="group" aria-label="Filters">
       <button class="chip" type="button" data-type="http" aria-pressed="true"><span class="dot http"></span>HTTP</button>
@@ -623,7 +623,7 @@
             <th scope="col" data-key="ptype"><button class="sort" type="button" aria-label="Type"><span class="name">Type</span></button></th>
             <th scope="col" data-key="proxy"><button class="sort" type="button">Proxy</button></th>
             <th scope="col" data-key="country"><button class="sort" type="button">Country</button></th>
-            <th scope="col" data-key="latency" aria-sort="ascending"><button class="sort" type="button">Latency</button></th>
+            <th scope="col" data-key="latency"><button class="sort" type="button">Latency</button></th>
             <th scope="col" data-key="speed_kbps" class="hide-sm"><button class="sort" type="button" title="Download speed in the last run – 100 KB through the proxy">Speed</button></th>
             <th scope="col" data-key="https" class="hide-sm"><button class="sort" type="button">HTTPS</button></th>
             <th scope="col" data-key="uptime_7d" class="hide-sm"><button class="sort" type="button" title="Share of this week's runs it was on the list">Uptime</button></th>
@@ -637,6 +637,7 @@
     <div class="list-foot">
       <span class="count" id="count" aria-live="polite"></span>
       <div class="actions">
+        <button class="btn small" id="best" type="button" hidden title="The ones that answer quickly and download fast">Best first</button>
         <button class="btn small" id="more" type="button" hidden>Show more</button>
         <button class="btn small" id="share" type="button" title="The filters are in the address, so the link opens this exact view">Share view</button>
         <button class="btn small" id="copy-all" type="button">Copy filtered</button>
@@ -871,7 +872,7 @@ proxy-scraper --want 50 --https-only</pre><button class="icon-btn" type="button"
   const speed = (k) => !k ? '<span class="quiet">–</span>'
     : `<span class="${k >= 500 ? "fast" : k >= 100 ? "mid" : "slow"}">${k >= 1024 ? (k / 1024).toFixed(1) + " MB/s" : fmt(k) + " KB/s"}</span>`;
   const latency = (ms) => `<span class="${ms < 1000 ? "fast" : ms < 3000 ? "mid" : "slow"}">${fmt(ms)} ms</span>`;
-  const state = { rows: [], shown: PAGE, sort: "latency", dir: 1, types: new Set(["http", "socks4", "socks5"]),
+  const state = { rows: [], shown: PAGE, sort: "rank", dir: 1, types: new Set(["http", "socks4", "socks5"]),
                   https: false, elite: false, noDc: false, noBl: false, stable: false, country: "", site: "", maxLat: 8000, q: "" };
 
   // Theme
@@ -1037,6 +1038,7 @@ proxy-scraper --want 50 --https-only</pre><button class="icon-btn" type="button"
       || '<tr><td colspan="9" class="empty">No proxy matches these filters. Try a higher latency limit or fewer filters.</td></tr>';
     $("#count").textContent = rows.length ? `Showing ${fmt(Math.min(state.shown, rows.length))} of ${fmt(rows.length)} matching proxies` : "";
     $("#more").hidden = rows.length <= state.shown;
+    $("#best").hidden = state.sort === "rank";
     saveView();
     $$("th[data-key]").forEach(th => th.dataset.key === state.sort ? th.setAttribute("aria-sort", state.dir > 0 ? "ascending" : "descending") : th.removeAttribute("aria-sort"));
   }
@@ -1052,7 +1054,7 @@ proxy-scraper --want 50 --https-only</pre><button class="icon-btn" type="button"
     if (state.site) q.set("site", state.site);
     if (state.maxLat < 8000) q.set("latency", state.maxLat);
     if (state.q.trim()) q.set("q", state.q.trim());
-    if (state.sort !== "latency" || state.dir !== 1) q.set("sort", (state.dir < 0 ? "-" : "") + state.sort);
+    if (state.sort !== "rank") q.set("sort", (state.dir < 0 ? "-" : "") + state.sort);
     return location.pathname + (q.toString() ? `?${q}` : "") + location.hash;
   }
   // debounced: browsers limit replaceState (Safari throws after ~100 calls in 30 s, e.g. while dragging the slider)
@@ -1117,6 +1119,7 @@ proxy-scraper --want 50 --https-only</pre><button class="icon-btn" type="button"
   $("#f-lat").oninput = (e) => { state.maxLat = +e.target.value; $("#f-lat-v").textContent = state.maxLat >= 8000 ? "any" : `${fmt(state.maxLat)} ms`; refresh(); };
   $("#f-q").oninput = (e) => { state.q = e.target.value; refresh(); };
   $("#more").onclick = () => { state.shown += PAGE * 4; render(); };
+  $("#best").onclick = () => { state.sort = "rank"; state.dir = 1; morph(render); };
   $$("th[data-key]").forEach(th => {
     th.querySelector(".sort").onclick = () => { const k = th.dataset.key; state.dir = state.sort === k ? -state.dir : 1; state.sort = k; morph(render); };
   });
@@ -1353,6 +1356,7 @@ proxy-scraper --want 50 --https-only</pre><button class="icon-btn" type="button"
 
   let started = false;
   function apply(rows, st, history) {
+    rows.forEach((r, i) => { r.rank = i; });  // proxies.json comes best first: first answer plus download speed
     state.rows = rows;
     shownRun = st.updated;
     RUN_HOURS = st.run_hours || 6;  // lists from before run_hours existed ran every 6 hours

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/tests/test_action.py

@@ -11,7 +11,7 @@ def fake(n, **extra):
             for i in range(n)]
 
 
-def run(monkeypatch, tmp_path, env, found=3, rechecked=None):
+def run(monkeypatch, tmp_path, env, found=3, rechecked=None, recheck=None):
     calls = {}
 
     def live(**kwargs):
@@ -20,7 +20,7 @@ def run(monkeypatch, tmp_path, env, found=3, rechecked=None):
 
     def check(urls, **kwargs):
         calls["check"] = list(urls)
-        return fake(found)[:rechecked]
+        return recheck(found) if recheck else fake(found)[:rechecked]
     monkeypatch.setattr(action, "live_proxies", live)
     monkeypatch.setattr(action, "check_proxies", check)
     out = tmp_path / "out.txt"
@@ -36,10 +36,10 @@ def run(monkeypatch, tmp_path, env, found=3, rechecked=None):
 def test_filters_reach_live_proxies_and_outputs_are_set(monkeypatch, tmp_path):
     code, out, calls = run(monkeypatch, tmp_path, {
         "PS_TYPES": "socks5, http", "PS_COUNTRIES": "de,nl", "PS_HTTPS": "true", "PS_MIN_UPTIME": "90",
-        "PS_WORKS_ON": "google", "PS_LIMIT": "2"})
+        "PS_MIN_SPEED": "100", "PS_WORKS_ON": "google", "PS_LIMIT": "2"})
     assert code == 0
     assert calls["live"] == {"types": ["socks5", "http"], "countries": "de,nl", "https": True, "min_uptime": 90,
-                             "works_on": ["google"], "limit": 2}
+                             "min_speed": 100, "works_on": ["google"], "limit": 2}
     assert out["proxy"] == "socks5://1.1.1.0:1080" and out["count"] == "2"  # limit
     file = out["file"]
     assert file.startswith(str(tmp_path)) and Path(file).read_text().splitlines()[0] == "socks5://1.1.1.0:1080"
@@ -67,3 +67,12 @@ def test_nothing_found_fails_the_step_unless_allowed(monkeypatch, tmp_path, caps
 def test_bad_inputs_are_explained(monkeypatch, tmp_path, capsys):
     code, _, _ = run(monkeypatch, tmp_path, {"PS_LIMIT": "lots"})
     assert code == 1 and "limit" in capsys.readouterr().out
+
+
+
+def test_a_recheck_keeps_the_live_lists_order(monkeypatch, tmp_path):
+    # the live list comes ranked by page load; the recheck's latencies say nothing about downloads
+    def slower_first(n):  # from the runner, the list's first proxy happens to answer slowest
+        return [CheckResult(r.key, r.ptype, r.proxy, 500 - r.latency, r.exit_ip, True) for r in fake(n)]
+    _, out, _ = run(monkeypatch, tmp_path, {"PS_RECHECK": "true"}, recheck=slower_first)
+    assert out["proxy"] == "socks5://1.1.1.0:1080"

{proxy_scraper_cli-1.17.0 → proxy_scraper_cli-1.19.0}/tests/test_pick.py

@@ -42,3 +42,10 @@ def test_options_for_a_scan_are_an_error_not_ignored(extra, capsys):
     with pytest.raises(SystemExit):
         cli.run(["--pick", *extra])
     assert "--pick" in capsys.readouterr().err
+
+
+def test_min_speed_keeps_only_proxies_that_downloaded_that_fast(monkeypatch, capsys):
+    rows = [dict(ROWS[0], speed_kbps=300), dict(ROWS[2], speed_kbps=40), ROWS[1]]
+    monkeypatch.setattr(api, "_live_fetch", fetch_from({"proxies.json": rows, "stats.json": STATS}))
+    assert cli.run(["--pick", "5", "--min-speed", "100"]) == 0
+    assert capsys.readouterr().out == "socks5://1.1.1.1:1080\n"

proxy_scraper_cli-1.19.0/tests/test_speed_ranking.py

@@ -0,0 +1,108 @@
+"""Download speed in the choice of proxy (#186): a quick answer to one tiny request says little about loading a
+page – in a test on the live list, the 25 proxies with the best latency loaded 8 of 50 pages, the 25 that downloaded
+fastest in the last run 33 of 50."""
+
+import random
+
+from proxyscraper import api, live_proxies
+from proxyscraper.agent import _as_result
+from proxyscraper.checker import CheckResult
+from proxyscraper.server import ProxyPool
+from proxyscraper.server.pool import page_ms
+
+from .test_live_api import ROWS, STATS, fetch_from
+
+
+def result(n, latency, speed=None, https=True):
+    proxy = f"10.0.0.{n}:80"
+    return CheckResult(f"http {proxy}", "http", proxy, latency, "9.9.9.9", https=https, speed_kbps=speed)
+
+
+def test_a_proxy_that_downloads_fast_beats_one_that_only_answers_fast():
+    quick_ping, fast_download = result(1, 100), result(2, 400, speed=500)
+    assert page_ms(fast_download, typical_kbps=100) < page_ms(quick_ping, typical_kbps=100)
+    pool = ProxyPool([quick_ping, fast_download], strategy="fastest")
+    assert pool.pick(set()).result is fast_download
+
+
+def test_the_weighted_choice_leans_to_the_fast_downloader():
+    pool = ProxyPool([result(1, 100), result(2, 400, speed=500)], rng=random.Random(1))
+    picks = [pool.pick(set()).result.proxy for _ in range(1000)]
+    assert picks.count("10.0.0.2:80") > 700
+
+
+def test_without_any_speed_data_latency_decides_as_before():
+    pool = ProxyPool([result(1, 400), result(2, 100)], strategy="fastest")
+    assert pool.pick(set()).result.latency == 100
+
+
+def test_the_live_list_brings_its_speed_into_the_pool():
+    row = {"ptype": "http", "proxy": "1.2.3.4:80", "latency": 100, "https": True, "speed_kbps": 250}
+    assert _as_result(row).speed_kbps == 250
+    assert _as_result({**row, "speed_kbps": "fast"}).speed_kbps is None
+
+
+def test_live_proxies_put_the_measured_fast_ones_first(monkeypatch):
+    rows = [dict(r) for r in ROWS]
+    rows[0]["speed_kbps"] = 400  # socks5, latency 300 – the slowest to answer, the only one that downloaded
+    monkeypatch.setattr(api, "_live_fetch", fetch_from({"proxies.json": rows, "stats.json": STATS}))
+    # the socks4 one answers faster but got no download through in the speed step
+    assert [p.url for p in live_proxies(https=True)] == ["socks5://1.1.1.1:1080", "socks4://3.3.3.3:4145"]
+
+
+def test_proxies_the_speed_step_never_tried_count_as_typical_not_slow():
+    # it only measures HTTPS-capable ones – a plain-HTTP-only proxy wasn't slow, it just wasn't measured
+    plain_only, measured = result(1, 50, https=False), result(2, 900, speed=100)
+    pool = ProxyPool([plain_only, measured], strategy="fastest")
+    assert pool.pick(set()).result is plain_only
+    assert pool.pick(set(), tls=True).result is measured
+
+
+def published(n, latency, speed=None, https=True, ptype="http"):
+    row = {"proxy": f"10.0.0.{n}:80", "ptype": ptype, "url": f"{ptype}://10.0.0.{n}:80", "latency": latency,
+           "https": https, "country": "DE", "exit_ip": f"10.0.0.{n}", "anonymity": "elite"}
+    return {**row, "speed_kbps": speed} if speed else row
+
+
+def test_the_published_lists_start_with_the_ones_that_load_pages_fastest(tmp_path):
+    import json
+
+    from proxyscraper import publish
+
+    (tmp_path / "proxies.json").write_text(json.dumps([published(1, 100), published(2, 400, speed=500)]))
+    assert [r["proxy"] for r in publish.load_rows(tmp_path)] == ["10.0.0.2:80", "10.0.0.1:80"]
+
+
+def test_landing_pages_list_the_best_first(tmp_path):
+    from datetime import datetime, timezone
+
+    from proxyscraper import pages
+
+    pages.write_pages([published(1, 100), published(2, 400, speed=500)], tmp_path, datetime.now(timezone.utc))
+    assert (tmp_path / "country" / "de" / "proxies.txt").read_text().splitlines()[0] == "http://10.0.0.2:80"
+
+
+def test_the_csv_comes_in_the_same_order_as_the_json(tmp_path):
+    import csv
+    import json
+
+    from proxyscraper import publish
+    from proxyscraper.output import ResultWriter
+
+    results = [CheckResult(f"http 1.1.1.{i}:80", "http", f"1.1.1.{i}:80", 100 * (i + 1), "9.9.9.9", True, "elite", "DE")
+               for i in range(3)]
+    ResultWriter(run_dir=tmp_path / "run").finalize(results)
+    rows = json.loads((tmp_path / "run" / "proxies.json").read_text())
+    rows[2]["speed_kbps"] = 900  # the slowest to answer downloads fastest
+    (tmp_path / "run" / "proxies.json").write_text(json.dumps(rows))
+    publish.publish(tmp_path / "run", tmp_path / "out", minimum=1)
+    order = [r["proxy"] for r in json.loads((tmp_path / "out" / "proxies.json").read_text())]
+    with (tmp_path / "out" / "proxies.csv").open(newline="") as fh:
+        assert [r["proxy"] for r in csv.DictReader(fh)] == order and order[0] == "1.1.1.2:80"
+
+
+def test_the_mcp_tools_list_best_first_too():
+    from proxyscraper.agent import select
+
+    rows = [published(1, 100), published(2, 400, speed=500)]
+    assert [r["proxy"] for r in select(rows)] == ["10.0.0.2:80", "10.0.0.1:80"]