Merge pull request #1008 from Mizoreww/fix/unblock-song-mismatch

MoYingJi · web-flow · commit 38491618c7d5 · 2026-03-24T06:13:39.000+08:00
fix(Unblock): 修复解锁音源搜索返回错误歌曲的问题
diff --git a/docs/api.md b/docs/api.md
@@ -258,7 +258,9 @@
 
 **请求参数**:
 
-- `keyword` (必需): 搜索关键词（歌曲名或歌手名）
+- `keyword` (必需): 搜索关键词（歌曲名-歌手名）
+- `songName` (可选): 歌曲名称，用于匹配校验
+- `artist` (可选): 歌手名称，用于匹配校验
 
 **响应示例**:
 
@@ -279,7 +281,9 @@
 
 **请求参数**:
 
-- `keyword` (必需): 搜索关键词（歌曲名或歌手名）
+- `keyword` (必需): 搜索关键词（歌曲名-歌手名）
+- `songName` (可选): 歌曲名称，用于匹配校验
+- `artist` (可选): 歌手名称，用于匹配校验
 
 **响应示例**:
 
@@ -300,7 +304,9 @@
 
 **请求参数**:
 
-- `keyword` (必需): 搜索关键词（歌曲名或歌手名）
+- `keyword` (必需): 搜索关键词（歌曲名-歌手名）
+- `songName` (可选): 歌曲名称，用于匹配校验
+- `artist` (可选): 歌手名称，用于匹配校验
 
 **响应示例**:
 
diff --git a/electron/server/unblock/bodian.ts b/electron/server/unblock/bodian.ts
@@ -1,4 +1,5 @@
-import { SongUrlResult } from "./unblock";
+import type { SongMatchInfo, SongUrlResult } from "./unblock";
+import { isSongMatch } from "./match";
 import { serverLog } from "../../main/logger";
 import { createHash } from "crypto";
 import axios from "axios";
