Merge pull request #49 from coder-hxl/fix/48

fix(crawlData): request body and response body

Author: coder-hxl

src/api.ts

@@ -847,12 +847,11 @@ function dataSingleResultHandle(
   if (isSuccess && detailTargetResult) {
     const contentType = detailTargetResult.headers['content-type'] ?? ''
 
-    const data =
-      contentType === 'application/json'
-        ? JSON.parse(detailTargetResult.data.toString())
-        : contentType.includes('text')
-        ? detailTargetResult.data.toString()
-        : detailTargetResult.data
+    const data = contentType.includes('application/json')
+      ? JSON.parse(detailTargetResult.data.toString())
+      : contentType.includes('text')
+      ? detailTargetResult.data.toString()
+      : detailTargetResult.data
 
     result.data = { ...detailTargetResult, data }
   }

src/request.ts

@@ -63,7 +63,14 @@ function parseHeaders(
 function createContentConfig(
   rawRequestConfig: LoaderCrawlDataDetail & LoaderCrawlFileDetail
 ): ContentConfig {
-  const { data: rawData, url, params, proxyUrl } = rawRequestConfig
+  const {
+    data: rawData,
+    url,
+    params,
+    proxyUrl,
+    timeout,
+    method
+  } = rawRequestConfig
   const { protocol, hostname, port, pathname, search } = new Url.URL(url)
 
   let path = pathname
@@ -88,9 +95,9 @@ function createContentConfig(
       port,
       path,
 
-      method: rawRequestConfig.method?.toLocaleUpperCase() ?? 'GET',
+      method: method?.toLocaleUpperCase() ?? 'GET',
       headers: {},
-      timeout: rawRequestConfig.timeout
+      timeout
     },
 
     protocol: protocol as 'http:' | 'https:',
@@ -131,7 +138,7 @@ export function request(config: LoaderCrawlDataDetail & LoaderCrawlFileDetail) {
         : https.request(requestConfig, handleRes)
 
     req.on('timeout', () => {
-      reject(new Error(`Timeout ${config.timeout}ms`))
+      reject(new Error(`Timeout ${requestConfig.timeout}ms`))
     })
 
     req.on('error', (err) => {
@@ -140,7 +147,7 @@ export function request(config: LoaderCrawlDataDetail & LoaderCrawlFileDetail) {
 
     // 其他处理
     if (!isUndefined(data)) {
-      req.write(config.data)
+      req.write(data)
     }
 
     req.end()