rsshub 1.0.0-master.fe34161 → 1.0.0-master.fe416a0

package/lib/routes/bilibili/check-cookie.ts

@@ -0,0 +1,31 @@
+import { APIRoute } from '@/types';
+import cacheIn from './cache';
+import ofetch from '@/utils/ofetch';
+
+export const apiRoute: APIRoute = {
+    path: '/check-cookie',
+    description: '检查 bilibili cookie 是否有效',
+    maintainers: ['DIYgod'],
+    handler,
+};
+
+async function handler() {
+    const cookie = await cacheIn.getCookie();
+
+    if (!cookie) {
+        return {
+            code: -1,
+        };
+    }
+
+    const response = await ofetch(`https://api.bilibili.com/x/web-interface/nav`, {
+        headers: {
+            Referer: `https://space.bilibili.com/1/`,
+            Cookie: cookie as string,
+        },
+    });
+
+    return {
+        code: response.code === 0 && !!response.data.mid ? 0 : -1,
+    };
+}

package/lib/routes/bilibili/danmaku.ts

@@ -2,7 +2,7 @@ import { Route } from '@/types';
 import { load } from 'cheerio';
 import cache from './cache';
 import got from '@/utils/got';
-import zlib from 'zlib';
+import zlib from 'node:zlib';
 
 const processFloatTime = (time) => {
     const totalSeconds = Number.parseInt(time);
@@ -62,7 +62,7 @@ async function handler(ctx) {
         danmakuList.push({ p: $(item).attr('p'), text: $(item).text() });
     });
 
