rsshub 1.0.0-master.f6c2ebb → 1.0.0-master.f70afef

package/lib/routes/zhihu/types.ts

@@ -102,3 +102,29 @@ export interface Articles {
     };
     data: Article[];
 }
+
+export interface CollectionItem {
+    content: {
+        type: string;
+        title?: string;
+        question?: {
+            title: string;
+        };
+        url: string;
+        content: string;
+        video?: {
+            url: string;
+        };
+        updated?: number;
+        updated_time?: number;
+    };
+    collectionTitle?: string;
+}
+
+export interface Collection {
+    id: string;
+    title: string;
+    creator: {
+        name: string;
+    };
+}

package/lib/routes/zhihu/utils.ts

@@ -61,7 +61,7 @@ export const getCookieValueByKey = (key: string) =>
         ?.split(';')
         .map((e) => e.trim())
         .find((e) => e.startsWith(key + '='))
-        ?.slice(key.length + 1);
+        ?.slice(key.length + 1) || '';
 
 export const getSignedHeader = async (url: string, apiPath: string) => {
     // Because the API of zhihu.com has changed, we must use the value of `d_c0` (extracted from cookies) to calculate
@@ -76,7 +76,6 @@ 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+/=\\]*?)",_=/)?.[1];
-
         const response2 = zseCk
             ? await ofetch.raw(url, {
                   headers: {
@@ -88,15 +87,13 @@ export const getSignedHeader = async (url: string, apiPath: string) => {
               })
             : null;
 
-        const dc0 = (response2 || response1).headers
-            .getSetCookie()
-            .find((s) => s.startsWith('d_c0='))
-            ?.split(';')[0]
-            .trim()
-            .slice('d_c0='.length);
-        if (!dc0) {
-            throw new Error('Failed to extract `d_c0` from cookies');
-        }
+        const dc0 =
+            (response2 || response1).headers
+                .getSetCookie()
+                .find((s) => s.startsWith('d_c0='))
+                ?.split(';')[0]
+                .trim()
+                .slice('d_c0='.length) || '';
 
         return dc0;
     });

package/lib/routes/zhihu/xhu/activities.ts

@@ -28,12 +28,12 @@ export const route: Route = {
     handler,
     description: `[xhu](https://github.com/REToys/xhu)
 
-  :::tip
+::: tip
   用户的 16 进制 id 获取方式：
 
   1.  可以通过 RSSHub Radar 扩展获取；
   2.  或者在用户主页打开 F12 控制台，执行以下代码：\`console.log(/"id":"([0-9a-f]*?)","urlToken"/.exec(document.getElementById('js-initialData').innerHTML)[1]);\` 即可获取用户的 16 进制 id。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/zhubai/index.ts

@@ -20,9 +20,9 @@ export const route: Route = {
     name: '文章',
     maintainers: ['naixy28'],
     handler,
-    description: `:::tip
+    description: `::: tip
   在路由末尾处加上 \`?limit=限制获取数目\` 来限制获取条目数量，默认值为\`20\`
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/zimuxia/portfolio.ts

@@ -24,7 +24,7 @@ export const route: Route = {
     name: '剧集',
     maintainers: ['nczitzk'],
     handler,
-    description: `:::tip
+    description: `::: tip
 本路由以 \`magnet\` 为默认 linktype，可以通过在路由后方加上 \`?linktype=链接类型\` 指定导出的链接类型。比如路由为 [\`/zimuxia/portfolio/我们这一天?linktype=baidu\`](https://rsshub.app/zimuxia/portfolio/我们这一天?linktype=baidu) 来导出百度盘链接。目前，你可以选择的 \`链接类型\` 包括: \`magnet\`(默认), \`all\`(所有), \`ed2k\`(电驴), \`baidu\`(百度盘), \`quark\`(夸克盘), \`115\`(115 盘), \`subhd\`(字幕).
 :::`,
 };

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

