Add chalk library

Author: coder-hxl

package.json

@@ -15,6 +15,7 @@
     "prettier": "prettier --write ."
   },
   "dependencies": {
+    "chalk": "4.1.2",
     "jsdom": "^21.1.0",
     "x-crawl": "link:"
   },

pnpm-lock.yaml

@@ -26,6 +26,7 @@
     }
   },
   "dependencies": {
+    "chalk": "4.1.2",
     "jsdom": "^21.1.0",
     "@types/jsdom": "^20.0.1"
   }

publish/package.json

@@ -3,7 +3,7 @@ import path from 'node:path'
 import { JSDOM } from 'jsdom'
 
 import { batchRequest, syncBatchRequest, request } from './request'
-import { isArray, isString, isUndefined } from './utils'
+import { isArray, isString, isUndefined, log, logError } from './utils'
 
 import {
   IXCrawlBaseConifg,
@@ -151,7 +151,7 @@ export default class XCrawl {
 
         fs.createWriteStream(filePath, 'binary').write(data, (err) => {
           if (err) {
-            console.log(`File save error at id ${id}: ${err.message}`)
+            log(logError(`File save error at id ${id}: ${err.message}`))
           } else {
             const fileInfo: IFileInfo = {
               fileName,

src/index.ts

@@ -2,7 +2,16 @@ import http, { Agent, RequestOptions } from 'node:http'
 import { Agent as httpsAgent } from 'https'
 import Url, { URL } from 'node:url'
 
-import { isNumber, isUndefined, random, sleep } from './utils'
+import {
+  isNumber,
+  isUndefined,
+  log,
+  logError,
+  logNumber,
+  logSuccess,
+  random,
+  sleep
+} from './utils'
 
 import {
   IIntervalTime,
@@ -88,13 +97,15 @@ async function useSleepByBatch(
       ? intervalTime
       : random(intervalTime.max, intervalTime.min)
 
-    console.log(
-      `Request ${id} needs to sleep for ${timeout} milliseconds before sending`
+    log(
+      `Request ${logNumber(id)} needs to sleep for ${logNumber(
+        timeout + 'ms'
+      )} milliseconds before sending`
     )
 
     await sleep(timeout)
   } else {
-    console.log(`Request ${id} does not need to sleep, send immediately`)
+    log(`Request ${logNumber(id)} does not need to sleep, send immediately`)
   }
 }
 
@@ -148,7 +159,9 @@ export async function batchRequest(
   const isHaveIntervalTime = !isUndefined(intervalTime)
   const isNumberIntervalTime = isNumber(intervalTime)
 
-  console.log(`Begin execution, mode: async, total: ${requestConifgs.length} `)
+  log(
+    `Begin execution, mode: async, total: ${logNumber(requestConifgs.length)} `
+  )
 
   const requestQueue: Promise<IRequestResItem | string>[] = []
 
@@ -176,7 +189,7 @@ export async function batchRequest(
     requestQueue.push(requestItem)
   }
 
-  console.log('All requests have been sent!')
+  log(logSuccess('All requests have been sent!'))
 
   const res = await Promise.all(requestQueue)
 
@@ -192,9 +205,13 @@ export async function batchRequest(
     success.push(item)
   })
 
-  error.forEach((message) => {
-    console.log(message)
-  })
+  error.forEach((message) => log(logError(message)))
+
+  log(
+    `total: ${logNumber(requestConifgs.length)}, success: ${logSuccess(
+      success.length
+    )}, error: ${logError(error.length)}`
+  )
 
   return success
 }
@@ -206,9 +223,13 @@ export async function syncBatchRequest(
   const isHaveIntervalTime = !isUndefined(intervalTime)
   const isNumberIntervalTime = isNumber(intervalTime)
 
-  console.log(`Begin execution, mode: sync, total: ${requestConifgs.length} `)
+  log(
+    `Begin execution, mode: sync, total: ${logNumber(requestConifgs.length)} `
+  )
 
   let id = 0
+  let successTotal = 0
+  let errorTotal = 0
   const requestRes: IRequestResItem[] = []
   for (const requestConifg of requestConifgs) {
     id++
@@ -223,13 +244,21 @@ export async function syncBatchRequest(
     try {
       const requestResItem = await request(requestConifg)
       requestRes.push({ id, ...requestResItem })
-      console.log(`Request ${id} is an success`)
+      log(logSuccess(`Request ${logNumber(id)} is an success`))
+      successTotal++
     } catch (error: any) {
-      console.log(`Request ${id} is an error: ${error.message}`)
+      log(logError(`Request ${id} is an error: ${error.message}`))
+      errorTotal++
     }
   }
 
-  console.log('All requests are over!')
+  log(logSuccess('All requests are over!'))
+
+  log(
+    `total: ${logNumber(requestConifgs.length)}, success: ${logSuccess(
+      successTotal
+    )}, error: ${logError(errorTotal)}`
+  )
 
   return requestRes
 }

src/request.ts

@@ -1,3 +1,5 @@
+import chalk from 'chalk'
+
 export function sleep(timeout: number) {
   return new Promise((resolve) => setTimeout(resolve, timeout))
 }
@@ -12,6 +14,11 @@ export function random(max: number, min = 0) {
   return res
 }
 
+export const log = console.log
+export const logNumber = chalk.hex('#a57fff')
+export const logSuccess = chalk.green
+export const logError = chalk.red
+
 export function isUndefined(value: any): value is undefined {
   return typeof value === 'undefined'
 }

src/utils.ts

@@ -7,24 +7,26 @@ const testXCrawl = new XCrawl({
     max: 3000,
     min: 2000
   },
-  mode: 'sync'
+  mode: 'async'
 })
 
-// testXCrawl
-//   .fetchData({
-//     requestConifg: [
-//       { url: 'http://localhost:3001/home' },
-//       { url: 'http://localhost:9001/api/home/wonderfulplace' },
-//       { url: 'http://localhost:9001/api/home/goodprice' },
-//       { url: 'http://localhost:3001/home' },
-//       { url: 'http://localhost:9001/ai/home/goodprice' }
-//     ]
-//   })
-//   .then((res) => {
-//     console.log(res)
-//   })
+testXCrawl
+  .fetchData({
+    requestConifg: [
+      { url: 'http://localhost:3001/home' },
+      { url: 'http://localhost:9001/api/home/wonderfulplace' },
+      { url: 'http://localhost:9001/api/home/goodprice' },
+      { url: 'http://localhost:3001/home' },
+      { url: 'http://localhost:9001/ai/home/goodprice' }
+    ]
+  })
+  .then((res) => {
+    // console.log(res)
+  })
+
+// testXCrawl.fetchHTML({ url: 'https://www.bilibili.com/' }).then((res) => {
+//   const { jsdom } = res.data
 
-// testXCrawl.fetchHTML({ url: 'https://www.bilibili.com/' }).then((jsdom) => {
 //   const document = jsdom.window.document
 //   const imgBoxEl = document.querySelectorAll('.bili-video-card__cover')
 
@@ -52,12 +54,3 @@ const testXCrawl = new XCrawl({
 //       console.log(res)
 //     })
 // })
-
-testXCrawl.fetchHTML('https://cn.bing.com').then((res) => {
-  const { jsdom } = res.data
-})
-
-testXCrawl.fetchHTML('https://docs.github.com/zh/get-started').then((res) => {
-  const { jsdom } = res.data
-  console.log(jsdom.window.document.querySelector('title')?.textContent)
-})