node-karin 0.6.17 → 0.6.19

package/lib/adapter/kritor/index.js

@@ -1,6 +1,6 @@
 import { kritor } from 'kritor-proto';
-import { logger, config, segment } from '../../utils/index.js';
 import { listener } from '../../core/index.js';
+import { logger, config, segment } from '../../utils/index.js';
 /**
  * @extends KarinAdapter
  */
@@ -338,7 +338,10 @@ export default class AdapterKritor {
          * 响应解码
          */
         const response = kritor[type][`${cmd}Response`].decode(res.buf);
-        return response;
+        return {
+            message_id: response.message_id,
+            message_time: Number(response.message_time),
+        };
     }
     /**
      * 撤回消息
@@ -388,7 +391,15 @@ export default class AdapterKritor {
         const command = `${service}.${cmd}`;
         const res = await this.SendApi(command, data);
         const response = kritor[type][`${cmd}Response`].decode(res.buf);
-        return response;
+        const message = response.message;
+        return {
+            time: Number(message.time),
+            message_id: String(message.message_id),
+            message_seq: Number(message.message_seq),
+            contact: message.contact,
+            sender: message.sender,
+            elements: this.AdapterConvertKarin(message.elements),
+        };
     }
     /**
      * 通过seq获取消息
@@ -452,8 +463,8 @@ export default class AdapterKritor {
         const data = kritor[type][`${cmd}Request`].encode(buf).finish();
         const command = `${service}.${cmd}`;
         const res = await this.SendApi(command, data);
-        const response = kritor[type][`${cmd}Response`].decode(res.buf);
-        return response;
+        kritor[type][`${cmd}Response`].decode(res.buf);
+        return true;
     }
     /**
      * 上传合并转发消息
@@ -582,7 +593,8 @@ export default class AdapterKritor {
      * @param headers - 请求头
      * @returns - 下载文件的响应
      */
