rsshub 1.0.0-master.f72af1b → 1.0.0-master.f7347d9

package/lib/routes/zaobao/util.ts

@@ -38,7 +38,7 @@ const parseList = async (
 }> => {
     const response = await got_ins.get(baseUrl + sectionUrl);
     const $ = load(response.data);
-    let data = /realtime/.test(sectionUrl) ? $('.card-listing .card') : $('.article-list').find('.article-type');
+    let data = $('.card-listing .card');
     if (data.length === 0) {
         // for HK version
         data = $('.clearfix').find('.list-block');
@@ -104,48 +104,7 @@ const parseList = async (
 
                 const articleBody = articleBodyNode.html();
 
-                const imageDataArray = [];
-                if ($1('.inline-figure-img').length) {
-                    // for SG version
-                    imageDataArray.push({
-                        type: 'normalHTML',
-                        html: $1('.inline-figure-img')
-                            .html()
-                            .replace(/\/\/.*\.com\/s3fs-public/, '//static.zaobao.com/s3fs-public')
-                            .replace(/s3\/files/, 's3fs-public'),
-                    });
-                }
-                if ($1('.body-content .loadme picture img').length) {
-                    // Unused?
-                    imageDataArray.push({
-                        type: 'data',
-                        src: $1('.body-content .loadme picture source')
-                            .attr('data-srcset')
-                            .replace(/\/\/.*\.com\/s3fs-public/, '//static.zaobao.com/s3fs-public')
-                            .replace(/s3\/files/, 's3fs-public'),
-                        title: $1('.body-content .loadme picture img').attr('title'),
-                    });
-                }
-                if ($1('.inline-figure-gallery').length) {
-                    // for SG version
-                    imageDataArray.push({
-                        type: 'normalHTML',
-                        html: $1('.inline-figure-gallery')
-                            .html()
-                            .replaceAll(/\/\/.*\.com\/s3fs-public/g, '//static.zaobao.com/s3fs-public')
-                            .replaceAll('s3/files', 's3fs-public'),
-                    });
-                }
-                if ($1('#carousel-article').length) {
-                    // for HK version, HK version of multi images use same selector as single image, so g is needed for all pages
-                    imageDataArray.push({
-                        type: 'normalHTML',
-                        html: $1('#carousel-article .carousel-inner')
-                            .html()
-                            .replaceAll(/\/\/.*\.com\/s3fs-public/g, '//static.zaobao.com/s3fs-public')
-                            .replaceAll('s3/files', 's3fs-public'),
-                    });
-                }
+                const imageDataArray = processImageData($1);
 
                 return {
                     // <- for SG version  -> for HK version
@@ -182,4 +141,43 @@ const orderContent = (parent) => {
     }
 };
 
+interface ImageData {
+    type: string;
+    html: string;
+    src?: string;
+    title?: string;
+}
+
+const processImageData = ($1) => {
+    const imageDataArray: ImageData[] = [];
+
+    const imageSelectors = [
+        '.inline-figure-img', // for SG version
+        '.body-content .loadme picture img', // Unused?
+        '.inline-figure-gallery', // for SG version
+        '#carousel-article', // for HK version, HK version of multi images use same selector as single image, so g is needed for all pages
+    ];
+
+    for (const selector of imageSelectors) {
+        if ($1(selector).length) {
+            let html = $1(selector === '#carousel-article' ? '#carousel-article .carousel-inner' : selector).html();
+
+            if (html) {
+                html = html.replaceAll(/\/\/.*\.com\/s3fs-public/g, '//static.zaobao.com/s3fs-public').replaceAll('s3/files', 's3fs-public');
+
+                imageDataArray.push({
+                    type: selector === '.body-content .loadme picture img' ? 'data' : 'normalHTML',
+                    html,
+                    ...(selector === '.body-content .loadme picture img' && {
+                        src: $1('.body-content .loadme picture source').attr('data-srcset'),
+                        title: $1(selector).attr('title'),
+                    }),
+                });
+            }
+        }
+    }
+
+    return imageDataArray;
+};
+
 export { parseList, orderContent };

package/lib/routes/zhihu/activities.ts

@@ -2,6 +2,7 @@ import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import { header, processImage, getSignedHeader } from './utils';
 import { parseDate } from '@/utils/parse-date';
+import sanitizeHtml from 'sanitize-html';
 
 export const route: Route = {
     path: '/people/activities/:id',
@@ -75,7 +76,7 @@ async function handler(ctx) {
                     url = `https://zhuanlan.zhihu.com/p/${detail.id}`;
                     break;
                 case 'pin':
-                    title = detail.excerpt_title;
+                    title = sanitizeHtml(detail.excerpt_title);
                     author = detail.author.name;
                     for (const contentItem of detail.content) {
                         switch (contentItem.type) {

package/lib/routes/zhihu/timeline.ts

@@ -60,10 +60,13 @@ async function handler(ctx) {
                 const questionId = e.target.question.id;
                 return `${urlBase}/question/${questionId}/answer/${id}`;
             }
+            case 'pin':
             case 'article':
                 return e.target.url;
             case 'question':
                 return `${urlBase}/question/${id}`;
+            default:
+                return;
         }
         return '';
     };
@@ -111,11 +114,12 @@ async function handler(ctx) {
             link,
             author: e.target.author ? e.target.author.name : '',
             guid: link,
+            category: [e.verb],
         };
     };
 
     const out = feeds
-        .filter((e) => e.verb && e.verb !== 'MEMBER_VOTEUP_ARTICLE' && e.verb !== 'MEMBER_VOTEUP_ANSWER')
+        .filter((e) => e.verb)
         .map((e) => {
             if (e && e.type && e.type === 'feed_group') {
                 // A feed group contains a list of feeds whose structure is the same as a single feed
@@ -134,6 +138,7 @@ async function handler(ctx) {
                     description,
                     pubDate,
                     guid,
+                    category: [e.verb],
                 };
             }
             return buildItem(e);

package/lib/routes/zhihu/utils.ts

@@ -75,7 +75,7 @@ export const getSignedHeader = async (url: string, apiPath: string) => {
         }
         const response1 = await ofetch.raw('https://static.zhihu.com/zse-ck/v3.js');
         const script = await response1._data.text();
-        const zseCk = script.match(/__g\.ck\|\|"([\w+/=\\]*?)",_=630e8;/)?.[1];
+        const zseCk = script.match(/__g\.ck\|\|"([\w+/=\\]*?)",_=/)?.[1];
 
         const response2 = zseCk
             ? await ofetch.raw(url, {

package/lib/routes/zjut/cs/index.ts

@@ -0,0 +1,105 @@
+import { Data, Route } from '@/types';
+import cache from '@/utils/cache';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
+import ofetch from '@/utils/ofetch';
+import timezone from '@/utils/timezone';
+
+const rootUrl = 'https://cs.zjut.edu.cn/jsp/newsclass.jsp?wcId=';
+const host = 'cs.zjut.edu.cn';
+
+export const route: Route = {
+    path: '/cs/:type',
+    categories: ['university'],
+    example: '/zjut/cs/54',
+    parameters: { type: '分类，见下表' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: '浙江工业大学计算机科学与技术学院、软件学院',
+    maintainers: ['zhullyb'],
+    url: 'cs.zjut.edu.cn',
+    handler,
+    radar: [
+        {
+            source: ['cs.zjut.edu.cn/jsp/newsclass.jsp?wcId=:type'],
+            target: '/cs/:type',
+        },
+    ],
+    description: `| 新闻资讯 | 学术动态 | 通知公告 |
+| ------- | ------- | ------- |
+| 54      | 55      | 53      |`,
+};
+
+async function handler(ctx) {
+    const type = Number.parseInt(ctx.req.param('type'));
+    const response = await ofetch(rootUrl + type);
+    const $ = load(response);
+
+    const list = $('dl.news')
+        .toArray()
+        .map((item) => {
+            const cheerioItem = $(item);
+            const a = cheerioItem.find('a');
+
+            try {
+                const title = a.text() || '';
+                let link = a.attr('href');
+                if (!link) {
+                    link = '';
+                } else if (!link.startsWith('http')) {
+                    link = 'https://' + host + '/jsp/' + link;
+                }
+                const pubDate = timezone(parseDate(cheerioItem.find('.datetime').text().slice(1, -1)), +8);
+
+                return {
+                    title,
+                    link,
+                    pubDate,
+                };
+            } catch {
+                return {
+                    title: '',
+                    link: '',
+                    pubDate: Date.now(),
+                };
+            }
+        })
+        .filter((item) => item.title && item.link);
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const newItem = {
+                    ...item,
+                    description: '',
+                };
+                if (host === new URL(item.link).hostname) {
+                    if (new URL(item.link).pathname.startsWith('/upload')) {
+                        // 链接为一个文件，直接返回链接
+                        newItem.description = item.link;
+                    } else {
+                        const response = await ofetch(item.link);
+                        const $ = load(response);
+                        newItem.description = $('div.news1content').html() || '';
+                    }
+                } else {
+                    // 涉及到其他站点，不方便做统一的 html 解析，直接返回链接
+                    newItem.description = item.link;
+                }
+                return newItem;
+            })
+        )
+    );
+
+    return {
+        title: $('li#classname').text() + ' - 浙江工业大学计算机科学与技术学院、软件学院',
+        link: rootUrl + type,
+        item: items,
+    } as Data;
+}

package/lib/routes/zjut/jwc/index.ts

@@ -0,0 +1,117 @@
+import { Data, Route } from '@/types';
+import cache from '@/utils/cache';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
+import ofetch from '@/utils/ofetch';
+import timezone from '@/utils/timezone';
+
+const rootUrl = 'http://www.jwc.zjut.edu.cn/';
+const host = 'www.jwc.zjut.edu.cn';
+
+export const route: Route = {
+    path: '/jwc/:type',
+    categories: ['university'],
+    example: '/zjut/jwc/1839',
+    parameters: { type: '分类，见下表' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: '浙江工业大学教务处',
+    maintainers: ['zhullyb'],
+    url: 'www.jwc.zjut.edu.cn',
+    handler,
+    radar: [
+        {
+            source: ['www.jwc.zjut.edu.cn/:type/list.htm'],
+            target: '/jwc/:type',
+        },
+    ],
+    description: `| 板块 | 参数 |
+| ------- | ------- |
+| 新闻动态 | 1838 |
+| 课程思政 | 1842 |
+| 校内动态 | 2613 |
+| 学习思考 | 2614 |
+| 成果展示 | 2615 |
+| 媒体聚焦 | 2616 |
+| 制度文件 | 2617 |
+| 教学运行 | 1849 |
+| 实践竞赛 | 1850 |
+| 留学生Notice | 1851 |
+| 项目申报 | 1852 |
+| 学籍管理 | 1853 |
+| 办事指南 | 1839 |`,
+};
+
+async function handler(ctx) {
+    const type = Number.parseInt(ctx.req.param('type'));
+    const response = await ofetch(rootUrl + type + '/list.htm');
+    const $ = load(response);
+
+    const list = $('.news.clearfix')
+        .toArray()
+        .map((item) => {
+            const cheerioItem = $(item);
+            const a = cheerioItem.find('a');
+
+            try {
+                const title = a.attr('title') || '';
+                let link = a.attr('href');
+                if (!link) {
+                    link = '';
+                } else if (!link.startsWith('http')) {
+                    link = rootUrl.slice(0, -1) + link;
+                }
+                const pubDate = timezone(parseDate(cheerioItem.find('.news_meta').text()), +8);
+
+                return {
+                    title,
+                    link,
+                    pubDate,
+                };
+            } catch {
+                return {
+                    title: '',
+                    link: '',
+                    pubDate: Date.now(),
+                };
+            }
+        })
+        .filter((item) => item.title && item.link);
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const newItem = {
+                    ...item,
+                    description: '',
+                };
+                if (host === new URL(item.link).hostname) {
+                    if (new URL(item.link).pathname.startsWith('/_upload')) {
+                        // 链接为一个文件，直接返回链接
+                        newItem.description = item.link;
+                    } else {
+                        const response = await ofetch(item.link);
+                        const $ = load(response);
+                        newItem.description = $('.wp_articlecontent').html() || '';
+                    }
+                } else {
+                    // 涉及到其他站点，不方便做统一的 html 解析，直接返回链接
+                    newItem.description = item.link;
+                }
+                return newItem;
+            })
+        )
+    );
+
+    return {
+        title: $('head > title').text() + ' - 浙江工业大学教务处',
+        link: rootUrl + type + '/list.htm',
+        item: items,
+    } as Data;
+}

package/lib/utils/cache/redis.ts

@@ -64,7 +64,7 @@ export default {
         }
         if (key) {
             if (maxAge !== config.cache.contentExpire) {
-                // Only set cacheTtlKey if maxAge !== contentExpire
+                // intentionally store the cache ttl if it is not the default value
                 clients.redisClient.set(getCacheTtlKey(key), maxAge, 'EX', maxAge);
             }
             return clients.redisClient.set(key, value, 'EX', maxAge); // setMode: https://redis.io/commands/set

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.f72af1b",
+  "version": "1.0.0-master.f7347d9",
   "description": "Make RSS Great Again!",
   "keywords": [
     "RSS"
@@ -32,8 +32,8 @@
     "*.yml": "eslint --cache --fix"
   },
   "dependencies": {
-    "@hono/node-server": "1.13.1",
-    "@hono/zod-openapi": "0.16.2",
+    "@hono/node-server": "1.13.2",
+    "@hono/zod-openapi": "0.16.4",
     "@notionhq/client": "2.2.15",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/exporter-prometheus": "0.53.0",
@@ -43,10 +43,10 @@
     "@opentelemetry/sdk-trace-base": "1.26.0",
     "@opentelemetry/semantic-conventions": "1.27.0",
     "@postlight/parser": "2.2.3",
-    "@rss3/sdk": "0.0.19",
-    "@scalar/hono-api-reference": "0.5.148",
-    "@sentry/node": "7.116.0",
-    "@tonyrl/rand-user-agent": "2.0.79",
+    "@rss3/sdk": "0.0.22",
+    "@scalar/hono-api-reference": "0.5.155",
+    "@sentry/node": "7.119.1",
+    "@tonyrl/rand-user-agent": "2.0.81",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
@@ -63,9 +63,9 @@
     "entities": "5.0.0",
     "etag": "1.8.1",
     "fanfou-sdk": "5.0.0",
-    "form-data": "4.0.0",
+    "form-data": "4.0.1",
     "googleapis": "144.0.0",
-    "hono": "4.6.3",
+    "hono": "4.6.5",
     "html-to-text": "9.0.5",
     "http-cookie-agent": "6.0.6",
     "https-proxy-agent": "7.0.5",
@@ -84,45 +84,45 @@
     "module-alias": "2.2.3",
     "notion-to-md": "3.1.1",
     "oauth-1.0a": "2.2.6",
-    "ofetch": "1.4.0",
+    "ofetch": "1.4.1",
     "otplib": "12.0.1",
     "pac-proxy-agent": "7.0.2",
-    "proxy-chain": "2.5.3",
+    "proxy-chain": "2.5.4",
     "puppeteer": "22.6.2",
     "puppeteer-extra": "3.3.6",
     "puppeteer-extra-plugin-stealth": "2.11.2",
     "puppeteer-extra-plugin-user-data-dir": "2.4.1",
     "puppeteer-extra-plugin-user-preferences": "2.4.1",
-    "query-string": "9.1.0",
+    "query-string": "9.1.1",
     "rate-limiter-flexible": "5.0.3",
     "re2js": "0.4.2",
     "rfc4648": "1.5.3",
     "rss-parser": "3.13.0",
-    "sanitize-html": "2.13.0",
-    "simplecc-wasm": "1.0.0",
+    "sanitize-html": "2.13.1",
+    "simplecc-wasm": "1.1.0",
     "socks-proxy-agent": "8.0.4",
     "source-map": "0.7.4",
-    "telegram": "2.25.11",
+    "telegram": "2.25.15",
     "tiny-async-pool": "2.1.0",
     "title": "3.5.3",
-    "tldts": "6.1.47",
+    "tldts": "6.1.52",
     "tosource": "2.0.0-alpha.3",
-    "tough-cookie": "4.1.4",
+    "tough-cookie": "5.0.0",
     "tsx": "4.19.1",
-    "twitter-api-v2": "1.17.2",
-    "undici": "6.19.8",
+    "twitter-api-v2": "1.18.0",
+    "undici": "6.20.1",
     "uuid": "10.0.0",
-    "winston": "3.14.2",
+    "winston": "3.15.0",
     "xxhash-wasm": "1.0.2",
     "zod": "3.23.8"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.25.4",
-    "@babel/preset-typescript": "7.24.7",
+    "@babel/preset-env": "7.25.8",
+    "@babel/preset-typescript": "7.25.7",
     "@eslint/eslintrc": "3.1.0",
-    "@eslint/js": "9.11.1",
+    "@eslint/js": "9.12.0",
     "@microsoft/eslint-formatter-sarif": "3.1.0",
-    "@stylistic/eslint-plugin": "2.8.0",
+    "@stylistic/eslint-plugin": "2.9.0",
     "@types/aes-js": "3.1.4",
     "@types/babel__preset-env": "7.9.7",
     "@types/crypto-js": "4.2.2",
@@ -136,31 +136,30 @@
     "@types/json-bigint": "1.0.4",
     "@types/jsrsasign": "10.5.13",
     "@types/lint-staged": "13.3.0",
-    "@types/mailparser": "3.4.4",
+    "@types/mailparser": "3.4.5",
     "@types/markdown-it": "14.1.2",
     "@types/module-alias": "2.0.4",
-    "@types/node": "22.7.0",
+    "@types/node": "22.7.6",
     "@types/sanitize-html": "2.13.0",
     "@types/supertest": "6.0.2",
     "@types/tiny-async-pool": "2.0.3",
     "@types/title": "3.4.3",
-    "@types/tough-cookie": "4.0.5",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.7.0",
-    "@typescript-eslint/parser": "8.7.0",
+    "@typescript-eslint/eslint-plugin": "8.10.0",
+    "@typescript-eslint/parser": "8.10.0",
     "@vercel/nft": "0.27.4",
     "@vitest/coverage-v8": "2.0.5",
-    "discord-api-types": "0.37.101",
-    "eslint": "9.11.1",
+    "discord-api-types": "0.37.102",
+    "eslint": "9.12.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-nibble": "8.1.0",
-    "eslint-plugin-n": "17.10.3",
+    "eslint-plugin-n": "17.11.1",
     "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-unicorn": "55.0.0",
+    "eslint-plugin-unicorn": "56.0.0",
     "eslint-plugin-yml": "1.14.0",
     "fs-extra": "11.2.0",
-    "globals": "15.9.0",
-    "got": "14.4.2",
+    "globals": "15.11.0",
+    "got": "14.4.3",
     "husky": "9.1.6",
     "js-beautify": "1.15.1",
     "lint-staged": "15.2.10",
@@ -169,7 +168,7 @@
     "prettier": "3.3.3",
     "remark-parse": "11.0.0",
     "supertest": "7.0.0",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "unified": "11.0.5",
     "vite-tsconfig-paths": "5.0.1",
     "vitest": "2.0.5",

package/lib/routes/a9vg/a9vg.ts

@@ -1,45 +0,0 @@
-import { Route } from '@/types';
-import got from '@/utils/got';
-import * as cheerio from 'cheerio';
-import { parseDate } from '@/utils/parse-date';
-import timezone from '@/utils/timezone';
-
-export const route: Route = {
-    path: '/',
-    radar: [
-        {
-            source: ['a9vg.com/list/news', 'a9vg.com/'],
-            target: '',
-        },
-    ],
-    name: 'Unknown',
-    maintainers: ['monnerHenster'],
-    handler,
-    url: 'a9vg.com/list/news',
-};
-
-async function handler() {
-    const baseUrl = 'http://www.a9vg.com';
-    const link = `${baseUrl}/list/news`;
-    const { data } = await got(link);
-
-    const $ = cheerio.load(data);
-    const list = $('.a9-rich-card-list li')
-        .toArray()
-        .map((elem) => {
-            const item = $(elem);
-            return {
-                title: item.find('.a9-rich-card-list_label').text(),
-                description: `<img src="${item.find('img').attr('src')}"><br>${item.find('.a9-rich-card-list_summary').text().trim()}`,
-                pubDate: timezone(parseDate(item.find('.a9-rich-card-list_infos').text().trim(), 'YYYY-MM-DD HH:mm:ss'), 8),
-                link: `${baseUrl}${item.find('.a9-rich-card-list_item').attr('href')}`,
-            };
-        });
-
-    return {
-        title: 'A9VG 电玩部落',
-        link,
-        description: $('meta[name="description"]').attr('content'),
-        item: list,
-    };
-}

package/lib/routes/gov/ndrc/zfxxgk/articles.ts

@@ -1,73 +0,0 @@
-import { Route } from '@/types';
-import cache from '@/utils/cache';
-import got from '@/utils/got';
-import { load } from 'cheerio';
-import { parseDate } from '@/utils/parse-date';
-
-export const route: Route = {
-    path: '/ndrc/zfxxgk/iteminfo',
-    categories: ['government'],
-    example: '/gov/ndrc/zfxxgk/iteminfo',
-    parameters: {},
-    features: {
-        requireConfig: false,
-        requirePuppeteer: false,
-        antiCrawler: false,
-        supportBT: false,
-        supportPodcast: false,
-        supportScihub: false,
-    },
-    name: '国家发展改革委 - 政府信息公开',
-    maintainers: ['howfool'],
-    handler,
-    url: 'zfxxgk.ndrc.gov.cn/web/dirlist.jsp',
-};
-
-async function handler() {
-    const homeUrl = 'https://zfxxgk.ndrc.gov.cn/web/dirlist.jsp';
-    const rootUrl = 'https://zfxxgk.ndrc.gov.cn/web/';
-
-    const response = await got({
-        method: 'get',
-        url: homeUrl,
-    });
-
-    const $ = load(response.data);
-
-    let items = $('div.zwgk-right .zwxxkg-result tr')
-        .toArray()
-        .slice(1)
-        .map((item) => {
-            item = $(item);
-
-            return {
-                title: item.find('a').text().replace(/^\s*/, ''),
-                link: rootUrl + item.find('a').attr('href'),
-                data: item.find('td:last').text(),
-            };
-        });
-
-    items = await Promise.all(
-        items.map((item) =>
-            cache.tryGet(item.link, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: item.link,
-                });
-
-                const content = load(detailResponse.data);
-                content('[class$="top"]').remove();
-                item.description = content('.zwgkbg').html();
-                item.pubDate = parseDate(item.data);
-
-                return item;
-            })
-        )
-    );
-
-    return {
-        title: '国家发展改革委 - 政府信息公开',
-        link: homeUrl,
-        item: items,
-    };
-}