@@ -57,12 +58,12 @@ const generateSign = (str: string) => {
 
 /**
  * 搜索歌曲
- * @param keyword 搜索关键词
+ * @param match 原曲匹配信息
  * @returns 歌曲 ID 或 null
  */
-const search = async (info: string): Promise<string | null> => {
+const search = async (match: SongMatchInfo): Promise<string | null> => {
   try {
-    const keyword = encodeURIComponent(info.replace(" - ", " "));
+    const keyword = encodeURIComponent(match.keyword.replace(" - ", " "));
     const url =
       "http://search.kuwo.cn/r.s?&correct=1&vipver=1&stype=comprehensive&encoding=utf8" +
       "&rformat=json&mobi=1&show_copyright_off=1&searchapi=6&all=" +
@@ -76,10 +77,17 @@ const search = async (info: string): Promise<string | null> => {
     ) {
       return null;
     }
-    // 获取歌曲信息
+    // 遍历搜索结果，找歌名和艺术家匹配的项
     const list = result.data.content[1].musicpage.abslist.map(format);
-    if (list[0] && !list[0]?.id) return null;
-    return list[0].id;
+    for (const item of list) {
+      if (!item?.id) continue;
+      const artistStr = item.artists?.map((a: any) => a.name).join("&") || "";
+      if (isSongMatch(item.name || "", artistStr, match)) {
+        return item.id;
+      }
+    }
+    serverLog.warn(`⚠️ Bodian 搜索结果均不匹配原曲: "${match.songName}"`);
+    return null;
   } catch (error) {
     serverLog.error("❌ Get BodianSongId Error:", error);
     return null;
@@ -121,13 +129,13 @@ const sendAdFreeRequest = () => {
 
 /**
  * 获取波点音乐歌曲 URL
- * @param keyword 搜索关键词
+ * @param match 原曲匹配信息
  * @returns 包含歌曲 URL 的结果对象
  */
-const getBodianSongUrl = async (keyword: string): Promise<SongUrlResult> => {
+const getBodianSongUrl = async (match: SongMatchInfo): Promise<SongUrlResult> => {
   try {
-    if (!keyword) return { code: 404, url: null };
-    const songId = await search(keyword);
+    if (!match.keyword) return { code: 404, url: null };
+    const songId = await search(match);
     if (!songId) return { code: 404, url: null };
     // 请求地址
     const headers = {
diff --git a/electron/server/unblock/gequbao.ts b/electron/server/unblock/gequbao.ts
@@ -1,26 +1,33 @@
-import { SongUrlResult } from "./unblock";
+import type { SongMatchInfo, SongUrlResult } from "./unblock";
+import { isSongMatch } from "./match";
 import { serverLog } from "../../main/logger";
 import axios from "axios";
 import { randomBytes } from "crypto";
 
 /**
  * 搜索歌曲获取 ID
- * @param keyword 搜索关键词
+ * @param match 原曲匹配信息
  * @returns 歌曲 ID 或 null
  */
-const search = async (keyword: string): Promise<string | null> => {
+const search = async (match: SongMatchInfo): Promise<string | null> => {
   try {
-    const searchUrl = `https://www.gequbao.com/s/${encodeURIComponent(keyword)}`;
+    const searchUrl = `https://www.gequbao.com/s/${encodeURIComponent(match.keyword)}`;
     const { data } = await axios.get(searchUrl);
 
-    // 匹配第一个歌曲链接 /music/12345
+    // 匹配歌曲链接和歌名
     // <a href="/music/17165" target="_blank" class="music-link d-block">
-    const match = data.match(
-      /<a href="\/music\/(\d+)" target="_blank" class="music-link d-block">/,
-    );
-    if (match && match[1]) {
-      return match[1];
+    const regex = /<a href="\/music\/(\d+)" target="_blank" class="music-link d-block">\s*([^<]*)/g;
+    let hasResult = false;
+    // 校验歌名是否与原曲吻合（歌曲宝搜索页无艺术家信息，仅校验歌名）
+    for (const m of data.matchAll(regex)) {
+      hasResult = true;
+      const songName = m[2]?.trim();
+      if (songName && isSongMatch(songName, undefined, match)) {
+        return m[1];
+      }
     }
+    if (!hasResult) return null;
+    serverLog.warn(`⚠️ Gequbao 搜索结果均不匹配原曲: "${match.songName}"`);
     return null;
   } catch (error) {
     serverLog.error("❌ Get GequbaoSongId Error:", error);
@@ -53,15 +60,15 @@ const getPlayId = async (id: string): Promise<string | null> => {
 
 /**
  * 获取歌曲 URL
- * @param keyword 搜索关键词
+ * @param match 原曲匹配信息
  * @returns 包含歌曲 URL 的结果对象
  */
-const getGequbaoSongUrl = async (keyword: string): Promise<SongUrlResult> => {
+const getGequbaoSongUrl = async (match: SongMatchInfo): Promise<SongUrlResult> => {
   try {
-    if (!keyword) return { code: 404, url: null };
+    if (!match.keyword) return { code: 404, url: null };
 
     // 1. 获取 ID
-    const id = await search(keyword);
+    const id = await search(match);
     if (!id) return { code: 404, url: null };
 
     // 2. 获取 play_id
diff --git a/electron/server/unblock/index.ts b/electron/server/unblock/index.ts
@@ -1,5 +1,5 @@
 import { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
-import { SongUrlResult } from "./unblock";
+import type { SongUrlResult } from "./unblock";
 import { serverLog } from "../../main/logger";
 import axios from "axios";
 import getKuwoSongUrl from "./kuwo";
@@ -51,15 +51,29 @@ export const initUnblockAPI = async (fastify: FastifyInstance) => {
       return reply.send(result);
     },
   );
+  // 构造匹配信息（fallback 用 lastIndexOf 兼容歌名含连字符的情况）
+  const buildMatchInfo = (query: { [key: string]: string }) => {
+    let songName = query.songName || "";
+    let artist = query.artist || "";
+    if (!songName && query.keyword) {
+      const lastIdx = query.keyword.lastIndexOf("-");
+      if (lastIdx > 0) {
+        songName = query.keyword.slice(0, lastIdx).trim();
+        artist = artist || query.keyword.slice(lastIdx + 1).trim();
+      } else {
+        songName = query.keyword.trim();
+      }
+    }
+    return { keyword: query.keyword || "", songName, artist };
+  };
   // kuwo
   fastify.get(
     "/unblock/kuwo",
     async (
       req: FastifyRequest<{ Querystring: { [key: string]: string } }>,
       reply: FastifyReply,
     ) => {
-      const { keyword } = req.query;
-      const result = await getKuwoSongUrl(keyword);
+      const result = await getKuwoSongUrl(buildMatchInfo(req.query));
       return reply.send(result);
     },
   );
@@ -70,8 +84,7 @@ export const initUnblockAPI = async (fastify: FastifyInstance) => {
       req: FastifyRequest<{ Querystring: { [key: string]: string } }>,
       reply: FastifyReply,
     ) => {
-      const { keyword } = req.query;
-      const result = await getBodianSongUrl(keyword);
+      const result = await getBodianSongUrl(buildMatchInfo(req.query));
       return reply.send(result);
     },
   );
@@ -82,8 +95,7 @@ export const initUnblockAPI = async (fastify: FastifyInstance) => {
       req: FastifyRequest<{ Querystring: { [key: string]: string } }>,
       reply: FastifyReply,
     ) => {
-      const { keyword } = req.query;
-      const result = await getGequbaoSongUrl(keyword);
+      const result = await getGequbaoSongUrl(buildMatchInfo(req.query));
       return reply.send(result);
     },
   );
diff --git a/electron/server/unblock/kuwo.ts b/electron/server/unblock/kuwo.ts
@@ -1,14 +1,15 @@
 import { encryptQuery } from "./kwDES";
-import { SongUrlResult } from "./unblock";
+import type { SongMatchInfo, SongUrlResult } from "./unblock";
+import { isSongMatch } from "./match";
 import { serverLog } from "../../main/logger";
 import axios from "axios";
 
 // 获取酷我音乐歌曲 ID
-const getKuwoSongId = async (keyword: string): Promise<string | null> => {
+const getKuwoSongId = async (match: SongMatchInfo): Promise<string | null> => {
   try {
     const url =
       "http://search.kuwo.cn/r.s?&correct=1&stype=comprehensive&encoding=utf8&rformat=json&mobi=1&show_copyright_off=1&searchapi=6&all=" +
-      keyword;
+      encodeURIComponent(match.keyword);
     const result = await axios.get(url);
     if (
       !result.data ||
@@ -18,24 +19,27 @@ const getKuwoSongId = async (keyword: string): Promise<string | null> => {
     ) {
       return null;
     }
-    // 获取歌曲信息
-    const songId = result.data.content[1].musicpage.abslist[0].MUSICRID;
-    const songName = result.data.content[1].musicpage.abslist[0]?.SONGNAME;
-    // 是否与原曲吻合
-    const originalName = keyword?.split("-") ?? keyword;
-    if (songName && !songName?.includes(originalName[0])) return null;
-    return songId.slice("MUSIC_".length);
+    // 遍历搜索结果，找歌名和艺术家匹配的项
+    for (const item of result.data.content[1].musicpage.abslist) {
+      const songId = item?.MUSICRID;
+      if (!songId) continue;
+      if (isSongMatch(item?.SONGNAME || "", item?.ARTIST || "", match)) {
+        return songId.slice("MUSIC_".length);
+      }
+    }
+    serverLog.warn(`⚠️ Kuwo 搜索结果均不匹配原曲: "${match.songName}"`);
+    return null;
   } catch (error) {
     serverLog.error("❌ Get KuwoSongId Error:", error);
     return null;
   }
 };
 
 // 获取酷我音乐歌曲 URL
-const getKuwoSongUrl = async (keyword: string): Promise<SongUrlResult> => {
+const getKuwoSongUrl = async (match: SongMatchInfo): Promise<SongUrlResult> => {
   try {
-    if (!keyword) return { code: 404, url: null };
-    const songId = await getKuwoSongId(keyword);
+    if (!match.keyword) return { code: 404, url: null };
+    const songId = await getKuwoSongId(match);
     if (!songId) return { code: 404, url: null };
     // 请求地址
     const PackageName = "kwplayer_ar_5.1.0.0_B_jiakong_vh.apk";
diff --git a/electron/server/unblock/match.ts b/electron/server/unblock/match.ts
@@ -0,0 +1,64 @@
+import type { SongMatchInfo } from "./unblock";
+
+/**
+ * 归一化歌名用于匹配：小写 + 去除括号及其内容
+ */
+export const normalizeName = (name: string): string => {
+  return name
+    .toLowerCase()
+    .replace(/[（(][^）)]*[）)]/g, "")
+    .trim();
+};
+
+/**
+ * 归一化艺术家名：小写 + 统一分隔符为空格
+ */
+export const normalizeArtist = (artist: string): string => {
+  return artist
+    .toLowerCase()
+    .replace(/[&/、，,;；]/g, " ")
+    .replace(/\s+/g, " ")
+    .trim();
+};
+
+/**
+ * 校验搜索结果是否与原曲匹配（歌名 + 艺术家）
+ * @param resultName 搜索结果歌名
+ * @param resultArtist 搜索结果艺术家（可选）
+ * @param match 原曲匹配信息
+ */
+export const isSongMatch = (
+  resultName: string,
+  resultArtist: string | undefined,
+  match: SongMatchInfo,
+): boolean => {
+  const normalizedResult = normalizeName(resultName);
+  const normalizedOriginal = normalizeName(match.songName);
+  // songName 为空时跳过歌名检查（保持旧行为：不传 songName 则不限制歌名匹配）
+  // normalizedResult 为空则视为无效结果，直接拒绝
+  if (!normalizedResult) return false;
+  if (normalizedOriginal) {
+    // 歌名：双向 includes（兼容一方带后缀的情况）
+    if (
+      !normalizedResult.includes(normalizedOriginal) &&
+      !normalizedOriginal.includes(normalizedResult)
+    ) {
+      return false;
+    }
+  }
+  // 艺术家：归一化分隔符后双向 includes
+  if (resultArtist && match.artist) {
+    const normalizedResultArtist = normalizeArtist(resultArtist);
+    const normalizedOriginalArtist = normalizeArtist(match.artist);
+    // 任一归一化后为空则跳过艺术家检查
+    if (normalizedResultArtist && normalizedOriginalArtist) {
+      if (
+        !normalizedResultArtist.includes(normalizedOriginalArtist) &&
+        !normalizedOriginalArtist.includes(normalizedResultArtist)
+      ) {
+        return false;
+      }
+    }
+  }
+  return true;
+};
diff --git a/electron/server/unblock/unblock.d.ts b/electron/server/unblock/unblock.d.ts
@@ -2,3 +2,10 @@ export type SongUrlResult = {
   code: number;
   url: string | null;
 };
+
+/** 用于校验搜索结果的原曲信息 */
+export type SongMatchInfo = {
+  keyword: string;
+  songName: string;
+  artist: string;
+};
diff --git a/src/api/song.ts b/src/api/song.ts
@@ -63,8 +63,14 @@ export const songUrl = (
 };
 
 // 获取解锁歌曲 URL
-export const unlockSongUrl = (id: number, keyword: string, server: SongUnlockServer) => {
-  const params = server === SongUnlockServer.NETEASE ? { id } : { keyword };
+export const unlockSongUrl = (
+  id: number,
+  keyword: string,
+  server: SongUnlockServer,
+  songName?: string,
+  artist?: string,
+) => {
+  const params = server === SongUnlockServer.NETEASE ? { id } : { keyword, songName, artist };
   return request({
     baseURL: "/api/unblock",
     url: `/${server}`,
diff --git a/src/core/player/SongManager.ts b/src/core/player/SongManager.ts
diff --git a/src/core/resource/DownloadManager.ts b/src/core/resource/DownloadManager.ts
