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

package/lib/utils/puppeteer-utils.js

@@ -0,0 +1,63 @@
+/**
+ * Get Cookie-header-style cookie string from a puppeteer-style cookie array
+ *
+ * @param {import('puppeteer').Protocol.Network.CookieParam[]} cookies Puppeteer-style cookie array
+ * @param {RegExp | string} domainFilter Filter cookies by domain or RegExp
+ * @return {string} Cookie-header-style cookie string (e.g. "foobar; foo=bar; baz=qux")
+ */
+const parseCookieArray = (cookies, domainFilter = null) => {
+    if (typeof domainFilter === 'string') {
+        const dotDomain = '.' + domainFilter;
+        cookies = cookies.filter(({ domain }) => domain === domainFilter || domain.endsWith(dotDomain));
+    } else if (domainFilter && domainFilter.test !== undefined) {
+        cookies = cookies.filter(({ domain }) => domainFilter.test(domain));
+    }
+    // {name: '', value: 'foobar'} => 'foobar' // https://stackoverflow.com/questions/42531198/cookie-without-a-name
+    // {name: 'foo', value: 'bar'} => 'foo=bar'
+    return cookies.map(({ name, value }) => (name ? `${name}=${value}` : value)).join('; ');
+};
+
+/**
+ * Construct a puppeteer-style cookie array from a Cookie-header-style cookie string
+ *
+ * @param {string} cookieStr Cookie-header-style cookie string (e.g. "foobar; foo=bar; baz=qux")
+ * @param {string} domain Domain to set for each cookie
+ * @return {import('puppeteer').Protocol.Network.CookieParam[]} Puppeteer-style cookie array
+ */
+const constructCookieArray = (cookieStr, domain) =>
+    cookieStr.split('; ').map((item) => {
+        const [name, value] = item.split('=');
+        return value === undefined ? { name: '', value: name, domain } : { name, value, domain };
+    });
+
+/**
+ * Set cookies for a page
+ *
+ * @param {import('puppeteer').Page} page Puppeteer Page object
+ * @param {string} cookieStr Cookie-header-style cookie string (e.g. "foobar; foo=bar; baz=qux")
+ * @param {string} domain Domain to set for each cookie
+ * @return {Promise<void>}
+ */
+const setCookies = async (page, cookieStr, domain) => {
+    const cookies = constructCookieArray(cookieStr, domain);
+    await page.setCookie(...cookies);
+};
+
+/**
+ * Get Cookie-header-style cookie string from a page
+ *
+ * @param {import('puppeteer').Page} page Puppeteer Page object
+ * @param {RegExp | string} domainFilter Filter cookies by domain or RegExp
+ * @return {Promise<string>} Cookie-header-style cookie string
+ */
+const getCookies = async (page, domainFilter = null) => {
+    const cookies = await page.cookies();
+    return parseCookieArray(cookies, domainFilter);
+};
+
+module.exports = {
+    parseCookieArray,
+    constructCookieArray,
+    setCookies,
+    getCookies,
+};

package/lib/utils/puppeteer.js

@@ -1,6 +1,8 @@
 const config = require('@/config').value;
+const { proxyUri, proxyUrlHandler } = require('./unify-proxy');
 let puppeteer = require('puppeteer');
 const proxyChain = require('proxy-chain');
