@sansenjian/qq-music-api 2.2.7 → 2.2.9

package/dist/routers/context/getDailyRecommend.js

@@ -7,31 +7,19 @@ exports.getDailyRecommendController = getDailyRecommendController;
 exports.getPrivateFMController = getPrivateFMController;
 exports.getNewSongsController = getNewSongsController;
 const getDailyRecommend_1 = __importDefault(require("../../module/apis/recommend/getDailyRecommend"));
-/**
- * 获取每日推荐歌曲
- */
+const cookieResolver_1 = require("../../util/cookieResolver");
 async function getDailyRecommendController(ctx) {
-    const { cookie } = ctx.query;
-    // 处理数组类型，取第一个值
-    const normalizedCookie = Array.isArray(cookie) ? cookie[0] : cookie;
-    const result = await getDailyRecommend_1.default.getDailyRecommend(normalizedCookie);
+    const { cookie } = (0, cookieResolver_1.resolveRequestCookie)(ctx);
+    const result = await getDailyRecommend_1.default.getDailyRecommend(cookie);
     ctx.status = result.status;
     ctx.body = result.body;
 }
-/**
- * 获取私人 FM
- */
 async function getPrivateFMController(ctx) {
-    const { cookie } = ctx.query;
-    // 处理数组类型，取第一个值
-    const normalizedCookie = Array.isArray(cookie) ? cookie[0] : cookie;
-    const result = await getDailyRecommend_1.default.getPrivateFM(normalizedCookie);
+    const { cookie } = (0, cookieResolver_1.resolveRequestCookie)(ctx);
+    const result = await getDailyRecommend_1.default.getPrivateFM(cookie);
     ctx.status = result.status;
     ctx.body = result.body;
 }
