rsshub 1.0.0-master.fe99193 → 1.0.0-master.fe9c82a

package/lib/v2/nintendo/eshop_cn.js

@@ -0,0 +1,44 @@
+const got = require('@/utils/got');
+const util = require('./utils');
+const software_url = 'https://www.nintendoswitch.com.cn/software/';
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const response = await got(software_url);
+
+    // 获取Nuxt对象
+    const result = await util.nuxtReader(response.data);
+
+    /* expectedReleaseNS[]
+        coverImageUrl: "//switch-cn.gtgres.com/global-images/c50e3390-14e5-11ea-9b40-236e671bca9e.png"
+        expectedReleaseDate: 0
+        expectedReleaseDateFuzzy: ""
+        gameName: "Mario Tennis Aces"
+        id: 1852
+        newsPageUrl: ""
+      recentSoftwareList[]
+        imgUrl: "https://metadata-images.nintendoswitch.com.cn/formal/8332803007012-1F2B121D-743F-B868-5595-35C79BB2A817-KV.jpg"
+        jumpUrl: "https://www.nintendoswitch.com.cn/awuxa/index.html"
+        publishTime: "2022.10.31"
+        title: "附带导航！一做就上手 第一次的游戏程序设计"
+    */
+    if (!result.recentSoftwareList) {
+        throw new Error('软件信息不存在，请报告这个问题');
+    }
+
+    let data = result.recentSoftwareList.map((item) => ({
+        title: item.title,
+        description: util.generateImageLink(item.imgUrl),
+        link: item.jumpUrl.startsWith('http') ? item.jumpUrl : `${software_url}${item.jumpUrl}`,
+        pubDate: parseDate(item.publishTime, 'YYYY.MM.DD'),
+    }));
+
+    data = await util.ProcessItemChina(data, ctx.cache);
+
+    ctx.state.data = {
+        title: 'Nintendo eShop（国服）新游戏',
+        link: 'https://www.nintendoswitch.com.cn/software',
+        description: 'Nintendo（国服）新上架的游戏',
+        item: data,
+    };
+};

package/lib/v2/nintendo/eshop_hk.js

@@ -0,0 +1,79 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const response = await got('https://www.nintendo.com.hk/data/json/switch_software.json');
+    const data = response.data.filter(({ link }) => link.startsWith('https://')).slice(0, ctx.query.limit ? Number(ctx.query.limit) : 30);
+
+    // 获取游戏描述
+    const result = await Promise.all(
+        data.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data: response } = await got(item.link);
+                const $ = cheerio.load(response);
+
+                let description;
+                if (item.link.startsWith('https://store.nintendo.com.hk/')) {
+                    const attributes = {
+                        platform: $('.platform .product-attribute-val').text(),
+                        game_category: $('.game_category .product-attribute-val').text(),
+                        release_date: $('.release_date .product-attribute-val').text(),
+                        publisher: $('.publisher .product-attribute-val').text(),
+                        no_of_players: $('.no_of_players .product-attribute-val').text(),
+                        supported_languages: $('.supported_languages .product-attribute-val').text(),
+                        required_space: $('.required_space .product-attribute-val').text(),
+                        supported_controllers: $('.supported_controllers .product-attribute-val').text(),
+                        supported_play_modes: $('.supported_play_modes .product-attribute-val').text(),
+                        disclaimer: $('.disclaimer .product-attribute-val p').text(),
+                        price: $('meta[property="product:price:amount"]').attr('content'),
+                        currency: $('meta[property="product:price:currency"]').attr('content'),
+                    };
+                    const gallery = JSON.parse(
+                        $('[type=text/x-magento-init]')
+                            .text()
+                            .match(/{\n\s+"\[data-gallery-role=gallery-placeholder\]": {\n\s+"mage\/gallery\/gallery".*?}}}}\s+}\n\s+}\n\s+}\n/s)
+                    );
+
+                    description = art(path.join(__dirname, 'templates/eshop_hk.art'), {
+                        attributes,
+                        description: $('.description').html(),
+                        gallery: gallery['[data-gallery-role=gallery-placeholder]']['mage/gallery/gallery'].data,
+                        host: 'store.nintendo.com.hk',
+                    });
+                } else if (item.link.startsWith('https://ec.nintendo.com/')) {
+                    const jsonData = JSON.parse(response.match(/NXSTORE\.titleDetail\.jsonData = ({.*?});/)[1]);
+                    const { data: priceData } = await got('https://ec.nintendo.com/api/HK/zh/guest_prices', {
+                        searchParams: {
+                            ns_uids: jsonData.id,
+                        },
+                    });
+
+                    description = art(path.join(__dirname, 'templates/eshop_hk.art'), {
+                        host: 'ec.nintendo.com',
+                        jsonData,
+                        priceData: priceData[0],
+                    });
+                } else {
+                    // not implemented
+                }
+
+                return {
+                    title: item.title,
+                    description,
+                    link: item.link,
+                    pubDate: parseDate(item.release_date, 'YYYY.M.D'),
+                };
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: 'Nintendo eShop（港服）新游戏',
+        link: 'https://www.nintendo.com.hk/software/switch/',
+        description: 'Nintendo eShop（港服）新上架的游戏',
+        item: result,
+    };
+};

