node-karin 0.5.1 → 0.6.2

package/lib/utils/common.js

@@ -129,6 +129,18 @@ export const common = new (class Common {
     }
   }
 
+  /**
+     * - 解析json文件
+     */
+  readJson (file) {
+    try {
+      return JSON.parse(fs.readFileSync(file, 'utf8'))
+    } catch (error) {
+      logger.error('读取json文件错误：' + error)
+      return null
+    }
+  }
+
   /**
      * 根据文件后缀名从指定路径下读取符合要求的文件
      * @param path - 路径

package/lib/utils/config.d.ts

@@ -15,9 +15,10 @@ export declare const config: {
     initCfg(): Promise<void>;
     getPlugins(): string[];
     /**
-     * 检查路径是否存在 不存在则创建
+     * 递归创建目录
+     * @param dirname - 要创建的文件夹路径
      */
-    checkPath(path: string): void;
+    mkdir(dirname: string): boolean;
     /**
      * 为每一个插件建立对应的文件夹
      */

package/lib/utils/config.js

@@ -1,3 +1,4 @@
+import path from 'path'
 import { karinDir } from '../core/dir.js'
 import { fs, yaml as Yaml, chokidar } from '../modules.js'
 /**
@@ -33,7 +34,7 @@ export const config = new (class Cfg {
       './plugins',
       './plugins/karin-plugin-example',
     ]
-    list.forEach(path => this.checkPath(path))
+    list.forEach(path => this.mkdir(path))
     if (this.npmCfgDir !== (this._path + '/defSet').replace(/\\/g, '/')) {
       const files = fs.readdirSync(this.npmCfgDir).filter(file => file.endsWith('.yaml'))
       files.forEach(file => {
@@ -58,10 +59,14 @@ export const config = new (class Cfg {
   }
 
   /**
-     * 检查路径是否存在 不存在则创建
+     * 递归创建目录
+     * @param dirname - 要创建的文件夹路径
      */
-  checkPath (path) {
-    if (!fs.existsSync(path)) { fs.mkdirSync(path) }
+  mkdir (dirname) {
+    if (fs.existsSync(dirname)) { return true }
+    /** 递归自调用 */
+    if (this.mkdir(path.dirname(dirname))) { fs.mkdirSync(dirname) }
+    return true
   }
 
   /**
@@ -69,10 +74,10 @@ export const config = new (class Cfg {
      */
   async dirPath (name, plugins) {
     name = `./${name}`
-    this.checkPath(name)
+    this.mkdir(name)
     for (const plugin of plugins) {
       const path = `${name}/${plugin}`
-      this.checkPath(path)
+      this.mkdir(path)
     }
   }
 

package/lib/utils/segment.d.ts

@@ -57,7 +57,7 @@ export declare const segment: {
         /**
          * - 图片子类型
          */
-        sub_type?: number;
+        sub_type?: string;
         /**
          * - 图片宽度
          */
@@ -84,6 +84,7 @@ export declare const segment: {
      * @param md5 - 语音md5
      * @param name - 语音名称
      * @returns {VoiceElement} 语音元素
+     * @deprecated 即将废弃 请使用segment.record
      */
     voice(file: string, magic?: boolean, md5?: string, name?: string): VoiceElement;
     /**
@@ -129,7 +130,7 @@ export declare const segment: {
      * @param pic - 封面
      * @returns {CustomMusicElemen} 自定义音乐元素
      */
-    customMusic(url: string, audio: string, title: string, author: string, pic: string): CustomMusicElemen;
+    customMusic(url: string, audio: string, title: string, author: string, pic: string, id: string): CustomMusicElemen;
     /**
      * 音乐
      * @param platform - 音乐平台

package/lib/utils/segment.js

@@ -77,7 +77,7 @@ export const segment = new (class Segment {
     const file_type = options.file_type || 'original'
     const name = options.name || ''
     const md5 = options.md5 || ''
-    const sub_type = options.sub_type || 0
+    const sub_type = options.sub_type || ''
     const width = options.width || 0
     const height = options.height || 0
     return {
@@ -118,6 +118,7 @@ export const segment = new (class Segment {
      * @param md5 - 语音md5
      * @param name - 语音名称
      * @returns {VoiceElement} 语音元素
+     * @deprecated 即将废弃 请使用segment.record
      */
   voice (file, magic = false, md5 = '', name = '') {
     return {
@@ -206,7 +207,7 @@ export const segment = new (class Segment {
      * @param pic - 封面
      * @returns {CustomMusicElemen} 自定义音乐元素
      */
-  customMusic (url, audio, title, author, pic) {
+  customMusic (url, audio, title, author, pic, id) {
     return {
       type: 'music',
       platform: 'custom',
@@ -215,6 +216,7 @@ export const segment = new (class Segment {
       title,
       author,
       pic,
+      id,
     }
   }
 

package/modules.d.ts

@@ -11,4 +11,5 @@ import { Level as level } from 'level';
 import schedule from 'node-schedule';
 import yaml from 'yaml';
 import log4js from 'log4js';
-export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, };
+import art_template from 'art-template';
+export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, art_template, };

package/modules.js

@@ -11,4 +11,5 @@ import { Level as level } from 'level';
 import schedule from 'node-schedule';
 import yaml from 'yaml';
 import log4js from 'log4js';
-export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, };
+import art_template from 'art-template';
+export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, art_template, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.5.1",
+  "version": "0.6.2",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -14,9 +14,6 @@
   "license": "GPL-3.0-only",
   "author": "Karin",
   "type": "module",
-  "imports": {
-    "#Karin": "./lib/index.js"
-  },
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "bin": {
@@ -42,6 +39,7 @@
     "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",
+    "debug": "tsx watch ./lib/index.js --dev",
     "fix": "eslint lib/**/*.js --fix",
     "fix:all": "eslint lib/**/*.js --fix && eslint lib/**/*.ts --fix",
     "init": "node lib/tools/install.js",
@@ -65,7 +63,7 @@
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
     "express": "4.19.2",
-    "kritor-proto": "^1.0.1",
+    "kritor-proto": "^1.0.2",
     "level": "8.0.1",
     "lodash": "4.17.21",
     "log4js": "6.9.1",