From 0bc9112bdb034386391e29401bed2d8adc4b53b3 Mon Sep 17 00:00:00 2001 From: ningmengchongshui <916415899@qq.com> Date: Fri, 14 Jun 2024 14:34:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9V3=E7=9A=84=E7=9B=AE?= =?UTF-8?q?=E5=BD=95/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugins/handler.ts | 2 ++ lib/plugins/loader.ts | 2 ++ renderers/puppeteer/index.ts | 6 ++-- src/miao.ts | 61 ++++++++++++++++++++++++++++++++ src/utils/puppeteer.ts | 5 +-- src/utils/renderers/index.ts | 6 ++-- src/utils/renderers/puppeteer.ts | 6 ++-- src/utils/types.ts | 17 --------- 8 files changed, 75 insertions(+), 30 deletions(-) create mode 100644 lib/plugins/handler.ts create mode 100644 lib/plugins/loader.ts diff --git a/lib/plugins/handler.ts b/lib/plugins/handler.ts new file mode 100644 index 0000000..7399741 --- /dev/null +++ b/lib/plugins/handler.ts @@ -0,0 +1,2 @@ +import handler from "../../src/core/plugins/handler.js"; +export default handler \ No newline at end of file diff --git a/lib/plugins/loader.ts b/lib/plugins/loader.ts new file mode 100644 index 0000000..0b335b4 --- /dev/null +++ b/lib/plugins/loader.ts @@ -0,0 +1,2 @@ +import pluginsLoader from "../../src/core/plugins.loader"; +export default pluginsLoader \ No newline at end of file diff --git a/renderers/puppeteer/index.ts b/renderers/puppeteer/index.ts index 8c8b1b8..6cb4f9f 100644 --- a/renderers/puppeteer/index.ts +++ b/renderers/puppeteer/index.ts @@ -9,9 +9,9 @@ import Puppeteer from './lib/puppeteer.js' * @returns renderer.render 渲染入口 */ export default function (config?: PuppeteerLaunchOptions & { - chromiumPath: string; - puppeteerWS: any; - puppeteerTimeout: any; + chromiumPath?: string; + puppeteerWS?: any; + puppeteerTimeout?: any; }) { // TODO Puppeteer待简化重构 return new Puppeteer(config) diff --git a/src/miao.ts b/src/miao.ts index d3a6bd3..5d7bc85 100644 --- a/src/miao.ts +++ b/src/miao.ts @@ -1,2 +1,63 @@ export { Common, Data } from '#miao' export { Character, Weapon } from '#miao.models' +// import lodash from 'lodash' +// import { existsSync, mkdirSync } from 'node:fs' +// import util from 'node:util' + +// const rootPath = process.cwd() +// const _path = rootPath + +// const getRoot = (root = '') => { +// if (!root) { +// root = `${_path}/` +// } else if (root === 'root' || root === 'yunzai') { +// root = `${_path}/` +// } else if (root === 'miao') { +// root = `${_path}/plugins/miao-plugin/` +// } else { +// root = `${_path}/plugins/${root}/` +// } +// return root +// } + +// export const Data = { +// // +// createDir(path = '', root = '', includeFile = false) { +// root = getRoot(root) +// let pathList = path.split('/') +// let nowPath = root +// pathList.forEach((name, idx) => { +// name = name.trim() +// if (!includeFile && idx <= pathList.length - 1) { +// nowPath += name + '/' +// if (name) { +// if (!existsSync(nowPath)) { +// mkdirSync(nowPath) +// } +// } +// } +// }) +// }, +// isPromise(data) { +// return util.types.isPromise(data) +// }, +// async forEach(data, fn) { +// if (lodash.isArray(data)) { +// for (let idx = 0; idx < data.length; idx++) { +// let ret = fn(data[idx], idx) +// ret = Data.isPromise(ret) ? await ret : ret +// if (ret === false) { +// break +// } +// } +// } else if (lodash.isPlainObject(data)) { +// for (const idx in data) { +// let ret = fn(data[idx], idx) +// ret = Data.isPromise(ret) ? await ret : ret +// if (ret === false) { +// break +// } +// } +// } +// } +// } diff --git a/src/utils/puppeteer.ts b/src/utils/puppeteer.ts index 21b8ac6..2d89d19 100644 --- a/src/utils/puppeteer.ts +++ b/src/utils/puppeteer.ts @@ -121,10 +121,7 @@ export class Puppeteer { * @param timeout 响应检查 * @returns buffer */ - async render( - htmlPath: string | Buffer | URL, - Options?: ScreenshotFileOptions - ) { + async render(htmlPath: string, Options?: ScreenshotFileOptions) { if (!(await this.isStart())) return false try { const page = await this.#browser?.newPage().catch(err => { diff --git a/src/utils/renderers/index.ts b/src/utils/renderers/index.ts index 21e04ff..b1dd09c 100644 --- a/src/utils/renderers/index.ts +++ b/src/utils/renderers/index.ts @@ -10,9 +10,9 @@ import Puppeteer from './puppeteer.js' * @returns renderer.render 渲染入口 */ export default function (config?: PuppeteerLaunchOptions & { - chromiumPath: string; - puppeteerWS: any; - puppeteerTimeout: any; + chromiumPath?: string; + puppeteerWS?: any; + puppeteerTimeout?: any; }) { // TODO Puppeteer待简化重构 return new Puppeteer(config) diff --git a/src/utils/renderers/puppeteer.ts b/src/utils/renderers/puppeteer.ts index 5c85a2e..26d99f3 100644 --- a/src/utils/renderers/puppeteer.ts +++ b/src/utils/renderers/puppeteer.ts @@ -43,9 +43,9 @@ export default class Puppeteer extends Renderer { * @param config */ constructor(config?: PuppeteerLaunchOptions & { - chromiumPath: string - puppeteerWS: any - puppeteerTimeout: any + chromiumPath?: string + puppeteerWS?: any + puppeteerTimeout?: any }) { /** * diff --git a/src/utils/types.ts b/src/utils/types.ts index 3500371..4ddd8d1 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -1,6 +1,3 @@ -// import { type ScreenshotOptions, type PuppeteerLifeCycleEvent } from 'puppeteer' -// import queryString from 'querystring' - /** * */ @@ -12,17 +9,3 @@ export interface ScreenshotFileOptions { tab?: string timeout?: number } - -/** - * - */ -// export interface ScreenshotUrlOptions { -// url: string -// time?: number -// rand?: ScreenshotOptions -// params?: queryString.ParsedUrlQueryInput -// tab?: string -// timeout?: number -// cache?: boolean -// waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[] -// }