http和https协议

Author: coder-hxl

src/request.ts

@@ -1,4 +1,4 @@
-import https from 'node:https'
+import http from 'node:http'
 
 import {
   handleRequestConfig,
@@ -12,13 +12,13 @@ import { IIntervalTime, IRequest, IRequestConfig } from './types'
 
 export function request(config: IRequestConfig) {
   return new Promise<IRequest>((resolve, reject) => {
-    const data = (config.data = config.data
-      ? JSON.stringify(config.data ?? '')
-      : config.data)
+    const isDataUndefine = isUndefined(config.data)
+    config.data = !isDataUndefine ? JSON.stringify(config.data) : config.data
+
     const requestConfig = handleRequestConfig(config)
 
-    const req = https.request(requestConfig, (res) => {
-      const { headers } = res
+    const req = http.request(requestConfig, (res) => {
+      const { statusCode, headers } = res
 
       const container: Buffer[] = []
 
@@ -27,6 +27,7 @@ export function request(config: IRequestConfig) {
       res.on('end', () => {
         const data = Buffer.concat(container)
         const resolveRes: IRequest = {
+          statusCode,
           headers,
           data
         }
@@ -36,18 +37,16 @@ export function request(config: IRequestConfig) {
     })
 
     req.on('timeout', () => {
-      console.log(`Timeout Error`)
-      reject(new Error('Timeout'))
+      reject(new Error(`Timeout ${config.timeout}ms`))
     })
 
     req.on('error', (err) => {
-      console.log('Error: ', err.message)
       reject(err)
     })
 
     // 其他处理
-    if (requestConfig.method === 'POST') {
-      req.write(data)
+    if (requestConfig.method === 'POST' && !isDataUndefine) {
+      req.write(config.data)
     }
 
     req.end()

src/types.ts

@@ -13,6 +13,7 @@ export type IMapTypeEmptyObject<T extends object, E extends string = ''> = {
 }
 
 export interface IRequest {
+  statusCode: number | undefined
   headers: IncomingHttpHeaders
   data: Buffer
 }
@@ -69,6 +70,12 @@ export interface IFetchFileConfig extends IFetchBaseConifg {
   }
 }
 
+export type IFetch<T> = {
+  statusCode: number | undefined
+  headers: IncomingHttpHeaders
+  data: T
+}[]
+
 export type IFetchFile = {
   fileName: string
   mimeType: string

src/utils.ts

@@ -1,11 +1,11 @@
-import { RequestOptions } from 'http'
+import { Agent } from 'http'
+import { Agent as httpsAgent } from 'https'
 import Url, { URL } from 'node:url'
-import { Agent } from 'https'
 
+import { RequestOptions } from 'http'
 import {
   IAnyObject,
   IFetchBaseConifg,
-  IFetchConfig,
   IMapTypeEmptyObject,
   IRequestConfig,
   IXCrawlBaseConifg
@@ -30,10 +30,11 @@ export function parseHeaders(
   rawConfig: IRequestConfig,
   config: RequestOptions & IMapTypeEmptyObject<URL>
 ) {
+  const rawHeaders = rawConfig.headers ?? {}
   const headers: IAnyObject = {
     'User-Agent':
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36',
-    ...config
+    ...rawHeaders
   }
 
   if (config.method === 'POST' && rawConfig.data) {
@@ -47,11 +48,12 @@ export function parseHeaders(
 export function handleRequestConfig(
   rawConfig: IRequestConfig
 ): RequestOptions & IMapTypeEmptyObject<URL> {
-  const { hostname, port, pathname, search } = new Url.URL(rawConfig.url)
+  const { protocol, hostname, port, pathname, search } = new Url.URL(
+    rawConfig.url
+  )
 
   const config: RequestOptions & IMapTypeEmptyObject<URL> = {
-    agent: new Agent({}),
-
+    protocol,
     hostname,
     port,
     path: pathname,
@@ -64,10 +66,16 @@ export function handleRequestConfig(
 
   config.headers = parseHeaders(rawConfig, config)
 
+  if (protocol === 'http:') {
+    config.agent = new Agent()
+  } else {
+    config.agent = new httpsAgent()
+  }
+
   return config
 }
 
-export function mergeConfig<T extends IFetchConfig>(
+export function mergeConfig<T extends IFetchBaseConifg>(
   baseConfig: IXCrawlBaseConifg,
   config: T
 ): IFetchBaseConifg & T {