rsshub 1.0.0-master.ebff6c5 → 1.0.0-master.ec03e07
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 +28 -6
- package/lib/errors/index.tsx +10 -3
- package/lib/index.ts +1 -1
- package/lib/middleware/anti-hotlink.test.ts +6 -6
- 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/69shu/article.ts +4 -4
- 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/asmr-200/index.ts +66 -0
- package/lib/routes/asmr-200/namespace.ts +6 -0
- package/lib/routes/asmr-200/templates/work.art +7 -0
- package/lib/routes/asmr-200/type.ts +96 -0
- 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/bilibili/api-interface.d.ts +1 -0
- package/lib/routes/bilibili/cache.ts +3 -1
- package/lib/routes/bilibili/dynamic.ts +7 -2
- package/lib/routes/bilibili/ranking.ts +2 -1
- package/lib/routes/bilibili/video.ts +2 -1
- 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/bluearchive/news.ts +2 -2
- package/lib/routes/bt0/mv.ts +21 -24
- package/lib/routes/bt0/tlist.ts +19 -26
- package/lib/routes/bt0/util.ts +6 -3
- 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 +48 -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/deadbydaylight/index.ts +69 -0
- package/lib/routes/deadbydaylight/namespace.ts +12 -0
- 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 +44 -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/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/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/chongqing/sydwgkzp.ts +4 -4
- package/lib/routes/gov/lswz/index.ts +289 -0
- package/lib/routes/gov/stats/index.ts +8 -8
- 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/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/investor/index.ts +213 -0
- package/lib/routes/investor/namespace.ts +8 -0
- 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/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/microsoft/mcr.ts +1 -1
- 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 +43 -0
- package/lib/routes/mirrormedia/namespace.ts +6 -0
- 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/nextjs/blog.ts +63 -0
- package/lib/routes/nextjs/namespace.ts +6 -0
- package/lib/routes/nga/forum.ts +3 -2
- package/lib/routes/notion/release.ts +81 -0
- 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 +3 -2
- 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/raycast/changelog.ts +54 -0
- package/lib/routes/raycast/namespace.ts +7 -0
- package/lib/routes/react/blog.ts +57 -0
- package/lib/routes/react/namespace.ts +6 -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/sjtu/jwc.ts +4 -1
- 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/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 +38 -4
- package/lib/routes/test/index.ts +6 -36
- package/lib/routes/the/index.ts +210 -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/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/tsdm39/bd.ts +101 -0
- package/lib/routes/tsdm39/namespace.ts +7 -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/utgd/category.ts +18 -59
- package/lib/routes/utgd/timeline.ts +9 -45
- package/lib/routes/utgd/topic.ts +9 -51
- package/lib/routes/utgd/utils.ts +41 -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/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 +60 -48
- 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/iplay/home.js +0 -26
- package/lib/routes-deprecated/iplay/utils.js +0 -57
- /package/lib/routes/{moduzy → maccms}/templates/vod.art +0 -0
package/lib/routes/zhihu/hot.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Route } from '@/types';
|
|
1
|
+
import { Route, ViewType } from '@/types';
|
|
2
2
|
import got from '@/utils/got';
|
|
3
3
|
import { parseDate } from '@/utils/parse-date';
|
|
4
4
|
|
|
@@ -18,9 +18,61 @@ const titles = {
|
|
|
18
18
|
|
|
19
19
|
export const route: Route = {
|
|
20
20
|
path: '/hot/:category?',
|
|
21
|
-
categories: ['social-media'],
|
|
21
|
+
categories: ['social-media', 'popular'],
|
|
22
22
|
example: '/zhihu/hot',
|
|
23
|
-
|
|
23
|
+
view: ViewType.Articles,
|
|
24
|
+
parameters: {
|
|
25
|
+
category: {
|
|
26
|
+
description: '分类',
|
|
27
|
+
default: 'total',
|
|
28
|
+
options: [
|
|
29
|
+
{
|
|
30
|
+
value: 'total',
|
|
31
|
+
label: '全站',
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
value: 'focus',
|
|
35
|
+
label: '国际',
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
value: 'science',
|
|
39
|
+
label: '科学',
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
value: 'car',
|
|
43
|
+
label: '汽车',
|
|
44
|
+
},
|
|
45
|
+
{
|
|
46
|
+
value: 'zvideo',
|
|
47
|
+
label: '视频',
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
value: 'fashion',
|
|
51
|
+
label: '时尚',
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
value: 'depth',
|
|
55
|
+
label: '时事',
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
value: 'digital',
|
|
59
|
+
label: '数码',
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
value: 'sport',
|
|
63
|
+
label: '体育',
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
value: 'school',
|
|
67
|
+
label: '校园',
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
value: 'film',
|
|
71
|
+
label: '影视',
|
|
72
|
+
},
|
|
73
|
+
],
|
|
74
|
+
},
|
|
75
|
+
},
|
|
24
76
|
features: {
|
|
25
77
|
requireConfig: false,
|
|
26
78
|
requirePuppeteer: false,
|
|
@@ -29,12 +81,9 @@ export const route: Route = {
|
|
|
29
81
|
supportPodcast: false,
|
|
30
82
|
supportScihub: false,
|
|
31
83
|
},
|
|
32
|
-
name: '
|
|
84
|
+
name: '知乎热榜',
|
|
33
85
|
maintainers: ['nczitzk'],
|
|
34
86
|
handler,
|
|
35
|
-
description: `| 全站 | 国际 | 科学 | 汽车 | 视频 | 时尚 | 时事 | 数码 | 体育 | 校园 | 影视 |
|
|
36
|
-
| ----- | ----- | ------- | ---- | ------ | ------- | ----- | ------- | ----- | ------ | ---- |
|
|
37
|
-
| total | focus | science | car | zvideo | fashion | depth | digital | sport | school | film |`,
|
|
38
87
|
};
|
|
39
88
|
|
|
40
89
|
async function handler(ctx) {
|
|
@@ -3,4 +3,7 @@ import type { Namespace } from '@/types';
|
|
|
3
3
|
export const namespace: Namespace = {
|
|
4
4
|
name: '知乎',
|
|
5
5
|
url: 'www.zhihu.com',
|
|
6
|
+
description: `:::tip
|
|
7
|
+
自2024年7月,未登录状态下大部分路由[无法获取全文](https://github.com/DIYgod/RSSHub/issues/16260)。若有需要请在登陆知乎后寻找并添加包含\`z_c0\`的Cookies至环境变量\`ZHIHU_COOKIES\`。
|
|
8
|
+
:::`,
|
|
6
9
|
};
|
|
@@ -3,6 +3,7 @@ import cache from '@/utils/cache';
|
|
|
3
3
|
import ofetch from '@/utils/ofetch';
|
|
4
4
|
import g_encrypt from './execlib/x-zse-96-v3';
|
|
5
5
|
import md5 from '@/utils/md5';
|
|
6
|
+
import { config } from '@/config';
|
|
6
7
|
|
|
7
8
|
export const header = {
|
|
8
9
|
'x-api-version': '3.0.91',
|
|
@@ -55,6 +56,13 @@ export const processImage = (content: string) => {
|
|
|
55
56
|
return $.html();
|
|
56
57
|
};
|
|
57
58
|
|
|
59
|
+
export const getCookieValueByKey = (key: string) =>
|
|
60
|
+
config.zhihu.cookies
|
|
61
|
+
?.split(';')
|
|
62
|
+
.map((e) => e.trim())
|
|
63
|
+
.find((e) => e.startsWith(key + '='))
|
|
64
|
+
?.slice(key.length + 1);
|
|
65
|
+
|
|
58
66
|
export const getSignedHeader = async (url: string, apiPath: string) => {
|
|
59
67
|
// Because the API of zhihu.com has changed, we must use the value of `d_c0` (extracted from cookies) to calculate
|
|
60
68
|
// `x-zse-96`. So first get `d_c0`, then get the actual data of a ZhiHu question. In this way, we don't need to
|
|
@@ -63,10 +71,7 @@ export const getSignedHeader = async (url: string, apiPath: string) => {
|
|
|
63
71
|
// fisrt: get cookie(dc_0) from zhihu.com
|
|
64
72
|
const dc0 = await cache.tryGet('zhihu:cookies:d_c0', async () => {
|
|
65
73
|
const response1 = await ofetch.raw(url);
|
|
66
|
-
const
|
|
67
|
-
const zseCk = $('script:contains("__zse_ck")')
|
|
68
|
-
.text()
|
|
69
|
-
.match(/\|\|"(.*?)",.*;document\.cookie/)?.[1];
|
|
74
|
+
const zseCk = response1._data.match(/var e="__zse_ck",t=\(typeof __g\.ck == 'string' && __g\.ck\)\|\|"([\w+/=]*?)",_=6048e5;/)?.[1];
|
|
70
75
|
|
|
71
76
|
const response2 = zseCk
|
|
72
77
|
? await ofetch.raw(url, {
|
|
@@ -82,7 +87,9 @@ export const getSignedHeader = async (url: string, apiPath: string) => {
|
|
|
82
87
|
const dc0 = (response2 || response1).headers
|
|
83
88
|
.getSetCookie()
|
|
84
89
|
.find((s) => s.startsWith('d_c0='))
|
|
85
|
-
?.split(';')[0]
|
|
90
|
+
?.split(';')[0]
|
|
91
|
+
.trim()
|
|
92
|
+
.slice('d_c0='.length);
|
|
86
93
|
if (!dc0) {
|
|
87
94
|
throw new Error('Failed to extract `d_c0` from cookies');
|
|
88
95
|
}
|
|
@@ -94,8 +101,11 @@ export const getSignedHeader = async (url: string, apiPath: string) => {
|
|
|
94
101
|
const xzse93 = '101_3_3.0';
|
|
95
102
|
const f = `${xzse93}+${apiPath}+${dc0}`;
|
|
96
103
|
const xzse96 = '2.0_' + g_encrypt(md5(f));
|
|
104
|
+
|
|
105
|
+
const zc0 = getCookieValueByKey('z_c0');
|
|
106
|
+
|
|
97
107
|
return {
|
|
98
|
-
cookie: `d_c0=${dc0}`,
|
|
108
|
+
cookie: `d_c0=${dc0}${zc0 ? `;z_c0=${zc0}` : ''}`,
|
|
99
109
|
'x-zse-96': xzse96,
|
|
100
110
|
'x-app-za': 'OS=Web',
|
|
101
111
|
'x-zse-93': xzse93,
|
|
@@ -26,7 +26,7 @@ export const route: Route = {
|
|
|
26
26
|
};
|
|
27
27
|
|
|
28
28
|
async function handler() {
|
|
29
|
-
const baseUrl = 'https://zhujia.zhuwang.
|
|
29
|
+
const baseUrl = 'https://zhujia.zhuwang.com.cn/';
|
|
30
30
|
const now = new Date();
|
|
31
31
|
const date = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
|
|
32
32
|
const response = await got(`${baseUrl}/api/chartData`, {
|
package/lib/routes/zsxq/types.ts
CHANGED
|
@@ -63,6 +63,13 @@ export interface QATopic extends BasicTopic {
|
|
|
63
63
|
question: {
|
|
64
64
|
images?: TopicImage[];
|
|
65
65
|
text?: string;
|
|
66
|
+
owner?: {
|
|
67
|
+
avatar_url: string;
|
|
68
|
+
description: string;
|
|
69
|
+
location: string;
|
|
70
|
+
name: string;
|
|
71
|
+
user_id: number;
|
|
72
|
+
};
|
|
66
73
|
};
|
|
67
74
|
}
|
|
68
75
|
|
|
@@ -140,6 +147,8 @@ export interface TopicImage {
|
|
|
140
147
|
|
|
141
148
|
export type Topic = TalkTopic | QATopic | TaskTopic | SolutionTopic;
|
|
142
149
|
|
|
150
|
+
export type ResponseData = UserInfo | GroupInfo | Topic[];
|
|
151
|
+
|
|
143
152
|
export type UserInfoResponse = BasicResponse<UserInfo>;
|
|
144
153
|
|
|
145
154
|
export type GroupInfoResponse = BasicResponse<GroupInfo>;
|
package/lib/routes/zsxq/utils.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import got from '@/utils/got';
|
|
2
|
-
import type { TopicImage, Topic, BasicResponse } from './types';
|
|
2
|
+
import type { TopicImage, Topic, BasicResponse, ResponseData } from './types';
|
|
3
3
|
import { parseDate } from '@/utils/parse-date';
|
|
4
4
|
import { config } from '@/config';
|
|
5
5
|
import type { DataItem } from '@/types';
|
|
6
6
|
|
|
7
|
-
export async function customFetch<T extends BasicResponse<
|
|
7
|
+
export async function customFetch<T extends BasicResponse<ResponseData>>(path: string, retryCount = 0): Promise<T['resp_data']> {
|
|
8
8
|
const apiUrl = 'https://api.zsxq.com/v2';
|
|
9
9
|
|
|
10
10
|
const response = await got(apiUrl + path, {
|
|
@@ -46,8 +46,9 @@ export function generateTopicDataItem(topics: Topic[]): DataItem[] {
|
|
|
46
46
|
case 'q&a':
|
|
47
47
|
title = topic.question?.text?.split('\n')[0] ?? '问答';
|
|
48
48
|
description = parseTopicContent(topic.question?.text, topic.question?.images);
|
|
49
|
+
description = `<blockquote>${String(topic.question?.owner?.name ?? '匿名用户')} 提问:${description}</blockquote>`;
|
|
49
50
|
if (topic.answered) {
|
|
50
|
-
description += '<br><br>';
|
|
51
|
+
description += '<br>' + topic.answer?.owner.name + ' 回答:<br><br>';
|
|
51
52
|
description += parseTopicContent(topic.answer?.text, topic.answer?.images);
|
|
52
53
|
}
|
|
53
54
|
break;
|
package/lib/routes.test.ts
CHANGED
|
@@ -69,10 +69,16 @@ async function checkRSS(response) {
|
|
|
69
69
|
|
|
70
70
|
describe('routes', () => {
|
|
71
71
|
for (const route in routes) {
|
|
72
|
-
it.concurrent(
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
72
|
+
it.concurrent(
|
|
73
|
+
route,
|
|
74
|
+
{
|
|
75
|
+
timeout: 60000,
|
|
76
|
+
},
|
|
77
|
+
async () => {
|
|
78
|
+
const response = await app.request(routes[route]);
|
|
79
|
+
expect(response.status).toBe(200);
|
|
80
|
+
await checkRSS(response);
|
|
81
|
+
}
|
|
82
|
+
);
|
|
77
83
|
}
|
|
78
84
|
});
|
package/lib/setup.test.ts
CHANGED
package/lib/types.ts
CHANGED
|
@@ -125,6 +125,15 @@ interface Namespace extends NamespaceItem {
|
|
|
125
125
|
|
|
126
126
|
export type { Namespace };
|
|
127
127
|
|
|
128
|
+
export enum ViewType {
|
|
129
|
+
Articles = 0,
|
|
130
|
+
SocialMedia = 1,
|
|
131
|
+
Pictures = 2,
|
|
132
|
+
Videos = 3,
|
|
133
|
+
Audios = 4,
|
|
134
|
+
Notifications = 5,
|
|
135
|
+
}
|
|
136
|
+
|
|
128
137
|
// route
|
|
129
138
|
interface RouteItem {
|
|
130
139
|
/**
|
|
@@ -223,6 +232,11 @@ interface RouteItem {
|
|
|
223
232
|
* The [RSSHub-Radar](https://github.com/DIYgod/RSSHub-Radar) rule of the route
|
|
224
233
|
*/
|
|
225
234
|
radar?: RadarItem[];
|
|
235
|
+
|
|
236
|
+
/**
|
|
237
|
+
* The [Follow](https://github.com/RSSNext/follow) default view of the route, default to `ViewType.Articles`
|
|
238
|
+
*/
|
|
239
|
+
view?: ViewType;
|
|
226
240
|
}
|
|
227
241
|
|
|
228
242
|
interface Route extends RouteItem {
|
|
@@ -272,3 +286,9 @@ export type RadarItem = {
|
|
|
272
286
|
document: Document
|
|
273
287
|
) => string);
|
|
274
288
|
};
|
|
289
|
+
|
|
290
|
+
export type RadarDomain = {
|
|
291
|
+
_name: string;
|
|
292
|
+
} & {
|
|
293
|
+
[subdomain: string]: RadarItem[];
|
|
294
|
+
};
|
package/lib/utils/cache/index.ts
CHANGED
|
@@ -63,6 +63,14 @@ if (config.cache.type === 'redis') {
|
|
|
63
63
|
// plz, write these tips in comments!
|
|
64
64
|
export default {
|
|
65
65
|
...cacheModule,
|
|
66
|
+
/**
|
|
67
|
+
* Try to get the cache. If the cache does not exist, the `getValueFunc` function will be called to get the data, and the data will be cached.
|
|
68
|
+
* @param key The key used to store and retrieve the cache. You can use `:` as a separator to create a hierarchy.
|
|
69
|
+
* @param getValueFunc A function that returns data to be cached when a cache miss occurs.
|
|
70
|
+
* @param maxAge The maximum age of the cache in seconds. This should left to the default value in most cases which is `CACHE_CONTENT_EXPIRE`.
|
|
71
|
+
* @param refresh Whether to renew the cache expiration time when the cache is hit. `true` by default.
|
|
72
|
+
* @returns
|
|
73
|
+
*/
|
|
66
74
|
tryGet: async (key: string, getValueFunc: () => Promise<string | Record<string, any>>, maxAge = config.cache.contentExpire, refresh = true) => {
|
|
67
75
|
if (typeof key !== 'string') {
|
|
68
76
|
throw new TypeError('Cache key must be a string');
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
|
|
3
|
+
import { camelcase, camelcaseKeys } from './camelcase-keys';
|
|
4
|
+
|
|
5
|
+
describe('test camelcase keys', () => {
|
|
6
|
+
it('case 1 normal', () => {
|
|
7
|
+
const obj = {
|
|
8
|
+
tool: 'too',
|
|
9
|
+
tool_name: 'too_name',
|
|
10
|
+
|
|
11
|
+
a_b: 1,
|
|
12
|
+
a: 1,
|
|
13
|
+
b: {
|
|
14
|
+
c_d: 1,
|
|
15
|
+
},
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
expect(camelcaseKeys(obj)).toStrictEqual({
|
|
19
|
+
tool: 'too',
|
|
20
|
+
toolName: 'too_name',
|
|
21
|
+
|
|
22
|
+
aB: 1,
|
|
23
|
+
a: 1,
|
|
24
|
+
b: {
|
|
25
|
+
cD: 1,
|
|
26
|
+
},
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it('case 2: key has number', () => {
|
|
31
|
+
const obj = {
|
|
32
|
+
b147da0eaecbea00aeb62055: {
|
|
33
|
+
data: {},
|
|
34
|
+
},
|
|
35
|
+
a_c11ab_Ac: [
|
|
36
|
+
{
|
|
37
|
+
a_b: 1,
|
|
38
|
+
},
|
|
39
|
+
1,
|
|
40
|
+
],
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
expect(camelcaseKeys(obj)).toStrictEqual({
|
|
44
|
+
b147da0eaecbea00aeb62055: {
|
|
45
|
+
data: {},
|
|
46
|
+
},
|
|
47
|
+
aC11abAc: [
|
|
48
|
+
{
|
|
49
|
+
aB: 1,
|
|
50
|
+
},
|
|
51
|
+
1,
|
|
52
|
+
],
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('case 3: not a object', () => {
|
|
57
|
+
const value = 1;
|
|
58
|
+
expect(camelcaseKeys(value)).toBe(value);
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
it('case 4: nullable value', () => {
|
|
62
|
+
let value = null as any;
|
|
63
|
+
expect(camelcaseKeys(value)).toBe(value);
|
|
64
|
+
|
|
65
|
+
value = undefined;
|
|
66
|
+
expect(camelcaseKeys(value)).toBe(value);
|
|
67
|
+
|
|
68
|
+
value = Number.NaN;
|
|
69
|
+
expect(camelcaseKeys(value)).toBe(value);
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
it('case 5: array', () => {
|
|
73
|
+
const arr = [
|
|
74
|
+
{
|
|
75
|
+
a_b: 1,
|
|
76
|
+
},
|
|
77
|
+
null,
|
|
78
|
+
undefined,
|
|
79
|
+
+0,
|
|
80
|
+
-0,
|
|
81
|
+
Number.POSITIVE_INFINITY,
|
|
82
|
+
{
|
|
83
|
+
a_b: 1,
|
|
84
|
+
},
|
|
85
|
+
];
|
|
86
|
+
|
|
87
|
+
expect(camelcaseKeys(arr)).toStrictEqual([
|
|
88
|
+
{
|
|
89
|
+
aB: 1,
|
|
90
|
+
},
|
|
91
|
+
null,
|
|
92
|
+
undefined,
|
|
93
|
+
+0,
|
|
94
|
+
-0,
|
|
95
|
+
Number.POSITIVE_INFINITY,
|
|
96
|
+
{
|
|
97
|
+
aB: 1,
|
|
98
|
+
},
|
|
99
|
+
]);
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
it('case 6: filter out mongo id', () => {
|
|
103
|
+
const obj = {
|
|
104
|
+
_id: '123',
|
|
105
|
+
a_b: 1,
|
|
106
|
+
collections: {
|
|
107
|
+
posts: {
|
|
108
|
+
'661bb93307d35005ba96731b': {},
|
|
109
|
+
},
|
|
110
|
+
},
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
expect(camelcaseKeys(obj)).toStrictEqual({
|
|
114
|
+
id: '123',
|
|
115
|
+
aB: 1,
|
|
116
|
+
collections: {
|
|
117
|
+
posts: {
|
|
118
|
+
'661bb93307d35005ba96731b': {},
|
|
119
|
+
},
|
|
120
|
+
},
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
it('case 7: start with underscore should not camelcase', () => {
|
|
125
|
+
expect(camelcase('_id')).toBe('id');
|
|
126
|
+
});
|
|
127
|
+
});
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
const isObject = (obj: any) => obj && typeof obj === 'object';
|
|
2
|
+
const isPlainObject = (obj: any) => isObject(obj) && Object.prototype.toString.call(obj) === '[object Object]' && Object.getPrototypeOf(obj) === Object.prototype;
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* A simple camelCase function that only handles strings, but not handling symbol, date, or other complex case.
|
|
6
|
+
* If you need to handle more complex cases, please use camelcase-keys package.
|
|
7
|
+
*/
|
|
8
|
+
export const camelcaseKeys = <T = any>(obj: any): T => {
|
|
9
|
+
if (Array.isArray(obj)) {
|
|
10
|
+
return obj.map((x) => camelcaseKeys(x)) as any;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
if (isPlainObject(obj)) {
|
|
14
|
+
return Object.keys(obj).reduce((result: any, key) => {
|
|
15
|
+
const nextKey = isMongoId(key) ? key : camelcase(key);
|
|
16
|
+
result[nextKey] = camelcaseKeys(obj[key]);
|
|
17
|
+
return result;
|
|
18
|
+
}, {}) as any;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
return obj;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export function camelcase(str: string) {
|
|
25
|
+
return str.replace(/^_+/, '').replaceAll(/([_-][a-z])/gi, ($1) => $1.toUpperCase().replace('-', '').replace('_', ''));
|
|
26
|
+
}
|
|
27
|
+
const isMongoId = (id: string) => id.length === 24 && /^[\dA-Fa-f]{24}$/.test(id);
|
package/lib/utils/ofetch.ts
CHANGED
|
@@ -3,9 +3,23 @@ import { config } from '@/config';
|
|
|
3
3
|
import logger from '@/utils/logger';
|
|
4
4
|
|
|
5
5
|
const rofetch = createFetch().create({
|
|
6
|
+
retryStatusCodes: [400, 408, 409, 425, 429, 500, 502, 503, 504],
|
|
6
7
|
retry: config.requestRetry,
|
|
7
8
|
retryDelay: 1000,
|
|
8
9
|
// timeout: config.requestTimeout,
|
|
10
|
+
onResponseError({ request, response, options }) {
|
|
11
|
+
if (options.retry) {
|
|
12
|
+
logger.warn(`Request ${request} with error ${response.status} remaining retry attempts: ${options.retry}`);
|
|
13
|
+
if (!options.headers) {
|
|
14
|
+
options.headers = {};
|
|
15
|
+
}
|
|
16
|
+
if (options.headers instanceof Headers) {
|
|
17
|
+
options.headers.set('x-prefer-proxy', '1');
|
|
18
|
+
} else {
|
|
19
|
+
options.headers['x-prefer-proxy'] = '1';
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
},
|
|
9
23
|
onRequestError({ request, error }) {
|
|
10
24
|
logger.error(`Request ${request} fail: ${error}`);
|
|
11
25
|
},
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { Resource } from '@opentelemetry/resources';
|
|
2
|
+
import { PrometheusExporter, PrometheusSerializer } from '@opentelemetry/exporter-prometheus';
|
|
3
|
+
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
|
|
4
|
+
import { MeterProvider } from '@opentelemetry/sdk-metrics';
|
|
5
|
+
import { Attributes } from '@opentelemetry/api';
|
|
6
|
+
|
|
7
|
+
interface IMetricAttributes extends Attributes {
|
|
8
|
+
method: string;
|
|
9
|
+
path: string;
|
|
10
|
+
status: number;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
interface IHistogramAttributes extends IMetricAttributes {
|
|
14
|
+
unit: string;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
const METRIC_PREFIX = 'rsshub';
|
|
18
|
+
|
|
19
|
+
const exporter = new PrometheusExporter({});
|
|
20
|
+
|
|
21
|
+
const provider = new MeterProvider({
|
|
22
|
+
resource: new Resource({
|
|
23
|
+
[SEMRESATTRS_SERVICE_NAME]: 'rsshub',
|
|
24
|
+
}),
|
|
25
|
+
readers: [exporter],
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
const serializer = new PrometheusSerializer();
|
|
29
|
+
|
|
30
|
+
const meter = provider.getMeter('rsshub');
|
|
31
|
+
|
|
32
|
+
const requestTotal = meter.createCounter<IMetricAttributes>(`${METRIC_PREFIX}_request_total`);
|
|
33
|
+
const requestErrorTotal = meter.createCounter<IMetricAttributes>(`${METRIC_PREFIX}_request_error_total`);
|
|
34
|
+
const requestDurationSecondsBucket = meter.createHistogram<IHistogramAttributes>(`${METRIC_PREFIX}_request_duration_seconds_bucket`, {
|
|
35
|
+
advice: {
|
|
36
|
+
explicitBucketBoundaries: [0.01, 0.1, 1, 2, 5, 15, 30, 60],
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
const request_duration_milliseconds_bucket = meter.createHistogram<IHistogramAttributes>(`${METRIC_PREFIX}_request_duration_milliseconds_bucket`, {
|
|
40
|
+
advice: {
|
|
41
|
+
explicitBucketBoundaries: [10, 20, 50, 100, 250, 500, 1000, 5000, 15000],
|
|
42
|
+
},
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
export const requestMetric = {
|
|
46
|
+
success: (value: number, attributes: IMetricAttributes) => {
|
|
47
|
+
requestTotal.add(1, attributes);
|
|
48
|
+
request_duration_milliseconds_bucket.record(value, { unit: 'millisecond', ...attributes });
|
|
49
|
+
requestDurationSecondsBucket.record(value / 1000, { unit: 'second', ...attributes });
|
|
50
|
+
},
|
|
51
|
+
error: (attributes: IMetricAttributes) => {
|
|
52
|
+
requestErrorTotal.add(1, attributes);
|
|
53
|
+
},
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
export const getContext = () =>
|
|
57
|
+
new Promise<string>((resolve, reject) => {
|
|
58
|
+
exporter
|
|
59
|
+
.collect()
|
|
60
|
+
.then((value) => {
|
|
61
|
+
resolve(serializer.serialize(value.resourceMetrics));
|
|
62
|
+
})
|
|
63
|
+
.finally(() => {
|
|
64
|
+
reject('');
|
|
65
|
+
});
|
|
66
|
+
});
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Resource } from '@opentelemetry/resources';
|
|
2
|
+
import { BasicTracerProvider, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
|
|
3
|
+
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
|
|
4
|
+
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
5
|
+
|
|
6
|
+
const provider = new BasicTracerProvider({
|
|
7
|
+
resource: new Resource({
|
|
8
|
+
[SEMRESATTRS_SERVICE_NAME]: 'rsshub',
|
|
9
|
+
}),
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
const exporter = new OTLPTraceExporter({
|
|
13
|
+
// optional OTEL_EXPORTER_OTLP_ENDPOINT=https://localhost:4318
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
provider.addSpanProcessor(
|
|
17
|
+
new BatchSpanProcessor(exporter, {
|
|
18
|
+
// The maximum queue size. After the size is reached spans are dropped.
|
|
19
|
+
maxQueueSize: 4096,
|
|
20
|
+
// The interval between two consecutive exports
|
|
21
|
+
scheduledDelayMillis: 30000,
|
|
22
|
+
})
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
provider.register();
|
|
26
|
+
|
|
27
|
+
export const tracer = provider.getTracer('rsshub');
|
|
28
|
+
export const mainSpan = tracer.startSpan('main');
|
|
@@ -40,8 +40,14 @@ const wrappedFetch: typeof undici.fetch = async (input: RequestInfo, init?: Requ
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
+
let isRetry = false;
|
|
44
|
+
if (request.headers.get('x-prefer-proxy')) {
|
|
45
|
+
isRetry = true;
|
|
46
|
+
request.headers.delete('x-prefer-proxy');
|
|
47
|
+
}
|
|
48
|
+
|
|
43
49
|
// proxy
|
|
44
|
-
if (!
|
|
50
|
+
if (!init?.dispatcher && proxy.dispatcher && (proxy.proxyObj.strategy !== 'on_retry' || isRetry)) {
|
|
45
51
|
const proxyRegex = new RegExp(proxy.proxyObj.url_regex);
|
|
46
52
|
let urlHandler;
|
|
47
53
|
try {
|
|
@@ -52,6 +58,7 @@ const wrappedFetch: typeof undici.fetch = async (input: RequestInfo, init?: Requ
|
|
|
52
58
|
|
|
53
59
|
if (proxyRegex.test(request.url) && request.url.startsWith('http') && !(urlHandler && urlHandler.host === proxy.proxyUrlHandler?.host)) {
|
|
54
60
|
options.dispatcher = proxy.dispatcher;
|
|
61
|
+
logger.debug(`Proxying request: ${request.url}`);
|
|
55
62
|
}
|
|
56
63
|
}
|
|
57
64
|
|
package/lib/views/atom.tsx
CHANGED
|
@@ -6,9 +6,9 @@ const RSS: FC<{ data: Data }> = ({ data }) => (
|
|
|
6
6
|
<title>{data.title || 'RSSHub'}</title>
|
|
7
7
|
<link href={data.link || 'https://docs.rsshub.app'} />
|
|
8
8
|
<id>{data.id || data.link}</id>
|
|
9
|
-
<subtitle>{data.description || data.title} -
|
|
9
|
+
<subtitle>{data.description || data.title} - Powered by RSSHub</subtitle>
|
|
10
10
|
<generator>RSSHub</generator>
|
|
11
|
-
<webMaster>
|
|
11
|
+
<webMaster>contact@rsshub.app (RSSHub)</webMaster>
|
|
12
12
|
<language>{data.language || 'en'}</language>
|
|
13
13
|
<updated>{data.lastBuildDate}</updated>
|
|
14
14
|
<author>
|
package/lib/views/error.tsx
CHANGED
|
@@ -11,13 +11,13 @@ const Index: FC<{
|
|
|
11
11
|
}> = ({ requestPath, message, errorRoute, nodeVersion }) => (
|
|
12
12
|
<Layout>
|
|
13
13
|
<div
|
|
14
|
-
className="pointer-events-none absolute w-full h-screen"
|
|
14
|
+
className="pointer-events-none absolute w-full min-h-screen"
|
|
15
15
|
style={{
|
|
16
16
|
backgroundImage: `url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHZpZXdCb3g9JzAgMCAzMiAzMicgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJyBmaWxsPSdub25lJyBzdHJva2U9J3JnYigxNSAyMyA0MiAvIDAuMDQpJz48cGF0aCBkPSdNMCAuNUgzMS41VjMyJy8+PC9zdmc+')`,
|
|
17
17
|
maskImage: 'linear-gradient(transparent, black, transparent)',
|
|
18
18
|
}}
|
|
19
19
|
></div>
|
|
20
|
-
<div className="w-full
|
|
20
|
+
<div className="w-full grow shrink-0 py-8 flex items-center justify-center flex-col space-y-4">
|
|
21
21
|
<img className="grayscale" src="/logo.png" alt="RSSHub" width="100" loading="lazy" />
|
|
22
22
|
<h1 className="text-4xl font-bold">Looks like something went wrong</h1>
|
|
23
23
|
<div className="text-left w-[800px] space-y-6 !mt-10">
|
|
@@ -104,7 +104,7 @@ const Index: FC<{
|
|
|
104
104
|
</div>
|
|
105
105
|
</div>
|
|
106
106
|
</div>
|
|
107
|
-
<div className="
|
|
107
|
+
<div className="mt-4 pb-8 text-center w-full text-sm font-medium space-y-2">
|
|
108
108
|
<p className="space-x-4">
|
|
109
109
|
<a target="_blank" href="https://github.com/DIYgod/RSSHub">
|
|
110
110
|
<img className="inline" src="https://icons.ly/github/_/fff" alt="github" width="20" height="20" />
|