package/lib/v2/nintendo/eshop_jp.js

@@ -0,0 +1,34 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const response = await got('https://search.nintendo.jp/nintendo_soft/search.json', {
+        searchParams: {
+            opt_sshow: 1,
+            fq: 'ssitu_s:onsale OR ssitu_s:preorder OR memo_bg:forced',
+            limit: ctx.query.limit ? Number(ctx.query.limit) : 24,
+            page: 1,
+            c: '50310840317994813',
+            opt_osale: 1,
+            opt_hard: '1_HAC',
+            sort: 'sodate desc,score',
+        },
+    });
+    const data = response.data.result.items;
+
+    ctx.state.data = {
+        title: 'Nintendo eShop（日服）新游戏',
+        link: 'https://www.nintendo.co.jp/software/switch/index.html',
+        description: 'Nintendo eShop（日服）新上架的游戏',
+        item: data.map((item) => ({
+            title: item.title,
+            description: art(path.join(__dirname, 'templates/eshop_jp.art'), {
+                item,
+            }),
+            link: `https://ec.nintendo.com/JP/ja/titles/${item.id}`,
+            pubDate: parseDate(item.pdate),
+        })),
+    };
+};

package/lib/v2/nintendo/eshop_us.js

@@ -0,0 +1,32 @@
+const { art } = require('@/utils/render');
+const got = require('@/utils/got');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const response = await got.post('https://u3b6gr4ua3-dsn.algolia.net/1/indexes/store_game_en_us_release_des/query', {
+        headers: {
+            'x-algolia-api-key': 'a29c6927638bfd8cee23993e51e721c9',
+            'x-algolia-application-id': 'U3B6GR4UA3',
+        },
+        json: {
+            params: new URLSearchParams({
+                hitsPerPage: 40,
+                page: 0,
+                facetFilters: JSON.stringify([['availability:Available now', 'availability:Pre-order']]),
+            }).toString(),
+        },
+    });
+    const data = response.data.hits;
+
+    ctx.state.data = {
+        title: `Nintendo eShop（美服）新游戏`,
+        link: `https://www.nintendo.com/store/games/`,
+        description: `Nintendo eShop（美服）新上架的游戏`,
+        item: data.map((item) => ({
+            title: item.title,
+            description: art(path.join(__dirname, 'templates/eshop_us.art'), item),
+            link: `https://www.nintendo.com${item.url}`,
+        })),
+    };
+    ctx.state.json = response.data;
+};

package/lib/v2/nintendo/maintainer.js

@@ -0,0 +1,7 @@
+module.exports = {
+    '/direct': ['HFO4'],
+    '/eshop/:region': ['HFO4'],
+    '/news': ['HFO4'],
+    '/news/china': ['NeverBehave'],
+    '/system-update': ['hoilc'],
+};

package/lib/v2/nintendo/news.js

