nex/college-bot-v1
1
0
Fork 0
mirror of https://github.com/nexy7574/LCC-bot.git synced 2024-09-19 18:16:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add speedtest uri

Browse source
This commit is contained in:
Nexus 2023-11-29 11:53:42 +00:00
parent 0f5e7b85b4
commit c944641979
Signed by: nex
GPG key ID: 0FA334385D0B689F
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cogs/events.py
View file

@ -11,7 +11,6 @@ import re
import subprocess import subprocess
import textwrap import textwrap
import traceback import traceback
import pydantic
import warnings import warnings
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from pathlib import Path from pathlib import Path
@ -19,6 +18,7 @@ from typing import Any, Dict, Optional, Tuple
import discord import discord
import httpx import httpx
import pydantic
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from config import guilds from config import guilds
from discord.ext import commands, pages, tasks from discord.ext import commands, pages, tasks

17
cogs/other.py
View file

@ -1,14 +1,9 @@
import asyncio import asyncio
import base64
import fnmatch import fnmatch
import functools import functools
import glob import glob
import io import io
import ipaddress
import json import json
import typing
import zlib
import math import math
import os import os
import random import random
@ -19,6 +14,7 @@ import sys
import tempfile import tempfile
import textwrap import textwrap
import traceback import traceback
import typing
from functools import partial from functools import partial
from io import BytesIO from io import BytesIO
from pathlib import Path from pathlib import Path
@ -38,8 +34,8 @@ from discord import Interaction
from discord.ext import commands from discord.ext import commands
from dns import asyncresolver from dns import asyncresolver
from PIL import Image from PIL import Image
from rich.tree import Tree
from rich import print from rich import print
from rich.tree import Tree
from selenium import webdriver from selenium import webdriver
from selenium.common.exceptions import WebDriverException from selenium.common.exceptions import WebDriverException
from selenium.webdriver.chrome.options import Options as ChromeOptions from selenium.webdriver.chrome.options import Options as ChromeOptions
@ -2327,19 +2323,20 @@ class OtherCog(commands.Cog):
"ash", "ash",
"hil" "hil"
] ]
SPEED_URL = "https://{}-speed.hetzner.com/1GB.bin"
results = { results = {
"localhost:1090": { "localhost:1090": {
"name": "SHRoNK", "name": "SHRoNK",
"failure": None, "failure": None,
"download_speed": 0.0, "download_speed": 0.0,
"tested": False "tested": False,
"speedtest": "https://{hetzner_region}-speed.hetzner.com/100M.bin"
}, },
"localhost:1080": { "localhost:1080": {
"name": "NexBox", "name": "NexBox",
"failure": None, "failure": None,
"download_speed": 0.0, "download_speed": 0.0,
"tested": False "tested": False,
"speedtest": "http://192.168.0.90:82/100M.bin"
} }
} }
if proxy_name != "first-working": if proxy_name != "first-working":
@ -2412,7 +2409,7 @@ class OtherCog(commands.Cog):
for region in SPEED_REGIONS: for region in SPEED_REGIONS:
try: try:
start = time() start = time()
used = SPEED_URL.format(region) used = results[proxy_uri]["speedtest"].format(hetzner_region=region)
latency_start = time() latency_start = time()
async with client.stream("GET", used) as response: async with client.stream("GET", used) as response:
latency_end = time() latency_end = time()