From 5b82430cbe40d6c3a1235bdc6c49984bc99157a3 Mon Sep 17 00:00:00 2001
From: lifegpc <root@lifegpc.com>
Date: Sat, 25 May 2024 12:16:33 +0800
Subject: [PATCH] Add speed information in download task progress

---
 routes/index.ts   |  6 +++---
 task.ts           |  4 ++++
 tasks/download.ts | 18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/routes/index.ts b/routes/index.ts
index 41fa81a..7b975f5 100644
--- a/routes/index.ts
+++ b/routes/index.ts
@@ -17,10 +17,10 @@ export const handler: Handlers = {
                 flutter_base = m.cfg.flutter_frontend;
             }
             if (!await exists(flutter_base)) {
-                return new Response("404 Not Found", {status: 404});
+                return new Response("404 Not Found", { status: 404 });
             }
             return Response.redirect(`${get_host(req)}/flutter/`);
         }
-        return new Response("404 Not Found", {status: 404});
-    }
+        return new Response("404 Not Found", { status: 404 });
+    },
 };
diff --git a/task.ts b/task.ts
index 9523f22..77edaf6 100644
--- a/task.ts
+++ b/task.ts
@@ -24,12 +24,16 @@ export type TaskDownloadSingleProgress = {
     total: number;
     started: number;
     downloaded: number;
+    speed: number;
+    last_updated: number;
 };
 
 export type TaskDownloadProgess = {
     downloaded_page: number;
     failed_page: number;
     total_page: number;
+    started: number;
+    downloaded_bytes: number;
     details: TaskDownloadSingleProgress[];
 };
 
diff --git a/tasks/download.ts b/tasks/download.ts
index 5a4c53a..ad11934 100644
--- a/tasks/download.ts
+++ b/tasks/download.ts
@@ -62,6 +62,8 @@ class DownloadManager {
             downloaded_page: 0,
             failed_page: 0,
             total_page: 0,
+            downloaded_bytes: 0,
+            started: Date.now(),
             details: [],
         };
         this.#task = task;
@@ -150,12 +152,22 @@ class DownloadManager {
     }
     set_details_downloaded(index: number, downloaded: number) {
         const d = this.#progress.details.find((v) => v.index === index);
-        if (d) d.downloaded = downloaded;
+        if (d) {
+            const num = downloaded - d.downloaded;
+            const now = Date.now();
+            this.#progress.downloaded_bytes += num;
+            d.downloaded = downloaded;
+            d.speed = num / (now - d.last_updated);
+            d.last_updated = now;
+        }
         this.#sendEvent();
     }
     set_details_started(index: number) {
         const d = this.#progress.details.find((v) => v.index === index);
-        if (d) d.started = (new Date()).getTime();
+        if (d) {
+            d.started = (new Date()).getTime();
+            d.last_updated = d.started;
+        }
         this.#sendEvent();
     }
     set_details_total(index: number, total: number) {
@@ -322,6 +334,8 @@ export async function download_task(
                 total: 0,
                 width: f.width,
                 started: 0,
+                speed: 0,
+                last_updated: 0,
             });
             function download_img() {
                 return new Promise<void>((resolve, reject) => {