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

package/lib/routes/gcores/util.ts

@@ -1,15 +1,12 @@
 import { type Data, type DataItem } from '@/types';
 
 import { art } from '@/utils/render';
-import { getCurrentPath } from '@/utils/helpers';
 import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
 
 import { type CheerioAPI, load } from 'cheerio';
 import path from 'node:path';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 import { parseContent } from './parser';
 
 const baseUrl: string = 'https://www.gcores.com';

package/lib/routes/gcores/videos.ts

@@ -1,12 +1,9 @@
 import { type Data, type Route, ViewType } from '@/types';
 
-import { getCurrentPath } from '@/utils/helpers';
 import { type Context } from 'hono';
 
 import { baseUrl, processItems } from './util';
 
-export const __dirname = getCurrentPath(import.meta.url);
-
 export const handler = async (ctx: Context): Promise<Data> => {
     const limit: number = Number.parseInt(ctx.req.query('limit') ?? '30', 10);
 

package/lib/routes/gdut/oa-news.ts

@@ -5,7 +5,7 @@ import { load } from 'cheerio';
 import { CookieJar } from 'tough-cookie';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
-import asyncPool from 'tiny-async-pool';
+import pMap from 'p-map';
 
 const site = 'https://oas.gdut.edu.cn/seeyon';
 const typeMap = {
@@ -123,94 +123,95 @@ async function handler(ctx) {
         category: item.typeName,
     }));
 
