|
|
@@ -167,7 +167,7 @@ async function persistentStore(config){
|
|
|
|
|
|
async function signBiliBili() {
|
|
|
config = magicJS.data.read("bilibili_daily_bonus", {});
|
|
|
- if (config.cookie && await me()) {
|
|
|
+ if (config.cookie && await getUserInfo()) {
|
|
|
await queryStatus();
|
|
|
let exec_times = config.Settings?.exec; //用户设置投币次数
|
|
|
if (!Boolean(exec_times)) {
|
|
|
@@ -1096,7 +1096,7 @@ async function signBiliBili() {
|
|
|
// });
|
|
|
// }
|
|
|
|
|
|
-async function me() {
|
|
|
+async function getUserInfo() {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
magicJS.logger.info("#### 用户信息");
|
|
|
const myRequest = {
|
|
|
@@ -1164,82 +1164,82 @@ async function me() {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-// async function queryStatus() {
|
|
|
-// return new Promise((resolve, reject) => {
|
|
|
-// magicJS.logger.info("#### 检查任务进行状况");
|
|
|
-// const myRequest = {
|
|
|
-// url: "https://api.bilibili.com/x/member/web/exp/reward",
|
|
|
-// headers: {
|
|
|
-// "cookie": config.cookieStr
|
|
|
-// }
|
|
|
-// };
|
|
|
-// magicJS.http.get(myRequest).then(response => {
|
|
|
-// try {
|
|
|
-// const body = response.body;
|
|
|
-// if (body?.code === 0) {
|
|
|
-// if (body.data.login) {
|
|
|
-// magicJS.logger.info("- 今日已登录");
|
|
|
-// config.user.num = (config.user.num === 0 ? 1 : config.user.num);
|
|
|
-// if (!config['user'].hasOwnProperty("time")) {
|
|
|
-// config.user.time = startTime;
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// magicJS.logger.info("! 今日尚未登录");
|
|
|
-// config.user.num = 0;
|
|
|
-// }
|
|
|
-// if (body.data.watch){
|
|
|
-// magicJS.logger.info("- 今日已观看");
|
|
|
-// config.watch.num = (config.watch.num === 0 || typeof config.watch.num === 'undefined' ? 1 : config.watch.num);
|
|
|
-// if (!config['watch'].hasOwnProperty("time")) {
|
|
|
-// config.watch.time = startTime;
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// magicJS.logger.info("! 今日尚未观看");
|
|
|
-// config.watch.num = 0;
|
|
|
-// }
|
|
|
-// if (body.data.share){
|
|
|
-// magicJS.logger.info("- 今日已分享");
|
|
|
-// config.share.num = (config.share.num === 0 || typeof config.share.num === 'undefined' ? 1 : config.share.num);
|
|
|
-// if (!config['share'].hasOwnProperty("time")) {
|
|
|
-// config.share.time = startTime;
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// magicJS.logger.info("! 今日尚未分享");
|
|
|
-// config.share.num = 0;
|
|
|
-// }
|
|
|
-// if (body.data.coins === 50){
|
|
|
-// magicJS.logger.info("- 今日已投币")
|
|
|
-// if (!config['coins'].hasOwnProperty("time")) {
|
|
|
-// config.coins.time = startTime;
|
|
|
-// } else {
|
|
|
-// if (format(new Date().toDateString()) > config.coins.time) {
|
|
|
-// config.coins.time = startTime;
|
|
|
-// }
|
|
|
-// }
|
|
|
-// } else if ((body.data.coins / 10) >= real_times) {
|
|
|
-// config.coins.time = startTime;
|
|
|
-// magicJS.logger.info("- 已完成用户设置的投币量");
|
|
|
-// } else if (config.user.money <= 5) {
|
|
|
-// magicJS.logger.info("! 硬币数不足");
|
|
|
-// } else {
|
|
|
-// magicJS.logger.info("! 今日投币未完成");
|
|
|
-// }
|
|
|
-// config.coins.num = body.data.coins;
|
|
|
-// magicJS.data.write("bilibili_daily_bonus", magicJS.toStr(config));
|
|
|
-// } else {
|
|
|
-// magicJS.logger.info("- 查询失败");
|
|
|
-// magicJS.logger.info("- 失败原因 " + body?.message);;
|
|
|
-// }
|
|
|
-// } catch (e) {
|
|
|
-// magicJS.logger.error(e);
|
|
|
-// }
|
|
|
-// resolve();
|
|
|
-// }).catch(err => {
|
|
|
-// const msg = `检查任务进行状况异常\n${JSON.stringify(err)}`;
|
|
|
-// magicJS.logger.error(msg);
|
|
|
-// reject();
|
|
|
-// });
|
|
|
-// });
|
|
|
+async function queryStatus() {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ magicJS.logger.info("#### 检查任务进行状况");
|
|
|
+ const myRequest = {
|
|
|
+ url: "https://api.bilibili.com/x/member/web/exp/reward",
|
|
|
+ headers: {
|
|
|
+ "cookie": config.cookieStr
|
|
|
+ }
|
|
|
+ };
|
|
|
+ magicJS.http.get(myRequest).then(response => {
|
|
|
+ try {
|
|
|
+ const body = response.body;
|
|
|
+ if (body?.code === 0) {
|
|
|
+ if (body.data.login) {
|
|
|
+ magicJS.logger.info("- 今日已登录");
|
|
|
+ config.user.num = (config.user.num === 0 ? 1 : config.user.num);
|
|
|
+ if (!config['user'].hasOwnProperty("time")) {
|
|
|
+ config.user.time = startTime;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info("! 今日尚未登录");
|
|
|
+ config.user.num = 0;
|
|
|
+ }
|
|
|
+ if (body.data.watch){
|
|
|
+ magicJS.logger.info("- 今日已观看");
|
|
|
+ config.watch.num = (config.watch.num === 0 || typeof config.watch.num === 'undefined' ? 1 : config.watch.num);
|
|
|
+ if (!config['watch'].hasOwnProperty("time")) {
|
|
|
+ config.watch.time = startTime;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info("! 今日尚未观看");
|
|
|
+ config.watch.num = 0;
|
|
|
+ }
|
|
|
+ if (body.data.share){
|
|
|
+ magicJS.logger.info("- 今日已分享");
|
|
|
+ config.share.num = (config.share.num === 0 || typeof config.share.num === 'undefined' ? 1 : config.share.num);
|
|
|
+ if (!config['share'].hasOwnProperty("time")) {
|
|
|
+ config.share.time = startTime;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info("! 今日尚未分享");
|
|
|
+ config.share.num = 0;
|
|
|
+ }
|
|
|
+ if (body.data.coins === 50){
|
|
|
+ magicJS.logger.info("- 今日已投币")
|
|
|
+ if (!config['coins'].hasOwnProperty("time")) {
|
|
|
+ config.coins.time = startTime;
|
|
|
+ } else {
|
|
|
+ if (format(new Date().toDateString()) > config.coins.time) {
|
|
|
+ config.coins.time = startTime;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if ((body.data.coins / 10) >= real_times) {
|
|
|
+ config.coins.time = startTime;
|
|
|
+ magicJS.logger.info("- 已完成用户设置的投币量");
|
|
|
+ } else if (config.user.money <= 5) {
|
|
|
+ magicJS.logger.info("! 硬币数不足");
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info("! 今日投币未完成");
|
|
|
+ }
|
|
|
+ config.coins.num = body.data.coins;
|
|
|
+ magicJS.data.write("bilibili_daily_bonus", magicJS.toStr(config));
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info("- 查询失败");
|
|
|
+ magicJS.logger.info("- 失败原因 " + body?.message);;
|
|
|
+ }
|
|
|
+ } catch (e) {
|
|
|
+ magicJS.logger.error(e);
|
|
|
+ }
|
|
|
+ resolve();
|
|
|
+ }).catch(err => {
|
|
|
+ const msg = `检查任务进行状况异常\n${JSON.stringify(err)}`;
|
|
|
+ magicJS.logger.error(msg);
|
|
|
+ reject();
|
|
|
+ });
|
|
|
+ });
|
|
|
// }
|
|
|
|
|
|
// async function dynamic() {
|
shawenguan