Jerry/rc-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/rc-plugin.git synced 2025-10-14 16:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from nikoyoke1/master

Browse Source 
🎈pref：优化#rnq判断/添加输出错误信息
This commit is contained in:
Zhiyu 2024-10-19 19:01:11 +08:00 committed by GitHub
commit b1b702a819
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/tools.js
View File

@ -1571,8 +1571,13 @@ export class tools extends plugin {
try { try {
// 优先判断是否使用自建 API // 优先判断是否使用自建 API
const isOversea = await this.isOverseasServer(); const isOversea = await this.isOverseasServer();
const autoSelectNeteaseApi = this.useLocalNeteaseAPI ? this.neteaseCloudAPIServer : (isOversea ? NETEASE_SONG_DOWNLOAD : NETEASE_API_CN); let autoSelectNeteaseApi
if (this.useLocalNeteaseAPI) {
autoSelectNeteaseApi = this.neteaseCloudAPIServer
} else {
autoSelectNeteaseApi = (isOversea ? NETEASE_SONG_DOWNLOAD : NETEASE_API_CN)
await e.reply('未使用自建服务器，高概率#rnq失败');
}
// 获取登录key // 获取登录key
const keyUrl = `${autoSelectNeteaseApi}/login/qr/key`; const keyUrl = `${autoSelectNeteaseApi}/login/qr/key`;
const keyResponse = await axios.get(keyUrl, { headers: { "User-Agent": COMMON_USER_AGENT } }); const keyResponse = await axios.get(keyUrl, { headers: { "User-Agent": COMMON_USER_AGENT } });
@ -1590,8 +1595,16 @@ export class tools extends plugin {
// 轮询检查登录状态 // 轮询检查登录状态
await this.pollLoginStatus(autoSelectNeteaseApi, unikey, e); await this.pollLoginStatus(autoSelectNeteaseApi, unikey, e);
} catch (error) { } catch (error) {
logger.error('执行网易云扫码登录时出错:', error); if (error.code == 'ERR_INVALID_URL') {
e.reply('执行扫码登录时发生错误，请稍后再试'); logger.error('执行网易云扫码登录时出错:非法地址，请检查API服务地址', error);
e.reply(`执行网易云扫码登录时出错${error.code}请检查API服务器地址`);
} else if (error.code == 'ECONNRESET') {
logger.error('执行网易云扫码登录时出错:API请求错误，请检查API服务状态', error);
e.reply(`执行扫码登录时发生错误${error.code}请检查API服务状态`);
} else {
logger.error('执行网易云扫码登录时出错:', error);
e.reply('执行扫码登录时发生错误，请稍后再试');
}
} }
} }
@ -1651,7 +1664,7 @@ export class tools extends plugin {
} }
}) })
// mv截断 // mv截断
if (message.includes("mv")) { if (/mv\?/.test(message)) {
const AUTO_NETEASE_MV_DETAIL = autoSelectNeteaseApi + "/mv/detail?mvid={}"; const AUTO_NETEASE_MV_DETAIL = autoSelectNeteaseApi + "/mv/detail?mvid={}";
const AUTO_NETEASE_MV_URL = autoSelectNeteaseApi + "/mv/url?id={}"; const AUTO_NETEASE_MV_URL = autoSelectNeteaseApi + "/mv/url?id={}";
// logger.info(AUTO_NETEASE_MV_DETAIL.replace("{}", id)); // logger.info(AUTO_NETEASE_MV_DETAIL.replace("{}", id));