-    const results = [];
-    // 获取实际的文章内容
-    for await (const data of asyncPool(2, articles, async (data) => {
-        const link = data.link;
-        data.description = await cache.tryGet(link, async () => {
-            // 获取数据
-            const response = await got(link, {
-                cookieJar,
-            });
+    const results = await pMap(
+        articles,
+        async (data) => {
+            const link = data.link;
+            data.description = await cache.tryGet(link, async () => {
+                // 获取数据
+                const response = await got(link, {
+                    cookieJar,
+                });
 
-            const $ = load(response.data);
-            const node = $('#content');
-            // 清理样式
-            node.find('*')
-                .filter(function () {
-                    return this.type === 'comment' || this.tagName === 'meta' || this.tagName === 'style';
-                })
-                .remove();
-            node.find('*')
-                .contents()
-                .filter(function () {
-                    return this.type === 'comment' || this.tagName === 'meta' || this.tagName === 'style';
-                })
-                .remove();
-            node.find('*').each(function () {
-                if (this.attribs.style !== undefined) {
-                    const newSty = this.attribs.style
-                        .split(';')
-                        .filter((s) => {
-                            const styBlocklist = ['color:rgb(0,0,0)', 'color:black', 'background:rgb(255,255,255)', 'background:white', 'text-align:left', 'text-align:justify', 'font-style:normal', 'font-weight:normal'];
-                            const styPrefixBlocklist = [
-                                'font-family',
-                                'font-size',
-                                'background',
-                                'text-autospace',
-                                'text-transform',
-                                'letter-spacing',
-                                'line-height',
-                                'padding',
-                                'margin',
-                                'text-justify',
-                                'word-break',
-                                'vertical-align',
-                                'mso-',
-                                '-ms-',
-                            ];
-                            const sty = s.trim();
-                            if (styBlocklist.includes(sty.replaceAll(/\s+/g, ''))) {
-                                return false;
-                            }
-                            for (const prefix of styPrefixBlocklist) {
-                                if (sty.startsWith(prefix)) {
+                const $ = load(response.data);
+                const node = $('#content');
+                // 清理样式
+                node.find('*')
+                    .filter(function () {
+                        return this.type === 'comment' || this.tagName === 'meta' || this.tagName === 'style';
+                    })
+                    .remove();
+                node.find('*')
+                    .contents()
+                    .filter(function () {
+                        return this.type === 'comment' || this.tagName === 'meta' || this.tagName === 'style';
+                    })
+                    .remove();
+                node.find('*').each(function () {
+                    if (this.attribs.style !== undefined) {
+                        const newSty = this.attribs.style
+                            .split(';')
+                            .filter((s) => {
+                                const styBlocklist = ['color:rgb(0,0,0)', 'color:black', 'background:rgb(255,255,255)', 'background:white', 'text-align:left', 'text-align:justify', 'font-style:normal', 'font-weight:normal'];
+                                const styPrefixBlocklist = [
+                                    'font-family',
+                                    'font-size',
+                                    'background',
+                                    'text-autospace',
+                                    'text-transform',
+                                    'letter-spacing',
+                                    'line-height',
+                                    'padding',
+                                    'margin',
+                                    'text-justify',
+                                    'word-break',
+                                    'vertical-align',
+                                    'mso-',
+                                    '-ms-',
+                                ];
+                                const sty = s.trim();
+                                if (styBlocklist.includes(sty.replaceAll(/\s+/g, ''))) {
                                     return false;
                                 }
-                            }
-                            return true;
-                        })
-                        .join(';');
-                    if (newSty) {
-                        this.attribs.style = newSty;
-                    } else {
-                        delete this.attribs.style;
+                                for (const prefix of styPrefixBlocklist) {
+                                    if (sty.startsWith(prefix)) {
+                                        return false;
+                                    }
+                                }
+                                return true;
+                            })
+                            .join(';');
+                        if (newSty) {
+                            this.attribs.style = newSty;
+                        } else {
+                            delete this.attribs.style;
+                        }
                     }
-                }
-                if (this.attribs.class && this.attribs.class.trim().startsWith('Mso')) {
-                    delete this.attribs.class;
-                }
-                if (this.attribs.lang) {
-                    delete this.attribs.lang;
-                }
-                if (this.tagName === 'font' || this.tagName === 'o:p') {
-                    $(this).replaceWith(this.childNodes);
-                }
-                if (this.tagName === 'span' && !this.attribs.style) {
-                    $(this).replaceWith(this.childNodes);
-                }
-            });
-            node.find('span').each(function () {
-                if (this.childNodes.length === 0) {
-                    $(this).remove();
-                }
-            });
+                    if (this.attribs.class && this.attribs.class.trim().startsWith('Mso')) {
+                        delete this.attribs.class;
+                    }
+                    if (this.attribs.lang) {
+                        delete this.attribs.lang;
+                    }
+                    if (this.tagName === 'font' || this.tagName === 'o:p') {
+                        $(this).replaceWith(this.childNodes);
+                    }
+                    if (this.tagName === 'span' && !this.attribs.style) {
+                        $(this).replaceWith(this.childNodes);
+                    }
+                });
+                node.find('span').each(function () {
+                    if (this.childNodes.length === 0) {
+                        $(this).remove();
+                    }
+                });
 
-            return node.html();
-        });
-    })) {
-        results.push(data);
-    }
+                return node.html();
+            });
+            return data;
+        },
+        { concurrency: 2 }
+    );
 
     return {
         title: `广东工业大学新闻通知网 - ` + type.name,

package/lib/routes/geekpark/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/gelbooru/utils.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import path from 'node:path';
 import { art } from '@/utils/render';
 import { config } from '@/config';

package/lib/routes/gelonghui/live.ts

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

package/lib/routes/geocaching/blogs.ts

@@ -74,6 +74,7 @@ async function handler(ctx) {
     const items = response.map((item) => {
         const media = item._embedded['wp:featuredmedia'][0];
         const mediaDetails = media?.media_details;
+        const mediaSize = mediaDetails.sizes.large || mediaDetails.sizes.full;
         return {
             title: item.title.rendered.trim(),
             link: item.link,
@@ -93,9 +94,9 @@ async function handler(ctx) {
                           fileSize: mediaDetails.filesize,
                       },
                       thumbnail: {
-                          url: mediaDetails.sizes.large.source_url,
-                          height: mediaDetails.sizes.large.height,
-                          width: mediaDetails.sizes.large.width,
+                          url: mediaSize.source_url,
+                          height: mediaSize.height,
+                          width: mediaSize.width,
                       },
                   }
                 : undefined,

package/lib/routes/gettr/user.ts

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

package/lib/routes/gihyo/group.ts

@@ -42,25 +42,23 @@ async function handler(ctx) {
     const description = $('head meta[name=description]').attr('content');
     const language = 'ja';
 
-    const item = articles
-        .map((_, article) => {
-            const _subtitle = $('p.m-listitem__title span.subtitle', article).text();
-            const _title = $('p.m-listitem__title', article)
-                .contents()
-                .filter((_, el) => el.nodeType === 3)
-                .text();
-            const title = `${_subtitle} ${_title}`;
-            const author = $('p.m-listitem__author', article).text();
-            const pubDate = timezone(parseDate($('span.date', article).text(), 'YYYY-MM-DD'), +9);
-            const link = `${baseUrl}${$('a', article).attr('href')}`.replace(/\?summary$/, '');
-            return {
-                title,
-                author,
-                pubDate,
-                link,
-            };
-        })
-        .get();
+    const item = articles.toArray().map((article) => {
+        const _subtitle = $('p.m-listitem__title span.subtitle', article).text();
+        const _title = $('p.m-listitem__title', article)
+            .contents()
+            .filter((_, el) => el.nodeType === 3)
+            .text();
+        const title = `${_subtitle} ${_title}`;
+        const author = $('p.m-listitem__author', article).text();
+        const pubDate = timezone(parseDate($('span.date', article).text(), 'YYYY-MM-DD'), +9);
+        const link = `${baseUrl}${$('a', article).attr('href')}`.replace(/\?summary$/, '');
+        return {
+            title,
+            author,
+            pubDate,
+            link,
+        };
+    });
 
     return {
         title,

package/lib/routes/github/comments.ts

@@ -43,7 +43,7 @@ export const route: Route = {
 async function handler(ctx) {
     const user = ctx.req.param('user');
     const repo = ctx.req.param('repo');
-    const number = ctx.req.param('number') && isNaN(Number.parseInt(ctx.req.param('number'))) ? 1 : Number.parseInt(ctx.req.param('number'));
+    const number = ctx.req.param('number') && Number.isNaN(Number.parseInt(ctx.req.param('number'))) ? 1 : Number.parseInt(ctx.req.param('number'));
     const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100;
     const headers =
         config.github && config.github.access_token
@@ -55,7 +55,7 @@ async function handler(ctx) {
                   Accept: 'application/vnd.github.v3+json',
               };
 
-    return await (isNaN(number) ? allIssues(ctx, user, repo, limit, headers) : singleIssue(ctx, user, repo, number, limit, headers));
+    return await (Number.isNaN(number) ? allIssues(ctx, user, repo, limit, headers) : singleIssue(ctx, user, repo, number, limit, headers));
 }
 
 async function allIssues(ctx, user, repo, limit, headers) {

package/lib/routes/github/contributors.ts

@@ -52,7 +52,7 @@ async function handler(ctx) {
         const url_base = last_page_link.match(/<(.*)page=\d*/)[1];
         const page_count = Number(last_page_link.match(/page=(\d*)/)[1]);
 
-        const generate_array = (n) => [...Array(n - 1)].map((_, index) => index + 2);
+        const generate_array = (n) => Array.from({ length: n - 1 }).map((_, index) => index + 2);
         const page_array = generate_array(page_count);
 
         // Get everypage

package/lib/routes/github/pulse.ts

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

package/lib/routes/github/trending.ts

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

package/lib/routes/gitpod/blog.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/gofans/index.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 { parseDate } from '@/utils/parse-date';

package/lib/routes/google/citations.ts

@@ -40,7 +40,7 @@ async function handler(ctx) {
     const name = $('#gsc_prf_in').text();
     const description = `Google Scholar Citation Monitor: ${name}; Profile: ${profile}; HomePage: ${homePage}`;
 
-    const list = $('#gsc_a_b .gsc_a_tr').get();
+    const list = $('#gsc_a_b .gsc_a_tr').toArray();
 
     const out = list.map((item) => {
         const $ = load(item);

package/lib/routes/google/fonts.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 { config } from '@/config';

package/lib/routes/google/news.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 ofetch from '@/utils/ofetch';

package/lib/routes/google/scholar.ts

@@ -48,7 +48,7 @@ async function handler(ctx) {
     });
 
     const $ = load(response.data);
-    const list = $('#gs_res_ccl_mid .gs_r.gs_or.gs_scl .gs_ri').get();
+    const list = $('#gs_res_ccl_mid .gs_r.gs_or.gs_scl .gs_ri').toArray();
 
     const out = list.map((item) => {
         const $ = load(item);

package/lib/routes/google/search.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/gov/caac/cjwt.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 timezone from '@/utils/timezone';

package/lib/routes/gov/chinatax/latest.ts

@@ -37,15 +37,15 @@ async function handler() {
     const $ = load(response.data);
     const list = $('ul.list.whlist li')
         .slice(0, 10)
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const a = item.find('a');
             return {
                 title: a.text(),
                 link: new URL(a.attr('href'), `http://www.chinatax.gov.cn`).toString(),
             };
-        })
-        .get();
+        });
     const items = await Promise.all(
         list.map((item) =>
             cache.tryGet(item.link, async () => {

package/lib/routes/gov/cmse/fxrw.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 { load } from 'cheerio';

package/lib/routes/gov/cmse/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 cache from '@/utils/cache';

package/lib/routes/gov/csrc/news.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';
@@ -43,7 +41,7 @@ async function handler(ctx) {
 
         out = data.data.data.results.map((item) => ({
             title: item.title,
-            description: item.contentHtml + art(path.join(__dirname, 'templates', 'attachment.art'), { attachments: item.resList }),
+            description: item.contentHtml + art(path.join(__dirname, 'templates/attachment.art'), { attachments: item.resList }),
             pubDate: parseDate(item.publishedTime, 'x'),
             link: item.url,
         }));

package/lib/routes/gov/forestry/gjlckjdjt.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/gov/general/general.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import { getSubPath } from '@/utils/common-utils';
 import cache from '@/utils/cache';
 // 来人拯救一下啊( >﹏<。)
@@ -187,7 +184,7 @@ const gdgov = async (info, ctx) => {
                     return {
                         link,
                         title: data.art_title,
-                        description: art(__dirname + '/templates/zcjdpt.art', data),
+                        description: art(path.join(__dirname, 'templates/zcjdpt.art'), data),
                         pubDate: timezone(parseDate(data.pub_time), +8),
                         author: /(本|本网|本站)/.test(data.pub_unite) ? authorisme : data.pub_unite,
                     };

package/lib/routes/gov/guangdong/tqyb/sncsyjxh.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 { art } from '@/utils/render';

package/lib/routes/gov/guangdong/tqyb/tfxtq.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 { art } from '@/utils/render';

package/lib/routes/gov/hangzhou/zwfw.ts

@@ -1,6 +1,5 @@
 import { Route } from '@/types';
 import { load } from 'cheerio';
-const __dirname = getCurrentPath(import.meta.url);
 
 import puppeteer from '@/utils/puppeteer';
 import ofetch from '@/utils/ofetch';
@@ -11,7 +10,6 @@ import { crawler, analyzer } from './zjzwfw';
 import timezone from '@/utils/timezone';
 import path from 'node:path';
 import { art } from '@/utils/render';
-import { getCurrentPath } from '@/utils/helpers';
 
 export const route: Route = {
     path: '/hangzhou/zwfw',

package/lib/routes/gov/huizhou/zwgk/index.ts

@@ -34,12 +34,12 @@ async function handler(ctx) {
     const $ = load(response.data);
     const title = $('span#navigation').children('a').last().text();
     const list = $('ul.ul_art_row')
-        .map((_, item) => ({
+        .toArray()
+        .map((item) => ({
             title: $(item).find('a').text().trim(),
             link: $(item).find('a').attr('href'),
             pubDate: timezone(parseDate($(item).find('li.li_art_date').text().trim()), +8),
-        }))
-        .get();
+        }));
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/gov/hunan/changsha/major-email.ts

@@ -42,7 +42,8 @@ async function handler() {
     const $ = load(listPage.data);
     const list = $('.table1 tbody tr')
         .slice(1)
-        .map((_, tr) => {
+        .toArray()
+        .map((tr) => {
             tr = $(tr);
 
             return {
@@ -50,8 +51,7 @@ async function handler() {
                 link: baseUrl + tr.find('td[title] > a').attr('href'),
                 author: tr.find('td:last').text(),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/gov/jiangsu/wlt/index.ts

@@ -1,5 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
 
 import cache from '@/utils/cache';
 import got from '@/utils/got';
@@ -8,8 +7,6 @@ import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import path from 'node:path';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 export const route: Route = {
     path: '/jiangsu/wlt/:page?',
     categories: ['government'],
@@ -51,7 +48,8 @@ async function handler(ctx) {
 
     const $ = load(response.data);
     const list = $('.tg_tb1')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             const i = $(item);
             const id = i.prop('onclick').match(/openDetail\('(\d+)'\)/)?.[1] || '';
             return {
@@ -61,7 +59,6 @@ async function handler(ctx) {
                 pubDate: '',
             };
         })
-        .get()
         .filter((e) => e.link);
     const items = await Promise.all(
         list.map((item) =>