rsshub 1.0.0-master.d8ae8d8 → 1.0.0-master.d8b026f
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/radar/rules/all.ts +3 -6
- package/lib/api/radar/rules/one.ts +3 -6
- package/lib/app.tsx +2 -0
- package/lib/config.ts +22 -6
- package/lib/errors/index.tsx +10 -3
- package/lib/index.ts +1 -1
- package/lib/middleware/anti-hotlink.test.ts +197 -12
- package/lib/middleware/anti-hotlink.ts +28 -0
- package/lib/middleware/logger.ts +5 -1
- package/lib/middleware/parameter.test.ts +22 -5
- package/lib/middleware/parameter.ts +47 -17
- package/lib/middleware/template.tsx +14 -10
- package/lib/middleware/trace.ts +25 -0
- package/lib/registry.test.ts +8 -0
- package/lib/registry.ts +8 -0
- package/lib/router.js +0 -3
- package/lib/routes/141jav/index.ts +25 -21
- package/lib/routes/141ppv/index.ts +24 -20
- package/lib/routes/51read/article.ts +82 -0
- package/lib/routes/51read/namespace.ts +6 -0
- package/lib/routes/5eplay/utils.ts +5 -3
- package/lib/routes/69shu/article.ts +4 -4
- package/lib/routes/agri/index.ts +307 -0
- package/lib/routes/agri/namespace.ts +8 -0
- package/lib/routes/agri/templates/description.art +21 -0
- package/lib/routes/aljazeera/index.ts +2 -2
- package/lib/routes/apnews/rss.ts +2 -1
- package/lib/routes/apnews/sitemap.ts +98 -0
- package/lib/routes/apnews/topics.ts +2 -1
- package/lib/routes/apnews/utils.ts +7 -5
- package/lib/routes/apple/apps.ts +30 -8
- package/lib/routes/autocentre/index.ts +29 -0
- package/lib/routes/autocentre/namespace.ts +7 -0
- package/lib/routes/bbc/index.ts +3 -1
- package/lib/routes/bestblogs/feeds.ts +107 -0
- package/lib/routes/bestblogs/namespace.ts +6 -0
- package/lib/routes/bilibili/api-interface.d.ts +1 -0
- package/lib/routes/bilibili/cache.ts +3 -1
- package/lib/routes/bilibili/dynamic.ts +9 -10
- package/lib/routes/bilibili/ranking.ts +2 -1
- package/lib/routes/bilibili/video.ts +2 -1
- package/lib/routes/binance/announcement.ts +168 -0
- package/lib/routes/binance/types.ts +26 -0
- package/lib/routes/bing/daily-wallpaper.ts +1 -1
- package/lib/routes/bjnews/cat.ts +43 -0
- package/lib/routes/bjnews/column.ts +43 -0
- package/lib/routes/bjnews/namespace.ts +6 -0
- package/lib/routes/bjnews/utils.ts +19 -0
- package/lib/routes/bjx/fd.ts +35 -26
- package/lib/routes/buaa/jiaowu.ts +124 -0
- package/lib/routes/buaa/lib/space/newbook.ts +171 -0
- package/lib/routes/buaa/lib/space/templates/newbook.art +44 -0
- package/lib/routes/buaa/news/index.ts +15 -13
- package/lib/routes/buaa/sme.ts +5 -3
- package/lib/routes/cccfna/index.ts +2 -2
- package/lib/routes/cctv/category.ts +16 -12
- package/lib/routes/cctv/xwlb.ts +32 -10
- package/lib/routes/cdu/jwgg.ts +79 -0
- package/lib/routes/cdu/namespace.ts +6 -0
- package/lib/routes/cffex/announcement.ts +73 -0
- package/lib/routes/cffex/namespace.ts +6 -0
- package/lib/routes/chlinlearn/daily-blog.ts +55 -0
- package/lib/routes/chlinlearn/namespcae.ts +6 -0
- package/lib/routes/cnbc/rss.ts +1 -1
- package/lib/routes/copymanga/comic.ts +3 -1
- package/lib/routes/devolverdigital/blog.ts +59 -42
- package/lib/routes/digitalcameraworld/news.ts +1 -1
- package/lib/routes/discord/channel.ts +10 -10
- package/lib/routes/discord/discord-api.ts +27 -32
- package/lib/routes/discord/templates/message.art +15 -0
- package/lib/routes/discourse/notifications.ts +2 -1
- package/lib/routes/dockerhub/build.ts +3 -2
- package/lib/routes/dongqiudi/result.ts +1 -1
- package/lib/routes/douban/other/group.ts +2 -1
- package/lib/routes/duckdb/namespace.ts +6 -0
- package/lib/routes/duckdb/news.ts +65 -0
- package/lib/routes/eastmoney/report/index.ts +63 -15
- package/lib/routes/eastmoney/templates/stock_description.art +36 -0
- package/lib/routes/eastmoney/utils.ts +35 -0
- package/lib/routes/epicgames/index.ts +14 -4
- package/lib/routes/fashionnetwork/index.ts +192 -0
- package/lib/routes/fashionnetwork/namespace.ts +8 -0
- package/lib/routes/fashionnetwork/templates/description.art +17 -0
- package/lib/routes/fediverse/timeline.ts +37 -19
- package/lib/routes/flashcat/blog.ts +61 -0
- package/lib/routes/flashcat/namespace.ts +6 -0
- package/lib/routes/foresightnews/util.ts +1 -1
- package/lib/routes/fortunechina/index.ts +24 -14
- package/lib/routes/ftm/index.ts +60 -0
- package/lib/routes/ftm/namespace.ts +6 -0
- package/lib/routes/galxe/index.ts +94 -0
- package/lib/routes/galxe/namespace.ts +9 -0
- package/lib/routes/gamersky/ent.ts +57 -0
- package/lib/routes/gamersky/namespace.ts +10 -0
- package/lib/routes/gamersky/news.ts +91 -0
- package/lib/routes/gamersky/review.ts +80 -0
- package/lib/routes/gamersky/utils.ts +94 -0
- package/lib/routes/gdut/oa-news.ts +12 -17
- package/lib/routes/getitfree/util.ts +1 -1
- package/lib/routes/gisreportsonline/index.ts +60 -0
- package/lib/routes/gisreportsonline/namespace.ts +6 -0
- package/lib/routes/github/activity.ts +56 -0
- package/lib/routes/github/issue.ts +3 -2
- package/lib/routes/github/search.ts +20 -18
- package/lib/routes/github/star.ts +4 -3
- package/lib/routes/github/trending.ts +27 -5
- package/lib/routes/go/namespace.ts +8 -0
- package/lib/routes/go/niid/idwr-dl.ts +104 -0
- package/lib/routes/google/citations.ts +2 -2
- package/lib/routes/google/research.ts +45 -0
- package/lib/routes/google/scholar.ts +2 -2
- package/lib/routes/gov/cbirc/index.ts +371 -0
- package/lib/routes/gov/chongqing/sydwgkzp.ts +4 -4
- package/lib/routes/gov/lswz/index.ts +289 -0
- package/lib/routes/gov/zj/ningbogzw-notice.ts +50 -0
- package/lib/routes/gov/zj/ningborsjnotice.ts +50 -0
- package/lib/routes/gq/news.ts +1 -1
- package/lib/routes/gs/developer/blog.ts +58 -0
- package/lib/routes/gs/namespace.ts +9 -0
- package/lib/routes/healthz.ts +8 -0
- package/lib/routes/hitcon/zeroday.ts +1 -1
- package/lib/routes/hket/index.ts +80 -76
- package/lib/routes/hottoys/index.ts +63 -0
- package/lib/routes/hottoys/namespace.ts +6 -0
- package/lib/routes/hust/gs.ts +281 -0
- package/lib/routes/hust/namespace.ts +1 -1
- package/lib/routes/huxiu/util.ts +2 -2
- package/lib/routes/imhcg/blog.ts +47 -0
- package/lib/routes/imhcg/namespace.ts +7 -0
- package/lib/routes/imop/namespace.ts +10 -0
- package/lib/routes/imop/tianshu.ts +53 -0
- package/lib/routes/infzm/hot.ts +39 -0
- package/lib/routes/infzm/index.ts +3 -30
- package/lib/routes/infzm/utils.ts +34 -0
- package/lib/routes/inspirehep/author.ts +46 -0
- package/lib/routes/inspirehep/literature.ts +42 -0
- package/lib/routes/inspirehep/namespace.ts +7 -0
- package/lib/routes/inspirehep/types.ts +210 -0
- package/lib/routes/inspirehep/utils.ts +15 -0
- package/lib/routes/instagram/private-api/index.ts +20 -3
- package/lib/routes/iplaysoft/index.ts +68 -0
- package/lib/routes/iplaysoft/namespace.ts +6 -0
- package/lib/routes/iwara/subscriptions.ts +1 -1
- package/lib/routes/j-test/namespace.ts +6 -0
- package/lib/routes/j-test/news.ts +64 -0
- package/lib/routes/japanpost/namespace.ts +7 -1
- package/lib/routes/japanpost/router.ts +40 -0
- package/lib/routes/japanpost/track.ts +1 -23
- package/lib/routes/javbus/index.ts +2 -1
- package/lib/routes/javdb/actors.ts +6 -2
- package/lib/routes/jjwxc/book.ts +4 -3
- package/lib/routes/joins/chinese.ts +218 -0
- package/lib/routes/joins/namespace.ts +8 -0
- package/lib/routes/joins/templates/description.art +17 -0
- package/lib/routes/juejin/dynamic.ts +114 -0
- package/lib/routes/kaopu/news.ts +3 -3
- package/lib/routes/kemono/index.ts +21 -0
- package/lib/routes/keylol/index.ts +56 -11
- package/lib/routes/kurogames/namespace.ts +7 -0
- package/lib/routes/kurogames/wutheringwaves/news.ts +59 -0
- package/lib/routes/kyodonews/index.ts +1 -1
- package/lib/routes/link3/events.ts +86 -0
- package/lib/routes/link3/namespace.ts +6 -0
- package/lib/routes/link3/profile.ts +143 -0
- package/lib/routes/linkedin/cn/renderer.ts +1 -1
- package/lib/routes/lmu/jobs.ts +96 -0
- package/lib/routes/lmu/namespace.ts +17 -0
- package/lib/routes/lmu/templates/jobPosting.art +11 -0
- package/lib/routes/lofter/user.ts +2 -1
- package/lib/routes/luma/index.ts +92 -0
- package/lib/routes/luma/namespace.ts +6 -0
- package/lib/routes/luolei/index.ts +1 -1
- package/lib/routes/maccms/index.ts +72 -0
- package/lib/routes/maccms/namespace.ts +9 -0
- package/lib/routes/maccms/type.ts +102 -0
- package/lib/routes/mcmod/index.ts +105 -0
- package/lib/routes/mcmod/namespace.ts +6 -0
- package/lib/routes/mcmod/templates/mod.art +13 -0
- package/lib/routes/metacritic/index.ts +10 -0
- package/lib/routes/metrics.ts +12 -0
- package/lib/routes/mihoyo/bbs/img-ranking.ts +4 -4
- package/lib/routes/mihoyo/bbs/static-data.ts +7 -0
- package/lib/routes/minecraft/version.ts +1 -1
- package/lib/routes/mirrormedia/category.ts +101 -0
- package/lib/routes/mirrormedia/index.ts +3 -16
- package/lib/routes/mirrormedia/utils.ts +19 -0
- package/lib/routes/misskey/user-timeline.ts +42 -0
- package/lib/routes/misskey/utils.ts +41 -1
- package/lib/routes/nasa/apod.ts +4 -3
- package/lib/routes/nasa/namespace.ts +1 -1
- package/lib/routes/nationalgeographic/latest-stories.ts +1 -1
- package/lib/routes/nationalgeographic/templates/stories.art +1 -1
- package/lib/routes/neea/index.ts +47 -19
- package/lib/routes/neea/jlpt.ts +12 -15
- package/lib/routes/neea/namespace.ts +2 -2
- package/lib/routes/newyorker/news.ts +24 -17
- package/lib/routes/nga/forum.ts +3 -2
- package/lib/routes/nyaa/main.ts +2 -3
- package/lib/routes/nyaa/namespace.ts +10 -0
- package/lib/routes/oschina/news.ts +2 -0
- package/lib/routes/people/index.ts +4 -2
- package/lib/routes/picnob/namespace.ts +1 -4
- package/lib/routes/picnob/user.ts +14 -5
- package/lib/routes/picuki/namespace.ts +1 -4
- package/lib/routes/picuki/profile.ts +11 -7
- package/lib/routes/pixiv/ranking.ts +2 -1
- package/lib/routes/pixiv/search.ts +22 -2
- package/lib/routes/pixiv/user.ts +2 -1
- package/lib/routes/pixiv/utils.ts +3 -3
- package/lib/routes/ps/monthly-games.ts +3 -2
- package/lib/routes/psyche/topic.ts +1 -1
- package/lib/routes/psyche/type.ts +1 -1
- package/lib/routes/psyche/utils.ts +1 -1
- package/lib/routes/qidian/chapter.ts +4 -3
- package/lib/routes/questn/community.ts +76 -0
- package/lib/routes/questn/events.ts +101 -0
- package/lib/routes/questn/namespace.ts +6 -0
- package/lib/routes/questn/util.ts +16 -0
- package/lib/routes/readwise/list.ts +152 -0
- package/lib/routes/readwise/namespace.ts +6 -0
- package/lib/routes/rebase/geekdaily.ts +35 -0
- package/lib/routes/rebase/namespace.ts +6 -0
- package/lib/routes/reuters/common.ts +2 -1
- package/lib/routes/rss3/index.ts +157 -0
- package/lib/routes/rss3/interfaces/metadata.ts +67 -0
- package/lib/routes/rss3/namespace.ts +7 -0
- package/lib/routes/rsshub/routes.ts +20 -13
- package/lib/routes/samd/news.ts +1 -1
- package/lib/routes/sara/index.ts +1 -1
- package/lib/routes/sciencedirect/cf-email.ts +0 -1
- package/lib/routes/scut/gzic/media.ts +71 -0
- package/lib/routes/scut/gzic/news.ts +65 -0
- package/lib/routes/scut/gzic/notice.ts +88 -0
- package/lib/routes/shiep/config.ts +4 -10
- package/lib/routes/shiep/index.ts +9 -9
- package/lib/routes/showstart/artist.ts +5 -4
- package/lib/routes/showstart/brand.ts +5 -4
- package/lib/routes/showstart/event.ts +8 -7
- package/lib/routes/showstart/search.ts +43 -9
- package/lib/routes/showstart/service.ts +81 -53
- package/lib/routes/showstart/site.ts +41 -0
- package/lib/routes/showstart/utils.ts +9 -8
- package/lib/routes/sis001/author.ts +52 -0
- package/lib/routes/sis001/common.ts +38 -0
- package/lib/routes/sis001/forum.ts +2 -29
- package/lib/routes/sjtu/jwc.ts +4 -1
- package/lib/routes/sjtu/namespace.ts +1 -1
- package/lib/routes/sjtu/seiee/index.ts +97 -0
- package/lib/routes/sjtu/yzb/zkxx.ts +36 -16
- package/lib/routes/smzdm/keyword.ts +3 -2
- package/lib/routes/smzdm/product.ts +86 -0
- package/lib/routes/smzdm/ranking.ts +180 -46
- package/lib/routes/spotify/artist.ts +3 -2
- package/lib/routes/spotify/playlist.ts +3 -2
- package/lib/routes/spotify/show.ts +1 -1
- package/lib/routes/springer/journal.ts +10 -12
- package/lib/routes/sse/sselawsrules.ts +370 -0
- package/lib/routes/sspai/author.ts +1 -1
- package/lib/routes/sspai/column.ts +1 -1
- package/lib/routes/sspai/index.ts +4 -3
- package/lib/routes/sspai/matrix.ts +1 -1
- package/lib/routes/sspai/series-update.ts +1 -1
- package/lib/routes/sspai/tag.ts +1 -1
- package/lib/routes/sspai/topic.ts +1 -1
- package/lib/routes/sustainabilitymag/articles.ts +2 -0
- package/lib/routes/szse/rule.ts +315 -42
- package/lib/routes/t66y/index.ts +29 -7
- package/lib/routes/taoguba/blog.ts +1 -1
- package/lib/routes/taoguba/index.ts +1 -1
- package/lib/routes/techcrunch/news.ts +20 -29
- package/lib/routes/techcrunch/templates/description.art +7 -0
- package/lib/routes/telecompaper/news.ts +1 -1
- package/lib/routes/telegram/channel.ts +37 -3
- package/lib/routes/test/index.ts +50 -43
- package/lib/routes/the/index.ts +211 -0
- package/lib/routes/the/namespace.ts +8 -0
- package/lib/routes/the/templates/description.art +27 -0
- package/lib/routes/the/util.ts +307 -0
- package/lib/routes/theblockbeats/index.ts +10 -5
- package/lib/routes/thoughtworks/index.ts +71 -0
- package/lib/routes/thoughtworks/namespace.ts +6 -0
- package/lib/routes/towardsdatascience/latest.ts +67 -0
- package/lib/routes/towardsdatascience/namespace.ts +6 -0
- package/lib/routes/tvb/news.ts +1 -0
- package/lib/routes/twitter/api/index.ts +3 -1
- package/lib/routes/twitter/api/mobile-api/login.ts +155 -131
- package/lib/routes/twitter/api/web-api/api.ts +19 -0
- package/lib/routes/twitter/api/web-api/constants.ts +2 -0
- package/lib/routes/twitter/api/web-api/login.ts +66 -0
- package/lib/routes/twitter/api/web-api/utils.ts +98 -52
- package/lib/routes/twitter/home-latest.ts +60 -0
- package/lib/routes/twitter/home.ts +2 -2
- package/lib/routes/twitter/keyword.ts +3 -2
- package/lib/routes/twitter/likes.ts +1 -1
- package/lib/routes/twitter/list.ts +1 -1
- package/lib/routes/twitter/media.ts +4 -3
- package/lib/routes/twitter/namespace.ts +2 -2
- package/lib/routes/twitter/user.ts +5 -4
- package/lib/routes/twitter/utils.ts +4 -1
- package/lib/routes/uber/blog.ts +1 -1
- package/lib/routes/udn/breaking-news.ts +9 -0
- package/lib/routes/ustc/scms.ts +97 -0
- package/lib/routes/v2ex/tab.ts +3 -2
- package/lib/routes/v2ex/topics.ts +18 -3
- package/lib/routes/v2ex/xna.ts +55 -0
- package/lib/routes/watasuke/blog.ts +1 -1
- package/lib/routes/wchscu/namespace.ts +6 -0
- package/lib/routes/wchscu/recruit.ts +73 -0
- package/lib/routes/weibo/keyword.ts +3 -2
- package/lib/routes/weibo/namespace.ts +1 -1
- package/lib/routes/weibo/search/hot.ts +12 -7
- package/lib/routes/weibo/user.ts +2 -1
- package/lib/routes/weibo/utils.ts +20 -0
- package/lib/routes/wfu/news.ts +1 -1
- package/lib/routes/wordpress/util.ts +1 -1
- package/lib/routes/xiaohongshu/notes.ts +10 -2
- package/lib/routes/xiaohongshu/user.ts +23 -2
- package/lib/routes/xiaoyuzhou/podcast.ts +2 -1
- package/lib/routes/xidian/cs.ts +143 -0
- package/lib/routes/xidian/gr.ts +289 -0
- package/lib/routes/xidian/jwc.ts +1 -0
- package/lib/routes/xidian/namespace.ts +1 -1
- package/lib/routes/xinhuanet/app.ts +109 -0
- package/lib/routes/xinhuanet/namespace.ts +8 -0
- package/lib/routes/xsijishe/forum.ts +5 -0
- package/lib/routes/xsijishe/rank.ts +23 -3
- package/lib/routes/xueqiu/cookies.ts +14 -1
- package/lib/routes/xueqiu/favorite.ts +16 -2
- package/lib/routes/yahoo/news/index.ts +149 -0
- package/lib/routes/yahoo/news/listid.ts +67 -0
- package/lib/routes/yahoo/news/{tw/provider-helper.ts → provider-helper.ts} +9 -4
- package/lib/routes/yahoo/news/{tw/provider.ts → provider.ts} +21 -6
- package/lib/routes/yahoo/news/{tw/utils.ts → utils.ts} +24 -15
- package/lib/routes/yicai/carousel.ts +48 -0
- package/lib/routes/yicai/utils.ts +23 -17
- package/lib/routes/youtube/subscriptions.ts +1 -0
- package/lib/routes/youtube/user.ts +2 -1
- package/lib/routes/yystv/docs.ts +28 -19
- package/lib/routes/zcool/discover.ts +2 -1
- package/lib/routes/zhihu/activities.ts +2 -1
- package/lib/routes/zhihu/answers.ts +5 -1
- package/lib/routes/zhihu/execlib/x-zse-96-v3.ts +2 -0
- package/lib/routes/zhihu/hot.ts +56 -7
- package/lib/routes/zhihu/namespace.ts +3 -0
- package/lib/routes/zhihu/utils.ts +16 -6
- package/lib/routes/zhuwang/index.ts +1 -1
- package/lib/routes/zsxq/types.ts +9 -0
- package/lib/routes/zsxq/utils.ts +4 -3
- package/lib/routes.test.ts +11 -5
- package/lib/setup.test.ts +1 -1
- package/lib/types.ts +20 -0
- package/lib/utils/cache/index.ts +8 -0
- package/lib/utils/camelcase-keys.spec.ts +127 -0
- package/lib/utils/camelcase-keys.ts +27 -0
- package/lib/utils/common-utils.ts +1 -0
- package/lib/utils/ofetch.ts +14 -0
- package/lib/utils/otel/index.ts +2 -0
- package/lib/utils/otel/metric.ts +66 -0
- package/lib/utils/otel/trace.ts +28 -0
- package/lib/utils/request-rewriter/fetch.ts +8 -1
- package/lib/views/atom.tsx +2 -2
- package/lib/views/error.tsx +3 -3
- package/lib/views/index.tsx +4 -3
- package/lib/views/json.ts +1 -1
- package/lib/views/layout.tsx +1 -1
- package/lib/views/rss.tsx +2 -2
- package/package.json +57 -45
- package/lib/routes/moduzy/index.ts +0 -80
- package/lib/routes/moduzy/namespace.ts +0 -17
- package/lib/routes/moduzy/type.ts +0 -95
- package/lib/routes/sse/lawandrules.ts +0 -68
- package/lib/routes/yahoo/news/tw/index.ts +0 -80
- package/lib/routes/yahoo/news/us/index.ts +0 -55
- package/lib/routes/zhihu/hotlist.ts +0 -72
- package/lib/routes-deprecated/bjnews/news.js +0 -44
- package/lib/routes-deprecated/gamersky/ent.js +0 -89
- package/lib/routes-deprecated/gamersky/news.js +0 -34
- package/lib/routes-deprecated/iplay/home.js +0 -26
- package/lib/routes-deprecated/iplay/utils.js +0 -57
- /package/lib/routes/{moduzy → maccms}/templates/vod.art +0 -0
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import { namespaces } from '@/registry';
|
|
2
2
|
import { parse } from 'tldts';
|
|
3
|
-
import {
|
|
3
|
+
import { RadarDomain } from '@/types';
|
|
4
4
|
import { createRoute, RouteHandler } from '@hono/zod-openapi';
|
|
5
5
|
|
|
6
6
|
const radar: {
|
|
7
|
-
[domain: string]:
|
|
8
|
-
_name: string;
|
|
9
|
-
[subdomain: string]: RadarItem[] | string;
|
|
10
|
-
};
|
|
7
|
+
[domain: string]: RadarDomain;
|
|
11
8
|
} = {};
|
|
12
9
|
|
|
13
10
|
for (const namespace in namespaces) {
|
|
@@ -23,7 +20,7 @@ for (const namespace in namespaces) {
|
|
|
23
20
|
if (!radar[domain]) {
|
|
24
21
|
radar[domain] = {
|
|
25
22
|
_name: namespaces[namespace].name,
|
|
26
|
-
};
|
|
23
|
+
} as RadarDomain;
|
|
27
24
|
}
|
|
28
25
|
if (!radar[domain][subdomain]) {
|
|
29
26
|
radar[domain][subdomain] = [];
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import { namespaces } from '@/registry';
|
|
2
2
|
import { parse } from 'tldts';
|
|
3
|
-
import {
|
|
3
|
+
import { RadarDomain } from '@/types';
|
|
4
4
|
import { z, createRoute, RouteHandler } from '@hono/zod-openapi';
|
|
5
5
|
|
|
6
6
|
const radar: {
|
|
7
|
-
[domain: string]:
|
|
8
|
-
_name: string;
|
|
9
|
-
[subdomain: string]: RadarItem[] | string;
|
|
10
|
-
};
|
|
7
|
+
[domain: string]: RadarDomain;
|
|
11
8
|
} = {};
|
|
12
9
|
|
|
13
10
|
for (const namespace in namespaces) {
|
|
@@ -23,7 +20,7 @@ for (const namespace in namespaces) {
|
|
|
23
20
|
if (!radar[domain]) {
|
|
24
21
|
radar[domain] = {
|
|
25
22
|
_name: namespaces[namespace].name,
|
|
26
|
-
};
|
|
23
|
+
} as RadarDomain;
|
|
27
24
|
}
|
|
28
25
|
if (!radar[domain][subdomain]) {
|
|
29
26
|
radar[domain][subdomain] = [];
|
package/lib/app.tsx
CHANGED
|
@@ -12,6 +12,7 @@ import debug from '@/middleware/debug';
|
|
|
12
12
|
import header from '@/middleware/header';
|
|
13
13
|
import antiHotlink from '@/middleware/anti-hotlink';
|
|
14
14
|
import parameter from '@/middleware/parameter';
|
|
15
|
+
import trace from '@/middleware/trace';
|
|
15
16
|
import { jsxRenderer } from 'hono/jsx-renderer';
|
|
16
17
|
import { trimTrailingSlash } from 'hono/trailing-slash';
|
|
17
18
|
|
|
@@ -37,6 +38,7 @@ app.use(
|
|
|
37
38
|
})
|
|
38
39
|
);
|
|
39
40
|
app.use(mLogger);
|
|
41
|
+
app.use(trace);
|
|
40
42
|
app.use(sentry);
|
|
41
43
|
app.use(accessControl);
|
|
42
44
|
app.use(debug);
|
package/lib/config.ts
CHANGED
|
@@ -39,8 +39,8 @@ export type Config = {
|
|
|
39
39
|
port?: string;
|
|
40
40
|
auth?: string;
|
|
41
41
|
url_regex: string;
|
|
42
|
+
strategy: 'on_retry' | 'all';
|
|
42
43
|
};
|
|
43
|
-
proxyStrategy: string;
|
|
44
44
|
pacUri?: string;
|
|
45
45
|
pacScript?: string;
|
|
46
46
|
accessKey?: string;
|
|
@@ -70,7 +70,9 @@ export type Config = {
|
|
|
70
70
|
temperature?: number;
|
|
71
71
|
maxTokens?: number;
|
|
72
72
|
endpoint: string;
|
|
73
|
-
|
|
73
|
+
inputOption: string;
|
|
74
|
+
promptTitle: string;
|
|
75
|
+
promptDescription: string;
|
|
74
76
|
};
|
|
75
77
|
bilibili: {
|
|
76
78
|
cookies: Record<string, string | undefined>;
|
|
@@ -168,6 +170,9 @@ export type Config = {
|
|
|
168
170
|
javdb: {
|
|
169
171
|
session?: string;
|
|
170
172
|
};
|
|
173
|
+
keylol: {
|
|
174
|
+
cookie?: string;
|
|
175
|
+
};
|
|
171
176
|
lastfm: {
|
|
172
177
|
api_key?: string;
|
|
173
178
|
};
|
|
@@ -232,6 +237,9 @@ export type Config = {
|
|
|
232
237
|
qingting: {
|
|
233
238
|
id?: string;
|
|
234
239
|
};
|
|
240
|
+
readwise: {
|
|
241
|
+
accessToken?: string;
|
|
242
|
+
};
|
|
235
243
|
saraba1st: {
|
|
236
244
|
cookie?: string;
|
|
237
245
|
};
|
|
@@ -265,7 +273,6 @@ export type Config = {
|
|
|
265
273
|
username?: string[];
|
|
266
274
|
password?: string[];
|
|
267
275
|
authenticationSecret?: string[];
|
|
268
|
-
cookie?: string;
|
|
269
276
|
authToken?: string[];
|
|
270
277
|
};
|
|
271
278
|
weibo: {
|
|
@@ -289,6 +296,7 @@ export type Config = {
|
|
|
289
296
|
};
|
|
290
297
|
xsijishe: {
|
|
291
298
|
cookie?: string;
|
|
299
|
+
userAgent?: string;
|
|
292
300
|
};
|
|
293
301
|
xueqiu: {
|
|
294
302
|
cookies?: string;
|
|
@@ -395,8 +403,8 @@ const calculateValue = () => {
|
|
|
395
403
|
port: envs.PROXY_PORT,
|
|
396
404
|
auth: envs.PROXY_AUTH,
|
|
397
405
|
url_regex: envs.PROXY_URL_REGEX || '.*',
|
|
406
|
+
strategy: envs.PROXY_STRATEGY || 'all', // all / on_retry
|
|
398
407
|
},
|
|
399
|
-
proxyStrategy: envs.PROXY_STRATEGY || 'all', // all / on_retry
|
|
400
408
|
pacUri: envs.PAC_URI,
|
|
401
409
|
pacScript: envs.PAC_SCRIPT,
|
|
402
410
|
// access control
|
|
@@ -430,7 +438,9 @@ const calculateValue = () => {
|
|
|
430
438
|
temperature: toInt(envs.OPENAI_TEMPERATURE, 0.2),
|
|
431
439
|
maxTokens: toInt(envs.OPENAI_MAX_TOKENS, 0) || undefined,
|
|
432
440
|
endpoint: envs.OPENAI_API_ENDPOINT || 'https://api.openai.com/v1',
|
|
433
|
-
|
|
441
|
+
inputOption: envs.OPENAI_INPUT_OPTION || 'description',
|
|
442
|
+
promptDescription: envs.OPENAI_PROMPT || 'Please summarize the following article and reply with markdown format.',
|
|
443
|
+
promptTitle: envs.OPENAI_PROMPT_TITLE || 'Please translate the following title into Simplified Chinese and reply only translated text.',
|
|
434
444
|
},
|
|
435
445
|
|
|
436
446
|
// Route-specific Configurations
|
|
@@ -531,6 +541,9 @@ const calculateValue = () => {
|
|
|
531
541
|
javdb: {
|
|
532
542
|
session: envs.JAVDB_SESSION,
|
|
533
543
|
},
|
|
544
|
+
keylol: {
|
|
545
|
+
cookie: envs.KEYLOL_COOKIE,
|
|
546
|
+
},
|
|
534
547
|
lastfm: {
|
|
535
548
|
api_key: envs.LASTFM_API_KEY,
|
|
536
549
|
},
|
|
@@ -595,6 +608,9 @@ const calculateValue = () => {
|
|
|
595
608
|
qingting: {
|
|
596
609
|
id: envs.QINGTING_ID,
|
|
597
610
|
},
|
|
611
|
+
readwise: {
|
|
612
|
+
accessToken: envs.READWISE_ACCESS_TOKEN,
|
|
613
|
+
},
|
|
598
614
|
saraba1st: {
|
|
599
615
|
cookie: envs.SARABA1ST_COOKIE,
|
|
600
616
|
},
|
|
@@ -632,7 +648,6 @@ const calculateValue = () => {
|
|
|
632
648
|
username: envs.TWITTER_USERNAME?.split(','),
|
|
633
649
|
password: envs.TWITTER_PASSWORD?.split(','),
|
|
634
650
|
authenticationSecret: envs.TWITTER_AUTHENTICATION_SECRET?.split(','),
|
|
635
|
-
cookie: envs.TWITTER_COOKIE,
|
|
636
651
|
authToken: envs.TWITTER_AUTH_TOKEN?.split(','),
|
|
637
652
|
},
|
|
638
653
|
weibo: {
|
|
@@ -656,6 +671,7 @@ const calculateValue = () => {
|
|
|
656
671
|
},
|
|
657
672
|
xsijishe: {
|
|
658
673
|
cookie: envs.XSIJISHE_COOKIE,
|
|
674
|
+
user_agent: envs.XSIJISHE_USER_AGENT,
|
|
659
675
|
},
|
|
660
676
|
xueqiu: {
|
|
661
677
|
cookies: envs.XUEQIU_COOKIES,
|
package/lib/errors/index.tsx
CHANGED
|
@@ -7,14 +7,20 @@ import Error from '@/views/error';
|
|
|
7
7
|
|
|
8
8
|
import NotFoundError from './types/not-found';
|
|
9
9
|
|
|
10
|
+
import { requestMetric } from '@/utils/otel';
|
|
11
|
+
|
|
10
12
|
export const errorHandler: ErrorHandler = (error, ctx) => {
|
|
11
13
|
const requestPath = ctx.req.path;
|
|
12
14
|
const matchedRoute = ctx.req.routePath;
|
|
13
15
|
const hasMatchedRoute = matchedRoute !== '/*';
|
|
14
16
|
|
|
15
17
|
const debug = getDebugInfo();
|
|
16
|
-
|
|
17
|
-
|
|
18
|
+
try {
|
|
19
|
+
if (ctx.res.headers.get('RSSHub-Cache-Status')) {
|
|
20
|
+
debug.hitCache++;
|
|
21
|
+
}
|
|
22
|
+
} catch {
|
|
23
|
+
// ignore
|
|
18
24
|
}
|
|
19
25
|
debug.error++;
|
|
20
26
|
|
|
@@ -61,8 +67,9 @@ export const errorHandler: ErrorHandler = (error, ctx) => {
|
|
|
61
67
|
const message = `${error.name}: ${errorMessage}`;
|
|
62
68
|
|
|
63
69
|
logger.error(`Error in ${requestPath}: ${message}`);
|
|
70
|
+
requestMetric.error({ path: requestPath, method: ctx.req.method, status: ctx.res.status });
|
|
64
71
|
|
|
65
|
-
return config.isPackage
|
|
72
|
+
return config.isPackage || ctx.req.query('format') === 'json'
|
|
66
73
|
? ctx.json({
|
|
67
74
|
error: {
|
|
68
75
|
message: error.message ?? error,
|
package/lib/index.ts
CHANGED
|
@@ -36,7 +36,7 @@ const expects = {
|
|
|
36
36
|
`<a href="https://mock.com/DIYgod/RSSHub"></a>
|
|
37
37
|
<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">`,
|
|
38
38
|
],
|
|
39
|
-
desc: '<img src="http://mock.com/DIYgod/DIYgod/RSSHub"> -
|
|
39
|
+
desc: '<img src="http://mock.com/DIYgod/DIYgod/RSSHub"> - Powered by RSSHub',
|
|
40
40
|
},
|
|
41
41
|
processed: {
|
|
42
42
|
items: [
|
|
@@ -54,7 +54,7 @@ const expects = {
|
|
|
54
54
|
`<a href="https://mock.com/DIYgod/RSSHub"></a>
|
|
55
55
|
<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">`,
|
|
56
56
|
],
|
|
57
|
-
desc: '<img src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"> -
|
|
57
|
+
desc: '<img src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"> - Powered by RSSHub',
|
|
58
58
|
},
|
|
59
59
|
urlencoded: {
|
|
60
60
|
items: [
|
|
@@ -72,7 +72,7 @@ const expects = {
|
|
|
72
72
|
`<a href="https://mock.com/DIYgod/RSSHub"></a>
|
|
73
73
|
<img src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.jpg" referrerpolicy="no-referrer">`,
|
|
74
74
|
],
|
|
75
|
-
desc: '<img src="https://images.weserv.nl?url=http%3A%2F%2Fmock.com%2FDIYgod%2FDIYgod%2FRSSHub"> -
|
|
75
|
+
desc: '<img src="https://images.weserv.nl?url=http%3A%2F%2Fmock.com%2FDIYgod%2FDIYgod%2FRSSHub"> - Powered by RSSHub',
|
|
76
76
|
},
|
|
77
77
|
},
|
|
78
78
|
multimedia: {
|
|
@@ -87,7 +87,7 @@ const expects = {
|
|
|
87
87
|
<audio src="https://mock.com/DIYgod/RSSHub.mp3"></audio>
|
|
88
88
|
<iframe src="https://mock.com/DIYgod/RSSHub.html" referrerpolicy="no-referrer"></iframe>`,
|
|
89
89
|
],
|
|
90
|
-
desc: '<video src="http://mock.com/DIYgod/DIYgod/RSSHub"></video> -
|
|
90
|
+
desc: '<video src="http://mock.com/DIYgod/DIYgod/RSSHub"></video> - Powered by RSSHub',
|
|
91
91
|
},
|
|
92
92
|
relayed: {
|
|
93
93
|
items: [
|
|
@@ -100,7 +100,7 @@ const expects = {
|
|
|
100
100
|
<audio src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp3"></audio>
|
|
101
101
|
<iframe src="https://mock.com/DIYgod/RSSHub.html" referrerpolicy="no-referrer"></iframe>`,
|
|
102
102
|
],
|
|
103
|
-
desc: '<video src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"></video> -
|
|
103
|
+
desc: '<video src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"></video> - Powered by RSSHub',
|
|
104
104
|
},
|
|
105
105
|
partlyRelayed: {
|
|
106
106
|
items: [
|
|
@@ -113,7 +113,149 @@ const expects = {
|
|
|
113
113
|
<audio src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp3"></audio>
|
|
114
114
|
<iframe src="https://mock.com/DIYgod/RSSHub.html" referrerpolicy="no-referrer"></iframe>`,
|
|
115
115
|
],
|
|
116
|
-
desc: '<video src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"></video> -
|
|
116
|
+
desc: '<video src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"></video> - Powered by RSSHub',
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
extraComplicated: {
|
|
120
|
+
origin: {
|
|
121
|
+
items: [
|
|
122
|
+
{
|
|
123
|
+
content:
|
|
124
|
+
'<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n\n<a href="http://mock.com/DIYgod/RSSHub"></a>\n<img src="https://mock.com/DIYgod/RSSHub.jpg" data-src="/DIYgod/RSSHub0.jpg" referrerpolicy="no-referrer">\n<img data-src="/DIYgod/RSSHub.jpg" src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<img data-mock="/DIYgod/RSSHub.png" src="https://mock.com/DIYgod/RSSHub.png" referrerpolicy="no-referrer">\n<img mock="/DIYgod/RSSHub.gif" src="https://mock.com/DIYgod/RSSHub.gif" referrerpolicy="no-referrer">\n<img src="http://mock.com/DIYgod/DIYgod/RSSHub" referrerpolicy="no-referrer">\n<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" referrerpolicy="no-referrer">',
|
|
125
|
+
itunes: {},
|
|
126
|
+
},
|
|
127
|
+
{
|
|
128
|
+
content: '<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">',
|
|
129
|
+
itunes: {},
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
content:
|
|
133
|
+
'<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" referrerpolicy="no-referrer">',
|
|
134
|
+
enclosure: {
|
|
135
|
+
url: 'https://mock.com/DIYgod/RSSHub.png',
|
|
136
|
+
type: 'image/png',
|
|
137
|
+
},
|
|
138
|
+
itunes: {
|
|
139
|
+
image: 'https://mock.com/DIYgod/RSSHub.gif',
|
|
140
|
+
},
|
|
141
|
+
},
|
|
142
|
+
],
|
|
143
|
+
image: {
|
|
144
|
+
link: 'https://github.com/DIYgod/RSSHub',
|
|
145
|
+
url: 'https://mock.com/DIYgod/RSSHub.png',
|
|
146
|
+
title: 'Test complicated',
|
|
147
|
+
},
|
|
148
|
+
description: '<img src="http://mock.com/DIYgod/DIYgod/RSSHub"> - Powered by RSSHub',
|
|
149
|
+
},
|
|
150
|
+
processed: {
|
|
151
|
+
items: [
|
|
152
|
+
{
|
|
153
|
+
content:
|
|
154
|
+
'<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n\n<a href="http://mock.com/DIYgod/RSSHub"></a>\n<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" data-src="/DIYgod/RSSHub0.jpg" referrerpolicy="no-referrer">\n<img data-src="/DIYgod/RSSHub.jpg" src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<img data-mock="/DIYgod/RSSHub.png" src="https://i3.wp.com/mock.com/DIYgod/RSSHub.png" referrerpolicy="no-referrer">\n<img mock="/DIYgod/RSSHub.gif" src="https://i3.wp.com/mock.com/DIYgod/RSSHub.gif" referrerpolicy="no-referrer">\n<img src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub" referrerpolicy="no-referrer">\n<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" referrerpolicy="no-referrer">',
|
|
155
|
+
itunes: {},
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
content: '<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">',
|
|
159
|
+
itunes: {},
|
|
160
|
+
},
|
|
161
|
+
{
|
|
162
|
+
content:
|
|
163
|
+
'<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" referrerpolicy="no-referrer">',
|
|
164
|
+
enclosure: {
|
|
165
|
+
url: 'https://i3.wp.com/mock.com/DIYgod/RSSHub.png',
|
|
166
|
+
type: 'image/png',
|
|
167
|
+
},
|
|
168
|
+
itunes: {
|
|
169
|
+
image: 'https://i3.wp.com/mock.com/DIYgod/RSSHub.gif',
|
|
170
|
+
},
|
|
171
|
+
},
|
|
172
|
+
],
|
|
173
|
+
image: {
|
|
174
|
+
link: 'https://github.com/DIYgod/RSSHub',
|
|
175
|
+
url: 'https://i3.wp.com/mock.com/DIYgod/RSSHub.png',
|
|
176
|
+
title: 'Test complicated',
|
|
177
|
+
},
|
|
178
|
+
description: '<img src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"> - Powered by RSSHub',
|
|
179
|
+
},
|
|
180
|
+
urlencoded: {
|
|
181
|
+
items: [
|
|
182
|
+
{
|
|
183
|
+
content:
|
|
184
|
+
'<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.jpg" referrerpolicy="no-referrer">\n\n<a href="http://mock.com/DIYgod/RSSHub"></a>\n<img src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.jpg" data-src="/DIYgod/RSSHub0.jpg" referrerpolicy="no-referrer">\n<img data-src="/DIYgod/RSSHub.jpg" src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.jpg" referrerpolicy="no-referrer">\n<img data-mock="/DIYgod/RSSHub.png" src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.png" referrerpolicy="no-referrer">\n<img mock="/DIYgod/RSSHub.gif" src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.gif" referrerpolicy="no-referrer">\n<img src="https://images.weserv.nl?url=http%3A%2F%2Fmock.com%2FDIYgod%2FDIYgod%2FRSSHub" referrerpolicy="no-referrer">\n<img src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.jpg" referrerpolicy="no-referrer">\n<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" referrerpolicy="no-referrer">',
|
|
185
|
+
itunes: {},
|
|
186
|
+
},
|
|
187
|
+
{
|
|
188
|
+
content: '<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.jpg" referrerpolicy="no-referrer">',
|
|
189
|
+
itunes: {},
|
|
190
|
+
},
|
|
191
|
+
{
|
|
192
|
+
content:
|
|
193
|
+
'<a href="https://mock.com/DIYgod/RSSHub"></a>\n<img src="https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.jpg" referrerpolicy="no-referrer">\n<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" referrerpolicy="no-referrer">',
|
|
194
|
+
enclosure: {
|
|
195
|
+
url: 'https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.png',
|
|
196
|
+
type: 'image/png',
|
|
197
|
+
},
|
|
198
|
+
itunes: {
|
|
199
|
+
image: 'https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.gif',
|
|
200
|
+
},
|
|
201
|
+
},
|
|
202
|
+
],
|
|
203
|
+
image: {
|
|
204
|
+
link: 'https://github.com/DIYgod/RSSHub',
|
|
205
|
+
url: 'https://images.weserv.nl?url=https%3A%2F%2Fmock.com%2FDIYgod%2FRSSHub.png',
|
|
206
|
+
title: 'Test complicated',
|
|
207
|
+
},
|
|
208
|
+
description: '<img src="https://images.weserv.nl?url=http%3A%2F%2Fmock.com%2FDIYgod%2FDIYgod%2FRSSHub"> - Powered by RSSHub',
|
|
209
|
+
},
|
|
210
|
+
},
|
|
211
|
+
extraMultimedia: {
|
|
212
|
+
origin: {
|
|
213
|
+
items: [
|
|
214
|
+
{
|
|
215
|
+
content:
|
|
216
|
+
'<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<video src="https://mock.com/DIYgod/RSSHub.mp4"></video>\n<video poster="https://mock.com/DIYgod/RSSHub.jpg">\n<source src="https://mock.com/DIYgod/RSSHub.mp4" type="video/mp4">\n<source src="https://mock.com/DIYgod/RSSHub.webm" type="video/webm">\n</video>\n<audio src="https://mock.com/DIYgod/RSSHub.mp3"></audio>\n<iframe src="https://mock.com/DIYgod/RSSHub.html" referrerpolicy="no-referrer"></iframe>',
|
|
217
|
+
},
|
|
218
|
+
{
|
|
219
|
+
content: '<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<video src="https://mock.com/DIYgod/RSSHub.mp4"></video>',
|
|
220
|
+
enclosure: {
|
|
221
|
+
url: 'https://mock.com/DIYgod/RSSHub.mp4',
|
|
222
|
+
type: 'video/mp4',
|
|
223
|
+
},
|
|
224
|
+
},
|
|
225
|
+
],
|
|
226
|
+
description: '<video src="http://mock.com/DIYgod/DIYgod/RSSHub"></video> - Powered by RSSHub',
|
|
227
|
+
},
|
|
228
|
+
relayed: {
|
|
229
|
+
items: [
|
|
230
|
+
{
|
|
231
|
+
content:
|
|
232
|
+
'<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<video src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4"></video>\n<video poster="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg">\n<source src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4" type="video/mp4">\n<source src="https://i3.wp.com/mock.com/DIYgod/RSSHub.webm" type="video/webm">\n</video>\n<audio src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp3"></audio>\n<iframe src="https://mock.com/DIYgod/RSSHub.html" referrerpolicy="no-referrer"></iframe>',
|
|
233
|
+
},
|
|
234
|
+
{
|
|
235
|
+
content: '<img src="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<video src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4"></video>',
|
|
236
|
+
enclosure: {
|
|
237
|
+
url: 'https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4',
|
|
238
|
+
type: 'video/mp4',
|
|
239
|
+
},
|
|
240
|
+
},
|
|
241
|
+
],
|
|
242
|
+
description: '<video src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"></video> - Powered by RSSHub',
|
|
243
|
+
},
|
|
244
|
+
partlyRelayed: {
|
|
245
|
+
items: [
|
|
246
|
+
{
|
|
247
|
+
content:
|
|
248
|
+
'<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<video src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4"></video>\n<video poster="https://i3.wp.com/mock.com/DIYgod/RSSHub.jpg">\n<source src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4" type="video/mp4">\n<source src="https://i3.wp.com/mock.com/DIYgod/RSSHub.webm" type="video/webm">\n</video>\n<audio src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp3"></audio>\n<iframe src="https://mock.com/DIYgod/RSSHub.html" referrerpolicy="no-referrer"></iframe>',
|
|
249
|
+
},
|
|
250
|
+
{
|
|
251
|
+
content: '<img src="https://mock.com/DIYgod/RSSHub.jpg" referrerpolicy="no-referrer">\n<video src="https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4"></video>',
|
|
252
|
+
enclosure: {
|
|
253
|
+
url: 'https://i3.wp.com/mock.com/DIYgod/RSSHub.mp4',
|
|
254
|
+
type: 'video/mp4',
|
|
255
|
+
},
|
|
256
|
+
},
|
|
257
|
+
],
|
|
258
|
+
description: '<video src="https://i3.wp.com/mock.com/DIYgod/DIYgod/RSSHub"></video> - Powered by RSSHub',
|
|
117
259
|
},
|
|
118
260
|
},
|
|
119
261
|
};
|
|
@@ -142,12 +284,55 @@ const testAntiHotlink = async (path, expectObj, query?: string | Record<string,
|
|
|
142
284
|
return parsed;
|
|
143
285
|
};
|
|
144
286
|
|
|
145
|
-
const
|
|
146
|
-
const
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
const
|
|
287
|
+
const testAntiHotlinkExtra = async (path, expectObj, query?: string | Record<string, any>) => {
|
|
288
|
+
const app = (await import('@/app')).default;
|
|
289
|
+
|
|
290
|
+
path += query ? `?${new URLSearchParams(query).toString()}` : '';
|
|
291
|
+
|
|
292
|
+
const response = await app.request(path);
|
|
293
|
+
const parsed = await parser.parseString(await response.text());
|
|
294
|
+
const obj = {
|
|
295
|
+
description: parsed.description,
|
|
296
|
+
image: parsed.image,
|
|
297
|
+
items: parsed.items.slice(0, expectObj.items.length).map((e) => ({
|
|
298
|
+
content: e.content,
|
|
299
|
+
enclosure: e.enclosure,
|
|
300
|
+
itunes: e.itunes,
|
|
301
|
+
})),
|
|
302
|
+
};
|
|
303
|
+
expect(obj).toEqual(expectObj);
|
|
304
|
+
|
|
305
|
+
return parsed;
|
|
306
|
+
};
|
|
307
|
+
|
|
308
|
+
const expectImgOrigin = async (query?: string | Record<string, any>) => {
|
|
309
|
+
await testAntiHotlink('/test/complicated', expects.complicated.origin, query);
|
|
310
|
+
await testAntiHotlinkExtra('/test/complicated', expects.extraComplicated.origin, query);
|
|
311
|
+
};
|
|
312
|
+
const expectImgProcessed = async (query?: string | Record<string, any>) => {
|
|
313
|
+
await testAntiHotlink('/test/complicated', expects.complicated.processed, query);
|
|
314
|
+
await testAntiHotlinkExtra('/test/complicated', expects.extraComplicated.processed, query);
|
|
315
|
+
};
|
|
316
|
+
|
|
317
|
+
const expectImgUrlencoded = async (query?: string | Record<string, any>) => {
|
|
318
|
+
await testAntiHotlink('/test/complicated', expects.complicated.urlencoded, query);
|
|
319
|
+
await testAntiHotlinkExtra('/test/complicated', expects.extraComplicated.urlencoded, query);
|
|
320
|
+
};
|
|
321
|
+
|
|
322
|
+
const expectMultimediaOrigin = async (query?: string | Record<string, any>) => {
|
|
323
|
+
await testAntiHotlink('/test/multimedia', expects.multimedia.origin, query);
|
|
324
|
+
await testAntiHotlinkExtra('/test/multimedia', expects.extraMultimedia.origin, query);
|
|
325
|
+
};
|
|
326
|
+
|
|
327
|
+
const expectMultimediaRelayed = async (query?: string | Record<string, any>) => {
|
|
328
|
+
await testAntiHotlink('/test/multimedia', expects.multimedia.relayed, query);
|
|
329
|
+
await testAntiHotlinkExtra('/test/multimedia', expects.extraMultimedia.relayed, query);
|
|
330
|
+
};
|
|
331
|
+
|
|
332
|
+
const expectMultimediaPartlyRelayed = async (query?: string | Record<string, any>) => {
|
|
333
|
+
await testAntiHotlink('/test/multimedia', expects.multimedia.partlyRelayed, query);
|
|
334
|
+
await testAntiHotlinkExtra('/test/multimedia', expects.extraMultimedia.partlyRelayed, query);
|
|
335
|
+
};
|
|
151
336
|
|
|
152
337
|
describe('anti-hotlink', () => {
|
|
153
338
|
it('template-legacy', async () => {
|
|
@@ -44,6 +44,18 @@ const parseUrl = (str: string) => {
|
|
|
44
44
|
|
|
45
45
|
return url;
|
|
46
46
|
};
|
|
47
|
+
|
|
48
|
+
const replaceUrl = (template?: string, url?: string) => {
|
|
49
|
+
if (!template || !url) {
|
|
50
|
+
return url;
|
|
51
|
+
}
|
|
52
|
+
const oldUrl = parseUrl(url);
|
|
53
|
+
if (oldUrl && oldUrl.protocol !== 'data:') {
|
|
54
|
+
return interpolate(template, oldUrl);
|
|
55
|
+
}
|
|
56
|
+
return url;
|
|
57
|
+
};
|
|
58
|
+
|
|
47
59
|
const replaceUrls = ($: CheerioAPI, selector: string, template: string, attribute = 'src') => {
|
|
48
60
|
$(selector).each(function () {
|
|
49
61
|
const oldSrc = $(this).attr(attribute);
|
|
@@ -120,6 +132,9 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
|
|
|
120
132
|
// image link
|
|
121
133
|
const data: Data = ctx.get('data');
|
|
122
134
|
if (data) {
|
|
135
|
+
if (data.image) {
|
|
136
|
+
data.image = replaceUrl(imageHotlinkTemplate, data.image);
|
|
137
|
+
}
|
|
123
138
|
if (data.description) {
|
|
124
139
|
data.description = process(data.description, imageHotlinkTemplate, multimediaHotlinkTemplate);
|
|
125
140
|
}
|
|
@@ -129,6 +144,19 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
|
|
|
129
144
|
if (item.description) {
|
|
130
145
|
item.description = process(item.description, imageHotlinkTemplate, multimediaHotlinkTemplate);
|
|
131
146
|
}
|
|
147
|
+
if (item.enclosure_url && item.enclosure_type) {
|
|
148
|
+
if (item.enclosure_type.startsWith('image/')) {
|
|
149
|
+
item.enclosure_url = replaceUrl(imageHotlinkTemplate, item.enclosure_url);
|
|
150
|
+
} else if (/^(video|audio)\//.test(item.enclosure_type)) {
|
|
151
|
+
item.enclosure_url = replaceUrl(multimediaHotlinkTemplate, item.enclosure_url);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
if (item.image) {
|
|
155
|
+
item.image = replaceUrl(imageHotlinkTemplate, item.image);
|
|
156
|
+
}
|
|
157
|
+
if (item.itunes_item_image) {
|
|
158
|
+
item.itunes_item_image = replaceUrl(imageHotlinkTemplate, item.itunes_item_image);
|
|
159
|
+
}
|
|
132
160
|
}
|
|
133
161
|
}
|
|
134
162
|
|
package/lib/middleware/logger.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { requestMetric } from '@/utils/otel';
|
|
1
2
|
import { MiddlewareHandler } from 'hono';
|
|
2
3
|
import logger from '@/utils/logger';
|
|
3
4
|
import { getPath, time } from '@/utils/helpers';
|
|
@@ -34,7 +35,10 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
|
|
|
34
35
|
|
|
35
36
|
await next();
|
|
36
37
|
|
|
37
|
-
|
|
38
|
+
const status = ctx.res.status;
|
|
39
|
+
|
|
40
|
+
logger.info(`${LogPrefix.Outgoing} ${method} ${path} ${colorStatus(status)} ${time(start)}`);
|
|
41
|
+
requestMetric.success(Date.now() - start, { path, method, status });
|
|
38
42
|
};
|
|
39
43
|
|
|
40
44
|
export default middleware;
|
|
@@ -427,7 +427,8 @@ describe('multi parameter', () => {
|
|
|
427
427
|
});
|
|
428
428
|
|
|
429
429
|
describe('openai', () => {
|
|
430
|
-
it(
|
|
430
|
+
it('processes both title and description', async () => {
|
|
431
|
+
config.openai.inputOption = 'both';
|
|
431
432
|
const responseWithGpt = await app.request('/test/gpt?chatgpt=true');
|
|
432
433
|
const responseNormal = await app.request('/test/gpt');
|
|
433
434
|
|
|
@@ -437,9 +438,25 @@ describe('openai', () => {
|
|
|
437
438
|
const parsedGpt = await parser.parseString(await responseWithGpt.text());
|
|
438
439
|
const parsedNormal = await parser.parseString(await responseNormal.text());
|
|
439
440
|
|
|
440
|
-
expect(parsedGpt.items[0].
|
|
441
|
-
expect(parsedGpt.items[0].
|
|
442
|
-
expect(parsedGpt.items[
|
|
443
|
-
expect(parsedGpt.items[
|
|
441
|
+
expect(parsedGpt.items[0].title).not.toBe(parsedNormal.items[0].title);
|
|
442
|
+
expect(parsedGpt.items[0].title).toContain('AI processed content.');
|
|
443
|
+
expect(parsedGpt.items[0].content).not.toBe(parsedNormal.items[0].content);
|
|
444
|
+
expect(parsedGpt.items[0].content).toContain('AI processed content.');
|
|
445
|
+
});
|
|
446
|
+
|
|
447
|
+
it('processes title or description', async () => {
|
|
448
|
+
// test title
|
|
449
|
+
config.openai.inputOption = 'title';
|
|
450
|
+
const responseTitleOnly = await app.request('/test/gpt?chatgpt=true');
|
|
451
|
+
const parsedTitleOnly = await parser.parseString(await responseTitleOnly.text());
|
|
452
|
+
expect(parsedTitleOnly.items[0].title).toContain('AI processed content.');
|
|
453
|
+
expect(parsedTitleOnly.items[0].content).not.toContain('AI processed content.');
|
|
454
|
+
|
|
455
|
+
// test description
|
|
456
|
+
config.openai.inputOption = 'description';
|
|
457
|
+
const responseDescriptionOnly = await app.request('/test/gpt?chatgpt=true');
|
|
458
|
+
const parsedDescriptionOnly = await parser.parseString(await responseDescriptionOnly.text());
|
|
459
|
+
expect(parsedDescriptionOnly.items[0].title).not.toContain('AI processed content.');
|
|
460
|
+
expect(parsedDescriptionOnly.items[0].content).toContain('AI processed content.');
|
|
444
461
|
});
|
|
445
462
|
});
|