node-karin 0.6.13 → 0.6.14

package/lib/adapter/input/index.d.ts

@@ -12,7 +12,8 @@ export declare class AdapterInput implements KarinAdapter {
     version: KarinAdapter['version'];
     constructor();
     get self_id(): string;
-    stdin(): void;
+    stdin(): this;
+    init(): void;
     logger(level: 'info' | 'error' | 'trace' | 'debug' | 'mark' | 'warn' | 'fatal', ...args: any[]): void;
     GetVersion(): Promise<{
         name: string;

package/lib/adapter/input/index.js

@@ -9,13 +9,11 @@ const { enable, msgToFile, token: oldToken, ip } = config.Config.AdapterInput;
  */
 export class AdapterInput {
     token;
-    #stdin;
     socket;
     account;
     adapter;
     version;
     constructor() {
-        this.#stdin = false;
         this.token = oldToken;
         this.account = { uid: 'input', uin: 'input', name: 'input' };
         this.adapter = { id: 'shell', name: 'input', type: 'internal', sub_type: 'internal', start_time: Date.now(), connect: '', index: 0 };
@@ -25,9 +23,6 @@ export class AdapterInput {
         return this.account.uid;
     }
     stdin() {
-        if (this.#stdin)
-            return;
-        this.#stdin = true;
         if (oldToken === 'AdapterInput') {
             try {
                 this.token = randomUUID();
@@ -57,8 +52,14 @@ export class AdapterInput {
         const index = listener.addBot({ bot: this, type: this.adapter.type });
         if (index)
             this.adapter.index = index;
+        return this;
+    }
+    init() {
         process.stdin.on('data', data => this.#input(data.toString()));
-        process.once('stdin.close', () => process.stdin.removeAllListeners('data'));
+        process.once('stdin.close', () => {
+            process.stdin.removeAllListeners('data');
+            process.stdin.once('stdin.open', () => this.init());
+        });
     }
     logger(level, ...args) {
         logger.bot(level, this.account.uid || this.account.uin, ...args);
@@ -89,9 +90,6 @@ export class AdapterInput {
         };
         const e = new KarinMessage(message);
         e.bot = this;
-        /**
-         * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
-         */
         e.replyCallback = async (elements) => {
             this.SendMessage(e.contact, elements);
             return { message_id: e.message_id };
@@ -111,7 +109,6 @@ export class AdapterInput {
         const buffer = await common.buffer(file);
         // 生成文件名 根据type生成不同的文件后缀
         const name = `${Date.now()}.${type === 'image' ? 'jpg' : type === 'voice' ? 'mp3' : 'file'}`;
-        // 写入文件
         fs.writeFileSync(`./temp/input/${name}`, buffer);
         return `[${type === 'image' ? '图片' : '语音'}: http://${ip}:${config.Server.http.port}/api/input?name=${name}&token=${this.token} ]`;
     }
@@ -187,4 +184,4 @@ export class AdapterInput {
     async GetGroupHonor() { throw new Error('Method not implemented.'); }
 }
 if (enable)
-    new AdapterInput().stdin();
+    new AdapterInput().stdin().init();

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

@@ -270,13 +270,26 @@ export declare class AdapterOneBot11 implements KarinAdapter {
     GetVersion(): Promise<any>;
     DownloadForwardMessage(): Promise<void>;
     GetEssenceMessageList(): Promise<void>;
+    /**
+     * 上传群文件
+     * @param group_id - 群号
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     * @param folder - 父目录ID 不提供则上传到根目录
+     */
+    UploadPrivateFile(group_id: string, file: string, name: string, folder?: string): Promise<any>;
+    /**
+     * 上传私聊文件
+     * @param user_id - 用户ID
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     */
+    UploadGroupFile(user_id: string, file: string, name: string): Promise<any>;
     SetEssenceMessage(): Promise<void>;
     DeleteEssenceMessage(): Promise<void>;
     SetFriendApplyResult(): Promise<void>;
     SetGroupApplyResult(): Promise<void>;
     SetInvitedJoinGroupResult(): Promise<void>;
-    UploadPrivateFile(): Promise<void>;
-    UploadGroupFile(): Promise<void>;
     sendForwardMessage(contact: contact, elements: KarinNodeElement[]): Promise<{
         message_id: any;
     }>;

package/lib/adapter/onebot/onebot11.js

@@ -1216,13 +1216,30 @@ export class AdapterOneBot11 {
     async GetEssenceMessageList() {
         throw new Error('Method not implemented.');
     }
+    /**
+     * 上传群文件
+     * @param group_id - 群号
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     * @param folder - 父目录ID 不提供则上传到根目录
+     */
+    async UploadPrivateFile(group_id, file, name, folder) {
+        return await this.SendApi('upload_group_file', { group_id, file, name, folder });
+    }
+    /**
+     * 上传私聊文件
+     * @param user_id - 用户ID
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     */
+    async UploadGroupFile(user_id, file, name) {
+        return await this.SendApi('upload_private_file', { user_id, file, name });
+    }
     async SetEssenceMessage() { }
     async DeleteEssenceMessage() { }
     async SetFriendApplyResult() { }
     async SetGroupApplyResult() { }
     async SetInvitedJoinGroupResult() { }
-    async UploadPrivateFile() { }
-    async UploadGroupFile() { }
     async sendForwardMessage(contact, elements) {
         let message_id = await this.UploadForwardMessage(contact, elements);
         if (this.version.name === 'Lagrange.OneBot') {

package/lib/core/karin.d.ts

@@ -51,10 +51,10 @@ export interface OptionsElement extends OptionsCommand {
 }
 export declare class Karin {
     /**
-     * @param reg - 正则表达式
-     * @param fnc - 函数
-     * @param options - 选项
-     */
+    * @param reg - 正则表达式
+    * @param fnc - 函数
+    * @param options - 选项
+    */
     command(reg: string | RegExp, fnc: FncFunction, options?: OptionsCommand): PluginApps;
     /**
      * @param reg - 正则表达式

package/lib/core/karin.js

@@ -11,7 +11,6 @@ export class Karin {
      * @param options - 选项
      * @returns - 返回插件对象
      */
-
   command (reg, second, options = {}) {
     reg = typeof reg === 'string' ? new RegExp(reg) : reg
     const fnc = typeof second === 'function'

package/lib/core/server.d.ts

@@ -19,7 +19,7 @@ export declare const server: {
     /**
      * 构建静态资源路径
      */
-    staticPath(): void;
+    staticPath(): Promise<void>;
     /** 重启当前HTTP服务器 */
     "__#17@#restartServer"(): Promise<void>;
 };

package/lib/core/server.js

@@ -201,7 +201,7 @@ export const server = new (class Server {
   /**
      * 构建静态资源路径
      */
-  staticPath () {
+  async staticPath () {
     this.list = []
     /** 读取./resources文件夹 */
     const resDir = './resources'
@@ -217,17 +217,32 @@ export const server = new (class Server {
       const file = `${htmlDir}/${dir}`
       if (common.isDir(file)) { this.list.push(file.replace('.', '')) }
     }
-    /** 读取./plugins/html下所有文件夹 */
+    /** 读取./plugins/xxx/resources下所有文件夹 */
     const pluginsDir = './plugins'
     const plugins = fs.readdirSync(pluginsDir)
     for (const dir of plugins) {
+      /** 忽略不是karin-plugin-开头 */
+      if (!dir.startsWith('karin-plugin-')) { continue }
       const file = `${pluginsDir}/${dir}`
       const resFile = `${file}/resources`
       /** 包含resources文件夹 */
       if (common.isDir(file) && common.isDir(resFile)) { this.list.push(resFile.replace('.', '')) }
-      const componentsFile = `${file}/components`
-      /** 包含components文件夹 兼容mys */
+      const componentsFile = `${file}/lib/components`
+      /** 包含lib/components文件夹 兼容mys */
       if (common.isDir(file) && common.isDir(componentsFile)) { this.list.push(componentsFile.replace('.', '')) }
+      /** 读取package.json 查找是否存在自定义资源文件入口 */
+      const pkgFile = `${file}/package.json`
+      if (!common.exists(pkgFile)) { continue }
+      const pkg = common.readJson(pkgFile)
+      if (!pkg?.karin?.static || !Array.isArray(pkg.karin.static)) { continue }
+      /** 标准格式为 lib/test/xxxx */
+      for (let staticFile of pkg.karin.static) {
+        /** 不允许向上级目录 ../开头等 */
+        if (staticFile.startsWith('../')) { continue }
+        /** ./开头去掉./ */
+        if (staticFile.startsWith('./')) { staticFile = staticFile.slice(2) }
+        this.list.push(`${file}/${staticFile}`)
+      }
     }
     this.reg = new RegExp(`(${this.list.join('|')})`, 'g')
   }

package/lib/event/message.handler.js

@@ -88,10 +88,7 @@ export class MessageHandler extends EventHandler {
     for (const val of this.e.elements) {
       switch (val.type) {
         case 'text': {
-          const msg = (val.text || '')
-            .replace(/^\s*[＃井#]+\s*/, '#')
-            .replace(/^\s*[\\*※＊]+\s*/, '*')
-            .trim()
+          const msg = (val.text || '').replace(/^\s*[＃井#]+\s*/, '#').replace(/^\s*[\\*※＊]+\s*/, '*').trim()
           this.e.msg += msg
           /** 美观一点... */
           logs.push(msg)
@@ -114,11 +111,9 @@ export class MessageHandler extends EventHandler {
           break
         case 'at':
           /** atBot不计入e.at */
-          // eslint-disable-next-line eqeqeq
-          if (val.uid && val.uid == this.e.bot.account.uid) {
+          if (val.uid && val.uid === this.e.bot.account.uid) {
             this.e.atBot = true
-            // eslint-disable-next-line eqeqeq
-          } else if (val.uin == this.e.bot.account.uin) {
+          } else if (val.uin === this.e.bot.account.uin) {
             this.e.atBot = true
           } else if (val.uid && val.uid === 'all') {
             this.e.atAll = true
@@ -185,6 +180,9 @@ export class MessageHandler extends EventHandler {
         case 'button':
           logs.push(`[button:${JSON.stringify(val.data)}]`)
           break
+        case 'long_msg':
+          logs.push(`[long_msg:${val.id}]`)
+          break
         default:
           logs.push(`[未知:${JSON.stringify(val)}]`)
       }

package/lib/index.d.ts

@@ -28,9 +28,10 @@ export declare const Renderer: {
     renderHtml(data: string): Promise<string | string[]>;
 };
 export declare const Cfg: {
-    dir: string;
-    _path: string;
-    npmCfgDir: string;
+    projPath: string;
+    projConfigPath: string;
+    pkgPath: string;
+    pkgConfigPath: string;
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
@@ -38,7 +39,7 @@ export declare const Cfg: {
     initCfg(): Promise<void>;
     getPlugins(): string[];
     mkdir(dirname: string): boolean;
-    dirPath(name: string, plugins: string[]): Promise<void>;
+    dirPath(_path: string, plugins: string[]): Promise<void>;
     timeout(type?: "ws" | "grpc"): number;
     readonly redis: import("./types/index.js").Redis;
     readonly master: string[];

package/lib/types/element.d.ts

@@ -28,6 +28,10 @@ export interface AtElement extends Element {
      * - At的uin
      */
     uin?: string;
+    /**
+     * - At的名称
+     */
+    name?: string;
 }
 /**
  * - 表情元素

package/lib/types/onebots11.d.ts

@@ -848,7 +848,7 @@ export type ByPostType<T extends EventPostType> = Extract<OneBot11Event, {
 /**
  * - OneBot11公开Api
  */
-export type OneBot11Api = 'send_private_msg' | 'send_group_msg' | 'send_msg' | 'delete_msg' | 'get_msg' | 'get_forward_msg' | 'send_like' | 'set_group_kick' | 'set_group_ban' | 'set_group_anonymous_ban' | 'set_group_whole_ban' | 'set_group_admin' | 'set_group_anonymous' | 'set_group_card' | 'set_group_name' | 'set_group_leave' | 'set_group_special_title' | 'set_friend_add_request' | 'set_group_add_request' | 'get_login_info' | 'get_stranger_info' | 'get_friend_list' | 'get_group_info' | 'get_group_list' | 'get_group_member_info' | 'get_group_member_list' | 'get_group_honor_info' | 'get_cookies' | 'get_csrf_token' | 'get_credentials' | 'get_record' | 'get_image' | 'can_send_image' | 'can_send_record' | 'get_status' | 'get_version_info' | 'set_restart' | 'clean_cache' | 'get_version' | 'send_forward_msg' | 'get_friend_msg_history' | 'get_group_msg_history' | 'set_msg_emoji_like';
+export type OneBot11Api = 'send_private_msg' | 'send_group_msg' | 'send_msg' | 'delete_msg' | 'get_msg' | 'get_forward_msg' | 'send_like' | 'set_group_kick' | 'set_group_ban' | 'set_group_anonymous_ban' | 'set_group_whole_ban' | 'set_group_admin' | 'set_group_anonymous' | 'set_group_card' | 'set_group_name' | 'set_group_leave' | 'set_group_special_title' | 'set_friend_add_request' | 'set_group_add_request' | 'get_login_info' | 'get_stranger_info' | 'get_friend_list' | 'get_group_info' | 'get_group_list' | 'get_group_member_info' | 'get_group_member_list' | 'get_group_honor_info' | 'get_cookies' | 'get_csrf_token' | 'get_credentials' | 'get_record' | 'get_image' | 'can_send_image' | 'can_send_record' | 'get_status' | 'get_version_info' | 'set_restart' | 'clean_cache' | 'get_version' | 'send_forward_msg' | 'get_friend_msg_history' | 'get_group_msg_history' | 'set_msg_emoji_like' | 'upload_group_file' | 'upload_private_file';
 /**
  * - OneBot11公开Api参数 params
  */
@@ -1379,6 +1379,44 @@ export type OneBot11ApiParams = {
          */
         is_set: boolean;
     };
+    /**
+     * 上传群文件
+     */
+    upload_group_file: {
+        /**
+         * - 群号
+         */
+        group_id: number;
+        /**
+         * - 文件路径 需要提供绝对路径
+         */
+        file: string;
+        /**
+         * - 文件名称 必须提供
+         */
+        name: string;
+        /**
+         * - 父目录ID 不提供则上传到根目录
+         */
+        folder?: string;
+    };
+    /**
+     * 上传私聊文件
+     */
+    upload_private_file: {
+        /**
+         * - 对方 QQ 号
+         */
+        user_id: number;
+        /**
+         * - 文件路径 需要提供绝对路径
+         */
+        file: string;
+        /**
+         * - 文件名称 必须提供
+         */
+        name: string;
+    };
 };
 /**
  * - OneBot11公开Api与参数映射

package/lib/utils/config.d.ts

@@ -4,9 +4,22 @@ import { Redis, App, Config, Server, Package, GroupCfg } from '../types/index.js
  * 配置文件
  */
 export declare const config: {
-    dir: string;
-    _path: string;
-    npmCfgDir: string;
+    /**
+     * 根项目绝对路径
+     */
+    projPath: string;
+    /**
+     * 根项目配置文件夹路径
+     */
+    projConfigPath: string;
+    /**
+     * npm包路径
+     */
+    pkgPath: string;
+    /**
+     * karin包配置文件夹路径
+     */
+    pkgConfigPath: string;
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
@@ -22,7 +35,7 @@ export declare const config: {
     /**
      * 为每一个插件建立对应的文件夹
      */
-    dirPath(name: string, plugins: string[]): Promise<void>;
+    dirPath(_path: string, plugins: string[]): Promise<void>;
     /**
      * 超时时间
      */

package/lib/utils/config.js

@@ -5,17 +5,31 @@ import { fs, yaml as Yaml, chokidar } from '../modules.js'
  * 配置文件
  */
 export const config = new (class Cfg {
-  dir
-  _path
-  npmCfgDir
+  /**
+     * 根项目绝对路径
+     */
+  projPath
+  /**
+     * 根项目配置文件夹路径
+     */
+  projConfigPath
+  /**
+     * npm包路径
+     */
+  pkgPath
+  /**
+     * karin包配置文件夹路径
+     */
+  pkgConfigPath
   change
   watcher
   review
   logger
   constructor () {
-    this.dir = karinDir
-    this._path = process.cwd() + '/config'
-    this.npmCfgDir = this.dir + '/config/defSet'
+    this.projPath = process.cwd()
+    this.pkgPath = karinDir
+    this.projConfigPath = this.projPath + '/config'
+    this.pkgConfigPath = this.pkgPath + '/config/defSet'
     /** 缓存 */
     this.change = new Map()
     /** 监听文件 */
@@ -28,33 +42,36 @@ export const config = new (class Cfg {
   /** 初始化配置 */
   async initCfg () {
     const list = [
-      this._path,
-      this._path + '/config',
-      process.cwd() + '/temp/input',
-      './plugins',
-      './plugins/karin-plugin-example',
+      this.projPath + '/temp/input',
+      this.projPath + '/plugins/karin-plugin-example',
+      this.projConfigPath + '/config',
+      this.projConfigPath + '/plugin',
     ]
     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'))
+    if (this.pkgConfigPath !== (this.projConfigPath + '/defSet').replace(/\\/g, '/')) {
+      const files = fs.readdirSync(this.pkgConfigPath).filter(file => file.endsWith('.yaml'))
       files.forEach(file => {
-        const path = `${this._path}/config/${file}`
-        const pathDef = `${this.npmCfgDir}/${file}`
+        const path = `${this.projConfigPath}/config/${file}`
+        const pathDef = `${this.pkgConfigPath}/${file}`
         if (!fs.existsSync(path)) { fs.copyFileSync(pathDef, path) }
       })
     }
-    // 创建插件文件夹文件夹
+    /** 为每个插件包创建统一存储的文件夹 */
     const plugins = this.getPlugins()
-    this.dirPath('data', plugins)
-    this.dirPath('temp', plugins)
-    this.dirPath('resources', plugins)
-    this.dirPath('temp/html', plugins)
+    const DataList = [
+      'data',
+      'temp',
+      'resources',
+      'temp/html',
+      this.projConfigPath + '/plugin',
+    ]
+    DataList.forEach(path => this.dirPath(path, plugins))
     this.logger = (await import('./logger.js')).default
   }
 
   getPlugins () {
     const files = fs.readdirSync('./plugins', { withFileTypes: true })
-    // 过滤掉非karin-plugin-开头或karin-adapter-开头的文件夹
+    // 过滤掉非karin-plugin-开头的文件夹
     return files.filter(file => file.isDirectory() && (file.name.startsWith('karin-plugin-'))).map(dir => dir.name)
   }
 
@@ -72,11 +89,10 @@ export const config = new (class Cfg {
   /**
      * 为每一个插件建立对应的文件夹
      */
-  async dirPath (name, plugins) {
-    name = `./${name}`
-    this.mkdir(name)
+  async dirPath (_path, plugins) {
+    this.mkdir(_path)
     for (const plugin of plugins) {
-      const path = `${name}/${plugin}`
+      const path = `${_path}/${plugin}`
       this.mkdir(path)
     }
   }

package/lib/utils/segment.d.ts

@@ -11,9 +11,10 @@ export declare const segment: {
      * 提供一个uid即可
      * @param uid - uid
      * @param uin - uin
+     * @param name - 名称
      * @returns {AtElement} 提及元素
      */
-    at(uid: string, uin?: string): AtElement;
+    at(uid: string, uin?: string, name?: string): AtElement;
     /**
      * 表情
      * @param id - 表情ID

package/lib/utils/segment.js

@@ -16,13 +16,15 @@ export const segment = new (class Segment {
      * 提供一个uid即可
      * @param uid - uid
      * @param uin - uin
+     * @param name - 名称
      * @returns {AtElement} 提及元素
      */
-  at (uid, uin) {
+  at (uid, uin, name) {
     return {
       type: 'at',
       uid: uid + '',
       uin: (uin || '') + '',
+      name,
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",