🐞 fix: 修复播放信息获取 & 桌面歌词数据异常

Author: imsyy

electron/main/ipc/ipc-lyric.ts

@@ -121,9 +121,10 @@ const initLyricIpc = (): void => {
         lyricWin.setAlwaysOnTop(true, "screen-saver");
       }
     } else {
-      // 关闭：不销毁窗口，直接隐藏，保留位置与状态
       if (!isWinAlive(lyricWin)) return;
-      lyricWin.hide();
+      // 解绑事件
+      unbindMainWinEvents();
+      lyricWin.close();
     }
   });
 

electron/main/services/SocketService.ts

@@ -2,6 +2,7 @@ import { WebSocketServer, type WebSocket } from "ws";
 import { createServer } from "net";
 import { socketLog } from "../logger";
 import { useStore } from "../store";
+import { getTrackInfoFromRenderer } from "../utils/track-info";
 import mainWindow from "../windows/main-window";
 
 /**
@@ -308,7 +309,6 @@ export class SocketService {
    */
   private async handleGetSongInfo(socket: WebSocket): Promise<void> {
     try {
-      const { getTrackInfoFromRenderer } = await import("../utils/track-info");
       const trackInfo = await getTrackInfoFromRenderer();
       this.sendToClient(socket, {
         type: "song-info",

electron/server/control/index.ts

@@ -1,5 +1,6 @@
 import { FastifyInstance } from "fastify";
 import { appVersion, appName } from "../../main/utils/config";
+import { getTrackInfoFromRenderer } from "../../main/utils/track-info";
 import mainWindow from "../../main/windows/main-window";
 
 /**
@@ -201,7 +202,6 @@ export const initControlAPI = async (fastify: FastifyInstance) => {
       // 获取当前播放信息
       fastify.get("/song-info", async (_request, reply) => {
         try {
-          const { getTrackInfoFromRenderer } = await import("../../main/utils/track-info");
           const trackInfo = await getTrackInfoFromRenderer();
           return reply.send({
             code: 200,

src/utils/initIpc.ts

@@ -68,6 +68,7 @@ const initIpc = () => {
             lrcData: musicStore.songLyric.lrcData ?? [],
             yrcData: musicStore.songLyric.yrcData ?? [],
             lyricIndex: statusStore.lyricIndex,
+            lyricLoading: statusStore.lyricLoading,
           }),
         );
       }
@@ -100,7 +101,9 @@ const initIpc = () => {
       const { name, artist, album } = getPlayerInfoObj() || {};
       // 获取原始对象
       const playSong = toRaw(musicStore.playSong);
-      const songLyric = toRaw(musicStore.songLyric);
+      const songLyric = statusStore.lyricLoading
+        ? { lrcData: [], yrcData: [] }
+        : toRaw(musicStore.songLyric);
       window.electron.ipcRenderer.send(
         "return-track-info",
         cloneDeep({
@@ -113,6 +116,9 @@ const initIpc = () => {
           volume: statusStore.playVolume,
           playRate: statusStore.playRate,
           ...playSong,
+          // 歌词及加载状态
+          lyricLoading: statusStore.lyricLoading,
+          lyricIndex: statusStore.lyricIndex,
           ...songLyric,
         }),
       );