Bug Fixes: The page is not closed when there is an error in the crawlPage API

Author: coder-hxl

CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v4.0.1](https://github.com/coder-hxl/x-crawl/compare/v4.0.0...v4.0.1) (2023-03-30)
+
+### 🐞 Bug Fixes
+
+- The page is not closed when there is an error in the crawlPage API
+
 # [v4.0.0](https://github.com/coder-hxl/x-crawl/compare/v3.3.0...v4.0.0) (2023-03-27)
 
 ### 🚨 Breaking Changes

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "x-crawl",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "author": "coderHXL",
   "description": "x-crawl is a flexible nodejs crawler library.",
   "license": "MIT",

publish/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x-crawl",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "author": "coderHXL",
   "description": "x-crawl is a flexible nodejs crawler library.",
   "license": "MIT",

src/api.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import { writeFile } from 'node:fs/promises'
 import path from 'node:path'
-import puppeteer, { Browser, Protocol } from 'puppeteer'
+import puppeteer, { Browser, HTTPResponse, Page, Protocol } from 'puppeteer'
 
 import { useBatchCrawlHandleByMode } from './batchCrawlHandle'
 import { request } from './request'
@@ -166,35 +166,43 @@ export function createCrawlPage(baseConfig: LoaderXCrawlBaseConfig) {
   }
 
   async function crawlPageHandle(handleConfig: CrawlBaseConfigV1) {
-    const page = await browser!.newPage()
-    await page.setViewport({ width: 1280, height: 1024 })
+    let page: Page | null = null
+    let httpResponse: HTTPResponse | null = null
+
+    try {
+      page = await browser!.newPage()
+      await page.setViewport({ width: 1280, height: 1024 })
+
+      if (handleConfig.proxy) {
+        await browser!.createIncognitoBrowserContext({
+          proxyServer: handleConfig.proxy
+        })
+      } else {
+        await browser!.createIncognitoBrowserContext({
+          proxyServer: undefined
+        })
+      }
 
-    if (handleConfig.proxy) {
-      await browser!.createIncognitoBrowserContext({
-        proxyServer: handleConfig.proxy
-      })
-    } else {
-      await browser!.createIncognitoBrowserContext({
-        proxyServer: undefined
-      })
-    }
+      if (handleConfig.headers) {
+        await page.setExtraHTTPHeaders(
+          handleConfig.headers as any as Record<string, string>
+        )
+      }
 
-    if (handleConfig.headers) {
-      await page.setExtraHTTPHeaders(
-        handleConfig.headers as any as Record<string, string>
-      )
-    }
+      if (handleConfig.cookies) {
+        await page.setCookie(
+          ...parseCrawlPageCookies(handleConfig.url, handleConfig.cookies)
+        )
+      }
 
-    if (handleConfig.cookies) {
-      await page.setCookie(
-        ...parseCrawlPageCookies(handleConfig.url, handleConfig.cookies)
-      )
+      httpResponse = await page.goto(handleConfig.url, {
+        timeout: handleConfig.timeout
+      })
+    } catch (error) {
+      await page?.close()
+      throw error
     }
 
-    const httpResponse = await page.goto(handleConfig.url, {
-      timeout: handleConfig.timeout
-    })
-
     return { httpResponse, browser: browser!, page }
   }