Can pass in a public configuration that does not use higher-order usage for the null type

Author: coder-hxl

src/api.ts

@@ -393,15 +393,12 @@ function createCrawlFileConfig(
     advancedConfig = originalConfig as CrawlFileAdvancedConfig
     crawlFileConfig.detailTargets.push(...transformToDetailTargets(targets))
   } else {
-    // string | CrawlFileDetailConfig | (string | CrawlFileDetailConfig)[] 处理
-    const detailTargets = transformToDetailTargets(
-      originalConfig as
-        | string
-        | CrawlFileDetailConfig
-        | (string | CrawlFileDetailConfig)[]
+    // CrawlFileDetailConfig |  CrawlFileDetailConfig[] 处理
+    crawlFileConfig.detailTargets.push(
+      ...(isArray(originalConfig)
+        ? originalConfig
+        : [originalConfig as CrawlFileDetailConfig])
     )
-
-    crawlFileConfig.detailTargets.push(...detailTargets)
   }
 
   loaderCommonConfig(xCrawlConfig, advancedConfig, crawlFileConfig)
@@ -453,9 +450,11 @@ async function pageSingleCrawlHandle(
     }
 
     if (detailTarget.cookies) {
-      await page.setCookie(
-        ...parsePageCookies(detailTarget.url, detailTarget.cookies)
-      )
+      const cookies = parsePageCookies(detailTarget.url, detailTarget.cookies)
+      await page.setCookie(...cookies)
+    } else {
+      const cookies = await page.cookies(detailTarget.url)
+      await page.deleteCookie(...cookies)
     }
 
     if (detailTarget.headers) {
@@ -547,10 +546,7 @@ function fileSingleResultHandle(
     const fileExtension =
       detailTarget.extension ?? `.${mimeType.split('/').pop()}`
 
-    if (
-      !isUndefined(detailTarget.storeDir) &&
-      !fs.existsSync(detailTarget.storeDir)
-    ) {
+    if (detailTarget.storeDir && !fs.existsSync(detailTarget.storeDir)) {
       mkdirDirSync(detailTarget.storeDir)
     }
 

src/controller.ts

@@ -51,7 +51,7 @@ export async function controller<
   const isPriorityCrawl = !detailTargets.every(
     (item) => item.priority === detailTargets[0].priority
   )
-  const targetRequestConfigs = isPriorityCrawl
+  const detailTargetConfigs = isPriorityCrawl
     ? priorityQueueMergeSort(
         detailTargets.map((item) => ({
           ...item,
@@ -61,7 +61,7 @@ export async function controller<
     : detailTargets
 
   // 通过映射生成新的配置数组
-  const detailInfos: DetailInfo<T, R>[] = targetRequestConfigs.map(
+  const detailInfos: DetailInfo<T, R>[] = detailTargetConfigs.map(
     (detailTarget, index) => ({
       id: index + 1,
       isSuccess: false,

src/types/api.ts

@@ -46,31 +46,31 @@ export interface CrawlCommonConfig {
 // 1.Detail
 export interface CrawlPageDetailConfig extends CrawlCommonConfig {
   url: string
-  headers?: AnyObject
-  cookies?: PageCookies
+  headers?: AnyObject | null
+  cookies?: PageCookies | null
   priority?: number
   viewport?: {
     width?: number
     height?: number
-  }
+  } | null
 }
 
 export interface CrawlDataDetailConfig extends CrawlCommonConfig {
   url: string
   method?: Method
-  headers?: AnyObject
+  headers?: AnyObject | null
   params?: AnyObject
   data?: any
   priority?: number
 }
 
 export interface CrawlFileDetailConfig extends CrawlCommonConfig {
   url: string
-  headers?: AnyObject
+  headers?: AnyObject | null
   priority?: number
-  storeDir?: string
+  storeDir?: string | null
   fileName?: string
-  extension?: string
+  extension?: string | null
 }
 
 // 2.Advanced
@@ -105,13 +105,13 @@ export interface CrawlFileAdvancedConfig extends CrawlCommonConfig {
   storeDir?: string
   extension?: string
 
+  onCrawlItemComplete?: (crawlFileSingleRes: CrawlFileSingleRes) => void
   onBeforeSaveFile?: (info: {
     id: number
     fileName: string
     filePath: string
     data: Buffer
   }) => Promise<Buffer>
-  onCrawlItemComplete?: (crawlFileSingleRes: CrawlFileSingleRes) => void
 }
 
 export interface StartPollingConfig {