@@ -0,0 +1,23 @@
+const got = require('@/utils/got');
+const util = require('./utils');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const response = await got('https://www.nintendo.com.hk/data/json/topics.json');
+    const data = response.data.filter((val) => val.only_for !== 'tw' && val.url.startsWith('/topics/article/')).slice(0, ctx.query.limit ? Number(ctx.query.limit) : 30);
+
+    // 获取新闻正文
+    const result = await util.ProcessNews(data, ctx.cache);
+
+    ctx.state.data = {
+        title: 'Nintendo（香港）主页资讯',
+        link: 'https://www.nintendo.com.hk/topics/',
+        description: 'Nintendo 香港有限公司官网刊登的资讯',
+        item: result.map((item) => ({
+            title: item.title,
+            description: item.content,
+            link: `https://www.nintendo.com.hk${item.url}`,
+            pubDate: parseDate(item.release_date, 'YYYY.M.D'),
+        })),
+    };
+};

package/lib/v2/nintendo/news_china.js

@@ -0,0 +1,35 @@
+const got = require('@/utils/got');
+const util = require('./utils');
+const news_url = 'https://www.nintendoswitch.com.cn';
+
+module.exports = async (ctx) => {
+    const response = await got(news_url);
+
+    // 获取Nuxt对象
+    const result = await util.nuxtReader(response.data);
+
+    /* newsList[]
+        imgUrl: "https://metadata-images.nintendoswitch.com.cn/formal/8332123215251-EAFBA647-9772-DB4B-3C1A-FE0CC41A3966-封面图(1).jpg"
+        jumpUrl: "0691bb11-e6a0-4e8c-9b0b-80470ec0a939"
+        publishTime: "2022.11.08 11:30:00" // 1667878200000
+        title: "8款新品开启预约：超级马力欧系列官方周边"
+    */
+    if (!result.newsList) {
+        throw new Error('新闻信息不存在，请报告这个问题');
+    }
+
+    let data = result.newsList.map((item) => ({
+        title: item.title,
+        description: util.generateImageLink(item.imgUrl),
+        link: `${news_url}/topics/${item.jumpUrl}`,
+    }));
+
+    data = await util.ProcessNewsChina(data, ctx.cache);
+
+    ctx.state.data = {
+        title: 'Nintendo（中国大陆）主页资讯',
+        link: 'https://www.nintendoswitch.com.cn',
+        description: 'Nintendo 中国大陆官网刊登的资讯',
+        item: data,
+    };
+};

package/lib/v2/nintendo/radar.js

@@ -0,0 +1,70 @@
+module.exports = {
+    'nintendo.com': {
+        _name: 'Nintendo',
+        '.': [
+            {
+                title: '直面会',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/nintendo-direct/archive', '/'],
+                target: '/nintendo/direct',
+            },
+            {
+                title: 'eShop 新发售游戏',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/store/games', '/'],
+                target: '/nintendo/eshop/us',
+            },
+        ],
+    },
+    'nintendo.com.hk': {
+        _name: 'Nintendo',
+        '.': [
+            {
+                title: 'eShop 新发售游戏',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/software/switch', '/'],
+                target: '/nintendo/eshop/hk',
+            },
+            {
+                title: '首页资讯（香港）',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/topics', '/'],
+                target: '/nintendo/news',
+            },
+        ],
+    },
+    'nintendo.co.jp': {
+        _name: 'Nintendo',
+        '.': [
+            {
+                title: 'eShop 新发售游戏',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/software/switch/index.html', '/'],
+                target: '/nintendo/eshop/jp',
+            },
+            {
+                title: 'Switch 本体更新情报（日本）',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/support/switch/system_update/index.html', '/'],
+                target: '/nintendo/system-update',
+            },
+        ],
+    },
+    'nintendoswitch.com.cn': {
+        _name: 'Nintendo',
+        '.': [
+            {
+                title: 'eShop 新发售游戏',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/software', '/'],
+                target: '/nintendo/eshop/cn',
+            },
+            {
+                title: '首页资讯（中国）',
+                docs: 'https://docs.rsshub.app/game.html#nintendo',
+                source: ['/'],
+                target: '/nintendo/news/china',
+            },
+        ],
+    },
+};

package/lib/v2/nintendo/router.js

