Adjust: The execution time of the callback to get the result is moved to before the result is returned

Author: coder-hxl

src/api.ts

@@ -405,17 +405,17 @@ export function createCrawlPage(xCrawlConfig: LoaderXCrawlConfig) {
 
   function crawlPage(
     config: (string | CrawlPageDetailConfig)[],
-    callback?: (res: CrawlPageSingleRes) => void
+    callback?: (res: CrawlPageSingleRes[]) => void
   ): Promise<CrawlPageSingleRes[]>
 
   function crawlPage(
     config: CrawlPageAdvancedConfig,
-    callback?: (res: CrawlPageSingleRes) => void
+    callback?: (res: CrawlPageSingleRes[]) => void
   ): Promise<CrawlPageSingleRes[]>
 
   async function crawlPage(
     config: UniteCrawlPageConfig,
-    callback?: (res: CrawlPageSingleRes) => void
+    callback?: (res: any) => void
   ): Promise<CrawlPageSingleRes | CrawlPageSingleRes[]> {
     const cId = ++cIdCount
 
@@ -484,10 +484,6 @@ export function createCrawlPage(xCrawlConfig: LoaderXCrawlConfig) {
         data
       }
 
-      if (callback) {
-        callback(crawlRes)
-      }
-
       return crawlRes
     })
 
@@ -500,6 +496,10 @@ export function createCrawlPage(xCrawlConfig: LoaderXCrawlConfig) {
         ? crawlResArr
         : crawlResArr[0]
 
+    if (callback) {
+      callback(crawlRes)
+    }
+
     return crawlRes
   }
 
@@ -576,17 +576,17 @@ export function createCrawlData(xCrawlConfig: LoaderXCrawlConfig) {
 
   function crawlData<T = any>(
     config: (string | CrawlDataDetailConfig)[],
-    callback?: (res: CrawlDataSingleRes<T>) => void
+    callback?: (res: CrawlDataSingleRes<T>[]) => void
   ): Promise<CrawlDataSingleRes<T>[]>
 
   function crawlData<T = any>(
     config: CrawlDataAdvancedConfig,
-    callback?: (res: CrawlDataSingleRes<T>) => void
+    callback?: (res: CrawlDataSingleRes<T>[]) => void
   ): Promise<CrawlDataSingleRes<T>[]>
 
   async function crawlData<T = any>(
     config: UniteCrawlDataConfig,
-    callback?: (res: CrawlDataSingleRes<T>) => void
+    callback?: (res: any) => void
   ): Promise<CrawlDataSingleRes<T> | CrawlDataSingleRes<T>[]> {
     const { crawlDetails, intervalTime } = createCrawlDataConfig(
       xCrawlConfig,
@@ -632,10 +632,6 @@ export function createCrawlData(xCrawlConfig: LoaderXCrawlConfig) {
         crawlRes.data = { ...crawlSingleRes, data }
       }
 
-      if (callback) {
-        callback(crawlRes)
-      }
-
       return crawlRes
     })
 
@@ -645,6 +641,10 @@ export function createCrawlData(xCrawlConfig: LoaderXCrawlConfig) {
         ? crawlResArr
         : crawlResArr[0]
 
+    if (callback) {
+      callback(crawlRes)
+    }
+
     return crawlRes
   }
 
@@ -659,17 +659,17 @@ export function createCrawlFile(xCrawlConfig: LoaderXCrawlConfig) {
 
   function crawlFile(
     config: CrawlFileDetailConfig[],
-    callback?: (res: CrawlFileSingleRes) => void
+    callback?: (res: CrawlFileSingleRes[]) => void
   ): Promise<CrawlFileSingleRes[]>
 
   function crawlFile(
     config: CrawlFileAdvancedConfig,
-    callback?: (res: CrawlFileSingleRes) => void
+    callback?: (res: CrawlFileSingleRes[]) => void
   ): Promise<CrawlFileSingleRes[]>
 
   async function crawlFile(
     config: UniteCrawlFileConfig,
-    callback?: (res: CrawlFileSingleRes) => void
+    callback?: (res: any) => void
   ): Promise<CrawlFileSingleRes | CrawlFileSingleRes[]> {
     const { crawlDetails, intervalTime, onBeforeSaveFile } =
       createCrawlFileConfig(xCrawlConfig, config)
@@ -762,17 +762,9 @@ export function createCrawlFile(xCrawlConfig: LoaderXCrawlConfig) {
               filePath
             }
           }
-
-          if (callback) {
-            callback(crawlRes)
-          }
         })
 
         saveFileQueue.push(saveFileItem)
-      } else {
-        if (callback) {
-          callback(crawlRes)
-        }
       }
 
       return crawlRes
@@ -816,6 +808,10 @@ export function createCrawlFile(xCrawlConfig: LoaderXCrawlConfig) {
         ? crawlResArr
         : crawlResArr[0]
 
+    if (callback) {
+      callback(crawlRes)
+    }
+
     return crawlRes
   }
 

src/types/index.ts

@@ -43,12 +43,12 @@ export interface XCrawlInstance {
 
     (
       config: (string | CrawlPageDetailConfig)[],
-      callback?: (res: CrawlPageSingleRes) => void
+      callback?: (res: CrawlPageSingleRes[]) => void
     ): Promise<CrawlPageSingleRes[]>
 
     (
       config: CrawlPageAdvancedConfig,
-      callback?: (res: CrawlPageSingleRes) => void
+      callback?: (res: CrawlPageSingleRes[]) => void
     ): Promise<CrawlPageSingleRes[]>
   }
 
@@ -65,12 +65,12 @@ export interface XCrawlInstance {
 
     <T = any>(
       config: (string | CrawlDataDetailConfig)[],
-      callback?: (res: CrawlDataSingleRes<T>) => void
+      callback?: (res: CrawlDataSingleRes<T>[]) => void
     ): Promise<CrawlDataSingleRes<T>[]>
 
     <T = any>(
       config: CrawlDataAdvancedConfig,
-      callback?: (res: CrawlDataSingleRes<T>) => void
+      callback?: (res: CrawlDataSingleRes<T>[]) => void
     ): Promise<CrawlDataSingleRes<T>[]>
   }
 
@@ -82,12 +82,12 @@ export interface XCrawlInstance {
 
     (
       config: CrawlFileDetailConfig[],
-      callback?: (res: CrawlFileSingleRes) => void
+      callback?: (res: CrawlFileSingleRes[]) => void
     ): Promise<CrawlFileSingleRes[]>
 
     (
       config: CrawlFileAdvancedConfig,
-      callback?: (res: CrawlFileSingleRes) => void
+      callback?: (res: CrawlFileSingleRes[]) => void
     ): Promise<CrawlFileSingleRes[]>
   }