fix: ensure proper browser closure (#18404)

lib/routes/aip/journal-pupp.ts

@@ -50,7 +50,7 @@ const handler = async (ctx) => {
         false
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title: jrnlName,

lib/routes/alternativeto/utils.ts

@@ -14,7 +14,7 @@ const puppeteerGet = (url, cache) =>
             waitUntil: 'domcontentloaded',
         });
         const html = await page.evaluate(() => document.documentElement.innerHTML);
-        browser.close();
+        await browser.close();
         return html;
     });
 

lib/routes/apkpure/versions.ts

@@ -39,7 +39,7 @@ async function handler(ctx) {
     });
 
     const r = await page.evaluate(() => document.documentElement.innerHTML);
-    browser.close();
+    await browser.close();
 
     const $ = load(r);
     const img = new URL($('.ver-top img').attr('src'));

lib/routes/colamanga/manga.ts

@@ -60,7 +60,7 @@ async function handler(ctx: Context) {
     });
 
     const response = await page.content();
-    browser.close();
+    await browser.close();
 
     const $ = load(response);
 

lib/routes/douyin/live.ts

@@ -58,7 +58,7 @@ async function handler(ctx) {
             await page.goto(pageUrl, {
                 waitUntil: 'networkidle2',
             });
-            browser.close();
+            await browser.close();
 
             return roomInfo;
         },

lib/routes/douyin/user.ts

@@ -69,7 +69,7 @@ async function handler(ctx) {
                 waitUntil: 'networkidle2',
             });
 
-            browser.close();
+            await browser.close();
 
             if (!postData) {
                 throw new Error('Empty post data. The request may be filtered by WAF.');

lib/routes/fortnite/news.ts

@@ -64,7 +64,7 @@ async function handler(ctx) {
     });
 
     await page.close();
-    browser.close();
+    await browser.close();
 
     const { blogList: list } = data;
     const items = await Promise.all(

lib/routes/gov/customs/list.ts

@@ -104,7 +104,7 @@ async function handler(ctx) {
         )
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title: `中国海关-${channelName}`,

lib/routes/gov/pbc/goutongjiaoliu.ts

@@ -75,7 +75,7 @@ async function handler() {
         )
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title: '中国人民银行 - 沟通交流',

lib/routes/gov/pbc/trade-announcement.ts

@@ -68,7 +68,7 @@ async function handler() {
         )
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title: '中国人民银行 - 货币政策司公开市场交易公告',

lib/routes/hitcon/zeroday.ts

@@ -63,7 +63,7 @@ async function handler(ctx: Context): Promise<Data> {
     });
 
     const response = await page.evaluate(() => document.documentElement.innerHTML);
-    browser.close();
+    await browser.close();
 
     const $ = load(response);
     const items: DataItem[] = $('.zdui-strip-list>li')

lib/routes/hottoys/index.ts

@@ -39,7 +39,7 @@ async function handler() {
         waitUntil: 'domcontentloaded',
     });
     const response = await page.content();
-    page.close();
+    await page.close();
     const $ = load(response);
     const items = $('li.productListItem')
         .toArray()
@@ -54,7 +54,7 @@ async function handler() {
                 guid: a.attr('href'),
             };
         });
-    browser.close();
+    await browser.close();
     return {
         title: 'Hot Toys New Products',
         link: baseUrl,

lib/routes/ielts/index.ts

@@ -38,7 +38,7 @@ async function handler() {
             await page.waitForSelector('div.container');
 
             const html = await page.evaluate(() => document.documentElement.innerHTML);
-            browser.close();
+            await browser.close();
             return html;
         },
         config.cache.routeExpire,

lib/routes/iqiyi/video.ts

@@ -73,7 +73,7 @@ async function handler(ctx) {
         config.cache.routeExpire,
         false
     );
-    browser.close();
+    await browser.close();
 
     return data;
 }

lib/routes/njust/utils.ts

