Merge pull request #865 from DIYgod/master

[pull] master from diygod:master

Author: pull[bot]

.dockerignore

@@ -1,3 +1,4 @@
+.devcontainer
 .github
 .idea
 .vscode
@@ -16,11 +17,13 @@ test
 .env
 .eslint*
 .gitignore
+.gitpod.yml
 .prettier*
 .(yarn|npm|nvm)rc
 *.md
 app.json
 docker-compose*
+fly.toml
 jsconfig.json
 npm-debug.log
 process.json
@@ -33,3 +36,7 @@ vercel.json
 .git/index
 .git/info
 .git/hooks
+
+#rsshub auxiliary files
+lib/radar-rules.js
+lib/v2/**/radar.js

.puppeteerrc.js

@@ -0,0 +1,9 @@
+const { join } = require('path');
+
+/**
+ * @type {import("puppeteer").Configuration}
+ */
+module.exports = {
+    // Changes the cache location for Puppeteer.
+    cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer'),
+};

Dockerfile

@@ -79,13 +79,14 @@ FROM node:16-bullseye-slim as chromium-downloader
 # Yeah, downloading Chromium never needs those dependencies below.
 
 WORKDIR /app
+COPY ./.puppeteerrc.js /app/
 COPY --from=dep-version-parser /ver/.puppeteer_version /app/.puppeteer_version
 
 ARG TARGETPLATFORM
 ARG USE_CHINA_NPM_REGISTRY=0
 ARG PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
 # The official recommended way to use Puppeteer on x86(_64) is to use the bundled Chromium from Puppeteer:
-# https://github.com/puppeteer/puppeteer#q-why-doesnt-puppeteer-vxxx-work-with-chromium-vyyy
+# https://pptr.dev/faq#q-why-doesnt-puppeteer-vxxx-work-with-chromium-vyyy
 RUN \
     set -ex ; \
     if [ "$PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" = 0 ] && [ "$TARGETPLATFORM" = 'linux/amd64' ]; then \
@@ -98,7 +99,7 @@ RUN \
         yarn add puppeteer@$(cat /app/.puppeteer_version) && \
         yarn cache clean ; \
     else \
-        mkdir -p /root/.cache/puppeteer ; \
+        mkdir -p /app/node_modules/.cache/puppeteer ; \
     fi;
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -115,11 +116,11 @@ WORKDIR /app
 # install deps first to avoid cache miss or disturbing buildkit to build concurrently
 ARG TARGETPLATFORM
 ARG PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
-# https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#chrome-headless-doesnt-launch-on-unix
+# https://pptr.dev/troubleshooting#chrome-headless-doesnt-launch-on-unix
 # https://github.com/puppeteer/puppeteer/issues/7822
 # https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html#noteworthy-obsolete-packages
 # The official recommended way to use Puppeteer on arm/arm64 is to install Chromium from the distribution repositories:
-# https://github.com/puppeteer/puppeteer/blob/94cb08c85955c0688d12b6ed10e61a4581a01280/src/node/BrowserFetcher.ts#L116-L119
+# https://github.com/puppeteer/puppeteer/blob/07391bbf5feaf85c191e1aa8aa78138dce84008d/packages/puppeteer-core/src/node/BrowserFetcher.ts#L128-L131
 RUN \
     set -ex && \
     apt-get update && \
@@ -143,14 +144,14 @@ RUN \
     fi; \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=chromium-downloader /root/.cache/puppeteer /root/.cache/puppeteer
+COPY --from=chromium-downloader /app/node_modules/.cache/puppeteer /app/node_modules/.cache/puppeteer
 
 # if grep matches nothing then it will exit with 1, thus, we cannot `set -e` here
 RUN \
     set -x && \
     if [ "$PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" = 0 ] && [ "$TARGETPLATFORM" = 'linux/amd64' ]; then \
         echo 'Verifying Chromium installation...' && \
-        ldd $(find /root/.cache/puppeteer/ -name chrome) | grep "not found" ; \
+        ldd $(find /app/node_modules/.cache/puppeteer/ -name chrome -type f) | grep "not found" ; \
         if [ "$?" = 0 ]; then \
             echo "!!! Chromium has unmet shared libs !!!" && \
             exit 1 ; \
@@ -177,7 +178,7 @@ CMD ["npm", "run", "start"]
 #     apt-file \
 # && \
 # apt-file update && \
-# ldd $(find /app/node_modules/puppeteer/ -name chrome) | grep -Po "\S+(?= => not found)" | \
+# ldd $(find /app/node_modules/.cache/puppeteer/ -name chrome -type f) | grep -Po "\S+(?= => not found)" | \
 # sed 's/\./\\./g' | awk '{print $1"$"}' | apt-file search -xlf - | grep ^lib | \
 # xargs -d '\n' -- \
 #     apt-get install -yq --no-install-recommends \

docs/anime.md

@@ -436,6 +436,22 @@ Sources
 
 <Route author="aether17" path="/thwiki/calendar/:before?/:after?" example="/thwiki/calendar" :paramsDesc="['从多少天前（默认30）', '到多少天后（默认30）']" radar="1" rssbud="1"/>
 
