[pull] master from DIYgod:master

.dockerignore

@@ -19,9 +19,18 @@ test
 process.json
 app.json
 .travis.yml
+app-minimal
+.idea
+.env
+.editorconfig
+Procfile
+now.json
+jsconfig.json
+package-lock.json
 
 #git but keep the git commit hash
 .git/logs
 .git/objects
 .git/index
 .git/info
+.git/hooks

.github/ISSUE_TEMPLATE/bug_report_en.yml

@@ -9,21 +9,23 @@ body:
         Please ensure you have read [documentation](https://docs.rsshub.app/en), and provide all the information required by this template, otherwise the issue will be closed immediately.
         Due to the anti-crawling policy implemented by certain websites, some RSS routes provided by the demo will return status code 403. This is not an issue caused by RSSHub and please do not report it.
 
-  - type: input
+  - type: textarea
     id: routes
     attributes:
       label: Routes
-      description: The involved route, without any parameters
-      placeholder: /rsshub/routes
+      description: The involved route, without any parameters, copied directly from the docs "route" field, one link per line. Use `NOROUTE` if it is not route related.
+      placeholder: /rsshub/someroute/:type?
+      render: routes
     validations:
       required: true
 
-  - type: input
+  - type: textarea
     id: fullroutes
     attributes:
       label: Full routes
-      description: The involved route, with all required and optional parameters
-      placeholder: /rsshub/routes
+      description: The involved route, with all required and optional parameters, and could be duplicate if necessary (different parameters)
+      placeholder: /rsshub/routes/1234?some_extension=mode
+      render: fullroutes
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/bug_report_zh.yml

@@ -9,21 +9,23 @@ body:
         请确保已阅读 [文档](https://docs.rsshub.app) 内相关部分，并按照模版提供信息，否则 issue 将被立即关闭。
         由于部分源网站反爬缘故，演示地址一些 RSS 会返回 status code 403，该问题不是 RSSHub 所致，请勿提交 issue。
 
-  - type: input
+  - type: textarea
     id: routes
     attributes:
       label: 路由地址
-      description: 不包含参数
-      placeholder: /rsshub/routes
+      description: 不包含参数，复制文档路由参数，一行一个，不要重复。如果和路由没有关系，请写`NOROUTE`
+      placeholder: /rsshub/someroute/:type?
+      render: routes
     validations:
       required: true
 
-  - type: input
+  - type: textarea
     id: fullroutes
     attributes:
       label: 完整路由地址
-      description: 包含所有必选与可选参数
-      placeholder: /rsshub/routes
+      description: 包含所有必选与可选参数，一行一个，可以有重复路由不同参数（如果需要）
+      placeholder: /rsshub/routes/1234?some_extension=mode
+      render: fullroutes
     validations:
       required: true
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,7 +18,7 @@ Please include route starts with /, with all required and optional parameters. F
 /some/route
 /some/other/route
 ```
-如果你的 PR 与路由无关, 请在 route 区域 填写 `NOROUTE`，而不是直接删除 `routes` 区域。否则你的 PR 将会被无条件关闭。
+如果你的 PR 与路由无关, 请在 `routes` 区域 填写 `NOROUTE`，而不是直接删除 `routes` 区域。否则你的 PR 将会被无条件关闭。
 If your changes are not related to route, please fill in `routes` with `NOROUTE`. Fail to comply will result in your PR being closed.
 -->
 

.github/pull.yml

@@ -0,0 +1,7 @@
+version: '1'
+rules:
+  - base: master
+    upstream: diygod:master
+    # default value if this file does not exist is `hardreset`, effectively overwriting any downstream changes!
+    # previously it was the misconfigured PR route test workflow that rescued downstream changes from being overwritten
+    mergeMethod: merge

.github/workflows/build-assets.yml

@@ -6,6 +6,7 @@ on:
       - master
     paths:
       - 'lib/**'
+      - 'scripts/workflow/*.js'
 
 jobs:
   build:
@@ -14,10 +15,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Use Node.js v14
-        uses: actions/setup-node@v3.1.0
+      - name: Use Node.js v16
+        uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: 16
           cache: 'yarn'
       - name: Build file
         run: yarn && npm run build:all

.github/workflows/codeql.yml

@@ -42,7 +42,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/comment-on-pr.yml

@@ -5,11 +5,21 @@ on:
     types: [opened]
 
 jobs:
-  comment:
+  testRoute:
+    name: Route test
     runs-on: ubuntu-latest
     steps:
-      - name: Comment
-        uses: ben-z/actions-comment-on-issue@1.0.2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3  # just need its cache
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          message: '👍 感谢提交该 Issue，请确保仔细阅读 [Issue 模板](https://github.com/DIYgod/RSSHub/blob/master/.github/ISSUE_TEMPLATE/bug_report_zh.yml)，[RSS 提案模板](https://github.com/DIYgod/RSSHub/blob/master/.github/ISSUE_TEMPLATE/rss_request_zh.yml) 或 [Feature 提案模板](https://github.com/DIYgod/RSSHub/blob/master/.github/ISSUE_TEMPLATE/feature_request_zh.yml) 以便于测试。不符合模板将导致 Issue 被直接关闭。<br /><br />👍 Thanks for the issue, please follow the [Issue template](https://github.com/DIYgod/RSSHub/blob/master/.github/ISSUE_TEMPLATE/bug_report_en.yml), [RSS proposal template](https://github.com/DIYgod/RSSHub/blob/master/.github/ISSUE_TEMPLATE/rss_request_en.yml) or [Feature proposal template](https://github.com/DIYgod/RSSHub/blob/master/.github/ISSUE_TEMPLATE/feature_request_en.yml). Otherwise the issue will be closed.'
+          node-version: 16
+          cache: 'yarn'
+      - name: Install dependencies (yarn)  # needed since we need to parse markdown, so we also use got instead
+        run: yarn
+      - name: Generate feedback
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const script = require(`${process.env.GITHUB_WORKSPACE}/scripts/workflow/test-issue/find-maintainer.js`)
+            return await script({ github, context, core })

.github/workflows/docker-release.yml

@@ -5,15 +5,20 @@ on:
     branches:
       - master
     paths:
-      - 'lib/**'
       - '.github/workflows/docker-release.yml'
+      - 'lib/**'
+      - '!**/maintainer.js'
+      - '!**/radar.js'
+      - '!**/radar-rules.js'
       - 'Dockerfile'
       - 'package.json'
       - 'yarn.lock'
   workflow_dispatch: ~
 
 jobs:
   check-env:
+    permissions:
+      contents: none
     runs-on: ubuntu-latest
     outputs:
       check-docker: ${{ steps.check-docker.outputs.defined }}
@@ -32,47 +37,75 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
+      - name: Extract Docker metadata (ordinary version)
+        id: meta-ordinary
+        uses: docker/metadata-action@v4
         with:
           images: ${{ secrets.DOCKER_USERNAME }}/rsshub
           tags: |
             type=raw,value=latest,enable=true
             type=raw,value={{date 'YYYY-MM-DD'}},enable=true
           flavor: latest=false
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+      - name: Build and push Docker image (ordinary version)
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-ordinary.outputs.tags }}
+          labels: ${{ steps.meta-ordinary.outputs.labels }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           cache-from: type=gha,scope=docker-release
           cache-to: type=gha,mode=max,scope=docker-release
+          # cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/rsshub:buildcache
+          # cache-to: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/rsshub:buildcache,mode=max
+
+      - name: Extract Docker metadata (Chromium-bundled version)
+        id: meta-chromium-bundled
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ secrets.DOCKER_USERNAME }}/rsshub
+          tags: |
+            type=raw,value=chromium-bundled,enable=true
+            type=raw,value=chromium-bundled-{{date 'YYYY-MM-DD'}},enable=true
+          flavor: latest=false
+
+      - name: Build and push Docker image (Chromium-bundled version)
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          build-args: PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=0
+          push: true
+          tags: ${{ steps.meta-chromium-bundled.outputs.tags }}
+          labels: ${{ steps.meta-chromium-bundled.outputs.labels }}
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          cache-from: |
+            type=registry,ref=${{ secrets.DOCKER_USERNAME }}/rsshub:chromium-bundled
+          # type=gha,scope=docker-release # not needed, Docker automatically uses local cache from the builder
+          # type=registry,ref=${{ secrets.DOCKER_USERNAME }}/rsshub:buildcache
+          cache-to: type=inline,ref=${{ secrets.DOCKER_USERNAME }}/rsshub:chromium-bundled  # inline cache is enough
+
   description:
     runs-on: ubuntu-latest
     needs: check-env
     if: needs.check-env.outputs.check-docker == 'true'
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Docker Hub Description
-      uses: peter-evans/dockerhub-description@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: ${{ secrets.DOCKER_USERNAME }}/rsshub
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: ${{ secrets.DOCKER_USERNAME }}/rsshub

.github/workflows/docker-test.yml

@@ -1,4 +1,6 @@
-name: '[docker] CI for build tests'
+# name: '[docker] CI for build tests'
+# https://github.community/t/215358
+name: PR - Docker build test
 
 on:
   pull_request:
@@ -9,8 +11,12 @@ on:
       - 'Dockerfile'
       - 'package.json'
       - 'yarn.lock'
+      - '.github/workflows/docker-test.yml'
   # Please, always create a pull request instead of push to master.
 
+permissions:
+  contents: read
+
 jobs:
   test:
     name: Docker build & tests
@@ -19,32 +25,43 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx  # needed by `cache-from`
+        uses: docker/setup-buildx-action@v2
 
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: rsshub
           flavor: latest=true
 
       - name: Build Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
+          build-args: PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=0  # also test bundling Chromium
           load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64  # explicit
           cache-from: |
-            type=gha,scope=docker-test
+            type=registry,ref=${{ secrets.DOCKER_USERNAME }}/rsshub:chromium-bundled
             type=gha,scope=docker-release
-          cache-to: type=gha,mode=max,scope=docker-test
+          # ! build on amd64 is fast enough, and cache between PRs never hit, so never waste the 10GB cache limit !
+          # cache-from: |
+          #   type=gha,scope=docker-test
+          #   type=gha,scope=docker-release
+          # cache-to: type=gha,mode=max,scope=docker-test
+
+      - name: Test Docker image
+        run: bash scripts/docker/test-docker.sh
 
-      - name: Run dockerfile
-        run: |
-          chmod +x scripts/docker/test-docker.sh
-          scripts/docker/test-docker.sh
+      - name: Export Docker image
+        run: docker save rsshub:latest | gzip -1cf > rsshub.tar.gz
+
+      - name: Upload Docker image
+        uses: actions/upload-artifact@v3
+        with:
+          name: docker-image
+          path: rsshub.tar.gz
+          retention-days: 1

.github/workflows/format.yml

@@ -5,16 +5,21 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 jobs:
   format:
+    permissions:
+      contents: write  # for Git to git push
     name: Auto format
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.1.0
+      - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: 16
           cache: 'yarn'
       - run: yarn install
       - run: npm run format