From 1f90b69973be39f46fa0d4bf155a87aba6cae566 Mon Sep 17 00:00:00 2001
From: Tony <TonyRL@users.noreply.github.com>
Date: Mon, 25 Dec 2023 18:23:33 +0000
Subject: [PATCH] fix: adjust http log level (#14114)

* feat: log redirect

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

ref: https://github.com/winstonjs/winston#logging-levels (npm levels)
---
 lib/utils/got.js                                            | 5 +++++
 lib/utils/request-wrapper.js                                | 4 ++--
 lib/v2/apkpure/versions.js                                  | 2 +-
 lib/v2/cw/utils.js                                          | 6 +++---
 lib/v2/douyin/live.js                                       | 2 +-
 lib/v2/fortnite/news.js                                     | 2 +-
 lib/v2/iqiyi/video.js                                       | 2 +-
 lib/v2/pnas/index.js                                        | 2 +-
 lib/v2/sysu/ygafz.js                                        | 2 +-
 lib/v2/uchicago/current.js                                  | 4 ++--
 lib/v2/xiaohongshu/util.js                                  | 6 +++---
 website/docs/joinus/new-rss/start-code.md                   | 6 +++---
 .../current/joinus/new-rss/start-code.md                    | 6 +++---
 13 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/lib/utils/got.js b/lib/utils/got.js
index 7beb19d51c..802612fb07 100644
--- a/lib/utils/got.js
+++ b/lib/utils/got.js
@@ -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 {
diff --git a/lib/utils/request-wrapper.js b/lib/utils/request-wrapper.js
index 7b7d9bf6b0..6120df3a4f 100644
--- a/lib/utils/request-wrapper.js
+++ b/lib/utils/request-wrapper.js
@@ -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
diff --git a/lib/v2/apkpure/versions.js b/lib/v2/apkpure/versions.js
index 263b75d906..2236848026 100644
--- a/lib/v2/apkpure/versions.js
+++ b/lib/v2/apkpure/versions.js
@@ -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',
     });
diff --git a/lib/v2/cw/utils.js b/lib/v2/cw/utils.js
index 32ce936267..c4383bf2ca 100644
--- a/lib/v2/cw/utils.js
+++ b/lib/v2/cw/utils.js
@@ -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',
                 });
diff --git a/lib/v2/douyin/live.js b/lib/v2/douyin/live.js
index c60cd9ba70..6e6d36a189 100644
--- a/lib/v2/douyin/live.js
+++ b/lib/v2/douyin/live.js
@@ -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',
             });
diff --git a/lib/v2/fortnite/news.js b/lib/v2/fortnite/news.js
index 965c93d586..596b96555b 100644
--- a/lib/v2/fortnite/news.js
+++ b/lib/v2/fortnite/news.js
@@ -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
     });
diff --git a/lib/v2/iqiyi/video.js b/lib/v2/iqiyi/video.js
index 2754483b34..5c0dbe7126 100644
--- a/lib/v2/iqiyi/video.js
+++ b/lib/v2/iqiyi/video.js
@@ -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',
             });
diff --git a/lib/v2/pnas/index.js b/lib/v2/pnas/index.js
index 5cf8576f98..600b006d2c 100644
--- a/lib/v2/pnas/index.js
+++ b/lib/v2/pnas/index.js
@@ -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,
diff --git a/lib/v2/sysu/ygafz.js b/lib/v2/sysu/ygafz.js
index 150f4d4bb4..4dc2583440 100644
--- a/lib/v2/sysu/ygafz.js
+++ b/lib/v2/sysu/ygafz.js
@@ -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',
     });
diff --git a/lib/v2/uchicago/current.js b/lib/v2/uchicago/current.js
index cc86f5ce52..f55c7ade60 100644
--- a/lib/v2/uchicago/current.js
+++ b/lib/v2/uchicago/current.js
@@ -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,
diff --git a/lib/v2/xiaohongshu/util.js b/lib/v2/xiaohongshu/util.js
index ecffddd151..e911224c19 100644
--- a/lib/v2/xiaohongshu/util.js
+++ b/lib/v2/xiaohongshu/util.js
@@ -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 = {};
diff --git a/website/docs/joinus/new-rss/start-code.md b/website/docs/joinus/new-rss/start-code.md
index 64d4298d00..6f9061d0b3 100644
--- a/website/docs/joinus/new-rss/start-code.md
+++ b/website/docs/joinus/new-rss/start-code.md
@@ -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',
                 });
diff --git a/website/i18n/zh/docusaurus-plugin-content-docs/current/joinus/new-rss/start-code.md b/website/i18n/zh/docusaurus-plugin-content-docs/current/joinus/new-rss/start-code.md
index 5b4e68f1a8..eec52ca0c6 100644
--- a/website/i18n/zh/docusaurus-plugin-content-docs/current/joinus/new-rss/start-code.md
+++ b/website/i18n/zh/docusaurus-plugin-content-docs/current/joinus/new-rss/start-code.md
@@ -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',
                 });