|
|
@@ -1096,73 +1096,73 @@ async function signBiliBili() {
|
|
|
// });
|
|
|
// }
|
|
|
|
|
|
-// async function me() {
|
|
|
-// return new Promise((resolve, reject) => {
|
|
|
-// magicJS.logger.info("#### 用户信息");
|
|
|
-// const myRequest = {
|
|
|
-// url: 'https://api.bilibili.com/x/web-interface/nav',
|
|
|
-// headers: {
|
|
|
-// "cookie": config.cookieStr
|
|
|
-// }
|
|
|
-// };
|
|
|
-// magicJS.http.get(myRequest).then(response => {
|
|
|
-// try {
|
|
|
-// const body = response.body;
|
|
|
-// if (body?.code) {
|
|
|
-// magicJS.logger.info("- ❌❌获得用户信息失败(请更新cookie)");
|
|
|
-// magicJS.data.write("bilibili_daily_bonus", null);
|
|
|
-// resolve(false);
|
|
|
-// } else {
|
|
|
-// magicJS.logger.info("- 🎉cookie有效任务即将开始🎉");
|
|
|
-// config.user = body?.data;
|
|
|
-// config.user.num = check("user") ? 1 : (config.user.num || 0) + 1;
|
|
|
-// magicJS.data.write("bilibili_daily_bonus", magicJS.toStr(config));
|
|
|
+async function me() {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ magicJS.logger.info("#### 用户信息");
|
|
|
+ const myRequest = {
|
|
|
+ url: 'https://api.bilibili.com/x/web-interface/nav',
|
|
|
+ headers: {
|
|
|
+ "cookie": config.cookieStr
|
|
|
+ }
|
|
|
+ };
|
|
|
+ magicJS.http.get(myRequest).then(response => {
|
|
|
+ try {
|
|
|
+ const body = response.body;
|
|
|
+ if (body?.code) {
|
|
|
+ magicJS.logger.info("- ❌❌获得用户信息失败(请更新cookie)");
|
|
|
+ magicJS.data.write("bilibili_daily_bonus", null);
|
|
|
+ resolve(false);
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info("- 🎉cookie有效任务即将开始🎉");
|
|
|
+ config.user = body?.data;
|
|
|
+ config.user.num = check("user") ? 1 : (config.user.num || 0) + 1;
|
|
|
+ magicJS.data.write("bilibili_daily_bonus", magicJS.toStr(config));
|
|
|
|
|
|
-// config.user.mext_exp = config.user.level_info.next_exp - config.user.level_info.current_exp;
|
|
|
-// config.user.next_day = Math.ceil(config.user.mext_exp / 15);
|
|
|
-// config.user.v6_exp = 28800 - config.user.level_info.current_exp;
|
|
|
-// config.user.v6_day = Math.ceil(config.user.v6_exp / 15);
|
|
|
+ config.user.mext_exp = config.user.level_info.next_exp - config.user.level_info.current_exp;
|
|
|
+ config.user.next_day = Math.ceil(config.user.mext_exp / 15);
|
|
|
+ config.user.v6_exp = 28800 - config.user.level_info.current_exp;
|
|
|
+ config.user.v6_day = Math.ceil(config.user.v6_exp / 15);
|
|
|
|
|
|
-// if (config.user.vipStatus === 1) {
|
|
|
-// magicJS.logger.log("- 💖尊贵的大会员用户💖");
|
|
|
-// }
|
|
|
-// magicJS.logger.log("- 用户名称: " + config.user.uname);
|
|
|
-// magicJS.logger.log("- 用户ID: " + config.user.mid);
|
|
|
-// magicJS.logger.log("- 用户硬币: " + Math.floor(config.user.money));
|
|
|
-// magicJS.logger.log("- 用户B币: " + config.user.wallet.bcoin_balance);
|
|
|
-// magicJS.logger.log("- 用户等级: " + config.user.level_info.current_level);
|
|
|
-// magicJS.logger.log(
|
|
|
-// `- 当前经验: ${config.user.level_info.current_exp}/${config.user.level_info.next_exp}`
|
|
|
-// );
|
|
|
-// magicJS.logger.log(`- 升级还需经验: ${config.user.mext_exp}`);
|
|
|
-// magicJS.logger.log(
|
|
|
-// `- 距离下级还需: ${config.user.next_day}天(登录 观看 分享)`
|
|
|
-// );
|
|
|
-// magicJS.logger.log(
|
|
|
-// `- 距离满级还需: ${Math.max(0, config.user.v6_day)}天(登录 观看 分享)`
|
|
|
-// );
|
|
|
-// magicJS.logger.log(`- 剩余硬币最多可投: ${Math.floor((config.user.money)/5)}天`);
|
|
|
-// magicJS.logger.log(
|
|
|
-// "- 距离满级最快还需: " +
|
|
|
-// Math.max(0, Math.ceil(config.user.v6_exp / 65)) +
|
|
|
-// "天(日常 + 投币*5)"
|
|
|
-// );
|
|
|
-// resolve(true);
|
|
|
-// }
|
|
|
-// } catch (e) {
|
|
|
-// magicJS.logger.error(JSON.stringify(e));
|
|
|
-// resolve();
|
|
|
-// }
|
|
|
-// }, reason => {
|
|
|
-// magicJS.notification.post(magicJS.scriptName, "- 获取用户信息失败", magicJS.toStr(reason));
|
|
|
-// resolve(false);
|
|
|
-// }).catch(err => {
|
|
|
-// const msg = `用户信息异常\n${JSON.stringify(err)}`;
|
|
|
-// magicJS.logger.error(msg);
|
|
|
-// reject();
|
|
|
-// });
|
|
|
-// });
|
|
|
-// }
|
|
|
+ if (config.user.vipStatus === 1) {
|
|
|
+ magicJS.logger.log("- 💖尊贵的大会员用户💖");
|
|
|
+ }
|
|
|
+ magicJS.logger.log("- 用户名称: " + config.user.uname);
|
|
|
+ magicJS.logger.log("- 用户ID: " + config.user.mid);
|
|
|
+ magicJS.logger.log("- 用户硬币: " + Math.floor(config.user.money));
|
|
|
+ magicJS.logger.log("- 用户B币: " + config.user.wallet.bcoin_balance);
|
|
|
+ magicJS.logger.log("- 用户等级: " + config.user.level_info.current_level);
|
|
|
+ magicJS.logger.log(
|
|
|
+ `- 当前经验: ${config.user.level_info.current_exp}/${config.user.level_info.next_exp}`
|
|
|
+ );
|
|
|
+ magicJS.logger.log(`- 升级还需经验: ${config.user.mext_exp}`);
|
|
|
+ magicJS.logger.log(
|
|
|
+ `- 距离下级还需: ${config.user.next_day}天(登录 观看 分享)`
|
|
|
+ );
|
|
|
+ magicJS.logger.log(
|
|
|
+ `- 距离满级还需: ${Math.max(0, config.user.v6_day)}天(登录 观看 分享)`
|
|
|
+ );
|
|
|
+ magicJS.logger.log(`- 剩余硬币最多可投: ${Math.floor((config.user.money)/5)}天`);
|
|
|
+ magicJS.logger.log(
|
|
|
+ "- 距离满级最快还需: " +
|
|
|
+ Math.max(0, Math.ceil(config.user.v6_exp / 65)) +
|
|
|
+ "天(日常 + 投币*5)"
|
|
|
+ );
|
|
|
+ resolve(true);
|
|
|
+ }
|
|
|
+ } catch (e) {
|
|
|
+ magicJS.logger.error(JSON.stringify(e));
|
|
|
+ resolve();
|
|
|
+ }
|
|
|
+ }, reason => {
|
|
|
+ magicJS.notification.post(magicJS.scriptName, "- 获取用户信息失败", magicJS.toStr(reason));
|
|
|
+ resolve(false);
|
|
|
+ }).catch(err => {
|
|
|
+ const msg = `用户信息异常\n${JSON.stringify(err)}`;
|
|
|
+ magicJS.logger.error(msg);
|
|
|
+ reject();
|
|
|
+ });
|
|
|
+ });
|
|
|
+}
|
|
|
|
|
|
// async function queryStatus() {
|
|
|
// return new Promise((resolve, reject) => {
|
|
|
@@ -1338,7 +1338,7 @@ function getWbiSigns(requestParams) {
|
|
|
|
|
|
|
|
|
Main()
|
|
|
-.catch((e) => magicJS.logger.error(`Error: ${JSON.stringify(e)}`))
|
|
|
+.catch((e) => magicJS.logger.error(`Error: ${e}`))
|
|
|
.finally(() => magicJS.done());
|
|
|
|
|
|
//---SyncByPyScript---MagicJS3-start
|