🐞 fix: 修复被错误移除的cloneDeep和lint问题 (#767)

kazukokawagawa · web-flow · commit 4a2b74b0c502 · 2026-01-25T10:55:40.000+08:00
diff --git a/electron/main/ipc/ipc-lyric.ts b/electron/main/ipc/ipc-lyric.ts
@@ -40,14 +40,14 @@ const initLyricIpc = (): void => {
     // 立即禁用 forward
     setLyricMouseEvents(false);
     // 防抖恢复：300ms 内无新事件则恢复
-    restoreTimer && clearTimeout(restoreTimer);
+    if (restoreTimer) clearTimeout(restoreTimer);
     restoreTimer = setTimeout(() => setLyricMouseEvents(true), 300);
   };
 
   // 主窗口移动/调整大小结束：立即恢复 forward（仅 Windows/macOS 支持）
   const onMoveOrResizeEnd = () => {
     if (!isLocked) return;
-    restoreTimer && clearTimeout(restoreTimer);
+    if (restoreTimer) clearTimeout(restoreTimer);
     setLyricMouseEvents(true);
   };
 
@@ -91,7 +91,7 @@ const initLyricIpc = (): void => {
     }
 
     // 清理定时器
-    restoreTimer && clearTimeout(restoreTimer);
+    if (restoreTimer) clearTimeout(restoreTimer);
     restoreTimer = null;
   };
 
diff --git a/electron/main/ipc/ipc-mpv.ts b/electron/main/ipc/ipc-mpv.ts
@@ -12,7 +12,7 @@ const initMpvIpc = (): void => {
       const command = process.platform === "win32" ? "where.exe mpv" : "which mpv";
       execSync(command, { encoding: "utf-8" });
       return { installed: true };
-    } catch (e) {
+    } catch {
       return { installed: false };
     }
   });
diff --git a/electron/main/services/CacheService.ts b/electron/main/services/CacheService.ts
@@ -195,7 +195,7 @@ export class CacheService {
       if (existsSync(dbPath)) dbTotal += (await stat(dbPath)).size;
       if (existsSync(dbPath + "-wal")) dbTotal += (await stat(dbPath + "-wal")).size;
       if (existsSync(dbPath + "-shm")) dbTotal += (await stat(dbPath + "-shm")).size;
-    } catch (e) {
+    } catch {
       // ignore
     }
 
@@ -342,7 +342,7 @@ export class CacheService {
       try {
         const now = new Date();
         await utimes(target, now, now);
-      } catch (e) {
+      } catch {
         // 忽略 utimes 失败
       }
 
diff --git a/electron/main/services/MpvService.ts b/electron/main/services/MpvService.ts
@@ -147,7 +147,7 @@ export class MpvService {
           });
         });
         return;
-      } catch (e) {
+      } catch {
         await new Promise((r) => setTimeout(r, 500));
       }
     }
diff --git a/electron/server/qqmusic/index.ts b/electron/server/qqmusic/index.ts
@@ -77,7 +77,7 @@ async function initSession(): Promise<void> {
       };
       serverLog.log("🔑 QQ 音乐会话初始化成功");
     }
-  } catch (error) {
+  } catch {
     serverLog.warn("⚠️ QQ 音乐会话初始化失败，将使用默认参数");
   }
 }
