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

package/lib/routes/flyert/creditcard.ts

@@ -6,7 +6,7 @@ import util from './utils';
 import iconv from 'iconv-lite';
 
 const gbk2utf8 = (s) => iconv.decode(s, 'gbk');
-const host = 'https://www.flyert.com';
+const host = 'https://www.flyert.com.cn';
 
 export const route: Route = {
     path: '/creditcard/:bank',
@@ -23,7 +23,7 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['flyert.com/'],
+            source: ['flyert.com.cn/'],
         },
     ],
     name: '信用卡',
@@ -123,13 +123,13 @@ async function handler(ctx) {
 
     const $ = load(gbk2utf8(response.data));
 
-    const list = $("[id*='normalthread']").get();
+    const list = $("[id*='normalthread']").toArray();
 
     const result = await util.ProcessFeed(list, cache);
 
     return {
         title: `飞客茶馆信用卡 - ${bankname}`,
-        link: 'https://www.flyert.com/',
+        link: 'https://www.flyert.com.cn/',
         description: `飞客茶馆信用卡 - ${bankname}`,
         item: result,
     };

package/lib/routes/flyert/namespace.ts

@@ -2,7 +2,7 @@ import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
     name: '飞客茶馆',
-    url: 'flyert.com',
+    url: 'flyert.com.cn',
     description: '',
     lang: 'zh-CN',
 };

package/lib/routes/flyert/preferential.ts