@@ -23,7 +23,7 @@ async function getContent(url, pptr = false) {
             const content = await page.content();
             return content;
         } finally {
-            browser.close();
+            await browser.close();
         }
     } else {
         const response = await got(url);

lib/routes/nytimes/index.ts

@@ -151,7 +151,7 @@ async function handler(ctx) {
         })
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title,

lib/routes/oceanengine/arithmetic-index.ts

@@ -118,7 +118,7 @@ async function handler(ctx) {
             });
             await page.goto('https://trendinsight.oceanengine.com/arithmetic-index');
             const res = await getMultiKeywordHotTrend(page, keyword, start_date, end_date, channel);
-            browser.close();
+            await browser.close();
 
             const rawData = JSON.parse(res).data;
             const data = decrypt(rawData).hot_list[0];

lib/routes/parliament.uk/commonslibrary.ts

@@ -46,7 +46,7 @@ async function handler(ctx) {
             description: $(article).find('p').last().text().trim(),
             pubDate: timezone($(article).find('.card__date time').attr('datetime')),
         }));
-    browser.close();
+    await browser.close();
     return {
         title: `parliament - lordslibrary - ${topic}`,
         link: url,

lib/routes/parliament.uk/lordslibrary.ts

@@ -46,7 +46,7 @@ async function handler(ctx) {
             description: $(article).find('p').last().text().trim(),
             pubDate: timezone($(article).find('.card__date time').attr('datetime')),
         }));
-    browser.close();
+    await browser.close();
     return {
         title: `parliament - lordslibrary - ${topic}`,
         link: url,

lib/routes/pincong/utils.ts

@@ -14,7 +14,7 @@ const puppeteerGet = (url, cache) =>
             waitUntil: 'domcontentloaded',
         });
         const html = await page.evaluate(() => document.documentElement.innerHTML);
-        browser.close();
+        await browser.close();
         return html;
     });
 

lib/routes/pnas/index.ts

@@ -108,7 +108,7 @@ async function handler(ctx) {
         )
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title: `${$('.banner-widget__content h1').text()} - PNAS`,

lib/routes/science/blogs.ts

@@ -52,8 +52,8 @@ async function handler(ctx) {
 
             const response = await page.content();
 
-            page.close();
-            browser.close();
+            await page.close();
+            await browser.close();
             return response;
         },
         config.cache.routeExpire,

lib/routes/sehuatang/index.ts

@@ -80,7 +80,7 @@ async function handler(ctx) {
 
     await Promise.all([page.click('a.enter-btn'), page.waitForNavigation({ waitUntil: 'domcontentloaded' })]);
     const response = await page.content();
-    page.close();
+    await page.close();
 
     const $ = load(response);
 

lib/routes/spankbang/new-videos.ts

@@ -61,7 +61,7 @@ const handler = async () => {
         false
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title: data.title,

lib/routes/sysu/ygafz.ts

@@ -63,7 +63,7 @@ async function handler(ctx) {
         return jar;
     }, cookieJar);
 
-    browser.close();
+    await browser.close();
 
     const $ = load(response);
     const list = $('.list-content a')

lib/routes/tiktok/user.ts

@@ -53,7 +53,7 @@ async function handler(ctx) {
                 waitUntil: 'networkidle0',
             });
             const SIGI_STATE = await page.evaluate(() => window.SIGI_STATE);
-            browser.close();
+            await browser.close();
 
             const lang = SIGI_STATE.AppContext.lang;
             const SharingMetaState = SIGI_STATE.SharingMetaState;

lib/routes/uchicago/current.ts

@@ -46,7 +46,7 @@ async function handler(ctx) {
     });
     const response = await page.evaluate(() => document.documentElement.innerHTML);
     const cookies = await getCookies(page);
-    page.close();
+    await page.close();
     const $ = load(response);
 
     const list = $('.issue-item__title')
@@ -68,7 +68,7 @@ async function handler(ctx) {
                     referer: link,
                 });
                 const response = await page.evaluate(() => document.documentElement.innerHTML);
-                page.close();
+                await page.close();
 
                 const $ = load(response);
 
@@ -94,7 +94,7 @@ async function handler(ctx) {
         )
     );
 
