refactor: avoid promise overhead (DIYgod#8028)

JohnnyWoong · Aug 16, 2021 · 6e3b58e · 6e3b58e
1 parent 8053b33
commit 6e3b58e
Show file tree

Hide file tree

Showing 543 changed files with 5,546 additions and 5,945 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -54,6 +54,8 @@
         "no-await-in-loop": 2,
         "require-atomic-updates": 0,
         "no-prototype-builtins": 0,
-        "no-new-func": 2
+        "no-new-func": 2,
+        "require-await": 2,
+        "no-return-await": 2
     }
 }
diff --git a/lib/middleware/access-control.js b/lib/middleware/access-control.js
@@ -29,24 +29,24 @@ module.exports = async (ctx, next) => {
         await next();
     } else {
         if (!isControlled || allowLocalhost) {
-            return await grant();
+            return grant();
         }
 
         if (config.accessKey) {
             if (config.accessKey === accessKey || accessCode === md5(requestPath + config.accessKey)) {
-                return await grant();
+                return grant();
             }
         }
 
         if (config.whitelist) {
             if (config.whitelist.find((white) => ip.includes(white) || requestPath.includes(white) || requestUA.includes(white))) {
-                return await grant();
+                return grant();
             }
         }
 
         if (config.blacklist) {
             if (!config.blacklist.find((black) => ip.includes(black) || requestPath.includes(black) || requestUA.includes(black))) {
-                return await grant();
+                return grant();
             }
         }
 

diff --git a/lib/middleware/cache.js b/lib/middleware/cache.js
@@ -145,7 +145,7 @@ module.exports = function (app) {
         const key = 'koa-redis-cache:' + md5(ctx.request.path);
 
         if (!available) {
-            return await next();
+            return next();
         }
 
         try {

diff --git a/lib/middleware/parameter.js b/lib/middleware/parameter.js
@@ -30,7 +30,7 @@ module.exports = async (ctx, next) => {
         // sort items
         ctx.state.data.item = ctx.state.data.item.sort((a, b) => +new Date(b.pubDate || 0) - +new Date(a.pubDate || 0));
 
-        const handleItem = async (item) => {
+        const handleItem = (item) => {
             item.title && (item.title = entities.decodeXML(item.title + ''));
 
             // handle pubDate

diff --git a/lib/router.js b/lib/router.js
@@ -35,7 +35,7 @@ const lazyloadRouteHandler = (routeHandlerPath) => (ctx) => {
 // index
 router.get('/', lazyloadRouteHandler('./routes/index'));
 
-router.get('/robots.txt', async (ctx) => {
+router.get('/robots.txt', (ctx) => {
     if (config.disallowRobot) {
         ctx.set('Content-Type', 'text/plain');
         ctx.body = 'User-agent: *\nDisallow: /';

diff --git a/lib/routes/199it/index.js b/lib/routes/199it/index.js
@@ -8,23 +8,21 @@ module.exports = async (ctx) => {
     const $ = cheerio.load(res.data);
     const list = $('.entry-content').get();
 
-    const out = await Promise.all(
-        list.slice(0, 9).map(async (item) => {
-            const $ = cheerio.load(item);
-            const time = $('.post-time time').attr('datetime');
-            const title = $('.entry-title a').attr('title');
-            const partial = $('.entry-title a').attr('href');
-            const address = partial;
-            const single = {
-                title,
-                pubDate: new Date(time).toUTCString(),
-                link: address,
-                guid: address,
-            };
-            ctx.cache.set(address, JSON.stringify(single));
-            return Promise.resolve(single);
-        })
-    );
+    const out = list.slice(0, 9).map((item) => {
+        const $ = cheerio.load(item);
+        const time = $('.post-time time').attr('datetime');
+        const title = $('.entry-title a').attr('title');
+        const partial = $('.entry-title a').attr('href');
+        const address = partial;
+        const single = {
+            title,
+            pubDate: new Date(time).toUTCString(),
+            link: address,
+            guid: address,
+        };
+        ctx.cache.set(address, JSON.stringify(single));
+        return single;
+    });
     ctx.state.data = {
         title: '199it',
         link: url,

diff --git a/lib/routes/199it/utils.js b/lib/routes/199it/utils.js
@@ -21,19 +21,18 @@ module.exports = async (ctx, keyword, currentUrl) => {
         .get();
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-                    const content = cheerio.load(detailResponse.data);
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(detailResponse.data);
 
-                    item.description = content('div.entry-content').html();
+                item.description = content('div.entry-content').html();
 
-                    return item;
-                })
+                return item;
+            })
         )
     );
 

diff --git a/lib/routes/1point3acres/blog.js b/lib/routes/1point3acres/blog.js
@@ -24,22 +24,21 @@ module.exports = async (ctx) => {
         .get();
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-                    const content = cheerio.load(detailResponse.data);
-
-                    content('h2, .meta_tags, .pagination, .subinfopost, #comments').remove();
-
-                    item.description = content('.post').html();
-                    item.pubDate = new Date(detailResponse.data.match(/"datePublished":"(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:00)","dateModified":/)[1]).toUTCString();
-
-                    return item;
-                })
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(detailResponse.data);
+
+                content('h2, .meta_tags, .pagination, .subinfopost, #comments').remove();
+
+                item.description = content('.post').html();
+                item.pubDate = new Date(detailResponse.data.match(/"datePublished":"(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:00)","dateModified":/)[1]).toUTCString();
+
+                return item;
+            })
         )
     );
 

diff --git a/lib/routes/36kr/motif.js b/lib/routes/36kr/motif.js
@@ -20,15 +20,14 @@ module.exports = async (ctx) => {
         title: `36氪专题 - ${motifInfo.categoryTitle}`,
         link: motifUrl,
         item: await Promise.all(
-            articleList.map(
-                async (item) =>
-                    await ctx.cache.tryGet(item.link, async () => {
-                        const contentResponse = await got({ method: 'get', url: item.link });
-                        const result = contentResponse.data.match(/"articleDetailData":(.*?),"articleRecommendData":/) || contentResponse.data.match(/"videoDetail":(.*?),"authorVideos":/);
-                        const contentData = JSON.parse(result[1]);
-                        item.description = contentData.data.widgetContent;
-                        return item;
-                    })
+            articleList.map((item) =>
+                ctx.cache.tryGet(item.link, async () => {
+                    const contentResponse = await got({ method: 'get', url: item.link });
+                    const result = contentResponse.data.match(/"articleDetailData":(.*?),"articleRecommendData":/) || contentResponse.data.match(/"videoDetail":(.*?),"authorVideos":/);
+                    const contentData = JSON.parse(result[1]);
+                    item.description = contentData.data.widgetContent;
+                    return item;
+                })
             )
         ),
         description: `${motifInfo.categoryTitle}`,

diff --git a/lib/routes/36kr/news.js b/lib/routes/36kr/news.js
@@ -81,14 +81,13 @@ module.exports = async (ctx) => {
         title: `36氪资讯 - ${cfg.title}`,
         link: newsUrl,
         item: await Promise.all(
-            informationList.map(
-                async (item) =>
-                    await ctx.cache.tryGet(item.link, async () => {
-                        const contentResponse = await got({ method: 'get', url: item.link });
-                        const content = cheerio.load(contentResponse.data);
-                        item.description = content('div.common-width.content.articleDetailContent.kr-rich-text-wrapper').html();
-                        return item;
-                    })
+            informationList.map((item) =>
+                ctx.cache.tryGet(item.link, async () => {
+                    const contentResponse = await got({ method: 'get', url: item.link });
+                    const content = cheerio.load(contentResponse.data);
+                    item.description = content('div.common-width.content.articleDetailContent.kr-rich-text-wrapper').html();
+                    return item;
+                })
             )
         ),
     };

diff --git a/lib/routes/36kr/search/article.js b/lib/routes/36kr/search/article.js
@@ -56,7 +56,7 @@ module.exports = async (ctx) => {
                 pubDate: new Date(item.publishTime).toUTCString(),
             };
 
-            const other = await ctx.cache.tryGet(link, async () => await load(link));
+            const other = await ctx.cache.tryGet(link, () => load(link));
             return Promise.resolve(Object.assign({}, single, other));
         })
     );

diff --git a/lib/routes/36kr/user.js b/lib/routes/36kr/user.js
@@ -20,15 +20,14 @@ module.exports = async (ctx) => {
         title: `36氪用户 - ${authorInfo.userNick}`,
         link: userUrl,
         item: await Promise.all(
-            articleList.map(
-                async (item) =>
-                    await ctx.cache.tryGet(item.link, async () => {
-                        const contentResponse = await got({ method: 'get', url: item.link });
-                        const result = contentResponse.data.match(/"articleDetailData":(.*?),"articleRecommendData":/) || contentResponse.data.match(/"videoDetail":(.*?),"authorVideos":/);
-                        const contentData = JSON.parse(result[1]);
-                        item.description = contentData.data.widgetContent;
-                        return item;
-                    })
+            articleList.map((item) =>
+                ctx.cache.tryGet(item.link, async () => {
+                    const contentResponse = await got({ method: 'get', url: item.link });
+                    const result = contentResponse.data.match(/"articleDetailData":(.*?),"articleRecommendData":/) || contentResponse.data.match(/"videoDetail":(.*?),"authorVideos":/);
+                    const contentData = JSON.parse(result[1]);
+                    item.description = contentData.data.widgetContent;
+                    return item;
+                })
             )
         ),
         description: `${authorInfo.label} | ${authorInfo.summary}`,

diff --git a/lib/routes/3k8/latest.js b/lib/routes/3k8/latest.js
@@ -23,23 +23,22 @@ module.exports = async (ctx) => {
         .get();
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                        responseType: 'buffer',
-                    });
-
-                    const content = cheerio.load(iconv.decode(detailResponse.data, 'gb2312'));
-
-                    item.title = content('h1.title').text();
-                    item.pubDate = new Date(content('div.news-mes span').eq(0).text().replace('发布时间：', '').trim() + ' GMT+8').toUTCString();
-                    item.description = content('div.news-content').html();
-
-                    return item;
-                })
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                    responseType: 'buffer',
+                });
+
+                const content = cheerio.load(iconv.decode(detailResponse.data, 'gb2312'));
+
+                item.title = content('h1.title').text();
+                item.pubDate = new Date(content('div.news-mes span').eq(0).text().replace('发布时间：', '').trim() + ' GMT+8').toUTCString();
+                item.description = content('div.news-content').html();
+
+                return item;
+            })
         )
     );
 

