Merge pull request #823 from imsyy/dev-font

refactor(download): 重构下载进度跟踪和多线程下载逻辑  - 提取 ProgressTracker 结构体统一管理进度更新，避免重复代码 - 简化多线程下载实现，使用 futures_util 替代手动任务管理 - 改进文件大小探测逻辑，增强 Range 请求处理 - 优化元数据写入函数，提取标签获取逻辑

Author: kazukokawagawa

Cargo.lock

@@ -16,19 +16,16 @@ import { loadNativeModule } from "../utils/native-loader";
 type toolModule = typeof import("@native/tools");
 const tools: toolModule = loadNativeModule("tools.node", "tools");
 
-interface DownloadProgress {
-  percent: number;
-  transferredBytes: number;
-  totalBytes: number;
-}
-
 /**
  * 文件相关 IPC
  */
 const initFileIpc = (): void => {
   /** 本地音乐服务 */
   const localMusicService = new LocalMusicService();
 
+  // Store active download tasks: ID -> DownloadTask instance
+  const activeDownloads = new Map<number, any>();
+
   /**
    * 获取全局搜索配置
    * @param cwd 当前工作目录
@@ -510,6 +507,7 @@ const initFileIpc = (): void => {
         skipIfExist?: boolean;
         threadCount?: number;
         referer?: string;
+        enableDownloadHttp2?: boolean;
       } = {
         fileName: "未知文件名",
         fileType: "mp3",
@@ -533,6 +531,7 @@ const initFileIpc = (): void => {
           songData,
           skipIfExist,
           referer,
+          enableDownloadHttp2,
         } = options;
         // 规范化路径
         const downloadPath = resolve(path);
@@ -593,33 +592,46 @@ const initFileIpc = (): void => {
         }
 
         const onProgress = (...args: any[]) => {
-          // console.log("Received progress args:", args);
-          let progressJson: string | undefined;
+          let progressData: any;
 
           // Handle (err, value) or (value) signature
-          if (args.length > 1 && args[0] === null && typeof args[1] === "string") {
-            progressJson = args[1];
-          } else if (args.length > 0 && typeof args[0] === "string") {
-            progressJson = args[0];
+          if (args.length > 1 && args[0] === null) {
+            progressData = args[1];
+          } else if (args.length > 0) {
+            progressData = args[0];
           }
 
           try {
-            if (!progressJson) return;
-            const progress = JSON.parse(progressJson) as DownloadProgress;
-            if (!progress) return;
+            if (!progressData) return;
+
+            // Handle both object (new) and JSON string (legacy/fallback)
+            if (typeof progressData === "string") {
+               try {
+                 progressData = JSON.parse(progressData);
+               } catch (e) {
+                 console.error("Failed to parse progress json", e);
+                 return;
+               }
+            }
+
+            if (!progressData || typeof progressData !== 'object') return;
+
+            // Map snake_case (Rust) to camelCase (JS)
+            // Rust struct: { percent, transferred_bytes, total_bytes }
+            const percent = progressData.percent;
+            const transferredBytes = progressData.transferredBytes ?? progressData.transferred_bytes ?? 0;
+            const totalBytes = progressData.totalBytes ?? progressData.total_bytes ?? 0;
 
             win.webContents.send("download-progress", {
               id: songData?.id,
-              percent: progress.percent,
-              transferredBytes: progress.transferredBytes,
-              totalBytes: progress.totalBytes,
+              percent: percent,
+              transferredBytes: transferredBytes,
+              totalBytes: totalBytes,
             });
           } catch (e) {
             console.error(
-              "Failed to parse progress json",
+              "Error processing progress callback",
               e,
-              "Input:",
-              progressJson,
               "Args:",
               args,
             );
@@ -635,15 +647,35 @@ const initFileIpc = (): void => {
         const threadCount =
           (options.threadCount as number) || (store.get("downloadThreadCount") as number) || 8;
 
-        await tools.downloadFile(
-          songData?.id || 0,
-          url,
-          finalFilePath,
-          metadata,
-          threadCount,
-          referer,
-          onProgress,
-        );
+        const enableHttp2 =
+          enableDownloadHttp2 !== undefined
+            ? enableDownloadHttp2
+            : (store.get("enableDownloadHttp2", true) as boolean);
+
+        // Upgrade HTTP to HTTPS if HTTP2 is enabled (HTTP2 usually requires HTTPS)
+        let finalUrl = url;
+        if (enableHttp2 && finalUrl.startsWith("http://")) {
+          finalUrl = finalUrl.replace(/^http:\/\//, "https://");
+          ipcLog.info(`🔒 Upgraded download URL to HTTPS for HTTP/2 support: ${finalUrl}`);
+        }
+
+        const task = new tools.DownloadTask();
+        const downloadId = songData?.id || 0;
+        activeDownloads.set(downloadId, task);
+
+        try {
+          await task.download(
+            finalUrl,
+            finalFilePath,
+            metadata,
+            threadCount,
+            referer,
+            onProgress,
+            enableHttp2,
+          );
+        } finally {
+          activeDownloads.delete(downloadId);
+        }
 
         // 创建同名歌词文件
         if (lyric && saveMetaFile && downloadLyric) {
@@ -667,8 +699,9 @@ const initFileIpc = (): void => {
 
   // 取消下载
   ipcMain.handle("cancel-download", async (_, songId: number) => {
-    if (tools) {
-      tools.cancelDownload(songId);
+    const task = activeDownloads.get(songId);
+    if (task) {
+      task.cancel();
       return true;
     }
     return false;

electron/main/ipc/ipc-file.ts

@@ -1,6 +1,7 @@
 import { existsSync } from "fs";
 import { rename, stat, unlink } from "fs/promises";
 import { cacheLog } from "../logger";
+import { useStore } from "../store";
 import { loadNativeModule } from "../utils/native-loader";
 import { CacheService } from "./CacheService";
 
@@ -90,17 +91,19 @@ export class MusicCacheService {
       }
 
       // 使用 Rust 下载器
-      // 这里的 id 仅用于进度或取消，缓存下载暂时传入 0 或尝试转换
-      const numericId = typeof id === "number" ? id : 0;
 
-      await tools.downloadFile(
-        numericId,
+      const store = useStore();
+      const enableHttp2 = store.get("enableDownloadHttp2", true) as boolean;
+
+      const task = new tools.DownloadTask();
+      await task.download(
         url,
         tempPath,
         null, // No metadata for cache
         4, // Thread count
         null, // Referer
         () => {}, // No progress callback needed for cache currently
+        enableHttp2,
       );
 
       // 检查临时文件是否存在

electron/main/services/MusicCacheService.ts

@@ -69,6 +69,10 @@ export interface StoreType {
     /** 端口 */
     port: number;
   };
