@alemonjs/qq-bot 2.1.0-alpha.0 → 2.1.0-alpha.10

package/lib/sdk/api.js

@@ -3,19 +3,12 @@ import { config } from './config.js';
 import FormData from 'form-data';
 import { createPicFrom } from './from.js';
 
+const BOTS_API_RUL = 'https://bots.qq.com';
+const API_URL_SANDBOX = 'https://sandbox.api.sgroup.qq.com';
+const API_URL = 'https://api.sgroup.qq.com';
+const msgMap = new Map();
 class QQBotAPI {
-    /**
-     * qq机器人
-     */
-    BOTS_API_RUL = 'https://bots.qq.com';
-    /**
-     * qq群 沙河接口
-     */
-    API_URL_SANDBOX = 'https://sandbox.api.sgroup.qq.com';
-    /**
-     * qq群
-     */
-    API_URL = 'https://api.sgroup.qq.com';
+    // /\[🔗[^\]]+\]\([^)]+\)|@everyone/.test(content)
     /**
      * 得到鉴权
      * @param app_id
@@ -23,7 +16,7 @@ class QQBotAPI {
      * @returns
      */
     getAuthentication(app_id, clientSecret) {
-        return axios.post(`${this.BOTS_API_RUL}/app/getAppAccessToken`, {
+        return axios.post(`${BOTS_API_RUL}/app/getAppAccessToken`, {
             appId: app_id,
             clientSecret: clientSecret
         });
@@ -33,12 +26,12 @@ class QQBotAPI {
      * @param config
      * @returns
      */
-    async groupService(options) {
+    groupService(options) {
         const app_id = config.get('app_id');
         // 群聊是加密token
         const token = config.get('access_token');
-        const service = await axios.create({
-            baseURL: this.API_URL,
+        const service = axios.create({
+            baseURL: API_URL,
             timeout: 20000,
             headers: {
                 'X-Union-Appid': app_id,
@@ -52,12 +45,12 @@ class QQBotAPI {
      * @param opstion
      * @returns
      */
-    async guildServer(opstion) {
+    guildServer(opstion) {
         const app_id = config.get('app_id');
         const token = config.get('token');
         const sandbox = config.get('sandbox');
-        const service = await axios.create({
-            baseURL: sandbox ? this.API_URL_SANDBOX : this.API_URL,
+        const service = axios.create({
+            baseURL: sandbox ? API_URL_SANDBOX : API_URL,
             timeout: 20000,
             headers: {
                 Authorization: `Bot ${app_id}.${token}`
@@ -96,29 +89,35 @@ class QQBotAPI {
      * @returns
      *   0 文本  1 图文 2 md 3 ark 4 embed
      */
-    async usersOpenMessages(openid, data, _msg_id) {
+    async usersOpenMessages(openid, data) {
+        const db = {
+            ...(data.event_id
+                ? { event_id: data.event_id }
+                : {
+                    msg_seq: this.getMessageSeq(data.msg_id || '')
+                }),
+            ...data
+        };
         return this.groupService({
             url: `/v2/users/${openid}/messages`,
             method: 'post',
-            data: data
+            data: db
         }).then(res => res?.data);
     }
-    // /\[🔗[^\]]+\]\([^)]+\)|@everyone/.test(content)
-    #map = new Map();
     /**
      * 得到消息序列
      * @param MessageId
      * @returns
      */
     getMessageSeq(MessageId) {
-        let seq = this.#map.get(MessageId) || 0;
+        let seq = msgMap.get(MessageId) || 0;
         seq++;
-        this.#map.set(MessageId, seq);
+        msgMap.set(MessageId, seq);
         // 如果映射表大小超过 100，则删除最早添加的 MessageId
-        if (this.#map.size > 100) {
-            const firstKey = this.#map.keys().next().value;
+        if (msgMap.size > 100) {
+            const firstKey = msgMap.keys().next().value;
             if (firstKey)
-                this.#map.delete(firstKey);
+                msgMap.delete(firstKey);
         }
         return seq;
     }
@@ -129,10 +128,18 @@ class QQBotAPI {
      * @returns
      */
     async groupOpenMessages(group_openid, data) {
+        const db = {
+            ...(data.event_id
+                ? { event_id: data.event_id }
+                : {
+                    msg_seq: this.getMessageSeq(data.msg_id || '')
+                }),
+            ...data
+        };
         return this.groupService({
             url: `/v2/groups/${group_openid}/messages`,
             method: 'post',
-            data: data
+            data: db
         }).then(res => res?.data);
     }
     /**
@@ -167,13 +174,13 @@ class QQBotAPI {
     }
     /**
      * 发送群里文件
-     * @param openid
+     * @param openid GuildID / UserId
      * @param data
      * @returns
      *  1 图文 2 视频 3 语言 4 文件
      * 图片：png/jpg，视频：mp4，语音：silk
      */
-    async postRichMediaByGroup(openid, data) {
+    async postRichMediaById(openid, data) {
         return this.groupService({
             url: `/v2/groups/${openid}/files`,
             method: 'post',
@@ -199,118 +206,13 @@ class QQBotAPI {
             }
         }).then(res => res?.data);
     }
-    /**
-     * 创建模板
-     * *********
-     * 使用该方法,你需要申请模板Id
-     * 并设置markdown源码为{{.text_0}}{{.text_1}}
-     * {{.text_2}}{{.text_3}}{{.text_4}}{{.text_5}}
-     * {{.text_6}}{{.text_7}}{{.text_8}}{{.text_9}}
-     * 当前,你也可以传递回调对key和values进行休整
-     * @param custom_template_id
-     * @param mac 默认 9
-     * @param callBack 默认 (key,values)=>({key,values})
-     * @returns
-     */
-    createTemplate(custom_template_id, mac = 10, callBack = (key, values) => ({ key, values })) {
-        let size = -1;
-        const params = [];
-        const Id = custom_template_id;
-        /**
-         * 消耗一个参数
-         * @param value 值
-         * @param change 是否换行
-         * @returns
-         */
-        const text = (value, change = false) => {
-            // 仅限push
-            if (size > mac - 1)
-                return;
-            size++;
-            params.push(callBack(`text_${size}`, [`${value}${change ? '\r' : ''}`]));
-        };
-        /**
-         * 消耗一个参数
-         * @param start  开始的值
-         * @param change 是否换行
-         * @returns
-         */
-        const prefix = (start, label) => {
-            text(`${start}[${label}]`);
-        };
-        /**
-         * 消耗一个参数
-         * @param param0.value 发送的值
-         * @param param0.enter 是否自动发送
-         * @param param0.reply 是否回复
-         * @param param0.change 是否换行
-         * @param param0.end 尾部字符串
-         */
-        const suffix = ({ value, enter = true, reply = false, change = false, end = '' }) => {
-            text(`(mqqapi://aio/inlinecmd?command=${value}&enter=${enter}&reply=${reply})${end}${change ? '\r' : ''}`);
-        };
-        /**
-         * 消耗2个参数
-         * @param param0.label 显示的值
-         * @param param0.value 发送的值
-         * @param param0.enter 是否自动发送
-         * @param param0.reply 是否回复
-         * @param param0.change 是否换行
-         * @param param0.start 头部字符串
-         * @param param0.end 尾部字符串
-         */
-        const button = ({ label, value, start = '', end = '', enter = true, reply = false, change = false }) => {
-            // size 只少留两个
-            if (size > mac - 1 - 2)
-                return;
-            prefix(start, label);
-            suffix({ value, enter, reply, change, end });
-        };
-        /**
-         * **********
-         * 代码块
-         * **********
-         * 跟在后面
-         * 前面需要设置换行
-         * 消耗4个参数
-         * @param val
-         * @returns
-         */
-        const code = (val) => {
-            // size 至少留4个
-            if (size > mac - 1 - 4)
-                return;
-            text('``');
-            text('`javascript\r' + val);
-            text('\r`');
-            text('``\r');
-        };
-        const getParam = () => {
-            return {
-                msg_type: 2,
-                markdown: {
-                    custom_template_id: Id,
-                    params
-                }
-            };
-        };
-        return {
-            size,
-            text,
-            prefix,
-            suffix,
-            button,
-            code,
-            getParam
-        };
-    }
     /**
      *
      * @param openid
      * @param message_id
      * @returns
      */
-    userMessageDelete(openid, message_id) {
+    async userMessageDelete(openid, message_id) {
         return this.groupService({
             url: `/v2/users/${openid}/messages/${message_id}`,
             method: 'delete'
@@ -322,47 +224,39 @@ class QQBotAPI {
      * @param message_id
      * @returns
      */
-    grouMessageDelte(group_openid, message_id) {
+    async grouMessageDelte(group_openid, message_id) {
         return this.groupService({
             url: `/v2/groups/${group_openid}/messages/${message_id}`,
             method: 'delete'
         }).then(res => res?.data);
     }
-    /**
-     * 创建form
-     * @param image
-     * @param msg_id
-     * @param content
-     * @param name
-     * @returns
-     */
-    async createFrom(image, msg_id, content, Name = 'image.jpg') {
-        const from = await createPicFrom(image, Name);
-        if (!from)
-            return false;
-        const { picData, name } = from;
-        const formdata = new FormData();
-        formdata.append('msg_id', msg_id);
-        if (typeof content === 'string')
-            formdata.append('content', content);
-        formdata.append('file_image', picData, name);
-        return formdata;
-    }
     /**
      * ************
      * 消息-图片接口
      * ***********
      */
     /**
-     * 发送buffer图片
-     * @param id 私信传频道id,公信传子频道id
-     * @param message {消息编号,图片,内容}
-     * @param isGroup 是否是群聊
+     *
+     * @param channel_id
+     * @param message
+     * @param image
      * @returns
      */
-    async postImage(channel_id, message) {
-        const formdata = await this.createFrom(message.image, message.msg_id, message.content, message.name);
-        const dary = formdata != false ? formdata.getBoundary() : '';
+    async channelsMessages(channel_id, message, image) {
+        const formdata = new FormData();
+        for (const key in message) {
+            if (message[key] !== undefined) {
+                formdata.append(key, message[key]);
+            }
+        }
+        if (image) {
+            const from = await createPicFrom(image);
+            if (from) {
+                const { picData, name } = from;
+                formdata.append('file_image', picData, name);
+            }
+        }
+        const dary = formdata.getBoundary();
         return this.guildServer({
             method: 'post',
             url: `/channels/${channel_id}/messages`,
@@ -373,14 +267,26 @@ class QQBotAPI {
         }).then(res => res?.data);
     }
     /**
-     * 私聊发送buffer图片
+     * 私聊发送
      * @param id 私信传频道id,公信传子频道id
      * @param message {消息编号,图片,内容}
      * @returns
      */
-    async postDirectImage(guild_id, message) {
-        const formdata = await this.createFrom(message.image, message.msg_id, message.content, message.name);
-        const dary = formdata != false ? formdata.getBoundary() : '';
+    async dmsMessages(guild_id, message, image) {
+        const formdata = new FormData();
+        for (const key in message) {
+            if (message[key] !== undefined) {
+                formdata.append(key, message[key]);
+            }
+        }
+        if (image) {
+            const from = await createPicFrom(image);
+            if (from) {
+                const { picData, name } = from;
+                formdata.append('file_image', picData, name);
+            }
+        }
+        const dary = formdata.getBoundary();
         return this.guildServer({
             method: 'post',
             url: `/dms/${guild_id}/messages`,
@@ -570,26 +476,12 @@ class QQBotAPI {
      * @param message_id
      * @returns
      */
-    async channelsMessages(channel_id, message_id) {
+    async channelsMessagesById(channel_id, message_id) {
         return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/messages/${message_id}`
         }).then(res => res?.data);
     }
-    /**
-     * 发送消息
-     * @param channel_id
-     * @param message_id
-     * @param data
-     * @returns
-     */
-    async channelsMessagesPost(channel_id, data) {
-        return this.guildServer({
-            method: 'POST',
-            url: `/channels/${channel_id}/messages`,
-            data
-        }).then(res => res?.data);
-    }
     /**
      * 撤回消息
      * @param channel_id
@@ -770,18 +662,6 @@ class QQBotAPI {
             url: `/users/@me/dms`
         }).then(res => res?.data);
     }
-    /**
-     * 发送私信
-     * @param guild_id
-     * @returns
-     */
-    async dmsMessage(guild_id, data) {
-        return this.guildServer({
-            method: 'POST',
-            url: `/dms/${guild_id}/messages`,
-            data
-        }).then(res => res?.data);
-    }
     /**
      * 撤回私信
      * @param guild_id
@@ -1177,6 +1057,32 @@ class QQBotAPI {
             url: `/guilds/${guild_id}/api_permission`
         }).then(res => res?.data);
     }
+    /**
+     * 交互事件回应
+     * @param interaction_id
+     * @param code
+     * @returns
+     */
+    async interactionResponse(mode, interaction_id, code) {
+        if (mode === 'group') {
+            return this.groupService({
+                method: 'PUT',
+                url: `/interactions/${interaction_id}`,
+                data: {
+                    code: code || 0
+                }
+            }).then(res => res?.data);
+        }
+        else {
+            return this.guildServer({
+                method: 'PUT',
+                url: `/interactions/${interaction_id}`,
+                data: {
+                    code: code || 0
+                }
+            }).then(res => res?.data);
+        }
+    }
 }
 
-export { QQBotAPI };
+export { API_URL, API_URL_SANDBOX, BOTS_API_RUL, QQBotAPI };

package/lib/sdk/typing.d.ts

@@ -1,63 +1,61 @@
-type MessageType = 0 | 1 | 2 | 3 | 4 | 7
-type FileType = 1 | 2 | 3 | 4
+type MessageType = 0 | 1 | 2 | 3 | 4 | 7;
+type FileType = 1 | 2 | 3 | 4;
 interface ButtonType {
-  id: string
-  render_data: {
-    label: string
-    visited_label: string
-    style?: number
-  }
-  action: {
-    type: number
-    permission: {
-      type: number
-    }
-    reply?: boolean
-    enter?: boolean
-    unsupport_tips?: string
-    data:
-      | string
-      | {
-          click: string
-          confirm: string
-          cancel: string
-        }
-    at_bot_show_channel_list?: boolean
-  }
+    id: string;
+    render_data: {
+        label: string;
+        visited_label: string;
+        style?: number;
+    };
+    action: {
+        type: number;
+        permission: {
+            type: number;
+        };
+        reply?: boolean;
+        enter?: boolean;
+        unsupport_tips?: string;
+        data: string | {
+            click: string;
+            confirm: string;
+            cancel: string;
+        };
+        at_bot_show_channel_list?: boolean;
+    };
 }
 interface KeyboardType {
-  id?: string
-  content?: {
-    rows: {
-      buttons: ButtonType[]
-    }[]
-  }
+    id?: string;
+    content?: {
+        rows: {
+            buttons: ButtonType[];
+        }[];
+    };
 }
 interface MarkdownType {
-  /** markdown 模版id，申请模版后获得 */
-  custom_template_id: string
-  /** 原生 markdown 文本内容（内邀使用） */
-  content?: string
-  /** 模版内变量与填充值的kv映射 */
-  params?: Array<{
-    key: string
-    values: string[]
-  }>
+    /** markdown 模版id，申请模版后获得 */
+    custom_template_id?: string;
+    /** 原生 markdown 文本内容（内邀使用） */
+    content?: string;
+    /** 模版内变量与填充值的kv映射 */
+    params?: Array<{
+        key: string;
+        values: string[];
+    }>;
 }
 interface ApiRequestData {
-  content?: string
-  msg_type: MessageType
-  markdown?: MarkdownType
-  keyboard?: KeyboardType
-  media?: {
-    file_info: string
-  }
-  ark?: any
-  image?: any
-  message_reference?: any
-  event_id?: any
-  msg_id?: string
-  msg_seq?: number
+    content?: string;
+    msg_type: MessageType;
+    markdown?: MarkdownType;
+    keyboard?: KeyboardType;
+    media?: {
+        file_info: string;
+    };
+    ark?: any;
+    image?: any;
+    message_reference?: any;
+    event_id?: any;
+    msg_id?: string;
+    msg_seq?: number;
 }
 
-export type { ApiRequestData, ButtonType, FileType, KeyboardType, MarkdownType, MessageType }
+export type { ApiRequestData, ButtonType, FileType, KeyboardType, MarkdownType, MessageType };