rsshub 1.0.0-master.dd430d1 → 1.0.0-master.dd4a216

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.
Files changed (734) hide show
  1. package/README.md +5 -4
  2. package/lib/config.js +147 -123
  3. package/lib/middleware/cache/index.js +5 -5
  4. package/lib/middleware/cache/memory.js +7 -13
  5. package/lib/middleware/cache/redis.js +17 -2
  6. package/lib/middleware/onerror.js +8 -0
  7. package/lib/middleware/template.js +19 -6
  8. package/lib/radar-rules.js +0 -103
  9. package/lib/router.js +100 -175
  10. package/lib/routes/afdian/dynamic.js +2 -1
  11. package/lib/routes/amd/graphicsdrivers.js +1 -1
  12. package/lib/routes/disqus/posts.js +1 -1
  13. package/lib/routes/fanfou/favorites.js +1 -1
  14. package/lib/routes/fanfou/home_timeline.js +1 -1
  15. package/lib/routes/fanfou/public_timeline.js +1 -1
  16. package/lib/routes/fanfou/user_timeline.js +1 -1
  17. package/lib/routes/fdroid/apprelease.js +1 -1
  18. package/lib/routes/gov/customs/list.js +2 -2
  19. package/lib/routes/hentaimama/videos.js +1 -1
  20. package/lib/routes/hkej/index.js +2 -2
  21. package/lib/routes/instagram/utils.js +1 -1
  22. package/lib/routes/ipsw/index.js +2 -2
  23. package/lib/routes/lastfm/loved.js +1 -1
  24. package/lib/routes/lastfm/recent.js +1 -1
  25. package/lib/routes/lastfm/top.js +1 -1
  26. package/lib/routes/lizhi/user.js +1 -1
  27. package/lib/routes/manxiaosi/book.js +1 -1
  28. package/lib/routes/missevan/drama.js +1 -1
  29. package/lib/routes/missevan/latest.js +1 -1
  30. package/lib/routes/mofish/index.js +21 -9
  31. package/lib/routes/mofish/templates/description.art +4 -0
  32. package/lib/routes/ncm/djradio.js +3 -4
  33. package/lib/routes/nhentai/util.js +3 -3
  34. package/lib/routes/novel/biquge.js +24 -23
  35. package/lib/routes/novel/biqugeinfo.js +26 -26
  36. package/lib/routes/pixiv/bookmarks.js +1 -1
  37. package/lib/routes/pixiv/illustfollow.js +1 -1
  38. package/lib/routes/pixiv/ranking.js +1 -1
  39. package/lib/routes/pixiv/search.js +1 -1
  40. package/lib/routes/pixiv/user.js +1 -1
  41. package/lib/routes/prestige-av/series.js +3 -6
  42. package/lib/routes/radio/radio.js +1 -1
  43. package/lib/routes/sina/rollnews.js +8 -3
  44. package/lib/routes/telecompaper/news.js +1 -1
  45. package/lib/routes/tencent/wechat/_README +1 -0
  46. package/lib/routes/tencent/wechat/ce.js +45 -16
  47. package/lib/routes/tencent/wechat/ershcimi.js +11 -19
  48. package/lib/routes/tencent/wechat/feeds.js +8 -32
  49. package/lib/routes/tencent/wechat/mp.js +8 -26
  50. package/lib/routes/tencent/wechat/msgalbum.js +7 -25
  51. package/lib/routes/tencent/wechat/tgchannel.js +6 -20
  52. package/lib/routes/touhougarakuta/index.js +4 -2
  53. package/lib/routes/touhougarakuta/json2html.js +22 -10
  54. package/lib/routes/twitter/keyword.js +9 -4
  55. package/lib/routes/twitter/likes.js +1 -1
  56. package/lib/routes/twitter/list.js +1 -1
  57. package/lib/routes/twitter/trends.js +1 -1
  58. package/lib/routes/twitter/user.js +9 -4
  59. package/lib/routes/twitter/web-api/media.js +5 -2
  60. package/lib/routes/twitter/web-api/twitter-api.js +105 -20
  61. package/lib/routes/twitter/web-api/twitter-got.js +4 -0
  62. package/lib/routes/twitter/web-api/user.js +5 -4
  63. package/lib/routes/universities/hitwh/today.js +6 -6
  64. package/lib/routes/weibo/keyword.js +18 -10
  65. package/lib/routes/weibo/super_index.js +24 -15
  66. package/lib/routes/weibo/timeline.js +38 -19
  67. package/lib/routes/weibo/user.js +47 -21
  68. package/lib/routes/weibo/utils.js +81 -12
  69. package/lib/routes/ximalaya/album.js +2 -2
  70. package/lib/routes/youtube/channel.js +1 -1
  71. package/lib/routes/youtube/playlist.js +1 -1
  72. package/lib/routes/youtube/user.js +1 -1
  73. package/lib/routes/yyets/todayfilelist.js +0 -1
  74. package/lib/routes/zcool/top.js +3 -3
  75. package/lib/routes/zhihu/activities.js +1 -0
  76. package/lib/routes/zhihu/daily.js +1 -0
  77. package/lib/routes/zhihu/daily_section.js +1 -0
  78. package/lib/routes/zhihu/hot.js +3 -2
  79. package/lib/utils/common-config.js +4 -0
  80. package/lib/utils/common-utils.js +26 -0
  81. package/lib/utils/parse-date.js +172 -17
  82. package/lib/utils/puppeteer.js +1 -1
  83. package/lib/utils/rand-user-agent.js +29 -0
  84. package/lib/utils/request-wrapper.js +2 -5
  85. package/lib/utils/torrent.js +9 -1
  86. package/lib/utils/wechat-mp.js +261 -0
  87. package/lib/v2/35photo/actual.js +7 -0
  88. package/lib/v2/35photo/author.js +9 -0
  89. package/lib/v2/35photo/genre.js +9 -0
  90. package/lib/v2/35photo/interesting.js +7 -0
  91. package/lib/v2/35photo/maintainer.js +8 -0
  92. package/lib/v2/35photo/map.js +7 -0
  93. package/lib/v2/35photo/new.js +7 -0
  94. package/lib/v2/35photo/radar.js +43 -0
  95. package/lib/v2/35photo/router.js +8 -0
  96. package/lib/v2/35photo/utils.js +42 -0
  97. package/lib/{routes → v2}/95mm/category.js +5 -3
  98. package/lib/v2/95mm/maintainer.js +5 -0
  99. package/lib/v2/95mm/radar.js +25 -0
  100. package/lib/v2/95mm/router.js +5 -0
  101. package/lib/v2/95mm/tab.js +9 -0
  102. package/lib/v2/95mm/tag.js +9 -0
  103. package/lib/v2/95mm/templates/description.art +3 -0
  104. package/lib/v2/95mm/utils.js +59 -0
  105. package/lib/v2/agirls/index.js +8 -2
  106. package/lib/v2/agirls/topic.js +2 -2
  107. package/lib/v2/agirls/topic_list.js +1 -1
  108. package/lib/v2/ajmide/index.js +1 -1
  109. package/lib/v2/app-center/templates/description.art +1 -1
  110. package/lib/v2/asus/bios.js +38 -0
  111. package/lib/v2/asus/maintainer.js +3 -0
  112. package/lib/v2/asus/radar.js +13 -0
  113. package/lib/v2/asus/router.js +3 -0
  114. package/lib/v2/asus/templates/bios.art +6 -0
  115. package/lib/v2/bbcnewslabs/maintainer.js +3 -0
  116. package/lib/v2/bbcnewslabs/news.js +32 -0
  117. package/lib/v2/bbcnewslabs/radar.js +13 -0
  118. package/lib/v2/bbcnewslabs/router.js +3 -0
  119. package/lib/v2/bigquant/collections.js +35 -0
  120. package/lib/v2/bigquant/maintainer.js +3 -0
  121. package/lib/v2/bigquant/radar.js +13 -0
  122. package/lib/v2/bigquant/router.js +3 -0
  123. package/lib/{routes → v2}/bilibili/app.js +0 -0
  124. package/lib/{routes → v2}/bilibili/article.js +1 -0
  125. package/lib/{routes → v2}/bilibili/audio.js +0 -0
  126. package/lib/{routes → v2}/bilibili/bangumi.js +0 -0
  127. package/lib/{routes → v2}/bilibili/blackboard.js +0 -0
  128. package/lib/{routes → v2}/bilibili/cache.js +17 -0
  129. package/lib/{routes → v2}/bilibili/coin.js +0 -0
  130. package/lib/{routes → v2}/bilibili/danmaku.js +0 -0
  131. package/lib/{routes → v2}/bilibili/dynamic.js +1 -0
  132. package/lib/{routes → v2}/bilibili/fav.js +0 -0
  133. package/lib/{routes → v2}/bilibili/followers.js +0 -0
  134. package/lib/{routes → v2}/bilibili/followings.js +0 -0
  135. package/lib/{routes → v2}/bilibili/followings_article.js +0 -0
  136. package/lib/{routes → v2}/bilibili/followings_dynamic.js +0 -0
  137. package/lib/{routes → v2}/bilibili/followings_video.js +0 -0
  138. package/lib/{routes → v2}/bilibili/linkNews.js +0 -0
  139. package/lib/{routes → v2}/bilibili/liveArea.js +2 -12
  140. package/lib/{routes → v2}/bilibili/liveRoom.js +0 -0
  141. package/lib/{routes → v2}/bilibili/liveSearch.js +0 -0
  142. package/lib/{routes → v2}/bilibili/mallIP.js +0 -0
  143. package/lib/{routes → v2}/bilibili/mallNew.js +0 -0
  144. package/lib/{routes → v2}/bilibili/manga_followings.js +0 -0
  145. package/lib/{routes → v2}/bilibili/manga_update.js +0 -0
  146. package/lib/v2/bilibili/online.js +25 -0
  147. package/lib/{routes → v2}/bilibili/page.js +0 -0
  148. package/lib/{routes → v2}/bilibili/partion-ranking.js +0 -0
  149. package/lib/{routes → v2}/bilibili/partion.js +0 -0
  150. package/lib/v2/bilibili/radar.js +6 -0
  151. package/lib/{routes → v2}/bilibili/ranking.js +0 -0
  152. package/lib/{routes → v2}/bilibili/readlist.js +0 -0
  153. package/lib/{routes → v2}/bilibili/reply.js +0 -0
  154. package/lib/v2/bilibili/router.js +39 -0
  155. package/lib/{routes → v2}/bilibili/topic.js +0 -0
  156. package/lib/{routes → v2}/bilibili/userChannel.js +0 -0
  157. package/lib/{routes → v2}/bilibili/userFav.js +0 -0
  158. package/lib/{routes → v2}/bilibili/user_bangumi.js +0 -0
  159. package/lib/{routes → v2}/bilibili/utils.js +0 -0
  160. package/lib/{routes → v2}/bilibili/video.js +4 -1
  161. package/lib/{routes → v2}/bilibili/vsearch.js +0 -0
  162. package/lib/{routes → v2}/bilibili/weekly_recommend.js +0 -0
  163. package/lib/v2/bitbucket/commits.js +40 -0
  164. package/lib/v2/bitbucket/maintainer.js +4 -0
  165. package/lib/v2/bitbucket/radar.js +19 -0
  166. package/lib/v2/bitbucket/router.js +4 -0
  167. package/lib/v2/bitbucket/tags.js +40 -0
  168. package/lib/v2/bitmovin/blog.js +33 -0
  169. package/lib/v2/bitmovin/maintainer.js +3 -0
  170. package/lib/v2/bitmovin/radar.js +13 -0
  171. package/lib/v2/bitmovin/router.js +3 -0
  172. package/lib/v2/bookfere/category.js +36 -0
  173. package/lib/v2/bookfere/maintainer.js +3 -0
  174. package/lib/v2/bookfere/radar.js +11 -0
  175. package/lib/v2/bookfere/router.js +3 -0
  176. package/lib/v2/brooklynmuseum/exhibitions.js +27 -0
  177. package/lib/v2/brooklynmuseum/maintainer.js +3 -0
  178. package/lib/v2/brooklynmuseum/radar.js +11 -0
  179. package/lib/v2/brooklynmuseum/router.js +3 -0
  180. package/lib/v2/cankaoxiaoxi/index.js +81 -0
  181. package/lib/v2/cankaoxiaoxi/maintainer.js +3 -0
  182. package/lib/v2/cankaoxiaoxi/radar.js +61 -0
  183. package/lib/v2/cankaoxiaoxi/router.js +3 -0
  184. package/lib/v2/cbirc/index.js +1 -1
  185. package/lib/{routes → v2}/cctv/category.js +1 -1
  186. package/lib/{routes → v2}/cctv/jx.js +6 -1
  187. package/lib/{routes → v2}/cctv/lm.js +1 -1
  188. package/lib/v2/cctv/maintainer.js +7 -0
  189. package/lib/v2/cctv/radar.js +41 -0
  190. package/lib/v2/cctv/router.js +7 -0
  191. package/lib/{routes → v2}/cctv/special.js +6 -4
  192. package/lib/{routes → v2}/cctv/utils/mzzlbg.js +8 -6
  193. package/lib/{routes → v2}/cctv/utils/news.js +25 -22
  194. package/lib/{routes → v2}/cctv/utils/xinwen1j1.js +20 -17
  195. package/lib/v2/cctv/xwlb.js +50 -0
  196. package/lib/{routes → v2}/chaping/banner.js +2 -1
  197. package/lib/v2/chaping/maintainer.js +5 -0
  198. package/lib/{routes → v2}/chaping/news.js +3 -2
  199. package/lib/v2/chaping/newsflash.js +23 -0
  200. package/lib/v2/chaping/radar.js +31 -0
  201. package/lib/v2/chaping/router.js +5 -0
  202. package/lib/v2/chinacef/experts.js +38 -0
  203. package/lib/v2/chinacef/hot.js +38 -0
  204. package/lib/v2/chinacef/index.js +39 -0
  205. package/lib/v2/chinacef/maintainer.js +5 -0
  206. package/lib/v2/chinacef/radar.js +25 -0
  207. package/lib/v2/chinacef/router.js +5 -0
  208. package/lib/v2/{wechat → chinacef}/templates/description.art +0 -0
  209. package/lib/v2/chinacef/utils.js +55 -0
  210. package/lib/v2/cnbeta/index.js +2 -1
  211. package/lib/v2/cnbeta/utils.js +1 -0
  212. package/lib/v2/dapenti/maintainer.js +4 -0
  213. package/lib/v2/dapenti/radar.js +27 -0
  214. package/lib/v2/dapenti/router.js +4 -0
  215. package/lib/{routes → v2}/dapenti/subject.js +1 -1
  216. package/lib/{routes → v2}/dapenti/tugua.js +1 -1
  217. package/lib/v2/dapenti/utils.js +75 -0
  218. package/lib/v2/dayanzai/index.js +58 -0
  219. package/lib/v2/dayanzai/maintainer.js +3 -0
  220. package/lib/v2/dayanzai/radar.js +13 -0
  221. package/lib/v2/dayanzai/router.js +3 -0
  222. package/lib/v2/dbmv/index.js +64 -0
  223. package/lib/v2/dbmv/maintainer.js +3 -0
  224. package/lib/v2/dbmv/radar.js +13 -0
  225. package/lib/v2/dbmv/router.js +3 -0
  226. package/lib/{routes → v2}/dongqiudi/daily.js +10 -13
  227. package/lib/v2/dongqiudi/maintainer.js +8 -0
  228. package/lib/{routes → v2}/dongqiudi/player_news.js +0 -0
  229. package/lib/v2/dongqiudi/radar.js +45 -0
  230. package/lib/{routes → v2}/dongqiudi/result.js +2 -1
  231. package/lib/v2/dongqiudi/router.js +8 -0
  232. package/lib/{routes → v2}/dongqiudi/special.js +0 -0
  233. package/lib/{routes → v2}/dongqiudi/team_news.js +0 -0
  234. package/lib/{routes → v2}/dongqiudi/top_news.js +12 -15
  235. package/lib/{routes → v2}/dongqiudi/utils.js +47 -28
  236. package/lib/v2/douban/people/status.js +10 -2
  237. package/lib/v2/douban/people/wish.js +55 -43
  238. package/lib/v2/dut/defaults.js +53 -0
  239. package/lib/v2/dut/index.js +78 -0
  240. package/lib/v2/dut/maintainer.js +14 -0
  241. package/lib/v2/dut/radar.js +109 -0
  242. package/lib/v2/dut/router.js +4 -0
  243. package/lib/v2/dut/shortcuts.js +77 -0
  244. package/lib/v2/eagle/blog.js +47 -0
  245. package/lib/{routes → v2}/eagle/changelog.js +3 -1
  246. package/lib/v2/eagle/maintainer.js +4 -0
  247. package/lib/v2/eagle/radar.js +101 -0
  248. package/lib/v2/eagle/router.js +4 -0
  249. package/lib/v2/eprice/rss.js +4 -2
  250. package/lib/v2/ff14/ff14_global.js +1 -1
  251. package/lib/v2/firefox/index.js +10 -5
  252. package/lib/v2/flyert/preferential.js +29 -14
  253. package/lib/v2/foresightnews/index.js +88 -0
  254. package/lib/v2/foresightnews/maintainer.js +6 -0
  255. package/lib/v2/foresightnews/radar.js +31 -0
  256. package/lib/v2/foresightnews/router.js +3 -0
  257. package/lib/v2/fortunechina/index.js +3 -3
  258. package/lib/{routes → v2}/gamer/gnn_index.js +6 -7
  259. package/lib/v2/gamer/hot.js +1 -1
  260. package/lib/v2/gamer/maintainer.js +1 -0
  261. package/lib/v2/gamer/radar.js +16 -0
  262. package/lib/v2/gamer/router.js +1 -0
  263. package/lib/v2/gaze/maintainer.js +3 -0
  264. package/lib/v2/gaze/radar.js +13 -0
  265. package/lib/v2/gaze/router.js +3 -0
  266. package/lib/v2/gaze/templates/update.art +4 -0
  267. package/lib/v2/gaze/update.js +27 -0
  268. package/lib/v2/gcores/category.js +126 -0
  269. package/lib/v2/gcores/maintainer.js +4 -0
  270. package/lib/v2/gcores/radar.js +19 -0
  271. package/lib/v2/gcores/router.js +4 -0
  272. package/lib/v2/gcores/tag.js +126 -0
  273. package/lib/v2/github/comments.js +102 -37
  274. package/lib/v2/github/follower.js +1 -1
  275. package/lib/v2/github/issue.js +6 -2
  276. package/lib/v2/github/maintainer.js +1 -1
  277. package/lib/v2/github/pulls.js +8 -4
  278. package/lib/v2/github/radar.js +1 -1
  279. package/lib/v2/github/router.js +3 -2
  280. package/lib/v2/github/star.js +1 -1
  281. package/lib/v2/github/starred_repos.js +1 -1
  282. package/lib/v2/gitpod/blog.js +60 -0
  283. package/lib/v2/gitpod/changelog.js +35 -0
  284. package/lib/v2/gitpod/maintainer.js +4 -0
  285. package/lib/v2/gitpod/radar.js +19 -0
  286. package/lib/v2/gitpod/router.js +4 -0
  287. package/lib/v2/gitpod/templates/description.art +2 -0
  288. package/lib/v2/gitpod/utils.js +3 -0
  289. package/lib/v2/google/maintainer.js +1 -0
  290. package/lib/v2/google/router.js +1 -0
  291. package/lib/v2/google/sitesRecentChanges.js +52 -0
  292. package/lib/v2/gov/anhui/kjt.js +56 -0
  293. package/lib/v2/gov/maintainer.js +15 -1
  294. package/lib/v2/gov/mee/ywdt.js +80 -0
  295. package/lib/v2/gov/mfa/wjdt.js +67 -0
  296. package/lib/v2/gov/miit/wjfb.js +61 -0
  297. package/lib/{routes → v2}/gov/miit/wjgs.js +0 -0
  298. package/lib/v2/gov/miit/yjzj.js +59 -0
  299. package/lib/{routes → v2}/gov/miit/zcjd.js +0 -0
  300. package/lib/{routes → v2}/gov/miit/zcwj.js +0 -0
  301. package/lib/v2/gov/nrta/news.js +63 -0
  302. package/lib/{routes → v2/gov}/pbc/goutongjiaoliu.js +5 -4
  303. package/lib/v2/gov/pbc/gzlw.js +27 -0
  304. package/lib/{routes → v2/gov}/pbc/tradeAnnouncement.js +5 -4
  305. package/lib/v2/gov/pbc/utils.js +20 -0
  306. package/lib/v2/gov/pbc/zcyj.js +29 -0
  307. package/lib/v2/gov/radar.js +150 -57
  308. package/lib/v2/gov/router.js +15 -1
  309. package/lib/v2/gov/sichuan/deyang/govpulicinfo.js +54 -74
  310. package/lib/v2/gov/sichuan/deyang/templates/govPublicInfo.art +1 -0
  311. package/lib/{routes → v2}/guancha/headline.js +11 -8
  312. package/lib/{routes → v2}/guancha/index.js +56 -29
  313. package/lib/v2/guancha/maintainer.js +7 -0
  314. package/lib/{routes → v2}/guancha/member.js +30 -15
  315. package/lib/{routes → v2}/guancha/personalpage.js +0 -0
  316. package/lib/v2/guancha/radar.js +49 -0
  317. package/lib/v2/guancha/router.js +7 -0
  318. package/lib/{routes → v2}/guancha/topic.js +14 -13
  319. package/lib/v2/guangdiu/cheaps.js +28 -0
  320. package/lib/v2/guangdiu/index.js +44 -0
  321. package/lib/v2/guangdiu/maintainer.js +5 -0
  322. package/lib/v2/guangdiu/radar.js +25 -0
  323. package/lib/v2/guangdiu/rank.js +38 -0
  324. package/lib/v2/guangdiu/router.js +5 -0
  325. package/lib/v2/guggenheim/exhibitions.js +29 -0
  326. package/lib/v2/guggenheim/maintainer.js +3 -0
  327. package/lib/v2/guggenheim/radar.js +11 -0
  328. package/lib/v2/guggenheim/router.js +3 -0
  329. package/lib/{routes/guokr/calendar.js → v2/guokr/channel.js} +2 -2
  330. package/lib/v2/guokr/maintainer.js +4 -0
  331. package/lib/v2/guokr/radar.js +19 -0
  332. package/lib/v2/guokr/router.js +4 -0
  333. package/lib/{routes → v2}/guokr/scientific.js +3 -3
  334. package/lib/v2/gzh360/_README +1 -0
  335. package/lib/v2/gzh360/category.js +8 -0
  336. package/lib/v2/gzh360/gzh.js +18 -0
  337. package/lib/v2/gzh360/maintainer.js +4 -0
  338. package/lib/v2/gzh360/radar.js +19 -0
  339. package/lib/v2/gzh360/router.js +4 -0
  340. package/lib/v2/gzh360/universal.js +53 -0
  341. package/lib/v2/gzh360/utils.js +62 -0
  342. package/lib/v2/hameln/chapter.js +59 -0
  343. package/lib/v2/hameln/maintainer.js +3 -0
  344. package/lib/v2/hameln/radar.js +13 -0
  345. package/lib/v2/hameln/router.js +1 -0
  346. package/lib/v2/hdu/cs/index.js +57 -0
  347. package/lib/v2/hdu/maintainer.js +3 -0
  348. package/lib/v2/hdu/radar.js +13 -0
  349. package/lib/v2/hdu/router.js +4 -0
  350. package/lib/v2/hellobtc/information.js +51 -0
  351. package/lib/v2/hellobtc/kepu.js +64 -0
  352. package/lib/v2/hellobtc/maintainer.js +6 -0
  353. package/lib/v2/hellobtc/news.js +29 -0
  354. package/lib/v2/hellobtc/radar.js +85 -0
  355. package/lib/v2/hellobtc/router.js +6 -0
  356. package/lib/v2/hellobtc/topic.js +43 -0
  357. package/lib/v2/hellogithub/article.js +47 -0
  358. package/lib/v2/hellogithub/maintainer.js +5 -0
  359. package/lib/v2/hellogithub/month.js +42 -0
  360. package/lib/v2/hellogithub/radar.js +25 -0
  361. package/lib/v2/hellogithub/ranking.js +39 -0
  362. package/lib/v2/hellogithub/router.js +5 -0
  363. package/lib/v2/hkej/index.js +11 -17
  364. package/lib/v2/hkepc/index.js +8 -0
  365. package/lib/v2/hket/index.js +12 -4
  366. package/lib/v2/hnrb/index.js +85 -0
  367. package/lib/v2/hnrb/maintainer.js +3 -0
  368. package/lib/v2/hnrb/radar.js +13 -0
  369. package/lib/v2/hnrb/router.js +3 -0
  370. package/lib/v2/huangz/index.js +29 -0
  371. package/lib/v2/huangz/maintainer.js +3 -0
  372. package/lib/v2/huangz/radar.js +13 -0
  373. package/lib/v2/huangz/router.js +3 -0
  374. package/lib/v2/huanqiu/index.js +65 -0
  375. package/lib/v2/huanqiu/maintainer.js +3 -0
  376. package/lib/v2/huanqiu/radar.js +13 -0
  377. package/lib/v2/huanqiu/router.js +3 -0
  378. package/lib/v2/hupu/all.js +73 -0
  379. package/lib/v2/hupu/bbs.js +64 -0
  380. package/lib/v2/hupu/index.js +72 -0
  381. package/lib/v2/hupu/maintainer.js +7 -0
  382. package/lib/v2/hupu/radar.js +35 -0
  383. package/lib/v2/hupu/router.js +7 -0
  384. package/lib/v2/hupu/templates/description.art +6 -0
  385. package/lib/v2/hyqss/index.js +89 -0
  386. package/lib/v2/hyqss/maintainer.js +4 -0
  387. package/lib/v2/hyqss/radar.js +22 -0
  388. package/lib/v2/hyqss/router.js +3 -0
  389. package/lib/v2/ielts/index.js +58 -0
  390. package/lib/v2/ielts/maintainer.js +3 -0
  391. package/lib/v2/ielts/radar.js +13 -0
  392. package/lib/v2/ielts/router.js +3 -0
  393. package/lib/{routes → v2}/ifeng/feng.js +7 -5
  394. package/lib/v2/ifeng/maintainer.js +3 -0
  395. package/lib/v2/ifeng/radar.js +11 -0
  396. package/lib/v2/ifeng/router.js +3 -0
  397. package/lib/{routes → v2}/ifeng/utils.js +0 -0
  398. package/lib/v2/ithome/index.js +1 -0
  399. package/lib/v2/ixigua/maintainer.js +3 -0
  400. package/lib/v2/ixigua/radar.js +13 -0
  401. package/lib/v2/ixigua/router.js +3 -0
  402. package/lib/v2/ixigua/templates/userVideo.art +5 -0
  403. package/lib/v2/ixigua/userVideo.js +40 -0
  404. package/lib/v2/javbus/index.js +153 -0
  405. package/lib/v2/javbus/maintainer.js +2 -0
  406. package/lib/v2/javbus/radar.js +79 -65
  407. package/lib/v2/javbus/router.js +1 -14
  408. package/lib/v2/javbus/templates/description.art +18 -0
  409. package/lib/v2/jewishmuseum/exhibitions.js +16 -0
  410. package/lib/v2/jewishmuseum/maintainer.js +3 -0
  411. package/lib/v2/jewishmuseum/radar.js +11 -0
  412. package/lib/v2/jewishmuseum/router.js +3 -0
  413. package/lib/v2/kakuyomu/episode.js +54 -0
  414. package/lib/v2/kakuyomu/maintainer.js +3 -0
  415. package/lib/v2/kakuyomu/radar.js +13 -0
  416. package/lib/v2/kakuyomu/router.js +1 -0
  417. package/lib/v2/kyodonews/index.js +123 -0
  418. package/lib/v2/kyodonews/maintainer.js +3 -0
  419. package/lib/v2/kyodonews/radar.js +33 -0
  420. package/lib/v2/kyodonews/router.js +3 -0
  421. package/lib/v2/kyodonews/templates/article.art +4 -0
  422. package/lib/v2/liulinblog/itnews.js +23 -0
  423. package/lib/v2/liulinblog/kuaixun.js +17 -0
  424. package/lib/v2/liulinblog/maintainer.js +4 -0
  425. package/lib/v2/liulinblog/radar.js +33 -0
  426. package/lib/v2/liulinblog/router.js +4 -0
  427. package/lib/v2/liulinblog/utils.js +39 -0
  428. package/lib/v2/mcachicago/exhibitions.js +17 -0
  429. package/lib/v2/mcachicago/maintainer.js +3 -0
  430. package/lib/v2/mcachicago/radar.js +11 -0
  431. package/lib/v2/mcachicago/router.js +3 -0
  432. package/lib/v2/metmuseum/exhibitions.js +31 -0
  433. package/lib/v2/metmuseum/maintainer.js +3 -0
  434. package/lib/v2/metmuseum/radar.js +11 -0
  435. package/lib/v2/metmuseum/router.js +3 -0
  436. package/lib/v2/mihoyo/bbs.js +62 -0
  437. package/lib/v2/mihoyo/maintainer.js +3 -0
  438. package/lib/v2/mihoyo/radar.js +31 -0
  439. package/lib/v2/mihoyo/router.js +3 -0
  440. package/lib/v2/mihoyo/templates/description.art +6 -0
  441. package/lib/v2/miris/blog.js +19 -0
  442. package/lib/v2/miris/maintainer.js +3 -0
  443. package/lib/v2/miris/radar.js +11 -0
  444. package/lib/v2/miris/router.js +3 -0
  445. package/lib/{routes → v2}/mpaypass/main.js +23 -27
  446. package/lib/v2/mpaypass/maintainer.js +4 -0
  447. package/lib/v2/mpaypass/news.js +39 -0
  448. package/lib/v2/mpaypass/radar.js +19 -0
  449. package/lib/v2/mpaypass/router.js +4 -0
  450. package/lib/v2/mtime/maintainer.js +3 -0
  451. package/lib/v2/mtime/news.js +48 -0
  452. package/lib/v2/mtime/radar.js +13 -0
  453. package/lib/v2/mtime/router.js +3 -0
  454. package/lib/v2/natgeo/dailyphoto.js +32 -0
  455. package/lib/v2/natgeo/dailyselection.js +41 -0
  456. package/lib/v2/natgeo/maintainer.js +5 -0
  457. package/lib/{routes → v2}/natgeo/natgeo.js +18 -32
  458. package/lib/v2/natgeo/radar.js +24 -0
  459. package/lib/v2/natgeo/router.js +5 -0
  460. package/lib/v2/natgeo/templates/dailyPhoto.art +5 -0
  461. package/lib/v2/newmuseum/exhibitions.js +27 -0
  462. package/lib/v2/newmuseum/maintainer.js +3 -0
  463. package/lib/v2/newmuseum/radar.js +11 -0
  464. package/lib/v2/newmuseum/router.js +3 -0
  465. package/lib/v2/news/whxw.js +2 -2
  466. package/lib/v2/nikkei-cn/index.js +10 -5
  467. package/lib/v2/njupt/jwc.js +90 -0
  468. package/lib/v2/njupt/maintainer.js +3 -0
  469. package/lib/v2/njupt/radar.js +20 -0
  470. package/lib/v2/njupt/router.js +3 -0
  471. package/lib/v2/npm/maintainer.js +3 -0
  472. package/lib/v2/npm/package.js +45 -0
  473. package/lib/v2/npm/radar.js +13 -0
  474. package/lib/v2/npm/router.js +3 -0
  475. package/lib/v2/npm/templates/package.art +10 -0
  476. package/lib/v2/ntdtv/channel.js +44 -0
  477. package/lib/v2/ntdtv/maintainer.js +3 -0
  478. package/lib/v2/ntdtv/radar.js +13 -0
  479. package/lib/v2/ntdtv/router.js +3 -0
  480. package/lib/v2/nuaa/cs/index.js +87 -0
  481. package/lib/v2/nuaa/jwc/jwc.js +82 -0
  482. package/lib/v2/nuaa/maintainer.js +5 -0
  483. package/lib/v2/nuaa/radar.js +23 -0
  484. package/lib/v2/nuaa/router.js +5 -0
  485. package/lib/{routes/universities → v2}/nuaa/utils/pypasswaf.js +1 -1
  486. package/lib/{routes/universities → v2}/nuaa/yjsy/yjsy.js +16 -22
  487. package/lib/v2/nytimes/author.js +43 -0
  488. package/lib/{routes → v2}/nytimes/book.js +1 -1
  489. package/lib/{routes → v2}/nytimes/daily_briefing_chinese.js +0 -0
  490. package/lib/{routes → v2}/nytimes/index.js +3 -4
  491. package/lib/v2/nytimes/maintainer.js +6 -0
  492. package/lib/v2/nytimes/radar.js +31 -0
  493. package/lib/v2/nytimes/router.js +6 -0
  494. package/lib/{routes → v2}/nytimes/utils.js +0 -0
  495. package/lib/v2/odaily/post.js +10 -8
  496. package/lib/v2/picuki/maintainer.js +3 -0
  497. package/lib/v2/picuki/profile.js +176 -0
  498. package/lib/v2/picuki/radar.js +13 -0
  499. package/lib/v2/picuki/router.js +3 -0
  500. package/lib/v2/picuki/templates/post.art +7 -0
  501. package/lib/v2/pubmed/maintainer.js +3 -0
  502. package/lib/v2/pubmed/radar.js +13 -0
  503. package/lib/v2/pubmed/router.js +3 -0
  504. package/lib/v2/pubmed/templates/description.art +7 -0
  505. package/lib/v2/pubmed/trending.js +58 -0
  506. package/lib/v2/qbittorrent/maintainer.js +3 -0
  507. package/lib/v2/qbittorrent/news.js +59 -0
  508. package/lib/v2/qbittorrent/radar.js +13 -0
  509. package/lib/v2/qbittorrent/router.js +3 -0
  510. package/lib/v2/quicker/maintainer.js +7 -0
  511. package/lib/v2/quicker/qa.js +65 -0
  512. package/lib/v2/quicker/radar.js +31 -0
  513. package/lib/v2/quicker/router.js +7 -0
  514. package/lib/v2/quicker/share.js +61 -0
  515. package/lib/v2/quicker/user.js +62 -0
  516. package/lib/v2/quicker/versions.js +36 -0
  517. package/lib/v2/qweather/3days.js +46 -0
  518. package/lib/v2/qweather/maintainer.js +4 -0
  519. package/lib/v2/qweather/now.js +46 -0
  520. package/lib/v2/qweather/router.js +4 -0
  521. package/lib/v2/qweather/util/3days.art +20 -0
  522. package/lib/v2/qweather/util/now.art +16 -0
  523. package/lib/v2/readhub/index.js +16 -4
  524. package/lib/v2/readhub/maintainer.js +1 -1
  525. package/lib/v2/readhub/radar.js +2 -2
  526. package/lib/v2/readhub/router.js +2 -2
  527. package/lib/{routes → v2}/rfa/index.js +11 -6
  528. package/lib/v2/rfa/maintainer.js +3 -0
  529. package/lib/v2/rfa/radar.js +13 -0
  530. package/lib/v2/rfa/router.js +3 -0
  531. package/lib/v2/rsshub/sponsors.js +1 -0
  532. package/lib/{routes → v2}/sciencenet/blog.js +17 -12
  533. package/lib/v2/sciencenet/maintainer.js +4 -0
  534. package/lib/v2/sciencenet/radar.js +19 -0
  535. package/lib/v2/sciencenet/router.js +4 -0
  536. package/lib/v2/sciencenet/user.js +65 -0
  537. package/lib/v2/sdu/cmse.js +59 -0
  538. package/lib/v2/sdu/cs.js +57 -0
  539. package/lib/v2/sdu/data.js +110 -0
  540. package/lib/v2/sdu/epe.js +55 -0
  541. package/lib/v2/sdu/extractor/index.js +15 -0
  542. package/lib/v2/sdu/extractor/sdrj.js +21 -0
  543. package/lib/v2/sdu/extractor/view.js +21 -0
  544. package/lib/v2/sdu/extractor/wh/jwc.js +24 -0
  545. package/lib/v2/sdu/extractor/wh/news.js +21 -0
  546. package/lib/v2/sdu/maintainer.js +9 -0
  547. package/lib/v2/sdu/mech.js +60 -0
  548. package/lib/v2/sdu/radar.js +159 -0
  549. package/lib/v2/sdu/router.js +9 -0
  550. package/lib/v2/sdu/sc.js +61 -0
  551. package/lib/v2/sdu/wh/jwc.js +42 -0
  552. package/lib/v2/sdu/wh/news.js +38 -0
  553. package/lib/v2/segmentfault/channel.js +46 -0
  554. package/lib/v2/segmentfault/maintainer.js +4 -0
  555. package/lib/v2/segmentfault/radar.js +19 -0
  556. package/lib/v2/segmentfault/router.js +4 -0
  557. package/lib/v2/segmentfault/user.js +43 -0
  558. package/lib/v2/sohu/maintainer.js +3 -0
  559. package/lib/{routes → v2}/sohu/mp.js +9 -8
  560. package/lib/v2/sohu/radar.js +13 -0
  561. package/lib/v2/sohu/router.js +3 -0
  562. package/lib/v2/soundofhope/channel.js +42 -0
  563. package/lib/v2/soundofhope/maintainer.js +3 -0
  564. package/lib/v2/soundofhope/radar.js +13 -0
  565. package/lib/v2/soundofhope/router.js +3 -0
  566. package/lib/v2/sputniknews/index.js +93 -0
  567. package/lib/v2/sputniknews/maintainer.js +3 -0
  568. package/lib/v2/sputniknews/radar.js +13 -0
  569. package/lib/v2/sputniknews/router.js +3 -0
  570. package/lib/v2/stratechery/index.js +20 -0
  571. package/lib/v2/stratechery/maintainer.js +3 -0
  572. package/lib/v2/stratechery/radar.js +11 -0
  573. package/lib/v2/stratechery/router.js +3 -0
  574. package/lib/{routes → v2}/taptap/changelog.js +2 -1
  575. package/lib/v2/taptap/maintainer.js +5 -0
  576. package/lib/v2/taptap/radar.js +25 -0
  577. package/lib/v2/taptap/review.js +69 -0
  578. package/lib/v2/taptap/router.js +5 -0
  579. package/lib/v2/taptap/templates/videoPost.art +2 -0
  580. package/lib/v2/taptap/topic.js +79 -0
  581. package/lib/v2/taptap/utils.js +48 -0
  582. package/lib/v2/telegram/channel.js +450 -112
  583. package/lib/v2/telegram/maintainer.js +1 -1
  584. package/lib/v2/telegram/router.js +1 -1
  585. package/lib/v2/telegram/stickerpack.js +1 -1
  586. package/lib/v2/telegram/templates/video.art +3 -1
  587. package/lib/v2/test/index.js +2 -1
  588. package/lib/{routes → v2}/thepaper/839studio/category.js +0 -0
  589. package/lib/{routes → v2}/thepaper/839studio/studio.js +0 -0
  590. package/lib/{routes → v2}/thepaper/channel.js +0 -0
  591. package/lib/v2/thepaper/factpaper.js +61 -0
  592. package/lib/{routes → v2}/thepaper/featured.js +0 -0
  593. package/lib/{routes → v2}/thepaper/list.js +0 -0
  594. package/lib/v2/thepaper/maintainer.js +8 -0
  595. package/lib/v2/thepaper/radar.js +42 -0
  596. package/lib/v2/thepaper/router.js +8 -0
  597. package/lib/v2/thepaper/templates/factpaper.art +12 -0
  598. package/lib/v2/thepaper/utils.js +55 -0
  599. package/lib/v2/tokeninsight/blog.js +52 -0
  600. package/lib/v2/tokeninsight/bulletin.js +44 -0
  601. package/lib/v2/tokeninsight/maintainer.js +5 -0
  602. package/lib/v2/tokeninsight/radar.js +25 -0
  603. package/lib/v2/tokeninsight/report.js +52 -0
  604. package/lib/v2/tokeninsight/router.js +5 -0
  605. package/lib/{routes → v2}/twreporter/category.js +7 -12
  606. package/lib/{routes → v2}/twreporter/fetch_article.js +5 -4
  607. package/lib/v2/twreporter/maintainer.js +5 -0
  608. package/lib/{routes → v2}/twreporter/newest.js +8 -13
  609. package/lib/v2/twreporter/photography.js +46 -0
  610. package/lib/v2/twreporter/radar.js +25 -0
  611. package/lib/v2/twreporter/router.js +5 -0
  612. package/lib/v2/txrjy/fornumtopic.js +72 -0
  613. package/lib/v2/txrjy/maintainer.js +3 -0
  614. package/lib/v2/txrjy/radar.js +17 -0
  615. package/lib/v2/txrjy/router.js +3 -0
  616. package/lib/v2/txrjy/templates/fornumtopic.art +6 -0
  617. package/lib/v2/wallstreetcn/live.js +18 -15
  618. package/lib/v2/wallstreetcn/router.js +1 -1
  619. package/lib/v2/wechat/_README +1 -0
  620. package/lib/v2/wechat/data258.js +137 -0
  621. package/lib/v2/wechat/feeddd.js +3 -46
  622. package/lib/v2/wechat/maintainer.js +1 -0
  623. package/lib/v2/wechat/radar.js +11 -0
  624. package/lib/v2/wechat/router.js +1 -0
  625. package/lib/v2/whitehouse/maintainer.js +1 -0
  626. package/lib/v2/whitehouse/ostp.js +50 -0
  627. package/lib/v2/whitehouse/radar.js +6 -0
  628. package/lib/v2/whitehouse/router.js +1 -0
  629. package/lib/v2/wikinews/index.js +43 -0
  630. package/lib/v2/wikinews/maintainer.js +3 -0
  631. package/lib/v2/wikinews/radar.js +13 -0
  632. package/lib/v2/wikinews/router.js +4 -0
  633. package/lib/v2/wp-china/maintainer.js +3 -0
  634. package/lib/v2/wp-china/news.js +57 -0
  635. package/lib/v2/wp-china/radar.js +13 -0
  636. package/lib/v2/wp-china/router.js +3 -0
  637. package/lib/v2/xiaoyuzhou/maintainer.js +1 -1
  638. package/lib/v2/xiaoyuzhou/pickup.js +2 -2
  639. package/lib/v2/xiaoyuzhou/podcast.js +2 -2
  640. package/lib/{routes → v2}/xueqiu/favorite.js +2 -1
  641. package/lib/v2/xueqiu/fund.js +50 -0
  642. package/lib/{routes → v2}/xueqiu/hots.js +2 -1
  643. package/lib/v2/xueqiu/maintainer.js +10 -0
  644. package/lib/v2/xueqiu/radar.js +60 -0
  645. package/lib/v2/xueqiu/router.js +10 -0
  646. package/lib/{routes → v2}/xueqiu/snb.js +2 -1
  647. package/lib/{routes → v2}/xueqiu/stock_comments.js +4 -20
  648. package/lib/{routes → v2}/xueqiu/stock_info.js +2 -1
  649. package/lib/v2/xueqiu/templates/comments_description.art +10 -0
  650. package/lib/{routes → v2}/xueqiu/user.js +2 -1
  651. package/lib/{routes → v2}/xueqiu/user_stock.js +3 -2
  652. package/lib/{routes → v2}/yystv/category.js +8 -8
  653. package/lib/{routes → v2}/yystv/docs.js +2 -2
  654. package/lib/v2/yystv/maintainer.js +4 -0
  655. package/lib/v2/yystv/radar.js +49 -0
  656. package/lib/v2/yystv/router.js +4 -0
  657. package/lib/{routes/universities → v2}/zju/career/index.js +14 -13
  658. package/lib/{routes/universities → v2}/zju/cst/custom.js +2 -1
  659. package/lib/{routes/universities → v2}/zju/cst/index.js +20 -24
  660. package/lib/v2/zju/grs/index.js +43 -0
  661. package/lib/v2/zju/list.js +66 -0
  662. package/lib/v2/zju/maintainer.js +8 -0
  663. package/lib/v2/zju/physics/index.js +52 -0
  664. package/lib/v2/zju/radar.js +139 -0
  665. package/lib/v2/zju/router.js +8 -0
  666. package/lib/v2/zooTeam/blog.js +32 -0
  667. package/lib/v2/zooTeam/maintainer.js +4 -0
  668. package/lib/v2/zooTeam/radar.js +21 -0
  669. package/lib/v2/zooTeam/router.js +4 -0
  670. package/lib/v2/zooTeam/weekly.js +34 -0
  671. package/lib/views/atom.art +17 -3
  672. package/lib/views/error.art +5 -4
  673. package/lib/views/rss.art +5 -4
  674. package/lib/views/welcome.art +4 -1
  675. package/package.json +28 -24
  676. package/lib/routes/95mm/tab.js +0 -9
  677. package/lib/routes/95mm/tag.js +0 -7
  678. package/lib/routes/95mm/utils.js +0 -51
  679. package/lib/routes/cctv/xwlb.js +0 -48
  680. package/lib/routes/dapenti/utils.js +0 -73
  681. package/lib/routes/dbmv/index.js +0 -45
  682. package/lib/routes/gcores/category.js +0 -127
  683. package/lib/routes/gov/fmprc/fyrbt.js +0 -24
  684. package/lib/routes/gov/fmprc/utils.js +0 -54
  685. package/lib/routes/gov/mee/gs.js +0 -54
  686. package/lib/routes/hupu/all.js +0 -53
  687. package/lib/routes/hupu/bbs.js +0 -83
  688. package/lib/routes/hupu/dept.js +0 -66
  689. package/lib/routes/ixigua/userVideo.js +0 -35
  690. package/lib/routes/mpaypass/news.js +0 -43
  691. package/lib/routes/natgeo/dailyphoto.js +0 -27
  692. package/lib/routes/picuki/profile.js +0 -90
  693. package/lib/routes/pubmed/trending.js +0 -65
  694. package/lib/routes/quicker/person.js +0 -32
  695. package/lib/routes/quicker/qa.js +0 -41
  696. package/lib/routes/quicker/update.js +0 -30
  697. package/lib/routes/segmentfault/channel.js +0 -90
  698. package/lib/routes/segmentfault/user.js +0 -90
  699. package/lib/routes/taptap/review.js +0 -39
  700. package/lib/routes/taptap/topic.js +0 -85
  701. package/lib/routes/tencent/wechat/csm.js +0 -59
  702. package/lib/routes/tencent/wechat/wjdn.js +0 -28
  703. package/lib/routes/thepaper/utils.js +0 -48
  704. package/lib/routes/twreporter/photography.js +0 -57
  705. package/lib/routes/universities/dut/index.js +0 -60
  706. package/lib/routes/universities/dut/subsite.js +0 -50
  707. package/lib/routes/universities/njupt/jwc.js +0 -84
  708. package/lib/routes/universities/nuaa/cs/index.js +0 -84
  709. package/lib/routes/universities/nuaa/jwc/jwc.js +0 -105
  710. package/lib/routes/universities/sdu/cmse.js +0 -55
  711. package/lib/routes/universities/sdu/cs.js +0 -55
  712. package/lib/routes/universities/sdu/epe.js +0 -54
  713. package/lib/routes/universities/sdu/mech.js +0 -58
  714. package/lib/routes/universities/sdu/sc.js +0 -56
  715. package/lib/routes/universities/zju/grs/index.js +0 -44
  716. package/lib/routes/universities/zju/list.js +0 -78
  717. package/lib/routes/universities/zju/physics/index.js +0 -55
  718. package/lib/routes/xueqiu/fund.js +0 -71
  719. package/lib/v2/javbus/genre.js +0 -7
  720. package/lib/v2/javbus/home.js +0 -3
  721. package/lib/v2/javbus/label.js +0 -7
  722. package/lib/v2/javbus/series.js +0 -7
  723. package/lib/v2/javbus/star.js +0 -7
  724. package/lib/v2/javbus/studio.js +0 -7
  725. package/lib/v2/javbus/uncensored/genre.js +0 -6
  726. package/lib/v2/javbus/uncensored/home.js +0 -3
  727. package/lib/v2/javbus/uncensored/series.js +0 -7
  728. package/lib/v2/javbus/uncensored/star.js +0 -7
  729. package/lib/v2/javbus/util.js +0 -207
  730. package/lib/v2/javbus/western/genre.js +0 -7
  731. package/lib/v2/javbus/western/home.js +0 -3
  732. package/lib/v2/javbus/western/series.js +0 -7
  733. package/lib/v2/javbus/western/star.js +0 -7
  734. package/lib/v2/wechat/templates/image.art +0 -1
