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

package/lib/routes/shu/global.ts

@@ -6,7 +6,8 @@ import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 
 const noticeType = {
-    tzgg: { title: '上海大学国际部港澳台-通知公告', url: 'https://global.shu.edu.cn/cd/tzgg/3.htm' },
+    tzgg: { title: '上海大学国际部港澳台-通知公告', url: 'https://global.shu.edu.cn/cd/tzgg.htm' },
+    xwsd: { title: '上海大学国际部港澳台-新闻速递', url: 'https://global.shu.edu.cn/cd/xwsd.htm' },
 };
 
 export const route: Route = {
@@ -24,7 +25,7 @@ export const route: Route = {
     },
     radar: [
         {
-            source: ['global.shu.edu.cn/'],
+            source: ['global.shu.edu.cn/cd/tzgg.htm', 'global.shu.edu.cn/cd/xwsd.htm'],
             target: '/global',
         },
     ],
@@ -32,9 +33,9 @@ export const route: Route = {
     maintainers: ['GhhG123'],
     handler,
     url: 'global.shu.edu.cn/',
-    description: `| 通知公告 |
-| -------- |
-| tzgg     |`,
+    description: `| 通知公告 | 新闻速递 |
+| -------- | -------- |
+| tzgg     | xwsd     |`,
 };
 
 async function handler(ctx) {

package/lib/routes/shu/xxgk.ts

@@ -0,0 +1,107 @@
+import { Route } from '@/types';
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+
+const noticeType = {
+    dwjlxm: { title: '上海大学信息公开网-信息公开栏目-国际合作与交流-对外交流项目', url: 'https://xxgk.shu.edu.cn/xxgklm/gjhzyjl1/dwjlxm.htm' }, // 对外交流项目
+    hzjl: { title: '上海大学信息公开网-信息公开栏目-国际合作与交流-合作交流', url: 'https://xxgk.shu.edu.cn/xxgklm/gjhzyjl1/hzjl.htm' }, // 合作交流
+};
+
+export const route: Route = {
+    path: '/xxgk/:type?',
+    categories: ['university'],
+    example: '/shu/xxgk/dwjlxm',
+    parameters: { type: '分类，默认为对外交流项目' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['xxgk.shu.edu.cn/'],
+            target: '/xxgk',
+        },
+    ],
+    name: '信息公开网',
+    maintainers: ['GhhG123'],
+    handler,
+    url: 'xxgk.shu.edu.cn/',
+    description: `| 对外交流项目 | 合作交流 |
+| -------- | --------- |
+| dwjlxm   | hzjl      |`,
+};
+
+async function handler(ctx) {
+    const type = ctx.req.param('type') ?? 'dwjlxm';
+    const rootUrl = 'https://xxgk.shu.edu.cn';
+
+    // 发起 HTTP GET 请求
+    const response = await got({
+        method: 'get',
+
+        /* headers: {
+            'user-agent': UA,
+            cookie: await getCookie(ctx),
+        }, */
+        url: noticeType[type].url,
+    });
+
+    const $ = load(response.data);
+
+    const list = $('li[id^="line_u6_"]') // 定位到每个包含新闻的<li>元素
+        .toArray()
+        .map((el) => {
+            const item = $(el); // 使用Cheerio包装每个<li>元素
+            const a = item.find('a');
+            const rawLink = a.attr('href'); // 获取链接
+            const title = a.text().trim(); // 获取标题
+            const pubDate = item.find('i').text().trim(); // 获取日期
+
+            return {
+                title, // 获取标题
+                link: rawLink ? new URL(rawLink, rootUrl).href : rootUrl, // 生成完整链接
+                pubDate: timezone(parseDate(pubDate, 'YYYY/MM/DD'), +8), // 解析日期
+                description: '', // 初始化描述
+            };
+        });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const url = new URL(item.link); // 创建 URL 对象以验证链接
+                // 确保链接是以正确的域名开头，并且不为空
+                if (url.hostname === 'gs1.shu.edu.cn') {
+                    // 需校内访问
+                    // Skip or handle differently for URLs with gs1.shu.edu.cn domain
+                    item.description = 'gs1.shu.edu.cn, 无法直接获取';
+                    return item;
+                }
+
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                }); // 获取详情页内容
+                const content = load(detailResponse.data); // 使用cheerio解析内容
+
+                item.description = content('.v_news_content').html() || item.description;
+
+                return item; // 返回完整的item
+            })
+        )
+    );
+
+    return {
+        title: noticeType[type].title,
+        description: noticeType[type].title,
+        link: noticeType[type].url,
+        image: 'https://www.shu.edu.cn/__local/0/08/C6/1EABE492B0CF228A5564D6E6ABE_779D1EE3_5BF7.png',
+        item: items,
+    };
+}

