node-karin 0.0.3 → 0.1.0

package/lib/index.d.ts

@@ -1,23 +1,23 @@
-import './core/init.js';
-import config from './utils/config.js';
-import logger from './utils/logger.js';
-import listener from './core/listener.js';
-import server from './core/server.js';
-import Plugin from './core/plugin.js';
-import PluginLoader from './core/plugin.loader.js';
-import common from './utils/common.js';
-import segment from './utils/segment.js';
-import handler from './utils/handler.js';
-import ffmpeg from './utils/ffmpeg.js';
-import exec from './utils/exec.js';
-import button from './utils/button.js';
-import update from './utils/update.js';
-import YamlEditor from './utils/YamlEditor.js';
-import render from './renderer/app.js';
-import { KarinMessage } from './event/message.js';
-import level from './db/level.js';
-import { RedisClientType } from 'redis';
-import { kritor } from 'kritor-proto';
-export * as types from './types/index.js';
-declare const redis: RedisClientType;
-export { config, config as Cfg, common, listener, logger, Plugin, PluginLoader, server, Plugin as plugin, listener as Bot, segment, handler, ffmpeg, exec, button, level, redis, update, render, kritor, YamlEditor, render as Renderer, update as Update, KarinMessage, };
+import './core/init.js';
+import config from './utils/config.js';
+import logger from './utils/logger.js';
+import listener from './core/listener.js';
+import server from './core/server.js';
+import Plugin from './core/plugin.js';
+import PluginLoader from './core/plugin.loader.js';
+import common from './utils/common.js';
+import segment from './utils/segment.js';
+import handler from './utils/handler.js';
+import ffmpeg from './utils/ffmpeg.js';
+import exec from './utils/exec.js';
+import button from './utils/button.js';
+import update from './utils/update.js';
+import YamlEditor from './utils/YamlEditor.js';
+import render from './renderer/app.js';
+import { KarinMessage } from './event/message.js';
+import level from './db/level.js';
+import { RedisClientType } from 'redis';
+import { kritor } from 'kritor-proto';
+export * as types from './types/index.js';
+declare const redis: RedisClientType;
+export { config, config as Cfg, common, listener, logger, Plugin, PluginLoader, server, Plugin as plugin, listener as Bot, segment, handler, ffmpeg, exec, button, level, redis, update, render, kritor, YamlEditor, render as Renderer, update as Update, KarinMessage, };

package/lib/index.js

@@ -1,40 +1,39 @@
-// 基本模块
-import './core/init.js'
-import config from './utils/config.js'
-import logger from './utils/logger.js'
-// 核心模块
-import listener from './core/listener.js'
-import server from './core/server.js'
-import Plugin from './core/plugin.js'
-import PluginLoader from './core/plugin.loader.js'
-// 工具类
-import common from './utils/common.js'
-import segment from './utils/segment.js'
-import handler from './utils/handler.js'
-import ffmpeg from './utils/ffmpeg.js'
-import exec from './utils/exec.js'
-import button from './utils/button.js'
-import update from './utils/update.js'
-import YamlEditor from './utils/YamlEditor.js'
-import render from './renderer/app.js'
-import { KarinMessage } from './event/message.js'
-// 适配器
-import Puppeteer from './renderer/server.js'
-import OneBot11 from './adapter/onebot/onebot11.js'
-// 数据库
-import level from './db/level.js'
-import Redis from './db/redis.js'
-// proto
-import { kritor } from 'kritor-proto'
-export * as types from './types/index.js'
-// 初始化
-server.init()
-const redis = (await new Redis().start())
-PluginLoader.load()
-listener.emit('adapter', Puppeteer)
-listener.emit('adapter', OneBot11)
-// Exporting Modules
-export {
-// 基本模块
-  config, config as Cfg, common, listener, logger, Plugin, PluginLoader, server, Plugin as plugin, listener as Bot, segment, handler, ffmpeg, exec, button, level, redis, update, render, kritor, YamlEditor, render as Renderer, update as Update, KarinMessage,
-}
+// 基本模块
+import './core/init.js';
+import config from './utils/config.js';
+import logger from './utils/logger.js';
+// 核心模块
+import listener from './core/listener.js';
+import server from './core/server.js';
+import Plugin from './core/plugin.js';
+import PluginLoader from './core/plugin.loader.js';
+// 工具类
+import common from './utils/common.js';
+import segment from './utils/segment.js';
+import handler from './utils/handler.js';
+import ffmpeg from './utils/ffmpeg.js';
+import exec from './utils/exec.js';
+import button from './utils/button.js';
+import update from './utils/update.js';
+import YamlEditor from './utils/YamlEditor.js';
+import render from './renderer/app.js';
+import { KarinMessage } from './event/message.js';
+// 适配器
+import Puppeteer from './renderer/server.js';
+import OneBot11 from './adapter/onebot/onebot11.js';
+// 数据库
+import level from './db/level.js';
+import Redis from './db/redis.js';
+// proto
+import { kritor } from 'kritor-proto';
+export * as types from './types/index.js';
+// 初始化
+server.init();
+const redis = (await new Redis().start());
+PluginLoader.load();
+listener.emit('adapter', Puppeteer);
+listener.emit('adapter', OneBot11);
+// Exporting Modules
+export { 
+// 基本模块
+config, config as Cfg, common, listener, logger, Plugin, PluginLoader, server, Plugin as plugin, listener as Bot, segment, handler, ffmpeg, exec, button, level, redis, update, render, kritor, YamlEditor, render as Renderer, update as Update, KarinMessage, };

