diff --git a/src/music/qq.test.ts b/src/music/qq.test.ts new file mode 100644 index 0000000..4f606cf --- /dev/null +++ b/src/music/qq.test.ts @@ -0,0 +1,43 @@ +import { describe, it, expect } from "vitest"; +import { mapQqAlbums } from "./qq.js"; + +describe("QQ adapter", () => { + it("mapQqAlbums maps albumMID-style raw entries", () => { + const raw = [ + { + albumMID: "abc", + albumName: "Aero", + singerName: "Singer A", + }, + { + albumMID: "xyz", + albumName: "Beta", + singer: [{ name: "Singer B" }, { name: "Singer C" }], + }, + ]; + const out = mapQqAlbums(raw); + expect(out).toHaveLength(2); + expect(out[0]).toMatchObject({ + id: "abc", + name: "Aero", + artist: "Singer A", + platform: "qq", + }); + expect(out[0].coverUrl).toContain("T002R300x300M000abc.jpg"); + expect(out[1].artist).toBe("Singer B / Singer C"); + expect(out[1].coverUrl).toContain("xyz"); + }); + + it("mapQqAlbums returns [] for empty/null input", () => { + expect(mapQqAlbums([])).toEqual([]); + expect(mapQqAlbums(null as any)).toEqual([]); + expect(mapQqAlbums(undefined as any)).toEqual([]); + }); + + it("mapQqAlbums falls back to albumPic when no albumMID", () => { + const raw = [{ albumName: "C", albumPic: "https://x/p.jpg", singerName: "S" }]; + const out = mapQqAlbums(raw); + expect(out[0].coverUrl).toBe("https://x/p.jpg"); + expect(out[0].id).toBe(""); + }); +}); diff --git a/src/music/qq.ts b/src/music/qq.ts index 9c0360d..1e7a8ae 100644 --- a/src/music/qq.ts +++ b/src/music/qq.ts @@ -8,6 +8,7 @@ import type { SearchResult, QrCodeResult, AuthStatus, + Album, } from "./provider.js"; import { parseLyrics } from "./netease.js"; @@ -27,6 +28,26 @@ const qqFavApi = axios.create({ headers: { referer: "https://y.qq.com/" }, }); +export function mapQqAlbums(raw: any[] | null | undefined): Album[] { + if (!Array.isArray(raw)) return []; + return raw.map((a) => { + const id = String(a.albumMID ?? a.mid ?? a.albumID ?? ""); + const artist = a.singerName + ?? (Array.isArray(a.singer) ? a.singer.map((s: any) => s.name).join(" / ") : ""); + const coverUrl = id + ? `https://y.gtimg.cn/music/photo_new/T002R300x300M000${id}.jpg` + : (a.albumPic ?? ""); + return { + id, + name: a.albumName ?? a.title ?? "", + artist, + coverUrl, + songCount: a.song_count ?? a.songCount ?? 0, + platform: "qq" as const, + }; + }); +} + function computeGtk(pSkey: string): number { let hash = 5381; for (let i = 0; i < pSkey.length; i++) { @@ -65,11 +86,12 @@ export class QQMusicProvider implements MusicProvider { req_0: { module: "music.search.SearchCgiService", method: "DoSearchForQQMusicDesktop", - param: { - searchid: "1", - query, - num_per_page: Math.min(limit, 50), - }, + param: { searchid: "1", query, num_per_page: Math.min(limit, 50), search_type: 0 }, + }, + req_album: { + module: "music.search.SearchCgiService", + method: "DoSearchForQQMusicDesktop", + param: { searchid: "1", query, num_per_page: 5, search_type: 8 }, }, }); const res = await qqDirectApi.get("/cgi-bin/musicu.fcg", { @@ -90,7 +112,10 @@ export class QQMusicProvider implements MusicProvider { platform: "qq", })); - return { songs, playlists: [], albums: [] }; + const albumList: any[] = res.data?.req_album?.data?.body?.album?.list ?? []; + const albums = mapQqAlbums(albumList); + + return { songs, playlists: [], albums }; } async getSongUrl(songId: string, quality?: string): Promise {