node-karin 0.2.0 → 0.2.2

package/config/defSet/config.yaml

@@ -11,6 +11,9 @@ log4jsCfg:
   # 日志文件最大大小 MB
   maxLogSize: 30
 
+# 关闭后台进程失败后是否继续启动 继续启动会导致多进程
+multi_progress: false
+
 # 控制台触发插件日志颜色 十六进制 默认#FFFF00 不支持热更新
 log_color: "#E1D919"
 

package/lib/adapter/onebot/onebot11.d.ts

@@ -2,9 +2,7 @@
 import WebSocket from 'ws';
 import { IncomingMessage } from 'http';
 import { KarinAdapter } from '../../types/adapter.js';
-import { CustomNodeSegment, OneBot11Api, OneBot11ApiParamsType, OneBot11Segment } from '../../types/onebots11.js';
-import { Scene, contact } from '../../types/types.js';
-import { KarinElement } from '../../types/element.js';
+import { Scene, contact, OneBot11Api, KarinElement, OneBot11Segment, CustomNodeSegment, OneBot11ApiParamsType } from '../../types/index.js';
 /**
  * @class OneBot11
  * @extends KarinAdapter
@@ -44,13 +42,13 @@ export declare class OneBot11 implements KarinAdapter {
      * @param {Array<{type: string, data: any}>} data onebot11格式消息
      * @return karin格式消息
      * */
-    AdapterConvertKarin(data: Array<OneBot11Segment>): (import("../../types/element.js").TextElement | import("../../types/element.js").AtElement | import("../../types/element.js").FaceElement | import("../../types/element.js").ReplyElement | import("../../types/element.js").ImageElement | import("../../types/element.js").VoiceElement | import("../../types/element.js").VideoElement | import("../../types/element.js").PokeElement | import("../../types/element.js").LocationElement | import("../../types/element.js").ForwardElement | import("../../types/element.js").ContactElement | import("../../types/element.js").JsonElement | import("../../types/element.js").XmlElement)[];
+    AdapterConvertKarin(data: Array<OneBot11Segment>): (import("../../types/index.js").TextElement | import("../../types/index.js").AtElement | import("../../types/index.js").FaceElement | import("../../types/index.js").ReplyElement | import("../../types/index.js").ImageElement | import("../../types/index.js").VoiceElement | import("../../types/index.js").VideoElement | import("../../types/index.js").PokeElement | import("../../types/index.js").LocationElement | import("../../types/index.js").ForwardElement | import("../../types/index.js").ContactElement | import("../../types/index.js").JsonElement | import("../../types/index.js").XmlElement)[];
     /**
      * karin转onebot11
      * @param data karin格式消息
      * @return {Array<{type: string, data: any}>} onebot11格式消息
      * */