@@ -0,0 +1,10 @@
+module.exports = (router) => {
+    router.get('/direct', require('./direct'));
+    router.get('/eshop/cn', require('./eshop_cn'));
+    router.get('/eshop/hk', require('./eshop_hk'));
+    router.get('/eshop/jp', require('./eshop_jp'));
+    router.get('/eshop/us', require('./eshop_us'));
+    router.get('/news', require('./news'));
+    router.get('/news/china', require('./news_china'));
+    router.get('/system-update', require('./system-update'));
+};

package/lib/{routes → v2}/nintendo/system-update.js

@@ -4,10 +4,10 @@ const cheerio = require('cheerio');
 module.exports = async (ctx) => {
     const url = 'https://www.nintendo.co.jp/support/switch/system_update/index.html';
 
-    const response = await got.get(url);
+    const response = await got(url);
     const $ = cheerio.load(response.data);
 
-    const list = $('#latest > .c-heading-lv3').toArray().slice(1);
+    const list = $('.c-heading-lv3').toArray().slice(1, -2);
 
     ctx.state.data = {
         title: 'Nintendo Switch 本体更新情報',

package/lib/v2/nintendo/templates/direct.art

@@ -0,0 +1,6 @@
+{{ if publicId }}<img src="https://assets.nintendo.com/image/upload/{{ publicId }}">{{ /if }}
+{{ if content }}
+    {{ each content C }}
+        {{ if C.nodeType === 'paragraph' }}<p>{{ each C.content c }}{{ c.value }}{{ /each }}</p>{{ /if }}
+    {{ /each }}
+{{ /if }}

package/lib/v2/nintendo/templates/eshop_cn.art

@@ -0,0 +1,21 @@
+{{ if software.coverImage }}<img src="https:{{ software.coverImage }}">{{ else }}{{@ item.description }}{{ /if }}
+<h1>{{ software.descriptionTitle }}</h1>
+{{ if software.descriptionContent }}{{@ software.descriptionContent.replace(/\\n/g, '<br>') }}<br><br>{{ /if }}
+<table>
+  {{ if software.price }}<tr><th>建议零售价</th><td>{{ software.price }} {{ software.currency }}</td></tr>{{ /if }}
+  {{ if software.sizeNum }}<tr><th>游戏大小</th><td>{{ software.sizeNum }} {{ software.sizeUnit }}</td></tr>{{ /if }}
+  {{ if software.playMode }}<tr><th>游戏模式</th><td>{{ software.playMode.map((s) => s).join(', ') }}</td></tr>{{ /if }}
+  {{ if software.normalPlayersNum }}<tr><th>游戏人数</th><td>{{ if software.normalPlayersNum.max === software.normalPlayersNum.min }}{{ software.normalPlayersNum.max }}{{ else }}{{ software.normalPlayersNum.min }}-{{ software.normalPlayersNum.max }}{{ /if }}</td></tr>{{ /if }}
+  {{ if software.handleSupport }}<tr><th>手柄支持</th><td>{{ software.handleSupport }}</td></tr>{{ /if }}
+  {{ if software.platform }}<tr><th>平台</th><td>{{ software.platform }}</td></tr>{{ /if }}
+  {{ if software.publisher }}<tr><th>发行商</th><td>{{ software.publisher }}</td></tr>{{ /if }}
+  {{ if software.genre }}<tr><th>类型</th><td>{{ software.genre.map((s) => s).join('/') }}</td></tr>{{ /if }}
+  {{ if releaseDatetime }}<tr><th>发售日</th><td>{{ releaseDatetime }}</td></tr>{{ /if }}
+  {{ if software.supportLanguages }}<tr><th>支持语言</th><td>{{ software.supportLanguages.map((s) => s).join('/') }}</td></tr>{{ /if }}
+  {{ if software.ageAppropriateInfo }}<tr><th>适龄信息</th><td>{{@ software.ageAppropriateInfo.text.replace(/\n/g, '<br>') }}</td></tr>{{ /if }}
+</table><br>
+{{ if software.images }}
+<% for(var i = 1; i < software.images.length; i++){ %>
+    <img src="https:<%= software.images[i] %>">
+<% } %>
+{{ /if }}

package/lib/v2/nintendo/templates/eshop_hk.art

@@ -0,0 +1,61 @@
+{{ if host === 'store.nintendo.com.hk' }}
+
+{{ if gallery }}{{ each gallery g }}{{ if g.type === 'image' && g.isMain }}<img src="{{ g.full || g.img || g.thumb }}">{{ /if }}{{ /each }}{{ /if }}
+<table>
+  <tr>
+    {{ if attributes.platform }}<th>支援平台：</th><td>{{ attributes.platform }}</td>{{ /if }}
+    {{ if attributes.supported_languages }}<th>對應語言：</th><td>{{ attributes.supported_languages }}</td>{{ /if }}
+  </tr>
+  <tr>
+    {{ if attributes.game_category }}<th>遊戲類型：</th><td>{{ attributes.game_category }}</td>{{ /if }}
+    {{ if attributes.required_space }}<th>所需容量（約）：</th><td>{{ attributes.required_space }}</td>{{ /if }}
+  </tr>
+  <tr>
+    {{ if attributes.release_date }}<th>發售日：</th><td>{{ attributes.release_date }}</td>{{ /if }}
+    {{ if attributes.supported_controllers }}<th>支援的控制器：</th><td>{{ attributes.supported_controllers }}</td>{{ /if }}
+  </tr>
+  <tr>
+    {{ if attributes.publisher }}<th>發行商：</th><td>{{ attributes.publisher }}</td>{{ /if }}
+    {{ if attributes.supported_play_modes }}<th>遊玩模式：</th><td>{{ attributes.supported_play_modes }}</td>{{ /if }}
+  </tr>
+  <tr>
+    {{ if attributes.no_of_players }}<th>遊玩人數：</th><td>{{ attributes.no_of_players }}</td>{{ /if }}
+    {{ if attributes.price }}<th>售價：</th><td>{{ attributes.currency }} {{ attributes.price }}</td>{{ /if }}
+  </tr>
+</table>
+{{ if attributes.disclaimer }}{{ attributes.disclaimer }}{{ /if }}
+<br><br>{{@ description }}<br>
+{{ if gallery }}{{ each gallery g }}
+    {{ if g.type === 'image' && !g.isMain }}<img src="{{ g.full || g.img || g.thumb }}">{{ /if }}
+{{ /each }}{{ /if }}
+
+{{ else if host === 'ec.nintendo.com' }}
+
+{{ if jsonData.hero_banner_url }}<img src="{{ jsonData.hero_banner_url }}">{{ /if }}
+<h2>{{ jsonData.catch_copy }}</h2>
+<div>{{@ jsonData.description.replace(/\n/g, '<br>') }}</div>
+{{ if jsonData.notices }}
+<br><span>廠商通知</span>
+<div>{{ jsonData.notices[0].text }}</div><br>
+{{ /if }}
+<table>
+  {{ if priceData }}<tr><th>售價</th><td>{{ priceData.price.regular_price.formatted_value }}</td></tr>{{ /if }}
+  {{ if jsonData.total_rom_size }}<tr><th>需要空間</th><td>{{ (jsonData.total_rom_size / 1024 / 1024 / 1024).toFixed(1) }} GB</td></tr>{{ /if }}
+  {{ if jsonData.play_styles }}<tr><th>遊玩模式</th><td>{{ jsonData.play_styles.map((s) => s.name).join(', ') }}</td></tr>{{ /if }}
+  {{ if jsonData.player_number }}<tr><th>遊玩人數</th><td>{{ jsonData.player_number.offline_max }}</td></tr>{{ /if }}
+  {{ if jsonData.player_number }}<tr><th>鄰近主機通訊遊玩人數</th><td>{{ jsonData.player_number.local_max }}</td></tr>{{ /if }}
+  {{ if jsonData.player_number }}<tr><th>網路通訊遊玩人數</th><td>{{ jsonData.player_number.online_max }}</td></tr>{{ /if }}
+  {{ if jsonData.controllers }}<tr><th>對應控制器</th><td>{{ jsonData.controllers.map((c) => c.name).join(', ') }}</td></tr>{{ /if }}
+  {{ if jsonData.cloud_backup_type }}<tr><th>保管儲存資料</th><td>{{ jsonData.cloud_backup_type === 'supported' ? '對應' : '不對應' }}</td></tr>{{ /if }}
+  {{ if jsonData.platform }}<tr><th>平台</th><td>{{ jsonData.platform.name }}</td></tr>{{ /if }}
+  {{ if jsonData.publisher }}<tr><th>廠商</th><td>{{ jsonData.publisher.name }}</td></tr>{{ /if }}
+  {{ if jsonData.genre }}<tr><th>類型</th><td>{{ jsonData.genre }}</td></tr>{{ /if }}
+  {{ if jsonData.release_date_on_eshop }}<tr><th>發布日</th><td>{{ jsonData.release_date_on_eshop }}</td></tr>{{ /if }}
+  {{ if jsonData.languages }}<tr><th>對應語言</th><td>{{ jsonData.languages.map((l) => l.name).join(', ') }}</td></tr>{{ /if }}
+</table>
+{{ if jsonData.network_feature_description}}{{ jsonData.network_feature_description }}<br>{{ /if }}
+{{ if jsonData.copyright_text }}{{ jsonData.copyright_text }}{{ /if }}
+{{ if jsonData.screenshots }}{{ each jsonData.screenshots s }}
+    {{ each s.images i }}<img src="{{ i.url }}">{{ /each }}
+{{ /each }}{{ /if }}
+{{ /if }}

package/lib/v2/nintendo/templates/eshop_jp.art

@@ -0,0 +1,3 @@
+<img src="https://img-eshop.cdn.nintendo.net/i/{{ item.iurl }}.jpg"><br><strong>发售日期：</strong>{{ item.pdate }}<br><strong>价格：</strong>{{ item.dprice }}円<br><br>
+{{ if item.hcopy }}{{ each item.hcopy h }}<b>{{ h }}</b><br>{{ /each }}{{ /if }}<br>
+{{@ item.text.replace(/\n/g, '<br>') }}

package/lib/v2/nintendo/templates/eshop_us.art

@@ -0,0 +1,24 @@
+<p>
+    {{ if availability.includes("Pre-order") }}
+        预售中<br>
+    {{ /if }}
+    {{ if releaseDateDisplay }}
+        预计发售时间：{{ releaseDateDisplay }}
+    {{ /if }}
+    {{ if price }}
+        当前价格：{{ if price.finalPrice === 0 }}免费{{ else }}${{ price.finalPrice }}{{ /if }}<br>
+        {{ if price.salePrice }}
+            原价：${{ price.regPrice }}<br>
+        {{ /if }}
+    {{ /if }}
+    {{ if genres }}
+        类别：{{ genres.join(', ') }}<br>
+    {{ /if }}
+    {{ if softwareDeveloper }}
+        开发商：{{ softwareDeveloper }}<br>
+    {{ /if }}
+    {{ if softwarePublisher }}
+        发行商：{{ softwarePublisher }}<br>
+    {{ /if }}
+</p>
+<p>{{ description }}</p>

package/lib/{routes → v2}/nintendo/utils.js

@@ -1,6 +1,13 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { JSDOM } = require('jsdom');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+const dayjs = require('dayjs');
+const localizedFormat = require('dayjs/plugin/localizedFormat');
+require('dayjs/locale/zh-cn');
+dayjs.extend(localizedFormat);
 
 function nuxtReader(data) {
     let nuxt = {};
@@ -21,10 +28,7 @@ function generateImageLink(link) {
 }
 
 async function load(link) {
-    const response = await got({
-        method: 'get',
-        url: link,
-    });
+    const response = await got(link);
 
     const data = response.data;
 
@@ -37,20 +41,17 @@ async function load(link) {
 }
 
 async function loadNews(link) {
-    const response = await got({
-        method: 'get',
-        url: link,
-    });
+    const response = await got(link);
 
     const data = response.data;
 
     const $ = cheerio.load(data);
     let description = $('.detail-body-container').html();
-    const date = $('.topics-articleHead__date').html();
-    description = description.replace(new RegExp('src="/topics/', 'g'), ' src="https://www.nintendo.com.hk/topics/');
+    const date = $('.topics-articleHead__date').text();
+    description = description.replace(/src="\/topics\//g, 'src="https://www.nintendo.com.hk/topics/');
     return {
         content: description,
-        date: new Date(date).toUTCString(),
+        pubDate: parseDate(date, 'YYYY.M.D'),
     };
 }
 
@@ -58,7 +59,7 @@ const ProcessItem = (list, caches) =>
     Promise.all(
         list.map(async (item) => {
             const other = await caches.tryGet(item.link, () => load(item.link));
-            return Promise.resolve(Object.assign({}, item, other));
+            return { ...item, ...other };
         })
     );
 
@@ -66,7 +67,7 @@ const ProcessNews = (list, caches) =>
     Promise.all(
         list.map(async (item) => {
             const other = await caches.tryGet(item.url, () => loadNews('https://www.nintendo.com.hk' + item.url));
-            return Promise.resolve(Object.assign({}, item, other));
+            return { ...item, ...other };
         })
     );
 
@@ -129,50 +130,33 @@ const ProcessNews = (list, caches) =>
 const ProcessItemChina = (list, cache) =>
     Promise.all(
         list.map(async (item) => {
-            const n = await cache.tryGet(item.link, async () =>
-                nuxtReader(
-                    (
-                        await got({
-                            url: item.link,
-                            method: 'get',
-                        })
-                    ).data
-                )
-            );
+            if (!item.link.startsWith('https://www.nintendoswitch.com.cn/software/')) {
+                return item;
+            }
+            const n = await cache.tryGet(item.link, async () => nuxtReader((await got(item.link)).data));
             const software = n.data;
-            return Promise.resolve(
-                Object.assign({}, item, {
-                    category: [...item.category, ...software.supportLanguages, ...software.genre, ...software.playMode],
-                    description: `
-            ${item.description}
-            价格: ${software.price} ${software.currency} <br/>
-            大小：${software.sizeNum} ${software.sizeUnit} <br/>
-
-            ${software.descriptionContent}
-            `,
-                })
-            );
+            return {
+                ...item,
+                category: [...software.supportLanguages, ...software.genre, ...software.playMode],
+                description: art(path.join(__dirname, 'templates/eshop_cn.art'), {
+                    item,
+                    software,
+                    releaseDatetime: dayjs(software.releaseDatetime).locale('zh-cn').format('lll'),
+                }),
+            };
         })
     );
 
 const ProcessNewsChina = (list, cache) =>
     Promise.all(
         list.map(async (item) => {
-            const n = await cache.tryGet(item.link, async () =>
-                nuxtReader(
-                    (
-                        await got({
-                            url: item.link,
-                            method: 'get',
-                        })
-                    ).data
-                )
-            );
-            return Promise.resolve(
-                Object.assign({}, item, {
-                    description: item.description + n.newsData.content,
-                })
-            );
+            const n = await cache.tryGet(item.link, async () => nuxtReader((await got(item.link)).data));
+            return {
+                ...item,
+                description: item.description + n.newsData.content,
+                category: n.newsData.category,
+                pubDate: parseDate(n.newsData.releaseTime, 'x'),
+            };
         })
     );
 

package/lib/v2/njnu/ceai/utils.js

@@ -23,8 +23,8 @@ async function load(link) {
     return { description, pubDate };
 }
 
-const ProcessFeed = async (list, caches) =>
-    await Promise.all(
+const ProcessFeed = (list, caches) =>
+    Promise.all(
         // 遍历每一篇文章
         list.map(async (item) => {
             const $ = cheerio.load(item);
@@ -43,7 +43,7 @@ const ProcessFeed = async (list, caches) =>
 
             // 使用tryGet方法从缓存获取内容。
             // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。
-            const other = await caches.tryGet(itemUrl, async () => await load(itemUrl));
+            const other = await caches.tryGet(itemUrl, () => load(itemUrl));
 
             // 合并解析后的结果集作为该篇文章最终的输出结果
             return { ...single, ...other };