diff --git a/lib/middleware/onerror.js b/lib/middleware/onerror.js index 0109576549..32f2554513 100644 --- a/lib/middleware/onerror.js +++ b/lib/middleware/onerror.js @@ -107,7 +107,7 @@ Please ensure you have deployed the [master branch](https://github.com/DIYgod/RS if (config.isPackage) { ctx.body = { error: { - message: err.message, + message: err.message ? err.message : err, }, }; } else { diff --git a/lib/routes/pixiv/constants.js b/lib/routes/pixiv/constants.js index 4580ef09ea..d889b33cff 100644 --- a/lib/routes/pixiv/constants.js +++ b/lib/routes/pixiv/constants.js @@ -1,4 +1,4 @@ -exports.modules = { +module.exports = { maskHeader: { 'App-OS': 'ios', 'App-OS-Version': '10.3.1', diff --git a/lib/routes/pixiv/token.js b/lib/routes/pixiv/token.js index b3907738e5..5a34b27af1 100644 --- a/lib/routes/pixiv/token.js +++ b/lib/routes/pixiv/token.js @@ -2,7 +2,7 @@ const config = require('@/config').value; const logger = require('@/utils/logger'); const wait = require('@/utils/wait'); const got = require('./pixiv-got'); -const maskHeader = require('./constants').maskHeader; +const { maskHeader } = require('./constants'); let token = null; @@ -25,11 +25,13 @@ async function refreshToken() { headers: { ...maskHeader, }, + responseType: 'json', + resolveBodyOnly: true, }).catch(function (e) { logger.error('Pixiv refresh token failed.'); logger.debug(e); }); - return response && response.data && response.data.response; + return response; } async function tokenLoop() { @@ -62,3 +64,5 @@ if (config.pixiv && config.pixiv.refreshToken) { module.exports = function getToken() { return token; }; + +module.exports.refreshToken = refreshToken;