-    KarinConvertAdapter(data: Array<KarinElement>): (import("../../types/element.js").BubbleFaceElement | import("../../types/element.js").RecordElement | import("../../types/element.js").BasketballElement | import("../../types/element.js").DiceElement | import("../../types/element.js").RpsElement | import("../../types/element.js").WeatherElement | import("../../types/element.js").LocationElement | import("../../types/element.js").ShareElement | import("../../types/element.js").GiftElement | import("../../types/element.js").MarketFaceElement | import("../../types/element.js").ContactElement | import("../../types/element.js").RowElement | import("../../types/element.js").LongMsgElement | {
+    KarinConvertAdapter(data: Array<KarinElement>): (import("../../types/index.js").BubbleFaceElement | import("../../types/index.js").RecordElement | import("../../types/index.js").BasketballElement | import("../../types/index.js").DiceElement | import("../../types/index.js").RpsElement | import("../../types/index.js").WeatherElement | import("../../types/index.js").LocationElement | import("../../types/index.js").ShareElement | import("../../types/index.js").GiftElement | import("../../types/index.js").MarketFaceElement | import("../../types/index.js").ContactElement | import("../../types/index.js").RowElement | import("../../types/index.js").LongMsgElement | {
         type: string;
         data: {
             text: string;
@@ -245,7 +243,7 @@ export declare class OneBot11 implements KarinAdapter {
         message_seq: any;
         contact: contact;
         sender: any;
-        elements: (import("../../types/element.js").TextElement | import("../../types/element.js").AtElement | import("../../types/element.js").FaceElement | import("../../types/element.js").ReplyElement | import("../../types/element.js").ImageElement | import("../../types/element.js").VoiceElement | import("../../types/element.js").VideoElement | import("../../types/element.js").PokeElement | import("../../types/element.js").LocationElement | import("../../types/element.js").ForwardElement | import("../../types/element.js").ContactElement | import("../../types/element.js").JsonElement | import("../../types/element.js").XmlElement)[];
+        elements: (import("../../types/index.js").TextElement | import("../../types/index.js").AtElement | import("../../types/index.js").FaceElement | import("../../types/index.js").ReplyElement | import("../../types/index.js").ImageElement | import("../../types/index.js").VoiceElement | import("../../types/index.js").VideoElement | import("../../types/index.js").PokeElement | import("../../types/index.js").LocationElement | import("../../types/index.js").ForwardElement | import("../../types/index.js").ContactElement | import("../../types/index.js").JsonElement | import("../../types/index.js").XmlElement)[];
     }[]>;
     /**
      * 获取合并转发消息

package/lib/adapter/onebot/onebot11.js

@@ -1,13 +1,8 @@
-import { KarinMessage } from '../../event/message.js';
-import { KarinNotice } from '../../event/notice.js';
-import { KarinRequest } from '../../event/request.js';
 import WebSocket from 'ws';
 import { randomUUID } from 'crypto';
-import logger from '../../utils/logger.js';
-import common from '../../utils/common.js';
-import listener from '../../core/listener.js';
-import config from '../../utils/config.js';
-import segment from '../../utils/segment.js';
+import { listener } from '../../core/listener.js';
+import { common, config, logger, segment } from '../../utils/index.js';
+import { KarinMessage, KarinNotice, KarinRequest } from '../../event/index.js';
 /**
  * @class OneBot11
  * @extends KarinAdapter

package/lib/core/index.d.ts

@@ -0,0 +1,9 @@
+export * from './dir.js';
+export * from './init.js';
+export * from './karin.js';
+export * from './listener.js';
+export * from './plugin.js';
+export * from './plugin.app.js';
+export * from './plugin.loader.js';
+export * from './process.js';
+export * from './server.js';

package/lib/core/index.js

@@ -0,0 +1,9 @@
+export * from './dir.js'
+export * from './init.js'
+export * from './karin.js'
+export * from './listener.js'
+export * from './plugin.js'
+export * from './plugin.app.js'
+export * from './plugin.loader.js'
+export * from './process.js'
+export * from './server.js'

package/lib/core/init.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/core/init.js

@@ -1,4 +1,22 @@
-'use strict'
-process.title = 'karin'
+import { logger } from '../utils/index.js'
+/**
+ * 启动日志
+ */
+logger.mark('Karin 启动中...')
+logger.mark('https://github.com/KarinJS/Karin')
+/**
+ * 设置标题
+ */
+process.title = 'Karin'
+/**
+ * 设置时区
+ */
+process.env.TZ = 'Asia/Shanghai'
+/**
+ * 设置应用模式
+ */
 process.env.karin_app_mode = process.argv[2]?.includes('dev') ? 'dev' : 'prod'
+/**
+ * 设置语言环境
+ */
 process.env.karin_app_lang = JSON.stringify(process.execArgv).includes('tsx@') ? 'ts' : 'js'

package/lib/core/karin.d.ts

@@ -1,7 +1,5 @@
-import { Permission } from '../types/types.js';
-import { PluginApps } from '../types/plugin.js';
-import { KarinElement } from '../types/element.js';
 import { KarinMessage } from '../event/message.js';
+import { Permission, PluginApps, KarinElement } from '../types/index.js';
 type FncFunction = (e: KarinMessage) => Promise<boolean>;
 type FncElement = string | KarinElement | Array<KarinElement>;
 export interface OptionsCommand {
@@ -55,7 +53,7 @@ export interface OptionsElement extends OptionsCommand {
      */
     stop?: boolean;
 }
-export default class Karin {
+export declare class Karin {
     /**
      * @param reg - 正则表达式
      * @param fnc - 函数

package/lib/core/karin.js

@@ -1,6 +1,6 @@
-import common from '../utils/common.js'
 import PluginApp from './plugin.app.js'
-export default class Karin {
+import { common } from '../utils/index.js'
+export class Karin {
   /**
      * - 快速构建命令
      * @param reg - 正则表达式

package/lib/core/listener.d.ts

@@ -1,12 +1,10 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { KarinAdapter } from '../types/adapter.js';
-import { contact } from '../types/types.js';
-import { KarinElement } from '../types/element.js';
+import { KarinAdapter, contact, KarinElement } from '../types/index.js';
 /**
  * 监听器管理
  */
-declare const _default: {
+export declare const listener: {
     /**
      * Bot索引
      * @type - Bot索引
@@ -118,4 +116,3 @@ declare const _default: {
     prependOnceListener<K_11>(eventName: string | symbol, listener: (...args: any[]) => void): any;
     eventNames(): (string | symbol)[];
 };
-export default _default;

package/lib/core/listener.js

@@ -1,13 +1,11 @@
 import { EventEmitter } from 'events'
-import loader from './plugin.loader.js'
-import Common from '../utils/common.js'
-import logger from '../utils/logger.js'
-import Config from '../utils/config.js'
-import MessageHandller from '../event/message.handler.js'
+import { PluginLoader } from './plugin.loader.js'
+import { common, logger, config } from '../utils/index.js'
+import { MessageHandler } from '../event/message.handler.js'
 /**
  * 监听器管理
  */
-export default new (class Listeners extends EventEmitter {
+export const listener = new (class Listeners extends EventEmitter {
   /**
      * Bot索引
      * @type - Bot索引
@@ -26,10 +24,10 @@ export default new (class Listeners extends EventEmitter {
     this.list = []
     this.adapter = []
     this.on('error', data => logger.error(data))
-    this.on('plugin', () => loader.load())
+    this.on('plugin', () => PluginLoader.load())
     this.on('adapter', data => {
       let path = data.path || '无'
-      if (path && data.type !== 'grpc') { path = `ws://127.0.0.1:/${Config.Server.http.port}${data.path}` }
+      if (path && data.type !== 'grpc') { path = `ws://127.0.0.1:/${config.Server.http.port}${data.path}` }
       path = logger.green(path)
       logger.info(`[适配器][注册][${data.type}] ` + path)
       this.addAdapter(data)
@@ -39,7 +37,7 @@ export default new (class Listeners extends EventEmitter {
       logger.info(`[机器人][注册][${data.type}] ` + logger.green(`[account:${data.bot.account.uid || data.bot.account.uin}(${data.bot.account.name})]`))
       this.emit('karin:online', data.bot.account.uid || data.bot.account.uin)
     })
-    this.on('message', data => new MessageHandller(data))
+    this.on('message', data => new MessageHandler(data))
   }
 
   /**
@@ -160,10 +158,10 @@ export default new (class Listeners extends EventEmitter {
     if (!bot) { throw new Error('发送消息失败: 未找到对应Bot实例') }
     const { recallMsg, retry_count } = options
     /** 标准化 */
-    const NewElements = Common.makeMessage(elements)
+    const NewElements = common.makeMessage(elements)
     /** 结果 */
     let result = { message_id: '' }
-    const reply_log = Common.makeMessageLog(NewElements)
+    const reply_log = common.makeMessageLog(NewElements)
     const self_id = bot.account.uid || bot.account.uin
     if (contact.scene === 'group') {
       logger.bot('info', self_id, `Send Proactive Group ${contact.peer}: ${reply_log}`)

package/lib/core/plugin.app.d.ts

@@ -1,4 +1,4 @@
-import { dirName, fileName, PluginApps } from '../types/plugin.js';
+import { dirName, fileName, PluginApps } from '../types/index.js';
 export interface PluginAppType {
     file?: {
         dir?: dirName;

package/lib/core/plugin.d.ts

@@ -1,10 +1,8 @@
-import { Plugin as PluginType } from '../types/plugin.js';
-import { KarinElement, KarinNodeElement } from '../types/element.js';
-import { E } from '../types/types.js';
+import { PluginType as PluginType, KarinElement, KarinNodeElement, E } from '../types/index.js';
 /**
  * 插件基类
  */
-export default class Plugin implements PluginType {
+export declare class Plugin implements PluginType {
     e: PluginType['e'];
     init?: () => void;
     accept?: (e: E) => Promise<void>;

package/lib/core/plugin.js

@@ -1,7 +1,7 @@
 /**
  * 插件基类
  */
-export default class Plugin {
+export class Plugin {
   e
   init
   accept

package/lib/core/plugin.loader.d.ts

@@ -1,12 +1,12 @@
 import path from 'path';
 import chokidar from 'chokidar';
 import schedule from 'node-schedule';
-import Plugin from './plugin.js';
-import { Plugin as PluginType, PluginApps, PluginTask, dirName, fileName, AppInfo } from '../types/plugin.js';
+import { Plugin } from './plugin.js';
+import { PluginType as PluginType, PluginApps, PluginTask, dirName, fileName, AppInfo } from '../types/index.js';
 /**
  * 加载插件
  */
-declare const _default: {
+export declare const PluginLoader: {
     dir: './plugins';
     dirPath: string;
     /**
@@ -112,11 +112,11 @@ declare const _default: {
         event: import("../types/index.js").Event | "message.group_message" | "message.friend_message" | "message.guild_message" | "message.nearby" | "message.stranger" | "message.stranger_from_group" | "message.friend_apply" | "message.group_apply" | "message.invited_group" | "message.friend_poke" | "message.friend_recall" | "message.friend_file_uploaded" | "message.group_poke" | "message.group_card_changed" | "message.group_member_unique_title_changed" | "message.group_essence_changed" | "message.group_recall" | "message.group_member_increase" | "message.group_member_decrease" | "message.group_admin_changed" | "message.group_member_ban" | "message.group_sign" | "message.group_whole_ban" | "message.group_file_uploaded" | "request.group_message" | "request.friend_message" | "request.guild_message" | "request.nearby" | "request.stranger" | "request.stranger_from_group" | "request.friend_apply" | "request.group_apply" | "request.invited_group" | "request.friend_poke" | "request.friend_recall" | "request.friend_file_uploaded" | "request.group_poke" | "request.group_card_changed" | "request.group_member_unique_title_changed" | "request.group_essence_changed" | "request.group_recall" | "request.group_member_increase" | "request.group_member_decrease" | "request.group_admin_changed" | "request.group_member_ban" | "request.group_sign" | "request.group_whole_ban" | "request.group_file_uploaded" | "notice.group_message" | "notice.friend_message" | "notice.guild_message" | "notice.nearby" | "notice.stranger" | "notice.stranger_from_group" | "notice.friend_apply" | "notice.group_apply" | "notice.invited_group" | "notice.friend_poke" | "notice.friend_recall" | "notice.friend_file_uploaded" | "notice.group_poke" | "notice.group_card_changed" | "notice.group_member_unique_title_changed" | "notice.group_essence_changed" | "notice.group_recall" | "notice.group_member_increase" | "notice.group_member_decrease" | "notice.group_admin_changed" | "notice.group_member_ban" | "notice.group_sign" | "notice.group_whole_ban" | "notice.group_file_uploaded" | "meta_event.group_message" | "meta_event.friend_message" | "meta_event.guild_message" | "meta_event.nearby" | "meta_event.stranger" | "meta_event.stranger_from_group" | "meta_event.friend_apply" | "meta_event.group_apply" | "meta_event.invited_group" | "meta_event.friend_poke" | "meta_event.friend_recall" | "meta_event.friend_file_uploaded" | "meta_event.group_poke" | "meta_event.group_card_changed" | "meta_event.group_member_unique_title_changed" | "meta_event.group_essence_changed" | "meta_event.group_recall" | "meta_event.group_member_increase" | "meta_event.group_member_decrease" | "meta_event.group_admin_changed" | "meta_event.group_member_ban" | "meta_event.group_sign" | "meta_event.group_whole_ban" | "meta_event.group_file_uploaded" | "message_sent.group_message" | "message_sent.friend_message" | "message_sent.guild_message" | "message_sent.nearby" | "message_sent.stranger" | "message_sent.stranger_from_group" | "message_sent.friend_apply" | "message_sent.group_apply" | "message_sent.invited_group" | "message_sent.friend_poke" | "message_sent.friend_recall" | "message_sent.friend_file_uploaded" | "message_sent.group_poke" | "message_sent.group_card_changed" | "message_sent.group_member_unique_title_changed" | "message_sent.group_essence_changed" | "message_sent.group_recall" | "message_sent.group_member_increase" | "message_sent.group_member_decrease" | "message_sent.group_admin_changed" | "message_sent.group_member_ban" | "message_sent.group_sign" | "message_sent.group_whole_ban" | "message_sent.group_file_uploaded";
         priority: number;
         accept: boolean;
-        rule: import("../types/plugin.js").PluginRule[];
+        rule: import("../types/index.js").PluginRule[];
         type: "function" | "class";
         task: PluginTask[];
-        handler: import("../types/plugin.js").PluginHandler[];
-        button: import("../types/plugin.js").PluginButton[];
+        handler: import("../types/index.js").PluginHandler[];
+        button: import("../types/index.js").PluginButton[];
     };
     /** 排序 */
     orderBy(): void;
@@ -146,4 +146,3 @@ declare const _default: {
      */
     watchDir(dir: dirName): void;
 };
-export default _default;

package/lib/core/plugin.loader.js

@@ -1,18 +1,15 @@
 import fs from 'fs'
-import lodash from 'lodash'
 import path from 'path'
+import lodash from 'lodash'
 import schedule from 'node-schedule'
-import Renderer from '../renderer/app.js'
-import button from '../utils/button.js'
-import Common from '../utils/common.js'
-import handler from '../utils/handler.js'
-import listener from './listener.js'
-import logger from '../utils/logger.js'
+import { listener } from './listener.js'
 import PluginApp from './plugin.app.js'
+import { render } from '../renderer/index.js'
+import { button, common, handler, logger } from '../utils/index.js'
 /**
  * 加载插件
  */
-export default new (class PluginLoader {
+export const PluginLoader = new (class PluginLoader {
   dir
   dirPath
   /**
@@ -42,7 +39,7 @@ export default new (class PluginLoader {
   PluginList
   constructor () {
     this.dir = './plugins'
-    this.dirPath = Common.urlToPath(import.meta.url)
+    this.dirPath = common.urlToPath(import.meta.url)
     this.Apps = []
     this.task = []
     this.watcher = new Map()
@@ -76,7 +73,7 @@ export default new (class PluginLoader {
     })
     logger.info(`[按钮][${button.Apps.length}个] 加载完成`)
     logger.info(`[插件][${this.Apps.length}个] 加载完成`)
-    logger.info(`[渲染器][${Renderer.Apps.length}个] 加载完成`)
+    logger.info(`[渲染器][${render.Apps.length}个] 加载完成`)
     logger.info(`[定时任务][${this.task.length}个] 加载完成`)
     logger.info(`[Handler][Key:${handlerKeys.length}个][fnc:${handlerCount}个] 加载完成`)
     logger.info(logger.green('-----------'))
@@ -93,7 +90,7 @@ export default new (class PluginLoader {
   getPlugins () {
     const Apps = []
     /** 获取所有插件包 */
-    const plugins = Common.getPlugins()
+    const plugins = common.getPlugins()
     const isTs = process.env.karin_app_lang === 'ts'
     for (const dir of plugins) {
       /**
@@ -102,7 +99,7 @@ export default new (class PluginLoader {
              */
       const PluginPath = `${this.dir}/${dir}`
       // 非插件包
-      if (!Common.isPlugin(PluginPath)) {
+      if (!common.isPlugin(PluginPath)) {
         const list = fs.readdirSync(`${this.dir}/${dir}`, {
           withFileTypes: true,
         })
@@ -114,22 +111,22 @@ export default new (class PluginLoader {
         }
       }
       /** js环境 */
-      if (Common.exists(`${PluginPath}/index.js`)) {
+      if (common.exists(`${PluginPath}/index.js`)) {
         Apps.push({ dir, name: 'index.js' })
       }
       const appList = ['apps', 'dist/apps']
       appList.forEach(app => {
-        if (Common.isDir(`${PluginPath}/${app}`)) {
+        if (common.isDir(`${PluginPath}/${app}`)) {
           const result = this.getApps((`${dir}/${app}`))
           Apps.push(...result)
         }
       })
       /** ts环境 */
       if (isTs) {
-        if (Common.exists(`${PluginPath}/index.ts`)) {
+        if (common.exists(`${PluginPath}/index.ts`)) {
           Apps.push({ dir, name: 'index.ts' })
         }
-        if (Common.isDir(`${PluginPath}/src/apps`)) {
+        if (common.isDir(`${PluginPath}/src/apps`)) {
           const result = this.getApps((`${dir}/src/apps`), true)
           Apps.push(...result)
         }

package/lib/core/process.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 处理基本事件
+ */
+export default class Process {
+    /**
+     * 进程初始化
+     */
+    static process(): Promise<Process>;
+    /**
+     * 检查后台进程
+     */
+    static check(): Promise<Process>;
+    /**
+     * 退出Karin
+     * @param code 退出码
+     */
+    static exit(code?: any): Promise<void>;
+}

package/lib/core/process.js

@@ -0,0 +1,98 @@
+import { listener } from './listener.js'
+import { logger, common, config } from '../utils/index.js'
+/**
+ * 处理基本事件
+ */
+export default class Process {
+  /**
+     * 进程初始化
+     */
+  static async process () {
+    /**
+         * 监听挂起信号 在终端关闭时触发
+         */
+    process.once('SIGHUP', async (code) => await this.exit(code))
+    /**
+         * 监听中断信号 用户按下 Ctrl + C 时触发
+         */
+    process.once('SIGINT', async (code) => await this.exit(code))
+    /**
+         * 监听终止信号 程序正常退出时触发
+         */
+    process.once('SIGTERM', async (code) => await this.exit(code))
+    /**
+         * 监听退出信号 windows下程序正常退出时触发
+         */
+    process.once('SIGBREAK', async (code) => await this.exit(code))
+    /**
+         * 监听退出信号 与 SIGINT 类似，但会生成核心转储
+         */
+    process.once('SIGQUIT', async (code) => await this.exit(code))
+    /**
+         * 监听退出信号 Node.js进程退出时触发
+         */
+    process.once('exit', async (code) => await this.exit(code))
+    /**
+         * 捕获警告
+         */
+    process.on('warning', warning => listener.emit('warn', warning))
+    /**
+         * 捕获错误
+         */
+    process.on('uncaughtException', error => listener.emit('error', error))
+    /**
+         * 捕获未处理的Promise错误
+         */
+    process.on('unhandledRejection', error => listener.emit('error', error))
+    return this
+  }
+
+  /**
+     * 检查后台进程
+     */
+  static async check () {
+    const host = `http://localhost:${config.Server.http.port}/api`
+    /**
+         * 使用api来检查后台
+         */
+    const res = await common.axios(host + '/info', 'get', { timeout: 100 })
+    if (!res) { return this }
+    logger.mark(logger.red('检测到后台进程 正在关闭'))
+    /** 发退出信号 */
+    await common.axios(host + '/exit', 'get', { timeout: 10 })
+    for (let i = 0; i < 50; i++) {
+      const res = await common.axios(host + '/info', 'get', { timeout: 100 })
+      /** 请求成功继续循环 */
+      if (res) { continue }
+      /** 请求异常即代表后台进程已关闭 */
+      logger.mark(logger.green('后台进程已关闭'))
+      return this
+    }
+    /**
+         * 走到这里说明后台关闭失败
+         * 根据配置文件判断是否继续
+         */
+    logger.error(logger.red('后台进程关闭失败，请手动关闭'))
+    if (!config.Config.multi_progress) {
+      logger.error(logger.red('当前配置不允许多进程运行，程序即将退出'))
+      await this.exit(1)
+    }
+    logger.error(logger.red('当前配置允许多进程运行，程序继续运行'))
+    return this
+  }
+
+  /**
+     * 退出Karin
+     * @param code 退出码
+     */
+  static async exit (code = 0) {
+    try {
+      const { redis } = await import('../db/index.js')
+      if (redis && redis.save) { await redis.save() }
+      logger.mark(`Karin 已停止运行 运行时间：${common.uptime()} 退出码：${code || '未知'}`)
+    } finally {
+      process.exit()
+    }
+  }
+}
+Process.process()

package/lib/core/server.d.ts

@@ -1,7 +1,7 @@
-import { Express } from 'express';
 import { WebSocketServer } from 'ws';
+import { Express } from 'express';
 import { Server as ServerType, ServerResponse, IncomingMessage } from 'http';
-declare const _default: {
+export declare const server: {
     reg: RegExp;
     list: string[];
     app: Express;
@@ -11,7 +11,7 @@ declare const _default: {
     /**
      * 监听WebSocket连接并初始化http服务器
      */
-    init(): false | any;
+    init(): Promise<false | any>;
     /**
      * HTTP渲染器
      */
@@ -21,6 +21,5 @@ declare const _default: {
      */
     staticPath(): void;
     /** 重启当前HTTP服务器 */
-    "__#3@#restartServer"(): Promise<void>;
+    "__#13@#restartServer"(): Promise<void>;
 };
-export default _default;

package/lib/core/server.js

@@ -1,16 +1,12 @@
 import fs from 'fs'
-import express from 'express'
-import { createServer } from 'http'
+import Process from './process.js'
+import { listener } from './listener.js'
 import { WebSocketServer } from 'ws'
-import { render } from '../index.js'
-import connect from '../renderer/wormhole.js'
-import HttpRenderer from '../renderer/http.js'
-import logger from '../utils/logger.js'
-import common from '../utils/common.js'
-import config from '../utils/config.js'
-import listener from './listener.js'
-import exec from '../utils/exec.js'
-export default new (class Server {
+import { createServer } from 'http'
+import express from 'express'
+import { exec, config, logger, common } from '../utils/index.js'
+import { render, HttpRenderer, Wormhole } from '../renderer/index.js'
+export const server = new (class Server {
   reg
   list
   app
@@ -29,8 +25,10 @@ export default new (class Server {
   /**
      * 监听WebSocket连接并初始化http服务器
      */
-  init () {
+  async init () {
     try {
+      // 防止多进程端口冲突 启动失败
+      await Process.check()
       this.WebSocketServer.on('connection', (socket, request) => {
         const path = request.url
         const headers = request.headers
@@ -90,7 +88,7 @@ export default new (class Server {
       if (enable) {
         this.static()
         if (WormholeClient) {
-          connect()
+          Wormhole()
           return this
         }
         const { host, post, token } = config.Server.HttpRender

package/lib/db/index.d.ts

@@ -0,0 +1,4 @@
+import LevelDB from './level.js';
+import { RedisClientType } from 'redis';
+export declare const level: LevelDB;
+export declare const redis: RedisClientType;

package/lib/db/index.js

@@ -0,0 +1,4 @@
+import Redis from './redis.js'
+import LevelDB from './level.js'
+export const level = new LevelDB()
+export const redis = await new Redis().start()

package/lib/db/level.d.ts

@@ -2,7 +2,7 @@ import { Level } from 'level';
 /**
  * @type {Level}
  */
-declare class LevelDB extends Level {
+export default class LevelDB extends Level {
     id: string;
     constructor();
     /**
@@ -16,5 +16,3 @@ declare class LevelDB extends Level {
      */
     set(key: string, value: string): Promise<void>;
 }
-declare const level: LevelDB;
-export default level;

package/lib/db/level.js

@@ -3,7 +3,7 @@ const path = process.cwd() + '/data/db/Level'
 /**
  * @type {Level}
  */
-class LevelDB extends Level {
+export default class LevelDB extends Level {
   id
   constructor () {
     super(path, { valueEncoding: 'json' })
@@ -34,5 +34,3 @@ class LevelDB extends Level {
     return await super.put(key, value)
   }
 }
-const level = new LevelDB()
-export default level

package/lib/db/redis.js

@@ -1,7 +1,6 @@
 import { exec } from 'child_process'
 import RedisLevel from './redis_level.js'
-import logger from '../utils/logger.js'
-import config from '../utils/config.js'
+import { logger, config } from '../utils/index.js'
 import { createClient, createCluster } from 'redis'
 export default class Redis {
   id

package/lib/event/event.d.ts

@@ -1,6 +1,4 @@
-import { Reply, replyCallback } from '../types/reply.js';
-import { KarinAdapter } from '../types/adapter.js';
-import { Event, contact, Sender, SubEventForEvent } from '../types/types.js';
+import { KarinAdapter, Reply, replyCallback, Event, contact, Sender, SubEventForEvent } from '../types/index.js';
 /**
  * - 事件基类 所有事件都继承自此类并且需要实现此类的所有属性
  * @class KarinEvent