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

package/lib/routes/xjtu/ee.ts

@@ -40,7 +40,8 @@ async function handler(ctx) {
     const feed_title = $('span.windowstyle67278', "div[class='list_right fr']").text().trim();
 
     const list = $("div[class='list_right fr'] ul li")
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const a = item.find('a');
             const date = parseDate(item.find('span').text());
@@ -49,8 +50,7 @@ async function handler(ctx) {
                 link: new URL(a.attr('href'), baseUrl).href,
                 pubDate: timezone(date, +8),
             };
-        })
-        .get();
+        });
 
     return {
         title: `西安交通大学电气学院 - ${feed_title}`,

package/lib/routes/xjtu/gs/tzgg.ts

@@ -37,7 +37,8 @@ async function handler() {
     const $ = load(response.data);
     const list = $('div.list_right_con ul li')
         .slice(0, 10)
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const a = item.find('a');
             return {
@@ -45,8 +46,7 @@ async function handler() {
                 link: new URL(a.attr('href'), 'http://gs.xjtu.edu.cn/').href,
                 pubDate: parseDate(item.find('span.time').text()),
             };
-        })
-        .get();
+        });
 
     return {
         title: '西安交通大学研究生院 - 通知公告',

package/lib/routes/xjtu/job.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/xjtu/std.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/xjtu/zs.ts

@@ -0,0 +1,171 @@
+import { type Data, type DataItem, type Route, ViewType } from '@/types';
+
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+
+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> => {
+    const { category = 'zsxx1/zskx' } = ctx.req.param();
+    const limit: number = Number.parseInt(ctx.req.query('limit') ?? '30', 10);
+
+    const baseUrl: string = 'https://zs.xjtu.edu.cn';
+    const targetUrl: string = new URL(`${category}.htm`, baseUrl).href;
+
+    const response = await ofetch(targetUrl);
+    const $: CheerioAPI = load(response);
+    const language = $('html').attr('lang') ?? 'zh';
+
+    let items: DataItem[] = [];
+
+    items = $('section.TextList ul li')
+        .slice(0, limit)
+        .toArray()
+        .map((el): Element => {
+            const $el: Cheerio<Element> = $(el);
+            const $aEl: Cheerio<Element> = $el.find('a.flex');
+
+            const title: string = $aEl.text();
+            const pubDateStr: string | undefined = $el.find('b').text();
+            const linkUrl: string | undefined = $aEl.attr('href');
+            const categoryEls: Element[] = $el.find('i.zc').toArray();
+            const categories: string[] = [...new Set(categoryEls.map((el) => $(el).text()).filter(Boolean))];
+            const upDatedStr: string | undefined = pubDateStr;
+
+            const processedItem: DataItem = {
+                title,
+                pubDate: pubDateStr ? parseDate(pubDateStr) : undefined,
+                link: linkUrl ? new URL(linkUrl, targetUrl).href : undefined,
+                category: categories,
+                updated: upDatedStr ? parseDate(upDatedStr) : undefined,
+                language,
+            };
+
+            return processedItem;
+        });
+
+    items = (
+        await Promise.all(
+            items.map((item) => {
+                if (!item.link) {
+                    return item;
+                }
+
+                return cache.tryGet(item.link, async (): Promise<DataItem> => {
+                    const detailResponse = await ofetch(item.link);
+                    const $$: CheerioAPI = load(detailResponse);
+
+                    const title: string = $$('div.show01 h5').text();
+                    const description: string | undefined = $$('div.v_news_content').html();
+                    const pubDateStr: string | undefined = $$('div.show01 i')
+                        .text()
+                        ?.match(/(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})/)?.[1];
+                    const categoryEls: Element[] = $$('div.mianbao a').toArray().slice(1);
+                    const categories: string[] = [...new Set(categoryEls.map((el) => $$(el).text()).filter(Boolean))];
+                    const upDatedStr: string | undefined = pubDateStr;
+
+                    const processedItem: DataItem = {
+                        title,
+                        description,
+                        pubDate: pubDateStr ? timezone(parseDate(pubDateStr), +8) : item.pubDate,
+                        category: categories,
+                        content: {
+                            html: description,
+                            text: description,
+                        },
+                        updated: upDatedStr ? timezone(parseDate(upDatedStr), +8) : item.updated,
+                        language,
+                    };
+
+                    return {
+                        ...item,
+                        ...processedItem,
+                    };
+                });
+            })
+        )
+    ).filter((_): _ is DataItem => true);
+
+    const title: string = $('title').text();
+
+    return {
+        title,
+        description: title.split(/-/)[0],
+        link: targetUrl,
+        item: items,
+        allowEmpty: true,
+        image: $('div.logoimg img').attr('src'),
+        author: $('META[Name="keywords"]').attr('Content'),
+        language,
+        id: targetUrl,
+    };
+};
+
+export const route: Route = {
+    path: '/zs/:category{.+}?',
+    name: '本科招生网',
+    url: 'zs.xjtu.edu.cn',
+    maintainers: ['nczitzk'],
+    handler,
+    example: '/xjtu/zs/zsxx1/zskx',
+    parameters: {
+        category: {
+            description: '分类，默认为 zsxx1/zskx，可在对应分类页 URL 中找到',
+            options: [
+                {
+                    label: '招生快讯',
+                    value: 'zsxx1/zskx',
+                },
+                {
+                    label: '招生政策',
+                    value: 'zsxx1/zszc',
+                },
+                {
+                    label: '招生计划',
+                    value: 'zsxx1/zsjh',
+                },
+                {
+                    label: '阳光公告',
+                    value: 'zsxx1/yggg',
+                },
+                {
+                    label: '历年录取',
+                    value: 'zsxx1/lnlq',
+                },
+            ],
+        },
+    },
+    description: `:::tip
+若订阅 [招生快讯](https://zs.xjtu.edu.cn/zsxx1/zskx.htm)，网址为 \`https://zs.xjtu.edu.cn/zsxx1/zskx.htm\`，请截取 \`https://zs.xjtu.edu.cn/\` 到末尾 \`.htm\` 的部分 \`zsxx1/zskx\` 作为 \`category\` 参数填入，此时目标路由为 [\`/xjtu/zs/zsxx1/zskx\`](https://rsshub.app/xjtu/zs/zsxx1/zskx)。
+:::
+
+| [招生快讯](https://zs.xjtu.edu.cn/zsxx1/zskx.htm)   | [招生政策](https://zs.xjtu.edu.cn/zsxx1/zszc.htm)   | [招生计划](https://zs.xjtu.edu.cn/zsxx1/zsjh.htm)   | [阳光公告](https://zs.xjtu.edu.cn/zsxx1/yggg.htm)   | [历年录取](https://zs.xjtu.edu.cn/zsxx1/lnlq.htm)   |
+| --------------------------------------------------- | --------------------------------------------------- | --------------------------------------------------- | --------------------------------------------------- | --------------------------------------------------- |
+| [zsxx1/zskx](https://rsshub.app/xjtu/zs/zsxx1/zskx) | [zsxx1/zszc](https://rsshub.app/xjtu/zs/zsxx1/zszc) | [zsxx1/zsjh](https://rsshub.app/xjtu/zs/zsxx1/zsjh) | [zsxx1/yggg](https://rsshub.app/xjtu/zs/zsxx1/yggg) | [zsxx1/lnlq](https://rsshub.app/xjtu/zs/zsxx1/lnlq) |
+`,
+    categories: ['university'],
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['zs.xjtu.edu.cn/:category'],
+            target: (params) => {
+                const category: string = params.category;
+
+                return `/xjtu/zs${category ? `/${category}` : ''}`;
+            },
+        },
+    ],
+    view: ViewType.Articles,
+};

