From 6743b694c8ff334cbd0b2873b76a6358cb2910cb Mon Sep 17 00:00:00 2001
From: Astrian Zheng <happy.wheel6743@astrian.moe>
Date: Sat, 24 May 2025 22:53:21 +1000
Subject: [PATCH] =?UTF-8?q?refactor(Player):=20=E5=B0=86=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E5=99=A8=E7=BB=84=E4=BB=B6=E4=BB=8EApp.vue=E4=B8=AD=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=E5=88=B0=E7=8B=AC=E7=AB=8B=E7=9A=84Player.vue?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

提取播放器逻辑到独立的Player.vue组件，以提高代码的可维护性和复用性。同时，更新了相关依赖和样式，确保功能不受影响。
---
 public/manifest.json      | 29 ++++++++++++++++++--------
 src/App.vue               | 22 +++-----------------
 src/apis/index.ts         |  5 ++---
 src/components/Player.vue | 44 +++++++++++++++++++++++++++++++++++++++
 src/pages/AlbumDetail.vue | 14 ++++++++-----
 src/vite-env.d.ts         |  3 ++-
 6 files changed, 80 insertions(+), 37 deletions(-)
 create mode 100644 src/components/Player.vue

diff --git a/public/manifest.json b/public/manifest.json
index 80914d9..0aba2e7 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -5,12 +5,20 @@
 	"description": "A Vue-based browser extension.",
 	"content_scripts": [
 		{
-			"matches": ["https://monster-siren.hypergryph.com/"],
-			"js": ["content.js"],
+			"matches": [
+				"https://monster-siren.hypergryph.com/"
+			],
+			"js": [
+				"content.js"
+			],
 			"run_at": "document_end"
 		}
 	],
-	"host_permissions": ["https://monster-siren.hypergryph.com/*", "http://localhost:5173/*"],
+	"host_permissions": [
+		"https://monster-siren.hypergryph.com/*",
+		"http://localhost:5173/*",
+		"https://res01.hycdn.cn/*"
+	],
 	"icons": {
 		"16": "vite.svg",
 		"48": "vite.svg",
@@ -19,9 +27,12 @@
 	"background": {
 		"service_worker": "background.js"
 	},
-	"permissions": ["tabs", "webRequest"],
-  "content_security_policy": {
-    "extension_pages": "default-src 'self'; script-src 'self' http://localhost:5173; style-src 'self' 'unsafe-inline'; connect-src 'self' ws://localhost:5173 https://monster-siren.hypergryph.com; img-src 'self' https://web.hycdn.cn;",
-    "sandbox": "sandbox"
-  }
-}
+	"permissions": [
+		"tabs",
+		"webRequest"
+	],
+	"content_security_policy": {
+		"extension_pages": "default-src 'self'; script-src 'self' http://localhost:5173; style-src 'self' 'unsafe-inline'; connect-src 'self' ws://localhost:5173 https://monster-siren.hypergryph.com; img-src 'self' https://web.hycdn.cn; media-src 'self' https://res01.hycdn.cn;",
+		"sandbox": "sandbox"
+	}
+}
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 0529b19..a2e8ff3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
-import { usePlayQueueStore } from './stores/usePlayQueueStore'
-
-const playQueueStore = usePlayQueueStore()
+import Player from './components/Player.vue'
 
 const route = useRoute()
+
 </script>
 
 <template>
@@ -54,22 +53,7 @@ const route = useRoute()
 							</div>
 						</button>
 
-						<div class="text-white w-48 h-9 bg-neutral-800/80 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl flex gap-2 overflow-hidden" v-if="playQueueStore.list.length !== 0">
-							<img :src="playQueueStore.list[playQueueStore.currentIndex].album?.coverUrl ?? ''" class="rounded-full" />
-							<div class="flex-1 flex items-center">
-								<span class="">{{ playQueueStore.list[playQueueStore.currentIndex].song.name }}</span>
-							</div>
-							<button class="h-9 w-9 flex justify-center items-center" @click="() => {
-								playQueueStore.isPlaying = !playQueueStore.isPlaying
-							}">
-								<div class="w-4 h-4" v-if="playQueueStore.isPlaying">
-									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M6 5H8V19H6V5ZM16 5H18V19H16V5Z"></path></svg>
-								</div>
-								<div class="w-4 h-4" v-else>
-									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M19.376 12.4161L8.77735 19.4818C8.54759 19.635 8.23715 19.5729 8.08397 19.3432C8.02922 19.261 8 19.1645 8 19.0658V4.93433C8 4.65818 8.22386 4.43433 8.5 4.43433C8.59871 4.43433 8.69522 4.46355 8.77735 4.5183L19.376 11.584C19.6057 11.7372 19.6678 12.0477 19.5146 12.2774C19.478 12.3323 19.4309 12.3795 19.376 12.4161Z"></path></svg>
-								</div>
-							</button>
-						</div>
+						<Player />
 					</div>
 				</div>
 			</div>