diff --git a/lib/routes/3ycy/home.js b/lib/routes/3ycy/home.js
@@ -18,12 +18,12 @@ module.exports = async (ctx) => {
     }
 
     const items = await Promise.all(
-        count.map(async (i) => {
+        count.map((i) => {
             const item = $(list[i]);
             const title = item.find('h3 a').first();
             const link = title.attr('href');
 
-            return await ctx.cache.tryGet('3ycy' + link, async () => {
+            return ctx.cache.tryGet('3ycy' + link, async () => {
                 const date = item.find('div.postSubtitle').text().trim();
                 const match = /(\d+\/\d+\/\d{4}\s+\d+:\d+:\d+\s*(?:AM|PM))/i.exec(date);
                 const pubDate = match && new Date(match[1] + ' GMT+8').toUTCString();

diff --git a/lib/routes/6park/index.js b/lib/routes/6park/index.js
@@ -29,24 +29,23 @@ module.exports = async (ctx) => {
         .get();
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-                    const content = cheerio.load(detailResponse.data);
-
-                    item.title = content('title').text().replace(' -6park.com', '');
-                    item.author = detailResponse.data.match(/送交者: .*>(.*)<.*\[/)[1];
-                    item.pubDate = new Date(detailResponse.data.match(/于 (.*) 已读/)[1]).toUTCString();
-                    item.description = content('pre')
-                        .html()
-                        .replace(/<font color="#E6E6DD">6park.com<\/font>/g, '');
-
-                    return item;
-                })
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(detailResponse.data);
+
+                item.title = content('title').text().replace(' -6park.com', '');
+                item.author = detailResponse.data.match(/送交者: .*>(.*)<.*\[/)[1];
+                item.pubDate = new Date(detailResponse.data.match(/于 (.*) 已读/)[1]).toUTCString();
+                item.description = content('pre')
+                    .html()
+                    .replace(/<font color="#E6E6DD">6park.com<\/font>/g, '');
+
+                return item;
+            })
         )
     );
 

diff --git a/lib/routes/8kcos/cat.js b/lib/routes/8kcos/cat.js
@@ -15,7 +15,7 @@ module.exports = async (ctx) => {
                   Cheerio.load(resp.body)('#wrap > div > div > div > ul > li.item')
                       .map((_, e) => {
                           const { href } = Cheerio.load(e)('h2 > a')[0].attribs;
-                          return ctx.cache.tryGet(href, async () => loadArticle(href));
+                          return ctx.cache.tryGet(href, () => loadArticle(href));
                       })
                       .toArray()
               ),

diff --git a/lib/routes/8kcos/latest.js b/lib/routes/8kcos/latest.js
@@ -14,7 +14,7 @@ module.exports = async (ctx) => {
                   Cheerio.load(response.body)('#wrap > div > div > div > ul > li.item')
                       .map((_, e) => {
                           const { href } = Cheerio.load(e)('div > h2 > a')[0].attribs;
-                          return ctx.cache.tryGet(href, async () => loadArticle(href));
+                          return ctx.cache.tryGet(href, () => loadArticle(href));
                       })
                       .toArray()
               )

diff --git a/lib/routes/91ddcc/stage.js b/lib/routes/91ddcc/stage.js
@@ -24,19 +24,18 @@ module.exports = async (ctx) => {
         .get();
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-                    const content = cheerio.load(detailResponse.data);
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(detailResponse.data);
 
-                    item.description = content('div.article-con').html();
+                item.description = content('div.article-con').html();
 
-                    return item;
-                })
+                return item;
+            })
         )
     );