Merge pull request #2299 from DIYgod/master

[pull] master from diygod:master

lib/middleware/cache/index.js

@@ -1,4 +1,4 @@
-const md5 = require('@/utils/md5');
+const xxhash = require('xxhash-wasm');
 const config = require('@/config').value;
 const logger = require('@/utils/logger');
 const { RequestInProgressError } = require('@/errors');
@@ -81,8 +81,9 @@ module.exports = function (app) {
     };
 
     return async (ctx, next) => {
-        const key = 'koa-redis-cache:' + md5(ctx.request.path);
-        const controlKey = 'path-requested:' + md5(ctx.request.path);
+        const { h64ToString } = await xxhash();
+        const key = 'rsshub:koa-redis-cache:' + h64ToString(ctx.request.path);
+        const controlKey = 'rsshub:path-requested:' + h64ToString(ctx.request.path);
 
         if (!status.available) {
             return next();

lib/middleware/cache/redis.js

@@ -19,10 +19,10 @@ redisClient.on('connect', () => {
 });
 
 const getCacheTtlKey = (key) => {
-    if (key.startsWith('cacheTtl:')) {
-        throw Error('"cacheTtl:" prefix is reserved for the internal usage, please change your cache key'); // blocking any attempt to get/set the cacheTtl
+    if (key.startsWith('rsshub:cacheTtl:')) {
+        throw Error('"rsshub:cacheTtl:" prefix is reserved for the internal usage, please change your cache key'); // blocking any attempt to get/set the cacheTtl
     }
-    return `cacheTtl:${key}`;
+    return `rsshub:cacheTtl:${key}`;
 };
 
 module.exports = {

lib/v2/kepu/live.js

@@ -0,0 +1,89 @@
+const got = require('@/utils/got');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit, 10) : 50;
+
+    const rootUrl = 'https://live.kepu.net.cn';
+    const apiRootUrl = 'https://live.kepu.net.cn:8089';
+
+    const currentUrl = new URL('replay/index', rootUrl).href;
+    const apiUrl = new URL('index.php/front/index/replay_list', apiRootUrl).href;
+
+    const { data: response } = await got.post(apiUrl, {
+        form: {
+            page: 1,
+            size: limit,
+        },
+    });
+
+    let items = response.data.data.slice(0, limit).map((item) => ({
+        title: item.title,
+        link: new URL(`live/index?id=${item.id}`, rootUrl).href,
+        description: item.desc,
+        author: item.company,
+        guid: item.id,
+        pubDate: timezone(parseDate(item.live_start_time ?? item.start_time), +8),
+        updated: timezone(parseDate(item.live_end_time ?? item.end_time), +8),
+        itunes_item_image: new URL(item.cover, apiRootUrl).href,
+        comments: item.display_comment ?? 0,
+    }));
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const apiReplayUrl = new URL('index.php/front/live/replay_url', apiRootUrl).href;
+
+                const { data: detailResponse } = await got.post(apiReplayUrl, {
+                    form: {
+                        id: item.guid,
+                    },
+                });
+
+                item.guid = `kepu-live#${item.guid}`;
+                item.enclosure_url = detailResponse.data.RecordIndexInfoList.RecordIndexInfo.pop()?.RecordUrl;
+
+                if (item.enclosure_url) {
+                    item.enclosure_type = `video/${item.enclosure_url.split(/\./).pop()}`;
+                }
+
+                item.description = art(path.join(__dirname, 'templates/description.art'), {
+                    image: {
+                        src: item.itunes_item_image,
+                        alt: item.title,
+                    },
+                    video: {
+                        src: item.enclosure_url,
+                        type: item.enclosure_type,
+                        poster: item.itunes_item_image,
+                    },
+                    description: item.description,
+                });
+
+                return item;
+            })
+        )
+    );
+
+    const icon = new URL('favicon.ico', rootUrl).href;
+    const author = '中国科普博览';
+    const subtitle = '直播回看';
+
+    ctx.state.data = {
+        item: items,
+        title: `${author} - ${subtitle}`,
+        link: currentUrl,
+        description: '科学直播(live.kepu.net.cn)',
+        language: 'zh',
+        icon,
+        logo: icon,
+        subtitle,
+        author,
+        itunes_author: author,
+        itunes_category: 'Science',
+        allowEmpty: true,
+    };
+};