+const logger = require('./logger');
 
 const options = {
     args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-infobars', '--window-position=0,0', '--ignore-certificate-errors', '--ignore-certificate-errors-spki-list', `--user-agent=${config.ua}`],
@@ -8,13 +10,6 @@ const options = {
     ignoreHTTPSErrors: true,
 };
 
-let proxyUri;
-if (config.proxyUri && typeof config.proxyUri === 'string') {
-    proxyUri = config.proxyUri;
-} else if (config.proxy && config.proxy.protocol && config.proxy.host && config.proxy.port) {
-    proxyUri = `${config.proxy.protocol}://${config.proxy.host}:${config.proxy.port}`;
-}
-
 /**
  * @param {Object} extraOptions
  * @param {boolean} extraOptions.stealth - Use puppeteer-extra-plugin-stealth
@@ -50,7 +45,17 @@ module.exports = async (extraOptions = {}) => {
     }
     let browser;
     if (proxyUri) {
-        options.args.push(`--proxy-server=${await proxyChain.anonymizeProxy(proxyUri)}`);
+        if (proxyUrlHandler.username || proxyUrlHandler.password) {
+            // only proxies with authentication need to be anonymized
+            if (proxyUrlHandler.protocol === 'http:') {
+                options.args.push(`--proxy-server=${await proxyChain.anonymizeProxy(proxyUri)}`);
+            } else {
+                logger.warn('SOCKS/HTTPS proxy with authentication is not supported by puppeteer, continue without proxy');
+            }
+        } else {
+            // Chromium cannot recognize socks5h and socks4a, so we need to trim their postfixes
+            options.args.push(`--proxy-server=${proxyUri.replace('socks5h://', 'socks5://').replace('socks4a://', 'socks4://')}`);
+        }
     }
     if (config.puppeteerWSEndpoint) {
         browser = await puppeteer.connect({

package/lib/utils/render.js

@@ -1,7 +1,9 @@
 const art = require('art-template');
+const json = require('@/views/json');
 
 // We may add more control over it later
 
 module.exports = {
     art,
+    json, // This should be used by RSSHub middleware only.
 };

package/lib/utils/request-wrapper.js

@@ -1,127 +1,65 @@
 const config = require('@/config').value;
+const { proxyUri, proxyObj, proxyUrlHandler } = require('./unify-proxy');
 const logger = require('./logger');
 const http = require('http');
 const https = require('https');
 
-let tunnel;
-let HttpsProxyAgent;
-let SocksProxyAgent;
-
 let agent = null;
-if (config.proxyUri && typeof config.proxyUri === 'string') {
-    let proxy = null;
-    if (config.proxyUri.startsWith('http')) {
-        HttpsProxyAgent = HttpsProxyAgent || require('https-proxy-agent');
-        proxy = new HttpsProxyAgent(config.proxyUri);
-    } else if (config.proxyUri.startsWith('socks')) {
-        SocksProxyAgent = SocksProxyAgent || require('socks-proxy-agent').SocksProxyAgent;
-        proxy = new SocksProxyAgent(config.proxyUri);
-    } else {
-        throw 'Unknown proxy-uri format';
-    }
-
-    agent = {
-        http: proxy,
-        https: proxy,
-    };
-} else if (config.proxy && config.proxy.protocol && config.proxy.host && config.proxy.port) {
-    agent = {};
-    const proxyUrl = `${config.proxy.protocol}://${config.proxy.host}:${config.proxy.port}`;
-
-    switch (config.proxy.protocol) {
-        case 'socks':
-            SocksProxyAgent = SocksProxyAgent || require('socks-proxy-agent').SocksProxyAgent;
-            agent.http = new SocksProxyAgent(proxyUrl);
-            agent.https = new SocksProxyAgent(proxyUrl);
-            break;
-        case 'http':
-            tunnel = tunnel || require('tunnel');
-            process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;
-            agent.http = tunnel.httpOverHttp({
-                proxy: {
-                    host: config.proxy.host,
-                    port: parseInt(config.proxy.port),
-                },
-            });
-            agent.https = tunnel.httpsOverHttp({
-                proxy: {
-                    host: config.proxy.host,
-                    port: parseInt(config.proxy.port),
-                },
-            });
-            break;
-        case 'https':
-            tunnel = tunnel || require('tunnel');
-            agent.http = tunnel.httpOverHttps({
-                proxy: {
-                    host: config.proxy.host,
-                    port: parseInt(config.proxy.port),
-                },
-            });
-            agent.https = tunnel.httpsOverHttps({
-                proxy: {
-                    host: config.proxy.host,
-                    port: parseInt(config.proxy.port),
-                },
-            });
-            break;
+if (proxyUri) {
+    if (proxyUri.startsWith('http')) {
+        const HttpsProxyAgent = require('https-proxy-agent');
+        agent = new HttpsProxyAgent(proxyUri);
+    } else if (proxyUri.startsWith('socks')) {
+        const SocksProxyAgent = require('socks-proxy-agent').SocksProxyAgent;
+        agent = new SocksProxyAgent(proxyUri);
     }
 }
 
-const requestWrapper = (url, options) => {
-    // agent
-    if (agent && new RegExp(config.proxy.url_regex).test(url)) {
-        let agentResult;
-        try {
-            agentResult = agent[(options.protocol || url.match(/(^https?:)/)[1]).slice(0, -1)];
-        } catch (error) {
-            agentResult = null;
-        }
-        try {
-            if (new URL(url).host !== new URL(config.proxyUri).host) {
-                options.agent = agentResult;
-            }
-        } catch (error) {
-            options.agent = agentResult;
-        }
+let proxyWrapper = () => false;
+if (agent) {
+    const proxyRegex = new RegExp(proxyObj.url_regex);
+    const protocolMatch = (protocolLike) => protocolLike && protocolLike.toLowerCase().startsWith('http');
 
-        if (config.proxy.auth) {
-            if (!options.headers) {
-                options.headers = {};
+    proxyWrapper = (url, options, urlHandler) => {
+        if (proxyRegex.test(url)) {
+            if ((protocolMatch(options.protocol) || protocolMatch(url)) && (!urlHandler || urlHandler.host !== proxyUrlHandler.host)) {
+                options.agent = agent;
+                if (proxyObj.auth) {
+                    options.headers['Proxy-Authorization'] = `Basic ${proxyObj.auth}`;
+                }
+                return true;
             }
-            options.headers['Proxy-Authorization'] = `Basic ${config.proxy.auth}`;
         }
-        logger.info(`Proxy for ${url}`);
-    } else {
-        logger.debug(`Requesting ${url}`);
+        return false;
+    };
+}
+
+const requestWrapper = (url, options) => {
+    let urlHandler;
+    try {
+        urlHandler = new URL(url);
+    } catch (error) {
+        // ignore
     }
+    options.headers = options.headers || {};
+    const headersLowerCaseKeys = Object.keys(options.headers).map((key) => key.toLowerCase());
+
+    proxyWrapper(url, options, urlHandler) ? logger.info(`Proxy for ${url}`) : logger.debug(`Requesting ${url}`);
 
     // ua
-    let hasUA = false;
-    for (const header in options.headers) {
-        if (header.toLowerCase() === 'user-agent') {
-            hasUA = true;
-        }
-    }
-    if (!hasUA) {
-        if (!options.headers) {
-            options.headers = {};
-        }
+    if (!headersLowerCaseKeys.includes('user-agent')) {
         options.headers['user-agent'] = config.ua;
     }
 
-    try {
-        const urlHandler = new URL(url);
+    if (urlHandler) {
         // referer
-        if (!options.headers.referer && !options.headers.Referer) {
+        if (!headersLowerCaseKeys.includes('referer')) {
             options.headers.referer = urlHandler.origin;
         }
         // host
-        if (!options.headers.host && !options.headers.Host) {
+        if (!headersLowerCaseKeys.includes('host')) {
             options.headers.host = urlHandler.host;
         }
-    } catch (e) {
-        // do nothing
     }
 };
 

package/lib/utils/unify-proxy.js

@@ -0,0 +1,116 @@
+const config = require('@/config').value;
+const logger = require('./logger');
+
+const defaultProtocol = 'http';
+const possibleProtocol = ['http', 'https', 'socks', 'socks4', 'socks4a', 'socks5', 'socks5h'];
+
+const unifyProxy = (proxyUri, proxyObj) => {
+    proxyObj = proxyObj || {};
+    const [oriProxyUri, oriProxyObj] = [proxyUri, proxyObj];
+    proxyObj = { ...proxyObj };
+
+    let proxyUrlHandler;
+
+    // PROXY_URI
+    if (proxyUri && typeof proxyUri === 'string') {
+        if (!proxyUri.includes('://')) {
+            logger.warn(`PROXY_URI contains no protocol, assuming ${defaultProtocol}`);
+            proxyUri = `${defaultProtocol}://${proxyUri}`;
+        }
+        try {
+            proxyUrlHandler = new URL(proxyUri);
+        } catch (e) {
+            logger.error(`Parse PROXY_URI error: ${e.stack}`);
+        }
+    }
+
+    // PROXY_{PROTOCOL,HOST,PORT}
+    if (proxyObj.protocol || proxyObj.host || proxyObj.port) {
+        if (proxyUrlHandler) {
+            logger.warn('PROXY_URI is set, ignoring PROXY_{PROTOCOL,HOST,PORT}');
+        } else if (proxyObj.host) {
+            let tempProxyStr = proxyObj.host;
+
+            if (tempProxyStr.includes('://')) {
+                logger.warn('PROXY_HOST contains protocol, ignoring PROXY_PROTOCOL');
+            } else if (!proxyObj.protocol) {
+                logger.warn(`PROXY_PROTOCOL is not set, assuming '${defaultProtocol}'`);
+                tempProxyStr = `${defaultProtocol}://${tempProxyStr}`;
+            } else {
+                tempProxyStr = `${proxyObj.protocol}://${tempProxyStr}`;
+            }
+            try {
+                proxyUrlHandler = new URL(tempProxyStr);
+                if (proxyUrlHandler.port && proxyObj.port) {
+                    logger.warn('PROXY_HOST contains port, ignoring PROXY_PORT');
+                } else if (proxyObj.port) {
+                    if (!parseInt(proxyObj.port)) {
+                        logger.warn(`PROXY_PORT is not a number, ignoring`);
+                    } else {
+                        proxyUrlHandler.port = proxyObj.port;
+                    }
+                } else {
+                    logger.warn('PROXY_PORT is not set, leaving proxy agent to determine');
+                }
+            } catch (e) {
+                logger.error(`Parse PROXY_HOST error: ${e.stack}`);
+            }
+        } else {
+            logger.warn('Either PROXY_{PROTOCOL,PORT} is set, but PROXY_HOST is missing, ignoring');
+        }
+    }
+
+    // PROXY_AUTH
+    if (proxyObj.auth && proxyUrlHandler) {
+        let promptProxyUri = false;
+        if (proxyUrlHandler.username || proxyUrlHandler.password) {
+            logger.warn('PROXY_URI contains username and/or password, ignoring PROXY_AUTH');
+            proxyObj.auth = undefined;
+        } else if (!['http:', 'https:'].includes(proxyUrlHandler.protocol)) {
+            logger.warn(`PROXY_AUTH is only supported by HTTP(S) proxies, but got ${proxyUrlHandler.protocol}, ignoring`);
+            proxyObj.auth = undefined;
+            promptProxyUri = true;
+        } else {
+            logger.info('PROXY_AUTH is set and will be used for requests from Node.js. However, requests from puppeteer will not use it');
+            promptProxyUri = true;
+        }
+        if (promptProxyUri) {
+            logger.info('To get rid of this, set PROXY_URI like protocol://username:password@host:port and clear PROXY_{AUTH,PROTOCOL,HOST,PORT}');
+        }
+    }
+
+    // is proxy enabled and valid?
+    let isProxyValid = false;
+    if (proxyUrlHandler) {
+        const protocol = proxyUrlHandler.protocol.replace(':', '');
+        if (possibleProtocol.includes(protocol)) {
+            if (protocol !== 'http' && (proxyUrlHandler.username || proxyUrlHandler.password)) {
+                logger.warn("PROXY_URI is an HTTPS/SOCKS proxy with authentication, which is not supported by puppeteer (ignore if you don't need it)");
+                logger.info('To get rid of this, consider using an HTTP proxy instead');
+            }
+            proxyObj.protocol = protocol;
+            proxyObj.host = proxyUrlHandler.hostname;
+            proxyObj.port = parseInt(proxyUrlHandler.port) || undefined;
+            // trailing slash will cause puppeteer to throw net::ERR_NO_SUPPORTED_PROXIES, trim it
+            proxyUri = proxyUrlHandler.href.endsWith('/') ? proxyUrlHandler.href.slice(0, -1) : proxyUrlHandler.href;
+            isProxyValid = true;
+        } else {
+            logger.error(`Unsupported proxy protocol: ${protocol}, expect one of ${possibleProtocol.join(', ')}`);
+        }
+    }
+    if (!isProxyValid) {
+        if ((oriProxyUri && typeof oriProxyUri === 'string') || oriProxyObj.protocol || oriProxyObj.host || oriProxyObj.port || oriProxyObj.auth) {
+            logger.error('Proxy is disabled due to misconfiguration');
+        }
+        proxyObj.protocol = proxyObj.host = proxyObj.port = proxyObj.auth = undefined;
+        proxyUri = null;
+        proxyUrlHandler = null;
+    }
+
+    return { proxyUri, proxyObj, proxyUrlHandler };
+};
+
+module.exports = {
+    unifyProxy,
+    ...unifyProxy(config.proxyUri, config.proxy),
+};

package/lib/utils/valid-host.js

@@ -0,0 +1,16 @@
+/**
+ * Check if a sub-domain is valid
+ * @param {String} hostname sub-domain
+ * @returns {Boolean} true if valid
+ */
+const isValidHost = (hostname) => {
+    if (typeof hostname !== 'string') {
+        return false;
+    }
+    const regex = /^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
+    return regex.test(hostname);
+};
+
+module.exports = {
+    isValidHost,
+};

package/lib/utils/wechat-mp.js

@@ -8,6 +8,8 @@
  * lib/v2/pku/nsd/gd
  * lib/v2/sdu/cs
  * lib/v2/nua/utils
+ * lib/v2/hrbeu
+ * lib/v2/freewechat
  *
  * If your new route is not in the above folders, please add it to the list.
  *
@@ -185,9 +187,9 @@ const normalizeUrl = (url, bypassHostCheck = false) => {
  * @param {boolean} bypassHostCheck - Whether to bypass host check.
  * @return {Promise<object>} - An object containing the article and its metadata.
  */
-const fetchArticle = async (ctx, url, bypassHostCheck = false) => {
+const fetchArticle = (ctx, url, bypassHostCheck = false) => {
     url = normalizeUrl(url, bypassHostCheck);
-    return await ctx.cache.tryGet(url, async () => {
+    return ctx.cache.tryGet(url, async () => {
         const response = await got(url);
         const $ = cheerio.load(response.data);
 
@@ -220,7 +222,7 @@ const fetchArticle = async (ctx, url, bypassHostCheck = false) => {
 
         let mpName = $('.profile_nickname').first().text();
         mpName = mpName && mpName.trim();
-        return { title, author, description, summary, pubDate, mpName, link: url };
+        return { title, author, description, summary, pubDate, mpName, link: response.url };
     });
 };
 

package/lib/v2/163/ds.js

@@ -0,0 +1,33 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const root_url = 'https://inf.ds.163.com';
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+
+    const current_url = `${root_url}/v1/web/feed/basic/getSomeOneFeeds?feedTypes=1,2,3,4,6,7,10,11&someOneUid=${id}`;
+    const response = await got({
+        method: 'get',
+        url: current_url,
+    });
+    const data = response.data.result.feeds;
+
+    const list = data.map((feed) => ({
+        title: JSON.parse(feed.content).body.text,
+        link: `https://ds.163.com/feed/${feed.id}`,
+        description: art(path.resolve(__dirname, 'templates/ds.art'), {
+            text: JSON.parse(feed.content).body.text,
+            medias: JSON.parse(feed.content).body.media,
+        }),
+        pubDate: parseDate(feed.updateTime),
+    }));
+
+    ctx.state.data = {
+        title: `${response.data.result.userInfos[0].user.nick} 的动态`,
+        link: `https://ds.163.com/user/${id}`,
+        item: list,
+    };
+};

package/lib/v2/163/dy.js

@@ -0,0 +1,29 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+const { parseDyArticle } = require('./utils');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+
+    const response = await got(`https://dy.163.com/v2/article/list.do?pageNo=1&wemediaId=${id}&size=10`);
+    const charset = response.headers['content-type'].split('=')[1];
+
+    const list = response.data.data.list.map((e) => ({
+        title: e.title,
+        link: 'https://www.163.com/dy/article/' + e.docid + '.html',
+        pubDate: timezone(parseDate(e.ptime), 8),
+        author: e.source,
+        imgsrc: e.imgsrc,
+    }));
+
+    const items = await Promise.all(list.map((e) => parseDyArticle(charset, e, ctx.cache.tryGet)));
+
+    ctx.state.data = {
+        title: `网易号 - ${list[0].author}`,
+        link: items[0].feedLink,
+        description: items[0].feedDescription,
+        image: items[0].feedImage,
+        item: items,
+    };
+};

package/lib/v2/163/dy2.js

@@ -0,0 +1,42 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const iconv = require('iconv-lite');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+const { parseDyArticle } = require('./utils');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+    const limit = ctx.query.limit ?? 30;
+    const url = `https://www.163.com/dy/media/${id}.html`;
+
+    const response = await got(url, { responseType: 'buffer' });
+
+    const charset = response.headers['content-type'].split('=')[1];
+    const data = iconv.decode(response.data, charset);
+    const $ = cheerio.load(data);
+
+    const list = $('.tab_content ul li')
+        .slice(0, limit)
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('h4 a').text(),
+                link: item.find('a').first().attr('href'),
+                pubDate: timezone(parseDate(item.find('.time').text()), 8),
+                imgsrc: item.find('a img').attr('src'),
+            };
+        });
+
+    const items = await Promise.all(list.map((item) => parseDyArticle(charset, item, ctx.cache.tryGet)));
+
+    ctx.state.data = {
+        title: `${$('head title').text()} - 网易号`,
+        link: url,
+        description: $('.icon_line.desc').text(),
+        image: $('.head_img').attr('src'),
+        item: items,
+        author: $('h2').text(),
+    };
+};

