diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..8cad4e7 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,149 @@ +{ + "name": "genshincloudgamehelpper", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "genshincloudgamehelpper", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "axios": "^1.5.0", + "nodemailer": "^6.7.6", + "reggol": "^1.4.4" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.5.0", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.5.0.tgz", + "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/cosmokit": { + "version": "1.4.5", + "resolved": "https://registry.npmmirror.com/cosmokit/-/cosmokit-1.4.5.tgz", + "integrity": "sha512-hu/c4LP9SWqdxC+VWBCPKW+vb78kh8TMEwERb1irCNKyiPQUGJDT1Hu8GrUM3X9Gd0HvQpbzGkEpGWFxFXREgQ==" + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/nodemailer": { + "version": "6.9.4", + "resolved": "https://registry.npmmirror.com/nodemailer/-/nodemailer-6.9.4.tgz", + "integrity": "sha512-CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, + "node_modules/reggol": { + "version": "1.4.4", + "resolved": "https://registry.npmmirror.com/reggol/-/reggol-1.4.4.tgz", + "integrity": "sha512-gbiFjh2o6rF+ZkDNCuv72qVKuEUdJSLzjxEZt56vpOMCO7erF2k6eyI84roe/i41R6f5N9HKLs8M7yy4bsqEWQ==", + "dependencies": { + "cosmokit": "^1.4.2", + "object-inspect": "^1.12.3", + "supports-color": "^8.1.1" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + } + } +} diff --git a/src/config.js b/src/config.js index efcb49f..3ebed09 100644 --- a/src/config.js +++ b/src/config.js @@ -4,19 +4,26 @@ const nodemailer = require('nodemailer') const { default: axios } = require("axios") const { log } = require("./logger") -exports.NotificationURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/listNotifications?is_sort=true&source=NotificationSourceUnknown&status=NotificationStatusUnread&type=NotificationTypePopup' +exports.ListNotificationURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/listNotifications?is_sort=true&source=NotificationSourceUnknown&status=NotificationStatusUnread&type=NotificationTypePopup' +exports.AckNotificationURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/ackNotification' exports.WalletURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/wallet/wallet/get?cost_method=COST_METHOD_UNSPECIFIED' exports.AnnouncementURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/getAnnouncementInfo' // Here must be an earlier version so that the response won't be null exports.AppVersionURL = 'https://api-takumi.mihoyo.com/ptolemaios/api/getLatestRelease?app_id=1953443910&app_version=3.8.0&channel=mihoyo' -exports.Notification = async function(header) { - let tmp = (await axios(exports.NotificationURL,{ +exports.ListNotification = async function(header) { + let tmp = (await axios(exports.ListNotificationURL,{ headers:header })).data; tmp.StringVersion = JSON.stringify(tmp); return tmp; } +exports.AckNotification = async function(header, id) { + let data = `{"id":"${id}"}`; + await axios.post(exports.AckNotificationURL, data,{ + headers:header + }); +} exports.Wallet = async function(header) { let tmp = (await axios(exports.WalletURL,{ headers:header diff --git a/src/index.js b/src/index.js index c013f61..3f7329d 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ const fs = require("fs") const reggol = require("reggol") -const { getConfigs, checkConfigs, makeHeader, Notification, Wallet, SendLog, AppVersion, getGlobalConfig } = require("./config") +const { getConfigs, checkConfigs, makeHeader, ListNotification, AckNotification, Wallet, SendLog, AppVersion, getGlobalConfig } = require("./config") const urlconfig = require("./config") const { log, addLogContent, getLogs } = require("./logger"); @@ -39,21 +39,23 @@ const nodemailer = require("nodemailer"); totalNum ++; log.info(`正在执行配置 ${key}`) log.info("尝试签到……") - var WalletRespond = await Wallet(makeHeader(configs[key]),appversion); + var header = makeHeader(configs[key], appversion); + var WalletRespond = await Wallet(header); addLogContent(`${key} Wallet返回体
${JSON.stringify(WalletRespond)}

`); - var NotificationRespond = await Notification(makeHeader(configs[key])); + var NotificationRespond = await ListNotification(header); addLogContent(`${key} Notification返回体
${JSON.stringify(NotificationRespond)}

`); if(WalletRespond.data != null) { - if(WalletRespond.data.free_time.free_time != undefined) { - successNum ++; - log.info(`签到完毕! 剩余时长:${WalletRespond.data.free_time.free_time}分钟`) - let NotificationLength = NotificationRespond.data.list.length - if(NotificationLength != 0) { - log.info(`已堆积 ${NotificationLength} 个签到通知 请及时处理!`) - } - } else { - log.error("签到失败") - } + successNum ++; + log.info(`签到完毕! 剩余时长:${WalletRespond.data.free_time.free_time}分钟`) + let NotificationLength = NotificationRespond.data.list.length + let postHeader = header; + Object.assign(postHeader, { + "Content-Length": 28, + "Content-Type": "application/json", + }); + for (var i = 0; i < NotificationLength; i++) { + AckNotification(postHeader, NotificationRespond.data.list[i].id); + } } else { log.error("签到失败") }