@@ -41,12 +41,12 @@ async function handler() {
 
     const $ = load(gbk2utf8(response.data));
     const list = $('.comiis_wzli')
-        .map((_index, item) => ({
+        .toArray()
+        .map((item) => ({
             title: $(item).find('.wzbt').text(),
             link: `${host}/${$(item).find('.wzbt a').attr('href')}`,
             description: $(item).find('.wznr > div:first-child').text(),
-        }))
-        .get();
+        }));
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/flyert/util.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import { CheerioAPI } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';

package/lib/routes/flyert/utils.ts

@@ -1,18 +1,22 @@
 import got from '@/utils/got';
 import { load } from 'cheerio';
-import * as url from 'node:url';
 import iconv from 'iconv-lite';
+import pMap from 'p-map';
+import wait from '@/utils/wait';
 
 const gbk2utf8 = (s) => iconv.decode(s, 'gbk');
 
-// 加载文章页
 async function loadContent(link) {
+    // 添加随机延迟，假设延迟时间在1000毫秒到3000毫秒之间
+    const randomDelay = Math.floor(Math.random() * (3000 - 1000 + 1)) + 1000;
+    await wait(randomDelay);
+
     const response = await got.get(link, {
         responseType: 'buffer',
     });
     const $ = load(gbk2utf8(response.data));
 
-    // 去除全文末尾多与内容
+    // 去除全文末尾多余内容
     $('.lookMore').remove();
     $('script, style').remove();
     $('#loginDialog').remove();
@@ -23,7 +27,7 @@ async function loadContent(link) {
     // 修改图片中的链接
     firstpost.find('ignore_js_op img').each(function () {
         $(this).attr('src', $(this).attr('file'));
-        // remove useless atrributes
+        // 移除无用属性
         for (const attr of ['id', 'aid', 'zoomfile', 'file', 'zoomfile', 'class', 'onclick', 'title', 'inpost', 'alt', 'onmouseover']) {
             $(this).removeAttr(attr);
         }
@@ -34,23 +38,24 @@ async function loadContent(link) {
     firstpost.find('ignore_js_op').remove();
     firstpost.append(images);
 
-    // // 提取内容
+    // 提取内容
     const description = firstpost.html();
 
     return { description };
 }
 
 const ProcessFeed = (list, caches) => {
-    const host = 'https://www.flyert.com';
+    const host = 'https://www.flyert.com.cn';
 
-    return Promise.all(
-        list.map(async (item) => {
+    return pMap(
+        list,
+        async (item) => {
             const $ = load(item);
 
             const $label = $(".comiis_common a[data-track='版块页主题分类']");
             const $title = $(".comiis_common a[data-track='版块页文章']");
             // 还原相对链接为绝对链接
-            const itemUrl = url.resolve(host, $title.attr('href'));
+            const itemUrl = new URL($title.attr('href'), host).href;
 
             // 列表上提取到的信息
             const single = {
@@ -65,8 +70,9 @@ const ProcessFeed = (list, caches) => {
 
             // 合并解析后的结果集作为该篇文章最终的输出结果
             return Object.assign({}, single, other);
-        })
-    );
+        },
+        { concurrency: 2 }
+    ); // 设置并发请求数量为 2
 };
 
 export default { ProcessFeed };

package/lib/routes/focustaiwan/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/followin/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 { parseDate } from '@/utils/parse-date';

package/lib/routes/foresightnews/util.ts

@@ -1,11 +1,8 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import path from 'node:path';
-import zlib from 'zlib';
+import zlib from 'node:zlib';
 
 const constants = {
     labelHot: '热门',
@@ -26,18 +23,16 @@ const imgRootUrl = 'https://img.foresightnews.pro';
 const icon = new URL('foresight.ico', rootUrl).href;
 const image = new URL('vertical_logo.png', imgRootUrl).href;
 
-const processItems = async (apiUrl, limit, ...searchParams) => {
-    searchParams = {
-        ...searchParams.reduce(
-            (result, object) => ({
-                ...result,
-                ...object,
-            }),
-            {}
-        ),
-
+const processItems = async (apiUrl, limit, ...parameters) => {
+    let searchParams = {
         size: limit,
     };
+    for (const param of parameters) {
+        searchParams = {
+            ...searchParams,
+            ...param,
+        };
+    }
 
     const info = {
         column: '',

package/lib/routes/fosshub/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 { load } from 'cheerio';

package/lib/routes/freecomputerbooks/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 { load } from 'cheerio';

package/lib/routes/ft/myft.ts

@@ -55,12 +55,12 @@ async function handler(ctx) {
                 item.category = [
                     $('.n-content-tag--with-follow').text(),
                     ...$('.article__right-bottom a.concept-list__concept')
-                        .map((i, e) => $(e).text().trim())
-                        .get(),
+                        .toArray()
+                        .map((e) => $(e).text().trim()),
                 ];
                 item.author = $('a.n-content-tag--author')
-                    .map((i, e) => ({ name: $(e).text() }))
-                    .get();
+                    .toArray()
+                    .map((e) => ({ name: $(e).text() }));
 
                 return item;
             })

package/lib/routes/furstar/artists.ts

@@ -38,8 +38,8 @@ async function handler(ctx) {
     });
     const $ = load(res.data);
     const artists = $('.filter-item')
-        .map((i, e) => utils.authorDetail(e))
-        .get();
+        .toArray()
+        .map((e) => utils.authorDetail(e));
     artists.shift(); // the first one is "show all"
 
     return {

package/lib/routes/furstar/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';
@@ -53,12 +50,12 @@ const detailPage = (link, cache) =>
         const title = $('.row .panel-heading h2').text().trim(); // Get first title
         const desc = $('.character-description p').text().trim();
         const pics = $('.img-gallery .prettyPhoto')
-            .map((i, e) => {
+            .toArray()
+            .map((e) => {
                 const p = load(e);
                 const link = p('a').attr('href').trim();
-                return `${base}/${link.substring(2)}`;
-            })
-            .get();
+                return `${base}/${link.slice(2)}`;
+            });
 
         return {
             title,
@@ -72,18 +69,16 @@ const fetchAllCharacters = (data, base) => {
     // All character page
     const $ = load(data);
     const characters = $('.character-article');
-    const info = characters
-        .map((i, e) => {
-            const c = load(e);
-            const r = {
-                title: c('.character-headline').text().trim(),
-                headImage: c('.character-images img').attr('src').trim(),
-                detailPage: `${base}/${c('.character-images a').attr('href').trim()}`,
-                author: authorDetail(c('.character-description').html()),
-            };
-            return r;
-        })
-        .get();
+    const info = characters.toArray().map((e) => {
+        const c = load(e);
+        const r = {
+            title: c('.character-headline').text().trim(),
+            headImage: c('.character-images img').attr('src').trim(),
+            detailPage: `${base}/${c('.character-images a').attr('href').trim()}`,
+            author: authorDetail(c('.character-description').html()),
+        };
+        return r;
+    });
 
     return info;
 };

package/lib/routes/futunn/main.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/fx-markets/channel.ts

@@ -34,19 +34,17 @@ async function handler(ctx) {
     const title = `FX-Markets ${pageTitle}`;
 
     const items = $('div#listings').children();
-    const articles = items
-        .map((i, el) => {
-            const $el = $(el);
-            const $titleEl = $el.find('h5 > a');
-            const articleURL = `https://www.fx-markets.com${$titleEl.attr('href')}`;
-            const articleTitle = $titleEl.attr('title');
-            return {
-                title: articleTitle,
-                link: articleURL,
-                pubDate: parseDate($el.find('time').text()),
-            };
-        })
-        .get();
+    const articles = items.toArray().map((el) => {
+        const $el = $(el);
+        const $titleEl = $el.find('h5 > a');
+        const articleURL = `https://www.fx-markets.com${$titleEl.attr('href')}`;
+        const articleTitle = $titleEl.attr('title');
+        return {
+            title: articleTitle,
+            link: articleURL,
+            pubDate: parseDate($el.find('time').text()),
+        };
+    });
 
     const result = await Promise.all(
         articles.map((item) =>
@@ -54,7 +52,7 @@ async function handler(ctx) {
                 const res = await got(item.link);
                 const doc = load(res.data);
                 // This script holds publish datetime info {"datePublished": "2022-05-12T08:45:04+01:00"}
-                const dateScript = doc('script[type="application/ld+json"]').get()[0].children[0].data;
+                const dateScript = doc('script[type="application/ld+json"]').toArray()[0].children[0].data;
                 const re = /"datePublished": "(?<dateTimePub>.*)"/;
                 const dateStr = re.exec(dateScript).groups.dateTimePub;
                 const pubDateTime = parseDate(dateStr, 'YYYY-MM-DDTHH:mm:ssZ');

package/lib/routes/fx678/kx.ts

@@ -37,9 +37,9 @@ async function handler() {
     // 页面新闻消息列表
     const list = $('.body_zb ul .body_zb_li .zb_word')
         .find('.list_font_pic > a:first-child')
-        .map((i, e) => $(e).attr('href'))
+        .toArray()
         .slice(0, 30)
-        .get();
+        .map((e) => $(e).attr('href'));
 
     const out = await Promise.all(
         list.map((itemUrl) =>

package/lib/routes/fzmtr/announcements.ts

@@ -29,7 +29,8 @@ async function handler() {
 
     const $ = load(data);
     const list = $('span#resources li')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const url = `http://${domain}` + item.find('a').attr('href');
             const title = item.find('a').text();
@@ -40,8 +41,7 @@ async function handler() {
                 author: '福州地铁',
                 pubtime: publishTime,
             };
-        })
-        .get();
+        });
 
     return {
         title: '福州地铁通知公告',

package/lib/routes/gameapps/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 ofetch from '@/utils/ofetch';
@@ -76,7 +74,7 @@ async function handler() {
                     intro: $('div.introduction.media.news-intro div.media-body').html()?.trim(),
                     desc: content.html()?.trim(),
                 });
-                item.guid = item.guid.substring(0, item.link.lastIndexOf('/'));
+                item.guid = item.guid.slice(0, item.link.lastIndexOf('/'));
                 item.pubDate = parseDate(item.pubDate);
                 item.enclosure_url = $('div.introduction.media.news-intro div.media-left').find('img').attr('src');
                 item.enclosure_type = 'image/jpeg';

package/lib/routes/gamebase/news.ts

@@ -2,7 +2,6 @@ import { type Data, type DataItem, type Route, ViewType } from '@/types';
 
 import { art } from '@/utils/render';
 import cache from '@/utils/cache';
-import { getCurrentPath } from '@/utils/helpers';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
 import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
@@ -12,8 +11,6 @@ import { type CheerioAPI, load } from 'cheerio';
 import { type Context } from 'hono';
 import path from 'node:path';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 const types = {
     newslist: 'newsList',
     r18list: 'newsPornList',

package/lib/routes/gamer/gnn-index.ts

@@ -95,7 +95,8 @@ async function handler(ctx) {
         .children()
         .not('p,a,img,span')
         .slice(0, limit)
-        .map((index, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             let aLabelNode;
             let tag;
@@ -113,8 +114,7 @@ async function handler(ctx) {
                 title: '[' + tag + ']' + aLabelNode.text(),
                 link: aLabelNode.attr('href').replace('//', 'https://'),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map(async (item) => {

package/lib/routes/gamer/hot.ts

@@ -35,13 +35,13 @@ async function handler(ctx) {
 
     const $ = load(response.data);
     const list = $('div.FM-abox2A a.FM-abox2B')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             return {
                 link: `https:${item.attr('href')}`,
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/gamersky/utils.ts

@@ -89,6 +89,6 @@ export const getArticle = (item) =>
     }) as Promise<DataItem>;
 
 export function mdTableBuilder(data: idNameMap[]) {
-    const table = '|' + data.map((item) => `${item.type}|`).join('') + '\n|' + Array(data.length).fill('---|').join('') + '\n|' + data.map((item) => `${item.name}|`).join('') + '\n';
+    const table = '|' + data.map((item) => `${item.type}|`).join('') + '\n|' + Array.from({ length: data.length }).fill('---|').join('') + '\n|' + data.map((item) => `${item.name}|`).join('') + '\n';
     return table;
 }

package/lib/routes/gcores/articles.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/gcores/categories.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);
-
 let viewType: ViewType = ViewType.Articles;
 
 export const handler = async (ctx: Context): Promise<Data> => {

package/lib/routes/gcores/collections.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);
-
 let viewType: ViewType = ViewType.Articles;
 
 export const handler = async (ctx: Context): Promise<Data> => {

package/lib/routes/gcores/news.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/gcores/parser.ts

@@ -1,10 +1,7 @@
 import { art } from '@/utils/render';
-import { getCurrentPath } from '@/utils/helpers';
 
 import path from 'node:path';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 interface Style {
     [key: string]: string;
 }
@@ -225,7 +222,7 @@ const parseBlock = (block: Block, entityMap: Readonly<Record<string, Entity>>):
         lastOffset = range.offset + range.length;
     }
 
-    resultParts.push(text.substring(lastOffset));
+    resultParts.push(text.slice(lastOffset));
 
     return `${blockType.element ? `<${blockType.element}>` : ''}${resultParts.join('').replaceAll('\n', '<br>')}${blockType.element ? `</${blockType.element}>` : ''}`;
 };

package/lib/routes/gcores/program-previews.ts

@@ -0,0 +1,47 @@
+import { type Data, type Route, ViewType } from '@/types';
+
+import { type Context } from 'hono';
+
+import { baseUrl, processItems } from './util';
+
+export const handler = async (ctx: Context): Promise<Data> => {
+    const limit: number = Number.parseInt(ctx.req.query('limit') ?? '30', 10);
+
+    const targetUrl: string = new URL('radios/preview', baseUrl).href;
+    const apiUrl: string = new URL('gapi/v1/program-previews', baseUrl).href;
+
+    const query = {
+        'page[limit]': limit,
+        include: 'radio.djs,video.djs,radio.category,video.category',
+    };
+
+    return await processItems(limit, query, apiUrl, targetUrl);
+};
+
+export const route: Route = {
+    path: '/radios/preview',
+    name: '预告',
+    url: 'www.gcores.com',
+    maintainers: ['nczitzk'],
+    handler,
+    example: '/gcores/radios/preview',
+    parameters: undefined,
+    description: undefined,
+    categories: ['game'],
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['www.gcores.com/radios/preview'],
+            target: '/gcores/radios/preview',
+        },
+    ],
+    view: ViewType.Notifications,
+};

package/lib/routes/gcores/radio.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import { art } from '@/utils/render';
 import { parseDate } from '@/utils/parse-date';
@@ -46,17 +44,17 @@ async function handler(ctx) {
 
     const api = getApi(category);
     api.searchParams.set('include', 'media');
-    api.searchParams.set('page[limit]', limit);
+    api.searchParams.set('page[limit]', limit.toString());
     api.searchParams.set('sort', '-published-at');
     api.searchParams.set('filter[list-all]', '0');
     api.searchParams.set('filter[is-require-privilege]', '0');
     api.searchParams.set('fields[radios]', 'title,cover,published-at,duration,content,media');
     const { data, included } = await get(api);
 
-    const audios = included.reduce((result, media) => {
-        result[media.id] = media.attributes.audio;
-        return result;
-    }, {});
+    const audios = {};
+    for (const media of included) {
+        audios[media.id] = media.attributes.audio;
+    }
 
     const item = data.map((radio) => {
         const { id, attributes, relationships } = radio;

package/lib/routes/gcores/tags.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);
-
 let viewType: ViewType = ViewType.Articles;
 
 export const handler = async (ctx: Context): Promise<Data> => {

package/lib/routes/gcores/topics.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 { id } = ctx.req.param();
     const limit: number = Number.parseInt(ctx.req.query('limit') ?? '30', 10);