Horizontal42/netsleuth
1
0
Fork 0
mirror of https://github.com/Horizontal42/netsleuth.git synced 2026-11-10 22:42:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bdc2c4a92a into 8c99ac78b7

Browse source
This commit is contained in:
Andrew Pimenov 2026-08-26 17:17:20 +03:00 • committed by GitHub
commit 4e79bed584
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/netsleuth/config.py
View file

@ -78,7 +78,7 @@ class Speedtest(BaseModel):
upload_sizes_bytes: list[int] = Field(default_factory=lambda: [1_000_000, 5_000_000]) upload_sizes_bytes: list[int] = Field(default_factory=lambda: [1_000_000, 5_000_000])
cloudflare_base_url: str = "https://speed.cloudflare.com" cloudflare_base_url: str = "https://speed.cloudflare.com"
fastcom_api_url: str = "https://api.fast.com/netflix/speedtest/v2" fastcom_api_url: str = "https://api.fast.com/netflix/speedtest/v2"
fastcom_api_token: str = "YXNkZmFzZGxmbnNkYWZoYXNkZmhrYWxm" fastcom_api_token: SecretStr | None = Field(default=None)
ndt7_locate_url: str = "https://locate.measurementlab.net/v2/nearest/ndt/ndt7" ndt7_locate_url: str = "https://locate.measurementlab.net/v2/nearest/ndt/ndt7"
bufferbloat_probe_interval_seconds: float = 0.2 bufferbloat_probe_interval_seconds: float = 0.2

3
src/netsleuth/speed.py
View file

@ -174,9 +174,10 @@ async def tier_cloudflare(client: httpx.AsyncClient, cfg: Speedtest, timeout: fl
async def tier_fastcom(client: httpx.AsyncClient, cfg: Speedtest, timeout: float) -> SpeedResult: async def tier_fastcom(client: httpx.AsyncClient, cfg: Speedtest, timeout: float) -> SpeedResult:
token = cfg.fastcom_api_token.get_secret_value() if cfg.fastcom_api_token else ""
response = await client.get( response = await client.get(
cfg.fastcom_api_url, cfg.fastcom_api_url,
params={"https": "true", "token": cfg.fastcom_api_token, "urlCount": "3"}, params={"https": "true", "token": token, "urlCount": "3"},
timeout=timeout, timeout=timeout,
) )
response.raise_for_status() response.raise_for_status()

10
tests/test_speed.py
View file

@ -463,7 +463,7 @@ async def test_tier_fastcom_happy_path(httpx_mock):
config = Speedtest() config = Speedtest()
api_url = config.fastcom_api_url api_url = config.fastcom_api_url
httpx_mock.add_response( httpx_mock.add_response(
url=f"{api_url}?https=true&token=YXNkZmFzZGxmbnNkYWZoYXNkZmhrYWxm&urlCount=3", url=f"{api_url}?https=true&token=&urlCount=3",
json={ json={
"targets": [ "targets": [
{ {
@ -498,7 +498,7 @@ async def test_tier_fastcom_no_targets(httpx_mock):
config = Speedtest() config = Speedtest()
api_url = config.fastcom_api_url api_url = config.fastcom_api_url
httpx_mock.add_response( httpx_mock.add_response(
url=f"{api_url}?https=true&token=YXNkZmFzZGxmbnNkYWZoYXNkZmhrYWxm&urlCount=3", url=f"{api_url}?https=true&token=&urlCount=3",
json={"targets": []}, json={"targets": []},
) )
async with httpx.AsyncClient() as client: async with httpx.AsyncClient() as client:
@ -513,7 +513,7 @@ async def test_tier_fastcom_missing_urls(httpx_mock):
config = Speedtest() config = Speedtest()
api_url = config.fastcom_api_url api_url = config.fastcom_api_url
httpx_mock.add_response( httpx_mock.add_response(
url=f"{api_url}?https=true&token=YXNkZmFzZGxmbnNkYWZoYXNkZmhrYWxm&urlCount=3", url=f"{api_url}?https=true&token=&urlCount=3",
json={ json={
"targets": [ "targets": [
{"location": {"country": "US"}}, {"location": {"country": "US"}},
@ -540,7 +540,7 @@ async def test_tier_fastcom_api_error(httpx_mock):
config = Speedtest() config = Speedtest()
api_url = config.fastcom_api_url api_url = config.fastcom_api_url
httpx_mock.add_response( httpx_mock.add_response(
url=f"{api_url}?https=true&token=YXNkZmFzZGxmbnNkYWZoYXNkZmhrYWxm&urlCount=3", url=f"{api_url}?https=true&token=&urlCount=3",
status_code=500, status_code=500,
) )
async with httpx.AsyncClient() as client: async with httpx.AsyncClient() as client:
@ -553,7 +553,7 @@ async def test_tier_fastcom_download_error(httpx_mock):
config = Speedtest() config = Speedtest()
api_url = config.fastcom_api_url api_url = config.fastcom_api_url
httpx_mock.add_response( httpx_mock.add_response(
url=f"{api_url}?https=true&token=YXNkZmFzZGxmbnNkYWZoYXNkZmhrYWxm&urlCount=3", url=f"{api_url}?https=true&token=&urlCount=3",
json={ json={
"targets": [ "targets": [
{ {