@@ -212,7 +212,9 @@ async function getQQMusicLyric(
       // lyric 就是 LRC 格式
       try {
         result.lrc = decryptQrc(lyric);
-      } catch {}
+      } catch {
+        // LRC 解密失败，忽略
+      }
     } else {
       // 单独请求 LRC 格式歌词
       try {
@@ -490,7 +492,8 @@ export const initQQMusicAPI = async (fastify: FastifyInstance) => {
       );
 
       // 返回歌曲信息和歌词
-      const { code: _, ...lyrics } = lyricResult;
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      const { code: _code, ...lyrics } = lyricResult;
       return reply.send({
         code: 200,
         song: {
diff --git a/electron/server/qqmusic/qrc.ts b/electron/server/qqmusic/qrc.ts
@@ -34,19 +34,25 @@ export function decryptQrc(encryptedQrc: string): string {
   try {
     decompressed = inflateSync(decryptedBuffer);
     return decompressed.toString("utf8");
-  } catch {}
+  } catch {
+    // zlib inflate 失败，尝试其他格式
+  }
 
   // 尝试 2: raw inflate (无 header)
   try {
     decompressed = inflateRawSync(decryptedBuffer);
     return decompressed.toString("utf8");
-  } catch {}
+  } catch {
+    // raw inflate 失败，尝试其他格式
+  }
 
   // 尝试 3: gzip unzip
   try {
     decompressed = unzipSync(decryptedBuffer);
     return decompressed.toString("utf8");
-  } catch {}
+  } catch {
+    // gzip unzip 失败，尝试其他格式
+  }
 
   // 尝试 4: 可能数据本身就不是压缩的
   const str = decryptedBuffer.toString("utf8");
diff --git a/src/api/lastfm.ts b/src/api/lastfm.ts
@@ -34,7 +34,7 @@ lastfmClient.interceptors.response.use(
     const { status, data } = response;
 
     switch (status) {
-      case 403:
+      case 403: {
         const code = data?.error;
         if (code === 9 || code === 4 || code === 26) {
           window.$message.error("Last.fm 认证失败，需要重新授权，已断开与 Last.fm 的连接！");
@@ -43,6 +43,7 @@ lastfmClient.interceptors.response.use(
           window.$message.error("Last.fm 认证失败，可能需要重新授权");
         }
         break;
+      }
       case 401:
         window.$message.error("Last.fm 未授权，已断开与 Last.fm 的连接！");
         disconnect();
diff --git a/src/components/Player/PlayerLyric/AMLyric.vue b/src/components/Player/PlayerLyric/AMLyric.vue
@@ -55,6 +55,9 @@ import { useMusicStore, useSettingStore, useStatusStore } from "@/stores";
 import { getLyricLanguage } from "@/utils/format";
 import { usePlayerController } from "@/core/player/PlayerController";
 
+// 此处cloneDeep 删除会暴毙 不要动
+
+import { cloneDeep } from "lodash-es";
 import { lyricLangFontStyle } from "@/utils/lyricFontConfig";
 
 defineProps({
@@ -72,37 +75,51 @@ const player = usePlayerController();
 const lyricPlayerRef = ref<any | null>(null);
 
 // 当前歌词
-const amLyricsData = computed<LyricLine[]>(() => {
+const amLyricsData = computed(() => {
   const { songLyric } = musicStore;
   if (!songLyric) return [];
+
   // 优先使用逐字歌词(YRC/TTML)
   const useYrc = songLyric.yrcData?.length && settingStore.showYrc;
   const lyrics = useYrc ? songLyric.yrcData : songLyric.lrcData;
+
   // 简单检查歌词有效性
   if (!Array.isArray(lyrics) || lyrics.length === 0) return [];
-  const { showTran, showRoma, showWordsRoma, swapTranRoma, lyricAlignRight } = settingStore;
-  // 单次遍历处理，移除 cloneDeep 以提升性能
-  return lyrics.map((line) => {
-    const newLine = { ...line };
-    // 不需要显示的字段
-    if (!showTran) newLine.translatedLyric = "";
-    if (!showRoma) newLine.romanLyric = "";
-    // 逐字音译显示
-    if (!showWordsRoma && newLine.words) {
-      newLine.words = newLine.words.map((word) => ({ ...word, romanWord: "" }));
-    }
-    // 调换翻译与音译位置
-    if (swapTranRoma) {
-      const temp = newLine.translatedLyric;
-      newLine.translatedLyric = newLine.romanLyric;
-      newLine.romanLyric = temp;
-    }
-    // 如果开启了歌词靠右，反转 isDuet
-    if (lyricAlignRight) {
-      newLine.isDuet = !newLine.isDuet;
-    }
-    return newLine;
-  }) as LyricLine[];
+
+  const clonedLyrics = cloneDeep(lyrics) as LyricLine[];
+
+  // 检查是否要不显示某一部分并删去
+  const showTran = settingStore.showTran;
+  const showRoma = settingStore.showRoma;
+  const showWordsRoma = settingStore.showWordsRoma;
+
+  if (!showTran || !showRoma || !showWordsRoma) {
+    clonedLyrics.forEach((line) => {
+      if (!showTran) line.translatedLyric = "";
+      if (!showRoma) line.romanLyric = "";
+      if (!showWordsRoma) line.words.forEach((word) => (word.romanWord = ""));
+    });
+  }
+
+
+
+  // 调换翻译与音译位置
+  if (settingStore.swapTranRoma) {
+    clonedLyrics.forEach((line) => {
+      const temp = line.translatedLyric;
+      line.translatedLyric = line.romanLyric;
+      line.romanLyric = temp;
+    });
+  }
+
+  // 如果开启了歌词靠右，反转 isDuet
+  if (settingStore.lyricAlignRight) {
+    clonedLyrics.forEach((line) => {
+      line.isDuet = !line.isDuet;
+    });
+  }
+
+  return clonedLyrics;
 });
 
 // 是否有对唱行
diff --git a/src/core/audio-player/ffmpeg-engine/FFmpegAudioPlayer.ts b/src/core/audio-player/ffmpeg-engine/FFmpegAudioPlayer.ts
@@ -284,6 +284,7 @@ export class FFmpegAudioPlayer extends BaseAudioPlayer {
    * 设置音频输出设备
    * @param _deviceId 设备 ID（不支持，依赖基类的 AudioContext.setSinkId）
    */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   protected async doSetSinkId(_deviceId: string) {
     console.warn("[FFmpegAudioPlayer] doSetSinkId is not supported");
   }
diff --git a/src/utils/lyricParser.ts b/src/utils/lyricParser.ts
@@ -19,7 +19,7 @@ type LyricWord = { word: string; startTime: number; endTime: number; romanWord:
 const META_TAG_REGEX = /^\[[a-z]+:/i;
 const TIME_TAG_REGEX = /\[(\d{2}):(\d{2})\.(\d{2,3})\]/g;
 const ENHANCED_TIME_TAG_REGEX = /<(\d{2}):(\d{2})\.(\d{2,3})>/;
-const WORD_BY_WORD_REGEX = /\[(\d{2}):(\d{2})\.(\d{2,3})\]([^\[\]]*)/g;
+const WORD_BY_WORD_REGEX = /\[(\d{2}):(\d{2})\.(\d{2,3})\]([^[\]]*)/g;
 const ENHANCED_WORD_REGEX = /<(\d{2}):(\d{2})\.(\d{2,3})>([^<]*)/g;
 const LINE_TIME_REGEX = /^\[(\d{2}):(\d{2})\.(\d{2,3})\]/;
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ const initMpvIpc = (): void => {`
`12`	`12`	`const command = process.platform === "win32" ? "where.exe mpv" : "which mpv";`
`13`	`13`	`execSync(command, { encoding: "utf-8" });`
`14`	`14`	`return { installed: true };`
`15`		`- } catch (e) {`
	`15`	`+ } catch {`
`16`	`16`	`return { installed: false };`
`17`	`17`	`}`
`18`	`18`	`});`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ export class MpvService {`
`147`	`147`	`});`
`148`	`148`	`});`
`149`	`149`	`return;`
`150`		`- } catch (e) {`
	`150`	`+ } catch {`
`151`	`151`	`await new Promise((r) => setTimeout(r, 500));`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ export class FFmpegAudioPlayer extends BaseAudioPlayer {`
`284`	`284`	`* 设置音频输出设备`
`285`	`285`	`* @param _deviceId 设备 ID（不支持，依赖基类的 AudioContext.setSinkId）`
`286`	`286`	`*/`
	`287`	`+ // eslint-disable-next-line @typescript-eslint/no-unused-vars`
`287`	`288`	`protected async doSetSinkId(_deviceId: string) {`
`288`	`289`	`console.warn("[FFmpegAudioPlayer] doSetSinkId is not supported");`
`289`	`290`	`}`