Merge pull request #633 from imsyy/dev-perf

✨ feat: 重构播放器相关逻辑

Author: imsyy

electron.vite.config.ts

@@ -28,7 +28,6 @@ export default defineConfig(({ command, mode }) => {
         rollupOptions: {
           input: {
             index: resolve(__dirname, "electron/main/index.ts"),
-            lyric: resolve(__dirname, "web/lyric.html"),
           },
         },
       },

src/api/song.ts

@@ -1,6 +1,6 @@
 import { isElectron } from "@/utils/env";
 import { defaultAMLLDbServer, songLevelData } from "@/utils/meta";
-import { SongUnlockServer } from "@/utils/songManager";
+import { SongUnlockServer } from "@/core/player/SongManager";
 import { useSettingStore } from "@/stores";
 import request from "@/utils/request";
 

src/components/Card/SongCard.vue

@@ -162,9 +162,9 @@ import { openJumpArtist } from "@/utils/modal";
 import { toLikeSong } from "@/utils/auth";
 import { isObject } from "lodash-es";
 import { formatTimestamp, msToTime } from "@/utils/time";
-import { usePlayer } from "@/utils/player";
+import { usePlayerController } from "@/core/player/PlayerController";
 import { isElectron } from "@/utils/env";
-import blob from "@/utils/blob";
+import { useBlobURLManager } from "@/core/resource/BlobURLManager";
 
 const props = defineProps<{
   // 歌曲
@@ -178,12 +178,14 @@ const props = defineProps<{
 }>();
 
 const router = useRouter();
-const player = usePlayer();
 const dataStore = useDataStore();
 const musicStore = useMusicStore();
 const statusStore = useStatusStore();
 const settingStore = useSettingStore();
 
+const player = usePlayerController();
+const blobURLManager = useBlobURLManager();
+
 // 歌曲数据
 const song = toRef(props, "song");
 
@@ -198,12 +200,25 @@ const qualityColor = computed(() => {
 // 加载本地歌曲封面
 const localCover = async (show: boolean) => {
   if (!isElectron || !show || !song.value.path) return;
-  if (song.value.cover || song.value.cover === "/images/song.jpg?assest") return;
+  // 是否还在缓存中
+  const currentCover = song.value.cover;
+  if (currentCover && currentCover.startsWith("blob:")) {
+    // 需要重新获取
+    if (!blobURLManager.hasBlobURL(song.value.path)) {
+      song.value.cover = "";
+    } else {
+      return;
+    }
+  }
+  // 如果已有非 blob URL 的封面，不需要重新获取
+  if (song.value.cover && song.value.cover !== "" && song.value.cover !== "/images/song.jpg?assest") {
+    return;
+  }
   // 获取封面
   const coverData = await window.electron.ipcRenderer.invoke("get-music-cover", song.value.path);
   if (!coverData) return;
   const { data, format } = coverData;
-  const blobURL = blob.createBlobURL(data, format, song.value.path);
+  const blobURL = blobURLManager.createBlobURL(data, format, song.value.path);
   if (blobURL) song.value.cover = blobURL;
 };
 </script>

src/components/Layout/Menu.vue

@@ -35,14 +35,14 @@ import { openCreatePlaylist } from "@/utils/modal";
 import { debounce } from "lodash-es";
 import { isLogin } from "@/utils/auth";
 import { isElectron } from "@/utils/env";
-import { usePlayer } from "@/utils/player";
+import { usePlayerController } from "@/core/player/PlayerController";
 
 const router = useRouter();
-const player = usePlayer();
 const dataStore = useDataStore();
 const musicStore = useMusicStore();
 const statusStore = useStatusStore();
 const settingStore = useSettingStore();
+const player = usePlayerController();
 
 // 菜单数据
 const menuRef = ref<MenuInst | null>(null);
@@ -272,8 +272,7 @@ const menuUpdate = (key: string, item: MenuOption) => {
       // 更改播放模式
       statusStore.personalFmMode = true;
       statusStore.playHeartbeatMode = false;
-      player.resetStatus();
-      player.initPlayer();
+      player.playSong();
     }
     statusStore.showFullPlayer = true;
     window.$message.info("已开启私人漫游", { icon: renderIcon("Radio") });

src/components/List/CoverList.vue

@@ -121,9 +121,9 @@ import { formatSongsList } from "@/utils/format";
 import { songDetail } from "@/api/song";
 import { playlistAllSongs } from "@/api/playlist";
 import { radioAllProgram } from "@/api/radio";
-import { usePlayer } from "@/utils/player";
-import CoverMenu from "@/components/Menu/CoverMenu.vue";
+import { usePlayerController } from "@/core/player/PlayerController";
 import { formatTimestamp } from "@/utils/time";
+import CoverMenu from "@/components/Menu/CoverMenu.vue";
 
 interface Props {
   data: CoverType[];
@@ -145,9 +145,9 @@ const emit = defineEmits<{
 }>();
 
 const router = useRouter();
-const player = usePlayer();
 const musicStore = useMusicStore();
 const statusStore = useStatusStore();
+const player = usePlayerController();
 
 // 右键菜单
 const coverMenuRef = ref<InstanceType<typeof CoverMenu> | null>(null);

src/components/List/SongList.vue

@@ -114,7 +114,7 @@ import { useMusicStore, useStatusStore } from "@/stores";
 import { entries, isEmpty } from "lodash-es";
 import { sortOptions } from "@/utils/meta";
 import { renderIcon } from "@/utils/helper";
-import { usePlayer } from "@/utils/player";
+import { usePlayerController } from "@/core/player/PlayerController";
 import SongListMenu from "@/components/Menu/SongListMenu.vue";
 
 const props = withDefaults(
@@ -168,9 +168,9 @@ const emit = defineEmits<{
   removeSong: [id: number[]];
 }>();
 
-const player = usePlayer();
 const musicStore = useMusicStore();
 const statusStore = useStatusStore();
+const player = usePlayerController();
 
 // 列表状态
 const scrollTop = ref<number>(0);
@@ -316,7 +316,6 @@ const sortSelect = (key: SortType) => {
     player.updatePlayList(listData.value, musicStore.playSong, props.playListId, {
       showTip: false,
       play: false,
-      scrobble: false,
     });
   }
   // 滚动到当前播放歌曲或顶部

src/components/Menu/SongListMenu.vue

@@ -19,7 +19,7 @@
 import type { SongType } from "@/types/main";
 import { NAlert, type DropdownOption } from "naive-ui";
 import { useStatusStore, useDataStore, useMusicStore } from "@/stores";
-import DownloadManager from "@/utils/downloadManager";
+import { useDownloadManager } from "@/core/resource/DownloadManager";
 import { renderIcon, copyData } from "@/utils/helper";
 import { deleteCloudSong, importCloudSong } from "@/api/cloud";
 import {
@@ -32,15 +32,17 @@ import { deleteSongs, isLogin } from "@/utils/auth";
 import { songUrl } from "@/api/song";
 import { dailyRecommendDislike } from "@/api/rec";
 import { formatSongsList } from "@/utils/format";
-import { usePlayer } from "@/utils/player";
+import { usePlayerController } from "@/core/player/PlayerController";
 
 const emit = defineEmits<{ removeSong: [index: number[]] }>();
 
 const router = useRouter();
-const player = usePlayer();
 const dataStore = useDataStore();
-const statusStore = useStatusStore();
 const musicStore = useMusicStore();
+const statusStore = useStatusStore();
+
+const player = usePlayerController();
+const downloadManager = useDownloadManager();
 
 // 右键菜单数据
 const dropdownX = ref<number>(0);
@@ -256,7 +258,7 @@ const openDropdown = (
           key: "retry-download",
           label: "重试下载",
           show: isDownloading,
-          props: { onClick: () => DownloadManager.retryDownload(song.id) },
+          props: { onClick: () => downloadManager.retryDownload(song.id) },
           icon: renderIcon("Refresh"),
         },
       ];

src/components/Modal/AutoClose.vue

@@ -66,9 +66,9 @@
 <script setup lang="ts">
 import { useStatusStore } from "@/stores";
 import { convertSecondsToTime } from "@/utils/time";
-import { usePlayer } from "@/utils/player";
+import { usePlayerController } from "@/core/player/PlayerController";
 
-const player = usePlayer();
+const player = usePlayerController();
 const statusStore = useStatusStore();
 
 // 自定义时长

src/components/Modal/ChangeRate.vue

@@ -32,8 +32,8 @@
 
 <script setup lang="ts">
 import { useStatusStore } from "@/stores";
-import { usePlayer } from "@/utils/player";
+import { usePlayerController } from "@/core/player/PlayerController";
 
-const player = usePlayer();
+const player = usePlayerController();
 const statusStore = useStatusStore();
 </script>

src/components/Modal/DownloadModal.vue

@@ -78,9 +78,9 @@ import { openSetting } from "@/utils/modal";
 import { isElectron } from "@/utils/env";
 import { songDetail } from "@/api/song";
 import { formatSongsList } from "@/utils/format";
-import SongDataCard from "@/components/Card/SongDataCard.vue";
 import { pick } from "lodash-es";
-import DownloadManager from "@/utils/downloadManager";
+import { useDownloadManager } from "@/core/resource/DownloadManager";
+import SongDataCard from "@/components/Card/SongDataCard.vue";
 
 const props = defineProps<{
   songs?: SongType[];
@@ -93,7 +93,7 @@ const emit = defineEmits<{
 }>();
 
 const settingStore = useSettingStore();
-
+const downloadManager = useDownloadManager();
 const loading = ref<boolean>(false);
 const songs = ref<SongType[]>(props.songs || []);
 
@@ -148,7 +148,7 @@ const handleConfirm = () => {
 
   // 添加到下载队列
   songs.value.forEach((song) => {
-    DownloadManager.addDownload(song, selectedQuality.value);
+    downloadManager.addDownload(song, selectedQuality.value);
   });
 
   emit("close");