feat: place common code in shared

Author: coder-hxl

packages/ai/index.ts

@@ -5,6 +5,7 @@ import {
   GET_ELEMENT_SELECTORS_CONTEXT,
   HELP_CONTEXT
 } from './context'
+import { isObject } from '../shared'
 
 type OpenAIChatModel =
   | 'gpt-4-0125-preview'
@@ -127,7 +128,7 @@ export function createXCrawlOpenAI(
       const { model } = option
 
       let coderContent: string = ''
-      if (typeof content === 'object' && content !== null) {
+      if (isObject(content)) {
         coderContent = JSON.stringify(content)
       } else {
         const obj: XCrawlOpenAIParseElementsContentOptions = {
@@ -155,7 +156,7 @@ export function createXCrawlOpenAI(
       const { model } = option
 
       let coderContent: string = ''
-      if (typeof content === 'object' && content !== null) {
+      if (isObject(content)) {
         coderContent = JSON.stringify(content)
       } else {
         const obj: XCrawlOpenAIGetElementSelectorsContentOptions = {

packages/crawl/api.ts

@@ -21,7 +21,7 @@ import {
   whiteBold,
   isPromise,
   isBuffer
-} from './utils'
+} from '../shared'
 
 import {
   CrawlDataDetailTargetConfig,

packages/crawl/batchCrawl.ts

@@ -6,7 +6,7 @@ import {
   random,
   sleep,
   whiteBold
-} from './utils'
+} from '../shared'
 
 import type { InfoCommonConfig } from './api'
 import { CrawlDetail, Device } from './controller'

packages/crawl/controller.ts

@@ -20,7 +20,7 @@ import {
   logSuccess,
   logWarn,
   whiteBold
-} from './utils'
+} from '../shared'
 import { HTTPResponse } from 'puppeteer'
 import { Request } from './request'
 import { CrawlCommonResult } from './types/api'

packages/crawl/index.ts

@@ -6,7 +6,7 @@ import {
 } from './api'
 
 import { CreateCrawlConfig, CrawlApp, CrawlBaseConfig } from './types'
-import { isBoolean, isObject } from './utils'
+import { isBoolean, isObject } from '../shared'
 
 let id = 0
 

packages/crawl/request.ts

@@ -10,7 +10,7 @@ import querystring from 'node:querystring'
 
 import { HttpsProxyAgent } from 'https-proxy-agent'
 
-import { isObject, isUndefined } from './utils'
+import { isObject, isUndefined } from '../shared'
 
 import { AnyObject } from './types/common'
 import { LoaderCrawlDataDetail, LoaderCrawlFileDetail } from './api'

packages/crawl/utils.ts renamed to packages/shared/index.ts

@@ -11,37 +11,30 @@ export const logWarn = chalk.yellow
 export const logNumber = chalk.hex('#a57fff')
 export const whiteBold = chalk.white.bold
 
-export function isUndefined(value: any): value is undefined {
-  return typeof value === 'undefined'
-}
+export const isUndefined = (value: unknown): value is undefined =>
+  typeof value === 'undefined'
 
-export function isNumber(value: any): value is number {
-  return typeof value === 'number'
-}
+export const isNumber = (value: unknown): value is number =>
+  typeof value === 'number'
 
-export function isString(value: any): value is string {
-  return typeof value === 'string'
-}
+export const isString = (value: unknown): value is string =>
+  typeof value === 'string'
 
-export function isBoolean(value: any): value is string {
-  return typeof value === 'boolean'
-}
+export const isBoolean = (value: unknown): value is string =>
+  typeof value === 'boolean'
 
-export function isObject(value: any): value is object {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
+export const isObject = (value: unknown): value is Record<any, any> =>
+  typeof value === 'object' && value !== null && !Array.isArray(value)
 
-export function isArray(value: any): value is any[] {
-  return Array.isArray(value)
-}
+export const isArray = Array.isArray
 
-export function isPromise(value: any): value is Promise<any> {
-  return typeof value === 'function' && !isUndefined(value.then)
-}
+export const isFunction = (value: unknown): value is Function =>
+  typeof value === 'function'
 
-export function isBuffer(value: any): value is Buffer {
-  return Buffer.isBuffer(value)
-}
+export const isPromise = (value: any): value is Promise<any> =>
+  isObject(value) && isFunction(value.then) && isFunction(value.catch)
+
+export const isBuffer = Buffer.isBuffer
 
 export function sleep(timeout: number) {
   return new Promise((resolve) => setTimeout(resolve, timeout))