node-karin 0.3.9 → 0.5.0

package/lib/utils/config.js

@@ -6,7 +6,7 @@ import { fs, yaml as Yaml, chokidar } from '../modules.js'
 export const config = new (class Cfg {
   dir
   _path
-  _pathDef
+  npmCfgDir
   change
   watcher
   review
@@ -14,7 +14,7 @@ export const config = new (class Cfg {
   constructor () {
     this.dir = karinDir
     this._path = process.cwd() + '/config'
-    this._pathDef = this.dir + '/config/defSet'
+    this.npmCfgDir = this.dir + '/config/defSet'
     /** 缓存 */
     this.change = new Map()
     /** 监听文件 */
@@ -26,18 +26,23 @@ export const config = new (class Cfg {
 
   /** 初始化配置 */
   async initCfg () {
-    if (!fs.existsSync(this._path)) { fs.mkdirSync(this._path) }
-    this._path = process.cwd() + '/config/config'
-    if (!fs.existsSync(this._path)) { fs.mkdirSync(this._path) }
-    const files = fs.readdirSync(this._pathDef).filter(file => file.endsWith('.yaml'))
-    for (const file of files) {
-      const path = `${this._path}/${file}`
-      const pathDef = `${this._pathDef}/${file}`
-      if (!fs.existsSync(path)) { fs.copyFileSync(pathDef, path) }
+    const list = [
+      this._path,
+      this._path + '/config',
+      process.cwd() + '/temp/input',
+      './plugins',
+      './plugins/karin-plugin-example',
+    ]
+    list.forEach(path => this.checkPath(path))
+    if (this.npmCfgDir !== (this._path + '/defSet').replace(/\\/g, '/')) {
+      const files = fs.readdirSync(this.npmCfgDir).filter(file => file.endsWith('.yaml'))
+      files.forEach(file => {
+        const path = `${this._path}/config/${file}`
+        const pathDef = `${this.npmCfgDir}/${file}`
+        if (!fs.existsSync(path)) { fs.copyFileSync(pathDef, path) }
+      })
     }
     // 创建插件文件夹文件夹
-    if (!fs.existsSync('./plugins')) { fs.mkdirSync('./plugins') }
-    if (!fs.existsSync('./plugins/karin-plugin-example')) { fs.mkdirSync('./plugins/karin-plugin-example') }
     const plugins = this.getPlugins()
     this.dirPath('data', plugins)
     this.dirPath('temp', plugins)
@@ -52,15 +57,22 @@ export const config = new (class Cfg {
     return files.filter(file => file.isDirectory() && (file.name.startsWith('karin-plugin-'))).map(dir => dir.name)
   }
 
+  /**
+     * 检查路径是否存在 不存在则创建
+     */
+  checkPath (path) {
+    if (!fs.existsSync(path)) { fs.mkdirSync(path) }
+  }
+
   /**
      * 为每一个插件建立对应的文件夹
      */
   async dirPath (name, plugins) {
     name = `./${name}`
-    if (!fs.existsSync(name)) { fs.mkdirSync(name) }
+    this.checkPath(name)
     for (const plugin of plugins) {
       const path = `${name}/${plugin}`
-      if (!fs.existsSync(path)) { fs.mkdirSync(path) }
+      this.checkPath(path)
     }
   }
 
@@ -90,7 +102,6 @@ export const config = new (class Cfg {
 
   /**
      * 主人列表
-     * @returns {string[]}
      */
   get master () {
     return this.Config.master || []
@@ -130,9 +141,24 @@ export const config = new (class Cfg {
     const config = this.getYaml('config', 'config', true)
     const defSet = this.getYaml('defSet', 'config', false)
     const data = { ...defSet, ...config }
+    const Config = {
+      ...data,
+      WhiteList: {
+        users: data.WhiteList.users.map((i) => String(i)),
+        groups: data.WhiteList.groups.map((i) => String(i)),
+        GroupMsgLog: data.WhiteList.GroupMsgLog.map((i) => String(i)),
+      },
+      BlackList: {
+        users: data.BlackList.users.map((i) => String(i)),
+        groups: data.BlackList.groups.map((i) => String(i)),
+        GroupMsgLog: data.BlackList.GroupMsgLog.map((i) => String(i)),
+      },
+      master: data.master.map((i) => String(i)),
+      admin: data.admin.map((i) => String(i)),
+    }
     /** 缓存 */
-    this.change.set(key, data)
-    return data
+    this.change.set(key, Config)
+    return Config
   }
 
   /**

package/lib/utils/handler.d.ts

@@ -1,4 +1,4 @@
-import { EventType, PluginType } from '../types/index.js';
+import { EventType, PluginType, PluginApps } from '../types/index.js';
 /**
  * 事件处理器类
  */
@@ -8,21 +8,14 @@ export declare const handler: {
      * @param index 插件索引
      * @param Class 插件类
      */
-    add(index: string, Class: PluginType): void;
+    add(index: string, Class: PluginType | PluginApps): void;
     /**
      * 删除事件处理器
      * 如果不传参数则删除所有处理器
+     * @param index 插件索引
+     * @param key 事件键
      */
-    del({ index, key }: {
-        /**
-         * 插件索引
-         */
-        index: string | "";
-        /**
-         * 事件键
-         */
-        key: string | "";
-    }): boolean;
+    del(index?: string, key?: string): boolean;
     /**
      * 调用事件处理器
      * @param key 事件键

package/lib/utils/handler.js

@@ -24,8 +24,10 @@ export const handler = new (class EventHandler {
   /**
      * 删除事件处理器
      * 如果不传参数则删除所有处理器
+     * @param index 插件索引
+     * @param key 事件键
      */
-  del ({ index = '', key = '' }) {
+  del (index = '', key = '') {
     /** 无参 */
     if (!key && !index) {
       loader.handlerIds = {}

package/lib/utils/yamlEditor.d.ts

@@ -14,7 +14,7 @@ export declare class YamlEditor {
      * @param path - 路径，用点号分隔，例如：'a.b.c'
      * @param value - 要设置的值
      */
-    set(path: string | string[], value: string): null | undefined;
+    set(path: string | string[], value: string | boolean): null | undefined;
     /**
      * 向指定路径添加新值
      * @param path - 路径，用点号分隔，例如：'a.b.c'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.3.9",
+  "version": "0.5.0",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -39,11 +39,11 @@
   "scripts": {
     "app": "node .",
     "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix && npm run cp",
-    "cp": "cp ./lib/modules.d.ts ./modules.d.ts && cp ./lib/modules.js ./modules.js && cp ./src/utils/kritor-proto.d.ts ./lib/utils/kritor-proto.d.ts",
+    "cp": "cp ./lib/modules.d.ts ./modules.d.ts && cp ./lib/modules.js ./modules.js",
     "delete": "pm2 delete ./config/config/pm2.yaml",
     "dev": "tsx ./lib/index.js --dev",
     "fix": "eslint lib/**/*.js --fix",
-    "fix:all": "eslint lib/**/*.js --fix && eslint src/**/*.ts --fix",
+    "fix:all": "eslint lib/**/*.js --fix && eslint lib/**/*.ts --fix",
     "init": "node lib/tools/install.js",
     "init:dev": "node lib/tools/install.js",
     "init:pack": "node lib/tools/install.js",
@@ -59,6 +59,7 @@
   "dependencies": {
     "@grpc/grpc-js": "1.10.10",
     "@grpc/proto-loader": "0.7.13",
+    "@inquirer/prompts": "^5.0.7",
     "art-template": "4.13.2",
     "axios": "1.7.2",
     "chalk": "5.3.0",

package/lib/utils/kritor-proto.d.ts

@@ -1 +0,0 @@
-declare module 'kritor-proto'