node-karin 0.6.3 → 0.6.5

package/config/view/config.yaml

@@ -1,100 +1,102 @@
 name: 通用配置
 view:
-  -
-    key: 日志等级
+  - key: 日志等级
     comment: 日志等级:trace,debug,info,warn,fatal,mark,error,off
-    path: 'log_level'
-    type: 'select'
+    path: "log_level"
+    type: "select"
     multiple: false
     item:
-      -
-        name: Trace
+      - name: Trace
         value: trace
-      -
-        name: Debug
+      - name: Debug
         value: ebug
-      -
-        name: Info
+      - name: Info
         value: info
-      -
-        name: Warn
+      - name: Warn
         value: warn
-      -
-        name: Fatal
+      - name: Fatal
         value: fatal
-      -
-        name: Mark
+      - name: Mark
         value: mark
-      -
-        name: Error
+      - name: Error
         value: error
-      -
-        name: Off
+      - name: Off
         value: off
-  -
-    key: 日志保留天数
-    path: 'log_days_Keep'
-    type: 'number'
-  -
-    key: ffmpeg路径
+  - key: 日志保留天数
+    path: "log_days_Keep"
+    type: "number"
+  - key: ffmpeg路径
     comment: ffmpeg配置 用于音视频处理
-    path: 'ffmpeg_path'
-    type: 'text'
-  -
-    key: ffprobe路径
+    path: "ffmpeg_path"
+    type: "text"
+  - key: ffprobe路径
     comment: ffmpeg配置 用于音视频处理
-    path: 'ffprobe_path'
-    type: 'text'
-  -
-    key: 主人列表
+    path: "ffprobe_path"
+    type: "text"
+  - key: 主人列表
     comment: 主人列表 主权限
-    path: 'master'
-    type: 'array'
-    arrayType: 'number'
-  -
-    key: 管理员列表
+    path: "master"
+    type: "array"
+    arrayType: "number"
+  - key: 管理员列表
     comment: 管理员列表 子权限
-    path: 'admin'
-    type: 'array'
-    arrayType: 'number'
-  -
-    key: 黑名单
+    path: "admin"
+    type: "array"
+    arrayType: "number"
+  - key: 黑名单
     comment: 黑名单相关
-    path: 'BlackList'
-    type: 'group'
+    path: "BlackList"
+    type: "group"
     part:
-        -
-          key: 黑名单用户
-          path: 'BlackList.users'
-          type: 'array'
-          arrayType: 'number'
-        -
-          key: 黑名单群聊
-          path: 'BlackList.groups'
-          type: 'array'
-          arrayType: 'number'
-        -
-          key: 消息日志黑名单群聊
-          comment: 设置后不会打印该群的消息日志
-          path: 'BlackList.GroupMsgLog'
-          type: 'array'
-          arrayType: 'number'
-  -
-    key: 白名单
+      - key: 黑名单用户
+        path: "BlackList.users"
+        type: "array"
+        arrayType: "number"
+        associated:
+          - file: App
+            path: "BlackList.users"
+            requirement: true
+      - key: 黑名单群聊
+        path: "BlackList.groups"
+        type: "array"
+        arrayType: "number"
+        associated:
+          - file: App
+            path: "BlackList.groups"
+            requirement: true
+      - key: 消息日志黑名单群聊
+        comment: 设置后不会打印该群的消息日志
+        path: "BlackList.GroupMsgLog"
+        type: "array"
+        arrayType: "number"
+        associated:
+          - file: App
+            path: "BlackList.GroupMsgLog"
+            requirement: true
+  - key: 白名单
     comment: 白名单相关
-    path: 'WhiteList'
-    type: 'group'
+    path: "WhiteList"
+    type: "group"
     part:
-        -
-          key: 白名单用户
-          path: 'WhiteList.users'
-          type: 'boolean'
-        -
-          key: 白名单群聊
-          path: 'WhiteList.groups'
-          type: 'boolean'
-        -
-          key: 消息日志白名单群聊
-          comment: 消息日志白名单群聊 设置后只会打印该群的消息日志
-          path: 'WhiteList.GroupMsgLog'
-          type: 'boolean'
+      - key: 白名单用户
+        path: "WhiteList.users"
+        type: "boolean"
+        associated:
+          - file: App
+            path: "WhiteList.users"
+            requirement: true
+      - key: 白名单群聊
+        path: "WhiteList.groups"
+        type: "boolean"
+        associated:
+          - file: App
+            path: "WhiteList.groups"
+            requirement: true
+      - key: 消息日志白名单群聊
+        comment: 消息日志白名单群聊 设置后只会打印该群的消息日志
+        path: "WhiteList.GroupMsgLog"
+        type: "boolean"
+        associated:
+          - file: App
+            path: "WhiteList.GroupMsgLog"
+            requirement: true

package/config/view/group.yaml

@@ -11,17 +11,32 @@ view:
           path: 'default.global_cd'
           type: 'number'
           suffix: 秒
+          associated:
+            -
+              file: App
+              path: 'GroupConfig.GroupCD'
+              requirement: true
         -
           key: 个人消息冷却时间
           comment: 群聊中 每个人的消息冷却时间，0则无限制。注意，开启后所有消息，无论是否触发插件。
           path: 'default.personal_cd'
           type: 'number'
           suffix: 秒