-/**
- * 获取新歌速递
- */
 async function getNewSongsController(ctx) {
     const { areaId = '5', limit = '20' } = ctx.query;
     const result = await getDailyRecommend_1.default.getNewSongs(Number(areaId), Number(limit));

package/dist/routers/context/getHotkey.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_1 = require("../../module");
-exports.default = async (ctx, next) => {
+const util_1 = require("../util");
+const getHotkeyController = (0, util_1.withErrorHandler)(async (ctx) => {
     const props = {
         method: 'get',
         params: {},
@@ -10,12 +11,10 @@ exports.default = async (ctx, next) => {
     if (process.env.DEBUG === 'true') {
         console.log('[getHotkey] controller props:', props);
     }
-    const { status, body } = await (0, module_1.getHotKey)(props);
+    const result = await (0, module_1.getHotKey)(props);
     if (process.env.DEBUG === 'true') {
-        console.log('[getHotkey] controller response status:', status);
+        console.log('[getHotkey] controller response status:', result.status);
     }
-    Object.assign(ctx, {
-        status,
-        body
-    });
-};
+    (0, util_1.setApiResponse)(ctx, result);
+});
+exports.default = getHotkeyController;

package/dist/routers/context/getMusicPlay.js

@@ -1,91 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_1 = require("../../module");
-const config_1 = require("../../module/config");
-const ALLOWED_QUALITIES = ['m4a', 128, 320, 'ape', 'flac'];
-const DEFAULT_QUALITY = 128;
-const parseQuality = (quality) => {
-    const parsed = parseInt(quality) || quality;
-    return ALLOWED_QUALITIES.includes(parsed) ? parsed : DEFAULT_QUALITY;
-};
+const cookieResolver_1 = require("../../util/cookieResolver");
 const controller = async (ctx, next) => {
-    const uin = global.userInfo?.uin || '0';
-    const songmid = ctx.query.songmid + '';
-    const justPlayUrl = (ctx.query.resType || 'play') === 'play';
-    const guid = config_1._guid || '1429839143';
-    const { mediaId } = ctx.query;
-    const quality = parseQuality(ctx.query.quality);
-    const fileType = {
-        m4a: { s: 'C400', e: '.m4a' },
-        128: { s: 'M500', e: '.mp3' },
-        320: { s: 'M800', e: '.mp3' },
-        ape: { s: 'A000', e: '.ape' },
-        flac: { s: 'F000', e: '.flac' }
-    };
-    const songmidList = songmid.split(',');
-    const fileInfo = fileType[quality];
-    const file = songmidList.map(_ => `${fileInfo.s}${_}${mediaId || _}${fileInfo.e}`);
-    const data = {
-        req_0: {
-            module: 'vkey.GetVkeyServer',
-            method: 'CgiGetVkey',
-            param: {
-                filename: file,
-                guid,
-                songmid: songmidList,
-                songtype: [0],
-                uin,
-                loginflag: 1,
-                platform: '20'
-            }
+    const songmid = ctx.query.songmid ?? ctx.params.songmid;
+    const resType = Array.isArray(ctx.query.resType) ? ctx.query.resType[0] : ctx.query.resType;
+    const mediaId = Array.isArray(ctx.query.mediaId) ? ctx.query.mediaId[0] : ctx.query.mediaId;
+    const quality = Array.isArray(ctx.query.quality) ? ctx.query.quality[0] : ctx.query.quality;
+    const { cookie: effectiveCookie } = (0, cookieResolver_1.resolveRequestCookie)(ctx);
+    const headers = {};
+    if (effectiveCookie) {
+        headers.Cookie = effectiveCookie;
+    }
+    const props = {
+        method: 'get',
+        params: {
+            songmid,
+            resType,
+            mediaId,
+            quality
         },
-        loginUin: uin,
-        comm: {
-            uin,
-            format: 'json',
-            ct: 24,
-            cv: 0
+        option: {
+            headers
         }
     };
-    const params = Object.assign({
-        format: 'json',
-        sign: 'zzannc1o6o9b4i971602f3554385022046ab796512b7012',
-        data: JSON.stringify(data)
+    const { status, body } = await (0, module_1.getMusicPlay)(props);
+    Object.assign(ctx, {
+        status,
+        body
     });
-    const props = {
-        method: 'get',
-        params,
-        option: {}
-    };
-    if (songmid) {
-        await (0, module_1.UCommon)(props)
-            .then(res => {
-            const response = res.data;
-            const domain = response?.req_0?.data?.sip?.filter?.((i) => !i.startsWith('http://ws'))?.[0] ||
-                response?.req_0?.data?.sip?.[0];
-            const playUrl = {};
-            (response?.req_0?.data?.midurlinfo || []).forEach((item) => {
-                playUrl[item.songmid] = {
-                    url: item.purl ? `${domain}${item.purl}` : '',
-                    error: !item.purl ? '暂无播放链接' : undefined
-                };
-            });
-            response.playUrl = playUrl;
-            ctx.body = {
-                data: justPlayUrl ? { playUrl } : response
-            };
-        })
-            .catch(error => {
-            console.log('error', error);
-        });
-    }
-    else {
-        ctx.status = 400;
-        ctx.body = {
-            data: {
-                message: 'no songmid'
-            }
-        };
-    }
 };
 exports.default = controller;

package/dist/routers/context/getMv.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_1 = require("../../module");
-const controller = async (ctx, next) => {
+const util_1 = require("../util");
+const apiResponse_1 = require("../../util/apiResponse");
+const getMvController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { area_id = 15, version_id = 7, limit = 20, page = 0 } = ctx.query;
     const start = (+page ? +page - 1 : 0) * +limit;
     const data = {
@@ -25,33 +27,25 @@ const controller = async (ctx, next) => {
             }
         }
     };
-    const params = Object.assign({
+    const params = {
         format: 'json',
         data: JSON.stringify(data)
-    });
+    };
     const props = {
         method: 'get',
         params,
         option: {}
     };
-    if (version_id && area_id) {
-        await (0, module_1.UCommon)(props)
-            .then(res => {
-            const response = res.data;
-            ctx.status = 200;
-            ctx.body = {
-                response
-            };
-        })
-            .catch(error => {
-            console.log('error', error);
+    if (!version_id || !area_id) {
+        (0, util_1.setApiResponse)(ctx, {
+            status: 400,
+            body: {
+                response: 'version_id or area_id is null'
+            }
         });
+        return;
     }
-    else {
-        ctx.status = 400;
-        ctx.body = {
-            response: 'version_id or area_id is null'
-        };
-    }
-};
-exports.default = controller;
+    const response = await (0, module_1.UCommon)(props);
+    (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.customResponse)({ response: response.data }, 200));
+});
+exports.default = getMvController;

package/dist/routers/context/getMvPlay.js

@@ -1,8 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_1 = require("../../module");
-const controller = async (ctx, next) => {
+const util_1 = require("../util");
+const apiResponse_1 = require("../../util/apiResponse");
+const getMvPlayController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { vid } = ctx.query;
+    if (!vid) {
+        (0, util_1.setApiResponse)(ctx, {
+            status: 400,
+            body: {
+                response: 'vid is null'
+            }
+        });
+        return;
+    }
     const data = {
         comm: {
             ct: 24,
@@ -44,62 +55,50 @@ const controller = async (ctx, next) => {
             }
         }
     };
-    const params = Object.assign({
+    const params = {
         format: 'json',
         data: JSON.stringify(data)
-    });
+    };
     const props = {
         method: 'get',
         params,
         option: {}
     };
-    if (vid) {
-        await (0, module_1.UCommon)(props)
-            .then(res => {
-            const response = res.data;
-            const mvurls = response?.getMVUrl?.data;
-            if (!mvurls || typeof mvurls !== 'object' || Object.keys(mvurls).length === 0) {
-                ctx.status = 502;
-                ctx.body = {
-                    response: {
-                        data: null,
-                        error: 'Failed to get MV URL data'
-                    }
-                };
-                return;
+    const response = await (0, module_1.UCommon)(props);
+    const mvurls = response.data?.getMVUrl?.data;
+    if (!mvurls || typeof mvurls !== 'object' || Object.keys(mvurls).length === 0) {
+        (0, util_1.setApiResponse)(ctx, {
+            status: 502,
+            body: {
+                response: {
+                    data: null,
+                    error: 'Failed to get MV URL data'
+                }
             }
-            const mvurlskey = Object.keys(mvurls)[0];
-            const mp4_urls = mvurls[mvurlskey]?.mp4?.map((item) => item.freeflow_url) || [];
-            const hls_urls = mvurls[mvurlskey]?.hls?.map((item) => item.freeflow_url) || [];
-            const urls = [...mp4_urls, ...hls_urls];
-            let play_urls = [];
-            let playLists = {};
-            if (urls.length) {
-                urls.forEach((url) => {
-                    play_urls = [...play_urls, ...url];
-                });
-                playLists = {
-                    f10: play_urls.filter((item) => /\.f10\.mp4/.test(item)),
-                    f20: play_urls.filter((item) => /\.f20\.mp4/.test(item)),
-                    f30: play_urls.filter((item) => /\.f30\.mp4/.test(item)),
-                    f40: play_urls.filter((item) => /\.f40\.mp4/.test(item))
-                };
-            }
-            response.playLists = playLists;
-            ctx.status = 200;
-            ctx.body = {
-                response
-            };
-        })
-            .catch(error => {
-            console.log('error', error);
         });
+        return;
     }
-    else {
-        ctx.status = 400;
-        ctx.body = {
-            response: 'vid is null'
-        };
+    const mvurlskey = Object.keys(mvurls)[0];
+    const mp4_urls = mvurls[mvurlskey]?.mp4?.map((item) => item.freeflow_url) || [];
+    const hls_urls = mvurls[mvurlskey]?.hls?.map((item) => item.freeflow_url) || [];
+    const urls = [...mp4_urls, ...hls_urls];
+    let play_urls = [];
+    const playLists = {
+        f10: [],
+        f20: [],
+        f30: [],
+        f40: []
+    };
+    if (urls.length) {
+        urls.forEach((url) => {
+            play_urls = [...play_urls, ...url];
+        });
+        playLists.f10 = play_urls.filter((item) => /\.f10\.mp4/.test(item));
+        playLists.f20 = play_urls.filter((item) => /\.f20\.mp4/.test(item));
+        playLists.f30 = play_urls.filter((item) => /\.f30\.mp4/.test(item));
+        playLists.f40 = play_urls.filter((item) => /\.f40\.mp4/.test(item));
     }
-};
-exports.default = controller;
+    response.data.playLists = playLists;
+    (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.customResponse)({ response: response.data }, 200));
+});
+exports.default = getMvPlayController;

package/dist/routers/context/getPersonalRecommend.js

@@ -6,44 +6,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPersonalRecommendController = getPersonalRecommendController;
 exports.getSimilarSongsController = getSimilarSongsController;
 const getPersonalRecommend_1 = __importDefault(require("../../module/apis/recommend/getPersonalRecommend"));
-/**
- * 获取个性化推荐
- */
+const cookieResolver_1 = require("../../util/cookieResolver");
+const apiResponse_1 = require("../../util/apiResponse");
 async function getPersonalRecommendController(ctx) {
-    const { type = '1', cookie } = ctx.query;
-    // 处理数组类型，取第一个值
+    const { type = '1' } = ctx.query;
     const rawType = Array.isArray(type) ? type[0] : type;
-    const rawCookie = Array.isArray(cookie) ? cookie[0] : cookie;
-    const result = await getPersonalRecommend_1.default.getPersonalRecommend(Number(rawType), rawCookie);
+    const { cookie } = (0, cookieResolver_1.resolveRequestCookie)(ctx);
+    const result = await getPersonalRecommend_1.default.getPersonalRecommend(Number(rawType), cookie);
     ctx.status = result.status;
     ctx.body = result.body;
 }
-/**
- * 获取相似歌曲
- */
 async function getSimilarSongsController(ctx) {
-    const { songmid, cookie } = ctx.query;
+    const { songmid } = ctx.query;
     if (!songmid) {
-        ctx.status = 400;
-        ctx.body = {
-            code: -1,
-            msg: '缺少参数 songmid',
-            data: null
-        };
+        const result = (0, apiResponse_1.errorResponse)('缺少参数 songmid', 400);
+        ctx.status = result.status;
+        ctx.body = result.body;
         return;
     }
-    // 处理数组类型，取第一个值
     const validSongmid = Array.isArray(songmid) ? songmid[0] : songmid;
-    // 校验空字符串
     if (!validSongmid || String(validSongmid).trim() === '') {
-        ctx.status = 400;
-        ctx.body = {
-            code: -1,
-            msg: '参数 songmid 不能为空',
-            data: null
-        };
+        const result = (0, apiResponse_1.errorResponse)('参数 songmid 不能为空', 400);
+        ctx.status = result.status;
+        ctx.body = result.body;
         return;
     }
+    const { cookie } = (0, cookieResolver_1.resolveRequestCookie)(ctx);
     const result = await getPersonalRecommend_1.default.getSimilarSongs(String(validSongmid), cookie);
     ctx.status = result.status;
     ctx.body = result.body;

package/dist/routers/context/getPlaylistTags.js

@@ -3,55 +3,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlaylistTagsController = getPlaylistTagsController;
-exports.getPlaylistsByTagController = getPlaylistsByTagController;
-exports.getHotCommentsController = getHotCommentsController;
-exports.getSingerListByAreaController = getSingerListByAreaController;
+exports.getSingerListByAreaController = exports.getHotCommentsController = exports.getPlaylistsByTagController = exports.getPlaylistTagsController = void 0;
 const getPlaylistTags_1 = __importDefault(require("../../module/apis/extend/getPlaylistTags"));
+const util_1 = require("../util");
+const apiResponse_1 = require("../../util/apiResponse");
 /**
  * 获取歌单标签列表
  */
-async function getPlaylistTagsController(ctx) {
+const getPlaylistTagsController = (0, util_1.withErrorHandler)(async (ctx) => {
     const result = await getPlaylistTags_1.default.getPlaylistTags();
-    ctx.status = result.status;
-    ctx.body = result.body;
-}
+    (0, util_1.setApiResponse)(ctx, result);
+});
+exports.getPlaylistTagsController = getPlaylistTagsController;
 /**
  * 根据标签获取歌单列表
  */
-async function getPlaylistsByTagController(ctx) {
+const getPlaylistsByTagController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { tagId = '1', page = '0', num = '20' } = ctx.query;
     const result = await getPlaylistTags_1.default.getPlaylistsByTag(Number(tagId), Number(page), Number(num));
-    ctx.status = result.status;
-    ctx.body = result.body;
-}
+    (0, util_1.setApiResponse)(ctx, result);
+});
+exports.getPlaylistsByTagController = getPlaylistsByTagController;
 /**
  * 获取热门评论
  */
-async function getHotCommentsController(ctx) {
+const getHotCommentsController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { id, type = '1', page = '0', pagesize = '20' } = ctx.query;
     if (!id) {
-        ctx.status = 400;
-        ctx.body = {
-            code: -1,
-            msg: '缺少参数 id（资源 ID）',
-            data: null
-        };
+        (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.errorResponse)('缺少参数 id（资源 ID）', 400));
         return;
     }
     const result = await getPlaylistTags_1.default.getHotComments(id, Number(type), Number(page), Number(pagesize));
-    ctx.status = result.status;
-    ctx.body = result.body;
-}
+    (0, util_1.setApiResponse)(ctx, result);
+});
+exports.getHotCommentsController = getHotCommentsController;
 /**
  * 获取歌手分类列表
  */
-async function getSingerListByAreaController(ctx) {
+const getSingerListByAreaController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { area = '-1', sex = '-1', genre = '-1', page = '1', pagesize = '80' } = ctx.query;
     const result = await getPlaylistTags_1.default.getSingerListByArea(Number(area), Number(sex), Number(genre), Number(page), Number(pagesize));
-    ctx.status = result.status;
-    ctx.body = result.body;
-}
+    (0, util_1.setApiResponse)(ctx, result);
+});
+exports.getSingerListByAreaController = getSingerListByAreaController;
 exports.default = {
     getPlaylistTags: getPlaylistTagsController,
     getPlaylistsByTag: getPlaylistsByTagController,

package/dist/routers/context/getRanks.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_1 = require("../../module");
-const controller = async (ctx, next) => {
+const util_1 = require("../util");
+const apiResponse_1 = require("../../util/apiResponse");
+const getRanksController = (0, util_1.withErrorHandler)(async (ctx) => {
     const getWeekNumber = (d) => {
         d = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
         const dayNum = d.getUTCDay() || 7;
@@ -36,25 +38,16 @@ const controller = async (ctx, next) => {
             }
         }
     };
-    const params = Object.assign({
+    const params = {
         format: 'json',
         data: JSON.stringify(data)
-    });
+    };
     const props = {
         method: 'get',
         params,
         option: {}
     };
-    await (0, module_1.UCommon)(props)
-        .then(res => {
-        const response = res.data;
-        ctx.status = 200;
-        ctx.body = {
-            response
-        };
-    })
-        .catch(error => {
-        console.log('error', error);
-    });
-};
-exports.default = controller;
+    const response = await (0, module_1.UCommon)(props);
+    (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.customResponse)({ response: response.data }, 200));
+});
+exports.default = getRanksController;

package/dist/routers/context/getSingerAlbum.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_1 = require("../../module");
-const controller = async (ctx, next) => {
+const util_1 = require("../util");
+const apiResponse_1 = require("../../util/apiResponse");
+const getSingerAlbumController = (0, util_1.withErrorHandler)(async (ctx) => {
     const singermid = ctx.query.singermid;
     const num = +ctx.query.limit || 5;
     const begin = +ctx.query.page || 0;
@@ -21,34 +23,26 @@ const controller = async (ctx, next) => {
             module: 'music.musichallAlbum.AlbumListServer'
         }
     };
-    const params = Object.assign({
+    const params = {
         format: 'json',
         singermid,
         data: JSON.stringify(data)
-    });
+    };
     const props = {
         method: 'get',
         params,
         option: {}
     };
-    if (singermid) {
-        await (0, module_1.UCommon)(props)
-            .then(res => {
-            const response = res.data;
-            ctx.status = 200;
-            ctx.body = {
-                response
-            };
-        })
-            .catch(error => {
-            console.log('error', error);
+    if (!singermid) {
+        (0, util_1.setApiResponse)(ctx, {
+            status: 400,
+            body: {
+                response: 'no singermid'
+            }
         });
+        return;
     }
-    else {
-        ctx.status = 400;
-        ctx.body = {
-            response: 'no singermid'
-        };
-    }
-};
-exports.default = controller;
+    const response = await (0, module_1.UCommon)(props);
+    (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.customResponse)({ response: response.data }, 200));
+});
+exports.default = getSingerAlbumController;

package/dist/routers/context/getSingerHotsong.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_1 = require("../../module");
-const controller = async (ctx, next) => {
+const util_1 = require("../util");
+const apiResponse_1 = require("../../util/apiResponse");
+const getSingerHotsongController = (0, util_1.withErrorHandler)(async (ctx) => {
     const singermid = ctx.query.singermid;
     const num = +ctx.query.limit || 5;
     const page = +ctx.query.page || 0;
@@ -21,34 +23,26 @@ const controller = async (ctx, next) => {
             module: 'music.web_singer_info_svr'
         }
     };
-    const params = Object.assign({
+    const params = {
         format: 'json',
         singermid,
         data: JSON.stringify(data)
-    });
+    };
     const props = {
         method: 'get',
         params,
         option: {}
     };
-    if (singermid) {
-        await (0, module_1.UCommon)(props)
-            .then(res => {
-            const response = res.data;
-            ctx.status = 200;
-            ctx.body = {
-                response
-            };
-        })
-            .catch(error => {
-            console.log('error', error);
+    if (!singermid) {
+        (0, util_1.setApiResponse)(ctx, {
+            status: 400,
+            body: {
+                response: 'no singermid'
+            }
         });
+        return;
     }
-    else {
-        ctx.status = 400;
-        ctx.body = {
-            response: 'no singermid'
-        };
-    }
-};
-exports.default = controller;
+    const response = await (0, module_1.UCommon)(props);
+    (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.customResponse)({ response: response.data }, 200));
+});
+exports.default = getSingerHotsongController;