package/README.md CHANGED
@@ -5,9 +5,10 @@
5
5
 
6
6
  > 🍰 Everything is RSSible
7
7
 
8
- [![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?style=flat-square)](https://t.me/rsshub)
9
- [![build status](https://img.shields.io/travis/DIYgod/RSSHub/master.svg?style=flat-square)](https://travis-ci.org/DIYgod/RSSHub)
10
- [![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square)](https://codecov.io/github/DIYgod/RSSHub?branch=master)
8
+ [![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?logo=telegram&style=flat-square)](https://t.me/rsshub)
9
+ [![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub)
10
+ [![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
11
+ [![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
11
12
 
12
13
  ## Introduction
13
14
 
@@ -37,7 +38,7 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器,可以
37
38
 
38
39
  ### Sponsors
39
40
 
40
- [Sayori Studio](https://t.me/SayoriStudio) . [Sion Kazama](https://blog.sion.moe) . [琚致远](https://wineso.me/) . [Rolly RSS 阅读器](https://www.coolapk.com/apk/239500) . [mokeyjay](https://www.mokeyjay.com/) . [萌开源联盟](https://www.moeunion.com) . [hooke007](https://github.com/hooke007/MPV_lazy) . [feeds.pub](https://feeds.pub)
41
+ [Sayori Studio](https://t.me/SayoriStudio) . [Sion Kazama](https://blog.sion.moe) . [琚致远](https://wineso.me/) . [Rolly RSS 阅读器](https://www.coolapk.com/apk/239500) . [mokeyjay](https://www.mokeyjay.com/) . [萌开源联盟](https://www.moeunion.com) . [hooke007](https://github.com/hooke007/MPV_lazy) . [feeds.pub](https://feeds.pub) . [KINGX@安全引擎](http://cve.today/)
41
42
 
42
43
  [![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/en/support/)
43
44
 
package/lib/config.js CHANGED
@@ -1,4 +1,5 @@
1
1
  require('dotenv').config();
2
+ const randUserAgent = require('@/utils/rand-user-agent');
2
3
  let envs = process.env;
3
4
  let value;
4
5
 
@@ -25,83 +26,38 @@ const calculateValue = () => {
25
26
  }
26
27
 
27
28
  value = {
29
+ // app config
30
+ disallowRobot: envs.DISALLOW_ROBOT !== '0' && envs.DISALLOW_ROBOT !== 'false',
31
+ enableCluster: envs.ENABLE_CLUSTER,
28
32
  isPackage: envs.IS_PACKAGE,
29
- noLogfiles: envs.NO_LOGFILES,
33
+ nodeName: envs.NODE_NAME,
34
+ puppeteerWSEndpoint: envs.PUPPETEER_WS_ENDPOINT,
35
+ // network
30
36
  connect: {
31
37
  port: envs.PORT || 1200, // 监听端口
32
38
  socket: envs.SOCKET || null, // 监听 Unix Socket, null 为禁用
33
39
  },
40
+ listenInaddrAny: envs.LISTEN_INADDR_ANY || 1, // 是否允许公网连接,取值 0 1
41
+ requestRetry: parseInt(envs.REQUEST_RETRY) || 2, // 请求失败重试次数
42
+ requestTimeout: parseInt(envs.REQUEST_TIMEOUT) || 30000, // Milliseconds to wait for the server to end the response before aborting the request
43
+ ua: envs.UA || randUserAgent({ browser: 'chrome', os: 'mac os', device: 'desktop' }),
44
+ // cors request
45
+ allowOrigin: envs.ALLOW_ORIGIN,
46
+ // cache
34
47
  cache: {
35
48
  type: typeof envs.CACHE_TYPE === 'undefined' ? 'memory' : envs.CACHE_TYPE, // 缓存类型,支持 'memory' 和 'redis',设为空可以禁止缓存
36
49
  requestTimeout: parseInt(envs.CACHE_REQUEST_TIMEOUT) || 60,
37
50
  routeExpire: parseInt(envs.CACHE_EXPIRE) || 5 * 60, // 路由缓存时间,单位为秒
38
51
  contentExpire: parseInt(envs.CACHE_CONTENT_EXPIRE) || 1 * 60 * 60, // 不变内容缓存时间,单位为秒
39
52
  },
40
- ua: envs.UA || 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36',
41
- listenInaddrAny: envs.LISTEN_INADDR_ANY || 1, // 是否允许公网连接,取值 0 1
42
- requestRetry: parseInt(envs.REQUEST_RETRY) || 2, // 请求失败重试次数
43
- requestTimeout: parseInt(envs.REQUEST_TIMEOUT) || 30000, // Milliseconds to wait for the server to end the response before aborting the request
44
- // 是否显示 Debug 信息,取值 'true' 'false' 'some_string' ,取值为 'true' 时永久显示,取值为 'false' 时永远隐藏,取值为 'some_string' 时请求带上 '?debug=some_string' 显示
45
- debugInfo: envs.DEBUG_INFO || 'true',
46
- disallowRobot: envs.DISALLOW_ROBOT !== '0' && envs.DISALLOW_ROBOT !== 'false',
47
- titleLengthLimit: parseInt(envs.TITLE_LENGTH_LIMIT) || 150,
53
+ memory: {
54
+ max: parseInt(envs.MEMORY_MAX) || Math.pow(2, 8), // The maximum number of items that remain in the cache. This must be a positive finite intger.
55
+ // https://github.com/isaacs/node-lru-cache#options
56
+ },
48
57
  redis: {
49
58
  url: envs.REDIS_URL || 'redis://localhost:6379/',
50
59
  },
51
- nodeName: envs.NODE_NAME,
52
- suffix: envs.SUFFIX,
53
- pixiv: {
54
- refreshToken: envs.PIXIV_REFRESHTOKEN,
55
- bypassCdn: envs.PIXIV_BYPASS_CDN !== '0' && envs.PIXIV_BYPASS_CDN !== 'false',
56
- bypassCdnHostname: envs.PIXIV_BYPASS_HOSTNAME || 'public-api.secure.pixiv.net',
57
- bypassCdnDoh: envs.PIXIV_BYPASS_DOH || 'https://1.1.1.1/dns-query',
58
- imgProxy: envs.PIXIV_IMG_PROXY || 'https://i.pixiv.cat',
59
- },
60
- fanbox: {
61
- session: envs.FANBOX_SESSION_ID,
62
- },
63
- disqus: {
64
- api_key: envs.DISQUS_API_KEY,
65
- },
66
- spotify: {
67
- clientId: envs.SPOTIFY_CLIENT_ID,
68
- clientSecret: envs.SPOTIFY_CLIENT_SECRET,
69
- refreshToken: envs.SPOTIFY_REFRESHTOKEN,
70
- },
71
- twitter: {
72
- consumer_key: envs.TWITTER_CONSUMER_KEY,
73
- consumer_secret: envs.TWITTER_CONSUMER_SECRET,
74
- tokens: twitter_tokens,
75
- authorization: envs.TWITTER_WEBAPI_AUTHORIZAION || 'Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA',
76
- // 此处硬编码参考自https://github.com/mikf/gallery-dl/blob/master/gallery_dl/extractor/twitter.py#L550
77
- },
78
- youtube: {
79
- key: envs.YOUTUBE_KEY,
80
- },
81
- telegram: {
82
- token: envs.TELEGRAM_TOKEN,
83
- },
84
- github: {
85
- access_token: envs.GITHUB_ACCESS_TOKEN,
86
- },
87
- authentication: {
88
- name: envs.HTTP_BASIC_AUTH_NAME || 'usernam3',
89
- pass: envs.HTTP_BASIC_AUTH_PASS || 'passw0rd',
90
- },
91
- bilibili: {
92
- cookies: bilibili_cookies,
93
- },
94
- yuque: {
95
- token: envs.YUQUE_TOKEN,
96
- },
97
- zhihu: {
98
- cookies: envs.ZHIHU_COOKIES,
99
- },
100
- ncm: {
101
- cookies: envs.NCM_COOKIES || '',
102
- },
103
- puppeteerWSEndpoint: envs.PUPPETEER_WS_ENDPOINT,
104
- loggerLevel: envs.LOGGER_LEVEL || 'info',
60
+ // proxy
105
61
  proxyUri: envs.PROXY_URI,
106
62
  proxy: {
107
63
  protocol: envs.PROXY_PROTOCOL,
@@ -110,26 +66,74 @@ const calculateValue = () => {
110
66
  auth: envs.PROXY_AUTH,
111
67
  url_regex: envs.PROXY_URL_REGEX || '.*',
112
68
  },
113
- allowOrigin: envs.ALLOW_ORIGIN,
69
+ // auth
70
+ authentication: {
71
+ name: envs.HTTP_BASIC_AUTH_NAME || 'usernam3',
72
+ pass: envs.HTTP_BASIC_AUTH_PASS || 'passw0rd',
73
+ },
74
+ // access control
114
75
  blacklist: envs.BLACKLIST && envs.BLACKLIST.split(','),
115
76
  whitelist: envs.WHITELIST && envs.WHITELIST.split(','),
116
77
  allowLocalhost: envs.ALLOW_LOCALHOST,
117
78
  accessKey: envs.ACCESS_KEY,
118
- enableCluster: envs.ENABLE_CLUSTER,
119
- email: {
120
- config: email_config,
121
- },
79
+ // logging
80
+ // 是否显示 Debug 信息,取值 'true' 'false' 'some_string' ,取值为 'true' 时永久显示,取值为 'false' 时永远隐藏,取值为 'some_string' 时请求带上 '?debug=some_string' 显示
81
+ debugInfo: envs.DEBUG_INFO || 'true',
82
+ loggerLevel: envs.LOGGER_LEVEL || 'info',
83
+ noLogfiles: envs.NO_LOGFILES,
122
84
  sentry: {
123
85
  dsn: envs.SENTRY,
124
86
  routeTimeout: parseInt(envs.SENTRY_ROUTE_TIMEOUT) || 30000,
125
87
  },
88
+ // feed config
89
+ hotlink: {
90
+ template: envs.HOTLINK_TEMPLATE,
91
+ },
92
+ suffix: envs.SUFFIX,
93
+ titleLengthLimit: parseInt(envs.TITLE_LENGTH_LIMIT) || 150,
94
+
95
+ // Route-specific Configurations
96
+ bilibili: {
97
+ cookies: bilibili_cookies,
98
+ },
99
+ bitbucket: {
100
+ username: envs.BITBUCKET_USERNAME,
101
+ password: envs.BITBUCKET_PASSWORD,
102
+ },
103
+ btbyr: {
104
+ host: envs.BTBYR_HOST,
105
+ cookies: envs.BTBYR_COOKIE,
106
+ },
107
+ bupt: {
108
+ portal_cookie: envs.BUPT_PORTAL_COOKIE,
109
+ },
126
110
  chuiniu: {
127
111
  member: envs.CHUINIU_MEMBER,
128
112
  },
129
- weibo: {
130
- app_key: envs.WEIBO_APP_KEY,
131
- app_secret: envs.WEIBO_APP_SECRET,
132
- redirect_url: envs.WEIBO_REDIRECT_URL,
113
+ dida365: {
114
+ username: envs.DIDA365_USERNAME,
115
+ password: envs.DIDA365_PASSWORD,
116
+ },
117
+ discuz: {
118
+ cookies: discuz_cookies,
119
+ },
120
+ disqus: {
121
+ api_key: envs.DISQUS_API_KEY,
122
+ },
123
+ douban: {
124
+ cookie: envs.DOUBAN_COOKIE,
125
+ },
126
+ ehentai: {
127
+ ipb_member_id: envs.EH_IPB_MEMBER_ID,
128
+ ipb_pass_hash: envs.EH_IPB_PASS_HASH,
129
+ sk: envs.EH_SK,
130
+ igneous: envs.EH_IGNEOUS,
131
+ },
132
+ email: {
133
+ config: email_config,
134
+ },
135
+ fanbox: {
136
+ session: envs.FANBOX_SESSION_ID,
133
137
  },
134
138
  fanfou: {
135
139
  consumer_key: envs.FANFOU_CONSUMER_KEY,
@@ -137,27 +141,21 @@ const calculateValue = () => {
137
141
  username: envs.FANFOU_USERNAME,
138
142
  password: envs.FANFOU_PASSWORD,
139
143
  },
140
- lastfm: {
141
- api_key: envs.LASTFM_API_KEY,
142
- },
143
- pkubbs: {
144
- cookie: envs.PKUBBS_COOKIE,
145
- },
146
- bupt: {
147
- portal_cookie: envs.BUPT_PORTAL_COOKIE,
144
+ game4399: {
145
+ cookie: envs.GAME_4399,
148
146
  },
149
- nhentai: {
150
- username: envs.NHENTAI_USERNAME,
151
- password: envs.NHENTAI_PASSWORD,
147
+ github: {
148
+ access_token: envs.GITHUB_ACCESS_TOKEN,
152
149
  },
153
- discuz: {
154
- cookies: discuz_cookies,
150
+ google: {
151
+ fontsApiKey: envs.GOOGLE_FONTS_API_KEY,
155
152
  },
156
- scihub: {
157
- host: envs.SCIHUB_HOST || 'https://sci-hub.se/',
153
+ hefeng: {
154
+ // weather
155
+ key: envs.HEFENG_KEY,
158
156
  },
159
- hotlink: {
160
- template: envs.HOTLINK_TEMPLATE,
157
+ infzm: {
158
+ cookie: envs.INFZM_COOKIE,
161
159
  },
162
160
  initium: {
163
161
  username: envs.INITIUM_USERNAME,
@@ -165,68 +163,94 @@ const calculateValue = () => {
165
163
  bearertoken: envs.INITIUM_BEARER_TOKEN,
166
164
  iap_receipt: envs.INITIUM_IAP_RECEIPT,
167
165
  },
168
- btbyr: {
169
- host: envs.BTBYR_HOST,
170
- cookies: envs.BTBYR_COOKIE,
166
+ instagram: {
167
+ username: envs.IG_USERNAME,
168
+ password: envs.IG_PASSWORD,
169
+ proxy: envs.IG_PROXY,
170
+ },
171
+ lastfm: {
172
+ api_key: envs.LASTFM_API_KEY,
171
173
  },
172
174
  mastodon: {
173
175
  apiHost: envs.MASTODON_API_HOST,
174
176
  accessToken: envs.MASTODON_API_ACCESS_TOKEN,
175
177
  acctDomain: envs.MASTODON_API_ACCT_DOMAIN,
176
178
  },
177
- xiaoyuzhou: {
178
- device_id: envs.XIAOYUZHOU_ID,
179
- refresh_token: envs.XIAOYUZHOU_TOKEN,
180
- },
181
179
  miniflux: {
182
180
  instance: envs.MINIFLUX_INSTANCE || 'https://reader.miniflux.app',
183
181
  token: envs.MINIFLUX_TOKEN || '',
184
182
  },
185
- nga: {
186
- uid: envs.NGA_PASSPORT_UID,
187
- cid: envs.NGA_PASSPORT_CID,
183
+ ncm: {
184
+ cookies: envs.NCM_COOKIES || '',
188
185
  },
189
186
  newrank: {
190
187
  cookie: envs.NEWRANK_COOKIE,
191
188
  },
192
- ximalaya: {
193
- token: envs.XIMALAYA_TOKEN,
189
+ nga: {
190
+ uid: envs.NGA_PASSPORT_UID,
191
+ cid: envs.NGA_PASSPORT_CID,
194
192
  },
195
- game4399: {
196
- cookie: envs.GAME_4399,
193
+ nhentai: {
194
+ username: envs.NHENTAI_USERNAME,
195
+ password: envs.NHENTAI_PASSWORD,
197
196
  },
198
- dida365: {
199
- username: envs.DIDA365_USERNAME,
200
- password: envs.DIDA365_PASSWORD,
197
+ pixiv: {
198
+ refreshToken: envs.PIXIV_REFRESHTOKEN,
199
+ bypassCdn: envs.PIXIV_BYPASS_CDN !== '0' && envs.PIXIV_BYPASS_CDN !== 'false',
200
+ bypassCdnHostname: envs.PIXIV_BYPASS_HOSTNAME || 'public-api.secure.pixiv.net',
201
+ bypassCdnDoh: envs.PIXIV_BYPASS_DOH || 'https://1.1.1.1/dns-query',
202
+ imgProxy: envs.PIXIV_IMG_PROXY || 'https://i.pixiv.cat',
203
+ },
204
+ pkubbs: {
205
+ cookie: envs.PKUBBS_COOKIE,
201
206
  },
202
207
  scboy: {
203
208
  token: envs.SCBOY_BBS_TOKEN,
204
209
  },
205
- wordpress: {
206
- cdnUrl: envs.WORDPRESS_CDN,
210
+ scihub: {
211
+ host: envs.SCIHUB_HOST || 'https://sci-hub.se/',
207
212
  },
208
- ehentai: {
209
- ipb_member_id: envs.EH_IPB_MEMBER_ID,
210
- ipb_pass_hash: envs.EH_IPB_PASS_HASH,
211
- sk: envs.EH_SK,
212
- igneous: envs.EH_IGNEOUS,
213
+ spotify: {
214
+ clientId: envs.SPOTIFY_CLIENT_ID,
215
+ clientSecret: envs.SPOTIFY_CLIENT_SECRET,
216
+ refreshToken: envs.SPOTIFY_REFRESHTOKEN,
213
217
  },
214
- infzm: {
215
- cookie: envs.INFZM_COOKIE,
218
+ telegram: {
219
+ token: envs.TELEGRAM_TOKEN,
220
+ },
221
+ twitter: {
222
+ consumer_key: envs.TWITTER_CONSUMER_KEY,
223
+ consumer_secret: envs.TWITTER_CONSUMER_SECRET,
224
+ tokens: twitter_tokens,
225
+ authorization: envs.TWITTER_WEBAPI_AUTHORIZAION || 'Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA',
226
+ // 此处硬编码参考自https://github.com/mikf/gallery-dl/blob/master/gallery_dl/extractor/twitter.py#L550
227
+ },
228
+ weibo: {
229
+ app_key: envs.WEIBO_APP_KEY,
230
+ app_secret: envs.WEIBO_APP_SECRET,
231
+ redirect_url: envs.WEIBO_REDIRECT_URL,
216
232
  },
217
233
  wenku8: {
218
234
  cookie: envs.WENKU8_COOKIE,
219
235
  },
220
- google: {
221
- fontsApiKey: envs.GOOGLE_FONTS_API_KEY,
236
+ wordpress: {
237
+ cdnUrl: envs.WORDPRESS_CDN,
222
238
  },
223
- instagram: {
224
- username: envs.IG_USERNAME,
225
- password: envs.IG_PASSWORD,
226
- proxy: envs.IG_PROXY,
239
+ xiaoyuzhou: {
240
+ device_id: envs.XIAOYUZHOU_ID,
241
+ refresh_token: envs.XIAOYUZHOU_TOKEN,
227
242
  },
228
- douban: {
229
- cookie: envs.DOUBAN_COOKIE,
243
+ ximalaya: {
244
+ token: envs.XIMALAYA_TOKEN,
245
+ },
246
+ youtube: {
247
+ key: envs.YOUTUBE_KEY,
248
+ },
249
+ yuque: {
250
+ token: envs.YUQUE_TOKEN,
251
+ },
252
+ zhihu: {
253
+ cookies: envs.ZHIHU_COOKIES,
230
254
  },
231
255
  };
232
256
  };
@@ -27,10 +27,10 @@ if (config.cache.type === 'redis') {
27
27
  globalCache.set = cacheModule.set;
28
28
  } else if (config.cache.type === 'memory') {
29
29
  cacheModule = require('./memory');
30
- const { pageCache } = cacheModule.clients;
30
+ const { memoryCache } = cacheModule.clients;
31
31
  globalCache.get = (key) => {
32
32
  if (key && cacheModule.status.available) {
33
- return pageCache.get(key);
33
+ return memoryCache.get(key, { updateAgeOnGet: false });
34
34
  }
35
35
  };
36
36
  globalCache.set = (key, value, maxAge) => {
@@ -41,7 +41,7 @@ if (config.cache.type === 'redis') {
41
41
  value = JSON.stringify(value);
42
42
  }
43
43
  if (key) {
44
- return pageCache.set(key, value, maxAge * 1000);
44
+ return memoryCache.set(key, value, { ttl: maxAge * 1000 });
45
45
  }
46
46
  };
47
47
  } else {
@@ -55,8 +55,8 @@ module.exports = function (app) {
55
55
  const { get, set, status } = cacheModule;
56
56
  app.context.cache = {
57
57
  ...cacheModule,
58
- tryGet: async (key, getValueFunc, maxAge = config.cache.contentExpire) => {
59
- let v = await get(key);
58
+ tryGet: async (key, getValueFunc, maxAge = config.cache.contentExpire, refresh = true) => {
59
+ let v = await get(key, refresh);
60
60
  if (!v) {
61
61
  v = await getValueFunc();
62
62
  set(key, v, maxAge);
@@ -3,15 +3,9 @@ const config = require('@/config').value;
3
3
 
4
4
  const status = { available: false };
5
5
 
6
- const pageCache = new Lru({
7
- maxAge: config.cache.routeExpire * 1000,
8
- max: Infinity,
9
- });
10
-
11
- const routeCache = new Lru({
12
- maxAge: config.cache.routeExpire * 1000,
13
- max: Infinity,
14
- updateAgeOnGet: true,
6
+ const memoryCache = new Lru({
7
+ ttl: config.cache.routeExpire * 1000,
8
+ max: config.memory.max,
15
9
  });
16
10
 
17
11
  status.available = true;
@@ -19,14 +13,14 @@ status.available = true;
19
13
  module.exports = {
20
14
  get: (key, refresh = true) => {
21
15
  if (key && status.available) {
22
- let value = (refresh ? routeCache : pageCache).get(key);
16
+ let value = memoryCache.get(key, { updateAgeOnGet: refresh });
23
17
  if (value) {
24
18
  value = value + '';
25
19
  }
26
20
  return value;
27
21
  }
28
22
  },
29
- set: (key, value, maxAge = config.cache.contentExpire, refresh = true) => {
23
+ set: (key, value, maxAge = config.cache.contentExpire) => {
30
24
  if (!value || value === 'undefined') {
31
25
  value = '';
32
26
  }
@@ -34,9 +28,9 @@ module.exports = {
34
28
  value = JSON.stringify(value);
35
29
  }
36
30
  if (key && status.available) {
37
- return (refresh ? routeCache : pageCache).set(key, value, maxAge * 1000);
31
+ return memoryCache.set(key, value, { ttl: maxAge * 1000 });
38
32
  }
39
33
  },
40
- clients: { pageCache, routeCache },
34
+ clients: { memoryCache },
41
35
  status,
42
36
  };
@@ -18,12 +18,26 @@ redisClient.on('connect', () => {
18
18
  logger.info('Redis connected.');
19
19
  });
20
20
 
21
+ const getCacheTtlKey = (key) => {
22
+ if (key.startsWith('cacheTtl:')) {
23
+ throw Error('"cacheTtl:" prefix is reserved for the internal usage, please change your cache key'); // blocking any attempt to get/set the cacheTtl
24
+ }
25
+ return `cacheTtl:${key}`;
26
+ };
27
+
21
28
  module.exports = {
22
29
  get: async (key, refresh = true) => {
23
30
  if (key && status.available) {
24
- let value = await redisClient.get(key);
31
+ const cacheTtlKey = getCacheTtlKey(key);
32
+ let [value, cacheTtl] = await redisClient.mget(key, cacheTtlKey);
25
33
  if (value && refresh) {
26
- redisClient.expire(key, config.cache.contentExpire);
34
+ if (!cacheTtl) {
35
+ cacheTtl = config.cache.contentExpire;
36
+ redisClient.set(cacheTtlKey, cacheTtl, 'EX', cacheTtl);
37
+ } else {
38
+ redisClient.expire(cacheTtlKey, cacheTtl);
39
+ }
40
+ redisClient.expire(key, cacheTtl);
27
41
  value = value + '';
28
42
  }
29
43
  return value;
@@ -40,6 +54,7 @@ module.exports = {
40
54
  value = JSON.stringify(value);
41
55
  }
42
56
  if (key) {
57
+ redisClient.set(getCacheTtlKey(key), maxAge, 'EX', maxAge);
43
58
  return redisClient.set(key, value, 'EX', maxAge); // setMode: https://redis.io/commands/set
44
59
  }
45
60
  },
@@ -6,6 +6,7 @@ const path = require('path');
6
6
  const { RequestInProgressError } = require('@/errors');
7
7
 
8
8
  let Sentry;
9
+ let gitHash;
9
10
 
10
11
  if (config.sentry.dsn) {
11
12
  Sentry = Sentry || require('@sentry/node');
@@ -19,6 +20,12 @@ if (config.sentry.dsn) {
19
20
  logger.info('Sentry inited.');
20
21
  }
21
22
 
23
+ try {
24
+ gitHash = require('git-rev-sync').short();
25
+ } catch (e) {
26
+ gitHash = (process.env.HEROKU_SLUG_COMMIT && process.env.HEROKU_SLUG_COMMIT.slice(0, 7)) || (process.env.VERCEL_GITHUB_COMMIT_SHA && process.env.VERCEL_GITHUB_COMMIT_SHA.slice(0, 7)) || 'unknown';
27
+ }
28
+
22
29
  module.exports = async (ctx, next) => {
23
30
  try {
24
31
  const time = +new Date();
@@ -68,6 +75,7 @@ module.exports = async (ctx, next) => {
68
75
  message,
69
76
  errorPath: ctx.path,
70
77
  nodeVersion: process.version,
78
+ gitHash,
71
79
  });
72
80
  }
73
81
 
@@ -2,6 +2,7 @@ const art = require('art-template');
2
2
  const path = require('path');
3
3
  const config = require('@/config').value;
4
4
  const typeRegex = /\.(atom|rss|debug\.json)$/;
5
+ const { collapseWhitespace, convertDateToISO8601 } = require('@/utils/common-utils');
5
6
 
6
7
  module.exports = async (ctx, next) => {
7
8
  if (ctx.headers['user-agent'] && ctx.headers['user-agent'].includes('Reeder')) {
@@ -27,7 +28,8 @@ module.exports = async (ctx, next) => {
27
28
  if (!ctx.body) {
28
29
  let template;
29
30
 
30
- switch (ctx.state.type[1]) {
31
+ const outputType = ctx.state.type[1];
32
+ switch (outputType) {
31
33
  case 'atom':
32
34
  template = path.resolve(__dirname, '../views/atom.art');
33
35
  break;
@@ -40,10 +42,14 @@ module.exports = async (ctx, next) => {
40
42
  }
41
43
 
42
44
  if (ctx.state.data) {
45
+ ctx.state.data.title = collapseWhitespace(ctx.state.data.title);
46
+ ctx.state.data.subtitle = collapseWhitespace(ctx.state.data.subtitle);
47
+ ctx.state.data.author = collapseWhitespace(ctx.state.data.author);
48
+
43
49
  ctx.state.data.item &&
44
50
  ctx.state.data.item.forEach((item) => {
45
51
  if (item.title) {
46
- item.title = item.title.trim();
52
+ item.title = collapseWhitespace(item.title);
47
53
  // trim title length
48
54
  for (let length = 0, i = 0; i < item.title.length; i++) {
49
55
  length += Buffer.from(item.title[i]).length !== 1 ? 2 : 1;
@@ -54,10 +60,17 @@ module.exports = async (ctx, next) => {
54
60
  }
55
61
  }
56
62
 
57
- if (item.enclosure_length) {
58
- const itunes_duration =
59
- Math.floor(item.enclosure_length / 3600) + ':' + (Math.floor((item.enclosure_length % 3600) / 60) / 100).toFixed(2).slice(-2) + ':' + (((item.enclosure_length % 3600) % 60) / 100).toFixed(2).slice(-2);
60
- item.itunes_duration = itunes_duration;
63
+ item.author = collapseWhitespace(item.author);
64
+
65
+ if (item.itunes_duration && ((typeof item.itunes_duration === 'string' && item.itunes_duration.indexOf(':') === -1) || (typeof item.itunes_duration === 'number' && !isNaN(item.itunes_duration)))) {
66
+ item.itunes_duration = +item.itunes_duration;
67
+ item.itunes_duration =
68
+ Math.floor(item.itunes_duration / 3600) + ':' + (Math.floor((item.itunes_duration % 3600) / 60) / 100).toFixed(2).slice(-2) + ':' + (((item.itunes_duration % 3600) % 60) / 100).toFixed(2).slice(-2);
69
+ }
70
+
71
+ if (outputType === 'atom') {
72
+ item.pubDate = convertDateToISO8601(item.pubDate);
73
+ item.updated = convertDateToISO8601(item.updated);
61
74
  }
62
75
  });
63
76
  }