rsshub 1.0.0-master.f6c2ebb → 1.0.0-master.f6f0273

package/lib/routes/zju/cst/index.ts

@@ -59,8 +59,8 @@ export const route: Route = {
     },
     name: '软件学院',
     description: `| 全部通知 | 招生信息 | 教务管理 | 论文管理 | 思政工作 | 评奖评优 | 实习就业 | 国际实习 | 国内合作科研 | 国际合作科研 | 校园服务 |
-  | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | ------------ | ------------ | -------- |
-  | 0        | 1        | 2        | 3        | 4        | 5        | 6        | 7        | 8            | 9            | 10       |`,
+| -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | ------------ | ------------ | -------- |
+| 0        | 1        | 2        | 3        | 4        | 5        | 6        | 7        | 8            | 9            | 10       |`,
     maintainers: ['yonvenne', 'zwithz'],
     handler,
 };

package/lib/routes/zju/grs/index.ts

@@ -31,8 +31,8 @@ export const route: Route = {
     maintainers: ['Caicailiushui'],
     handler,
     description: `| 全部公告 | 教学管理 | 各类资助 | 学科建设 | 海外交流 |
-  | -------- | -------- | -------- | -------- | -------- |
-  | 1        | 2        | 3        | 4        | 5        |`,
+| -------- | -------- | -------- | -------- | -------- |
+| 1        | 2        | 3        | 4        | 5        |`,
 };
 
 async function handler(ctx) {

package/lib/routes/zju/physics/index.ts

@@ -40,8 +40,8 @@ export const route: Route = {
     maintainers: ['Caicailiushui'],
     handler,
     description: `| 本院动态 | 科研进展 | 研究生教育最新消息 |
-  | -------- | -------- | ------------------ |
-  | 1        | 2        | 3                  |`,
+| -------- | -------- | ------------------ |
+| 1        | 2        | 3                  |`,
 };
 
 async function handler(ctx) {

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/group.ts

@@ -31,8 +31,8 @@ export const route: Route = {
     },
     handler,
     description: `| all  | digests | by_owner | questions | tasks |
-  | ---- | ------ | --------- | -------- | ------ |
-  | 最新 | 精华    | 只看星主    | 问答      | 作业   |`,
+| ---- | ------ | --------- | -------- | ------ |
+| 最新 | 精华    | 只看星主    | 问答      | 作业   |`,
 };
 
 async function handler(ctx: Context): Promise<Data> {

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

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/puppeteer-utils.test.ts

@@ -5,9 +5,9 @@ import type { Browser } from 'puppeteer';
 
 let browser: Browser | null = null;
 
-afterEach(() => {
+afterEach(async () => {
     if (browser) {
-        browser.close();
+        await browser.close();
         browser = null;
     }
 

package/lib/utils/puppeteer.test.ts

@@ -4,12 +4,12 @@ import { type Browser } from 'puppeteer';
 
 let browser: Browser | null = null;
 
-afterEach(() => {
+afterEach(async () => {
     if (browser) {
         // double insurance to close unclosed browser immediately after each test
         // if a test closure fails before it can close the browser, the browser process will probably be unclosed,
         // especially when the test unit is run through `npm run vitest puppeteer`
-        browser.close();
+        await browser.close();
         browser = null;
     }
     delete process.env.PROXY_URI;

package/lib/utils/puppeteer.ts

@@ -54,8 +54,8 @@ const outPuppeteer = async (
                     }
                   : options
           ));
-    setTimeout(() => {
-        browser.close();
+    setTimeout(async () => {
+        await browser.close();
     }, 30000);
 
     return browser;

package/lib/utils/timezone.ts

@@ -8,7 +8,7 @@ export default function timezone(date, timezone = serverTimezone) {
         date = new Date(date);
     }
 
-    assert(date instanceof Date);
+    assert.ok(date instanceof Date);
 
     return new Date(date.getTime() - millisInAnHour * (timezone - serverTimezone));
 }

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: {