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

package/lib/routes/storm/index.ts

@@ -51,15 +51,15 @@ async function handler(ctx) {
     const $ = load(response.data);
 
     const list = $('.link_title')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
 
             return {
                 title: item.text(),
                 link: item.attr('href'),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/storyfm/episodes.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/storyfm/index.ts

@@ -32,7 +32,8 @@ async function handler() {
     const $ = load(response.data);
     const cnMonth = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'];
     const items = $('.isotope > .isotope-item')
-        .map((_, ele) => {
+        .toArray()
+        .map((ele) => {
             const $item = load(ele);
             const img = $item('.isotope-img-container img').attr('src');
             const infoNode = $item('.isotope-index-text').first();
@@ -58,8 +59,7 @@ async function handler() {
                 link,
                 pubDate,
             };
-        })
-        .get();
+        });
     return {
         title: '故事说FM',
         description: '故事说FM',

package/lib/routes/straitstimes/index.ts

@@ -2,7 +2,6 @@ import { Route } from '@/types';
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
-import { getCurrentPath } from '@/utils/helpers';
 import path from 'node:path';
 import { art } from '@/utils/render';
 
@@ -62,7 +61,6 @@ async function handler(ctx) {
     const section = ctx.req.param('section') ? ctx.req.param('section').toLowerCase() : undefined;
     const apiKey = 'T9XUJM9rAZoLOd2CAx2wCBSTrm3xoyPw';
     const platform = 'iosflex';
-    const __dirname = getCurrentPath(import.meta.url);
     let feed;
     const response = await got({
         method: 'get',

package/lib/routes/surfshark/blog.ts

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

package/lib/routes/swjtu/scai.ts

@@ -54,21 +54,36 @@ const partition = {
 const getItem = (item, cache) => {
     const title = item.find('a').text();
     const link = `${rootURL}${item.find('a').attr('href').slice(2)}`;
+    // console.log(link);
 
     return cache.tryGet(link, async () => {
         const res = await ofetch(link);
         const $ = load(res);
-
+        let pubDate: Date;
         let dateText = $('div.news-info span:nth-of-type(2)').text();
         // 转教务通知时的时间获取方法
         if (!dateText) {
             dateText = $('div.news-top-bar span:nth-of-type(1)').text();
         }
         // 'date' may be undefined. and 'parseDate' will return current time.
-        const date = dateText.match(/\d{4}(-|\/|.)\d{1,2}\1\d{1,2}/)?.[0];
-        const pubDate = parseDate(date);
+        // 转其他院的通知，获取不到具体时间，先从列表页获取具体信息
+        if (dateText) {
+            const dateMatch = dateText.match(/\d{4}(-|\/|.)\d{1,2}\1\d{1,2}/);
+            if (!dateMatch || !dateMatch[0]) {
+                return null;
+            }
+            pubDate = parseDate(dateMatch[0]);
+        } else {
+            const dateItem = item.find('.calendar'); // 注意 .calendar 是 class
+            const day = dateItem.find('.day').text().trim(); // "31" （文本需 trim 去空格）
+            const ymd = dateItem.find('.date').text().trim(); // "2025/03"
+            const [year, month] = ymd.split('/'); // ["2025", "03"]
+            const dateText = `${year}-${month}-${day.padStart(2, '0')}`;
+            pubDate = new Date(dateText);
+        }
         const description = $('div.content-main').html();
-
+        // 确实无法获取时间就以当前时间为准
+        pubDate ||= new Date('2025-04-12'); // 使用当前时间作为默认值
         return {
             title,
             pubDate,

package/lib/routes/swjtu/utils.ts

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

package/lib/routes/swpu/cjxy.ts

@@ -40,7 +40,7 @@ async function handler(ctx) {
     const $ = load(res.data);
 
     let title = $('title').text();
-    title = title.substring(0, title.indexOf('-'));
+    title = title.slice(0, title.indexOf('-'));
 
     const items = $('.main_conRCb > ul > li')
         .toArray()

package/lib/routes/swpu/dean.ts

@@ -41,7 +41,7 @@ async function handler(ctx): Promise<Data> {
     const $ = load(res.data);
 
     let title = $('.r_list > h3').text();
-    title = title.substring(title.indexOf('：') + 1);
+    title = title.slice(title.indexOf('：') + 1);
 
     // 获取标题、时间及链接
     const items: DataItem[] = $('.r_list > ul > li')

package/lib/routes/swpu/dxy.ts

@@ -43,7 +43,7 @@ async function handler(ctx): Promise<Data> {
     const $ = load(res.data);
 
     let title = $('title').text();
-    title = title.substring(0, title.indexOf('-'));
+    title = title.slice(0, title.indexOf('-'));
 
     // 获取标题、时间及链接
     const items: DataItem[] = $('tr[height="20"]')

package/lib/routes/swpu/is.ts

@@ -40,7 +40,7 @@ async function handler(ctx) {
     const $ = load(res.data);
 
     let title = $('title').text();
-    title = title.substring(0, title.indexOf('-'));
+    title = title.slice(0, title.indexOf('-'));
 
     const items = $('tr[height="20"]')
         .toArray()

package/lib/routes/syosetu/ranking-isekai.ts

@@ -2,13 +2,10 @@ import { Data, DataItem } from '@/types';
 import { NarouNovelFetch, SearchBuilder, SearchParams, BigGenre } from 'narou';
 import { art } from '@/utils/render';
 import path from 'node:path';
-import { getCurrentPath } from '@/utils/helpers';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
 import { Join } from 'narou/util/type';
 import { RankingPeriod, NovelType, periodToJapanese, novelTypeToJapanese, periodToOrder, periodToPointField, IsekaiCategory, isekaiCategoryToJapanese } from './types/ranking';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 export function parseIsekaiRankingType(type: string): { period: RankingPeriod; category: IsekaiCategory; novelType: NovelType } {
     const [periodStr, categoryStr, novelTypeStr = NovelType.TOTAL] = type.split('_');
 
@@ -77,7 +74,7 @@ export async function handleIsekaiRanking(type: string, limit: number): Promise<
         .map((novel, index) => ({
             title: `#${index + 1} ${novel.title}`,
             link: `https://ncode.syosetu.com/${String(novel.ncode).toLowerCase()}`,
-            description: art(path.join(__dirname, 'templates', 'description.art'), {
+            description: art(path.join(__dirname, 'templates/description.art'), {
                 novel,
             }),
             author: novel.writer,

package/lib/routes/syosetu/ranking-r18.ts

@@ -4,11 +4,8 @@ import path from 'node:path';
 import { Context } from 'hono';
 import { SearchBuilderR18, SearchParams, NarouNovelFetch } from 'narou';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
-import { getCurrentPath } from '@/utils/helpers';
 import { RankingPeriod, periodToJapanese, novelTypeToJapanese, periodToOrder, NovelType, SyosetuSub, syosetuSubToJapanese, syosetuSubToNocgenre } from './types/ranking-r18';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 /**
  * Implementation of "Syosetu" R18 Rankings
  *
@@ -176,7 +173,7 @@ async function handler(ctx: Context): Promise<Data> {
     const items = result.values.map((novel, index) => ({
         title: `#${index + 1} ${novel.title}`,
         link: `https://novel18.syosetu.com/${String(novel.ncode).toLowerCase()}`,
-        description: art(path.join(__dirname, 'templates', 'description.art'), {
+        description: art(path.join(__dirname, 'templates/description.art'), {
             novel,
         }),
         author: novel.writer,

package/lib/routes/syosetu/ranking.ts

@@ -4,12 +4,9 @@ import path from 'node:path';
 import { Context } from 'hono';
 import { Genre, SearchBuilder, SearchParams, NarouNovelFetch, GenreNotation } from 'narou';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
-import { getCurrentPath } from '@/utils/helpers';
 import { handleIsekaiRanking } from './ranking-isekai';
 import { RankingPeriod, periodToJapanese, novelTypeToJapanese, periodToOrder, RankingType, NovelType, isekaiCategoryToJapanese, IsekaiCategory } from './types/ranking';
 
-const __dirname = getCurrentPath(import.meta.url);
-
 const getParameters = () => {
     // Generate ranking type options
     const rankingTypeOptions = [
@@ -269,7 +266,7 @@ async function handler(ctx: Context): Promise<Data> {
     const items = result.values.map((novel, index) => ({
         title: `#${index + 1} ${novel.title}`,
         link: `https://ncode.syosetu.com/${String(novel.ncode).toLowerCase()}`,
-        description: art(path.join(__dirname, 'templates', 'description.art'), {
+        description: art(path.join(__dirname, 'templates/description.art'), {
             novel,
         }),
         author: novel.writer,

package/lib/routes/syosetu/search.ts

@@ -8,9 +8,6 @@ import { Join } from 'narou/util/type';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
 import { SyosetuSub, NarouSearchParams, syosetuSubToJapanese } from './types/search';
 
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 export const route: Route = {
     path: '/search/:sub/:query',
     categories: ['reading'],
@@ -134,7 +131,7 @@ async function handler(ctx: Context): Promise<Data> {
     const items = result.values.map((novel) => ({
         title: novel.title,
         link: `https://${isGeneral(sub) ? 'ncode' : 'novel18'}.syosetu.com/${String(novel.ncode).toLowerCase()}`,
-        description: art(path.join(__dirname, 'templates', 'description.art'), {
+        description: art(path.join(__dirname, 'templates/description.art'), {
             novel,
             genreText: GenreNotation[novel.genre],
         }),

package/lib/routes/sysu/ygafz.ts

@@ -1,11 +1,8 @@
 import { Route } from '@/types';
 import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-import logger from '@/utils/logger';
-import { CookieJar } from 'tough-cookie';
-import puppeteer from '@/utils/puppeteer';
 
 export const route: Route = {
     path: '/ygafz/:type?',
@@ -42,30 +39,9 @@ async function handler(ctx) {
     const baseUrl = 'https://ygafz.sysu.edu.cn';
     const url = `${baseUrl}/${type}`;
 
-    const browser = await puppeteer();
-    const page = await browser.newPage();
-    await page.setRequestInterception(true);
-    page.on('request', (request) => {
-        request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
-    });
-
-    logger.http(`Requesting ${url}`);
-    await page.goto(url, {
-        waitUntil: 'domcontentloaded',
-    });
-    await page.waitForSelector('[data-block-plugin-id]');
-    const response = await page.content();
-
-    const cookieJar = new CookieJar();
-    const cookies = await page.cookies();
-    cookies.reduce((jar, cookie) => {
-        jar.setCookie(`${cookie.name}=${cookie.value}`, url);
-        return jar;
-    }, cookieJar);
-
-    await browser.close();
-
+    const response = await ofetch(url);
     const $ = load(response);
+
     const list = $('.list-content a')
         .toArray()
         .map((item) => {
@@ -80,15 +56,13 @@ async function handler(ctx) {
     const items = await Promise.all(
         list.map((item) =>
             cache.tryGet(item.link, async () => {
-                const { data } = await got(item.link, {
-                    cookieJar,
-                });
+                const data = await ofetch(item.link);
                 const $ = load(data);
 
                 item.author = $('.article-submit')
                     .text()
                     .match(/发布人：(.*)/)[1];
-                item.description = $('div[data-block-plugin-id="entity_field:node:body"]').html();
+                item.description = $('div[data-block-plugin-id="entity_field:node:body"]').html() + ($('div[data-block-plugin-id="entity_field:node:attachments"]').html() ?? '');
                 return item;
             })
         )

package/lib/routes/szftedu/gonggao.ts

@@ -43,7 +43,7 @@ async function handler() {
         lists.map((item) =>
             cache.tryGet(item.link, async () => {
                 const thisUrl = item.link;
-                const trueLink = thisUrl.includes('http') ? thisUrl : host + thisUrl.substring(1);
+                const trueLink = thisUrl.includes('http') ? thisUrl : host + thisUrl.slice(1);
                 const response = await got(trueLink);
                 const $ = load(response.data);
                 item.description = thisUrl.includes('http') ? $('#page-content').html() : $('div.TRS_Editor').html();

package/lib/routes/szse/inquire.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/szse/projectdynamic.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/taobao/zhongchou.ts

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

package/lib/routes/taptap/utils.ts

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

package/lib/routes/techcrunch/news.ts

@@ -4,8 +4,6 @@ import { load } from 'cheerio';
 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 host = 'https://techcrunch.com';
 export const route: Route = {

package/lib/routes/telecompaper/news.ts

@@ -102,7 +102,8 @@ async function handler(ctx) {
 
     const list = $('table.details_rows tbody tr')
         .slice(0, 10)
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const a = item.find('a');
             return {
@@ -110,8 +111,7 @@ async function handler(ctx) {
                 link: a.attr('href'),
                 pubDate: new Date(item.find('span.source').text().replace('Published ', '').split(' CET | ')[0] + ' GMT+1').toUTCString(),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/telecompaper/search.ts

@@ -72,7 +72,8 @@ async function handler(ctx) {
 
     const list = $('table.details_rows tbody tr')
         .slice(0, 15)
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const a = item.find('a');
             return {
@@ -80,8 +81,7 @@ async function handler(ctx) {
                 link: a.attr('href'),
                 pubDate: new Date(item.find('span.source').text().split(' | ')[0] + ' GMT+1').toUTCString(),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/routes/telegram/blog.ts

@@ -37,7 +37,7 @@ async function handler() {
 
     const items = await Promise.all(
         $$('.dev_blog_card_link_wrap')
-            .get()
+            .toArray()
             .map((each) => {
                 const $ = $$(each);
                 const link = 'https://telegram.org' + $.attr('href');