+          associated:
+            -
+              file: App
+              path: 'GroupConfig.GroupUserCD'
+              requirement: true
         -
           key: 机器人响应模式
           comment: 机器人响应模式，0-所有 1-仅@机器人 2-仅回应主人 3-仅回应前缀 4-前缀或@机器人 5-主人无前缀，群员前缀或@机器人
           path: 'default.mode'
           type: 'select'
+          associated:
+            -
+              file: App
+              path: 'GroupConfig.mode'
+              requirement: true
           multiple: false
           item:
             -
@@ -48,15 +63,30 @@ view:
           path: 'default.ailas'
           type: 'array'
           arrayType: 'text'
+          associated:
+            -
+              file: App
+              path: 'GroupConfig.alias'
+              requirement: true
         -
           key: 白名单插件
           comment: 白名单插件、功能，只有在白名单中的插件、功能才会响应
           path: 'default.enable'
           type: 'array'
           arrayType: 'text'
+          associated:
+            -
+              file: App
+              path: 'GroupConfig.enable'
+              requirement: true
         -
           key: 黑名单插件
           comment: 黑名单插件、功能，黑名单中的插件、功能不会响应
           path: 'default.disable'
           type: 'array'
           arrayType: 'text'
+          associated:
+            -
+              file: App
+              path: 'GroupConfig.disable'
+              requirement: true

package/lib/tools/init.js

@@ -2,34 +2,64 @@
 import fs from 'fs'
 import path from 'path'
 import { karinDir } from '../core/dir.js'
-const pathList = ['./plugins', './config/config']
-for (const dir of pathList) { mkdir(dir) }
+import { execSync } from 'child_process'
+const pathList = ['./plugins', './config/config', './lib']
+// 创建目录
+pathList.forEach(dir => mkdir(dir))
 function mkdir (dirname) {
   if (fs.existsSync(dirname)) { return true }
-  /** 递归自调用 */
   if (mkdir(path.dirname(dirname))) { fs.mkdirSync(dirname) }
   return true
 }
-// 删除这两个文件夹
+// 创建 lib 目录并导出 node-karin 模块
+fs.writeFileSync('./lib/index.js', `export * from 'node-karin'`)
+// 删除指定目录并重新创建
 const delList = ['./config/defSet', './config/view']
-for (const dir of delList) {
+delList.forEach(dir => {
   if (fs.existsSync(dir)) { fs.rmdirSync(dir, { recursive: true }) }
   mkdir(dir)
-  const root = `${karinDir}${dir.replace('.', '')}`
+  const root = path.join(karinDir, dir.replace('.', ''))
   const files = fs.readdirSync(root).filter(file => file.endsWith('.yaml'))
-  for (const file of files) {
-    const path = `${dir}/${file}`
-    const pathDef = `${root}/${file}`
-    if (!fs.existsSync(path)) { fs.copyFileSync(pathDef, path) }
-  }
-}
-// 修改package.json为esm模块
+  files.forEach(file => {
+    const destPath = path.join(dir, file)
+    const srcPath = path.join(root, file)
+    if (!fs.existsSync(destPath)) { fs.copyFileSync(srcPath, destPath) }
+  })
+})
+// 修改 package.json 为 ESM 模块
 const pack = JSON.parse(fs.readFileSync('./package.json', 'utf-8'))
-// 解析包内的package.json文件
-const npmPack = JSON.parse(fs.readFileSync(`${karinDir}/package.json`, 'utf-8'))
+const npmPack = JSON.parse(fs.readFileSync(path.join(karinDir, 'package.json'), 'utf-8'))
 npmPack.main = './node_modules/node-karin/lib/index.js'
 delete npmPack.bin
 delete npmPack.types
 npmPack.dependencies = pack.dependencies
 fs.writeFileSync('./package.json', JSON.stringify(npmPack, null, 2))
+// 复制 pnpm-workspace.yaml 到根目录
+fs.copyFileSync(path.join(karinDir, 'pnpm-workspace.yaml'), './pnpm-workspace.yaml')
+// 检查是否安装 pnpm 并安装依赖
+console.log('检查是否安装 pnpm...')
+try {
+  const isPnpm = execSync('pnpm -v', { env: process.env }).toString().trim()
+  if (isPnpm) {
+    console.log('检查到 pnpm，开始安装依赖...')
+  } else {
+    installPnpm()
+  }
+} catch {
+  installPnpm()
+}
+// 安装依赖
+try {
+  execSync('pnpm install -P', { env: process.env, stdio: 'inherit' })
+  console.log('依赖安装完成~')
+} catch {
+  console.log('安装依赖失败，请手动安装依赖！')
+  console.log('可尝试手动执行 【 pnpm install -P 】 安装依赖~')
+  console.log('如中国大陆用户安装失败，请尝试执行换源 【 npm config set registry https://registry.npmmirror.com 】后再安装依赖~')
+}
 console.log('初始化完成~，请通过 【 node . 】 启动程序~')
+function installPnpm () {
+  console.log('未检查到 pnpm，开始安装 pnpm...')
+  execSync('npm --registry=https://registry.npmmirror.com install pnpm -g', { env: process.env, stdio: 'inherit' })
+  console.log('pnpm 安装完成，开始安装依赖...')
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -28,7 +28,8 @@
     "modules.d.ts",
     "LICENSE",
     "package.json",
-    "README.md"
+    "README.md",
+    "pnpm-workspace.yaml"
   ],
   "workspaces": [
     "plugins/**"

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+packages:
+  - 'plugins/**'