From 457f735934e6edb3b4eee610819be334c56aad27 Mon Sep 17 00:00:00 2001
From: Hiram <>
Date: Sun, 15 Dec 2024 15:56:22 +0800
Subject: [PATCH] [change] use new multi-player

---
 .../src/components/player/src/utils/tool.ts   |   4 +-
 .../src/locales/lang/en_US/pages/player.ts    |   1 +
 .../src/locales/lang/zh_CN/pages/player.ts    |   1 +
 src/renderer/src/pages/analyze/index.vue      |  11 +-
 .../lab/components/snifferPlay/index.vue      |  58 +++---
 .../src/pages/play/componets/AsideFilm.vue    | 172 +++++++++---------
 .../pages/play/componets/DialogDownload.vue   |   8 +-
 src/renderer/src/pages/play/index.vue         |  30 +--
 src/renderer/src/utils/common/film.ts         |  62 ++++---
 src/renderer/src/utils/tool.ts                | 118 +-----------
 10 files changed, 192 insertions(+), 273 deletions(-)

diff --git a/src/renderer/src/components/player/src/utils/tool.ts b/src/renderer/src/components/player/src/utils/tool.ts
index 1c947a786..f3b379d17 100644
--- a/src/renderer/src/components/player/src/utils/tool.ts
+++ b/src/renderer/src/components/player/src/utils/tool.ts
@@ -138,11 +138,11 @@ const mediaUtils = (() => {
   };
 
   // 映射 Content-Type 到具体格式
-  const mapContentTypeToFormat = (contentType: string): string => {
+  const mapContentTypeToFormat = (contentType: string): string | undefined => {
     const entry = Object.entries(supportedFormats).find(([type]) =>
       contentType.includes(type)
     );
-    return entry ? entry[1] : 'unknown';
+    return entry ? entry[1] : undefined;
   };
 
   // 使用 fetch 获取媒体类型
diff --git a/src/renderer/src/locales/lang/en_US/pages/player.ts b/src/renderer/src/locales/lang/en_US/pages/player.ts
index ebe39cadf..a59b6089f 100644
--- a/src/renderer/src/locales/lang/en_US/pages/player.ts
+++ b/src/renderer/src/locales/lang/en_US/pages/player.ts
@@ -44,6 +44,7 @@ export default {
     official: 'Analyze completed, data is derived from {0}',
     noDefaultAnalyze: 'Not set default, Choose your own analysis line',
     noRecommendSearch: 'No recommendation found for this source,  Switch is not performed',
+    noPlayUrl: 'Play address acquisition failed, please change the source or line',
     next: 'One moment, Switching next',
   },
   placeholder: {
diff --git a/src/renderer/src/locales/lang/zh_CN/pages/player.ts b/src/renderer/src/locales/lang/zh_CN/pages/player.ts
index ff4a91f43..9fee624da 100644
--- a/src/renderer/src/locales/lang/zh_CN/pages/player.ts
+++ b/src/renderer/src/locales/lang/zh_CN/pages/player.ts
@@ -44,6 +44,7 @@ export default {
     sniiferError: '嗅探失败,请换源',
     noDefaultAnalyze: '未配置默认解析,自行选择解析线路',
     noRecommendSearch: '该源未找到相关推荐,不执行本次切换',
+    noPlayUrl: '播放地址获取失败,请换源或线路',
     next: '请稍候,正在切换下集',
   },
   placeholder: {
diff --git a/src/renderer/src/pages/analyze/index.vue b/src/renderer/src/pages/analyze/index.vue
index f3c65168a..c624153ac 100644
--- a/src/renderer/src/pages/analyze/index.vue
+++ b/src/renderer/src/pages/analyze/index.vue
@@ -38,7 +38,7 @@
             </div>
           </div>
           <div class="player-content">
-            <player-view ref="playerRef" />
+            <multi-player ref="playerRef" />
           </div>
         </div>
         <div class="analyze-setting">
@@ -71,14 +71,14 @@ import { putHistory, addHistory, findHistory } from '@/api/history';
 import { fetchAnalyzeHelper } from '@/utils/common/film';
 import emitter from '@/utils/emitter';
 
+import { MultiPlayer } from '@/components/player';
 import DialogHistoryView from './components/DialogHistory.vue';
 import DialogIframemView from './components/DialogIframe.vue';
 import DialogSearchView from './components/DialogSearch.vue';
 import SharePopup from '@/components/share-popup/index.vue';
 import CommonNav from '@/components/common-nav/index.vue';
-import PlayerView from '@/components/player/index.vue';
 
-const store = usePlayStore();
+const storePlayer = usePlayStore();
 const searchText = ref('');
 const urlTitle = ref(''); // 播放地址的标题
 const analyzeUrl = ref<string>(''); // 输入需要解析地址
@@ -181,13 +181,12 @@ const getVideoInfo = async (url: string, title: string) => {
   playFormData.value.type = analyzeRes.mediaType;
   playFormData.value.url = analyzeRes.url;
   playFormData.value.headers = analyzeRes.headers;
-  const { playerMode } = store.setting;
+  const playerMode = storePlayer.setting.playerMode;
   if (playerMode.type === 'custom') {
     window.electron.ipcRenderer.send('call-player', playerMode.external, playFormData.value.url);
   } else {
     if (playerRef.value) {
-      await playerRef.value.init();
-      await playerRef.value.create(playFormData.value);
+      await playerRef.value.create(playFormData.value, playerMode.type);
     };
   }
 
diff --git a/src/renderer/src/pages/lab/components/snifferPlay/index.vue b/src/renderer/src/pages/lab/components/snifferPlay/index.vue
index 79131deeb..f15d75140 100644
--- a/src/renderer/src/pages/lab/components/snifferPlay/index.vue
+++ b/src/renderer/src/pages/lab/components/snifferPlay/index.vue
@@ -54,6 +54,7 @@
                   <t-option label="Flv" value="flv" />
                   <t-option label="Mp4" value="mp4" />
                   <t-option label="Dash" value="mpd" />
+                  <t-option label="Torrent" value="magnet" />
                 </t-select>
               </t-form-item>
             </t-form>
@@ -65,7 +66,7 @@
         </t-badge>
         <t-badge :count="$t('pages.lab.snifferPlay.preview')" style="flex: 1;" color="var(--td-success-color)" shape="round">
           <div class="result card" style="height: 100%; width: 100%;">
-            <player-view ref="playerRef" style="border-radius: var(--td-radius-default); overflow: hidden;" />
+            <multi-player ref="playerRef" style="border-radius: var(--td-radius-default); overflow: hidden;" />
           </div>
         </t-badge>
       </div>
@@ -75,11 +76,13 @@
 
 <script lang="ts" setup>
 import { ref, useTemplateRef } from 'vue';
-import sniffer from '@/utils/sniffer';
-import PlayerView from '@/components/player/index.vue';
 import { MessagePlugin } from 'tdesign-vue-next';
+import sniffer from '@/utils/sniffer';
 import { t } from '@/locales';
-import { checkMediaType } from '@/utils/tool';
+import { usePlayStore } from '@/store';
+import { MultiPlayer, mediaUtils } from '@/components/player';
+
+const storePlayer = usePlayStore();
 
 const formData = ref({
   sniffer: {
@@ -115,13 +118,13 @@ const sniiferEvent = async () => {
 };
 
 const playerPlayEvent = async () => {
-  if (!playerRef.value) return;
-  if (!formData.value.player.url || !formData.value.player.url.startsWith('http')) {
+  let { url, headers, type } = formData.value.player;
+  if (!headers) headers = '{}';
+  if (!url || !(/^(http:\/\/|https:\/\/)/.test(url) || url.includes('magnet:'))) {
     MessagePlugin.warning(t('pages.lab.snifferPlay.message.playerNoUrl'));
     return;
   };
 
-  let headers = formData.value.player.headers || '{}';
   try {
     headers = JSON.parse(headers);
     if (typeof headers === 'object' && headers !== null && !Array.isArray(headers)) {
@@ -133,23 +136,32 @@ const playerPlayEvent = async () => {
     MessagePlugin.warning(t('pages.lab.snifferPlay.message.headersNoJson'));
     return;
   }
-  let mediaType = formData.value.player.type;
-  if (mediaType === 'auto') {
-    const checkType = await checkMediaType(formData.value.player.url);
-    if (checkType === 'unknown' && !checkType) {
-      MessagePlugin.warning(t('pages.lab.snifferPlay.message.mediaNoType'));
-      return;
+
+  const playerMode = storePlayer.setting.playerMode;
+
+  if (playerMode.type === 'custom') {
+    window.electron.ipcRenderer.send('call-player', playerMode.external, url);
+  } else {
+    let mediaType = type;
+    if (mediaType === 'auto') {
+      const checkType = await mediaUtils.checkMediaType(url);
+      if (checkType === 'unknown' && !checkType) {
+        MessagePlugin.warning(t('pages.lab.snifferPlay.message.mediaNoType'));
+        return;
+      }
+      mediaType = checkType;
+    };
+    if (playerRef.value) {
+      await playerRef.value.create({
+        url: url,
+        isLive: false,
+        headers: headers,
+        type: mediaType,
+        container: 'lab-mse'
+      }, playerMode.type);
     }
-    mediaType = checkType;
-  };
-  await playerRef.value.init();
-  await playerRef.value.create({
-    url: formData.value.player.url,
-    isLive: false,
-    headers: headers,
-    type: mediaType,
-    container: 'lab-mse'
-  });
+  }
+
   MessagePlugin.success(t('pages.setting.form.success'));
 };
 
diff --git a/src/renderer/src/pages/play/componets/AsideFilm.vue b/src/renderer/src/pages/play/componets/AsideFilm.vue
index 7f0cce923..ae226168c 100644
--- a/src/renderer/src/pages/play/componets/AsideFilm.vue
+++ b/src/renderer/src/pages/play/componets/AsideFilm.vue
@@ -223,9 +223,7 @@ import {
 } from '@/utils/common/film';
 import { fetchRecommPage } from '@/api/site';
 import { fetchAnalyzeActive } from '@/api/analyze';
-import { fetchConfig } from '@/api/setting';
 import { t } from '@/locales';
-import { hash } from '@/utils/crypto';
 import DialogDownloadView from './DialogDownload.vue';
 import DialogSettingView from './DialogSetting.vue';
 import SharePopup from '@/components/share-popup/index.vue';
@@ -472,56 +470,64 @@ const settingEvent = () => {
 
 // 调用播放器
 const callPlay = async (item) => {
-  let { url } = formatIndex(item);
-  url = decodeURIComponent(url);
-  const originUrl = url;
-  active.value.filmIndex = item;
-  const analyzeInfo = analyzeData.value.list.find(item => item.id === active.value.analyzeId);
-  let response;
-  if (tmp.value.preloadNext.init  && tmp.value.preloadNext.load) {
-    response = { url: tmp.value.preloadNext.url, headers: tmp.value.preloadNext.headers, mediaType: tmp.value.preloadNext.mediaType };
-  } else {
-    let analyzeType = analyzeInfo?.type !== undefined ? analyzeInfo?.type : -1;
-    if (active.value.official) {
-      if (!analyzeInfo || typeof analyzeInfo !== 'object' || Object.keys(analyzeInfo).length === 0) {
-        MessagePlugin.warning(t('pages.film.message.notSelectAnalyze'));
-        return;
-      };
-      url = `${analyzeInfo.url}${url}`;
-      analyzeType = analyzeInfo.type;
+  try {
+    let { url } = formatIndex(item);
+    url = decodeURIComponent(url);
+    const originUrl = url;
+    active.value.filmIndex = item;
+    const analyzeInfo = analyzeData.value.list.find(item => item.id === active.value.analyzeId);
+    let response;
+    if (tmp.value.preloadNext.init  && tmp.value.preloadNext.load) {
+      response = { url: tmp.value.preloadNext.url, headers: tmp.value.preloadNext.headers, mediaType: tmp.value.preloadNext.mediaType };
     } else {
-      analyzeType = -1;
-    }
-    response = await playHelper(url, extConf.value.site, active.value.flimSource, analyzeType, extConf.value.setting.playConf.skipAd);
-  };
+      let analyzeType = analyzeInfo?.type !== undefined ? analyzeInfo?.type : -1;
+      if (active.value.official) {
+        if (!analyzeInfo || typeof analyzeInfo !== 'object' || Object.keys(analyzeInfo).length === 0) {
+          MessagePlugin.warning(t('pages.film.message.notSelectAnalyze'));
+          return;
+        };
+        url = `${analyzeInfo.url}${url}`;
+        analyzeType = analyzeInfo.type;
+      } else {
+        analyzeType = -1;
+      }
+      response = await playHelper(url, extConf.value.site, active.value.flimSource, analyzeType, extConf.value.setting.playConf.skipAd);
+    };
 
-  if (response?.url &&/^(http:\/\/|https:\/\/)/.test(response.url)) {
-    videoData.value.url = response.url;
-    emits('play', { url: response.url, type: response.mediaType! || '', headers: response.headers, startTime: videoData.value.skipTime });
-  };
+    if (!response?.url || !/^(http:\/\/|https:\/\/)/.test(response.url)) {
+      MessagePlugin.warning(t('pages.player.message.noPlayUrl'));
+      return;
+    } else {
+      videoData.value.url = response.url;
+      emits('play', { url: response.url, type: response.mediaType! || '', headers: response.headers, startTime: videoData.value.skipTime });
+    };
 
-  let barrage: any[] = [];
-  if (tmp.value.preloadNext.init  && tmp.value.preloadNext.load) {
-    if (tmp.value.preloadNext.barrage.length > 0) barrage = tmp.value.preloadNext.barrage;
-  } else {
-    barrage = await fetchBarrageData(originUrl, extConf.value.setting.barrage, active.value);
-  };
-  if (/^(http:\/\/|https:\/\/)/.test(response?.url) && barrage.length > 0) {
-    emits('barrage', { comments: barrage, url: extConf.value.setting.barrage.url, id: hash['md5-16'](originUrl) });
-  };
+    let barrage: any[] = [];
+    if (tmp.value.preloadNext.init  && tmp.value.preloadNext.load) {
+      if (tmp.value.preloadNext.barrage.length > 0) barrage = tmp.value.preloadNext.barrage;
+    } else {
+      barrage = await fetchBarrageData(originUrl, extConf.value.setting.barrage, active.value);
+    };
 
-  // 临时数据恢复默认
-  tmp.value = {
-    preloadNext: {
-      url: '',
-      headers: {},
-      load: false,
-      init: false,
-      barrage: [],
-      mediaType: '',
-    },
-    end: false,
-  };
+    if (barrage.length > 0) {
+      const { origin, pathname } = new URL(originUrl);
+      const formatBarrageUrl = `${origin}${pathname}`;
+      emits('barrage', { comments: barrage, url: extConf.value.setting.barrage.url, id: formatBarrageUrl });
+    };
+  } finally {
+    // 临时数据恢复默认
+    tmp.value = {
+      preloadNext: {
+        url: '',
+        headers: {},
+        load: false,
+        init: false,
+        barrage: [],
+        mediaType: '',
+      },
+      end: false,
+    };
+  }
 };
 
 // 切换线路
@@ -714,8 +720,8 @@ const timerUpdatePlayProcess = async(currentTime: number, duration: number) => {
   };
 
   // 2.获取跳过时间
-  const { preloadNext, skipStartEnd, playConf, barrage } = extConf.value.setting;
-  const watchTime = skipStartEnd ? currentTime + videoData.value.skipTimeInEnd : currentTime;
+  const { playConf, barrage } = extConf.value.setting;
+  const watchTime = playConf.skipHeadAndEnd ? currentTime + videoData.value.skipTimeInEnd : currentTime;
   // console.log(
   //   `[player][timeUpdate] - current:${currentTime}; watch:${watchTime}; duration:${duration}; percentage:${Math.trunc((currentTime / duration) * 100)}%`,
   // );
@@ -726,47 +732,47 @@ const timerUpdatePlayProcess = async(currentTime: number, duration: number) => {
   if (watchTime >= duration) videoData.value.playEnd = true;
   throttlePutHistory();
 
-  // 4.播放下集  不是最后一集 & 时间>尾部跳过时间+观看时间
+  // 4.播放下集  不是最后一集 & 开启续集 & 观看时间+尾部跳过时间 >= 总时长
   if (!isLast() && playConf.playNextEnabled && watchTime >= duration && duration !== 0 && !tmp.value.end) {
-    tmp.value.end = true;
+    tmp.value.end = true; // 标识是否触发下集
+
     const nextIndex = active.value.reverseOrder ? index + 1 : index - 1;
     const nextInfo = seasonData.value[active.value.flimSource][nextIndex];
     await switchSeasonEvent(nextInfo);
     return;
   };
 
-  // 5.预加载下集链接 提前30秒预加载
-  if (watchTime + 30 >= duration && duration !== 0) {
-    if (!isLast() && !tmp.value.preloadNext.load && preloadNext) {
-      tmp.value.preloadNext.load = true; // 标识是否触发预加载
-      try {
-        const nextIndex = active.value.reverseOrder ? index + 1 : index - 1;
-        const nextInfo = seasonData.value[active.value.flimSource][nextIndex];
-        let url = formatIndex(nextInfo).url;
-        url = decodeURIComponent(url);
-        const originUrl = url;
-        const analyzeInfo = analyzeData.value.list.find(item => item.id === active.value.analyzeId);
-        let analyzeType = analyzeInfo?.type !== undefined ? analyzeInfo?.type : -1;
-        if (active.value.official) {
-          if (!analyzeInfo || typeof analyzeInfo !== 'object' || Object.keys(analyzeInfo).length === 0) return;
-          url = `${analyzeInfo.url}${url}`;
-          analyzeType = analyzeInfo.type;
-        } else {
-          analyzeType = -1;
-        }
-        const response = await playHelper(url, extConf.value.site, active.value.flimSource, analyzeType, playConf.skipAd);
-        if (response?.url &&/^(http:\/\/|https:\/\/)/.test(response.url)) {
-          tmp.value.preloadNext.url = response.url;
-          tmp.value.preloadNext.headers = response.headers;
-          tmp.value.preloadNext.mediaType = response.mediaType;
-          tmp.value.preloadNext.init = true; // 标识是否预加载完毕
-
-          const barrageRes: any[] = await fetchBarrageData(originUrl, barrage, active.value);
-          if (Array.isArray(barrageRes) && barrageRes.length === 0) tmp.value.preloadNext.barrage = barrageRes;
-        }
-      } catch (err: any) {
-        console.log(`[player][timeUpdate][preloadNext][error]`, err.message);
+  // 5.预加载下集链接 不是最后一集 & 开启预加载 & 提前30秒预加载+观看时间+尾部跳过时间 >= 总时长
+  if (!isLast() && playConf.playNextPreload && watchTime + 30 >= duration && duration !== 0 && !tmp.value.preloadNext.load) {
+    tmp.value.preloadNext.load = true; // 标识是否触发预加载
+
+    try {
+      const nextIndex = active.value.reverseOrder ? index + 1 : index - 1;
+      const nextInfo = seasonData.value[active.value.flimSource][nextIndex];
+      let url = formatIndex(nextInfo).url;
+      url = decodeURIComponent(url);
+      const originUrl = url;
+      const analyzeInfo = analyzeData.value.list.find(item => item.id === active.value.analyzeId);
+      let analyzeType = analyzeInfo?.type !== undefined ? analyzeInfo?.type : -1;
+      if (active.value.official) {
+        if (!analyzeInfo || typeof analyzeInfo !== 'object' || Object.keys(analyzeInfo).length === 0) return;
+        url = `${analyzeInfo.url}${url}`;
+        analyzeType = analyzeInfo.type;
+      } else {
+        analyzeType = -1;
+      }
+      const response = await playHelper(url, extConf.value.site, active.value.flimSource, analyzeType, playConf.skipAd);
+      if (response?.url &&/^(http:\/\/|https:\/\/)/.test(response.url)) {
+        tmp.value.preloadNext.url = response.url;
+        tmp.value.preloadNext.headers = response.headers;
+        tmp.value.preloadNext.mediaType = response.mediaType;
+        tmp.value.preloadNext.init = true; // 标识是否预加载完毕
+
+        const barrageRes: any[] = await fetchBarrageData(originUrl, barrage, active.value);
+        if (Array.isArray(barrageRes) && barrageRes.length > 0) tmp.value.preloadNext.barrage = barrageRes;
       }
+    } catch (err: any) {
+      console.log(`[player][timeUpdate][preloadNext][error]`, err);
     }
   };
 };
diff --git a/src/renderer/src/pages/play/componets/DialogDownload.vue b/src/renderer/src/pages/play/componets/DialogDownload.vue
index 8a0bab40d..790ed719e 100644
--- a/src/renderer/src/pages/play/componets/DialogDownload.vue
+++ b/src/renderer/src/pages/play/componets/DialogDownload.vue
@@ -33,12 +33,11 @@
 
 <script setup lang="ts">
 import { useClipboard } from '@vueuse/core';
-import _ from 'lodash';
 import { ref, watch } from 'vue';
 import { MessagePlugin } from 'tdesign-vue-next';
 
 import { t } from '@/locales';
-import { supportedFormats } from '@/utils/tool';
+import { mediaUtils } from '@/components/player';
 
 const props = defineProps({
   visible: {
@@ -83,9 +82,8 @@ watch(
 );
 
 // 检查复制的复制
-const checkDownloadUrl = (url) => {
-  const urlExtension = url.match(/\.([^.]+)$/)?.[1]; // 使用正则表达式提取文件扩展名
-  const isValid = urlExtension && supportedFormats.includes(urlExtension); // 检查是否在允许的扩展名列表中
+const checkDownloadUrl = async (url) => {
+  const isValid = await mediaUtils.checkMediaType(url);
 
   if (!isValid) MessagePlugin.warning(t('pages.player.download.copyCheck'));
 };
diff --git a/src/renderer/src/pages/play/index.vue b/src/renderer/src/pages/play/index.vue
index 003491d9b..433f590e4 100644
--- a/src/renderer/src/pages/play/index.vue
+++ b/src/renderer/src/pages/play/index.vue
@@ -6,7 +6,7 @@
       </t-header>
       <t-layout>
         <t-content :class="`${prefix}-content`">
-          <player-view ref="playerRef" :class='["subject", active.aside ? "subject-ext": "" ]' @update-time="handleTimeUpdate"/>
+          <multi-player ref="playerRef" :class='["subject", active.aside ? "subject-ext": "" ]' @update-time="handleTimeUpdate"/>
           <div class="btn-box dock-show" @click="toggleAside">
             <chevron-left-icon v-if="active.aside" class="btn-icon" />
             <chevron-right-icon v-else class="btn-icon" />
@@ -53,7 +53,8 @@ import HeaderView from './componets/Header.vue';
 import AsideFilmView from './componets/AsideFilm.vue';
 import AsideIptvView from './componets/AsideIptv.vue';
 import AsideDriveView from './componets/AsideDrive.vue';
-import PlayerView from '@/components/player/index.vue';
+import { MultiPlayer } from '@/components/player';
+import type { MultiPlayerInstance } from '@/components/player';
 
 
 const store: { [key: string]: any } = usePlayStore();
@@ -87,7 +88,7 @@ const processFormData = ref({
   currentTime: 0,
   duration: 0
 });
-const playerRef = useTemplateRef('playerRef');
+const playerRef = useTemplateRef<MultiPlayerInstance | null>('playerRef');
 
 onMounted(() => {
   setupConf();
@@ -117,15 +118,24 @@ const updateConf = (item) => {
 
 const updatePlay = async (item) => {
   playerFormData.value = { ...playerFormData.value, ...item };
-  await playerRef.value?.init();
-  await playerRef.value?.create({ ...playerFormData.value });
-  if (storeConf.value.type === 'film') {
-    await playerRef.value?.onTimeUpdate();
+
+  const playerMode = storeConf.value.setting.playerMode;
+  if (playerMode.type === 'custom') {
+    window.electron.ipcRenderer.send('call-player', playerMode.external, playerFormData.value.url);
+  } else {
+    await playerRef.value?.create({ ...playerFormData.value }, playerMode.type);
+    if (storeConf.value.type === 'film') {
+      await playerRef.value?.onTimeUpdate();
+    }
   }
 };
 
 const updateBarrage = async (item) => {
-  if (playerRef.value) await playerRef.value?.barrage(item.comments, item.url, item.id);
+  if (playerRef.value) {
+    setTimeout(() => {
+      playerRef.value?.barrage(item.comments, item.url, item.id);
+    }, 0);
+  }
 };
 
 const handleTimeUpdate = (time) => {
@@ -133,9 +143,7 @@ const handleTimeUpdate = (time) => {
 };
 
 window.electron.ipcRenderer.on('destroy-playerWindow', () => {
-  store.updateConfig({
-    status: false,
-  });
+  store.updateConfig({ status: false });
 });
 
 window.electron.ipcRenderer.on('media-control', async (_, status) => {
diff --git a/src/renderer/src/utils/common/film.ts b/src/renderer/src/utils/common/film.ts
index cc26eb355..588686fac 100644
--- a/src/renderer/src/utils/common/film.ts
+++ b/src/renderer/src/utils/common/film.ts
@@ -8,7 +8,7 @@ import { findStar, addStar, delStar, putStar } from '@/api/star';
 import { fetchRecommPage, fetchCmsDetail, fetchCmsSearch, fetchCmsPlay, fetchCmsProxy } from '@/api/site';
 
 import sniffer from '@/utils/sniffer';
-import { checkMediaType } from '@/utils/tool';
+import { mediaUtils } from '@/components/player';
 
 // 官解地址
 const VIP_LIST = [
@@ -31,18 +31,23 @@ const VIP_LIST = [
  * @returns { status: boolean, data: any }
  */
 const fetchBingeData = async (relateId: string, videoId: number): Promise<{ status: boolean; data: any }> => {
+  console.log('[film_common][fetchBingeData][start]收藏获取流程开启');
+  let data = {
+    status: false,
+    data: {},
+  };
   try {
     const response = await findStar({ relateId, videoId });
-    return {
-      status: Boolean(response), // 直接转换为布尔值
-      data: response || {}, // 如果response存在则使用response，否则使用空对象
+    data = {
+      status: !!response,
+      data: response || {},
     };
+    console.log(`[film_common][fetchBingeData][return]`, data);
   } catch (err) {
-    console.error(`[film_common][fetchBingeData]`, err); // 更详细的错误日志
-    return {
-      status: false,
-      data: {},
-    };
+    console.error(`[film_common][fetchBingeData][error]`, err);
+  } finally {
+    console.log(`[film_common][fetchBingeData][end]收藏获取流程结束`);
+    return data;
   }
 };
 
@@ -54,6 +59,11 @@ const fetchBingeData = async (relateId: string, videoId: number): Promise<{ stat
  * @returns { status: boolean, data: any }
  */
 const putBingeData = async (action: string, id: any = null, doc: any = {}): Promise<{ status: boolean; data: any }> => {
+  console.log('[film_common][putBingeData][start]收藏更新流程开启');
+  let data = {
+    status: false,
+    data: {},
+  };
   try {
     let res = {};
     if (action === 'add') {
@@ -63,16 +73,16 @@ const putBingeData = async (action: string, id: any = null, doc: any = {}): Prom
     } else if (action === 'update') {
       res = await putStar({ ids: [id], doc });
     }
-    return {
+    data = {
       status: true,
       data: res,
     };
+    console.log(`[film_common][putBingeData][return]`, data);
   } catch (err) {
-    console.error(`[film_common][putBingeData]`, err);
-    return {
-      status: false,
-      data: {},
-    };
+    console.error(`[film_common][putBingeData][error]`, err);
+  } finally {
+    console.log(`[film_common][putBingeData][end]收藏更新流程结束`);
+    return data;
   }
 };
 
@@ -184,7 +194,7 @@ const playHelper = async (
   console.log(`[film_common][playHelper][before_start]准备处理地址:${url}`);
   console.log(`[film_common][playHelper][start]播放处理流程开始`);
 
-  let data = { url: '', originalUrl: url, mediaType: '', headers: {} };
+  let data: { [key: string]: any } = { url: '', originalUrl: url, mediaType: '', headers: {} };
 
   try {
     // 1. 解析
@@ -225,7 +235,7 @@ const playHelper = async (
         await setT3Proxy({ text: proxyData, url: proxyParams.url });
       }
 
-      const mediaType = await checkMediaType(play.url);
+      const mediaType = await mediaUtils.checkMediaType(play.url);
       if (mediaType !== 'unknown' && mediaType !== 'error') {
         data = { ...data, url: play.url, mediaType, headers: play.headers };
         return data;
@@ -243,7 +253,7 @@ const playHelper = async (
     );
     data.headers = snifferResult.headers;
     data.url = snifferResult.url;
-    data.mediaType = (await checkMediaType(snifferResult.url)) || 'm3u8';
+    data.mediaType = (await mediaUtils.checkMediaType(snifferResult.url)) || 'm3u8';
   } catch (err) {
     console.error(`[film_common][playHelper][error]`, err);
   } finally {
@@ -483,11 +493,10 @@ const fetchBarrageData = async (
       text: item[content],
       time: parseInt(item[start]),
       color: item[color],
-      border: false,
       mode: item[mode],
     }));
     data = formatBarrage;
-
+    console.log(`[film_common][fetchBarrageData][return]`, data);
   } catch (err) {
     console.log(`[film_common][fetchBarrageData][error]`, err);
   } finally {
@@ -504,15 +513,16 @@ const fetchBarrageData = async (
  */
 const fetchAnalyzeHelper = async (url: string, type: number) => {
   console.log('[film_common][fetchAnalyzeHelper][start]获取解析流程开启');
-  let data = { url: '', originalUrl: url, mediaType: '', headers: {} };
+  let data: { [key: string]: any } = { url: '', originalUrl: url, mediaType: undefined, headers: {} };
 
   try {
     const play = { playUrl: '', headers: {} };
 
     if (type == 1) {
       const resOfficial = await fetchConfig({ url, method: 'GET' });
-      if (JSONPath({ path: '$.url', json: resOfficial }).length > 0) {
-        play.playUrl = JSONPath({ path: '$.url', json: resOfficial })[0];
+      const paeseOfficial = JSONPath({ path: '$.url', json: resOfficial.data });
+      if (paeseOfficial.length > 0) {
+        play.playUrl = paeseOfficial[0];
         play.headers = resOfficial.headers;
       }
     } else if (type == 0) {
@@ -524,13 +534,13 @@ const fetchAnalyzeHelper = async (url: string, type: number) => {
     }
 
     if (play.playUrl) {
-      const mediaType = await checkMediaType(play.playUrl);
+      const mediaType = await mediaUtils.checkMediaType(play.playUrl);
       if (mediaType !== 'unknown' && mediaType !== 'error') {
         data = { url: play.playUrl, originalUrl: url, mediaType, headers: play.headers };
       }
     }
-  } catch (err: any) {
-    console.log(`[film_common][fetchAnalyzeHelper][error]${err.message}`);
+  } catch (err) {
+    console.error(`[film_common][fetchAnalyzeHelper][error]`, err);
   } finally {
     console.log(`[film_common][fetchAnalyzeHelper][end]获取解析流程结束`);
     return data;
diff --git a/src/renderer/src/utils/tool.ts b/src/renderer/src/utils/tool.ts
index 2a7f0102d..4f6540c96 100644
--- a/src/renderer/src/utils/tool.ts
+++ b/src/renderer/src/utils/tool.ts
@@ -1,85 +1,7 @@
 import ipaddr from 'ipaddr.js';
-import request, { requestComplete } from '@/utils/request';
+import request from '@/utils/request';
 import { usePlayStore, useSettingStore } from '@/store';
 
-const supportedFormats: string[] = [
-  'mp4',
-  'mkv',
-  'flv',
-  'm3u8',
-  'avi',
-  'magnet',
-  'mpd',
-  'mpd',
-  'mp3',
-  'm4a',
-  'wav',
-  'flac',
-  'aac',
-  'ogg',
-  'wma',
-];
-
-// 判断媒体类型
-const checkMediaType = async (url: string): Promise<string> => {
-  if (url && (url.startsWith('http') || url.startsWith('magnet'))) {
-    const fileType: any = supportedFormats.find((format) => url.includes(format));
-    if (fileType) {
-      return fileType;
-    } else {
-      const getMediaType: any = await getMeadiaType(url);
-      return getMediaType;
-    }
-  } else {
-    return ''; // 如果 URL 不以 http 开头，返回 null
-  }
-};
-
-const getMeadiaType = async (url: string): Promise<string> => {
-  let mediaType: string = 'unknown';
-  try {
-    const response = await requestComplete({
-      url,
-      method: 'HEAD',
-    });
-    if (response.status === 200) {
-      const contentType = response.headers['content-type'];
-      const supportedFormats: Record<string, string> = {
-        'video/mp4': 'mp4',
-        'video/x-flv': 'flv',
-        'video/ogg': 'ogx',
-        'application/vnd.apple.mpegurl': 'm3u8',
-        'application/x-mpegURL': 'm3u8',
-        'application/octet-stream': 'm3u8',
-        'video/avi': 'avi',
-        'video/x-msvideo': 'avi',
-        'video/x-matroska': 'mkv',
-        'video/quicktime': 'mov',
-        'video/x-ms-wmv': 'wmv',
-        'video/3gpp': '3gp',
-        'audio/mpeg': 'mp3',
-        'audio/wav': 'mav',
-        'audio/aac': 'aac',
-        'audio/ogg': 'oga',
-      };
-
-      for (const format in supportedFormats) {
-        if (contentType.includes(format)) {
-          mediaType = supportedFormats[format];
-        }
-      }
-    } else {
-      mediaType = 'error';
-    }
-  } catch (err) {
-    mediaType = 'error';
-    throw err;
-  } finally {
-    console.log(`媒体播放类型：${mediaType}`);
-    return mediaType;
-  }
-};
-
 const checkIpVersion = async (ip: string) => {
   let version = -1;
   try {
@@ -216,45 +138,7 @@ const loadExternalResource = (url: string, type: 'css' | 'js' | 'font') => {
   });
 };
 
-const singleton = <T extends new (...args: any[]) => any>(className: T): T => {
-  let instance: InstanceType<T> | null = null;
-  const proxy = new Proxy(className, {
-    construct(target, args) {
-      if (!instance) {
-        instance = Reflect.construct(target, args);
-      }
-      return instance as InstanceType<T>;
-    },
-  });
-  proxy.prototype.construct = proxy;
-  return proxy;
-};
-const mapVideoTypeToPlayerType = (videoType: string): string | undefined => {
-  const audioTypes = ['mp3', 'm4a', 'wav', 'flac', 'aac', 'ogg', 'wma'];
-  if (audioTypes.includes(videoType)) return 'customMpegts';
-
-  switch (videoType) {
-    case 'mp4':
-      return 'customMp4';
-    case 'flv':
-      return 'customFlv';
-    case 'm3u8':
-      return 'customHls';
-    case 'mpd':
-      return 'customDash';
-    case 'magnet':
-      return 'customWebTorrent';
-    default:
-      return 'customHls';
-  }
-};
-
 export {
-  mapVideoTypeToPlayerType,
-  singleton,
-  supportedFormats,
-  getMeadiaType,
-  checkMediaType,
   checkIpVersion,
   checkLiveM3U8,
   copyToClipboardApi,