rsshub 1.0.0-master.f7add90 → 1.0.0-master.f7bfacc

package/README.md

@@ -33,14 +33,6 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以
 
 ## Special Thanks
 
-### Special Sponsors
-
-<p>
-<a href="https://rss3.io/" target="_blank"><img height="50px" src="https://i.imgur.com/vHtI4bz.png"></a>
-</p>
-
-[![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/en/support/)
-
 ### Contributors
 
 [![](https://opencollective.com/RSSHub/contributors.svg?width=890)](https://github.com/DIYgod/RSSHub/graphs/contributors)

package/lib/app.js

@@ -13,6 +13,7 @@ const cache = require('./middleware/cache');
 const parameter = require('./middleware/parameter');
 const template = require('./middleware/template');
 const favicon = require('koa-favicon');
+const serve = require('koa-static');
 const debug = require('./middleware/debug');
 const accessControl = require('./middleware/access-control');
 const antiHotlink = require('./middleware/anti-hotlink');
@@ -37,6 +38,7 @@ app.proxy = true;
 
 // favicon
 app.use(favicon(__dirname + '/favicon.png'));
+app.use(serve(__dirname + '/static'));
 
 // global error handing
 app.use(onerror);

package/lib/config.js

@@ -9,6 +9,7 @@ const calculateValue = () => {
     const twitter_tokens = {};
     const email_config = {};
     const discuz_cookies = {};
+    const medium_cookies = {};
 
     for (const name in envs) {
         if (name.startsWith('BILIBILI_COOKIE_')) {
@@ -23,6 +24,9 @@ const calculateValue = () => {
         } else if (name.startsWith('DISCUZ_COOKIE_')) {
             const cid = name.slice(14);
             discuz_cookies[cid] = envs[name];
+        } else if (name.startsWith('MEDIUM_COOKIE_')) {
+            const username = name.slice(14).toLowerCase();
+            medium_cookies[username] = envs[name];
         }
     }
 
@@ -194,7 +198,8 @@ const calculateValue = () => {
             cookie: envs.IG_COOKIE,
         },
         iwara: {
-            cookie: envs.IWARA_COOKIE,
+            username: envs.IWARA_USERNAME,
+            password: envs.IWARA_PASSWORD,
         },
         lastfm: {
             api_key: envs.LASTFM_API_KEY,
@@ -207,6 +212,10 @@ const calculateValue = () => {
             accessToken: envs.MASTODON_API_ACCESS_TOKEN,
             acctDomain: envs.MASTODON_API_ACCT_DOMAIN,
         },
+        medium: {
+            cookies: medium_cookies,
+            articleCookie: envs.MEDIUM_ARTICLE_COOKIE || '',
+        },
         miniflux: {
             instance: envs.MINIFLUX_INSTANCE || 'https://reader.miniflux.app',
             token: envs.MINIFLUX_TOKEN || '',
@@ -225,6 +234,9 @@ const calculateValue = () => {
             username: envs.NHENTAI_USERNAME,
             password: envs.NHENTAI_PASSWORD,
         },
+        notion: {
+            key: envs.NOTION_TOKEN,
+        },
         pianyuan: {
             cookie: envs.PIANYUAN_COOKIE,
         },
@@ -244,6 +256,9 @@ const calculateValue = () => {
         saraba1st: {
             cookie: envs.SARABA1ST_COOKIE,
         },
+        sehuatang: {
+            cookie: envs.SEHUATANG_COOKIE,
+        },
         scboy: {
             token: envs.SCBOY_BBS_TOKEN,
         },
@@ -268,6 +283,7 @@ const calculateValue = () => {
         weibo: {
             app_key: envs.WEIBO_APP_KEY,
             app_secret: envs.WEIBO_APP_SECRET,
+            cookies: envs.WEIBO_COOKIES,
             redirect_url: envs.WEIBO_REDIRECT_URL,
         },
         wenku8: {

package/lib/middleware/cache/memory.js

@@ -1,9 +1,9 @@
-const Lru = require('lru-cache');
+const { LRUCache } = require('lru-cache');
 const config = require('@/config').value;
 
 const status = { available: false };
 
-const memoryCache = new Lru({
+const memoryCache = new LRUCache({
     ttl: config.cache.routeExpire * 1000,
     max: config.memory.max,
 });

package/lib/middleware/template.js

@@ -1,7 +1,7 @@
 const { art, json } = require('@/utils/render');
 const path = require('path');
 const config = require('@/config').value;
-const typeRegex = /\.(atom|rss|debug\.json|json)$/;
+const typeRegex = /\.(atom|rss|debug\.json|json|\d+\.debug\.html)$/;
 const { collapseWhitespace, convertDateToISO8601 } = require('@/utils/common-utils');
 
 module.exports = async (ctx, next) => {
@@ -26,6 +26,19 @@ module.exports = async (ctx, next) => {
             ctx.body = JSON.stringify({ message: 'plugin does not set debug json' });
         }
     }
+    if (outputType.endsWith('.debug.html') && config.debugInfo) {
+        ctx.set({
+            'Content-Type': 'text/html; charset=UTF-8',
+        });
+
+        const index = parseInt(outputType.match(/(\d+)\.debug\.html$/)[1]);
+        if (!(ctx.state.data && ctx.state.data.item && ctx.state.data.item[index])) {
+            ctx.body = `ctx.state.data.item[${index}] not found`;
+        } else {
+            ctx.body = ctx.state.data.item[index].description;
+        }
+    }
+
     if (outputType === 'json') {
         ctx.set({ 'Content-Type': 'application/feed+json; charset=UTF-8' });
     }

package/lib/radar-rules.js

@@ -789,82 +789,6 @@ module.exports = {
             },
         ],
     },
-    '141jav.com': {
-        _name: '141JAV BT',
-        '.': [
-            {
-                title: '今日种子',
-                docs: 'https://docs.rsshub.app/multimedia.html#141jav',
-                source: '/',
-                target: (params, url, document) => {
-                    const today = document.querySelector('div.card.mb-1.card-overview').getAttribute('data-date').replace(/-/g, '');
-                    return `/141jav/day/${today}`;
-                },
-            },
-            {
-                title: '今日演员',
-                docs: 'https://docs.rsshub.app/multimedia.html#141jav',
-                source: '/',
-                target: (params, url, document) => {
-                    const star = document.querySelector('div.card-content > div > a').getAttribute('href');
-                    return `/141jav${star}`;
-                },
-            },
-            {
-                title: '页面种子',
-                docs: 'https://docs.rsshub.app/multimedia.html#141jav',
-                source: ['/:type', '/:type/:key', '/:type/:key/:morekey'],
-                target: (params, url, document) => {
-                    const itype = params.morekey === undefined ? params.type : params.type === 'tag' ? 'tag' : 'day';
-                    let ikey = `${itype === 'day' ? params.type : ''}${params.key || ''}${itype === 'tag' && params.morekey !== undefined ? '%2F' : ''}${params.morekey || ''}`;
-                    if (ikey === '' && itype === 'tag') {
-                        ikey = document.querySelector('div.thumbnail.is-inline > a').getAttribute('href').replace('/tag/', '').replace('/', '%2F');
-                    } else if (ikey === '' && itype === 'actress') {
-                        ikey = document.querySelector('div.card > a').getAttribute('href').replace('/actress/', '');
-                    }
-                    return `/141jav/${itype}/${ikey}`;
-                },
-            },
-        ],
-    },
-    '141ppv.com': {
-        _name: '141ppv BT',
-        '.': [
-            {
-                title: '今日种子',
-                docs: 'https://docs.rsshub.app/multimedia.html#141pvp',
-                source: '/',
-                target: (params, url, document) => {
-                    const today = document.querySelector('div.card.mb-1.card-overview').getAttribute('data-date').replace(/-/g, '');
-                    return `/141ppv/day/${today}`;
-                },
-            },
-            {
-                title: '今日演员',
-                docs: 'https://docs.rsshub.app/multimedia.html#141ppv',
-                source: '/',
-                target: (params, url, document) => {
-                    const star = document.querySelector('div.card-content > div > a').getAttribute('href');
-                    return `/141ppv${star}`;
-                },
-            },
-            {
-                title: '页面种子',
-                docs: 'https://docs.rsshub.app/multimedia.html#141ppv',
-                source: ['/:type', '/:type/:key', '/:type/:key/:morekey'],
-                target: (params, url, document) => {
-                    const itype = params.morekey === undefined ? params.type : params.type === 'tag' ? 'tag' : 'day';
-                    let ikey = `${itype === 'day' ? params.type : ''}${params.key || ''}${itype === 'tag' && params.morekey !== undefined ? '%2F' : ''}${params.morekey || ''}`;
-                    if (ikey === '' && itype === 'tag') {
-                        ikey = document.querySelector('div.thumbnail.is-inline > a').getAttribute('href').replace('/tag/', '').replace('/', '%2F');
-                    } else if (ikey === '' && itype === 'actress') {
-                        ikey = document.querySelector('div.card > a').getAttribute('href').replace('/actress/', '');
-                    }
-                    return `/141ppv/${itype}/${ikey}`;
-                },
-            },
-        ],
-    },
     'sexinsex.net': {
         _name: 'sexinsex',
         '.': [

package/lib/radar.js

@@ -43,9 +43,28 @@ const validateRadarRules = (rule, dir) => {
                     if (!item.docs.startsWith('https://docs.rsshub.app/')) {
                         throw Error(`Radar rules for "${host}" in "${dir}" should start with 'https://docs.rsshub.app/'.`);
                     }
-                    if ((Array.isArray(item.source) && item.source.some((s) => s.includes('#') || s.includes('='))) || (typeof item.source === 'string' && (item.source.includes('#') || item.source.includes('=')))) {
-                        // Some will try to match '/some/path?a=1' which is not supported
-                        throw Error(`Radar rules for "${host}" in "${dir}" cannot match URL hash or URL search parameters.`);
+                    if (Array.isArray(item.source)) {
+                        if (!item.source.length) {
+                            // check for []
+                            throw Error(`Radar rule of "${item.title}" for subdomain "${host}" in "${dir}" should not be empty.`);
+                        }
+                        if (item.source.some((s) => s.includes('#') || s.includes('='))) {
+                            // Some will try to match '/some/path?a=1' which is not supported
+                            throw Error(`Radar rule of "${item.title}" for subdomain "${host}" in "${dir}" cannot match URL hash or URL search parameters.`);
+                        }
+                        if (item.source.some((s) => !s.length)) {
+                            // check for ['/some/thing', ''] and ['']
+                            throw Error(`Radar rule of "${item.title}" for subdomain "${host}" in "${dir}" should not be empty.`);
+                        }
+                    }
+                    if (typeof item.source === 'string') {
+                        if (!item.source.length) {
+                            // check for ''
+                            throw Error(`Radar rule of "${item.title}" for subdomain "${host}" in "${dir}" should not be empty.`);
+                        }
+                        if (item.source.includes('#') || item.source.includes('=')) {
+                            throw Error(`Radar rule of "${item.title}" for subdomain "${host}" in "${dir}" cannot match URL hash or URL search parameters.`);
+                        }
                     }
                     for (const key in item) {
                         if (key !== 'title' && key !== 'docs' && key !== 'source' && key !== 'target') {

package/lib/router.js

@@ -242,8 +242,8 @@ router.get('/yande.re/post/popular_recent/:period', lazyloadRouteHandler('./rout
 // router.get('/nytimes/:lang?', lazyloadRouteHandler('./routes/nytimes/index'));
 
 // 3dm
-router.get('/3dm/:name/:type', lazyloadRouteHandler('./routes/3dm/game'));
-router.get('/3dm/news', lazyloadRouteHandler('./routes/3dm/news_center'));
+// router.get('/3dm/:name/:type', lazyloadRouteHandler('./routes/3dm/game'));
+// router.get('/3dm/news', lazyloadRouteHandler('./routes/3dm/news_center'));
 
 // 喜马拉雅
 router.get('/ximalaya/:type/:id/:all?', lazyloadRouteHandler('./routes/ximalaya/album'));
@@ -748,7 +748,7 @@ router.get('/shu/:type?', lazyloadRouteHandler('./routes/universities/shu/index'
 router.get('/shu/jwc/:type?', lazyloadRouteHandler('./routes/universities/shu/jwc'));
 
 // 北京科技大学天津学院
-router.get('/ustb/tj/news/:type?', lazyloadRouteHandler('./routes/universities/ustb/tj/news'));
+// router.get('/ustb/tj/news/:type?', lazyloadRouteHandler('./routes/universities/ustb/tj/news'));
 
 // 深圳大学
 // router.get('/szu/yz/:type?', lazyloadRouteHandler('./routes/universities/szu/yz'));
@@ -1164,7 +1164,7 @@ router.get('/allpoetry/:order?', lazyloadRouteHandler('./routes/allpoetry/order'
 // router.get('/wallstreetcn/live/:channel?', lazyloadRouteHandler('./routes/wallstreetcn/live'));
 
 // 多抓鱼搜索
-router.get('/duozhuayu/search/:wd', lazyloadRouteHandler('./routes/duozhuayu/search'));
+// router.get('/duozhuayu/search/:wd', lazyloadRouteHandler('./routes/duozhuayu/search'));
 
 // 创业邦
 router.get('/cyzone/author/:id', lazyloadRouteHandler('./routes/cyzone/author'));
@@ -1247,19 +1247,19 @@ router.get('/fitchratings/site/:type', lazyloadRouteHandler('./routes/fitchratin
 // router.get('/mpaypass/main/:type?', lazyloadRouteHandler('./routes/mpaypass/main'));
 
 // 新浪科技探索
-router.get('/sina/discovery/:type', lazyloadRouteHandler('./routes/sina/discovery'));
+// router.get('/sina/discovery/:type', lazyloadRouteHandler('./routes/sina/discovery'));
 
 // 新浪科技滚动新闻
-router.get('/sina/rollnews', lazyloadRouteHandler('./routes/sina/rollnews'));
+// router.get('/sina/rollnews', lazyloadRouteHandler('./routes/sina/rollnews'));
 
 // 新浪体育
-router.get('/sina/sports/:type', lazyloadRouteHandler('./routes/sina/sports'));
+// router.get('/sina/sports/:type', lazyloadRouteHandler('./routes/sina/sports'));
 
 // 新浪专栏创事记
-router.get('/sina/csj', lazyloadRouteHandler('./routes/sina/chuangshiji'));
+// router.get('/sina/csj', lazyloadRouteHandler('./routes/sina/chuangshiji'));
 
 // 新浪财经－国內
-router.get('/sina/finance', lazyloadRouteHandler('./routes/sina/finance'));
+// router.get('/sina/finance', lazyloadRouteHandler('./routes/sina/finance'));
 
 // Animen
 router.get('/animen/news/:type', lazyloadRouteHandler('./routes/animen/news'));
@@ -1297,9 +1297,9 @@ router.get('/whalegogo/home', lazyloadRouteHandler('./routes/whalegogo/home'));
 router.get('/whalegogo/portal/:type_id/:tagid?', lazyloadRouteHandler('./routes/whalegogo/portal'));
 
 // 爱思想
-router.get('/aisixiang/column/:id', lazyloadRouteHandler('./routes/aisixiang/column'));
-router.get('/aisixiang/ranking/:type?/:range?', lazyloadRouteHandler('./routes/aisixiang/ranking'));
-router.get('/aisixiang/thinktank/:name/:type?', lazyloadRouteHandler('./routes/aisixiang/thinktank'));
+// router.get('/aisixiang/column/:id', lazyloadRouteHandler('./routes/aisixiang/column'));
+// router.get('/aisixiang/ranking/:type?/:range?', lazyloadRouteHandler('./routes/aisixiang/ranking'));
+// router.get('/aisixiang/thinktank/:name/:type?', lazyloadRouteHandler('./routes/aisixiang/thinktank'));
 
 // Hacker News
 // router.get('/hackernews/:section/:type?', lazyloadRouteHandler('./routes/hackernews/story'));
@@ -1360,7 +1360,7 @@ router.get('/ui-cn/user/:id', lazyloadRouteHandler('./routes/ui-cn/user'));
 router.get('/juesheng', lazyloadRouteHandler('./routes/juesheng'));
 
 // 播客IBCラジオ イヤーマイッタマイッタ
-router.get('/maitta', lazyloadRouteHandler('./routes/maitta'));
+// router.get('/maitta', lazyloadRouteHandler('./routes/maitta'));
 
 // 一些博客
 // 敬维-以认真的态度做完美的事情: https://jingwei.link/
@@ -1664,7 +1664,7 @@ router.get('/ningmeng/song', lazyloadRouteHandler('./routes/ningmeng/song'));
 router.get('/zzz/:category?/:language?', lazyloadRouteHandler('./routes/zzz'));
 
 // AEON
-router.get('/aeon/:cid', lazyloadRouteHandler('./routes/aeon/category'));
+// router.get('/aeon/:cid', lazyloadRouteHandler('./routes/aeon/category'));
 
 // AlgoCasts
 router.get('/algocasts', lazyloadRouteHandler('./routes/algocasts/all'));
@@ -1925,7 +1925,7 @@ router.get('/ctfhub/search/:limit?/:form?/:class?/:title?', lazyloadRouteHandler
 router.get('/liwushuo/index', lazyloadRouteHandler('./routes/liwushuo/index.js'));
 
 // 故事fm
-router.get('/storyfm/index', lazyloadRouteHandler('./routes/storyfm/index.js'));
+// router.get('/storyfm/index', lazyloadRouteHandler('./routes/storyfm/index.js'));
 
 // 中国日报
 router.get('/chinadaily/english/:category', lazyloadRouteHandler('./routes/chinadaily/english.js'));
@@ -2017,8 +2017,8 @@ router.get('/latexstudio/home', lazyloadRouteHandler('./routes/latexstudio/home'
 router.get('/jskou/:type?', lazyloadRouteHandler('./routes/jskou/index'));
 
 // 国家应急广播
-router.get('/cneb/yjxx', lazyloadRouteHandler('./routes/cneb/yjxx'));
-router.get('/cneb/guoneinews', lazyloadRouteHandler('./routes/cneb/guoneinews'));
+// router.get('/cneb/yjxx', lazyloadRouteHandler('./routes/cneb/yjxx'));
+// router.get('/cneb/guoneinews', lazyloadRouteHandler('./routes/cneb/guoneinews'));
 
 // 邮箱
 router.get('/mail/imap/:email', lazyloadRouteHandler('./routes/mail/imap'));
@@ -2882,7 +2882,7 @@ router.get('/gov/chinatax/latest', lazyloadRouteHandler('./routes/gov/chinatax/l
 router.get('/lizhi/user/:id', lazyloadRouteHandler('./routes/lizhi/user'));
 
 // 富途牛牛
-router.get('/futunn/highlights', lazyloadRouteHandler('./routes/futunn/highlights'));
+// router.get('/futunn/highlights', lazyloadRouteHandler('./routes/futunn/highlights'));
 
 // 即刻 migrated to v2
 // router.get('/jike/topic/:id', lazyloadRouteHandler('./routes/jike/topic'));
@@ -3037,17 +3037,17 @@ router.get('/hfut/tzgg', lazyloadRouteHandler('./routes/universities/hfut/tzgg')
 router.get('/onejav/:type/:key?', lazyloadRouteHandler('./routes/onejav/one'));
 
 // 141jav
-router.get('/141jav/:type/:key?', lazyloadRouteHandler('./routes/141jav/141jav'));
+// router.get('/141jav/:type/:key?', lazyloadRouteHandler('./routes/141jav/141jav'));
 
 // 141ppv
-router.get('/141ppv/:type/:key?', lazyloadRouteHandler('./routes/141ppv/141ppv'));
+// router.get('/141ppv/:type/:key?', lazyloadRouteHandler('./routes/141ppv/141ppv'));
 
 // CuriousCat
 router.get('/curiouscat/user/:id', lazyloadRouteHandler('./routes/curiouscat/user'));
 
 // Telecompaper
-router.get('/telecompaper/news/:caty/:year?/:country?/:type?', lazyloadRouteHandler('./routes/telecompaper/news'));
-router.get('/telecompaper/search/:keyword?/:company?/:sort?/:period?', lazyloadRouteHandler('./routes/telecompaper/search'));
+// router.get('/telecompaper/news/:caty/:year?/:country?/:type?', lazyloadRouteHandler('./routes/telecompaper/news'));
+// router.get('/telecompaper/search/:keyword?/:company?/:sort?/:period?', lazyloadRouteHandler('./routes/telecompaper/search'));
 
 // 水木社区
 router.get('/newsmth/account/:id', lazyloadRouteHandler('./routes/newsmth/account'));
@@ -3232,7 +3232,7 @@ router.get('/mamibuy/:caty?/:age?/:sort?', lazyloadRouteHandler('./routes/mamibu
 router.get('/mercari/:type/:id', lazyloadRouteHandler('./routes/mercari/index'));
 
 // notefolio
-router.get('/notefolio/:caty?/:order?/:time?/:query?', lazyloadRouteHandler('./routes/notefolio/index'));
+// router.get('/notefolio/:caty?/:order?/:time?/:query?', lazyloadRouteHandler('./routes/notefolio/index'));
 
 // JavDB
 // router.get('/javdb/home/:category?/:sort?/:filter?', lazyloadRouteHandler('./routes/javdb'));
@@ -3459,7 +3459,7 @@ router.get('/zhimap/:categoryUuid?/:recommend?', lazyloadRouteHandler('./routes/
 // router.get('/fantia/user/:id', lazyloadRouteHandler('./routes/fantia/user'));
 
 // i-Cable
-router.get('/icable/:category/:option?', lazyloadRouteHandler('./routes/icable/category'));
+// router.get('/icable/:category/:option?', lazyloadRouteHandler('./routes/icable/category'));
 
 // ProcessOn
 router.get('/processon/popular/:cate?/:sort?', lazyloadRouteHandler('./routes/processon/popular'));
@@ -3511,7 +3511,7 @@ router.get('/chuapp/index/:category?', lazyloadRouteHandler('./routes/chuapp/ind
 router.get('/deloitte/industries/:category?', lazyloadRouteHandler('./routes/deloitte/industries'));
 
 // 特斯拉系统更新
-router.get('/tesla', lazyloadRouteHandler('./routes/tesla/update'));
+// router.get('/tesla/ota', lazyloadRouteHandler('./routes/tesla/update'));
 
 // 复旦大学继续教育学院
 router.get('/fudan/cce', lazyloadRouteHandler('./routes/universities/fudan/cce'));
@@ -3719,7 +3719,7 @@ router.get('/thrillist/:tag?', lazyloadRouteHandler('./routes/thrillist/index'))
 router.get('/dxy/vaccine/:province?/:city?/:location?', lazyloadRouteHandler('./routes/dxy/vaccine'));
 
 // Wtu
-router.get('/wtu/:type', lazyloadRouteHandler('./routes/universities/wtu'));
+// router.get('/wtu/:type', lazyloadRouteHandler('./routes/universities/wtu'));
 
 // 中国庭审公开网
 router.get('/tingshen', lazyloadRouteHandler('./routes/tingshen/tingshen'));
@@ -3979,7 +3979,7 @@ router.get('/fnal/news/:category?', lazyloadRouteHandler('./routes/fnal/news'));
 router.get('/x410/news', lazyloadRouteHandler('./routes/x410/news'));
 
 // 恩山无线论坛
-router.get('/right/forum/:id?', lazyloadRouteHandler('./routes/right/forum'));
+// router.get('/right/forum/:id?', lazyloadRouteHandler('./routes/right/forum'));
 
 // 香港經濟日報 migrated to v2
 // router.get('/hket/:category?', lazyloadRouteHandler('./routes/hket/index'));
@@ -4024,9 +4024,6 @@ router.get('/sbs/chinese/:category?/:id?/:dialect?/:language?', lazyloadRouteHan
 // QuestMobile
 router.get('/questmobile/report/:category?/:label?', lazyloadRouteHandler('./routes/questmobile/report'));
 
-// RSS3
-router.get('/rss3/blog', lazyloadRouteHandler('./routes/rss3/blog'));
-
 // 星球日报
 // router.get('/odaily/activity', lazyloadRouteHandler('./routes/odaily/activity'));
 // router.get('/odaily/newsflash', lazyloadRouteHandler('./routes/odaily/newsflash'));

package/lib/routes/gov/hunan/notice.js

@@ -3,7 +3,7 @@ const got = require('@/utils/got');
 module.exports = async (ctx) => {
     const type = ctx.params.type || 'all';
     const rssData = {
-        isType: ctx.params.type ? true : false,
+        isType: !!ctx.params.type,
         Title: `湖南省政府采购网`,
         Desc: `湖南省政府采购网`,
         Link: `http://www.ccgp-hunan.gov.cn/page/notice/more.jsp`,

package/lib/utils/puppeteer.js

@@ -6,7 +6,7 @@ const logger = require('./logger');
 
 const options = {
     args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-infobars', '--window-position=0,0', '--ignore-certificate-errors', '--ignore-certificate-errors-spki-list', `--user-agent=${config.ua}`],
-    headless: true,
+    headless: 'new',
     ignoreHTTPSErrors: true,
 };
 
@@ -20,7 +20,7 @@ module.exports = async (extraOptions = {}) => {
         const { addExtra } = require('puppeteer-extra');
         puppeteer = addExtra(puppeteer);
 
-        // workaround for vercel/nft #54 and #283
+        // workaround for vercel/nft #54, #283, #304
         require('puppeteer-extra-plugin-stealth/evasions/chrome.app');
         require('puppeteer-extra-plugin-stealth/evasions/chrome.csi');
         require('puppeteer-extra-plugin-stealth/evasions/chrome.loadTimes');

package/lib/utils/request-wrapper.js

@@ -7,10 +7,10 @@ const https = require('https');
 let agent = null;
 if (proxyUri) {
     if (proxyUri.startsWith('http')) {
-        const HttpsProxyAgent = require('https-proxy-agent');
+        const { HttpsProxyAgent } = require('https-proxy-agent');
         agent = new HttpsProxyAgent(proxyUri);
     } else if (proxyUri.startsWith('socks')) {
-        const SocksProxyAgent = require('socks-proxy-agent').SocksProxyAgent;
+        const { SocksProxyAgent } = require('socks-proxy-agent');
         agent = new SocksProxyAgent(proxyUri);
     }
 }

package/lib/v2/141jav/index.js

@@ -0,0 +1,71 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const rootUrl = 'https://www.141jav.com';
+    const currentUrl = `${rootUrl}${ctx.path}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    if (ctx.path === '/') {
+        ctx.redirect(`/141jav${$('.overview').first().attr('href')}`);
+        return;
+    }
+
+    const items = $('.columns')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            const id = item.find('.title a').text();
+            const size = item.find('.title span').text();
+            const pubDate = item.find('.subtitle a').attr('href').split('/date/').pop();
+            const description = item.find('.has-text-grey-dark').text();
+            const actresses = item
+                .find('.panel-block')
+                .toArray()
+                .map((a) => $(a).text().trim());
+            const tags = item
+                .find('.tag')
+                .toArray()
+                .map((t) => $(t).text().trim());
+            const magnet = item.find('a[title="Magnet torrent"]').attr('href');
+            const link = item.find('a[title="Download .torrent"]').attr('href');
+            const image = item.find('.image').attr('src');
+
+            return {
+                title: `${id} ${size}`,
+                pubDate: parseDate(pubDate, 'YYYY/MM/DD'),
+                link: new URL(item.find('a').first().attr('href'), rootUrl).href,
+                description: art(path.join(__dirname, 'templates/description.art'), {
+                    image,
+                    id,
+                    size,
+                    pubDate,
+                    description,
+                    actresses,
+                    tags,
+                    magnet,
+                    link,
+                }),
+                author: actresses.join(', '),
+                category: [...tags, ...actresses],
+                enclosure_type: 'application/x-bittorrent',
+                enclosure_url: magnet,
+            };
+        });
+
+    ctx.state.data = {
+        title: `141JAV - ${$('title').text().split('-')[0].trim()}`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/141jav/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:type?/:keyword?': ['cgkings', 'nczitzk'],
+};

package/lib/v2/141jav/radar.js

@@ -0,0 +1,40 @@
+module.exports = {
+    '141jav.com': {
+        _name: '141JAV',
+        '.': [
+            {
+                title: '今日种子',
+                docs: 'https://docs.rsshub.app/multimedia.html#_141jav',
+                source: '/',
+                target: (params, url, document) => {
+                    const today = document.querySelector('div.card.mb-1.card-overview').getAttribute('data-date').replace(/-/g, '');
+                    return `/141jav/day/${today}`;
+                },
+            },
+            {
+                title: '今日演员',
+                docs: 'https://docs.rsshub.app/multimedia.html#_141jav',
+                source: '/',
+                target: (params, url, document) => {
+                    const star = document.querySelector('div.card-content > div > a').getAttribute('href');
+                    return `/141jav${star}`;
+                },
+            },
+            {
+                title: '页面种子',
+                docs: 'https://docs.rsshub.app/multimedia.html#_141jav',
+                source: ['/:type', '/:type/:key', '/:type/:key/:morekey'],
+                target: (params, url, document) => {
+                    const itype = params.morekey === undefined ? params.type : params.type === 'tag' ? 'tag' : 'day';
+                    let ikey = `${itype === 'day' ? params.type : ''}${params.key || ''}${itype === 'tag' && params.morekey !== undefined ? '%2F' : ''}${params.morekey || ''}`;
+                    if (ikey === '' && itype === 'tag') {
+                        ikey = document.querySelector('div.thumbnail.is-inline > a').getAttribute('href').replace('/tag/', '').replace(/\//g, '%2F');
+                    } else if (ikey === '' && itype === 'actress') {
+                        ikey = document.querySelector('div.card > a').getAttribute('href').replace('/actress/', '');
+                    }
+                    return `/141jav/${itype}/${ikey}`;
+                },
+            },
+        ],
+    },
+};

package/lib/v2/141jav/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get(/([\w-/]+)?/, require('./index'));
+};