@sansenjian/qq-music-api 2.2.7 → 2.2.9

package/CHANGELOG.md

@@ -1,4 +1,17 @@
-## 2.2.7 (2026-03-08)
+## 2.2.9 (2026-03-14)
+
+
+
+## 2.2.9 (2026-03-14)
+
+
+### Bug Fixes
+
+* rewrite getMusicPlay url logic ([#12](https://github.com/sansenjian/qq-music-api/issues/12)) ([ec9823b](https://github.com/sansenjian/qq-music-api/commit/ec9823be7821f6c83427f1aada8848729936e1d2))
+
+
+
+## 2.2.8 (2026-03-08)
 
 
 

package/README.md

@@ -9,6 +9,8 @@
 ![node](https://img.shields.io/badge/node-%3E%3D20.0.0-green?style=flat-square)
 <br />
 ![GitHub repo size](https://img.shields.io/github/repo-size/sansenjian/qq-music-api?style=flat-square) ![GitHub package.json version](https://img.shields.io/github/package-json/v/sansenjian/qq-music-api?style=flat-square) ![GitHub](https://img.shields.io/github/license/sansenjian/qq-music-api?style=flat-square) ![GitHub open issues](https://img.shields.io/github/issues/sansenjian/qq-music-api?style=flat-square) ![GitHub closed issues](https://img.shields.io/github/issues-closed/sansenjian/qq-music-api) ![GitHub last commit](https://img.shields.io/github/last-commit/sansenjian/qq-music-api?style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/sansenjian/qq-music-api?style=flat-square)
+<br />
+[![Codecov](https://img.shields.io/codecov/c/github/sansenjian/qq-music-api?style=flat-square&logo=codecov)](https://codecov.io/gh/sansenjian/qq-music-api)
 
 </div>
 

package/dist/app.js

@@ -12,20 +12,39 @@ const chalk_1 = __importDefault(require("chalk"));
 const koa_cors_1 = __importDefault(require("./middlewares/koa-cors"));
 const router_1 = __importDefault(require("./routers/router"));
 const cookie_1 = __importDefault(require("./util/cookie"));
+const fallback_middleware_1 = __importDefault(require("./middlewares/fallback-middleware"));
 const colors_1 = __importDefault(require("./util/colors"));
 const user_info_1 = __importDefault(require("./config/user-info"));
+const service_config_1 = __importDefault(require("./config/service-config"));
 const package_json_1 = __importDefault(require("./package.json"));
 const app = new koa_1.default();
 global.userInfo = user_info_1.default;
-console.log(chalk_1.default.green('\n🥳🎉 We had supported config the user cookies. \n'));
+// 输出服务配置信息
+console.log(chalk_1.default.green('\n🎵 QQ Music API Service Starting...\n'));
 console.log(colors_1.default.info(`Current Version: ${package_json_1.default.version}`));
-if (!(global.userInfo.loginUin || global.userInfo.uin)) {
-    console.log(chalk_1.default.yellow(`😔 The configuration ${chalk_1.default.red('loginUin')} or your ${chalk_1.default.red('cookie')} in file ${chalk_1.default.green('config/user-info')} has not configured. \n`));
+console.log(colors_1.default.info(`Fallback Mode: ${service_config_1.default.fallbackMode ? 'Enabled' : 'Disabled'}`));
+console.log(colors_1.default.info(`Use Global Cookie: ${service_config_1.default.useGlobalCookie ? 'Yes' : 'No'}`));
+if (service_config_1.default.fallbackMode) {
+    console.log(chalk_1.default.green('\n✅ 降级模式已启用：支持手动传递 Cookie\n'));
+    console.log('使用方式:');
+    console.log('  1. Query 参数：GET /api/endpoint?cookie=your_cookie');
+    console.log('  2. Header: X-Custom-Cookie: your_cookie');
+    console.log('  3. Header: Cookie: your_cookie\n');
 }
-if (!global.userInfo.cookie) {
-    console.log(chalk_1.default.yellow(`😔 The configuration ${chalk_1.default.red('cookie')} in file ${chalk_1.default.green('config/user-info')} has not configured. \n`));
+if (!service_config_1.default.useGlobalCookie) {
+    console.log(chalk_1.default.yellow('\n⚠️  全局 Cookie 未启用：需要登录的接口请手动传递 Cookie\n'));
+}
+if (service_config_1.default.useGlobalCookie) {
+    console.log(chalk_1.default.green('\n✅ 全局 Cookie 已启用\n'));
+    if (!(global.userInfo.loginUin || global.userInfo.uin)) {
+        console.log(chalk_1.default.yellow(`😔 The configuration ${chalk_1.default.red('loginUin')} or your ${chalk_1.default.red('cookie')} in file ${chalk_1.default.green('config/user-info')} has not configured. \n`));
+    }
+    if (!global.userInfo.cookie) {
+        console.log(chalk_1.default.yellow(`😔 The configuration ${chalk_1.default.red('cookie')} in file ${chalk_1.default.green('config/user-info')} has not configured. \n`));
+    }
 }
 app.use((0, koa_bodyparser_1.default)());
+app.use((0, fallback_middleware_1.default)());
 app.use((0, cookie_1.default)());
 app.use((0, koa_static_1.default)(path_1.default.join(__dirname, 'public')));
 // logger

package/dist/config/service-config.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const configPath = path_1.default.join(__dirname, './service-config.json');
+// 创建默认配置
+const defaultConfig = {
+    fallbackMode: true,
+    useGlobalCookie: false,
+    cookieParamName: 'cookie'
+};
+// 读取或创建配置文件
+let config = defaultConfig;
+if (fs_1.default.existsSync(configPath)) {
+    try {
+        const content = fs_1.default.readFileSync(configPath, 'utf-8');
+        config = { ...defaultConfig, ...JSON.parse(content) };
+    }
+    catch (e) {
+        console.warn('service-config.json 读取失败，使用默认配置');
+        fs_1.default.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2), 'utf-8');
+    }
+}
+else {
+    fs_1.default.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2), 'utf-8');
+}
+// 支持环境变量覆盖
+if (process.env.FALLBACK_MODE === 'true') {
+    config.fallbackMode = true;
+}
+if (process.env.USE_GLOBAL_COOKIE === 'true') {
+    config.useGlobalCookie = true;
+}
+exports.default = config;

package/dist/jest.config.js

@@ -8,12 +8,22 @@ const config = {
         'module/**/*.ts',
         'routers/**/*.ts',
         'util/**/*.ts',
+        'middlewares/**/*.ts',
         '!**/node_modules/**',
         '!**/tests/**',
-        '!**/dist/**'
+        '!**/dist/**',
+        '!**/*.d.ts',
+        '!**/types/**/*.ts'
     ],
     coverageDirectory: 'coverage',
-    coverageReporters: ['text', 'lcov', 'html'],
+    coverageReporters: ['text', 'lcov', 'html', 'json-summary', 'json'],
+    coveragePathIgnorePatterns: [
+        '/node_modules/',
+        '/tests/',
+        '/dist/',
+        '\\.d\\.ts$',
+        '/types/'
+    ],
     coverageThreshold: {
         global: {
             branches: 35,
@@ -26,6 +36,8 @@ const config = {
     modulePathIgnorePatterns: ['<rootDir>/dist/'],
     testTimeout: 10000,
     verbose: true,
+    collectCoverage: true, // 默认开启覆盖率
+    coverageProvider: 'v8', // 使用 v8 引擎，更准确
     moduleNameMapper: {
         '^@module/(.*)$': '<rootDir>/module/$1',
         '^@routers/(.*)$': '<rootDir>/routers/$1',

package/dist/middlewares/fallback-middleware.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const service_config_1 = __importDefault(require("../config/service-config"));
+const cookieResolver_1 = require("../util/cookieResolver");
+/**
+ * 降级模式中间件：支持通过 query/header 手动传递 Cookie。
+ */
+const fallbackMiddleware = () => async (ctx, next) => {
+    if (!service_config_1.default.fallbackMode) {
+        await next();
+        return;
+    }
+    const { cookie, source } = (0, cookieResolver_1.resolveRequestCookie)(ctx, {
+        fallbackMode: true,
+        useGlobalCookie: false,
+        cookieParamName: service_config_1.default.cookieParamName
+    });
+    if (cookie) {
+        (0, cookieResolver_1.setRequestCookieContext)(ctx, cookie);
+        if (process.env.DEBUG === 'true') {
+            console.log(`[FallbackMode] use cookie from ${source}, length: ${cookie.length}`);
+        }
+    }
+    await next();
+};
+exports.default = fallbackMiddleware;

package/dist/module/apis/music/getMusicPlay.js

@@ -0,0 +1,187 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const UCommon_1 = __importDefault(require("../UCommon/UCommon"));
+const config_1 = require("../../config");
+const cookieResolver_1 = require("../../../util/cookieResolver");
+const DEFAULT_QUALITY = '128';
+const FILE_TYPE_MAP = {
+    m4a: { prefix: 'C400', suffix: '.m4a' },
+    128: { prefix: 'M500', suffix: '.mp3' },
+    320: { prefix: 'M800', suffix: '.mp3' },
+    ape: { prefix: 'A000', suffix: '.ape' },
+    flac: { prefix: 'F000', suffix: '.flac' }
+};
+const normalizeFirstValue = (value) => {
+    if (Array.isArray(value)) {
+        return normalizeFirstValue(value[0]);
+    }
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const normalized = value.trim();
+    return normalized || undefined;
+};
+const normalizeSongmidList = (songmid) => {
+    const values = Array.isArray(songmid) ? songmid : [songmid];
+    return values
+        .flatMap(value => {
+        if (typeof value !== 'string')
+            return [];
+        return value.split(',');
+    })
+        .map(item => item.trim())
+        .filter(Boolean);
+};
+const normalizeQuality = (value) => {
+    const quality = normalizeFirstValue(value) || String(value || '');
+    if (quality === 'm4a' || quality === 'ape' || quality === 'flac') {
+        return quality;
+    }
+    const numericQuality = Number(quality);
+    if (numericQuality === 320) {
+        return '320';
+    }
+    if (numericQuality === 128) {
+        return '128';
+    }
+    return DEFAULT_QUALITY;
+};
+const pickPlayableDomain = (sip) => {
+    if (!Array.isArray(sip))
+        return '';
+    const urls = sip.filter((item) => typeof item === 'string' && item.length > 0);
+    return (urls.find(url => !url.startsWith('http://ws')) ||
+        urls.find(url => url.startsWith('https://')) ||
+        urls[0] ||
+        '');
+};
+const joinUrl = (domain, path) => {
+    if (domain.endsWith('/') && path.startsWith('/')) {
+        return `${domain}${path.slice(1)}`;
+    }
+    if (!domain.endsWith('/') && !path.startsWith('/')) {
+        return `${domain}/${path}`;
+    }
+    return `${domain}${path}`;
+};
+const buildPlayUrl = (domain, info, guid) => {
+    if (!domain)
+        return '';
+    if (info.purl) {
+        return joinUrl(domain, info.purl);
+    }
+    // Fallback for payloads where purl is empty but vkey/filename are present.
+    if (info.vkey && info.filename) {
+        return `${joinUrl(domain, info.filename)}?vkey=${info.vkey}&guid=${guid}&fromtag=66`;
+    }
+    return '';
+};
+const resolveUin = (cookie) => {
+    const defaultUin = String(global.userInfo?.uin || global.userInfo?.loginUin || '0');
+    return (0, cookieResolver_1.extractUinFromCookie)(cookie) || defaultUin;
+};
+const getCookieFromOptions = (option) => {
+    if (!option || typeof option !== 'object') {
+        return undefined;
+    }
+    const headers = option.headers;
+    if (!headers || typeof headers !== 'object') {
+        return undefined;
+    }
+    const cookie = headers.Cookie || headers.cookie;
+    return typeof cookie === 'string' ? cookie : undefined;
+};
+exports.default = async ({ method = 'get', params = {}, option = {} }) => {
+    const musicParams = params;
+    const songmidList = normalizeSongmidList(musicParams.songmid);
+    if (songmidList.length === 0) {
+        return {
+            status: 400,
+            body: {
+                data: {
+                    message: 'no songmid'
+                }
+            }
+        };
+    }
+    const justPlayUrl = (normalizeFirstValue(musicParams.resType) || 'play') === 'play';
+    const mediaId = normalizeFirstValue(musicParams.mediaId);
+    const quality = normalizeQuality(musicParams.quality);
+    const guid = String(config_1._guid || '1429839143');
+    const cookie = getCookieFromOptions(option);
+    const uin = resolveUin(cookie);
+    const fileType = FILE_TYPE_MAP[quality];
+    const filename = songmidList.map(item => `${fileType.prefix}${item}${mediaId || item}${fileType.suffix}`);
+    const requestPayload = {
+        req_0: {
+            module: 'vkey.GetVkeyServer',
+            method: 'CgiGetVkey',
+            param: {
+                filename,
+                guid,
+                songmid: songmidList,
+                songtype: [0],
+                uin,
+                loginflag: 1,
+                platform: '20'
+            }
+        },
+        loginUin: uin,
+        comm: {
+            uin,
+            format: 'json',
+            ct: 24,
+            cv: 0
+        }
+    };
+    const upstreamParams = {
+        format: 'json',
+        sign: 'zzannc1o6o9b4i971602f3554385022046ab796512b7012',
+        data: JSON.stringify(requestPayload)
+    };
+    try {
+        const response = await (0, UCommon_1.default)({
+            method: method,
+            params: upstreamParams,
+            option
+        });
+        const upstreamData = response.data;
+        const domain = pickPlayableDomain(upstreamData?.req_0?.data?.sip);
+        const midurlinfo = Array.isArray(upstreamData?.req_0?.data?.midurlinfo)
+            ? upstreamData.req_0.data.midurlinfo
+            : [];
+        const playUrl = {};
+        const midInfoMap = new Map();
+        midurlinfo.forEach(item => {
+            if (item.songmid) {
+                midInfoMap.set(item.songmid, item);
+            }
+        });
+        songmidList.forEach(songmid => {
+            const item = midInfoMap.get(songmid);
+            const url = item ? buildPlayUrl(domain, item, guid) : '';
+            playUrl[songmid] = {
+                url,
+                error: url ? undefined : '\u6682\u65e0\u64ad\u653e\u94fe\u63a5'
+            };
+        });
+        upstreamData.playUrl = playUrl;
+        return {
+            status: 200,
+            body: {
+                data: justPlayUrl ? { playUrl } : upstreamData
+            }
+        };
+    }
+    catch (error) {
+        return {
+            status: 502,
+            body: {
+                error: error instanceof Error ? error.message : error
+            }
+        };
+    }
+};

package/dist/module/apis/u_common.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = __importDefault(require("../../util/request"));
 const config = __importStar(require("../config"));
-exports.default = ({ options = {}, method = 'get' }) => {
+exports.default = ({ options = {}, method = 'get', customCookie }) => {
     const opts = { ...options };
     // Merge commonParams into params for query string
     opts.params = { ...config.commonParams, ...(opts.params || {}) };
@@ -52,5 +52,11 @@ exports.default = ({ options = {}, method = 'get' }) => {
         const logOpts = { ...opts, headers: { ...opts.headers, cookie: '[REDACTED]' } };
         console.log('https://u.y.qq.com/cgi-bin/musicu.fcg', { opts: logOpts });
     }
-    return (0, request_1.default)('https://u.y.qq.com/cgi-bin/musicu.fcg', method, opts, 'u');
+    return (0, request_1.default)({
+        url: 'https://u.y.qq.com/cgi-bin/musicu.fcg',
+        method: method,
+        options: opts,
+        isUUrl: 'u',
+        cookie: customCookie
+    });
 };

package/dist/module/apis/user/getUserPlaylists.js

@@ -59,7 +59,7 @@ const getErrorMessage = (payload) => {
 // 获取用户创建的歌单
 // 注意：此接口需要有效的 QQ 音乐 Cookie 才能正常工作
 const getUserPlaylists = async (params) => {
-    const { uin, offset = 0, limit = 30 } = params;
+    const { uin, offset = 0, limit = 30, cookie } = params;
     // 使用 c6.y.qq.com/rsc/fcgi-bin/fcg_get_profile_homepage.fcg 接口
     // 这是通过 Chrome DevTools 抓包发现的实际使用的接口
     const url = 'https://c6.y.qq.com/rsc/fcgi-bin/fcg_get_profile_homepage.fcg';
@@ -71,13 +71,14 @@ const getUserPlaylists = async (params) => {
             offset,
             limit,
             pageOffset,
-            hasGlobalCookie: Boolean(global.userInfo?.cookie),
-            cookieLength: global.userInfo?.cookie?.length || 0
+            hasCookie: Boolean(cookie),
+            cookieLength: cookie?.length || 0
         });
         const response = await (0, request_1.default)({
             url,
             method: 'GET',
             isUUrl: 'u',
+            cookie,
             options: {
                 params: {
                     _: Date.now(),
@@ -100,8 +101,7 @@ const getUserPlaylists = async (params) => {
                     loginUin: Number.parseInt(uin, 10)
                 },
                 headers: {
-                    Referer: `https://y.qq.com/portal/profile.html?uin=${uin}`,
-                    Cookie: global.userInfo?.cookie || ''
+                    Referer: `https://y.qq.com/portal/profile.html?uin=${uin}`
                 }
             }
         });

package/dist/module/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserLikedSongs = exports.getUserAvatar = exports.getUserPlaylists = exports.checkQQLoginQr = exports.getQQLoginQr = exports.getTopLists = exports.UCommon = exports.getComments = exports.getAlbumInfo = exports.getLyric = exports.getDigitalAlbumLists = exports.getRadioLists = exports.getSingerStarNum = exports.getSingerDesc = exports.getSingerMv = exports.getSimilarSinger = exports.getMvByTag = exports.songListDetail = exports.songListCategories = exports.songLists = exports.getSmartbox = exports.getSearchByKey = exports.getHotKey = exports.downloadQQMusic = void 0;
+exports.getUserLikedSongs = exports.getUserAvatar = exports.getUserPlaylists = exports.checkQQLoginQr = exports.getQQLoginQr = exports.getTopLists = exports.UCommon = exports.getComments = exports.getAlbumInfo = exports.getMusicPlay = exports.getLyric = exports.getDigitalAlbumLists = exports.getRadioLists = exports.getSingerStarNum = exports.getSingerDesc = exports.getSingerMv = exports.getSimilarSinger = exports.getMvByTag = exports.songListDetail = exports.songListCategories = exports.songLists = exports.getSmartbox = exports.getSearchByKey = exports.getHotKey = exports.downloadQQMusic = void 0;
 const downloadQQMusic_1 = __importDefault(require("./apis/downloadQQMusic"));
 exports.downloadQQMusic = downloadQQMusic_1.default;
 // search
@@ -41,6 +41,8 @@ exports.getDigitalAlbumLists = getDigitalAlbumLists_1.default;
 // music
 const getLyric_1 = __importDefault(require("./apis/music/getLyric"));
 exports.getLyric = getLyric_1.default;
+const getMusicPlay_1 = __importDefault(require("./apis/music/getMusicPlay"));
+exports.getMusicPlay = getMusicPlay_1.default;
 // album
 const getAlbumInfo_1 = __importDefault(require("./apis/album/getAlbumInfo"));
 exports.getAlbumInfo = getAlbumInfo_1.default;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sansenjian/qq-music-api",
-    "version": "2.2.7",
+    "version": "2.2.9",
     "publishConfig": {
         "access": "public"
     },
@@ -31,6 +31,9 @@
         "test:watch": "jest --watch",
         "test:coverage": "jest --coverage",
         "test:verbose": "jest --verbose",
+        "test:unit": "jest --testPathPattern=tests/unit",
+        "test:flags": "tsx scripts/run-tests-with-flags.ts all",
+        "test:flags:unit": "tsx scripts/run-tests-with-flags.ts unit",
         "docs:dev": "vitepress dev docs --port 9611",
         "docs:preview": "vitepress preview docs",
         "commit-push": "./scripts/commit-push.sh",

package/dist/routers/context/batchGetSongInfo.js

@@ -1,16 +1,18 @@
 "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 batchGetSongInfoController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { songs } = ctx.request.body || {};
-    const params = Object.assign({
+    const params = {
         format: 'json',
         inCharset: 'utf8',
         outCharset: 'utf-8',
         notice: 0,
         platform: 'yqq.json',
         needNewCode: 0
-    });
+    };
     const props = {
         method: 'get',
         option: {},
@@ -18,7 +20,7 @@ const controller = async (ctx, next) => {
     };
     const data = await Promise.all((songs || []).map(async (song) => {
         const [song_mid, song_id = ''] = song;
-        return await (0, module_1.UCommon)({
+        const response = await (0, module_1.UCommon)({
             ...props,
             params: {
                 ...params,
@@ -38,16 +40,9 @@ const controller = async (ctx, next) => {
                     }
                 }
             }
-        }).then(res => res.data);
+        });
+        return response.data;
     }));
-    Object.assign(ctx, {
-        status: 200,
-        body: {
-            response: {
-                code: 0,
-                data
-            }
-        }
-    });
-};
-exports.default = controller;
+    (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.customResponse)({ response: { code: 0, data } }, 200));
+});
+exports.default = batchGetSongInfoController;

package/dist/routers/context/batchGetSongLists.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 batchGetSongListsController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { limit: ein = 19, page: sin = 0, sortId = 5, categoryIds = [10000000] } = ctx.request.body || {};
     const params = {
         sortId,
@@ -13,25 +15,21 @@ const controller = async (ctx, next) => {
         option: {},
         params
     };
-    const data = await Promise.all(categoryIds.map(async (categoryId) => await (0, module_1.songLists)({
-        ...props,
-        params: {
-            ...params,
-            categoryId
-        }
-    }).then(res => {
-        if (res.body.response && +res.body.response.code === 0) {
-            return res.body.response.data;
+    const data = await Promise.all(categoryIds.map(async (categoryId) => {
+        const result = await (0, module_1.songLists)({
+            ...props,
+            params: {
+                ...params,
+                categoryId
+            }
+        });
+        if (result.body.response && +result.body.response.code === 0) {
+            return result.body.response.data;
         }
         else {
-            return res.body.response;
-        }
-    })));
-    Object.assign(ctx, {
-        body: {
-            status: 200,
-            data
+            return result.body.response;
         }
-    });
-};
-exports.default = controller;
+    }));
+    (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.customResponse)({ status: 200, data }, 200));
+});
+exports.default = batchGetSongListsController;

package/dist/routers/context/getAlbumInfo.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 getAlbumInfoController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { albummid } = ctx.query;
     const props = {
         method: 'get',
@@ -10,20 +12,11 @@ const controller = async (ctx, next) => {
         },
         option: {}
     };
-    if (albummid) {
-        const { status, body } = await (0, module_1.getAlbumInfo)(props);
-        Object.assign(ctx, {
-            status,
-            body
-        });
+    if (!albummid) {
+        (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.errorResponse)('no albummid', 400));
+        return;
     }
-    else {
-        ctx.status = 400;
-        ctx.body = {
-            data: {
-                message: 'no albummid'
-            }
-        };
-    }
-};
-exports.default = controller;
+    const result = await (0, module_1.getAlbumInfo)(props);
+    (0, util_1.setApiResponse)(ctx, result);
+});
+exports.default = getAlbumInfoController;

package/dist/routers/context/getComments.js

@@ -1,10 +1,12 @@
 "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 getCommentsController = (0, util_1.withErrorHandler)(async (ctx) => {
     const { id, pagesize = 25, pagenum = 0, cid = 205360772, cmd = 8, reqtype = 2, biztype = 1, rootcommentid = !pagenum && '' } = ctx.query;
     const checkrootcommentid = !pagenum ? true : !!rootcommentid;
-    const params = Object.assign({
+    const params = {
         cid,
         reqtype,
         biztype,
@@ -13,26 +15,17 @@ const controller = async (ctx, next) => {
         pagenum,
         pagesize,
         lasthotcommentid: rootcommentid
-    });
+    };
     const props = {
         method: 'get',
         params,
         option: {}
     };
-    if (id && checkrootcommentid) {
-        const { status, body } = await (0, module_1.getComments)(props);
-        Object.assign(ctx, {
-            status,
-            body
-        });
-    }
-    else {
-        ctx.status = 400;
-        ctx.body = {
-            data: {
-                message: 'Don\'t have id or rootcommentid'
-            }
-        };
+    if (!id || !checkrootcommentid) {
+        (0, util_1.setApiResponse)(ctx, (0, apiResponse_1.errorResponse)('Don\'t have id or rootcommentid', 400));
+        return;
     }
-};
-exports.default = controller;
+    const result = await (0, module_1.getComments)(props);
+    (0, util_1.setApiResponse)(ctx, result);
+});
+exports.default = getCommentsController;