package/lib/v2/163/maintainer.js

@@ -0,0 +1,20 @@
+module.exports = {
+    '/exclusive/:id?': ['nczitzk'],
+    '/ds/:id': ['luyuhuang'],
+    '/dy/:id': ['HendricksZheng'],
+    '/dy2/:id': ['mjysci'],
+
+    '/music/artist/:id': ['metowolf'],
+    '/music/artist/songs/:id': ['ZhongMingKun'],
+    '/music/djradio/:id': ['magic-akari'],
+    '/music/playlist/:id': ['DIYgod'],
+    '/music/user/events/:id': ['Master-Hash'],
+    '/music/user/playlist/:uid': ['DIYgod'],
+    '/music/user/playrecords/:uid/:type?': ['alfredcai'],
+
+    '/news/rank/:category?/:type?/:time?': ['nczitzk'],
+    '/news/special/:type?': ['nczitzk'],
+    '/open/vip': ['hoilc'],
+    '/renjian/:category?': ['nczitzk'],
+    '/today/:need_content?': ['nczitzk'],
+};

package/lib/v2/163/music/artist-songs.js

@@ -0,0 +1,39 @@
+const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+
+    const { data } = await got(`https://music.163.com/api/v1/artist/songs`, {
+        headers: {
+            Referer: 'https://music.163.com/',
+        },
+        searchParams: {
+            id,
+            private_cloud: 'true',
+            work_type: 1,
+            order: 'time',
+            offset: 0,
+            limit: 100,
+        },
+    });
+
+    const artist = data.songs.find(({ ar }) => ar[0].id === parseInt(id)).ar[0];
+    const items = data.songs.map((song) => ({
+        title: `${song.name} - ${song.ar.map(({ name }) => name).join(' / ')}`,
+        description: art(path.join(__dirname, '../templates/music/playlist.art'), {
+            singer: song.ar.map(({ name }) => name).join(' / '),
+            album: song.al.name,
+            picUrl: song.al.picUrl,
+        }),
+        link: `https://music.163.com/#/song?id=${song.id}`,
+    }));
+
+    ctx.state.data = {
+        title: `${artist.name} - 歌手歌曲`,
+        link: `https://music.163.com/#/artist?id=${id}`,
+        description: `网易云音乐 - 歌手歌曲 - ${artist.name}`,
+        item: items,
+    };
+};