diff --git a/src/apis/index.ts b/src/apis/index.ts
index af56f46..26a2363 100644
--- a/src/apis/index.ts
+++ b/src/apis/index.ts
@@ -16,8 +16,8 @@ export default {
 		const song: {
 			data: ApiResponse
 		} = await msrInstance.get(`song/${cid}`)
-		if (song.data.code!== 0) { return new Error(`Cannot get song: ${song.data.msg}`) }
-		return { song: song.data.data as Song }
+		if (song.data.code!== 0) { throw new Error(`Cannot get song: ${song.data.msg}`) }
+		return song.data.data as Song
 	},
 	async getAlbums() {
 		const albums: {
@@ -36,7 +36,6 @@ export default {
 		} = await msrInstance.get(`album/${cid}/data`)
 		let data = album.data.data as Album
 		data.artistes = (albumMeta.data.data as Album).artistes
-		console.log(albumMeta)
 		return data
 	}
 }
diff --git a/src/components/Player.vue b/src/components/Player.vue
new file mode 100644
index 0000000..d209f77
--- /dev/null
+++ b/src/components/Player.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { usePlayQueueStore } from '../stores/usePlayQueueStore'
+import { useTemplateRef, watch } from 'vue'
+
+const playQueueStore = usePlayQueueStore()
+
+const player = useTemplateRef('playerRef')
+
+watch(() => playQueueStore.isPlaying, (newValue) => {
+	if (newValue) { player.value?.play() }
+	else { player.value?.pause() }
+})
+</script>
+
+<template>
+	<div>
+		<audio :src="playQueueStore.list[playQueueStore.currentIndex] ? playQueueStore.list[playQueueStore.currentIndex].song.sourceUrl : ''" ref="playerRef" autoplay v-if="playQueueStore.list.length !== 0"></audio>
+
+		<div
+			class="text-white w-48 h-9 bg-neutral-800/80 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl flex gap-2 overflow-hidden"
+			v-if="playQueueStore.list.length !== 0">
+			<img :src="playQueueStore.list[playQueueStore.currentIndex].album?.coverUrl ?? ''" class="rounded-full" />
+			<div class="flex-1 flex items-center">
+				<span class="">{{ playQueueStore.list[playQueueStore.currentIndex].song.name }}</span>
+			</div>
+			<button class="h-9 w-9 flex justify-center items-center" @click="() => {
+				playQueueStore.isPlaying = !playQueueStore.isPlaying
+			}">
+				<div class="w-4 h-4" v-if="playQueueStore.isPlaying">
+					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+						<path d="M6 5H8V19H6V5ZM16 5H18V19H16V5Z"></path>
+					</svg>
+				</div>
+				<div class="w-4 h-4" v-else>
+					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+						<path
+							d="M19.376 12.4161L8.77735 19.4818C8.54759 19.635 8.23715 19.5729 8.08397 19.3432C8.02922 19.261 8 19.1645 8 19.0658V4.93433C8 4.65818 8.22386 4.43433 8.5 4.43433C8.59871 4.43433 8.69522 4.46355 8.77735 4.5183L19.376 11.584C19.6057 11.7372 19.6678 12.0477 19.5146 12.2774C19.478 12.3323 19.4309 12.3795 19.376 12.4161Z">
+						</path>
+					</svg>
+				</div>
+			</button>
+		</div>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/pages/AlbumDetail.vue b/src/pages/AlbumDetail.vue
index 7a07e19..0df7ae1 100644
--- a/src/pages/AlbumDetail.vue
+++ b/src/pages/AlbumDetail.vue
@@ -13,8 +13,12 @@ const playQueue = usePlayQueueStore()
 
 onMounted(async () => {
 	try {
-		const res = await apis.getAlbum(albumId as string)
+		let res = await apis.getAlbum(albumId as string)
+		for (const track in res.songs) {
+			res.songs[parseInt(track)] = await apis.getSong(res.songs[parseInt(track)].cid)
+		}
 		album.value = res
+		console.log(res)
 	} catch (error) {
 		console.log(error)
 	}
@@ -35,6 +39,7 @@ function playTheAlbum() {
 
 	let newPlayQueue = []
 	for (const track of album.value?.songs ?? []) {
+		console.log(track)
 		newPlayQueue.push({
 			song: track,
 			album: album.value
@@ -67,8 +72,7 @@ function playTheAlbum() {
 				<div class="flex gap-2">
 					<button
 						class="bg-sky-500/20 hover:bg-sky-500/30 active:bg-sky-600/30 active:shadow-inner border border-[#ffffff39] rounded-full w-56 h-10 text-base text-white flex justify-center items-center gap-2"
-						@click="playTheAlbum"
-					>
+						@click="playTheAlbum">
 						<div class="w-4 h-4">
 							<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
 								<path
@@ -115,8 +119,8 @@ function playTheAlbum() {
 					<div class="flex flex-col justify-center">
 						<div class="text-white text-base">{{ track.name }}</div>
 						<div class="text-white/50 text-sm"
-							v-if="artistsOrganize(track.artistes) !== artistsOrganize(album?.artistes ?? [])">
-							{{ artistsOrganize(track.artistes) }}
+							v-if="artistsOrganize(track.artists ?? []) !== artistsOrganize(album?.artistes ?? [])">
+							{{ artistsOrganize(track.artists ?? []) }}
 						</div>
 					</div>
 				</button>
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 48ae7b9..b1fd495 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -12,7 +12,8 @@ type Song = {
   lyricUrl?: string | null
   mvUrl?: string | null
   mvCoverUrl?: string | null
-  artistes: string[]
+  artistes?: string[]
+  artists?: string[]
 }
 
 type Album = {