package/lib/renderer/app.d.ts

@@ -1,53 +1,53 @@
-import { KarinRender, KarinRenderApp, KarinRenderType } from '../types/render.js';
-/**
- * 渲染器管理器
- */
-declare const _default: {
-    index: number;
-    Apps: Array<KarinRenderApp>;
-    /**
-     * 注册渲染器
-     * @param {object} data 渲染器数据
-     * @param {string} data.id 渲染器ID
-     * @param {'image'|string} data.type 渲染器类型
-     * @param {RenderBase.render} data.render 渲染器标准方法
-     * @returns {number} 渲染器索引
-     */
-    app(data: {
-        /**
-         * 渲染器ID
-         */
-        id: string;
-        /**
-         * 渲染器类型
-         */
-        type?: 'image' | string;
-        /**
-         * 渲染器标准方法
-         */
-        render: KarinRender['render'];
-    }): number;
-    /**
-     * 卸载渲染器
-     * @param index 渲染器索引
-     * @returns 是否卸载成功
-     */
-    unapp(index: number): boolean;
-    /**
-     * 返回渲染器实例 未键入id返回第一个
-     * @param id 渲染器ID
-     * @returns 渲染器实例
-     */
-    App(id?: string): KarinRenderApp;
-    /**
-     * 调用标准渲染器
-     */
-    render(options: KarinRenderType, id: string): Promise<string | string[]>;
-    /**
-     * 快速渲染
-     * @param data html路径、http地址
-     * @returns 返回图片base64或数组
-     */
-    renderHtml(data: string): Promise<string | string[]>;
-};
-export default _default;
+import { KarinRender, KarinRenderApp, KarinRenderType } from '../types/render.js';
+/**
+ * 渲染器管理器
+ */
+declare const _default: {
+    index: number;
+    Apps: Array<KarinRenderApp>;
+    /**
+     * 注册渲染器
+     * @param {object} data 渲染器数据
+     * @param {string} data.id 渲染器ID
+     * @param {'image'|string} data.type 渲染器类型
+     * @param {RenderBase.render} data.render 渲染器标准方法
+     * @returns {number} 渲染器索引
+     */
+    app(data: {
+        /**
+         * 渲染器ID
+         */
+        id: string;
+        /**
+         * 渲染器类型
+         */
+        type?: 'image' | string;
+        /**
+         * 渲染器标准方法
+         */
+        render: KarinRender['render'];
+    }): number;
+    /**
+     * 卸载渲染器
+     * @param index 渲染器索引
+     * @returns 是否卸载成功
+     */
+    unapp(index: number): boolean;
+    /**
+     * 返回渲染器实例 未键入id返回第一个
+     * @param id 渲染器ID
+     * @returns 渲染器实例
+     */
+    App(id?: string): KarinRenderApp;
+    /**
+     * 调用标准渲染器
+     */
+    render(options: KarinRenderType, id: string): Promise<string | string[]>;
+    /**
+     * 快速渲染
+     * @param data html路径、http地址
+     * @returns 返回图片base64或数组
+     */
+    renderHtml(data: string): Promise<string | string[]>;
+};
+export default _default;

