rsshub 1.0.0-master.facc6d5 → 1.0.0-master.fad0dfa

package/lib/routes/blogread/index.ts

@@ -24,7 +24,8 @@ async function handler() {
     });
     const $ = cheerio.load(response.data);
     const resultItem = $('.media')
-        .map((index, elem) => {
+        .toArray()
+        .map((elem) => {
             elem = $(elem);
             const $link = elem.find('dt a');
             return {
@@ -34,9 +35,7 @@ async function handler() {
                 author: elem.find('.small a').eq(0).text(),
                 pubDate: elem.find('dd').eq(1).text().split('\n')[2],
             };
-        })
-        .get();
-
+        });
     return {
         title: '技术头条',
         link: url,

package/lib/routes/bloomberg/authors.ts

@@ -2,7 +2,8 @@ import { Route, ViewType } from '@/types';
 import { load } from 'cheerio';
 import ofetch from '@/utils/ofetch';
 import rssParser from '@/utils/rss-parser';
-import { asyncPoolAll, parseArticle } from './utils';
+import { parseArticle } from './utils';
+import pMap from 'p-map';
 
 const parseAuthorNewsList = async (slug) => {
     const baseURL = `https://www.bloomberg.com/authors/${slug}`;
@@ -14,18 +15,16 @@ const parseAuthorNewsList = async (slug) => {
     }
     const $ = load(resp.html);
     const articles = $('article.story-list-story');
-    return articles
-        .map((index, item) => {
-            item = $(item);
-            const headline = item.find('a.story-list-story__info__headline-link');
-            return {
-                title: headline.text(),
-                pubDate: item.attr('data-updated-at'),
-                guid: `bloomberg:${item.attr('data-id')}`,
-                link: new URL(headline.attr('href'), baseURL).href,
-            };
-        })
-        .get();
+    return articles.toArray().map((item) => {
+        item = $(item);
+        const headline = item.find('a.story-list-story__info__headline-link');
+        return {
+            title: headline.text(),
+            pubDate: item.attr('data-updated-at'),
+            guid: `bloomberg:${item.attr('data-id')}`,
+            link: new URL(headline.attr('href'), baseURL).href,
+        };
+    });
 };
 
 export const route: Route = {
@@ -66,7 +65,7 @@ async function handler(ctx) {
         list = (await rssParser.parseURL(`${link}.rss`)).items;
     }
 
-    const item = await asyncPoolAll(1, list, (item) => parseArticle(item));
+    const item = await pMap(list, (item) => parseArticle(item), { concurrency: 1 });
     const authorName = item.find((i) => i.author)?.author ?? slug;
 
     return {

package/lib/routes/bloomberg/index.ts

@@ -1,6 +1,7 @@
 import { Route, ViewType } from '@/types';
-import { rootUrl, asyncPoolAll, parseNewsList, parseArticle } from './utils';
-const site_title_mapping = {
+import { rootUrl, parseNewsList, parseArticle } from './utils';
+import pMap from 'p-map';
+const siteTitleMapping = {
     '/': 'News',
     bpol: 'Politics',
     bbiz: 'Business',
@@ -23,7 +24,7 @@ export const route: Route = {
     parameters: {
         site: {
             description: 'Site ID, can be found below',
-            options: Object.keys(site_title_mapping).map((key) => ({ value: key, label: site_title_mapping[key] })),
+            options: Object.keys(siteTitleMapping).map((key) => ({ value: key, label: siteTitleMapping[key] })),
         },
     },
     features: {
@@ -60,9 +61,9 @@ async function handler(ctx) {
     const currentUrl = site ? `${rootUrl}/${site}/sitemap_news.xml` : `${rootUrl}/sitemap_news.xml`;
 
     const list = await parseNewsList(currentUrl, ctx);
-    const items = await asyncPoolAll(1, list, (item) => parseArticle(item));
+    const items = await pMap(list, (item) => parseArticle(item), { concurrency: 1 });
     return {
-        title: `Bloomberg - ${site_title_mapping[site ?? '/']}`,
+        title: `Bloomberg - ${siteTitleMapping[site ?? '/']}`,
         link: currentUrl,
         item: items,
     };

package/lib/routes/bloomberg/utils.ts

@@ -1,10 +1,6 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import cache from '@/utils/cache';
 import { load } from 'cheerio';
 import path from 'node:path';
-import asyncPool from 'tiny-async-pool';
 import { destr } from 'destr';
 
 import { parseDate } from '@/utils/parse-date';
@@ -201,10 +197,10 @@ const parseVideoPage = async (res, api, item) => {
 
 const parsePhotoEssaysPage = async (res, api, item) => {
     const $ = load(res.data.html);
-    const article_json = $(api.sel)
-        .toArray()
-        .map((e) => JSON.parse($(e).html()))
-        .reduce((pv, cv) => ({ ...pv, ...cv }), {});
+    const article_json = {};
+    for (const e of $(api.sel).toArray()) {
+        Object.assign(article_json, JSON.parse($(e).html()));
+    }
     const rss_item = {
         title: article_json.headline || item.title,
         link: article_json.canonical || item.link,
@@ -607,12 +603,4 @@ const documentToHtmlString = async (document) => {
     return str;
 };
 
-const asyncPoolAll = async (...args) => {
-    const results = [];
-    for await (const result of asyncPool(...args)) {
-        results.push(result);
-    }
-    return results;
-};
-
-export { rootUrl, asyncPoolAll, parseNewsList, parseArticle };
+export { rootUrl, parseNewsList, parseArticle };

package/lib/routes/bnu/bs.ts

@@ -45,7 +45,8 @@ async function handler(ctx) {
     const $ = load(response.data);
 
     const list = $('a[title]')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
 
             return {
@@ -53,8 +54,7 @@ async function handler(ctx) {
                 pubDate: parseDate(item.prev().text()),
                 link: `${rootUrl}/${category}/${item.attr('href')}`,
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/bnu/dwxgb.ts

@@ -48,7 +48,8 @@ async function handler(ctx) {
     const $ = load(response.data);
 
     const list = $('ul.container.list > li')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             const link = $(item).find('a').attr('href');
             const absoluteLink = new URL(link, currentUrl).href;
             return {
@@ -56,8 +57,7 @@ async function handler(ctx) {
                 pubDate: parseDate($(item).find('span').text()),
                 link: absoluteLink,
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/bnu/jwb.ts

@@ -31,7 +31,7 @@ async function handler() {
             const a = e.find('a');
             return {
                 title: e.find('a span').text(),
-                link: a.attr('href').startsWith('http') ? a.attr('href') : 'https://jwb.bnu.edu.cn' + a.attr('href').substring(2),
+                link: a.attr('href').startsWith('http') ? a.attr('href') : 'https://jwb.bnu.edu.cn' + a.attr('href').slice(2),
                 pubDate: parseDate(e.find('span.fr.text-muted').text(), 'YYYY-MM-DD'),
             };
         });

package/lib/routes/bookfere/category.ts

@@ -51,20 +51,16 @@ async function handler(ctx) {
     return {
         title: $('head title').text(),
         link: url,
-        item:
-            list &&
-            list
-                .map((index, item) => {
-                    item = $(item);
-                    const date = item.find('time').attr('datetime');
-                    const pubDate = parseDate(date);
-                    return {
-                        title: item.find('h2 a').text(),
-                        link: item.find('h2 a').attr('href'),
-                        pubDate,
-                        description: item.find('p').text(),
-                    };
-                })
-                .get(),
+        item: list.toArray().map((item) => {
+            item = $(item);
+            const date = item.find('time').attr('datetime');
+            const pubDate = parseDate(date);
+            return {
+                title: item.find('h2 a').text(),
+                link: item.find('h2 a').attr('href'),
+                pubDate,
+                description: item.find('p').text(),
+            };
+        }),
     };
 }

package/lib/routes/booru/mmda.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import got from '@/utils/got';
 import queryString from 'query-string';

package/lib/routes/bsky/feeds.ts

@@ -1,6 +1,4 @@
 import { Route, ViewType } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import { parseDate } from '@/utils/parse-date';

package/lib/routes/bsky/posts.ts

@@ -1,13 +1,11 @@
 import { Route, ViewType } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import { parseDate } from '@/utils/parse-date';
 import { resolveHandle, getProfile, getAuthorFeed } from './utils';
 import { art } from '@/utils/render';
 import path from 'node:path';
-import querystring from 'querystring';
+import querystring from 'node:querystring';
 
 export const route: Route = {
     path: '/profile/:handle/:routeParams?',

package/lib/routes/btzj/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/buaa/lib/space/newbook.ts

@@ -6,8 +6,6 @@ import timezone from '@/utils/timezone';
 import cache from '@/utils/cache';
 import { art } from '@/utils/render';
 import path from 'node:path';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 interface Book {
     bibId: string;

package/lib/routes/bulianglin/rss.ts

@@ -24,7 +24,8 @@ async function handler() {
     const $ = load(response.data);
 
     const list = $('div.single-post')
-        .map((i, e) => {
+        .toArray()
+        .map((e) => {
             const element = $(e);
             const title = element.find('h2 > a').text();
             const link = element.find('h2 > a').attr('href');
@@ -37,8 +38,7 @@ async function handler() {
                 link,
                 pubDate: parseDate(dateraw, 'YYYY 年 MM 月 DD 日'),
             };
-        })
-        .get();
+        });
 
     return {
         title: '不良林',

package/lib/routes/bullionvault/gold-news.ts

@@ -4,7 +4,8 @@ import cache from '@/utils/cache';
 import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
 
-import { type CheerioAPI, type Cheerio, type Element, load } from 'cheerio';
+import { type CheerioAPI, type Cheerio, load } from 'cheerio';
+import type { Element } from 'domhandler';
 import { type Context } from 'hono';
 
 export const handler = async (ctx: Context): Promise<Data> => {

package/lib/routes/bupt/jwc.ts

@@ -68,7 +68,8 @@ async function handler(ctx: Context) {
     const $ = load(response.data);
 
     const list = $('.txt-elise')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             const $item = $(item);
             const $link = $item.find('a');
             // Skip elements without links or with empty href
@@ -80,7 +81,6 @@ async function handler(ctx: Context) {
                 link: rootUrl + '/' + $link.attr('href'),
             };
         })
-        .get()
         .filter(Boolean);
 
     const items = await Promise.all(

package/lib/routes/bupt/rczp.ts

@@ -41,15 +41,15 @@ async function handler() {
     const $ = load(response.data);
 
     const list = $('.date-block')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
 
             return {
                 title: item.next().text(),
                 link: `${rootUrl}/${item.next().attr('href')}`,
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/caai/utils.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import { load } from 'cheerio';
 import got from '@/utils/got';
 import { art } from '@/utils/render';

package/lib/routes/caareviews/utils.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
@@ -14,12 +11,12 @@ const getList = async (url) => {
     const response = await got(url);
     const $ = load(response.data);
     const list = $('#infinite-content > div')
-        .map((_index, item) => ({
+        .toArray()
+        .map((item) => ({
             title: $(item).find('div.title').text().trim(),
             link: new URL($(item).find('div.title > em > a').attr('href'), rootUrl).href,
             author: $(item).find('div.contributors').text().trim(),
-        }))
-        .get();
+        }));
 
     return list;
 };

package/lib/routes/cahkms/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/caixin/blog.ts

@@ -38,7 +38,7 @@ async function handler(ctx) {
         const $ = load(response);
         const user = $('div.indexMainConri > script[type="text/javascript"]')
             .text()
-            .substring('window.user = '.length + 1)
+            .slice('window.user = '.length + 1)
             .split(';')[0]
             .replaceAll(/\s/g, '');
         const authorId = user.match(/id:"(\d+)"/)[1];

package/lib/routes/caixin/database.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/caixin/utils-fulltext.ts

@@ -1,4 +1,4 @@
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 import { hextob64, KJUR } from 'jsrsasign';
 import ofetch from '@/utils/ofetch';
 import { config } from '@/config';

package/lib/routes/caixin/utils.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { art } from '@/utils/render';

package/lib/routes/cankaoxiaoxi/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/cara/likes.ts

@@ -2,13 +2,10 @@ import type { Data, DataItem, Route } from '@/types';
 import type { PostsResponse } from './types';
 import { customFetch, parseUserData } from './utils';
 import { API_HOST, CDN_HOST, HOST } from './constant';
-import { getCurrentPath } from '@/utils/helpers';
 import { art } from '@/utils/render';
 import { parseDate } from '@/utils/parse-date';
 import path from 'node:path';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 export const route: Route = {
     path: ['/likes/:user'],
     categories: ['social-media', 'popular'],

package/lib/routes/cara/timeline.ts

@@ -2,13 +2,10 @@ import type { Data, DataItem, Route } from '@/types';
 import type { PostsResponse } from './types';
 import { customFetch, parseUserData } from './utils';
 import { API_HOST, CDN_HOST, HOST } from './constant';
-import { getCurrentPath } from '@/utils/helpers';
 import { art } from '@/utils/render';
 import { parseDate } from '@/utils/parse-date';
 import path from 'node:path';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 export const route: Route = {
     path: ['/timeline/:user'],
     categories: ['social-media', 'popular'],

package/lib/routes/cara/utils.ts

@@ -1,7 +1,6 @@
 import { config } from '@/config';
 import ofetch from '@/utils/ofetch';
 import type { FetchOptions, FetchRequest, ResponseType } from 'ofetch';
-import asyncPool from 'tiny-async-pool';
 import type { PortfolioDetailResponse, PortfolioResponse, UserNextData } from './types';
 import type { DataItem } from '@/types';
 import { parseDate } from '@/utils/parse-date';
@@ -35,14 +34,6 @@ export async function parseUserData(user: string) {
     })) as Promise<UserNextData['pageProps']['user']>;
 }
 
-export async function asyncPoolAll<IN, OUT>(poolLimit: number, array: readonly IN[], iteratorFn: (generator: IN) => Promise<OUT>) {
-    const results: Awaited<OUT[]> = [];
-    for await (const result of asyncPool(poolLimit, array, iteratorFn)) {
-        results.push(result);
-    }
-    return results;
-}
-
 export async function fetchPortfolioItem(item: PortfolioResponse['data'][number]) {
     const res = await customFetch<PortfolioDetailResponse>(`${API_HOST}/posts/${item.postId}`);
 

package/lib/routes/cartoonmad/comic.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import { load } from 'cheerio';

package/lib/routes/cas/cg/index.ts

@@ -45,15 +45,15 @@ async function handler(ctx) {
     const list = $('#content li')
         .not('.gl_line')
         .slice(0, 15)
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const a = item.find('a');
             return {
                 title: a.text(),
                 link: `${rootUrl}/cg/${caty}${a.attr('href').replace('.', '')}`,
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/cas/genetics/index.ts

@@ -22,7 +22,7 @@ async function handler(ctx) {
 
     let items;
 
-    if (path.substring(0, 3) === 'edu') {
+    if (path.slice(0, 3) === 'edu') {
         items = $('li.box-s.h16')
             .toArray()
             .map((item) => {
@@ -35,7 +35,7 @@ async function handler(ctx) {
                     pubDate: parseDate(date.text(), 'YYYY-MM-DD'),
                 };
             });
-    } else if (path.substring(0, 4) === 'dqyd') {
+    } else if (path.slice(0, 4) === 'dqyd') {
         items = $('div.list-tab ul li')
             .toArray()
             .map((item) => {

package/lib/routes/cbaigui/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import { getSubPath } from '@/utils/common-utils';
 import got from '@/utils/got';

package/lib/routes/cccmc/index.ts

@@ -4,7 +4,8 @@ import cache from '@/utils/cache';
 import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
 
-import { type CheerioAPI, type Cheerio, type Element, load } from 'cheerio';
+import { type CheerioAPI, type Cheerio, load } from 'cheerio';
+import type { Element } from 'domhandler';
 import { type Context } from 'hono';
 
 export const handler = async (ctx: Context): Promise<Data> => {

package/lib/routes/ccf/ccfcv/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/ccf/tfbd/utils.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import { load } from 'cheerio';
 import got from '@/utils/got';
 import { art } from '@/utils/render';

package/lib/routes/ccfa/index.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';

package/lib/routes/ccreports/index.ts

@@ -36,15 +36,15 @@ async function handler() {
     const $ = load(listData.data);
     const list = $('div.index-four-content > div.article-box')
         .find('div.new-child')
-        .map((_, item) => ({
+        .toArray()
+        .map((item) => ({
             title: $(item).find('p.new-title').text(),
             link: new URL($(item).find('a').attr('href'), rootUrl).href,
             author: $(item)
                 .find('p.new-desc')
                 .text()
                 .match(/作者：(.*?)\s/)[1],
-        }))
-        .get();
+        }));
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/cctv/jx.ts

@@ -40,14 +40,14 @@ async function handler(ctx) {
 
     const list = $('.textr a')
         .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10)
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             return {
                 title: item.text(),
                 link: item.attr('href'),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/cctv/utils/news.ts

@@ -70,14 +70,14 @@ const getNews = async (category) => {
                             break;
 
                         case 'PHO':
-                            description = data.photo_album_list.reduce((description, { photo_url, photo_name, photo_brief }) => {
+                            description = '';
+                            for (const { photo_url, photo_name, photo_brief } of data.photo_album_list) {
                                 description += `
                                     <img src=${photo_url} /><br>
                                     <strong>${photo_name}</strong><br>
                                     ${photo_brief}<br>
                                 `;
-                                return description;
-                            }, '');
+                            }
                             author = data.source;
                             break;
 

package/lib/routes/cctv/utils/xinwen1j1.ts

@@ -9,7 +9,7 @@ import { parseDate } from '@/utils/parse-date';
 async function loadContent(link) {
     const res = await got({ method: 'get', url: link });
     const $ = load(res.data);
-    // console.log($('div.image').get().text())
+    // console.log($('div.image').toArray().text())
     // console.log('********')
     const js_txt = '' + $('script');