Download Speed

This commit is contained in:
MasterAcnolo
2025-11-17 15:33:25 +01:00
parent 3e9c545952
commit 070c3d507f
5 changed files with 53 additions and 6 deletions

View File

@@ -65,6 +65,7 @@
</div> </div>
<div id="downloadProgressText"></div> <div id="downloadProgressText"></div>
<div id="downloadSpeedText"></div>
<div id="downloadStatus"></div> <div id="downloadStatus"></div>

View File

@@ -2,11 +2,17 @@ const progressWrapper = document.getElementById("downloadProgressWrapper");
const progressBar = document.getElementById("downloadProgress"); const progressBar = document.getElementById("downloadProgress");
const progressBarText = document.getElementById("downloadProgressText") const progressBarText = document.getElementById("downloadProgressText")
const speedElement = document.getElementById("downloadSpeedText");
const speedEvt = new EventSource("/download/speed");
function startProgress() { function startProgress() {
progressWrapper.style.display = "block"; progressWrapper.style.display = "block";
progressBar.style.width = "0%"; progressBar.style.width = "0%";
progressBarText.style.display = "block"; progressBarText.style.display = "block";
progressBarText.innerHTML = "0%"; progressBarText.innerHTML = "0%";
speedElement.style.display = "block";
speedElement.innerHTML = "0 Mib/s";
} }
function updateProgress(percent) { function updateProgress(percent) {
@@ -16,9 +22,12 @@ function updateProgress(percent) {
function resetProgress() { function resetProgress() {
progressBar.style.width = "0%"; progressBar.style.width = "0%";
progressBarText.innerHTML = ""; progressBarText.textContent = "";
progressBarText.style.display = "none"; progressBarText.style.display = "none";
progressWrapper.style.display = "none"; progressWrapper.style.display = "none";
speedElement.textContent = "0 Mib/s";
speedElement.style.display = "none";
} }
// Connexion SSE // Connexion SSE
@@ -37,6 +46,7 @@ evtSource.onmessage = e => {
} }
const percent = parseFloat(e.data); const percent = parseFloat(e.data);
if (!isNaN(percent)) { if (!isNaN(percent)) {
updateProgress(percent); updateProgress(percent);
window.electronAPI.setProgress(percent); // update barre des tâches window.electronAPI.setProgress(percent); // update barre des tâches
@@ -46,3 +56,8 @@ evtSource.onmessage = e => {
}, 500); }, 500);
} }
}; };
speedEvt.onmessage = e => {
speedElement.style.display = "block";
speedElement.textContent = e.data; // ex: "5.2MiB/s"
};

View File

@@ -5,6 +5,7 @@ const { buildYtDlpArgs } = require("../helpers/buildArgs");
const { notifyDownloadFinished } = require("../helpers/notify"); const { notifyDownloadFinished } = require("../helpers/notify");
const listeners = []; const listeners = [];
const speedListeners = [];
async function downloadController(req, res) { async function downloadController(req, res) {
try { try {
@@ -18,7 +19,7 @@ async function downloadController(req, res) {
if (!options.url || !isValidUrl(options.url)) return res.status(400).send("❌ URL invalide !"); if (!options.url || !isValidUrl(options.url)) return res.status(400).send("❌ URL invalide !");
if (options.outputFolder && !isSafePath(options.outputFolder)) return res.status(400).send("❌ Chemin de sauvegarde non autorisé."); if (options.outputFolder && !isSafePath(options.outputFolder)) return res.status(400).send("❌ Chemin de sauvegarde non autorisé.");
const filePath = await fetchDownload(options, listeners); const filePath = await fetchDownload(options, listeners, speedListeners);
notifyDownloadFinished(filePath); notifyDownloadFinished(filePath);
res.send("✅ Téléchargement terminé !"); res.send("✅ Téléchargement terminé !");
@@ -44,4 +45,21 @@ function progressController(req, res) {
}); });
} }
module.exports = { downloadController, progressController }; function speedController(req, res) {
res.set({
'Content-Type': 'text/event-stream',
'Cache-Control': 'no-cache',
'Connection': 'keep-alive',
});
const sendSpeed = speed => res.write(`data: ${speed}\n\n`);
speedListeners.push(sendSpeed);
req.on('close', () => {
speedListeners.splice(speedListeners.indexOf(sendSpeed), 1);
res.end();
});
}
module.exports = { downloadController, progressController, speedController};

View File

@@ -1,10 +1,11 @@
const express = require("express"); const express = require("express");
const router = express.Router(); const router = express.Router();
const { downloadController, progressController } = require("../controller/download.controller"); const { downloadController, progressController, speedController } = require("../controller/download.controller");
router.post("/", downloadController); router.post("/", downloadController);
// SSE pour la progression du téléchargement // SSE pour la progression du téléchargement
router.get("/progress", progressController); router.get("/progress", progressController);
router.get("/speed", speedController);
module.exports = router; module.exports = router;

View File

@@ -5,7 +5,7 @@ const fs = require("fs");
const { logger } = require("../logger"); const { logger } = require("../logger");
const { buildYtDlpArgs } = require("../helpers/buildArgs"); const { buildYtDlpArgs } = require("../helpers/buildArgs");
function fetchDownload(options, listeners) { function fetchDownload(options, listeners, speedListeners) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const outputFolder = options.outputFolder || path.join(process.env.USERPROFILE, "Downloads", "Freedom Loader"); const outputFolder = options.outputFolder || path.join(process.env.USERPROFILE, "Downloads", "Freedom Loader");
@@ -34,12 +34,24 @@ function fetchDownload(options, listeners) {
if (line.startsWith("[download] Destination:")) listeners.forEach(fn => fn("reset")); if (line.startsWith("[download] Destination:")) listeners.forEach(fn => fn("reset"));
const match = line.match(/\[download\]\s+(\d+\.\d+)%/); const match = line.match(/\[download\]\s+(\d+\.\d+)%/);
if (match) listeners.forEach(fn => fn(parseFloat(match[1]))); if (match) listeners.forEach(fn => fn(parseFloat(match[1])));
if (line.includes("MiB/s") || line.includes("KiB/s")) {
const match = line.match(/\d+(\.\d+)?[KM]?iB\/s/);
if (match) {
const speed = match[0];
speedListeners.forEach(fn => fn(speed));
}
}
}); });
}); });
child.stderr.on("data", data => { child.stderr.on("data", data => {
data.toString().split("\n").forEach(line => line.trim() && logger.error(`[yt-dlp stderr] ${line}`)); data.toString().split("\n").forEach(line => line.trim() && logger.error(`[yt-dlp stderr] ${line}`));
}); });
}); });
} }