opensource/RSSHub
3
0
Fork 0
mirror of https://github.com/DIYgod/RSSHub.git synced 2026-09-24 23:12:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: adjust http log level (#14114)

Browse Source 
* feat: log redirect

* fix: change puppeteer/proxy/redirect/got log level to `http`

ref: https://github.com/winstonjs/winston#logging-levels (npm levels)
This commit is contained in:
Tony
2023-12-26 02:23:33 +08:00
committed by GitHub
parent 7d50fff9c2
commit 1f90b69973
13 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/utils/got.js
+5
View File
@@ -14,6 +14,11 @@ const custom = got.extend({
options.retryCount = count;
},
],
beforeRedirect: [
(options, response) => {
logger.http(`Redirecting to ${options.url} for ${response.requestUrl}`);
},
],
afterResponse: [
(response) => {
try {
lib/utils/request-wrapper.js
+2 -2
View File
@@ -76,9 +76,9 @@ const requestWrapper = (
}
}
if (prxied) {
logger.debug(`Proxy for ${url}`);
logger.http(`Proxy for ${url}`);
} else {
logger.debug(`Requesting ${url}`);
logger.http(`Requesting ${url}`);
}
// ua
lib/v2/apkpure/versions.js
+1 -1
View File
@@ -13,7 +13,7 @@ module.exports = async (ctx) => {
page.on('request', (request) => {
request.resourceType() === 'document' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${link}`);
logger.http(`Requesting ${link}`);
await page.goto(link, {
waitUntil: 'domcontentloaded',
});
lib/v2/cw/utils.js
+3 -3
View File
@@ -33,7 +33,7 @@ const getCookie = async (browser, tryGet) => {
page.on('request', (request) => {
request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${baseUrl}/user/get/cookie-bar`);
logger.http(`Requesting ${baseUrl}/user/get/cookie-bar`);
await page.goto(`${baseUrl}/user/get/cookie-bar`, {
waitUntil: 'domcontentloaded',
});
@@ -55,7 +55,7 @@ const parsePage = async (path, browser, ctx) => {
request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
});
await setCookies(page, cookie, 'cw.com.tw');
logger.debug(`Requesting ${pageUrl}`);
logger.http(`Requesting ${pageUrl}`);
await page.goto(pageUrl, {
waitUntil: 'domcontentloaded',
});
@@ -93,7 +93,7 @@ const parseItems = (list, browser, tryGet) =>
request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
});
await setCookies(page, cookie, 'cw.com.tw');
logger.debug(`Requesting ${item.link}`);
logger.http(`Requesting ${item.link}`);
await page.goto(item.link, {
waitUntil: 'domcontentloaded',
});
lib/v2/douyin/live.js
+1 -1
View File
@@ -27,7 +27,7 @@ module.exports = async (ctx) => {
roomInfo = await response.json();
}
});
logger.debug(`Requesting ${pageUrl}`);
logger.http(`Requesting ${pageUrl}`);
await page.goto(pageUrl, {
waitUntil: 'networkidle2',
});
lib/v2/fortnite/news.js
+1 -1
View File
@@ -29,7 +29,7 @@ module.exports = async (ctx) => {
});
// log manually (necessary for puppeteer)
logger.debug(`Requesting ${apiUrl}`);
logger.http(`Requesting ${apiUrl}`);
await page.goto(apiUrl, {
waitUntil: 'networkidle0', // if use 'domcontentloaded', `await page.content()` is necessary
});
lib/v2/iqiyi/video.js
+1 -1
View File
@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
page.on('request', (request) => {
request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${link}`);
logger.http(`Requesting ${link}`);
await page.goto(link, {
waitUntil: 'domcontentloaded',
});
lib/v2/pnas/index.js
+1 -1
View File
@@ -46,7 +46,7 @@ module.exports = async (ctx) => {
page.on('request', (request) => {
request.resourceType() === 'document' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${item.link}`);
logger.http(`Requesting ${item.link}`);
await page.goto(item.link, {
waitUntil: 'domcontentloaded',
referer: link,
lib/v2/sysu/ygafz.js
+1 -1
View File
@@ -16,7 +16,7 @@ module.exports = async (ctx) => {
request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${url}`);
logger.http(`Requesting ${url}`);
await page.goto(url, {
waitUntil: 'domcontentloaded',
});
lib/v2/uchicago/current.js
+2 -2
View File
@@ -14,7 +14,7 @@ module.exports = async (ctx) => {
page.on('request', (request) => {
request.resourceType() === 'document' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${link}`);
logger.http(`Requesting ${link}`);
await page.goto(link, {
waitUntil: 'domcontentloaded',
});
@@ -36,7 +36,7 @@ module.exports = async (ctx) => {
page.on('request', (request) => {
request.resourceType() === 'document' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${item.link}`);
logger.http(`Requesting ${item.link}`);
await page.goto(item.link, {
waitUntil: 'domcontentloaded',
referer: link,
lib/v2/xiaohongshu/util.js
+3 -3
View File
@@ -62,7 +62,7 @@ const getBoard = (url, cache) =>
page.on('request', (request) => {
request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'xhr' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${url}`);
logger.http(`Requesting ${url}`);
await page.goto(url);
await page.waitForSelector('.pc-container');
const initialSsrState = await page.evaluate(() => window.__INITIAL_SSR_STATE__);
@@ -94,7 +94,7 @@ const getNotes = (url, cache) =>
const page = await browser.newPage();
await setPageFilter(page);
logger.debug(`Requesting ${url}`);
logger.http(`Requesting ${url}`);
await page.goto(url);
let otherInfo = {};
@@ -124,7 +124,7 @@ const getNotes = (url, cache) =>
const notePage = await browser.newPage();
await setPageFilter(notePage);
logger.debug(`Requesting ${noteUrl}`);
logger.http(`Requesting ${noteUrl}`);
await notePage.goto(noteUrl);
let feed = {};
website/docs/joinus/new-rss/start-code.md
+3 -3
View File
@@ -639,7 +639,7 @@ module.exports = async (ctx) => {
// got requests will be logged automatically
// but puppeteer requests are not
// so we need to log them manually
logger.debug(`Requesting ${link}`);
logger.http(`Requesting ${link}`);
await page.goto(link, {
// specify how long to wait for the page to load
waitUntil: 'domcontentloaded',
@@ -711,7 +711,7 @@ module.exports = async (ctx) => {
});
const link = `${baseUrl}/${user}/${repo}/issues`;
logger.debug(`Requesting ${link}`);
logger.http(`Requesting ${link}`);
await page.goto(link, {
waitUntil: 'domcontentloaded',
});
@@ -749,7 +749,7 @@ module.exports = async (ctx) => {
request.resourceType() === 'document' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${item.link}`);
logger.http(`Requesting ${item.link}`);
await page.goto(item.link, {
waitUntil: 'domcontentloaded',
});
website/i18n/zh/docusaurus-plugin-content-docs/current/joinus/new-rss/start-code.md
+3 -3
View File
@@ -636,7 +636,7 @@ module.exports = async (ctx) => {
// got 请求会被自动记录，
// 但 puppeteer 请求不会
// 所以我们需要手动记录它们
logger.debug(`Requesting ${link}`);
logger.http(`Requesting ${link}`);
await page.goto(link, {
// 指定页面等待载入的时间
waitUntil: 'domcontentloaded',
@@ -708,7 +708,7 @@ module.exports = async (ctx) => {
});
const link = `${baseUrl}/${user}/${repo}/issues`;
logger.debug(`Requesting ${link}`);
logger.http(`Requesting ${link}`);
await page.goto(link, {
waitUntil: 'domcontentloaded',
});
@@ -746,7 +746,7 @@ module.exports = async (ctx) => {
request.resourceType() === 'document' ? request.continue() : request.abort();
});
logger.debug(`Requesting ${item.link}`);
logger.http(`Requesting ${item.link}`);
await page.goto(item.link, {
waitUntil: 'domcontentloaded',
});