+## VCB-Studio
+
+### 最新文章
+
+<Route author="cxfksword" example="/vcb-s" path="/vcb-s" radar="1"/>
+
+### 分类文章
+
+<Route author="cxfksword" example="/vcb-s/category/works" path="/vcb-s/category/:cate" :paramsDesc="['分类']" radar="1">
+
+| 作品项目  | 科普系列 | 计划与日志   |
+| ----- | ---- | ------- |
+| works | kb   | planlog |
+
+</Route>
+
 ## Vol.moe
 
 ### vol

docs/en/reading.md

@@ -56,6 +56,16 @@ Eg:<https://kakuyomu.jp/works/1177354054883783581>
 
 <RouteEn author="nczitzk" example="/literotica/category/anal-sex-stories" path="/literotica/category/:category?" :paramsDesc="['Category, can be found in URL']"/>
 
+## MagazineLib
+
+### Latest Magazine
+
+<RouteEn author="NavePnow" example="/magazinelib/latest-magazine/new+yorker" path="/magazinelib/latest-magazine/:query?" :paramsDesc="['query, search page querystring']"/>
+
+For instance, when doing search at <https://magazinelib.com/> and you get url <https://magazinelib.com/?s=new+yorker>, the query is `new+yorker`
+
+</RouteEn>
+
 ## Mobilism
 
 ### eBook Releases

docs/new-media.md

@@ -3331,6 +3331,12 @@ column 为 third 时可选的 category:
 
 </Route>
 
+## 千篇网
+
+### 知识库／资讯
+
+<Route author="TonyRL" example="/qianp/news" path="/qianp/news/:path*" :paramsDesc="['路径，可在URL中找到，默认为 `news/recommend`']" radar="1" rssbud="1"/>
+
 ## 求是网
 
 ### 分类

docs/reading.md

@@ -67,6 +67,16 @@ pageClass: routes
 
 <Route author="nczitzk" example="/literotica/category/anal-sex-stories" path="/literotica/category/:category?" :paramsDesc="['分类，可在对应分类页地址栏中找到']"/>
 
+## MagazineLib
+
+### Latest Magazine
+
+<Route author="NavePnow" example="/magazinelib/latest-magazine/new+yorker" path="/magazinelib/latest-magazine/:query?" :paramsDesc="['query，search page querystring']"/>
+
+For instance, when doing search at <https://magazinelib.com/> and you get url <https://magazinelib.com/?s=new+yorker>, the query is `new+yorker`
+
+</Route>
+
 ## Mobilism
 
 ### 电子书

docs/traditional-media.md

@@ -2570,3 +2570,15 @@ category 对应的关键词有
 `https://www.rfa.org/cantonese/news/htm` 对应 `/rfa/cantonese/news/htm`
 
 </Route>
+
+## 组织人事报
+
+### 电子报
+
+<Route author="5upernove-heng" example="/zuzhirenshi" path="/zuzhirenshi/:id?" :paramsDesc="['报纸版号，默认为全部']" radar="1">
+
+| 第一版 要闻 | 第二版 要闻 | 第三版 人才 | 第四版 人社工作 | 第五版 基层党建 | 第六版 理论评论 | 第七版 史事通鉴 | 第八版 关注 |
+| ------ | ------ | ------ | -------- | -------- | -------- | -------- | ------ |
+| 1      | 2      | 3      | 4        | 5        | 6        | 7        | 8      |
+
+</Route>

lib/v2/magazinelib/latest-magazine.js

@@ -0,0 +1,55 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const host = 'https://magazinelib.com';
+module.exports = async (ctx) => {
+    const query = ctx.params.query;
+    const url = `${host}/wp-json/wp/v2/posts/`;
+    const response = await got({
+        method: 'get',
+        url,
+        searchParams: {
+            search: query,
+            per_page: 30,
+            _embed: 1,
+        },
+    });
+    let subTitle = query;
+    if (subTitle !== undefined) {
+        subTitle = subTitle.replace(/[^a-zA-Z0-9]+/g, ' ').toUpperCase();
+        subTitle = ` - ${subTitle}`;
+    } else {
+        subTitle = '';
+    }
+
+    const items = response.data.map((obj) => {
+        const data = {};
+        data.date = obj.date_gmt;
+        data.link = obj.link;
+        data.featuredMediaLink = obj._links['wp:featuredmedia'][0].href;
+        data.title = obj.title.rendered;
+        const $ = cheerio.load(obj.content.rendered);
+        const content = $('.vk-att');
+        content.find('img[src="https://magazinelib.com/wp-includes/images/media/default.png"]').remove();
+        data.content = content.html();
+        const imgUrl = obj._embedded['wp:featuredmedia'][0].source_url;
+        data.description = data.content + art(path.join(__dirname, 'templates/magazine-description.art'), { imgUrl });
+        data.categories = obj._embedded['wp:term'][0].map((item) => item.name);
+        return data;
+    });
+
+    ctx.state.data = {
+        title: `MagazineLib - Latest Magazines${subTitle}`,
+        link: `{host}/?s=${query}`,
+        description: `MagazineLib - Latest Magazines${subTitle}`,
+        item: items.map((item) => ({
+            title: item.title,
+            link: item.link,
+            category: item.categories,
+            pubDate: new Date(item.pubDate).toUTCString(),
+            description: item.description,
+        })),
+    };
+};

lib/v2/magazinelib/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/latest-magazine/:query?': ['NavePnow'],
+};