lib/v2/kepu/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/live': ['nczitzk'],
+};

lib/v2/kepu/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'kepu.net.cn': {
+        _name: '中国科普博览',
+        live: [
+            {
+                title: '直播回看',
+                docs: 'https://docs.rsshub.app/routes/new-media#zhong-guo-ke-pu-bo-lan-zhi-bo-hui-kan',
+                source: ['/replay/index'],
+                target: '/kepu/live',
+            },
+        ],
+    },
+};

lib/v2/kepu/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/live', require('./live'));
+};

lib/v2/kepu/templates/description.art

@@ -0,0 +1,33 @@
+{{ if image?.src }}
+  <figure>
+    <img 
+      {{ if image.alt }}
+        alt="{{ image.alt }}"
+      {{ /if }}
+    src="{{ image.src }}">
+  </figure>
+{{ /if }}
+
+{{ if intro }}
+  <p>{{ intro }}</p>
+{{ /if }}
+
+{{ if video?.src }}
+  <video
+    {{ set poster = video.poster || image?.src }}
+    {{ if poster }}
+      poster="{{ poster }}"
+    {{ /if }}
+    controls>
+    <source
+      src="{{ video.src }}"
+      type="{{ video.type }}">
+    <object data="{{ video.src }}">
+      <embed src="{{ video.src }}">
+    </object>
+  </video>
+{{ /if }}
+
+{{ if description }}
+  <p>{{ description }}</p>
+{{ /if }}

package.json

@@ -130,7 +130,7 @@
     "oauth-1.0a": "2.2.6",
     "plist": "3.1.0",
     "proxy-chain": "2.4.0",
-    "puppeteer": "21.5.2",
+    "puppeteer": "21.6.0",
     "puppeteer-extra": "3.3.6",
     "puppeteer-extra-plugin-stealth": "2.11.2",
     "puppeteer-extra-plugin-user-data-dir": "2.4.1",
@@ -146,7 +146,8 @@
     "tiny-async-pool": "2.1.0",
     "tough-cookie": "4.1.3",
     "twitter-api-v2": "1.15.2",
-    "winston": "3.11.0"
+    "winston": "3.11.0",
+    "xxhash-wasm": "1.0.2"
   },
   "devDependencies": {
     "@microsoft/eslint-formatter-sarif": "3.0.0",

test/middleware/cache.js

@@ -13,7 +13,7 @@ beforeAll(() => {
 afterEach(() => {
     delete process.env.CACHE_TYPE;
     jest.resetModules();
-    server.close();
+    server?.close();
 });
 
 afterAll(() => {
@@ -203,4 +203,17 @@ describe('cache', () => {
             expect(e.message).toContain('Cache key must be a string');
         }
     });
+
+    it('throws TTL key', async () => {
+        process.env.CACHE_TYPE = 'redis';
+        const app = require('../../lib/app');
+
+        try {
+            await app.context.cache.get('rsshub:cacheTtl:mock');
+        } catch (e) {
+            expect(e.message).toContain('reserved for the internal usage');
+        } finally {
+            await app.context.cache.clients.redisClient.quit();
+        }
+    });
 });

website/docs/routes/new-media.mdx

@@ -6439,6 +6439,12 @@ column 为 third 时可选的 category:
 
 </Route>
 
+## 中国科普博览 {#zhong-guo-ke-pu-bo-lan}
+
+### 直播回看 {#zhong-guo-ke-pu-bo-lan-zhi-bo-hui-kan}
+
+<Route author="nczitzk" example="/kepu/live" path="/kepu/live" radar="1" supportBT="1"/>
+
 ## 中国科学院青年创新促进会 {#zhong-guo-ke-xue-yuan-qing-nian-chuang-xin-cu-jin-hui}
 
 ### 最新博文 {#zhong-guo-ke-xue-yuan-qing-nian-chuang-xin-cu-jin-hui-zui-xin-bo-wen}