From d165538e74031752bfc6cced53614f6c6b05468b Mon Sep 17 00:00:00 2001 From: wesl Date: Mon, 29 Apr 2024 23:07:56 +0800 Subject: [PATCH] =?UTF-8?q?240429-=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E5=90=8E=E7=BD=91=E7=9B=98?= =?UTF-8?q?=E5=AE=B9=E9=87=8F=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/run.yml | 77 ++- accounts.js | 43 +- src/app.js | 593 ++++++++++++++-------- serverChan.js => src/push/serverChan.js | 0 telegramBot.js => src/push/telegramBot.js | 0 wecomBot.js => src/push/wecomBot.js | 0 src/push/wxPusher.js | 5 + wxPusher.js | 4 - 8 files changed, 448 insertions(+), 274 deletions(-) rename serverChan.js => src/push/serverChan.js (100%) rename telegramBot.js => src/push/telegramBot.js (100%) rename wecomBot.js => src/push/wecomBot.js (100%) create mode 100644 src/push/wxPusher.js delete mode 100644 wxPusher.js diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 0c22b6ded..2fe176bf9 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -12,44 +12,39 @@ jobs: runs-on: ubuntu-latest environment: user steps: - - uses: actions/checkout@v3 - - name: Setup Node.js environment - uses: actions/setup-node@v3 - with: - node-version: 14 - - name: init - run: npm install - - name: run - id: run - uses: nick-fields/retry@v2 - env: - TY_USER_NAME: ${{secrets.TY_USER_NAME}} - TY_PASSWORD: ${{secrets.TY_PASSWORD}} - TY_FAMILY_ID: ${{secrets.TY_FAMILY_ID}} - TY_USER_NAME1: ${{secrets.TY_USER_NAME1}} - TY_PASSWORD1: ${{secrets.TY_PASSWORD1}} - TY_FAMILY_ID1: ${{secrets.TY_FAMILY_ID1}} - TY_USER_NAME2: ${{secrets.TY_USER_NAME2}} - TY_PASSWORD2: ${{secrets.TY_PASSWORD2}} - TY_FAMILY_ID2: ${{secrets.TY_FAMILY_ID2}} - TY_USER_NAME3: ${{secrets.TY_USER_NAME3}} - TY_PASSWORD3: ${{secrets.TY_PASSWORD3}} - TY_FAMILY_ID3: ${{secrets.TY_FAMILY_ID3}} - TY_USER_NAME4: ${{secrets.TY_USER_NAME4}} - TY_PASSWORD4: ${{secrets.TY_PASSWORD4}} - TY_FAMILY_ID4: ${{secrets.TY_FAMILY_ID4}} - # Server - SENDKEY: ${{secrets.SENDKEY}} - # Telegram - TELEGRAM_BOT_TOKEN: ${{secrets.TELEGRAM_BOT_TOKEN}} - TELEGRAM_CHAT_ID: ${{secrets.TELEGRAM_CHAT_ID}} - # WecomBot - WECOM_BOT_KEY: ${{secrets.WECOM_BOT_KEY}} - WECOM_BOT_TELPHONE: ${{secrets.WECOM_BOT_TELPHONE}} - # WxPusher - WX_PUSHER_APP_TOKEN : ${{secrets.WX_PUSHER_APP_TOKEN}} - WX_PUSHER_UID: ${{secrets.WX_PUSHER_UID}} - with: - timeout_minutes: 10 - max_attempts: 3 - command: npm start \ No newline at end of file + - uses: actions/checkout@v3 + - name: Setup Node.js environment + uses: actions/setup-node@v3 + with: + node-version: 14 + - name: init + run: npm install + - name: run + id: run + uses: nick-fields/retry@v2 + env: + TY_USER_NAME: ${{secrets.TY_USER_NAME}} + TY_PASSWORD: ${{secrets.TY_PASSWORD}} + TY_USER_NAME1: ${{secrets.TY_USER_NAME1}} + TY_PASSWORD1: ${{secrets.TY_PASSWORD1}} + TY_USER_NAME2: ${{secrets.TY_USER_NAME2}} + TY_PASSWORD2: ${{secrets.TY_PASSWORD2}} + TY_USER_NAME3: ${{secrets.TY_USER_NAME3}} + TY_PASSWORD3: ${{secrets.TY_PASSWORD3}} + TY_USER_NAME4: ${{secrets.TY_USER_NAME4}} + TY_PASSWORD4: ${{secrets.TY_PASSWORD4}} + # Server + SENDKEY: ${{secrets.SENDKEY}} + # Telegram + TELEGRAM_BOT_TOKEN: ${{secrets.TELEGRAM_BOT_TOKEN}} + TELEGRAM_CHAT_ID: ${{secrets.TELEGRAM_CHAT_ID}} + # WecomBot + WECOM_BOT_KEY: ${{secrets.WECOM_BOT_KEY}} + WECOM_BOT_TELPHONE: ${{secrets.WECOM_BOT_TELPHONE}} + # WxPusher + WX_PUSHER_APP_TOKEN: ${{secrets.WX_PUSHER_APP_TOKEN}} + WX_PUSHER_UID: ${{secrets.WX_PUSHER_UID}} + with: + timeout_minutes: 10 + max_attempts: 3 + command: npm start diff --git a/accounts.js b/accounts.js index e8047f335..fc834cdc5 100644 --- a/accounts.js +++ b/accounts.js @@ -1,21 +1,22 @@ -module.exports = [{ - userName: process.env.TY_USER_NAME || 'userName', - password: process.env.TY_PASSWORD || 'password', - familyId: process.env.TY_FAMILY_ID -}, { - userName: process.env.TY_USER_NAME1, - password: process.env.TY_PASSWORD1, - familyId: process.env.TY_FAMILY_ID1 -}, { - userName: process.env.TY_USER_NAME2, - password: process.env.TY_PASSWORD2, - familyId: process.env.TY_FAMILY_ID2 -}, { - userName: process.env.TY_USER_NAME3, - password: process.env.TY_PASSWORD3, - familyId: process.env.TY_FAMILY_ID3 -}, { - userName: process.env.TY_USER_NAME4, - password: process.env.TY_PASSWORD4, - familyId: process.env.TY_FAMILY_ID4 -}]; +module.exports = [ + { + userName: process.env.TY_USER_NAME || "userName", + password: process.env.TY_PASSWORD || "password", + }, + { + userName: process.env.TY_USER_NAME1, + password: process.env.TY_PASSWORD1, + }, + { + userName: process.env.TY_USER_NAME2, + password: process.env.TY_PASSWORD2, + }, + { + userName: process.env.TY_USER_NAME3, + password: process.env.TY_PASSWORD3, + }, + { + userName: process.env.TY_USER_NAME4, + password: process.env.TY_PASSWORD4, + }, +]; diff --git a/src/app.js b/src/app.js index 97ea4e29b..5cc454bfc 100644 --- a/src/app.js +++ b/src/app.js @@ -1,201 +1,224 @@ /* eslint-disable no-await-in-loop */ -const url = require('url'); -const log4js = require('log4js'); -const recording = require('log4js/lib/appenders/recording'); +const url = require("url"); +const log4js = require("log4js"); +const recording = require("log4js/lib/appenders/recording"); log4js.configure({ appenders: { vcr: { - type: 'recording', + type: "recording", }, out: { - type: 'console', + type: "console", }, }, - categories: { default: { appenders: ['vcr', 'out'], level: 'info' } }, + categories: { default: { appenders: ["vcr", "out"], level: "info" } }, }); const logger = log4js.getLogger(); -const JSEncrypt = require('node-jsencrypt'); +const JSEncrypt = require("node-jsencrypt"); // process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0' -const superagent = require('superagent'); -const config = require('../config'); -const accounts = require('../accounts'); -const serverChan = require('../serverChan'); -const telegramBot = require('../telegramBot'); -const wecomBot = require('../wecomBot'); -const wxpush = require('../wxPusher') +const superagent = require("superagent"); +const crypto = require("crypto"); +const serverChan = require("./push/serverChan"); +const telegramBot = require("./push/telegramBot"); +const wecomBot = require("./push/wecomBot"); +const wxpush = require("./push/wxPusher"); +const accounts = require("../accounts"); +const config = require("../config"); const client = superagent.agent(); const headers = { - 'User-Agent': `Mozilla/5.0 (Linux; U; Android 11; ${config.model} Build/RP1A.201005.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36 Ecloud/${config.version} Android/30 clientId/${config.clientId} clientModel/${config.model} clientChannelId/qq proVersion/1.0.6`, - Referer: 'https://m.cloud.189.cn/zhuanti/2016/sign/index.jsp?albumBackupOpened=1', - 'Accept-Encoding': 'gzip, deflate', - Host: 'cloud.189.cn', + "User-Agent": `Mozilla/5.0 (Linux; U; Android 11; ${config.model} Build/RP1A.201005.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36 Ecloud/${config.version} Android/30 clientId/${config.clientId} clientModel/${config.model} clientChannelId/qq proVersion/1.0.6`, + Referer: + "https://m.cloud.189.cn/zhuanti/2016/sign/index.jsp?albumBackupOpened=1", + "Accept-Encoding": "gzip, deflate", + Host: "cloud.189.cn", }; -const getEncrypt = () => new Promise((resolve, reject) => { - if (config.pubKey) { - resolve(config.pubKey); - return; - } - superagent.post('https://open.e.189.cn/api/logbox/config/encryptConf.do') - .send('appId=cloud') - .end((err, res) => { - if (err) { - reject(err); - return; - } - const json = JSON.parse(res.text); - if (json.result === 0) { - resolve(json.data.pubKey); - } else { - reject(json.data); - } - }); -}); +const getEncrypt = () => + new Promise((resolve, reject) => { + if (config.pubKey) { + resolve(config.pubKey); + return; + } + superagent + .post("https://open.e.189.cn/api/logbox/config/encryptConf.do") + .send("appId=cloud") + .end((err, res) => { + if (err) { + reject(err); + return; + } + const json = JSON.parse(res.text); + if (json.result === 0) { + resolve(json.data.pubKey); + } else { + reject(json.data); + } + }); + }); -const redirectURL = () => new Promise((resolve, reject) => { - superagent.get('https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https://cloud.189.cn/web/redirect.html?returnURL=/main.action') - .end((err, res) => { - if (err) { +const redirectURL = () => + new Promise((resolve, reject) => { + superagent + .get( + "https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https://cloud.189.cn/web/redirect.html?returnURL=/main.action" + ) + .end((err, res) => { + if (err) { + reject(err); + return; + } + const { query } = url.parse(res.redirects[1], true); + resolve(query); + }); + }); + +const getLoginFormData = (username, password, encryptKey) => + new Promise((resolve, reject) => { + redirectURL() + .then((query) => { + superagent + .post("https://open.e.189.cn/api/logbox/oauth2/appConf.do") + .set({ + "User-Agent": + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0", + Referer: "https://open.e.189.cn/", + lt: query.lt, + REQID: query.reqId, + }) + .type("form") + .send({ + version: "2.0", + appKey: "cloud", + }) + .end((err, res) => { + if (err) { + reject(err); + return; + } + const resData = JSON.parse(res.text); + if (resData.result === "0") { + const keyData = `-----BEGIN PUBLIC KEY-----\n${encryptKey}\n-----END PUBLIC KEY-----`; + const jsencrypt = new JSEncrypt(); + jsencrypt.setPublicKey(keyData); + const usernameEncrypt = Buffer.from( + jsencrypt.encrypt(username), + "base64" + ).toString("hex"); + const passwordEncrypt = Buffer.from( + jsencrypt.encrypt(password), + "base64" + ).toString("hex"); + const formData = { + returnUrl: resData.data.returnUrl, + paramId: resData.data.paramId, + lt: query.lt, + REQID: query.reqId, + userName: `{NRP}${usernameEncrypt}`, + password: `{NRP}${passwordEncrypt}`, + }; + resolve(formData); + } else { + reject(new Error(resData.msg)); + } + }); + }) + .catch((err) => { reject(err); - return; - } - const { query } = url.parse(res.redirects[1], true); - resolve(query); - }); -}); + }); + }); -const getLoginFormData = (username, password, encryptKey) => new Promise((resolve, reject) => { - redirectURL().then((query) => { - superagent.post('https://open.e.189.cn/api/logbox/oauth2/appConf.do') +const login = (formData) => + new Promise((resolve, reject) => { + const data = { + appKey: "cloud", + version: "2.0", + accountType: "01", + mailSuffix: "@189.cn", + validateCode: "", + returnUrl: formData.returnUrl, + paramId: formData.paramId, + captchaToken: "", + dynamicCheck: "FALSE", + clientType: "1", + cb_SaveName: "0", + isOauth2: false, + userName: formData.userName, + password: formData.password, + }; + superagent + .post("https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do") .set({ - 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0', - Referer: 'https://open.e.189.cn/', - lt: query.lt, - REQID: query.reqId, - }) - .type('form') - .send({ - version: '2.0', - appKey: 'cloud', + "User-Agent": + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0", + Referer: "https://open.e.189.cn/", + lt: formData.lt, + REQID: formData.REQID, }) + .type("form") + .send(data) .end((err, res) => { if (err) { reject(err); return; } - const resData = JSON.parse(res.text); - if (resData.result === '0') { - const keyData = `-----BEGIN PUBLIC KEY-----\n${encryptKey}\n-----END PUBLIC KEY-----`; - const jsencrypt = new JSEncrypt(); - jsencrypt.setPublicKey(keyData); - const usernameEncrypt = Buffer.from(jsencrypt.encrypt(username), 'base64').toString('hex'); - const passwordEncrypt = Buffer.from(jsencrypt.encrypt(password), 'base64').toString('hex'); - const formData = { - returnUrl: resData.data.returnUrl, - paramId: resData.data.paramId, - lt: query.lt, - REQID: query.reqId, - userName: `{NRP}${usernameEncrypt}`, - password: `{NRP}${passwordEncrypt}`, - }; - resolve(formData); - } else { - reject(new Error(resData.msg)); + const json = JSON.parse(res.text); + if (json.result !== 0) { + reject(json.msg); + return; } + client + .get(json.toUrl) + .set(headers) + .end((e, r) => { + if (e) { + reject(e); + return; + } + resolve(r.statusCode); + }); }); - }).catch((err) => { - reject(err); }); -}); -const login = (formData) => new Promise((resolve, reject) => { - const data = { - appKey: 'cloud', - version: '2.0', - accountType: '01', - mailSuffix: '@189.cn', - validateCode: '', - returnUrl: formData.returnUrl, - paramId: formData.paramId, - captchaToken: '', - dynamicCheck: 'FALSE', - clientType: '1', - cb_SaveName: '0', - isOauth2: false, - userName: formData.userName, - password: formData.password, - }; - superagent.post('https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do') - .set({ - 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0', - Referer: 'https://open.e.189.cn/', - lt: formData.lt, - REQID: formData.REQID, - }) - .type('form') - .send(data) - .end((err, res) => { - if (err) { - reject(err); - return; - } - const json = JSON.parse(res.text); - if (json.result !== 0) { - reject(json.msg); - return; - } - client.get(json.toUrl) - .set(headers) - .end((e, r) => { - if (e) { - reject(e); - return; - } - resolve(r.statusCode); - }); - }); -}); - -const doGet = (taskUrl) => new Promise((resolve, reject) => { - const q = url.parse(taskUrl, true); - client.get(taskUrl) - .set({ - ...headers, - Host: q.host, - }) - .end((err, res) => { - if (err) { - reject(err); - return; - } - resolve(JSON.parse(res.text)); - }); -}); +const doGet = (taskUrl) => + new Promise((resolve, reject) => { + const q = url.parse(taskUrl, true); + client + .get(taskUrl) + .set({ + ...headers, + Host: q.host, + }) + .then((res) => resolve(res.body)) + .catch((err) => reject(err)); + }); -const mask = (s, start, end) => s.split('').fill('*', start, end).join(''); +const mask = (s, start, end) => s.split("").fill("*", start, end).join(""); // 登录流程 1.获取公钥 -> 2.获取登录参数 -> 3.获取登录地址,跳转到登录页 -const doLogin = (userName, password) => new Promise((resolve, reject) => { - getEncrypt() - .then((encryptKey) => getLoginFormData(userName, password, encryptKey)) - .then((formData) => login(formData)) - .then(() => resolve('登录成功')) - .catch((error) => { - logger.error(`登录失败:${JSON.stringify(error)}`); - reject(error); - }); -}); +const doLogin = (userName, password) => + new Promise((resolve, reject) => { + getEncrypt() + .then((encryptKey) => getLoginFormData(userName, password, encryptKey)) + .then((formData) => login(formData)) + .then(() => resolve("登录成功")) + .catch((error) => { + logger.error(`登录失败:${JSON.stringify(error)}`); + reject(error); + }); + }); // 任务 1.签到 2.天天抽红包 3.自动备份抽红包 -const doTask = async (familyId) => { +const doTask = async () => { const tasks = [ - `https://cloud.189.cn/mkt/userSign.action?rand=${new Date().getTime()}&clientType=TELEANDROID&version=${config.version}&model=${config.model}`, - 'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN&activityId=ACT_SIGNIN', - 'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN_PHOTOS&activityId=ACT_SIGNIN', - 'https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_2022_FLDFS_KJ&activityId=ACT_SIGNIN' + `https://cloud.189.cn/mkt/userSign.action?rand=${new Date().getTime()}&clientType=TELEANDROID&version=${ + config.version + }&model=${config.model}`, + "https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN&activityId=ACT_SIGNIN", + "https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN_PHOTOS&activityId=ACT_SIGNIN", + "https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_2022_FLDFS_KJ&activityId=ACT_SIGNIN", ]; const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); @@ -205,30 +228,156 @@ const doTask = async (familyId) => { const res = await doGet(task); if (index === 0) { // 签到 - result.push(`${res.isSign ? '已经签到过了，' : ''}签到获得${res.netdiskBonus}M空间`); - } else if (res.errorCode === 'User_Not_Chance') { + result.push( + `${res.isSign ? "已经签到过了，" : ""}签到获得${res.netdiskBonus}M空间` + ); + } else if (res.errorCode === "User_Not_Chance") { result.push(`第${index}次抽奖失败,次数不足`); } else { result.push(`第${index}次抽奖成功,抽奖获得${res.prizeName}`); } await delay(5000); // 延迟5秒 } - if(familyId){ - const url = `http://api.cloud.189.cn/family/manage/exeFamilyUserSign.action?familyId=${familyId}` - const res = await doGet(url); - logger.error(res) + return result; +}; + +const getUserBriefInfo = () => + new Promise((resolve, reject) => { + client + .get("https://cloud.189.cn/api/portal/v2/getUserBriefInfo.action") + .then((res) => resolve(res.body)) + .catch((err) => reject(err)); + }); + +const parameter = (data) => { + if (!data) { + return {}; + } + const e = Object.entries(data).map((t) => t.join("=")); + e.sort((a, b) => (a > b ? 1 : a < b ? -1 : 0)); + return e.join("&"); +}; + +const getSignature = (data) => { + const sig = parameter(data); + return crypto.createHash("md5").update(sig).digest("hex"); +}; + +const getAccessTokenBySsKey = (sessionKey) => + new Promise((resolve, reject) => { + const appkey = "600100422"; + const time = String(Date.now()); + + const signature = getSignature({ + sessionKey, + Timestamp: time, + AppKey: appkey, + }); + + client + .get( + `https://cloud.189.cn/api/open/oauth2/getAccessTokenBySsKey.action?sessionKey=${sessionKey}` + ) + .set({ + "Sign-Type": "1", + Signature: signature, + Timestamp: time, + Appkey: appkey, + }) + .end((err, res) => { + if (err) { + reject(err); + return; + } + resolve(JSON.parse(res.text)); + }); + }); + +const getFamilyList = (accessToken) => + new Promise((resolve, reject) => { + const time = String(Date.now()); + const signature = getSignature({ + Timestamp: time, + AccessToken: accessToken, + }); + client + .get("https://api.cloud.189.cn/open/family/manage/getFamilyList.action") + .set({ + "Sign-Type": "1", + Signature: signature, + Timestamp: time, + Accesstoken: accessToken, + Accept: "application/json;charset=UTF-8", + }) + .then((res) => resolve(res.body)) + .catch((err) => reject(err)); + }); + +const familyUserSign = (familyId, accessToken) => + new Promise((resolve, reject) => { + const time = String(Date.now()); + const data = { + familyId, + }; + const signature = getSignature({ + ...data, + Timestamp: time, + AccessToken: accessToken, + }); + const gturl = `https://api.cloud.189.cn/open/family/manage/exeFamilyUserSign.action?familyId=${familyId}`; + client + .get(gturl) + .set({ + "Sign-Type": "1", + Signature: signature, + Timestamp: time, + Accesstoken: accessToken, + Accept: "application/json;charset=UTF-8", + }) + .then((res) => resolve(res.body)) + .catch((err) => reject(err)); + }); + +const doFamilyTask = async () => { + const { sessionKey } = await getUserBriefInfo(); + const { accessToken } = await getAccessTokenBySsKey(sessionKey); + const { familyInfoResp } = await getFamilyList(accessToken); + const result = []; + if (familyInfoResp) { + for (let index = 0; index < familyInfoResp.length; index += 1) { + const { familyId } = familyInfoResp[index]; + const res = await familyUserSign(familyId, accessToken); + result.push( + "家庭任务" + + `${res.signStatus ? "已经签到过了，" : ""}签到获得${ + res.bonusSpace + }M空间` + ); + } } return result; }; +const getUserSizeInfo = () => + new Promise((resolve, reject) => { + client + .get("https://cloud.189.cn/api/portal/getUserSizeInfo.action") + .set({ Accept: "application/json;charset=UTF-8" }) + .then((res) => resolve(res.body)) + .catch((err) => reject(err)); + }); + const pushServerChan = (title, desp) => { - if (!serverChan.sendKey) { return; } + if (!serverChan.sendKey) { + return; + } const data = { title, desp, }; - superagent.post(`https://sctapi.ftqq.com/${serverChan.sendKey}.send`) - .type('form') + superagent + .post(`https://sctapi.ftqq.com/${serverChan.sendKey}.send`) + .type("form") .send(data) .end((err, res) => { if (err) { @@ -239,19 +388,22 @@ const pushServerChan = (title, desp) => { if (json.code !== 0) { logger.error(`ServerChan推送失败:${JSON.stringify(json)}`); } else { - logger.info('ServerChan推送成功'); + logger.info("ServerChan推送成功"); } }); }; const pushTelegramBot = (title, desp) => { - if (!(telegramBot.botToken && telegramBot.chatId)) { return; } + if (!(telegramBot.botToken && telegramBot.chatId)) { + return; + } const data = { chat_id: telegramBot.chatId, - text: title + "\n\n" + desp, + text: `${title}\n\n${desp}`, }; - superagent.post(`https://api.telegram.org/bot${telegramBot.botToken}/sendMessage`) - .type('form') + superagent + .post(`https://api.telegram.org/bot${telegramBot.botToken}/sendMessage`) + .type("form") .send(data) .end((err, res) => { if (err) { @@ -262,21 +414,26 @@ const pushTelegramBot = (title, desp) => { if (!json.ok) { logger.error(`TelegramBot推送失败:${JSON.stringify(json)}`); } else { - logger.info('TelegramBot推送成功'); + logger.info("TelegramBot推送成功"); } }); }; const pushWecomBot = (title, desp) => { - if (!(wecomBot.key && wecomBot.telphone)) { return; } + if (!(wecomBot.key && wecomBot.telphone)) { + return; + } const data = { msgtype: "text", text: { - content: title + "\n\n" + desp, - mentioned_mobile_list: [wecomBot.telphone] - } + content: `${title}\n\n${desp}`, + mentioned_mobile_list: [wecomBot.telphone], + }, }; - superagent.post(`https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${wecomBot.key}`) + superagent + .post( + `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${wecomBot.key}` + ) .send(data) .end((err, res) => { if (err) { @@ -287,58 +444,78 @@ const pushWecomBot = (title, desp) => { if (json.errcode) { logger.error(`wecomBot推送失败:${JSON.stringify(json)}`); } else { - logger.info('wecomBot推送成功'); + logger.info("wecomBot推送成功"); } }); }; const pushWxPusher = (title, desp) => { - if (!(wxpush.appToken && wxpush.uid)) { return; } + if (!(wxpush.appToken && wxpush.uid)) { + return; + } const data = { appToken: wxpush.appToken, - contentType:1, - summary:title, - content:desp, - uids:[wxpush.uid] + contentType: 1, + summary: title, + content: desp, + uids: [wxpush.uid], }; - superagent.post(`https://wxpusher.zjiecode.com/api/send/message`) - .send(data) - .end((err, res) => { - if (err) { - logger.error(`wxPusher推送失败:${JSON.stringify(err)}`); - return; - } - const json = JSON.parse(res.text); - if (json.data[0].code !==1000) { - logger.error(`wxPusher推送失败:${JSON.stringify(json)}`); - } else { - logger.info('wxPusher推送成功'); - } - }); -} + superagent + .post("https://wxpusher.zjiecode.com/api/send/message") + .send(data) + .end((err, res) => { + if (err) { + logger.error(`wxPusher推送失败:${JSON.stringify(err)}`); + return; + } + const json = JSON.parse(res.text); + if (json.data[0].code !== 1000) { + logger.error(`wxPusher推送失败:${JSON.stringify(json)}`); + } else { + logger.info("wxPusher推送成功"); + } + }); +}; const push = (title, desp) => { pushServerChan(title, desp); pushTelegramBot(title, desp); pushWecomBot(title, desp); pushWxPusher(title, desp); -} +}; // 开始执行程序 async function main() { for (let index = 0; index < accounts.length; index += 1) { const account = accounts[index]; - const { userName, password, familyId } = account; + const { userName, password } = account; if (userName && password) { const userNameInfo = mask(userName, 3, 7); try { logger.log(`账户 ${userNameInfo}开始执行`); await doLogin(userName, password); - const result = await doTask(familyId); + const result = await doTask(); result.forEach((r) => logger.log(r)); - logger.log('任务执行完毕'); + const familyResult = await doFamilyTask(); + familyResult.forEach((r) => logger.log(r)); + logger.log("任务执行完毕"); + const { cloudCapacityInfo, familyCapacityInfo } = + await getUserSizeInfo(); + logger.log( + `个人总容量：${( + cloudCapacityInfo.totalSize / + 1024 / + 1024 / + 1024 + ).toFixed(2)}G,家庭总容量：${( + familyCapacityInfo.totalSize / + 1024 / + 1024 / + 1024 + ).toFixed(2)}G` + ); } catch (e) { - if (e.code === 'ECONNRESET') { + if (e.code === "ECONNRESET") { throw e; } } finally { @@ -353,8 +530,8 @@ async function main() { await main(); } finally { const events = recording.replay(); - const content = events.map((e) => `${e.data.join('')}`).join(' \n'); - push('天翼云盘自动签到任务', content); + const content = events.map((e) => `${e.data.join("")}`).join(" \n"); + push("天翼云盘自动签到任务", content); recording.erase(); } })(); diff --git a/serverChan.js b/src/push/serverChan.js similarity index 100% rename from serverChan.js rename to src/push/serverChan.js diff --git a/telegramBot.js b/src/push/telegramBot.js similarity index 100% rename from telegramBot.js rename to src/push/telegramBot.js diff --git a/wecomBot.js b/src/push/wecomBot.js similarity index 100% rename from wecomBot.js rename to src/push/wecomBot.js diff --git a/src/push/wxPusher.js b/src/push/wxPusher.js new file mode 100644 index 000000000..9ae928b29 --- /dev/null +++ b/src/push/wxPusher.js @@ -0,0 +1,5 @@ +module.exports = { + appToken: + process.env.WX_PUSHER_APP_TOKEN || "AT_OzwCik0QP4p4AQlKdO4jbgjWApTiWsJr", + uid: process.env.WX_PUSHER_UID || "", +}; diff --git a/wxPusher.js b/wxPusher.js deleted file mode 100644 index 31a3fbc2e..000000000 --- a/wxPusher.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - appToken: process.env.WX_PUSHER_APP_TOKEN || 'AT_OzwCik0QP4p4AQlKdO4jbgjWApTiWsJr', - uid: process.env.WX_PUSHER_UID||'' - }; \ No newline at end of file