package/lib/routes/xkb/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/xmanhua/index.ts

@@ -61,21 +61,19 @@ async function handler(ctx) {
     }
     // 最新一话的地址
     const updatedOne = $('div.detail-list-form-title span.s a').attr('href');
-    const items = list
-        .map((index, item) => {
-            item = $(item);
-            const itemTitle = item.text();
-            const itemUrl = item.attr('href');
-            const itemDate = itemUrl === updatedOne ? parseDate(newOneDate) : '';
-            return {
-                title: itemTitle,
-                link: host + itemUrl,
-                auther: autherName,
-                pubDate: itemDate,
-                guid: host + itemUrl,
-            };
-        })
-        .get();
+    const items = list.toArray().map((item) => {
+        item = $(item);
+        const itemTitle = item.text();
+        const itemUrl = item.attr('href');
+        const itemDate = itemUrl === updatedOne ? parseDate(newOneDate) : '';
+        return {
+            title: itemTitle,
+            link: host + itemUrl,
+            auther: autherName,
+            pubDate: itemDate,
+            guid: host + itemUrl,
+        };
+    });
     const name = $('body > div.detail-info-1 > div > div > p.detail-info-title').text();
     const description_ = finished ? '已完结' : '连载中';
     return {

package/lib/routes/xmut/jwc/bkjw.ts

@@ -25,7 +25,8 @@ async function handler(ctx) {
     });
     const $ = load(res.data);
     const itemsArray = $('#result_list table tbody tr')