-    async DownloadFile(file, file_type, root_path, file_name, thread_cnt, headers) {
+    async DownloadFile(options) {
+        const { file, file_type, root_path = '', file_name = '', thread_cnt = 1, headers = '' } = options;
         const service = 'CoreService';
         const cmd = 'DownloadFile';
         const type = 'core';
@@ -764,16 +776,16 @@ export default class AdapterKritor {
      * 戳一戳用户头像
      * @param options - 戳一戳选项
      */
-    async PokeMember(options) {
+    async PokeMember(group_id, target_uid_or_uin) {
         const service = 'GroupService';
         const cmd = 'PokeMember';
         const type = 'group';
         let buf = {};
-        if (Number(options.target_uin)) {
-            buf = { group_id: options.group_id, target_uin: Number(options.target_uin) };
+        if (Number(target_uid_or_uin)) {
+            buf = { group_id, target_uin: Number(target_uid_or_uin) };
         }
         else {
-            buf = { group_id: options.group_id, target_uid: options.target_uid };
+            buf = { group_id, target_uid: target_uid_or_uin };
         }
         const command = `${service}.${cmd}`;
         const data = kritor[type][`${cmd}Request`].encode(buf).finish();
@@ -1120,6 +1132,13 @@ export default class AdapterKritor {
         const response = kritor[type][`${cmd}Response`].decode(res.buf);
         return response;
     }
+    CreateFolder() { throw new Error('Method not implemented.'); }
+    RenameFolder() { throw new Error('Method not implemented.'); }
+    DeleteFolder() { throw new Error('Method not implemented.'); }
+    UploadFile() { throw new Error('Method not implemented.'); }
+    DeleteFile() { throw new Error('Method not implemented.'); }
+    GetFileSystemInfo() { throw new Error('Method not implemented.'); }
+    GetFileList() { throw new Error('Method not implemented.'); }
     async SendMessageByResId(contact, id) {
         if (contact)
             throw new Error('不支持的操作');
@@ -1160,7 +1179,7 @@ export default class AdapterKritor {
             }, time * 1000);
             this.grpc.write(params);
             this.grpc.once(seq + '', data => {
-                /** 停止监听器 */
+                /** 停止计时器 */
                 clearTimeout(timeoutId);
                 data.code === 'SUCCESS' ? resolve(data) : resolve(data);
             });

package/lib/adapter/onebot/11/convert.d.ts

@@ -0,0 +1,11 @@
+import { KarinElement, OB11Segment } from '../../../types/index.js';
+/**
+   * onebot11转karin
+   * @return karin格式消息
+   */
+export declare function AdapterConvertKarin(data: Array<OB11Segment>): Array<KarinElement>;
+/**
+   * karin转onebot11
+   * @param data karin格式消息
+   */
+export declare function KarinConvertAdapter(data: Array<KarinElement>): Array<OB11Segment>;

package/lib/adapter/onebot/11/convert.js

@@ -0,0 +1,168 @@
+import { segment } from '../../../utils/index.js';
+import { OB11SegmentType } from '../../../types/index.js';
+/**
+   * onebot11转karin
+   * @return karin格式消息
+   */
+export function AdapterConvertKarin(data) {
+    const elements = [];
+    for (const i of data) {
+        switch (i.type) {
+            case 'text':
+                elements.push(segment.text(i.data.text));
+                break;
+            case 'face':
+                elements.push(segment.face(Number(i.data.id)));
+                break;
+            case 'image':
+                elements.push(segment.image(i.data.url || i.data.file, { file_type: i.data.type }));
+                break;
+            case 'record':
+                elements.push(segment.voice(i.data.url || i.data.file, i.data.magic === 1));
+                break;
+            case 'video':
+                elements.push(segment.video(i.data.url || i.data.file));
+                break;
+            case 'at':
+                elements.push(segment.at(i.data.qq, i.data.qq));
+                break;
+            case 'poke':
+                elements.push(segment.poke(Number(i.data.id), Number(i.data.type)));
+                break;
+            case 'contact':
+                elements.push(segment.contact(i.data.type === 'qq' ? 'friend' : 'group', i.data.id));
+                break;
+            case 'location':
+                elements.push(segment.location(Number(i.data.lat), Number(i.data.lon), i.data.title || '', i.data.content || ''));
+                break;
+            case 'reply':
+                elements.push(segment.reply(i.data.id));
+                break;
+            case 'forward':
+                elements.push(segment.forward(i.data.id));
+                break;
+            case 'json':
+                elements.push(segment.json(i.data.data));
+                break;
+            case 'xml':
+                elements.push(segment.xml(i.data.data));
+                break;
+            default: {
+                elements.push(segment.text(JSON.stringify(i)));
+            }
+        }
+    }
+    return elements;
+}
+/**
+   * karin转onebot11
+   * @param data karin格式消息
+   */
+export function KarinConvertAdapter(data) {
+    const elements = [];
+    for (const i of data) {
+        const type = i.type;
+        switch (i.type) {
+            case OB11SegmentType.Text:
+                elements.push({ type, data: { text: i.text } });
+                break;
+            case OB11SegmentType.Face:
+                elements.push({ type, data: { id: i.id } });
+                break;
+            case OB11SegmentType.At:
+                elements.push({ type, data: { qq: String(i.uid || i.uin) } });
+                break;
+            case OB11SegmentType.Reply:
+                elements.push({ type, data: { id: i.message_id } });
+                break;
+            case OB11SegmentType.Image:
+            case OB11SegmentType.Video:
+            case OB11SegmentType.File: {
+                elements.push({ type, data: { file: i.file } });
+                break;
+            }
+            case OB11SegmentType.Xml: {
+                elements.push({ type, data: { data: i.data } });
+                break;
+            }
+            case OB11SegmentType.Json: {
+                elements.push({ type, data: { data: i.data } });
+                break;
+            }
+            case OB11SegmentType.Forward: {
+                elements.push({ type, data: { id: i.res_id } });
+                break;
+            }
+            case OB11SegmentType.Record: {
+                elements.push({ type: OB11SegmentType.Record, data: { file: i.file, magic: i.magic || false } });
+                break;
+            }
+            case OB11SegmentType.Music: {
+                if (i.id) {
+                    elements.push({ type: 'music', data: { type: i.platform, id: i.id } });
+                }
+                else {
+                    const { url, audio, title, author, pic } = i;
+                    elements.push({ type: 'music', data: { type: 'custom', url, audio, title, content: author, image: pic } });
+                }
+                break;
+            }
+            case 'button': {
+                elements.push({ type: 'button', data: i.data });
+                break;
+            }
+            case 'markdown': {
+                const { type, ...data } = i;
+                elements.push({ type, data: { ...data } });
+                break;
+            }
+            case 'rows': {
+                for (const val of i.rows) {
+                    elements.push({ type: 'button', data: val.data });
+                }
+                break;
+            }
+            case OB11SegmentType.Poke: {
+                elements.push({ type, data: { type: i.poke_type, id: i.id } });
+                break;
+            }
+            case 'bubble_face': {
+                elements.push({ type: 'bubble_face', data: { id: i.id, count: i.count } });
+                break;
+            }
+            case OB11SegmentType.Contact: {
+                elements.push({ type, data: { type: i.scene, id: i.peer } });
+                break;
+            }
+            case OB11SegmentType.Location: {
+                elements.push({ type, data: { lat: i.lat, lon: i.lon, title: i.title, content: i.address } });
+                break;
+            }
+            case 'long_msg':
+            case 'basketball':
+            case 'dice':
+            case 'market_face':
+            case 'rps': {
+                elements.push({ type: i.type, data: { id: i.id } });
+                break;
+            }
+            case 'gift': {
+                elements.push({ type: 'gift', data: { qq: i.qq, id: i.id } });
+                break;
+            }
+            case 'share': {
+                elements.push({ type: 'share', data: { url: i.url, title: i.title, content: i.content, image: i.image } });
+                break;
+            }
+            case 'weather': {
+                elements.push({ type: 'weather', data: { city: i.city, type: i.type } });
+                break;
+            }
+            default: {
+                elements.push(i);
+                break;
+            }
+        }
+    }
+    return elements;
+}

package/lib/adapter/onebot/11/event.d.ts

@@ -0,0 +1,25 @@
+import { AdapterOneBot11 } from './index.js';
+import { OB11EventAll, OB11MessageEvent, OB11MetaEvent, OB11NoticeEvent, OB11RequestEvent } from '../../../types/index.js';
+export declare class OB11Event {
+    adapter: AdapterOneBot11;
+    constructor(adapter: AdapterOneBot11);
+    /**
+     * 处理事件
+     * - @param data ob11相关标准数据
+     */
+    event(data: OB11EventAll): void;
+    /**
+     * 元事件
+     */
+    metaEvent(data: OB11MetaEvent): void;
+    /**
+     * 消息事件
+     */
+    messageEvent(data: OB11MessageEvent): void;
+    /**
+     * 通知事件
+     */
+    noticeEvent(data: OB11NoticeEvent): void;
+    /** 请求事件 */
+    requestEvent(data: OB11RequestEvent): void;
+}