chore: move code location

Author: coder-hxl

src/api.ts

@@ -5,8 +5,8 @@ import puppeteer, { Browser, HTTPResponse, Page, Protocol } from 'puppeteer'
 
 import { Device, controller, isCrawlStatusInHttpStatus } from './controller'
 import { Request, request } from './request'
-import { quickSort } from './sort'
 import {
+  mergeSort,
   isArray,
   isObject,
   isString,
@@ -1350,7 +1350,7 @@ export function createCrawlFile(xCrawlInstanceConfig: XCrawlInstanceConfig) {
 
     if (logConfig.result) {
       // 打印保存错误
-      quickSort(saveFileErrorArr).forEach((item) =>
+      mergeSort(saveFileErrorArr).forEach((item) =>
         log(`${infoConfig.serialNumber} | ${logError(item.message)}`)
       )
 

src/controller.ts

@@ -1,5 +1,4 @@
 import { asyncBatchCrawl, syncBatchCrawl } from './batchCrawl'
-import { priorityQueueMergeSort } from './sort'
 
 import {
   InfoCommonConfig,
@@ -11,6 +10,7 @@ import {
 } from './api'
 
 import {
+  mergeSort,
   isObject,
   isUndefined,
   log,
@@ -96,9 +96,9 @@ export async function controller<
     (item) => item.priority === detailTargets[0].priority
   )
   const detailTargetConfigs = isPriorityCrawl
-    ? priorityQueueMergeSort(
+    ? mergeSort(
         detailTargets.map((item) => ({ ...item, valueOf: () => item.priority }))
-      )
+      ).reverse()
     : detailTargets
 
   // 生成装置
@@ -185,8 +185,9 @@ export async function controller<
             )!.state = false
 
             // 寻找新代理 URL
-            const newProxyUrl = proxyDetails.find((detaile) => detaile.state)
-              ?.url
+            const newProxyUrl = proxyDetails.find(
+              (detaile) => detaile.state
+            )?.url
 
             // 使用新代理 URL
             if (!isUndefined(newProxyUrl)) {

src/sort.ts

@@ -115,6 +115,7 @@ export interface CrawlDataDetailTargetConfig extends CrawlCommonConfig {
 export interface CrawlFileDetailTargetConfig extends CrawlCommonConfig {
   url: string
   headers?: AnyObject | null
+  priority?: number
   storeDir?: string | null
   fileName?: string | null
   extension?: string | null

src/types/api.ts

@@ -1,19 +1,6 @@
 import chalk from 'chalk'
 
-export function sleep(timeout: number) {
-  return new Promise((resolve) => setTimeout(resolve, timeout))
-}
-
-export function random(max: number, min = 0) {
-  let result = Math.floor(Math.random() * max)
-
-  while (result < min) {
-    result = Math.floor(Math.random() * max)
-  }
-
-  return result
-}
-
+// Log
 export const log = console.log
 export const logStart = chalk.blueBright
 export const logStatistics = chalk.whiteBright
@@ -40,9 +27,52 @@ export function isBoolean(value: any): value is string {
 }
 
 export function isObject(value: any): value is object {
-  return typeof value === 'object' && value && !Array.isArray(value)
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
 }
 
 export function isArray(value: any): value is any[] {
   return Array.isArray(value)
 }
+
+export function sleep(timeout: number) {
+  return new Promise((resolve) => setTimeout(resolve, timeout))
+}
+
+export function random(max: number, min = 0) {
+  let result = Math.floor(Math.random() * max)
+
+  while (result < min) {
+    result = Math.floor(Math.random() * max)
+  }
+
+  return result
+}
+
+export function mergeSort<T extends any[]>(arr: T): T {
+  if (arr.length <= 1) return arr
+
+  const mid = Math.floor(arr.length / 2)
+  const newLeftArr = mergeSort(arr.slice(0, mid))
+  const newRightArr = mergeSort(arr.slice(mid))
+
+  const newArr = [] as any as T
+  let i = 0
+  let j = 0
+  while (i < newLeftArr.length && j < newRightArr.length) {
+    if (newLeftArr[i] <= newRightArr[j]) {
+      newArr.push(newLeftArr[i++])
+    } else {
+      newArr.push(newRightArr[j++])
+    }
+  }
+
+  if (i < newLeftArr.length) {
+    newArr.push(...newLeftArr.slice(i))
+  }
+
+  if (j < newRightArr.length) {
+    newArr.push(...newRightArr.splice(j))
+  }
+
+  return newArr
+}

src/utils.ts

@@ -1,19 +1,34 @@
+import path from 'node:path'
 import xCrawl from 'x-crawl'
 
-const testXCrawl = xCrawl()
-
-testXCrawl.crawlHTML([
-  'http://localhost:8888/html',
-  'http://localhost:8888/html',
-  'http://localhost:8888/html'
-])
+const pathResolve = (dirPath: string) => path.resolve(__dirname, dirPath)
 
-testXCrawl.crawlHTML('http://localhost:8888/html')
+const testXCrawl = xCrawl()
 
-testXCrawl.crawlFile({
-  targets: [
-    'https://raw.githubusercontent.com/coder-hxl/airbnb-upload/master/area/4401.jpg',
-    'https://raw.githubusercontent.com/coder-hxl/airbnb-upload/master/area/4403.jpg'
-  ],
-  proxy: { urls: ['http://localhost:14892'] }
-})
+testXCrawl
+  .crawlFile({
+    targets: [
+      {
+        url: 'https://raw.githubusercontent.com/coder-hxl/airbnb-upload/master/area/4408.jpg',
+        fileName: '4408',
+        priority: 1
+      },
+      {
+        url: 'https://raw.githubusercontent.com/coder-hxl/airbnb-upload/master/area/4401.jpg',
+        fileName: '4401',
+        priority: 3
+      },
+      {
+        url: 'https://raw.githubusercontent.com/coder-hxl/airbnb-upload/master/area/4406.jpg',
+        fileName: '4406',
+        priority: 2
+      }
+    ],
+    proxy: { urls: ['http://localhost:14892'] },
+    storeDirs: pathResolve('./upload')
+  })
+  .then((res) => {
+    res.forEach((item) => {
+      console.log(item.id, item.data?.data.fileName)
+    })
+  })