package/lib/{routes/ncm → v2/163/music}/artist.js

@@ -1,11 +1,11 @@
 const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const path = require('path');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
 
-    const response = await got({
-        method: 'get',
-        url: `https://music.163.com/api/artist/albums/${id}`,
+    const response = await got(`https://music.163.com/api/artist/albums/${id}`, {
         headers: {
             Referer: 'https://music.163.com/',
         },
@@ -17,11 +17,17 @@ module.exports = async (ctx) => {
         title: data.artist.name,
         link: `https://music.163.com/#/artist/album?id=${id}`,
         description: `网易云音乐歌手专辑 - ${data.artist.name}`,
+        image: data.artist.img1v1Url || data.artist.picUrl,
         item: data.hotAlbums.map((item) => {
             const singer = item.artists.length === 1 ? item.artists[0].name : item.artists.reduce((prev, cur) => (prev.name || prev) + '/' + cur.name);
             return {
                 title: `${item.name} - ${singer}`,
-                description: `歌手：${singer}<br>专辑：${item.name}<br>日期：${new Date(item.publishTime).toLocaleDateString()}<br><img src="${item.picUrl}">`,
+                description: art(path.join(__dirname, '../templates/music/playlist.art'), {
+                    singer,
+                    album: item.name,
+                    date: new Date(item.publishTime).toLocaleDateString(),
+                    picUrl: item.picUrl,
+                }),
                 link: `https://music.163.com/#/album?id=${item.id}`,
                 pubDate: new Date(item.publishTime),
                 published: new Date(item.publishTime),

package/lib/{routes/ncm → v2/163/music}/djradio.js

@@ -6,10 +6,8 @@ const path = require('path');
 module.exports = async (ctx) => {
     const id = ctx.params.id;
 
-    const ProcessFeed = async (limit, offset) =>
-        await got({
-            method: 'post',
-            url: 'https://music.163.com/api/dj/program/byradio',
+    const ProcessFeed = (limit, offset) =>
+        got.post('https://music.163.com/api/dj/program/byradio', {
             headers: {
                 Referer: 'https://music.163.com/',
             },
@@ -40,7 +38,7 @@ module.exports = async (ctx) => {
                 const duration = ~~(pg.duration / 1000);
                 const mm_ss_duration = `${(duration / 60).toFixed(0).padStart(2, '0')}:${(duration % 60).toFixed(0).padStart(2, '0')}`;
 
-                const html = art(path.join(__dirname, 'templates/djradio-content.art'), {
+                const html = art(path.join(__dirname, '../templates/music/djradio-content.art'), {
                     pg,
                     description,
                     itunes_duration: mm_ss_duration,