package/lib/renderer/app.js

@@ -1,93 +1,93 @@
-import logger from '../utils/logger.js'
-/**
- * 渲染器管理器
- */
-export default new (class Renderer {
-  index
-  Apps
-  constructor () {
-    /** 索引 */
-    this.index = 0
-    /**
-         * 渲染器列表
-         * @type {APP[]}
-         */
-    this.Apps = []
+import logger from '../utils/logger.js'
+/**
+ * 渲染器管理器
+ */
+export default new (class Renderer {
+  index
+  Apps
+  constructor () {
+    /** 索引 */
+    this.index = 0
+    /**
+         * 渲染器列表
+         * @type {APP[]}
+         */
+    this.Apps = []
   }
-
-  /**
-     * 注册渲染器
-     * @param {object} data 渲染器数据
-     * @param {string} data.id 渲染器ID
-     * @param {'image'|string} data.type 渲染器类型
-     * @param {RenderBase.render} data.render 渲染器标准方法
-     * @returns {number} 渲染器索引
-     */
-  app (data) {
-    this.index++
-    const index = this.index
-    const { id, type = 'image', render } = data
-    if (!id) { throw new Error('[注册渲染器失败] 缺少渲染器ID') }
-    if (!type) { throw new Error('[注册渲染器失败] 缺少渲染器类型') }
-    if (!render) { throw new Error('[注册渲染器失败] 缺少渲染器标准方法') }
-    const time = Date.now()
-    const options = { index, id, type, render, time }
-    this.Apps.push(options)
-    logger.mark(`${logger.violet(`[渲染器:${index}]`)} 注册成功: ` + logger.green(id))
-    return index
+
+  /**
+     * 注册渲染器
+     * @param {object} data 渲染器数据
+     * @param {string} data.id 渲染器ID
+     * @param {'image'|string} data.type 渲染器类型
+     * @param {RenderBase.render} data.render 渲染器标准方法
+     * @returns {number} 渲染器索引
+     */
+  app (data) {
+    this.index++
+    const index = this.index
+    const { id, type = 'image', render } = data
+    if (!id) { throw new Error('[注册渲染器失败] 缺少渲染器ID') }
+    if (!type) { throw new Error('[注册渲染器失败] 缺少渲染器类型') }
+    if (!render) { throw new Error('[注册渲染器失败] 缺少渲染器标准方法') }
+    const time = Date.now()
+    const options = { index, id, type, render, time }
+    this.Apps.push(options)
+    logger.mark(`${logger.violet(`[渲染器:${index}]`)} 注册成功: ` + logger.green(id))
+    return index
   }
-
-  /**
-     * 卸载渲染器
-     * @param index 渲染器索引
-     * @returns 是否卸载成功
-     */
-  unapp (index) {
-    const app = this.Apps.find(app => app.index === index)
-    if (!app) {
-      logger.error(`[卸载渲染器失败] 未找到渲染器索引：${index}`)
-      return false
-    }
-    this.Apps = this.Apps.filter(app => app.index !== index)
-    logger.mark(`[卸载渲染器] ${app.id}`)
-    return true
+
+  /**
+     * 卸载渲染器
+     * @param index 渲染器索引
+     * @returns 是否卸载成功
+     */
+  unapp (index) {
+    const app = this.Apps.find(app => app.index === index)
+    if (!app) {
+      logger.error(`[卸载渲染器失败] 未找到渲染器索引：${index}`)
+      return false
+    }
+    this.Apps = this.Apps.filter(app => app.index !== index)
+    logger.mark(`[卸载渲染器] ${app.id}`)
+    return true
   }
-
-  /**
-     * 返回渲染器实例 未键入id返回第一个
-     * @param id 渲染器ID
-     * @returns 渲染器实例
-     */
-  App (id = '') {
-    if (this.Apps.length === 0) { throw new Error('[调用渲染器失败] 渲染器列表为空') }
-    if (!id) { return this.Apps[0] }
-    /** 筛选出id一致的渲染器 */
-    const app = this.Apps.find(app => app.id === id)
-    if (!app) { throw new Error(`[调用渲染器失败] 未找到渲染器：${id}`) }
-    return app
+
+  /**
+     * 返回渲染器实例 未键入id返回第一个
+     * @param id 渲染器ID
+     * @returns 渲染器实例
+     */
+  App (id = '') {
+    if (this.Apps.length === 0) { throw new Error('[调用渲染器失败] 渲染器列表为空') }
+    if (!id) { return this.Apps[0] }
+    /** 筛选出id一致的渲染器 */
+    const app = this.Apps.find(app => app.id === id)
+    if (!app) { throw new Error(`[调用渲染器失败] 未找到渲染器：${id}`) }
+    return app
   }
-
-  /**
-     * 调用标准渲染器
-     */
-  async render (options, id) {
-    const res = this.App(id)
-    return res.render(options)
+
+  /**
+     * 调用标准渲染器
+     */
+  async render (options, id) {
+    const res = this.App(id)
+    return res.render(options)
   }
-
-  /**
-     * 快速渲染
-     * @param data html路径、http地址
-     * @returns 返回图片base64或数组
-     */
-  async renderHtml (data) {
-    const app = this.App()
-    return app.render({
-      file: data,
-      name: 'render',
-      pageGotoParams: {
-        waitUntil: 'networkidle2',
-      },
-    })
-  }
-})()
+
+  /**
+     * 快速渲染
+     * @param data html路径、http地址
+     * @returns 返回图片base64或数组
+     */
+  async renderHtml (data) {
+    const app = this.App()
+    return app.render({
+      file: data,
+      name: 'render',
+      pageGotoParams: {
+        waitUntil: 'networkidle2',
+      },
+    })
+  }
+})()

package/lib/renderer/base.d.ts

@@ -1,30 +1,30 @@
-import chokidar from 'chokidar';
-import { KarinRender, KarinRenderType } from '../types/render.js';
-/**
- * 渲染器基类 所有渲染器都应该继承这个类
- */
-export default class RenderBase implements KarinRender {
-    dir: './temp/html';
-    html: {
-        [key: string]: string;
-    };
-    watcher: {
-        [key: string]: chokidar.FSWatcher;
-    };
-    constructor();
-    /**
-     * 模板渲染
-     * @param options 模板名称
-     * @param isAbs 是否返回绝对路径
-     */
-    dealTpl(options: KarinRenderType, isAbs?: boolean): string;
-    /**
-     * 监听模板文件
-     * @param tplFile 模板文件路径
-     */
-    watch(tplFile: string): void;
-    /**
-     * 渲染标准方法
-     */
-    render(options: KarinRenderType): Promise<string | Array<string>>;
-}
+import chokidar from 'chokidar';
+import { KarinRender, KarinRenderType } from '../types/render.js';
+/**
+ * 渲染器基类 所有渲染器都应该继承这个类
+ */
+export default class RenderBase implements KarinRender {
+    dir: './temp/html';
+    html: {
+        [key: string]: string;
+    };
+    watcher: {
+        [key: string]: chokidar.FSWatcher;
+    };
+    constructor();
+    /**
+     * 模板渲染
+     * @param options 模板名称
+     * @param isAbs 是否返回绝对路径
+     */
+    dealTpl(options: KarinRenderType, isAbs?: boolean): string;
+    /**
+     * 监听模板文件
+     * @param tplFile 模板文件路径
+     */
+    watch(tplFile: string): void;
+    /**
+     * 渲染标准方法
+     */
+    render(options: KarinRenderType): Promise<string | Array<string>>;
+}

package/lib/renderer/base.js

@@ -1,71 +1,71 @@
-import fs from 'fs'
-import chokidar from 'chokidar'
-import template from 'art-template'
-import common from '../utils/common.js'
-import logger from '../utils/logger.js'
-/**
- * 渲染器基类 所有渲染器都应该继承这个类
- */
-export default class RenderBase {
-  dir
-  html
-  watcher
-  constructor () {
-    this.dir = './temp/html'
-    this.html = {}
-    this.watcher = {}
-    common.mkdir(this.dir)
+import fs from 'fs'
+import chokidar from 'chokidar'
+import template from 'art-template'
+import common from '../utils/common.js'
+import logger from '../utils/logger.js'
+/**
+ * 渲染器基类 所有渲染器都应该继承这个类
+ */
+export default class RenderBase {
+  dir
+  html
+  watcher
+  constructor () {
+    this.dir = './temp/html'
+    this.html = {}
+    this.watcher = {}
+    common.mkdir(this.dir)
   }
-
-  /**
-     * 模板渲染
-     * @param options 模板名称
-     * @param isAbs 是否返回绝对路径
-     */
-  dealTpl (options, isAbs = true) {
-    let { name, fileID, file: tplFile } = options
-    fileID = fileID || name
-    const filePath = `./temp/html/${name}/${fileID}.html`
-    /** 读取html模板 */
-    if (!this.html[tplFile]) {
-      common.mkdir(`./temp/html/${name}`)
-      try {
-        this.html[tplFile] = fs.readFileSync(tplFile, 'utf8')
-      } catch (error) {
-        logger.error(`加载html错误：${tplFile}`)
-        return ''
-      }
-      this.watch(tplFile)
-    }
-    /** 替换模板 */
-    const tmpHtml = template.render(this.html[tplFile], options.data)
-    /** 保存模板 */
-    fs.writeFileSync(filePath, tmpHtml)
-    logger.debug(`[图片生成][使用模板] ${filePath}`)
-    /** 是否返回绝对路径 */
-    if (isAbs) { return `${process.cwd()}/temp/html/${name}/${fileID}.html` }
-    return filePath
+
+  /**
+     * 模板渲染
+     * @param options 模板名称
+     * @param isAbs 是否返回绝对路径
+     */
+  dealTpl (options, isAbs = true) {
+    let { name, fileID, file: tplFile } = options
+    fileID = fileID || name
+    const filePath = `./temp/html/${name}/${fileID}.html`
+    /** 读取html模板 */
+    if (!this.html[tplFile]) {
+      common.mkdir(`./temp/html/${name}`)
+      try {
+        this.html[tplFile] = fs.readFileSync(tplFile, 'utf8')
+      } catch (error) {
+        logger.error(`加载html错误：${tplFile}`)
+        return ''
+      }
+      this.watch(tplFile)
+    }
+    /** 替换模板 */
+    const tmpHtml = template.render(this.html[tplFile], options.data)
+    /** 保存模板 */
+    fs.writeFileSync(filePath, tmpHtml)
+    logger.debug(`[图片生成][使用模板] ${filePath}`)
+    /** 是否返回绝对路径 */
+    if (isAbs) { return `${process.cwd()}/temp/html/${name}/${fileID}.html` }
+    return filePath
   }
-
-  /**
-     * 监听模板文件
-     * @param tplFile 模板文件路径
-     */
-  watch (tplFile) {
-    if (this.watcher[tplFile]) { return }
-    const watcher = chokidar.watch(tplFile)
-    watcher.on('change', () => {
-      delete this.html[tplFile]
-      logger.mark(`[修改html模板] ${tplFile}`)
-    })
-    this.watcher[tplFile] = watcher
+
+  /**
+     * 监听模板文件
+     * @param tplFile 模板文件路径
+     */
+  watch (tplFile) {
+    if (this.watcher[tplFile]) { return }
+    const watcher = chokidar.watch(tplFile)
+    watcher.on('change', () => {
+      delete this.html[tplFile]
+      logger.mark(`[修改html模板] ${tplFile}`)
+    })
+    this.watcher[tplFile] = watcher
   }
-
-  /**
-     * 渲染标准方法
-     */
-  async render (options) {
-    logger.error('未实现渲染方法')
-    return ''
-  }
-}
+
+  /**
+     * 渲染标准方法
+     */
+  async render (options) {
+    logger.error('未实现渲染方法')
+    return ''
+  }
+}