rsshub 1.0.0-master.fb6d4f3 → 1.0.0-master.fb7e42c

package/lib/routes/banshujiang/index.ts

@@ -377,7 +377,7 @@ export const route: Route = {
             ],
         },
     },
-    description: `:::tip
+    description: `::: tip
 订阅 [人工智能](https://banshujiang.cn//category/other/人工智能)，其源网址为 \`https://banshujiang.cn//category/other/人工智能\`，请参考该 URL 指定部分构成参数，此时路由为 [\`/banshujiang/category/other/人工智能\`](https://rsshub.app/banshujiang/other/人工智能)。
 :::
 

package/lib/routes/banyuetan/index.ts

@@ -174,7 +174,7 @@ export const route: Route = {
             ],
         },
     },
-    description: `:::tip
+    description: `::: tip
 订阅 [今日谈](http://www.banyuetan.org/byt/jinritan/)，其源网址为 \`http://www.banyuetan.org/byt/jinritan/\`，请参考该 URL 指定部分构成参数，此时路由为 [\`/banyuetan/jinritan\`](https://rsshub.app/banyuetan/jinritan)。
 :::
 

package/lib/routes/baozimh/index.ts

@@ -38,8 +38,8 @@ async function handler(ctx) {
     const response = await got(url);
     const $ = load(response.data);
     const comicTitle = $('div > div.pure-u-1-1.pure-u-sm-2-3.pure-u-md-3-4 > div > h1').text();
-    const list = $('#layout > div.comics-detail > div:nth-child(3) > div > div.pure-g')
-        .first() // 最新章节
+    const list = $('#chapter-items')
+        .first()
         .children()
         .toArray()
         .map((item) => {
@@ -52,8 +52,26 @@ async function handler(ctx) {
             };
         });
 
+    // more chapters
+    const otherList = $('#chapters_other_list')
+        .first()
+        .children()
+        .toArray()
+        .map((item) => {
+            const title = $(item).find('span').text();
+            const link = rootUrl + $(item).find('a').attr('href');
+
+            return {
+                title,
+                link,
+            };
+        });
+
+    const combinedList = [...list, ...otherList];
+    combinedList.reverse();
+
     const items = await Promise.all(
-        list.map((item) =>
+        combinedList.map((item) =>
             cache.tryGet(item.link, async () => {
                 const detailResponse = await got(item.link);
                 const $ = load(detailResponse.data);

package/lib/routes/baselang/index.ts

@@ -0,0 +1,117 @@
+import { Route, type Data } from '@/types';
+import ofetch from '@/utils/ofetch';
+import { parseDate } from '@/utils/parse-date';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
+import logger from '@/utils/logger';
+import { Context } from 'hono';
+
+type WordpressPost = {
+    id: number;
+    date: string;
+    date_gmt?: string;
+    link: string;
+    title?: { rendered?: string };
+    excerpt?: { rendered?: string };
+    content?: { rendered?: string };
+    _embedded?: {
+        author?: Array<{ name?: string }>;
+        'wp:term'?: Array<Array<{ name?: string }>>;
+    };
+};
+
+const ROOT_URL = 'https://baselang.com';
+const API_BASE = `${ROOT_URL}/wp-json/wp/v2`;
+
+// Supported categories and their WP IDs
+const CATEGORY_SLUG_TO_ID: Record<string, number> = {
+    'advanced-grammar': 5,
+    'basic-grammar': 4,
+    company: 8,
+    confidence: 9,
+    french: 24,
+    humor: 15,
+    medellin: 23,
+    motivation: 6,
+    pronunciation: 11,
+    'study-tips': 7,
+    'success-stories': 14,
+    travel: 13,
+    uncategorized: 1,
+    vocabulary: 12,
+};
+
+const CATEGORY_OPTIONS = Object.keys(CATEGORY_SLUG_TO_ID).map((slug) => ({ label: slug, value: slug }));
+
+export const route: Route = {
+    path: '/blog/:category?',
+    categories: ['blog'],
+    example: '/baselang/blog',
+    parameters: {
+        category: {
+            description: 'Optional category filter',
+            options: CATEGORY_OPTIONS,
+        },
+    },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['baselang.com/blog', 'baselang.com/blog/:category'],
+            target: '/blog/:category',
+        },
+    ],
+    name: 'Blog',
+    maintainers: ['johan456789'],
+    handler,
+};
+
+async function handler(ctx: Context): Promise<Data> {
+    const categoryParam = (ctx.req.param('category') ?? '').toLowerCase();
+    logger.debug(`BaseLang: received request, category='${categoryParam || 'all'}'`);
+
+    if (categoryParam && !Object.hasOwn(CATEGORY_SLUG_TO_ID, categoryParam)) {
+        logger.debug(`BaseLang: invalid category '${categoryParam}'`);
+        throw new InvalidParameterError(`Invalid category: ${categoryParam}. Valid categories are: ${Object.keys(CATEGORY_SLUG_TO_ID).join(', ')}`);
+    }
+
+    const searchParams: string[] = ['per_page=20', '_embed=author,wp:term'];
+    if (categoryParam) {
+        const id = CATEGORY_SLUG_TO_ID[categoryParam];
+        searchParams.push(`categories=${id}`);
+    }
+
+    const apiUrl = `${API_BASE}/posts?${searchParams.join('&')}`;
+
+    const data = await ofetch<WordpressPost[]>(apiUrl);
+    logger.debug(`BaseLang: fetched ${data.length} posts`);
+
+    const items = data.map((post) => ({
+        title: post.title?.rendered,
+        description: post.content?.rendered ?? post.excerpt?.rendered ?? '',
+        link: post.link,
+        pubDate: parseDate(post.date_gmt ?? post.date),
+        author: post._embedded?.author?.[0]?.name,
+        category: Array.isArray(post._embedded?.['wp:term'])
+            ? post._embedded['wp:term']
+                  .flat()
+                  .map((term: any) => term?.name)
+                  .filter(Boolean)
+            : undefined,
+    }));
+
+    const titleSuffix = categoryParam ? ` - ${categoryParam}` : '';
+    const link = categoryParam ? `${ROOT_URL}/blog/${categoryParam}/` : `${ROOT_URL}/blog/`;
+
+    return {
+        title: `BaseLang Blog${titleSuffix}`,
+        link,
+        language: 'en',
+        item: items,
+    } as Data;
+}

package/lib/routes/baselang/namespace.ts

@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'BaseLang',
+    lang: 'en',
+};

package/lib/routes/bbc/learningenglish.ts

@@ -1,8 +1,22 @@
-import { Route } from '@/types';
+import type { DataItem, Route } from '@/types';
 import cache from '@/utils/cache';
 import { load } from 'cheerio';
 import ofetch from '@/utils/ofetch';
 import { parseDate } from '@/utils/parse-date';
+import { type Context } from 'hono';
+
+const channelMap = {
+    'take-away-english': '随身英语',
+    'authentic-real-english': '地道英语',
+    'media-english': '媒体英语',
+    lingohack: '英语大破解',
+    'english-in-a-minute': '一分钟英语',
+    'phrasal-verbs': '短语动词',
+    'todays-phrase': '今日短语',
+    'q-and-a': '你问我答',
+    'english-at-work': '白领英语',
+    storytellers: '亲子英语故事',
+};
 
 export const route: Route = {
     name: 'Learning English',
@@ -12,18 +26,15 @@ export const route: Route = {
     path: '/learningenglish/:channel?',
     example: '/bbc/learningenglish/take-away-english',
     parameters: {
-        channel: 'channel, default to `take-away-english`',
+        channel: {
+            description: '英语学习分类栏目',
+            options: Object.entries(channelMap).map(([value, label]) => ({ value, label })),
+            default: 'take-away-english',
+        },
     },
-    description: `| 随身英语 | 地道英语 | 媒体英语 | 英语大破解 | 一分钟英语 |
-| -------- | -------- | -------- | -------- | -------- |
-| take-away-english | authentic-real-english | media-english | lingohack | english-in-a-minute |
-
-| 短语动词 | 今日短语 | 你问我答 | 白领英语 | 亲子英语故事 |
-| -------- | -------- | -------- | -------- | -------- |
-| phrasal-verbs | todays-phrase | q-and-a | english-at-work | storytellers |`,
 };
 
-async function handler(ctx) {
+async function handler(ctx: Context) {
     // set targetURL
     const { channel = 'take-away-english' } = ctx.req.param();
 
@@ -34,14 +45,14 @@ async function handler(ctx) {
     const $ = load(response);
 
     // get top article links
-    const firstItem = {
+    const firstItem: DataItem = {
         title: $('[data-widget-index=4]').find('h2').text(),
         link: `${rootURL}${$('[data-widget-index=4]').find('h2 a').attr('href')}`,
         pubDate: parseDate($('[data-widget-index=4]').find('.details h3').text()),
     };
 
     // get rest ul article links
-    const restItems = $('.threecol li')
+    const restItems: DataItem[] = $('.threecol li')
         .toArray()
         .slice(0, 10)
         .map((article) => {
@@ -55,21 +66,25 @@ async function handler(ctx) {
         });
 
     // try get article content detail
-    const items = await Promise.all(
-        [firstItem, ...restItems].map((item) =>
-            cache.tryGet(item.link, async () => {
-                const detailResponse = await ofetch(item.link, { parseResponse: (txt) => txt });
+    const items: DataItem[] = await Promise.all(
+        [firstItem, ...restItems].map((item) => {
+            if (!item.link) {
+                return item;
+            }
+
+            return cache.tryGet(item.link, async (): Promise<DataItem> => {
+                const detailResponse = await ofetch(item.link!, { parseResponse: (txt) => txt });
 
                 const $content = load(detailResponse);
 
-                item.description = $content('.widget-richtext').html();
+                item.description = $content('.widget-richtext').html() ?? undefined;
                 return item;
-            })
-        )
+            });
+        })
     );
 
     return {
-        title: `Learningenglish-${channel}-BBC`,
+        title: `BBC英语学习-${channelMap[channel]}`,
         link: targerURL,
         item: items,
     };

package/lib/routes/bestofjs/monthly.ts

@@ -0,0 +1,137 @@
+import path from 'node:path';
+import { load } from 'cheerio';
+import { Route, ViewType } from '@/types';
+import ofetch from '@/utils/ofetch';
+import cache from '@/utils/cache';
+import { art } from '@/utils/render';
+
+const BASEURL = 'https://bestofjs.org/rankings/monthly';
+
+export const route: Route = {
+    path: '/rankings/monthly',
+    categories: ['programming'],
+    example: '/bestofjs/rankings/monthly',
+    view: ViewType.Notifications,
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['bestofjs.org/rankings/monthly/:year/:month'],
+            target: '/rankings/monthly',
+        },
+    ],
+    name: 'Monthly Rankings',
+    maintainers: ['ztkuaikuai'],
+    url: 'bestofjs.org/rankings/monthly',
+    handler: async () => {
+        const targetMonths = getLastSixMonths();
+        const allNeededMonthlyRankings = await Promise.all(
+            targetMonths.map((data) => {
+                const [year, month] = data.split('-');
+                return getMonthlyRankings(year, month);
+            })
+        );
+        const items = allNeededMonthlyRankings.flatMap((oneMonthlyRankings, i) => {
+            const [year, month] = targetMonths[i].split('-');
+            const description = art(path.join(__dirname, 'templates/description.art'), { items: oneMonthlyRankings });
+            return {
+                title: `Best of JS Monthly Rankings - ${year}/${month}`,
+                description,
+                link: `${BASEURL}/${year}/${month}`,
+                guid: `${BASEURL}/${year}/${month}`,
+                author: 'Best of JS',
+            };
+        });
+
+        return {
+            title: 'Best of JS Monthly Rankings',
+            link: BASEURL,
+            description: 'Monthly rankings of the most popular JavaScript projects on Best of JS',
+            item: items,
+            language: 'en',
+        };
+    },
+};
+
+const getLastSixMonths = (): string[] => {
+    const now = new Date();
+    const currentYear = now.getFullYear();
+    const currentMonth = now.getMonth() + 1; // 0-based to 1-based
+    return Array.from({ length: 6 }, (_, i) => {
+        let month = currentMonth - (i + 1);
+        let year = currentYear;
+        if (month <= 0) {
+            month += 12;
+            year -= 1;
+        }
+        return `${year}-${month}`;
+    });
+};
+
+interface RankingItem {
+    logo: string;
+    projectName: string;
+    githubLink: string;
+    homepageLink: string;
+    description: string;
+    tags: string[];
+    starCount: string;
+    additionalInfo: string;
+}
+
+const getMonthlyRankings = (year: string, month: string): Promise<RankingItem[]> => {
+    const targetUrl = `${BASEURL}/${year}/${month}`;
+    return cache.tryGet(targetUrl, async () => {
+        const response = await ofetch(targetUrl);
+        const $ = load(response);
+        return $('table.w-full tbody tr[data-testid="project-card"]')
+            .toArray()
+            .map((el) => {
+                const $tr = $(el);
+                // Project logo
+                const logo =
+                    $tr
+                        .find('td:first img')
+                        .attr('src')
+                        ?.replace(/.dark./, '.') || '';
+                // Project name and link
+                const projectLink = $tr.find('td:nth-child(2) a[href^="/projects/"]').first();
+                const projectName = projectLink.text().trim();
+                // GitHub and homepage links
+                const githubLink = $tr.find('td:nth-child(2) a[href*="github.com"]').attr('href') || '';
+                const homepageLink = $tr.find('td:nth-child(2) a[href*="http"]:not([href*="github.com"])').attr('href') || '';
+                // Description
+                const description = $tr.find('td:nth-child(2) .font-serif').text().trim();
+                // Tags
+                const tags = $tr
+                    .find('td:nth-child(2) [href*="/projects?tags="]')
+                    .toArray()
+                    .map((tag) => $(tag).text().trim());
+                // Star count
+                const starCount = $tr.find('td:nth-child(4) span:last').text().trim() || $tr.find('td:nth-child(2) .inline-flex span:last-child').text().trim();
+                // Additional info (contributors, created date)
+                const additionalInfo = $tr
+                    .find('td:nth-child(3) > div')
+                    .toArray()
+                    .slice(1)
+                    .map((el) => $(el).text().trim())
+                    .join('; ');
+                return {
+                    logo,
+                    projectName,
+                    githubLink,
+                    homepageLink,
+                    description,
+                    tags,
+                    starCount,
+                    additionalInfo,
+                };
+            });
+    });
+};

package/lib/routes/bestofjs/namespace.ts

@@ -0,0 +1,7 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'Best of JS',
+    url: 'bestofjs.org',
+    lang: 'en',
+};

package/lib/routes/bestofjs/templates/description.art

@@ -0,0 +1,36 @@
+<ul>
+  {{each items item index}}
+    <li>
+      <p><strong>Rank {{index + 1}}</strong></p>
+      {{if item.logo}}
+        <img src="https://bestofjs.org{{item.logo}}" alt="{{item.projectName}}" height="32" width="32" />
+      {{/if}}
+      {{if item.projectName}}
+        <p><strong>Project:</strong> {{item.projectName}}</p>
+      {{/if}}
+      {{if item.description}}
+        <p>{{item.description}}</p>
+      {{/if}}
+      {{if item.starCount}}
+        <p><strong>Stars:</strong> {{item.starCount}}</p>
+      {{/if}}
+      {{if item.additionalInfo}}
+        <p><strong>Additional Info:</strong> {{item.additionalInfo}}</p>
+      {{/if}}
+      {{if item.githubLink}}
+        <p><strong>GitHub:</strong> <a href="{{item.githubLink}}">{{item.githubLink}}</a></p>
+      {{/if}}
+      {{if item.homepageLink}}
+        <p><strong>Homepage:</strong> <a href="{{item.homepageLink}}">{{item.homepageLink}}</a></p>
+      {{/if}}
+      {{if item.tags && item.tags.length}}
+        <p><strong>Tags:</strong>
+          {{each item.tags tag tIndex}}
+            <a href="/projects?tags={{tag.toLowerCase()}}">{{tag}}</a>{{if tIndex < item.tags.length - 1}}, {{/if}}
+          {{/each}}
+        </p>
+      {{/if}}
+    </li>
+    <br />
+  {{/each}}
+</ul>

package/lib/routes/bilibili/cache.ts

@@ -6,6 +6,17 @@ import { config } from '@/config';
 import logger from '@/utils/logger';
 import { getPuppeteerPage } from '@/utils/puppeteer';
 import { JSDOM } from 'jsdom';
+import { RateLimiterMemory, RateLimiterQueue } from 'rate-limiter-flexible';
+
+const subtitleLimiter = new RateLimiterMemory({
+    points: 5,
+    duration: 1,
+    execEvenly: true,
+});
+
+const subtitleLimiterQueue = new RateLimiterQueue(subtitleLimiter, {
+    maxQueueSize: 4800,
+});
 
 const getCookie = (disableConfig = false) => {
     if (Object.keys(config.bilibili.cookies).length > 0 && !disableConfig) {
@@ -200,7 +211,7 @@ const getCidFromId = (aid, pid, bvid) => {
         const { data } = await got(`https://api.bilibili.com/x/web-interface/view?${bvid ? `bvid=${bvid}` : `aid=${aid}`}`, {
             referer: `https://www.bilibili.com/video/${bvid || `av${aid}`}`,
         });
-        return data.data.pages[pid - 1].cid;
+        return data?.data?.pages[pid - 1]?.cid;
     });
 };
 
@@ -244,8 +255,13 @@ const getVideoSubtitle = async (
     }
 
     const cid = await getCidFromId(undefined, 1, bvid);
+    if (!cid) {
+        return [];
+    }
+
     const cookie = await getCookie();
     return cache.tryGet(`bili-video-subtitle-${bvid}`, async () => {
+        await subtitleLimiterQueue.removeTokens(1);
         const response = await got(`https://api.bilibili.com/x/player/wbi/v2?bvid=${bvid}&cid=${cid}`, {
             headers: {
                 Referer: `https://www.bilibili.com/video/${bvid}`,

package/lib/routes/bilibili/dynamic.ts

@@ -9,6 +9,7 @@ import cacheIn from './cache';
 import { BilibiliWebDynamicResponse, Item2, Modules } from './api-interface';
 import { parseDuration } from '@/utils/helpers';
 import { config } from '@/config';
+import CaptchaError from '@/errors/types/captcha';
 
 export const route: Route = {
     path: '/user/dynamic/:uid/:routeParams?',
@@ -125,34 +126,58 @@ const getIframe = (data?: Modules, embed: boolean = true) => {
 };
 
 const getImgs = (data?: Modules) => {
-    const imgUrls: string[] = [];
+    const imgUrls: {
+        url: string;
+        width?: number;
+        height?: number;
+    }[] = [];
     const major = data?.module_dynamic?.major;
     if (!major) {
         return '';
     }
     // 动态图片
     if (major.opus?.pics?.length) {
-        imgUrls.push(...major.opus.pics.map((e) => e.url));
+        imgUrls.push(
+            ...major.opus.pics.map((e) => ({
+                url: e.url,
+                width: e.width,
+                height: e.height,
+            }))
+        );
     }
     // 专栏封面
     if (major.article?.covers?.length) {
-        imgUrls.push(...major.article.covers);
+        imgUrls.push(
+            ...major.article.covers.map((e) => ({
+                url: e,
+            }))
+        );
     }
     // 相簿
     if (major.draw?.items?.length) {
-        imgUrls.push(...major.draw.items.map((e) => e.src));
+        imgUrls.push(
+            ...major.draw.items.map((e) => ({
+                url: e.src,
+                width: e.width,
+                height: e.height,
+            }))
+        );
     }
     // 正在直播的动态
     if (major.live_rcmd?.content) {
-        imgUrls.push(JSON.parse(major.live_rcmd.content)?.live_play_info?.cover);
+        imgUrls.push({
+            url: JSON.parse(major.live_rcmd.content)?.live_play_info?.cover,
+        });
     }
     const type = major.type.replace('MAJOR_TYPE_', '').toLowerCase();
     if (major[type]?.cover) {
-        imgUrls.push(major[type].cover);
+        imgUrls.push({
+            url: major[type]?.cover,
+        });
     }
     return imgUrls
         .filter(Boolean)
-        .map((url) => `<img src="${url}">`)
+        .map((img) => `<img src="${img.url}" ${img.width ? `width="${img.width}"` : ''} ${img.height ? `height="${img.height}"` : ''}>`)
         .join('');
 };
 
@@ -266,7 +291,8 @@ async function handler(ctx) {
         body = await getDynamic(cookie);
 
         if (body?.code === -352) {
-            throw new Error('遇到源站风控校验，请稍后再试');
+            cache.set('bili-cookie', '');
+            throw new CaptchaError('遇到源站风控校验，请稍后再试');
         }
     }
     const items = (body as BilibiliWebDynamicResponse)?.data?.items;

package/lib/routes/bilibili/page.ts

@@ -45,7 +45,7 @@ async function handler(ctx) {
         link,
         description: `视频 ${name} 的视频选集列表`,
         item: data
-            .sort((a, b) => b.page - a.page)
+            .toSorted((a, b) => b.page - a.page)
             .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10)
             .map((item) => ({
                 title: item.part,

package/lib/routes/bilibili/ranking.ts

@@ -2,6 +2,8 @@ import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import utils, { getVideoUrl } from './utils';
 import { parseDuration } from '@/utils/helpers';
+import { config } from '@/config';
+import cache from './cache';
 
 // https://www.bilibili.com/v/popular/rank/all
 
@@ -212,22 +214,28 @@ async function handler(ctx) {
     return {
         title: `bilibili 排行榜-${ridChinese}`,
         link,
-        item: list.map((item) => ({
-            title: item.title,
-            description: utils.renderUGCDescription(embed, item.pic, item.description || item.title, item.aid, undefined, item.bvid),
-            pubDate: item.create && new Date(item.create).toUTCString(),
-            author: item.author,
-            link: !item.create || (new Date(item.create).getTime() / 1000 > utils.bvidTime && item.bvid) ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
-            image: item.pic,
-            attachments: item.bvid
-                ? [
-                      {
-                          url: getVideoUrl(item.bvid),
-                          mime_type: 'text/html',
-                          duration_in_seconds: parseDuration(item.duration),
-                      },
-                  ]
-                : undefined,
-        })),
+        item: await Promise.all(
+            list.map(async (item) => {
+                const subtitles = !config.bilibili.excludeSubtitles && item.bvid ? await cache.getVideoSubtitleAttachment(item.bvid) : [];
+                return {
+                    title: item.title,
+                    description: utils.renderUGCDescription(embed, item.pic, item.description || item.title, item.aid, undefined, item.bvid),
+                    pubDate: item.create && new Date(item.create).toUTCString(),
+                    author: item.author,
+                    link: !item.create || (new Date(item.create).getTime() / 1000 > utils.bvidTime && item.bvid) ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
+                    image: item.pic,
+                    attachments: item.bvid
+                        ? [
+                              {
+                                  url: getVideoUrl(item.bvid),
+                                  mime_type: 'text/html',
+                                  duration_in_seconds: parseDuration(item.duration),
+                              },
+                              ...subtitles,
+                          ]
+                        : undefined,
+                };
+            })
+        ),
     };
 }

package/lib/routes/bilibili/wasm-exec.ts

@@ -595,7 +595,7 @@
             }
             argvPtrs.push(0);
 
-            const keys = Object.keys(this.env).sort();
+            const keys = Object.keys(this.env).toSorted();
             for (const key of keys) {
                 argvPtrs.push(strPtr(`${key}=${this.env[key]}`));
             }