@@ -27,7 +27,7 @@ export const route: Route = {
     handler,
     radar: [
         {
-            source: ['cs.zjut.edu.cn/jsp/newsclass.jsp?wcId=:type'],
+            source: ['cs.zjut.edu.cn/jsp/newsclass.jsp'],
             target: '/cs/:type',
         },
     ],

package/lib/routes/zsxq/utils.ts

@@ -38,6 +38,7 @@ export function generateTopicDataItem(topics: Topic[]): DataItem[] {
     return topics.map((topic) => {
         let description: string | undefined;
         let title = '';
+        const url = `https://wx.zsxq.com/topic/${topic.topic_id}`;
         switch (topic.type) {
             case 'talk':
                 title = topic.talk?.text?.split('\n')[0] ?? '文章';
@@ -66,6 +67,7 @@ export function generateTopicDataItem(topics: Topic[]): DataItem[] {
             title: topic.title ?? title,
             description,
             pubDate: parseDate(topic.create_time),
+            link: url,
         };
     });
 }

package/lib/routes/zyw/hot.ts

@@ -17,9 +17,9 @@ export const route: Route = {
     name: '今日热榜',
     maintainers: ['nczitzk'],
     handler,
-    description: `:::tip
+    description: `::: tip
   全部站点请见 [此处](https://hot.zyw.asia/#/list)
-  :::
+:::
 
   | 哔哩哔哩 | 微博 | 知乎 | 36 氪 | 百度 | 少数派 | IT 之家 | 澎湃新闻 | 今日头条 | 百度贴吧 | 稀土掘金 | 腾讯新闻 |
   | -------- | ---- | ---- | ----- | ---- | ------ | ------- | -------- | -------- | -------- | -------- | -------- |`,

package/lib/types.ts

@@ -52,7 +52,7 @@ export type DataItem = {
     image?: string;
     banner?: string;
     updated?: number | string | Date;
-    language?: string;
+    language?: Language;
     enclosure_url?: string;
     enclosure_type?: string;
     enclosure_title?: string;
@@ -60,6 +60,13 @@ export type DataItem = {
     itunes_duration?: number | string;
     itunes_item_image?: string;
     media?: Record<string, Record<string, string>>;
+    attachments?: {
+        url: string;
+        mime_type: string;
+        title?: string;
+        size_in_bytes?: number;
+        duration_in_seconds?: number;
+    }[];
 
     _extra?: Record<string, any> & {
         links?: {
@@ -78,19 +85,125 @@ export type Data = {
     allowEmpty?: boolean;
     image?: string;
     author?: string;
-    language?: string;
+    language?: Language;
     feedLink?: string;
     lastBuildDate?: string;
     itunes_author?: string;
     itunes_category?: string;
     itunes_explicit?: string | boolean;
     id?: string;
-
+    icon?: string;
+    logo?: string;
     atomlink?: string;
     ttl?: number;
 };
 
-type Language = 'en' | 'de' | 'ja' | 'zh-CN' | 'zh-TW' | 'zh-HK' | 'pt' | 'fr' | 'ar-DZ' | 'ar-SA' | 'ar-MA' | 'ar-IQ' | 'ar-KW' | 'ar-TN' | 'fi' | 'it' | 'ru' | 'es' | 'ko' | 'tr' | 'ne' | 'other';
+type Language =
+    | 'af'
+    | 'sq'
+    | 'eu'
+    | 'be'
+    | 'bg'
+    | 'ca'
+    | 'zh-CN'
+    | 'zh-TW'
+    | 'zh-HK'
+    | 'hr'
+    | 'cs'
+    | 'ar-DZ'
+    | 'ar-SA'
+    | 'ar-MA'
+    | 'ar-IQ'
+    | 'ar-KW'
+    | 'ar-TN'
+    | 'da'
+    | 'nl'
+    | 'nl-be'
+    | 'nl-nl'
+    | 'en'
+    | 'en-au'
+    | 'en-bz'
+    | 'en-ca'
+    | 'en-ie'
+    | 'en-jm'
+    | 'en-nz'
+    | 'en-ph'
+    | 'en-za'
+    | 'en-tt'
+    | 'en-gb'
+    | 'en-us'
+    | 'en-zw'
+    | 'et'
+    | 'fo'
+    | 'fi'
+    | 'fr'
+    | 'fr-be'
+    | 'fr-ca'
+    | 'fr-fr'
+    | 'fr-lu'
+    | 'fr-mc'
+    | 'fr-ch'
+    | 'gl'
+    | 'gd'
+    | 'de'
+    | 'de-at'
+    | 'de-de'
+    | 'de-li'
+    | 'de-lu'
+    | 'de-ch'
+    | 'el'
+    | 'haw'
+    | 'hu'
+    | 'is'
+    | 'in'
+    | 'ga'
+    | 'it'
+    | 'it-it'
+    | 'it-ch'
+    | 'ja'
+    | 'ko'
+    | 'mk'
+    | 'no'
+    | 'pl'
+    | 'pt'
+    | 'pt-br'
+    | 'pt-pt'
+    | 'ro'
+    | 'ro-mo'
+    | 'ro-ro'
+    | 'ru'
+    | 'ru-mo'
+    | 'ru-ru'
+    | 'sr'
+    | 'sk'
+    | 'sl'
+    | 'es'
+    | 'es-ar'
+    | 'es-bo'
+    | 'es-cl'
+    | 'es-co'
+    | 'es-cr'
+    | 'es-do'
+    | 'es-ec'
+    | 'es-sv'
+    | 'es-gt'
+    | 'es-hn'
+    | 'es-mx'
+    | 'es-ni'
+    | 'es-pa'
+    | 'es-py'
+    | 'es-pe'
+    | 'es-pr'
+    | 'es-es'
+    | 'es-uy'
+    | 'es-ve'
+    | 'sv'
+    | 'sv-fi'
+    | 'sv-se'
+    | 'tr'
+    | 'uk'
+    | 'ne'
+    | 'other';
 
 // namespace
 interface NamespaceItem {
@@ -167,7 +280,7 @@ interface RouteItem {
     /**
      * The handler function of the route
      */
-    handler: (ctx: Context) => Promise<Data> | Data;
+    handler: (ctx: Context) => Promise<Data | null> | Data | null;
 
     /**
      * An example URL of the route
@@ -247,9 +360,9 @@ interface RouteItem {
 }
 
 interface Route extends RouteItem {
-    ja?: NamespaceItem;
-    zh?: NamespaceItem;
-    'zh-TW'?: NamespaceItem;
+    ja?: RouteItem;
+    zh?: RouteItem;
+    'zh-TW'?: RouteItem;
 }
 
 export type { Route };

package/lib/utils/wechat-mp.ts

@@ -623,19 +623,21 @@ const fetchArticle = (url: string, bypassHostCheck: boolean = false) => {
  * @return {Promise<object>} - The incoming `item` object, with the article and its metadata filled in.
  */
 const finishArticleItem = async (item, setMpNameAsAuthor = false, skipLink = false) => {
-    const fetchedItem = await fetchArticle(item.link);
-    for (const key in fetchedItem) {
-        switch (key) {
-            case 'author':
-                item.author = setMpNameAsAuthor
-                    ? fetchedItem.mpName || item.author // the Official Account itself. if your route return articles from different accounts, you may want to use this
-                    : fetchedItem.author || item.author; // the real author of the article. if your route return articles from a certain account, use this
-                break;
-            case 'link':
-                item.link = skipLink ? item.link : fetchedItem.link || item.link;
-                break;
-            default:
-                item[key] = item[key] || fetchedItem[key];
+    if (item.link) {
+        const fetchedItem = await fetchArticle(item.link);
+        for (const key in fetchedItem) {
+            switch (key) {
+                case 'author':
+                    item.author = setMpNameAsAuthor
+                        ? fetchedItem.mpName || item.author // the Official Account itself. if your route return articles from different accounts, you may want to use this
+                        : fetchedItem.author || item.author; // the real author of the article. if your route return articles from a certain account, use this
+                    break;
+                case 'link':
+                    item.link = skipLink ? item.link : fetchedItem.link || item.link;
+                    break;
+                default:
+                    item[key] = item[key] || fetchedItem[key];
+            }
         }
     }
     return item;

package/lib/views/index.tsx

@@ -136,7 +136,7 @@ const Index: FC<{ debugQuery: string | undefined }> = ({ debugQuery }) => {
                 }}
             ></div>
             <div className="w-full grow shrink-0 py-8 flex items-center justify-center flex-col space-y-4">
-                <img src="/logo.png" alt="RSSHub" width="100" loading="lazy" />
+                <img src="./logo.png" alt="RSSHub" width="100" loading="lazy" />
                 <h1 className="text-4xl font-bold">
                     Welcome to <span className="text-[#F5712C]">RSSHub</span>!
                 </h1>

package/lib/views/json.ts

@@ -28,17 +28,19 @@ const json = (data: Data) => {
             authors: typeof item.author === 'string' ? [{ name: item.author }] : item.author,
             tags: typeof item.category === 'string' ? [item.category] : item.category,
             language: item.language,
-            attachments: item.enclosure_url
-                ? [
-                      {
-                          url: item.enclosure_url,
-                          mime_type: item.enclosure_type,
-                          title: item.enclosure_title,
-                          size_in_bytes: item.enclosure_length,
-                          duration_in_seconds: item.itunes_duration,
-                      },
-                  ]
-                : undefined,
+            attachments:
+                item.attachments ||
+                (item.enclosure_url
+                    ? [
+                          {
+                              url: item.enclosure_url,
+                              mime_type: item.enclosure_type,
+                              title: item.enclosure_title,
+                              size_in_bytes: item.enclosure_length,
+                              duration_in_seconds: item.itunes_duration,
+                          },
+                      ]
+                    : undefined),
             _extra: item._extra || undefined,
         })),
     };

package/lib/views/rss3.test.ts

@@ -1,9 +1,10 @@
 import { describe, expect, it } from 'vitest';
 import rss3 from './rss3';
 
-const NETWORK = 'RSS';
+const NETWORK = 'rsshub';
 const TAG = 'RSS';
 const TYPE = 'feed';
+const PLATFORM = 'RSSHub';
 
 describe('rss3', () => {
     it('should return UMS Result', () => {
@@ -48,7 +49,7 @@ describe('rss3', () => {
                         {
                             tag: TAG,
                             type: TYPE,
-                            platform: 'example.com',
+                            platform: PLATFORM,
                             from: 'example.com',
                             to: 'example.com',
                             metadata: {
@@ -77,7 +78,7 @@ describe('rss3', () => {
                         {
                             tag: TAG,
                             type: TYPE,
-                            platform: 'example.com',
+                            platform: PLATFORM,
                             from: 'example.com',
                             to: 'example.com',
                             metadata: {

package/lib/views/rss3.ts

@@ -6,9 +6,10 @@ import dayjs from 'dayjs';
  * @returns `JSON.stringify`-ed [UMS Result](https://docs.rss3.io/docs/unified-metadata-schemas)
  */
 
-const NETWORK = 'RSS';
+const NETWORK = 'rsshub';
 const TAG = 'RSS';
 const TYPE = 'feed';
+const PLATFORM = 'RSSHub';
 
 const rss3 = (data) => {
     const currentUnixTsp = dayjs().unix();
@@ -29,7 +30,7 @@ const rss3 = (data) => {
                     {
                         tag: TAG,
                         type: TYPE,
-                        platform: owner,
+                        platform: PLATFORM,
                         from: owner,
                         to: owner,
                         metadata: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.f6c2ebb",
+  "version": "1.0.0-master.f70afef",
   "description": "Make RSS Great Again!",
   "keywords": [
     "RSS"
@@ -32,21 +32,21 @@
     "*.yml": "eslint --cache --fix"
   },
   "dependencies": {
-    "@bbob/html": "4.1.1",
-    "@bbob/preset-html5": "4.1.1",
-    "@hono/node-server": "1.13.6",
-    "@hono/zod-openapi": "0.17.0",
+    "@bbob/html": "4.2.0",
+    "@bbob/preset-html5": "4.2.0",
+    "@hono/node-server": "1.13.7",
+    "@hono/zod-openapi": "0.18.3",
     "@notionhq/client": "2.2.15",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/exporter-prometheus": "0.54.2",
-    "@opentelemetry/exporter-trace-otlp-http": "0.54.2",
-    "@opentelemetry/resources": "1.27.0",
-    "@opentelemetry/sdk-metrics": "1.27.0",
-    "@opentelemetry/sdk-trace-base": "1.27.0",
-    "@opentelemetry/semantic-conventions": "1.27.0",
+    "@opentelemetry/exporter-prometheus": "0.57.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.57.1",
+    "@opentelemetry/resources": "1.30.1",
+    "@opentelemetry/sdk-metrics": "1.30.1",
+    "@opentelemetry/sdk-trace-base": "1.30.1",
+    "@opentelemetry/semantic-conventions": "1.28.0",
     "@postlight/parser": "2.2.3",
-    "@rss3/sdk": "0.0.23",
-    "@scalar/hono-api-reference": "0.5.159",
+    "@rss3/sdk": "0.0.25",
+    "@scalar/hono-api-reference": "0.5.168",
     "@sentry/node": "7.119.1",
     "@tonyrl/rand-user-agent": "2.0.81",
     "aes-js": "3.1.2",
@@ -59,73 +59,74 @@
     "currency-symbol-map": "5.1.0",
     "dayjs": "1.11.8",
     "destr": "2.0.3",
-    "directory-import": "3.3.1",
-    "dotenv": "16.4.5",
-    "entities": "5.0.0",
+    "directory-import": "3.3.2",
+    "dotenv": "16.4.7",
+    "entities": "6.0.0",
     "etag": "1.8.1",
     "fanfou-sdk": "5.0.0",
     "form-data": "4.0.1",
     "googleapis": "144.0.0",
-    "hono": "4.6.9",
+    "hono": "4.6.17",
     "html-to-text": "9.0.5",
-    "http-cookie-agent": "6.0.6",
-    "https-proxy-agent": "7.0.5",
+    "http-cookie-agent": "6.0.8",
+    "https-proxy-agent": "7.0.6",
     "iconv-lite": "0.6.3",
-    "imapflow": "1.0.169",
+    "imapflow": "1.0.177",
     "instagram-private-api": "1.46.1",
-    "ioredis": "5.4.1",
+    "ioredis": "5.4.2",
     "ip-regex": "5.0.0",
-    "jsdom": "25.0.1",
+    "jsdom": "26.0.0",
     "json-bigint": "1.0.0",
     "jsrsasign": "10.9.0",
     "lru-cache": "11.0.2",
     "lz-string": "1.5.0",
-    "mailparser": "3.7.1",
+    "mailparser": "3.7.2",
     "markdown-it": "14.1.0",
     "module-alias": "2.2.3",
-    "notion-to-md": "3.1.1",
+    "narou": "1.1.0",
+    "notion-to-md": "3.1.4",
     "oauth-1.0a": "2.2.6",
     "ofetch": "1.4.1",
     "otplib": "12.0.1",
-    "pac-proxy-agent": "7.0.2",
-    "proxy-chain": "2.5.4",
+    "pac-proxy-agent": "7.1.0",
+    "proxy-chain": "2.5.6",
     "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.1",
-    "rate-limiter-flexible": "5.0.4",
-    "re2js": "0.4.2",
-    "rfc4648": "1.5.3",
+    "rate-limiter-flexible": "5.0.5",
+    "re2js": "0.4.3",
+    "rfc4648": "1.5.4",
     "rss-parser": "3.13.0",
-    "sanitize-html": "2.13.1",
+    "sanitize-html": "2.14.0",
     "simplecc-wasm": "1.1.0",
-    "socks-proxy-agent": "8.0.4",
+    "socks-proxy-agent": "8.0.5",
     "source-map": "0.7.4",
-    "telegram": "2.26.6",
+    "telegram": "2.26.16",
     "tiny-async-pool": "2.1.0",
-    "title": "3.5.3",
-    "tldts": "6.1.60",
+    "title": "4.0.1",
+    "tldts": "6.1.74",
     "tosource": "2.0.0-alpha.3",
-    "tough-cookie": "5.0.0",
+    "tough-cookie": "5.1.0",
     "tsx": "4.19.2",
-    "twitter-api-v2": "1.18.2",
+    "twitter-api-v2": "1.19.0",
     "ufo": "1.5.4",
-    "undici": "6.20.1",
-    "uuid": "11.0.3",
+    "undici": "6.21.1",
+    "uuid": "11.0.5",
     "winston": "3.17.0",
-    "xxhash-wasm": "1.0.2",
-    "zod": "3.23.8"
+    "xxhash-wasm": "1.1.0",
+    "zod": "3.24.1"
   },
   "devDependencies": {
     "@babel/preset-env": "7.26.0",
     "@babel/preset-typescript": "7.26.0",
-    "@bbob/types": "4.1.1",
-    "@eslint/eslintrc": "3.1.0",
-    "@eslint/js": "9.14.0",
+    "@bbob/types": "4.2.0",
+    "@eslint/eslintrc": "3.2.0",
+    "@eslint/js": "9.18.0",
     "@microsoft/eslint-formatter-sarif": "3.1.0",
-    "@stylistic/eslint-plugin": "2.10.1",
+    "@stylistic/eslint-plugin": "2.13.0",
     "@types/aes-js": "3.1.4",
     "@types/babel__preset-env": "7.9.7",
     "@types/crypto-js": "4.2.2",
@@ -142,39 +143,39 @@
     "@types/mailparser": "3.4.5",
     "@types/markdown-it": "14.1.2",
     "@types/module-alias": "2.0.4",
-    "@types/node": "22.9.0",
+    "@types/node": "22.10.9",
     "@types/sanitize-html": "2.13.0",
     "@types/supertest": "6.0.2",
     "@types/tiny-async-pool": "2.0.3",
     "@types/title": "3.4.3",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.14.0",
-    "@typescript-eslint/parser": "8.14.0",
-    "@vercel/nft": "0.27.6",
+    "@typescript-eslint/eslint-plugin": "8.21.0",
+    "@typescript-eslint/parser": "8.21.0",
+    "@vercel/nft": "0.29.0",
     "@vitest/coverage-v8": "2.0.5",
-    "discord-api-types": "0.37.104",
-    "eslint": "9.14.0",
-    "eslint-config-prettier": "9.1.0",
+    "discord-api-types": "0.37.117",
+    "eslint": "9.18.0",
+    "eslint-config-prettier": "10.0.1",
     "eslint-nibble": "8.1.0",
-    "eslint-plugin-n": "17.13.1",
-    "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-unicorn": "56.0.0",
-    "eslint-plugin-yml": "1.15.0",
-    "fs-extra": "11.2.0",
-    "globals": "15.12.0",
-    "got": "14.4.4",
-    "husky": "9.1.6",
+    "eslint-plugin-n": "17.15.1",
+    "eslint-plugin-prettier": "5.2.3",
+    "eslint-plugin-unicorn": "56.0.1",
+    "eslint-plugin-yml": "1.16.0",
+    "fs-extra": "11.3.0",
+    "globals": "15.14.0",
+    "got": "14.4.5",
+    "husky": "9.1.7",
     "js-beautify": "1.15.1",
-    "lint-staged": "15.2.10",
+    "lint-staged": "15.4.1",
     "mockdate": "3.0.5",
     "msw": "2.4.3",
-    "node-network-devtools": "1.0.22",
-    "prettier": "3.3.3",
+    "node-network-devtools": "1.0.25",
+    "prettier": "3.4.2",
     "remark-parse": "11.0.0",
     "supertest": "7.0.0",
-    "typescript": "5.6.3",
+    "typescript": "5.7.3",
     "unified": "11.0.5",
-    "vite-tsconfig-paths": "5.1.2",
+    "vite-tsconfig-paths": "5.1.4",
     "vitest": "2.0.5",
     "yaml-eslint-parser": "1.2.3"
   },

package/lib/routes/78dm/templates/image.art

@@ -1 +0,0 @@
-<img src="{{ image }}">