[pull] master from diygod:master

.devcontainer/devcontainer.json

@@ -1,8 +1,8 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/devcontainers/images/blob/v0.2.24/src/javascript-node/.devcontainer/devcontainer.json
+// https://github.com/devcontainers/images/blob/v0.3.24/src/javascript-node/.devcontainer/devcontainer.json
 {
     "name": "Node.js",
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:20-bookworm",
 
     // Configure tool-specific properties.
     "customizations": {

.eslintrc.json

@@ -1,6 +1,6 @@
 {
     "extends": ["eslint:recommended", "plugin:n/recommended", "plugin:prettier/recommended", "plugin:yml/recommended"],
-    "plugins": ["prettier"],
+    "plugins": ["prettier", "@stylistic/js"],
     "parserOptions": {
         "ecmaVersion": "latest",
         "sourceType": "module"
@@ -54,25 +54,26 @@
         "prefer-const": 2,
         "prefer-regex-literals": 1,
         "require-await": 2,
-        "spaced-comment": 2,
-        // layout & formatting
-        "arrow-parens": 2,
-        "arrow-spacing": 2,
-        "comma-spacing": 2,
-        "comma-style": 2,
-        "func-call-spacing": 2,
-        "keyword-spacing": 2,
-        "linebreak-style": 2,
-        "lines-around-comment": 2,
-        "no-multiple-empty-lines": 2,
-        "no-trailing-spaces": 2,
-        "rest-spread-spacing": 2,
-        "semi": 2,
-        "space-before-blocks": 2,
-        "space-in-parens": 2,
-        "space-infix-ops": 2,
-        "space-unary-ops": 2,
         // plugin specific
+        // previous eslint formatting rules
+        "@stylistic/js/arrow-parens": 2,
+        "@stylistic/js/arrow-spacing": 2,
+        "@stylistic/js/comma-spacing": 2,
+        "@stylistic/js/comma-style": 2,
+        "@stylistic/js/function-call-spacing": 2,
+        "@stylistic/js/keyword-spacing": 2,
+        "@stylistic/js/linebreak-style": 2,
+        "@stylistic/js/lines-around-comment": ["error", { "beforeBlockComment": false }],
+        "@stylistic/js/no-multiple-empty-lines": 2,
+        "@stylistic/js/no-trailing-spaces": 2,
+        "@stylistic/js/rest-spread-spacing": 2,
+        "@stylistic/js/semi": 2,
+        "@stylistic/js/space-before-blocks": 2,
+        "@stylistic/js/space-in-parens": 2,
+        "@stylistic/js/space-infix-ops": 2,
+        "@stylistic/js/space-unary-ops": 2,
+        "@stylistic/js/spaced-comment": 2,
+        // https://github.com/eslint-community/eslint-plugin-n
         "n/no-extraneous-require": [
             "error",
             {

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

@@ -22,7 +22,7 @@ jobs:
       - name: Install dependencies (pnpm) # needed since we need to parse markdown, so we also use got instead
         run: pnpm i
       - name: Generate feedback
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.github/workflows/docker-test-cont.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Fetch affected routes
         id: fetch-route
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           PULL_REQUEST: ${{ steps.pr-data.outputs.data }}
         with:
@@ -85,7 +85,7 @@ jobs:
 
       - name: Generate feedback
         if: (env.TEST_CONTINUE)
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           TEST_BASEURL: http://localhost:1200
           TEST_ROUTES: ${{ steps.fetch-route.outputs.result }}

.github/workflows/docs-search-index.yml

@@ -30,7 +30,7 @@ jobs:
         run: sleep 2m
         if: github.event_name == 'push'
       - name: Run docs-scraper
-        timeout-minutes: 15
+        timeout-minutes: 30
         env:
           HOST_URL: ${{ secrets.MEILISEARCH_HOST_URL }}
           API_KEY: ${{ secrets.MEILISEARCH_API_KEY }}

.github/workflows/issue-command.yml

@@ -68,7 +68,7 @@ jobs:
 
       - name: Fetch affected routes
         id: fetch-route
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           EVENT: ${{ toJson(github.event) }}
         with:
@@ -91,7 +91,7 @@ jobs:
 
       - name: Generate feedback
         if: env.TEST_CONTINUE
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           TEST_BASEURL: http://localhost:1200
           TEST_ROUTES: ${{ steps.fetch-route.outputs.result }}

.github/workflows/npm-publish.yml

@@ -30,6 +30,7 @@ jobs:
           version: 8
       - uses: actions/setup-node@v4
         with:
+          # pinned to 18 until https://github.com/compulim/version-from-git/issues/16 is fixed
           node-version: 18
           cache: 'pnpm'
           registry-url: 'https://registry.npmjs.org'

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 18, 20 ]
+        node-version: [ 18, 20, 21 ]
     name: Jest on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
         env:
           REDIS_URL: redis://localhost:${{ job.services.redis.ports[6379] }}/
       - name: Upload coverage to Codecov
-        if: ${{ matrix.node-version == '18' }}
+        if: ${{ matrix.node-version == '20' }}
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos as documented, but seems broken
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 18, 20 ]
+        node-version: [ 18, 20, 21 ]
         chromium:
           - name: bundled Chromium
             dependency: ''
@@ -91,7 +91,7 @@ jobs:
         if: ${{ matrix.chromium.dependency != '' }}
         # 'chromium-browser' from Ubuntu APT repo is a dummy package. Its version (85.0.4183.83) means
         # nothing since it calls Snap (disgusting!) to install Chromium, which should be up-to-date.
-        # That's not really a problem since the Chromium-bundled Docker image is based on Debian bullseye,
+        # That's not really a problem since the Chromium-bundled Docker image is based on Debian bookworm,
         # which provides up-to-date native packages.
         run: |
           set -ex
@@ -111,7 +111,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 18, 20 ]
+        node-version: [ 18, 20, 21 ]
     defaults:
       run:
         working-directory: website
@@ -137,7 +137,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 18, 20 ]
+        node-version: [ 18, 20, 21 ]
     name: Build radar and maintainer on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v4
@@ -153,7 +153,7 @@ jobs:
         run: npm run build:all
 
   automerge:
-    if: github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'
+    if: github.triggering_actor == 'dependabot[bot]' && github.event_name == 'pull_request'
     needs: [ jest, puppeteer, docs, all ]
     runs-on: ubuntu-latest
     permissions:

.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/iron

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-bullseye AS dep-builder
+FROM node:20-bookworm AS dep-builder
 # Here we use the non-slim image to provide build-time deps (compilers and python), thus no need to install later.
 # This effectively speeds up qemu-based cross-build.
 
@@ -28,11 +28,11 @@ RUN \
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-FROM debian:bullseye-slim AS dep-version-parser
+FROM debian:bookworm-slim AS dep-version-parser
 # This stage is necessary to limit the cache miss scope.
 # With this stage, any modification to package.json won't break the build cache of the next two stages as long as the
 # version unchanged.
-# node:18-bullseye-slim is based on debian:bullseye-slim so this stage would not cause any additional download.
+# node:20-bookworm-slim is based on debian:bookworm-slim so this stage would not cause any additional download.
 
 WORKDIR /ver
 COPY ./package.json /app/
@@ -44,7 +44,7 @@ RUN \
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-FROM node:18-bullseye-slim AS docker-minifier
+FROM node:20-bookworm-slim AS docker-minifier
 # The stage is used to further reduce the image size by removing unused files.
 
 WORKDIR /minifier
@@ -77,7 +77,7 @@ RUN \
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-FROM node:18-bullseye-slim AS chromium-downloader
+FROM node:20-bookworm-slim AS chromium-downloader
 # This stage is necessary to improve build concurrency and minimize the image size.
 # Yeah, downloading Chromium never needs those dependencies below.
 
@@ -109,7 +109,7 @@ RUN \
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-FROM node:18-bullseye-slim AS app
+FROM node:20-bookworm-slim AS app
 
 LABEL org.opencontainers.image.authors="https://github.com/DIYgod/RSSHub"
 
@@ -123,7 +123,7 @@ ARG TARGETPLATFORM
 ARG PUPPETEER_SKIP_DOWNLOAD=1
 # 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
+# https://www.debian.org/releases/bookworm/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/07391bbf5feaf85c191e1aa8aa78138dce84008d/packages/puppeteer-core/src/node/BrowserFetcher.ts#L128-L131
 RUN \

docker-compose.yml

@@ -36,11 +36,12 @@ services:
     warp-socks:
         image: monius/docker-warp-socks:latest
         privileged: true
+        restart: always
         volumes:
             - /lib/modules:/lib/modules
         cap_add:
             - NET_ADMIN
-            - SYS_ADMIN
+            - SYS_MODULE
         sysctls:
             net.ipv6.conf.all.disable_ipv6: 0
             net.ipv4.conf.all.src_valid_mark: 1

lib/router.js

@@ -1090,8 +1090,8 @@ router.get('/wikihow/index', lazyloadRouteHandler('./routes/wikihow/index.js'));
 router.get('/wikihow/category/:category/:type', lazyloadRouteHandler('./routes/wikihow/category.js'));
 
 // 正版中国
-router.get('/getitfree/category/:category?', lazyloadRouteHandler('./routes/getitfree/category.js'));
-router.get('/getitfree/search/:keyword?', lazyloadRouteHandler('./routes/getitfree/search.js'));
+// router.get('/getitfree/category/:category?', lazyloadRouteHandler('./routes/getitfree/category.js'));
+// router.get('/getitfree/search/:keyword?', lazyloadRouteHandler('./routes/getitfree/search.js'));
 
 // 万联网
 router.get('/10000link/news/:category?', lazyloadRouteHandler('./routes/10000link/news'));
@@ -2545,8 +2545,8 @@ router.get('/wanwansub/info/:id', lazyloadRouteHandler('./routes/wanwansub/info'
 router.get('/wanwansub/:id?', lazyloadRouteHandler('./routes/wanwansub/index'));
 
 // FIX 字幕侠
-router.get('/zimuxia/portfolio/:id', lazyloadRouteHandler('./routes/zimuxia/portfolio'));
-router.get('/zimuxia/:category?', lazyloadRouteHandler('./routes/zimuxia/index'));
+// router.get('/zimuxia/portfolio/:id', lazyloadRouteHandler('./routes/zimuxia/portfolio'));
+// router.get('/zimuxia/:category?', lazyloadRouteHandler('./routes/zimuxia/index'));
 
 // Hugo 更新日志
 router.get('/hugo/releases', lazyloadRouteHandler('./routes/hugo/releases'));