feat: MT api 变更 #58

vertex-app · Jun 21, 2024 · eb0b2ed · eb0b2ed
1 parent c85d32c
commit eb0b2ed
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 83 deletions.
diff --git a/app/common/Site.js b/app/common/Site.js
@@ -50,13 +50,14 @@ class Site {
     };
   }
 
-  async _getDocument (url, origin = false, expire = 300, retCookies = false) {
+  async _getDocument (url, origin = false, expire = 300, retCookies = false, headers) {
     const cache = await redis.get(`vertex:document:body:${url}`);
     if (!cache) {
       const res = (await util.requestPromise({
         url: url,
         headers: {
-          cookie: this.cookie
+          cookie: this.cookie,
+          ...headers
         }
       }));
       if (origin) return res.body;

diff --git a/app/libs/rss.js b/app/libs/rss.js
@@ -53,10 +53,7 @@ const _getRssContent = async function (rssUrl, suffix = true) {
 const _getTorrents = async function (rssUrl) {
   const rss = await parseXml(await _getRssContent(rssUrl));
   const torrents = [];
-  let items = rss.rss.channel[0].item;
-  if (['chdbits', 'totheglory'].some(item => rssUrl.indexOf(item) !== -1)) {
-    items = items.slice(0, 5);
-  }
+  const items = rss.rss.channel[0].item;
   for (let i = 0; i < items.length; ++i) {
     const torrent = {
       size: 0,

diff --git a/app/libs/scrape.js b/app/libs/scrape.js
@@ -35,7 +35,7 @@ const _freeMTeam = async function (url, cookie) {
   const tid = url.match(/\/(\d+)/)[1];
   // const host = new URL(url).host;
   const { body } = await util.requestPromise({
-    url: 'https://kp.m-team.cc/api/torrent/detail',
+    url: 'https://api.m-team.cc/api/torrent/detail',
     method: 'POST',
     headers: {
       'x-api-key': cookie

diff --git a/app/libs/site/Audiences.js b/app/libs/site/Audiences.js
@@ -27,7 +27,7 @@ class Site {
     // 下载
     info.leeching = +document.querySelector('img[class=arrowdown]').nextSibling.nodeValue.trim();
     // 做种体积
-    const seedingDocument = await this._getDocument(`${this.index}getusertorrentlistajax.php?userid=${info.uid}&type=seeding`, true);
+    const seedingDocument = await this._getDocument(`${this.index}getusertorrentlistajax.php?userid=${info.uid}&type=seeding`, true, 300, false, { referer: `https://audiences.me/userdetails.php?id=${info.uid}` });
     const seedingSize = (seedingDocument.match(/Total: (\d+\.\d+ [KMGTP]B)/) || [0, '0 B'])[1].replace(/([KMGTP])B/, '$1iB');
     info.seedingSize = util.calSize(...seedingSize.split(' '));
     return info;

diff --git a/app/libs/site/MTeam.js b/app/libs/site/MTeam.js
@@ -4,7 +4,7 @@ const moment = require('moment');
 const _api = async function (cookie, path, data, type = 'form') {
   if (type === 'form') {
     const { body } = await util.requestPromise({
-      url: `https://kp.m-team.cc${path}`,
+      url: `https://api.m-team.cc${path}`,
       method: 'POST',
       headers: {
         'x-api-key': cookie
@@ -16,7 +16,7 @@ const _api = async function (cookie, path, data, type = 'form') {
   }
   if (type === 'json') {
     const { body } = await util.requestPromise({
-      url: `https://kp.m-team.cc${path}`,
+      url: `https://api.m-team.cc${path}`,
       method: 'POST',
       headers: {
         'x-api-key': cookie
@@ -31,7 +31,6 @@ const _api = async function (cookie, path, data, type = 'form') {
 class Site {
   constructor () {
     this.name = 'MTeam';
-    this.downloadLink = 'https://kp.m-team.cc/download.php?id={ID}&https=1';
     this.url = 'https://kp.m-team.cc/';
     this.id = 3;
   };

diff --git a/app/model/SettingMod.js b/app/model/SettingMod.js
@@ -200,37 +200,6 @@ class SettingMod {
     });
   }
 
-  async loginMTeam (options) {
-    const { body } = await util.requestPromise({
-      url: 'https://kp.m-team.cc/index.php',
-      headers: {
-        cookie: options.cookie
-      }
-    }, false);
-    const username = body.match(/userdetails.*?<b>(.*)<\/b>/);
-    if (username) {
-      return '无需登录 ' + username[1] + ' 使用已有 Cookie 即可';
-    }
-    if (body.indexOf('M-Team') === -1) {
-      throw new Error('疑似遇到 5s 盾, 请手动获取 Cookie 并重试');
-    }
-    const { headers } = await util.requestPromise({
-      url: 'https://kp.m-team.cc/verify.php?returnto=%2F',
-      method: 'POST',
-      headers: {
-        cookie: options.cookie
-      },
-      formData: {
-        otp: options.otp
-      }
-    }, false);
-    if (headers.location === 'https://kp.m-team.cc/') {
-      return '登录成功';
-    } else {
-      throw new Error('登录失败, 请重试');
-    }
-  }
-
   async getTrackerFlowHistory () {
     const _timeGroup = await util.getRecords('select time from tracker_flow where time >= ? group by time', [moment().unix() - 24 * 3600]);
     const timeGroup = _timeGroup.map(i => i.time);

diff --git a/app/model/UserMod.js b/app/model/UserMod.js
@@ -167,10 +167,6 @@ class UserMod {
           title: '网络测试',
           path: '/tool/networkTest',
           icon: ['fas', 'square-check']
-        }, {
-          title: 'MTEAM 登录',
-          path: '/tool/mteamLogin',
-          icon: ['fas', 'arrow-right-to-bracket']
         }, {
           title: '修改 HOSTS',
           path: '/tool/hosts',

diff --git a/app/script/loginMTeam.js b/app/script/loginMTeam.js