+  /** 下载线程数 */
+  downloadThreadCount?: number;
+  /** 启用HTTP2下载 */
+  enableDownloadHttp2?: boolean;
 }
 
 /**
@@ -109,6 +113,8 @@ export const useStore = () => {
         enabled: false,
         port: 25885,
       },
+      downloadThreadCount: 8,
+      enableDownloadHttp2: true,
     },
   });
 };

electron/main/store/index.ts

@@ -1,45 +1,20 @@
 use std::{
     sync::{
-        LazyLock,
-        Mutex,
-        mpsc::{
-            self,
-            Receiver,
-            Sender,
-        },
+        LazyLock, Mutex,
+        mpsc::{self, Receiver, Sender},
     },
     thread,
-    time::{
-        Duration,
-        SystemTime,
-        UNIX_EPOCH,
-    },
+    time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
 use discord_rich_presence::{
-    DiscordIpc,
-    DiscordIpcClient,
-    activity::{
-        Activity,
-        ActivityType,
-        Assets,
-        Button,
-        StatusDisplayType,
-        Timestamps,
-    },
-};
-use tracing::{
-    debug,
-    info,
-    warn,
+    DiscordIpc, DiscordIpcClient,
+    activity::{Activity, ActivityType, Assets, Button, StatusDisplayType, Timestamps},
 };
+use tracing::{debug, info, warn};
 
 use crate::model::{
-    DiscordConfigPayload,
-    DiscordDisplayMode,
-    MetadataPayload,
-    PlayStatePayload,
-    PlaybackStatus,
+    DiscordConfigPayload, DiscordDisplayMode, MetadataPayload, PlayStatePayload, PlaybackStatus,
     TimelinePayload,
 };
 

native/external-media-integration/src/discord.rs

@@ -6,10 +6,7 @@
 
 use napi::{
     Result,
-    bindgen_prelude::{
-        Function,
-        Unknown,
-    },
+    bindgen_prelude::{Function, Unknown},
     threadsafe_function::UnknownReturnValue,
 };
 use napi_derive::napi;
@@ -20,13 +17,8 @@ mod model;
 mod sys_media;
 
 use model::{
-    DiscordConfigPayload,
-    MetadataParam,
-    MetadataPayload,
-    PlayModePayload,
-    PlayStatePayload,
-    SystemMediaEvent,
-    TimelinePayload,
+    DiscordConfigPayload, MetadataParam, MetadataPayload, PlayModePayload, PlayStatePayload,
+    SystemMediaEvent, TimelinePayload,
 };
 
 /// 初始化插件

native/external-media-integration/src/lib.rs

@@ -1,32 +1,13 @@
-use std::{
-    fs,
-    path::PathBuf,
-    sync::OnceLock,
-};
+use std::{fs, path::PathBuf, sync::OnceLock};
 
-use anyhow::{
-    Context,
-    Result,
-};
+use anyhow::{Context, Result};
 use time::macros::format_description;
-use tracing::{
-    error,
-    trace,
-};
-use tracing_appender::{
-    non_blocking::WorkerGuard,
-    rolling::RollingFileAppender,
-};
+use tracing::{error, trace};
+use tracing_appender::{non_blocking::WorkerGuard, rolling::RollingFileAppender};
 use tracing_subscriber::{
     Layer,
-    filter::{
-        LevelFilter,
-        Targets,
-    },
-    fmt::{
-        self,
-        time::LocalTime,
-    },
+    filter::{LevelFilter, Targets},
+    fmt::{self, time::LocalTime},
     layer::SubscriberExt,
     util::SubscriberInitExt,
 };

native/external-media-integration/src/logger.rs

@@ -1,56 +1,30 @@
 use std::{
     io::Write,
     process,
-    sync::{
-        Arc,
-        RwLock,
-    },
+    sync::{Arc, RwLock},
     thread,
-    time::{
-        SystemTime,
-        UNIX_EPOCH,
-    },
+    time::{SystemTime, UNIX_EPOCH},
 };
 
 use anyhow::Result;
 use mpris_server::{
-    LoopStatus as MprisLoopStatus,
-    Metadata,
-    PlaybackStatus as MprisPlaybackStatus,
-    Player,
-    Time,
+    LoopStatus as MprisLoopStatus, Metadata, PlaybackStatus as MprisPlaybackStatus, Player, Time,
     zbus::zvariant::ObjectPath,
 };
 use napi::threadsafe_function::ThreadsafeFunctionCallMode;
 use tempfile::NamedTempFile;
 use tokio::{
     runtime::Runtime,
-    sync::mpsc::{
-        UnboundedReceiver,
-        UnboundedSender,
-        unbounded_channel,
-    },
-};
-use tracing::{
-    debug,
-    error,
+    sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel},
 };
+use tracing::{debug, error};
 
 use crate::{
     model::{
-        MetadataPayload,
-        PlayModePayload,
-        PlayStatePayload,
-        PlaybackStatus,
-        RepeatMode,
-        SystemMediaEvent,
-        SystemMediaEventType,
-        TimelinePayload,
-    },
-    sys_media::{
-        SystemMediaControls,
-        SystemMediaThreadsafeFunction,
+        MetadataPayload, PlayModePayload, PlayStatePayload, PlaybackStatus, RepeatMode,
+        SystemMediaEvent, SystemMediaEventType, TimelinePayload,
     },
+    sys_media::{SystemMediaControls, SystemMediaThreadsafeFunction},
 };
 
 /// 主线程和后台 D-Bus 现成通信的指令