-        .map((index, row) => {
+        .toArray()
+        .map((row) => {
             const res = $('td', row).eq(0);
             const resDate = $('td', row).eq(1);
             const resLink = $('a', res).attr('href');
@@ -43,8 +44,7 @@ async function handler(ctx) {
                 link,
                 pubDate,
             };
-        })
-        .get();
+        });
     const items = await Promise.all(
         itemsArray.map((item) =>
             cache.tryGet(item.link, async () => {

package/lib/routes/xueqiu/stock-comments.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/xys/new.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/xyzrank/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/yahoo/news/listid.ts

@@ -58,7 +58,7 @@ async function handler(ctx) {
 
     const author = items[0].author;
     const atIndex = author.indexOf('@'); // fing '@'
-    const source = atIndex === -1 ? author : author.substring(atIndex + 1).trim();
+    const source = atIndex === -1 ? author : author.slice(atIndex + 1).trim();
     // console.log(source);
 
     return {

package/lib/routes/yahoo/news/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/yamibo/bbs/forum.ts

@@ -3,7 +3,8 @@ import type { Context } from 'hono';
 import { config } from '@/config';
 import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
-import { asyncPoolAll, fetchThread, generateDescription, getDate, bbsOrigin } from '../utils';
+import { fetchThread, generateDescription, getDate, bbsOrigin } from '../utils';
+import pMap from 'p-map';
 import cache from '@/utils/cache';
 
 export const route: Route = {
@@ -81,8 +82,7 @@ async function handler(ctx: Context): Promise<Data> {
             };
         });
 
-    items = await asyncPoolAll(
-        5,
+    items = await pMap(
         items,
         async (item) =>
             (await cache.tryGet(item.link!, async () => {
@@ -105,7 +105,8 @@ async function handler(ctx: Context): Promise<Data> {
                     description,
                     pubDate: item.pubDate,
                 };
-            })) as DataItem
+            })) as DataItem,
+        { concurrency: 5 }
     );
 
     return {

package/lib/routes/yamibo/utils.ts

@@ -2,7 +2,6 @@ import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 import ofetch from '@/utils/ofetch';
 import { config } from '@/config';
-import asyncPool from 'tiny-async-pool';
 import { JSDOM } from 'jsdom';
 import type { Cheerio, Element } from 'cheerio';
 
@@ -104,11 +103,3 @@ export function generateDescription($item: Cheerio<Element>, postId: string) {
 
     return description;
 }
-
-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;
-}

package/lib/routes/ycwb/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/yenpress/series.ts

@@ -8,11 +8,8 @@ import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import path from 'node:path';
-import { getCurrentPath } from '@/utils/helpers';
 
-const __dirname = getCurrentPath(import.meta.url);
-
-const render = (data) => art(path.join(__dirname, 'templates', 'series.art'), data);
+const render = (data) => art(path.join(__dirname, 'templates/series.art'), data);
 
 export const route: Route = {
     path: '/series/:name',

package/lib/routes/ygkkk/rss.ts

@@ -24,7 +24,8 @@ async function handler() {
     const title_main = $('channel > title').text();
     const description_main = $('channel > description').text();
     const items = $('channel > item')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             const $item = $(item);
             const link = $item.find('link').text();
             const title = $item.find('title').text();
@@ -36,8 +37,7 @@ async function handler() {
                 title,
                 description,
             };
-        })
-        .get();
+        });
 
     return {
         title: title_main,

package/lib/routes/yicai/dt.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/yicai/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 timezone from '@/utils/timezone';

package/lib/routes/yilinzazhi/latest.ts

@@ -68,7 +68,7 @@ async function handler(): Promise<Data> {
                 .toArray()
                 .map<Data>((aTag) => {
                     const href = $$(aTag).attr('href')!;
-                    const yearType = currentYear + href.substring(4, 5);
+                    const yearType = currentYear + href.slice(4, 5);
                     return {
                         title: $$(aTag).text(),
                         link: `${baseUrl}${currentYear}/yl${yearType}/${href}`,

package/lib/routes/ymgal/game.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';
@@ -52,7 +50,7 @@ async function handler() {
             item = $(item);
             const itemPicUrl = item.find('.lazy').first().attr('data-original');
             const tags = item.find('.tag-info-list').children();
-            const taginfo = tags.map((i, elem) => $(elem).text()).get();
+            const taginfo = tags.toArray().map((elem) => $(elem).text());
             return {
                 title: item.attr('title'),
                 link: `${host}${item.attr('href')}`,

package/lib/routes/yoasobi-music/info.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/yoasobi-music/live.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 { parseJSONP } from './jsonp-helper';

package/lib/routes/yoasobi-music/media.ts

@@ -1,8 +1,6 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { parseJSONP } from './jsonp-helper';
 import { art } from '@/utils/render';
 import path from 'node:path';
@@ -40,13 +38,10 @@ async function handler() {
     const officialUrl = 'https://www.yoasobi-music.jp/media';
     const title = 'LATEST MEDIA';
 
-    const response = await got({
-        method: 'get',
-        url: api,
-    });
+    const response = await ofetch(api);
 
     const data = Object.values(parseJSONP(response.data).items)
-        .reduce((p, c) => [...p, ...c])
+        .flat()
         .sort((a, b) => new Date(b.date) - new Date(a.date))
         .map((item) => ({
             date: item.date,

package/lib/routes/yomujp/level.ts

@@ -42,7 +42,8 @@ async function handler(ctx) {
         const description = $('section')
             .slice(2, -2)
             .find('.elementor-widget-text-editor>div,.elementor-widget-image>div>img')
-            .map((_, el) => {
+            .toArray()
+            .map((el) => {
                 if (el.tagName === 'img') {
                     return `<img src=${el.attribs.src} />`;
                 } else if (el.firstChild.tagName === 'p') {
@@ -51,7 +52,6 @@ async function handler(ctx) {
                     return `<p>${$(el).html()}</p>`;
                 }
             })
-            .get()
             .join('');
 
         return {

package/lib/routes/youku/channel.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';
@@ -53,32 +51,30 @@ async function handler(ctx) {
         title: $('.username').text(),
         link: `https://i.youku.com/i/${channelId}`,
         description: $('.desc').text(),
-        item:
-            list &&
-            list
-                .map((_, item) => {
-                    item = $(item);
-                    const title = item.find('a.videoitem_videolink').attr('title');
-                    const cover = item.find('a.videoitem_videolink > img').attr('src');
-                    const $link = item.find('a.videoitem_videolink');
-                    const link = $link.length > 0 ? `https:${$link.attr('href')}` : null;
-                    const dateText = item.find('p.videoitem_subtitle').text().split('-').length === 2 ? `${new Date().getFullYear()}-${item.find('p.videoitem_subtitle').text()}` : item.find('p.videoitem_subtitle').text();
-                    const pubDate = parseDate(dateText);
+        item: list
+            .toArray()
+            .map((item) => {
+                item = $(item);
+                const title = item.find('a.videoitem_videolink').attr('title');
+                const cover = item.find('a.videoitem_videolink > img').attr('src');
+                const $link = item.find('a.videoitem_videolink');
+                const link = $link.length > 0 ? `https:${$link.attr('href')}` : null;
+                const dateText = item.find('p.videoitem_subtitle').text().split('-').length === 2 ? `${new Date().getFullYear()}-${item.find('p.videoitem_subtitle').text()}` : item.find('p.videoitem_subtitle').text();
+                const pubDate = parseDate(dateText);
 
-                    return link
-                        ? {
-                              title,
-                              description: art(path.join(__dirname, 'templates/channel.art'), {
-                                  embed,
-                                  videoId: path.parse(link).name.replaceAll(/^id_/g, ''),
-                                  cover,
-                              }),
-                              link,
-                              pubDate,
-                          }
-                        : null;
-                })
-                .get()
-                .filter(Boolean),
+                return link
+                    ? {
+                          title,
+                          description: art(path.join(__dirname, 'templates/channel.art'), {
+                              embed,
+                              videoId: path.parse(link).name.replaceAll(/^id_/g, ''),
+                              cover,
+                          }),
+                          link,
+                          pubDate,
+                      }
+                    : null;
+            })
+            .filter(Boolean),
     };
 }