-    browser.close();
+    await browser.close();
 
     return {
         title: $('head title').text(),

lib/routes/uraaka-joshi/uraaka-joshi-user.ts

@@ -42,9 +42,9 @@ async function handler(ctx) {
             page.on('request', (request) => {
                 request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'fetch' ? request.continue() : request.abort();
             });
-            page.on('requestfinished', (request) => {
+            page.on('requestfinished', async (request) => {
                 if (request.url() === link && request.response().status() === 403) {
-                    page.close();
+                    await page.close();
                 }
             });
 

lib/routes/uraaka-joshi/uraaka-joshi.ts

@@ -28,9 +28,9 @@ async function handler() {
     page.on('request', (request) => {
         request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'fetch' ? request.continue() : request.abort();
     });
-    page.on('requestfinished', (request) => {
+    page.on('requestfinished', async (request) => {
         if (request.url() === link && request.response().status() === 403) {
-            page.close();
+            await page.close();
         }
     });
 
@@ -57,49 +57,45 @@ async function handler() {
     return {
         title,
         link,
-        item:
-            list &&
-            list
-                .map((index, item) => {
-                    item = $(item);
-
-                    // remove event and styles
-                    item.find('*').removeAttr('onclick');
-                    item.find('*').removeAttr('onerror');
-                    item.find('*').removeAttr('style');
-
-                    // format account style
-                    const account = item.find('.account-group-link-row');
-                    account.html(account.text());
-
-                    // extract video tag from its player
-                    item.find('.plyr--video').each((_, player) => {
-                        player = $(player);
-
-                        const video = player.find('video');
-                        player.replaceWith(video);
-                        const poster = video.attr('data-poster');
-                        video.attr('poster', 'https:' + poster);
-
-                        const source = video.find('source');
-                        const src = source.attr('src');
-                        source.attr('src', 'https:' + src);
-                    });
-
-                    // correct src of img tags
-                    item.find('img').each((_, image) => {
-                        const src = $(image).attr('data-src');
-                        $(image).attr('src', 'https:' + src);
-                    });
-
-                    return {
-                        title: item.find('.account-group').text() + ` - ${title}`,
-                        description: item.html(),
-                        link: item.find('.account-group-link-row').attr('href'),
-                        pubDate: parseDate(item.find('.profile-char').attr('datetime')),
-                        guid: item.find('a.tap-image').attr('data-tweet-id') || item.find('video[class^="js-player-"]').attr('data-tweet-id') || parseDate(item.find('.profile-char').attr('datetime')).getTime(),
-                    };
-                })
-                .get(),
+        item: list.toArray().map((item) => {
+            item = $(item);
+
+            // remove event and styles
+            item.find('*').removeAttr('onclick');
+            item.find('*').removeAttr('onerror');
+            item.find('*').removeAttr('style');
+
+            // format account style
+            const account = item.find('.account-group-link-row');
+            account.html(account.text());
+
+            // extract video tag from its player
+            item.find('.plyr--video').each((_, player) => {
+                player = $(player);
+
+                const video = player.find('video');
+                player.replaceWith(video);
+                const poster = video.attr('data-poster');
+                video.attr('poster', 'https:' + poster);
+
+                const source = video.find('source');
+                const src = source.attr('src');
+                source.attr('src', 'https:' + src);
+            });
+
+            // correct src of img tags
+            item.find('img').each((_, image) => {
+                const src = $(image).attr('data-src');
+                $(image).attr('src', 'https:' + src);
+            });
+
+            return {
+                title: item.find('.account-group').text() + ` - ${title}`,
+                description: item.html(),
+                link: item.find('.account-group-link-row').attr('href'),
+                pubDate: parseDate(item.find('.profile-char').attr('datetime')),
+                guid: item.find('a.tap-image').attr('data-tweet-id') || item.find('video[class^="js-player-"]').attr('data-tweet-id') || parseDate(item.find('.profile-char').attr('datetime')).getTime(),
+            };
+        }),
     };
 }