-    danmakuList = danmakuList.reverse().slice(0, limit);
+    danmakuList = danmakuList.toReversed().slice(0, limit);
 
     return {
         title: `${videoName} 的 弹幕动态`,

package/lib/routes/bilibili/dynamic.ts

@@ -7,10 +7,13 @@ import { parseDate } from '@/utils/parse-date';
 import { fallback, queryToBoolean } from '@/utils/readable-social';
 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?',
-    categories: ['social-media', 'popular'],
+    categories: ['social-media'],
     view: ViewType.SocialMedia,
     example: '/bilibili/user/dynamic/2267573',
     parameters: {
@@ -123,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('');
 };
 
@@ -235,33 +262,51 @@ async function handler(ctx) {
     const uid = ctx.req.param('uid');
     const routeParams = Object.fromEntries(new URLSearchParams(ctx.req.param('routeParams')));
     const showEmoji = fallback(undefined, queryToBoolean(routeParams.showEmoji), false);
-    const embed = fallback(undefined, queryToBoolean(routeParams.embed), true);
+    const embed = fallback(undefined, queryToBoolean(routeParams.embed), false);
     const displayArticle = ctx.req.query('mode') === 'fulltext';
     const offset = fallback(undefined, routeParams.offset, '');
     const useAvid = fallback(undefined, queryToBoolean(routeParams.useAvid), false);
     const directLink = fallback(undefined, queryToBoolean(routeParams.directLink), false);
     const hideGoods = fallback(undefined, queryToBoolean(routeParams.hideGoods), false);
 
-    const cookie = await cacheIn.getCookie();
+    const getDynamic = async (cookie: string) => {
+        const params = utils.addDmVerifyInfo(`offset=${offset}&host_mid=${uid}&platform=web&features=itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote`, utils.getDmImgList());
+        const response = await got(`https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?${params}`, {
+            headers: {
+                Referer: `https://space.bilibili.com/${uid}/`,
+                Cookie: cookie,
+            },
+        });
+        const body = JSONbig.parse(response.body);
+        return body;
+    };
+
+    let body: BilibiliWebDynamicResponse;
+
+    const cookie = (await cacheIn.getCookie()) as string;
+    body = await getDynamic(cookie);
 
-    const params = utils.addDmVerifyInfo(`offset=${offset}&host_mid=${uid}&platform=web&features=itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote`, utils.getDmImgList());
-    const response = await got(`https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?${params}`, {
-        headers: {
-            Referer: `https://space.bilibili.com/${uid}/`,
-            Cookie: cookie,
-        },
-    });
-    const body = JSONbig.parse(response.body);
     if (body?.code === -352) {
-        throw new Error('Request failed, please try again.');
+        const cookie = (await cacheIn.getCookie(true)) as string;
+        body = await getDynamic(cookie);
+
+        if (body?.code === -352) {
+            cache.set('bili-cookie', '');
+            throw new CaptchaError('遇到源站风控校验，请稍后再试');
+        }
     }
     const items = (body as BilibiliWebDynamicResponse)?.data?.items;
 
-    const usernameAndFace = await cacheIn.getUsernameAndFaceFromUID(uid);
-    const author = usernameAndFace[0] ?? items[0]?.modules?.module_author?.name;
-    const face = usernameAndFace[1] ?? items[0]?.modules?.module_author?.face;
-    cache.set(`bili-username-from-uid-${uid}`, author);
-    cache.set(`bili-userface-from-uid-${uid}`, face);
+    let author = items[0]?.modules?.module_author?.name;
+    let face = items[0]?.modules?.module_author?.face;
+    if (!face || !author) {
+        const usernameAndFace = await cacheIn.getUsernameAndFaceFromUID(uid);
+        author = usernameAndFace[0] || items[0]?.modules?.module_author?.name;
+        face = usernameAndFace[1] || items[0]?.modules?.module_author?.face;
+    } else {
+        cache.set(`bili-username-from-uid-${uid}`, author);
+        cache.set(`bili-userface-from-uid-${uid}`, face);
+    }
 
     const rssItems = await Promise.all(
         items
@@ -276,6 +321,7 @@ async function handler(ctx) {
 
                 const data = item.modules;
                 const origin = item?.orig?.modules;
+                const bvid = data?.module_dynamic?.major?.archive?.bvid;
 
                 // link
                 let link = '';
@@ -283,8 +329,9 @@ async function handler(ctx) {
                     link = `https://t.bilibili.com/${item.id_str}`;
                 }
 
-                let description = getDes(data) || '';
-                const title = getTitle(data) || description; // 没有 title 的时候使用 desc 填充
+                const originalDescription = getDes(data) || '';
+                let description = originalDescription;
+                const title = getTitle(data);
                 const category: string[] = [];
                 // emoji
                 if (data.module_dynamic?.desc?.rich_text_nodes?.length) {
@@ -369,13 +416,15 @@ async function handler(ctx) {
                 // 换行处理
                 description = description.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
                 originDescription = originDescription.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
-                const descriptions = [description, getIframe(data, embed), getImgs(data), urlText, originDescription, getIframe(origin, embed), getImgs(origin), originUrlText]
+                const descriptions = [title, description, getIframe(data, embed), getImgs(data), urlText, originDescription, getIframe(origin, embed), getImgs(origin), originUrlText]
                     .map((e) => e?.trim())
                     .filter(Boolean)
                     .join('<br>');
 
+                const subtitles = !config.bilibili.excludeSubtitles && bvid ? await cacheIn.getVideoSubtitleAttachment(bvid) : [];
+
                 return {
-                    title,
+                    title: title || originalDescription,
                     description: descriptions,
                     pubDate: data.module_author?.pub_ts ? parseDate(data.module_author.pub_ts, 'X') : undefined,
                     link,
@@ -387,7 +436,9 @@ async function handler(ctx) {
                                   {
                                       url: urlResult?.videoPageUrl || originUrlResult?.videoPageUrl,
                                       mime_type: 'text/html',
+                                      duration_in_seconds: data.module_dynamic?.major?.archive?.duration_text ? parseDuration(data.module_dynamic.major.archive.duration_text) : undefined,
                                   },
+                                  ...subtitles,
                               ]
                             : undefined,
                 };

package/lib/routes/bilibili/followings-dynamic.ts

@@ -5,8 +5,9 @@ import { config } from '@/config';
 import utils from './utils';
 import JSONbig from 'json-bigint';
 import { fallback, queryToBoolean } from '@/utils/readable-social';
-import querystring from 'querystring';
+import querystring from 'node:querystring';
 import ConfigNotFoundError from '@/errors/types/config-not-found';
+import logger from '@/utils/logger';
 
 export const route: Route = {
     path: '/followings/dynamic/:uid/:routeParams?',
@@ -132,9 +133,14 @@ async function handler(ctx) {
         data.map(async (item) => {
             const parsed = JSONbig.parse(item.card);
             const data = parsed.apiSeasonInfo || (getTitle(parsed.item) ? parsed.item : parsed);
-            // parsed.origin is already parsed, and it may be json or string.
-            // Don't parse it again, or it will cause an error.
-            const origin = parsed.origin || null;
+            let origin = parsed.origin;
+            if (origin) {
+                try {
+                    origin = JSONbig.parse(origin);
+                } catch {
+                    logger.warn(`card.origin '${origin}' is not falsy-valued or a JSON string, fall back to unparsed value`);
+                }
+            }
 
             // img
             let imgHTML = '';

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

@@ -1,6 +1,9 @@
 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
 
@@ -117,7 +120,7 @@ export const route: Route = {
     path: '/ranking/:rid_index?/:embed?/:redirect1?/:redirect2?',
     name: '排行榜',
     maintainers: ['DIYgod', 'hyoban'],
-    categories: ['social-media', 'popular'],
+    categories: ['social-media'],
     view: ViewType.Videos,
     example: '/bilibili/ranking/0',
     parameters: {
@@ -211,21 +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',
-                      },
-                  ]
-                : 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/readlist.ts

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 
 export const route: Route = {
     path: '/readlist/:listid',
-    categories: ['social-media', 'popular'],
+    categories: ['social-media'],
     view: ViewType.Articles,
     example: '/bilibili/readlist/25611',
     parameters: { listid: '文集 id, 可在专栏文集 URL 中找到' },

package/lib/routes/bilibili/utils.ts

@@ -1,6 +1,3 @@
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 import { config } from '@/config';
 import md5 from '@/utils/md5';
 import ofetch from '@/utils/ofetch';
@@ -298,7 +295,11 @@ export const renderOGVDescription = (embed: boolean, img: string, description: s
     return rendered;
 };
 
-export const getVideoUrl = (bvid?: string) => (bvid ? `https://www.bilibili.com/blackboard/newplayer.html?isOutside=true&autoplay=true&danmaku=true&muted=false&highQuality=true&bvid=${bvid}` : undefined);
+export function getVideoUrl(bvid: string): string;
+export function getVideoUrl(bvid?: string): string | undefined;
+export function getVideoUrl(bvid?: string): string | undefined {
+    return bvid ? `https://www.bilibili.com/blackboard/newplayer.html?isOutside=true&autoplay=true&danmaku=true&muted=false&highQuality=true&bvid=${bvid}` : undefined;
+}
 export const getLiveUrl = (roomId?: string) => (roomId ? `https://www.bilibili.com/blackboard/live/live-activity-player.html?cid=${roomId}` : undefined);
 
 export default {

package/lib/routes/bilibili/video.ts

@@ -1,12 +1,14 @@
 import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
+import logger from '@/utils/logger';
+import type { Context } from 'hono';
 import cache from './cache';
 import utils, { getVideoUrl } from './utils';
-import logger from '@/utils/logger';
+import { config } from '@/config';
 
 export const route: Route = {
     path: '/user/video/:uid/:embed?',
-    categories: ['social-media', 'popular'],
+    categories: ['social-media'],
     view: ViewType.Videos,
     example: '/bilibili/user/video/2267573',
     parameters: { uid: '用户 id, 可在 UP 主主页中找到', embed: '默认为开启内嵌视频, 任意值为关闭' },
@@ -29,7 +31,7 @@ export const route: Route = {
     handler,
 };
 
-async function handler(ctx) {
+async function handler(ctx: Context) {
     const uid = ctx.req.param('uid');
     const embed = !ctx.req.param('embed');
     const cookie = await cache.getCookie();
@@ -37,7 +39,6 @@ async function handler(ctx) {
     const dmImgList = utils.getDmImgList();
     const dmImgInter = utils.getDmImgInter();
     const renderData = await cache.getRenderData(uid);
-    const [name, face] = await cache.getUsernameAndFaceFromUID(uid);
 
     const params = utils.addWbiVerifyInfo(
         utils.addRenderData(utils.addDmVerifyInfoWithInter(`mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&platform=web&web_location=1550101&order_avoided=true`, dmImgList, dmImgInter), renderData),
@@ -55,32 +56,42 @@ async function handler(ctx) {
         throw new Error(`Got error code ${data.code} while fetching: ${data.message}`);
     }
 
+    const usernameAndFace = await cache.getUsernameAndFaceFromUID(uid);
+    const name = usernameAndFace[0] || data.data.list.vlist[0]?.author;
+    const face = usernameAndFace[1];
+
     return {
         title: `${name} 的 bilibili 空间`,
         link: `https://space.bilibili.com/${uid}`,
         description: `${name} 的 bilibili 空间`,
-        image: face,
-        logo: face,
-        icon: face,
+        image: face ?? undefined,
+        logo: face ?? undefined,
+        icon: face ?? undefined,
         item:
             data.data &&
             data.data.list &&
             data.data.list.vlist &&
-            data.data.list.vlist.map((item) => ({
-                title: item.title,
-                description: utils.renderUGCDescription(embed, item.pic, item.description, item.aid, undefined, item.bvid),
-                pubDate: new Date(item.created * 1000).toUTCString(),
-                link: item.created > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
-                author: name,
-                comments: item.comment,
-                attachments: item.bvid
-                    ? [
-                          {
-                              url: getVideoUrl(item.bvid),
-                              mime_type: 'text/html',
-                          },
-                      ]
-                    : undefined,
-            })),
+            (await Promise.all(
+                data.data.list.vlist.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.aid, undefined, item.bvid),
+                        pubDate: new Date(item.created * 1000).toUTCString(),
+                        link: item.created > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
+                        author: name,
+                        comments: item.comment,
+                        attachments: item.bvid
+                            ? [
+                                  {
+                                      url: getVideoUrl(item.bvid),
+                                      mime_type: 'text/html',
+                                  },
+                                  ...subtitles,
+                              ]
+                            : undefined,
+                    };
+                })
+            )),
     };
 }

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

@@ -23,8 +23,8 @@
                 outputBuf += decoder.decode(buf);
                 const nl = outputBuf.lastIndexOf('\n');
                 if (nl !== -1) {
-                    console.log(outputBuf.substring(0, nl));
-                    outputBuf = outputBuf.substring(nl + 1);
+                    console.log(outputBuf.slice(0, nl));
+                    outputBuf = outputBuf.slice(nl + 1);
                 }
                 return buf.length;
             },
@@ -552,7 +552,7 @@
             this.mem = new DataView(this._inst.exports.mem.buffer);
             this._values = [
                 // JS values that Go currently has references to, indexed by reference id
-                Number.NaN,
+                NaN,
                 0,
                 null,
                 true,
@@ -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]}`));
             }

package/lib/routes/bilibili/weekly-recommend.ts

@@ -1,6 +1,9 @@
 import { Route } from '@/types';
 import got from '@/utils/got';
-import utils from './utils';
+import utils, { getVideoUrl } from './utils';
+import { parseDuration } from '@/utils/helpers';
+import { config } from '@/config';
+import cache from './cache';
 
 export const route: Route = {
     path: '/weekly/:embed?',
@@ -46,10 +49,23 @@ async function handler(ctx) {
         title: 'B站每周必看',
         link: 'https://www.bilibili.com/h5/weekly-recommend',
         description: 'B站每周必看',
-        item: data.map((item) => ({
-            title: item.title,
-            description: utils.renderUGCDescription(embed, item.cover, `${weekly_name} ${item.title} - ${item.rcmd_reason}`, item.param, undefined, item.bvid),
-            link: weekly_number > 60 && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.param}`,
-        })),
+        item: data.map(async (item) => {
+            const subtitles = !config.bilibili.excludeSubtitles && item.bvid ? await cache.getVideoSubtitleAttachment(item.bvid) : [];
+            return {
+                title: item.title,
+                description: utils.renderUGCDescription(embed, item.cover, `${weekly_name} ${item.title} - ${item.rcmd_reason}`, item.param, undefined, item.bvid),
+                link: weekly_number > 60 && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.param}`,
+                attachments: item.bvid
+                    ? [
+                          {
+                              url: getVideoUrl(item.bvid),
+                              mime_type: 'text/html',
+                              duration_in_seconds: parseDuration(item.cover_right_text_1),
+                          },
+                          ...subtitles,
+                      ]
+                    : undefined,
+            };
+        }),
     };
 }

package/lib/routes/binance/announcement.ts

@@ -132,7 +132,7 @@ const handler: Route['handler'] = async (ctx) => {
 
 export const route: Route = {
     path: '/announcement/:type',
-    categories: ['finance', 'popular'],
+    categories: ['finance'],
     view: ViewType.Articles,
     example: '/binance/announcement/new-cryptocurrency-listing',
     parameters: {

package/lib/routes/bing/search.ts

@@ -2,8 +2,8 @@ import { Route } from '@/types';
 import parser from '@/utils/rss-parser';
 import { parseDate } from '@/utils/parse-date';
 import dayjs from 'dayjs';
-import localizedFormat from 'dayjs/plugin/localizedFormat';
-import 'dayjs/locale/zh-cn';
+import localizedFormat from 'dayjs/plugin/localizedFormat.js';
+import 'dayjs/locale/zh-cn.js';
 dayjs.extend(localizedFormat);
 
 export const route: Route = {

package/lib/routes/biquge/index.ts

@@ -58,7 +58,7 @@ async function handler(ctx) {
 
     let items = $('dl dd a')
         .toArray()
-        .reverse()
+        .toReversed()
         .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 1)
         .map((item) => {
             item = $(item);

package/lib/routes/bitget/announcement.ts

@@ -139,7 +139,7 @@ const findTypeLabel = (type: string) => {
 
 export const route: Route = {
     path: '/announcement/:type/:lang?',
-    categories: ['finance', 'popular'],
+    categories: ['finance'],
     view: ViewType.Articles,
     example: '/bitget/announcement/all/zh-CN',
     parameters: {

package/lib/routes/bjnews/cat.ts

@@ -3,7 +3,7 @@ import { load } from 'cheerio';
 import ofetch from '@/utils/ofetch';
 
 import { fetchArticle } from './utils';
-import asyncPool from 'tiny-async-pool';
+import pMap from 'p-map';
 
 export const route: Route = {
     path: '/cat/:cat',
@@ -35,17 +35,10 @@ async function handler(ctx) {
             category: $(a).parent().find('.source').text().trim(),
         }));
 
-    const out = await asyncPoolAll(2, list, (item) => fetchArticle(item));
+    const out = await pMap(list, (item) => fetchArticle(item), { concurrency: 2 });
     return {
         title: `新京报 - 分类 - ${$('.cur').text().trim()}`,
         link: url,
         item: out,
     };
 }
-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/bjp/apod.ts

@@ -7,7 +7,7 @@ import timezone from '@/utils/timezone';
 
 export const route: Route = {
     path: '/apod',
-    categories: ['picture', 'popular'],
+    categories: ['picture'],
     view: ViewType.Pictures,
     example: '/bjp/apod',
     parameters: {},
@@ -48,7 +48,7 @@ async function handler(ctx) {
                 pubDate: timezone(parseDate(e.find('span').text().replace('：', ''), 'YYYY-MM-DD'), 8),
             };
         })
-        .sort((a, b) => b.pubDate - a.pubDate)
+        .toSorted((a, b) => b.pubDate - a.pubDate)
         .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10);
 
     const items = await Promise.all(