Viren070/mediaflow-proxy
1
0
Fork 0
mirror of https://github.com/Viren070/mediaflow-proxy.git synced 2025-12-01 23:22:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	mediaflow_proxy/extractors/uqload.py
#	mediaflow_proxy/extractors_routes.py
This commit is contained in:
mhdzumair
2024-11-10 21:41:51 +05:30
parent 29348f5fa5 abbeaee0d0
commit 4b4f6af536
2 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mediaflow_proxy/static/speedtest_progress.html
+35 -11
View File
@@ -63,34 +63,56 @@
<script>
const urlParams = new URLSearchParams(window.location.search);
const taskId = urlParams.get("task_id");
if (!taskId || !/^[a-zA-Z0-9-_]+$/.test(taskId)) {
window.location.href = "/speedtest";
}
let statusCheckTimeout;
let retryCount = 0;
const MAX_RETRIES = 5;
async function checkStatus() {
try {
const response = await fetch(`/speedtest/results/${taskId}`);
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), 5000);
const response = await fetch(`/speedtest/results/${taskId}`, {
signal: controller.signal
});
clearTimeout(timeoutId);
if (!response.ok) {
throw new Error('Network response was not ok');
}
const data = await response.json();
console.log("Fetched data:", data);
retryCount = 0;
// Check if the test is still running based on the response data
if (data && data.message && data.message.includes("still running")) {
console.log("Test still running, polling again...");
// Poll again after 5 seconds if the test is still running
setTimeout(checkStatus, 5000);
statusCheckTimeout = setTimeout(checkStatus, 5000);
} else {
console.log("Test complete, redirecting after a short delay...");
// Redirect to the results if the test is done after a short delay
setTimeout(() => {
window.location.href = `/speedtest/results/${taskId}`;
}, 2000); // 2 seconds delay
}, 2000);
}
} catch (error) {
console.error("Error fetching status:", error);
// Retry after 5 seconds in case of error
setTimeout(checkStatus, 5000);
retryCount++;
if (retryCount < MAX_RETRIES) {
statusCheckTimeout = setTimeout(checkStatus, 5000);
} else {
alert("Failed to check status after multiple attempts. Please refresh the page.");
}
}
}
// Cleanup on page unload
window.addEventListener('unload', () => {
if (statusCheckTimeout) {
clearTimeout(statusCheckTimeout);
}
});
// Start the first status check after 120 seconds (120000 milliseconds)
setTimeout(checkStatus, 120000);
@@ -105,12 +127,14 @@
</head>
<body class="light-mode">
<div class="toggle-switch">
<label for="darkModeToggle">Dark Mode</label>
<input type="checkbox" id="darkModeToggle" onclick="toggleDarkMode()">
<label for="darkModeToggle" class="switch">
<input type="checkbox" id="darkModeToggle" onclick="toggleDarkMode()" aria-label="Toggle dark mode">
<span class="slider">Dark Mode</span>
</label>
</div>
<div class="container">
<h1>Speedtest in progress... Please wait up to 3 minutes.</h1>
<div class="progress-bar"></div>
<div class="progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"></div>
</div>
</body>
</html>
mediaflow_proxy/utils/rd_speedtest.py
+24 -23
View File
@@ -37,32 +37,33 @@ async def perform_speed_test():
async with AsyncClient() as client:
streamer = Streamer(client)
for location, base_url in test_urls.items():
# Generate a random float with 16 decimal places
random_number = f"{random.uniform(0, 1):.16f}"
url = f"{base_url}{random_number}"
logging.info(f"Testing URL: {url}")
async def test_single_url(location: str, url: str) -> Dict[str, Any]:
try:
start_time = time.time()
total_bytes = 0
try:
# Stream the response
async for chunk in streamer.stream_content(url, headers={}):
if time.time() - start_time >= test_duration:
break
total_bytes += len(chunk)
async for chunk in streamer.stream_content(url, headers={}):
if time.time() - start_time >= test_duration:
break
total_bytes += len(chunk)
duration = time.time() - start_time
speed_mbps = (total_bytes * 8) / (duration * 1_000_000)
speed[location] = {
"speed_mbps": round(speed_mbps, 2),
"duration": round(duration, 2)
}
logging.info(f"Speed for {location}: {speed_mbps} Mbps in {duration} seconds")
except Exception as e:
speed[location] = {"error": str(e)}
logging.error(f"Error for {location}: {e}")
duration = time.time() - start_time
speed_mbps = (total_bytes * 8) / (duration * 1_000_000)
return {
"speed_mbps": round(speed_mbps, 2),
"duration": round(duration, 2)
}
except Exception as e:
logging.error(f"Error testing {location}: {e}")
return {"error": str(e)}
for location, base_url in test_urls.items():
random_number = f"{random.uniform(0, 1):.16f}"
url = f"{base_url}{random_number}"
logging.info(f"Testing URL: {url}")
speed[location] = await test_single_url(location, url)
# Add rate limiting between tests
await asyncio.sleep(1)
return speed