package/lib/routes/shuiguopai/index.ts

@@ -20,6 +20,9 @@ export const route: Route = {
     maintainers: ['nczitzk'],
     handler,
     url: 'shuiguopai.com/',
+    features: {
+        nsfw: true,
+    },
 };
 
 async function handler(ctx) {

package/lib/routes/sis001/author.ts

@@ -18,6 +18,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: '作者',
     maintainers: ['keocheung'],

package/lib/routes/sjtu/jwc.ts

@@ -7,7 +7,7 @@ import { parseDate } from '@/utils/parse-date';
 const urlRoot = 'https://jwc.sjtu.edu.cn';
 
 async function getFullArticle(link) {
-    const response = await got(link).catch(() => null);
+    const response = await got(link);
     if (!response) {
         return null;
     }

package/lib/routes/skeb/following-creators.ts

@@ -21,6 +21,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Following Creators',
     maintainers: ['SnowAgar25'],

package/lib/routes/skeb/following-works.ts

@@ -21,6 +21,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Following Works',
     maintainers: ['SnowAgar25'],

package/lib/routes/skeb/friend-works.ts

@@ -21,6 +21,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Friend Works',
     maintainers: ['SnowAgar25'],

package/lib/routes/skeb/index.ts

@@ -33,6 +33,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Skeb',
     maintainers: ['SnowAgar25'],

package/lib/routes/skeb/search.ts

@@ -16,6 +16,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Search Results',
     maintainers: ['SnowAgar25'],

package/lib/routes/skeb/works.ts

@@ -4,6 +4,7 @@ import ConfigNotFoundError from '@/errors/types/config-not-found';
 import { baseUrl, processWork } from './utils';
 import cache from '@/utils/cache';
 import ofetch from '@/utils/ofetch';
+import logger from '@/utils/logger';
 
 export const route: Route = {
     path: '/works/:username',
@@ -23,6 +24,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Creator Works',
     maintainers: ['SnowAgar25'],
@@ -46,32 +48,19 @@ async function handler(ctx): Promise<Data> {
 
     const url = `${baseUrl}/api/users/${username.replace('@', '')}/works`;
 
-    const items = await cache.tryGet(url, async () => {
-        const fetchData = async (retryCount = 0, maxRetries = 3) => {
-            const data = await ofetch(url, {
-                retry: 0,
-                method: 'GET',
-                query: { role: 'creator', sort: 'date', offset: '0' },
-                headers: {
-                    'User-Agent': config.ua,
-                    Cookie: `request_key=${cache.get('skeb:request_key')}`,
-                    Authorization: `Bearer ${config.skeb.bearerToken}`,
-                },
-            }).catch((error) => {
-                if (retryCount >= maxRetries) {
-                    throw new Error('Max retries reached');
-                }
-                const newRequestKey = error.response?._data?.match(/request_key=(.*?);/)?.[1];
-                if (newRequestKey) {
-                    cache.set('skeb:request_key', newRequestKey);
-                    return fetchData(retryCount + 1, maxRetries);
-                }
-                throw error;
-            });
-            return data;
-        };
+    await ensureRequestKey(url);
 
-        const data = await fetchData();
+    const items = await cache.tryGet(url, async () => {
+        const data = await ofetch(url, {
+            retry: 0,
+            method: 'GET',
+            query: { role: 'creator', sort: 'date', offset: '0' },
+            headers: {
+                'User-Agent': config.ua,
+                Cookie: `request_key=${await cache.get('skeb:request_key')}`,
+                Authorization: `Bearer ${config.skeb.bearerToken}`,
+            },
+        });
 
         if (!data || !Array.isArray(data)) {
             throw new Error('Invalid data received from API');
@@ -86,3 +75,33 @@ async function handler(ctx): Promise<Data> {
         item: items as DataItem[],
     };
 }
+
+function hasResponseData(error: unknown): error is { response: { _data: string } } {
+    return error !== null && typeof error === 'object' && 'response' in error && typeof (error as { response?: { _data?: unknown } }).response?._data === 'string';
+}
+
+async function ensureRequestKey(url: string) {
+    if (await cache.get('skeb:request_key')) {
+        return;
+    }
+
+    try {
+        await ofetch(url, {
+            retry: 0,
+            headers: {
+                'User-Agent': config.ua,
+                Authorization: `Bearer ${config.skeb.bearerToken}`,
+            },
+        });
+    } catch (error) {
+        if (hasResponseData(error)) {
+            const newRequestKey = error.response?._data?.match(/request_key=(.*?);/)?.[1];
+            if (newRequestKey) {
+                cache.set('skeb:request_key', newRequestKey);
+                logger.debug(`Retrieved new request_key: ${newRequestKey}`);
+            } else {
+                logger.error('Failed to extract request_key from error response');
+            }
+        }
+    }
+}

package/lib/routes/skebetter/illust.ts

@@ -15,6 +15,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Illust',
     maintainers: ['SnowAgar25'],

package/lib/routes/skebetter/index.ts

@@ -15,6 +15,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Hot',
     maintainers: ['SnowAgar25'],

package/lib/routes/skebetter/manga.ts

@@ -15,6 +15,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     name: 'Manga',
     maintainers: ['SnowAgar25'],

package/lib/routes/sohu/mp.ts

@@ -128,7 +128,7 @@ async function handler(ctx) {
                         .text()
                         .match(/contentData = (.*)/)?.[1]
             )
-            .sort((a: any, b: any) => b.length - a.length)[0] || '{}'
+            .toSorted((a: any, b: any) => b.length - a.length)[0] || '{}'
     );
     const blockRenderData = JSON.parse(
         $('script:contains("column_2_text")')

package/lib/routes/sotwe/user.ts

@@ -41,7 +41,7 @@ const renderMedia = (mediaEntities) =>
                 case 'photo':
                     return `<img src="${e.mediaURL}">`;
                 case 'video': {
-                    const video = e.videoInfo.variants.filter((v) => v.type === 'video/mp4').sort((a, b) => b.bitrate - a.bitrate)[0];
+                    const video = e.videoInfo.variants.filter((v) => v.type === 'video/mp4').toSorted((a, b) => b.bitrate - a.bitrate)[0];
                     return `<video controls preload="metadata" poster="${e.mediaURL}"><source src="${video.url}" type="video/mp4"></video>`;
                 }
                 default:

package/lib/routes/sspai/index.ts

@@ -23,7 +23,7 @@ export const route: Route = {
         },
     ],
     name: '首页',
-    maintainers: ['HenryQW'],
+    maintainers: ['HenryQW', 'cscnk52'],
     handler,
     url: 'sspai.com/index',
 };
@@ -49,6 +49,10 @@ async function handler() {
                 }
                 description += articleData.body;
 
+                if (articleData.body_extends) {
+                    description += articleData.body_extends.map((bodyExtendsItem) => `<h2>${bodyExtendsItem.title}</h2>${bodyExtendsItem.body}`).join('');
+                }
+
                 return {
                     title: item.title.trim(),
                     description,

package/lib/routes/stcn/index.ts

@@ -172,9 +172,8 @@ export const route: Route = {
             ],
         },
     },
-    description: `:::tip
+    description: `::: tip
 若订阅 [要闻](https://www.stcn.com/article/list/yw.html)，网址为 \`https://www.stcn.com/article/list/yw.html\`，请截取 \`https://www.stcn.com/article/list/\` 到末尾 \`.html\` 的部分 \`yw\` 作为 \`id\` 参数填入，此时目标路由为 [\`/stcn/article/list/yw\`](https://rsshub.app/stcn/article/list/yw)。
-
 :::
 
 | 要闻 | 股市 | 公司    | 基金 | 金融    | 评论    |

package/lib/routes/stcn/rank.ts

@@ -156,9 +156,8 @@ export const route: Route = {
             ],
         },
     },
-    description: `:::tip
+    description: `::: tip
 若订阅 [要闻](https://www.stcn.com/article/list/yw.html)，网址为 \`https://www.stcn.com/article/list/yw.html\`，请截取 \`https://www.stcn.com/article/list/\` 到末尾 \`.html\` 的部分 \`yw\` 作为 \`id\` 参数填入，此时目标路由为 [\`/stcn/article/rank/yw\`](https://rsshub.app/stcn/article/rank/yw)。
-
 :::
 
 | 要闻 | 股市 | 公司    | 基金 | 金融    | 评论    |