node-karin 0.8.3 → 0.8.5

package/lib/adapter/input/index.js

@@ -92,7 +92,7 @@ export class AdapterInput {
         e.bot = this;
         e.replyCallback = async (elements) => {
             this.SendMessage(e.contact, elements);
-            return { message_id: e.message_id };
+            return { message_id: e.message_id, message_time: Date.now(), raw_data: elements };
         };
         listener.emit('message', e);
     }

package/lib/core/plugin.d.ts

@@ -1,4 +1,4 @@
-import { PluginType, KarinElement, NodeElement, stateArrType, KarinNoticeType, KarinRequestType, KarinEventTypes } from '../types/index.js';
+import { PluginType, KarinElement, NodeElement, stateArrType, KarinNoticeType, KarinRequestType, KarinEventTypes, ReplyReturn } from '../types/index.js';
 /**
  * 插件基类
  */
@@ -115,17 +115,12 @@ export declare class Plugin implements PluginType {
          * @default 1
          */
         retry_count?: number;
-    }): Promise<{
-        /**
-         * @param message_id - 消息发送成功返回的消息ID
-         */
-        message_id?: string;
-    }>;
+    }): Promise<ReplyReturn>;
     /**
      * - 快速回复合并转发
      */
     replyForward(msg: NodeElement[]): Promise<{
-        message_id?: string;
+        message_id: string;
     }>;
     /**
      * - 构建上下文键

package/lib/event/event.handler.js

@@ -139,22 +139,28 @@ export default class EventHandler {
       } else {
         this.e.self_id !== 'input' && logger.bot('info', this.e.self_id, `${logger.green(`Send private ${this.e.user_id}: `)}${ReplyLog}`)
       }
-      let message_id = ''
+      const request = {
+        message_id: '',
+        message_time: 0,
+        raw_data: undefined,
+      }
       try {
         listener.emit('karin:count:send', 1)
         /** 取结果 */
         const Res = await result
-        message_id = Res.message_id || ''
+        request.message_id = Res.message_id || ''
+        request.message_time = Res.message_time || Date.now()
+        request.raw_data = Res.raw_data || undefined
         logger.bot('debug', this.e.self_id, `回复消息结果:${JSON.stringify(result)}`)
       } catch (error) {
         logger.bot('error', this.e.self_id, `回复消息失败:${ReplyLog}`)
         logger.bot('error', this.e.self_id, error.stack || error.message || JSON.stringify(error))
       }
       /** 快速撤回 */
-      if (recallMsg > 0 && message_id) {
-        setTimeout(() => this.e.bot.RecallMessage(this.e.contact, message_id), recallMsg * 1000)
+      if (recallMsg > 0 && request.message_id) {
+        setTimeout(() => this.e.bot.RecallMessage(this.e.contact, request.message_id), recallMsg * 1000)
       }
-      return result
+      return request
     }
     Object.freeze(this.e.reply)
   }

package/lib/event/message.handler.js

@@ -66,7 +66,7 @@ export class MessageHandler extends EventHandler {
             if (app.file.type === 'function' && typeof v.fnc === 'function') {
               res = await v.fnc(this.e)
             } else {
-              const cla = new app.file.Fnc()
+              const cla = new app.file.Fnc(this.e)
               cla.e = this.e
               res = await cla[v.fnc](this.e)
             }

package/lib/types/adapter/adapter.d.ts

@@ -1,6 +1,6 @@
 import { WebSocket } from 'ws';
 import { IncomingMessage } from 'http';
-import { Contact } from '../event/index.js';
+import { Contact, ReplyReturn } from '../event/index.js';
 import { KarinElement, NodeElement } from '../element.js';
 import { LoggerLevel } from '../logger.js';
 import { PushMessageBody, EssenceMessageBody, FriendInfo, GroupInfo, GroupMemberInfo, GroupHonorInfo, GroupFileInfo, GroupFolderInfo, GetRemainCountAtAllResponse } from './api.js';
@@ -117,11 +117,7 @@ export interface KarinAdapter {
      * @param retry_count - 重试次数 默认为1
      * @returns 此接口因各平台问题，允许返回更多自定义数据
      */
-    SendMessage(contact: Contact, elements: Array<KarinElement>, retry_count?: number): Promise<{
-        message_id?: string;
-        message_time?: number;
-        [key: string]: any;
-    }>;
+    SendMessage(contact: Contact, elements: Array<KarinElement>, retry_count?: number): Promise<ReplyReturn>;
     /**
      * 上传合并转发消息返回一个资源ID
      * @param contact - 联系人信息
@@ -353,7 +349,7 @@ export interface KarinAdapter {
      * @param elements 消息元素
      */
     sendForwardMessage(contact: Contact, elements: Array<NodeElement>): Promise<{
-        message_id?: string;
+        message_id: string;
     }>;
     /**
      * 对消息进行表情回应 icqq需要传递seq

package/lib/types/event/reply.d.ts

@@ -24,9 +24,20 @@ options?: {
      * 重试次数
      */
     retry_count?: number;
-}) => Promise<{
-    message_id?: string;
-}>;
+}) => Promise<ReplyReturn>;
+/**
+ * 发送消息后返回信息
+ */
+export interface ReplyReturn {
+    /**
+     * 消息ID
+     */
+    message_id: string;
+    /** 消息发送时间戳 */
+    message_time?: number;
+    /** 原始结果 QQBot适配器下为数组 */
+    raw_data?: any;
+}
 export type replyCallback = (
 /**
  * 发送的消息
@@ -35,9 +46,5 @@ elements: KarinElement[],
 /**
  * 重试次数
  */
-retry_count?: number) => Promise<{
-    message_id?: string;
-}>;
-export type replyForward = (msg: NodeElement[]) => Promise<{
-    message_id?: string;
-}>;
+retry_count?: number) => Promise<ReplyReturn>;
+export type replyForward = (msg: NodeElement[]) => Promise<ReplyReturn>;

package/lib/utils/config.js

@@ -213,7 +213,7 @@ export const config = new (class Cfg {
      * 实时获取packageon文件
      */
   get package () {
-    const data = fs.readFileSync('./package.json', 'utf8')
+    const data = fs.readFileSync(this.pkgDir + '/package.json', 'utf8')
     const pack = JSON.parse(data)
     return pack
   }
@@ -244,7 +244,7 @@ export const config = new (class Cfg {
      */
   getYaml (type, name, isWatch = false) {
     /** 文件路径 */
-    const file = `./config/${type}/${name}.yaml`
+    const file = type === 'defSet' ? `${this.pkgCfgDir}/${name}.yaml` : `${this.cfgDir}/${name}.yaml`
     /** 读取文件 */
     const data = Yaml.parse(fs.readFileSync(file, 'utf8'))
     /** 监听文件 */

package/package.json

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