@alemonjs/qq-bot 2.1.0-alpha.1 → 2.1.0-alpha.11

package/README.md

@@ -46,6 +46,13 @@ qq-bot:
   # ws: 'ws://[your ip]:17157/websocket'
   # 3) 自定义模式 (用于连接类官网连接方式的指定服务端)
   # gatewayURL: 'ws://[your ip]:8080'
+  # 其他
+  # 使用 user_key
+  master_key:
+     - 'xxx'
+  # 使用 user_id
+  master_id:
+     - 'yyy'
 ```
 
 ```conf

package/lib/config.d.ts

@@ -0,0 +1,3 @@
+declare const platform = "qq-bot";
+
+export { platform };

package/lib/config.js

@@ -0,0 +1,20 @@
+import { getConfigValue, useUserHashKey } from 'alemonjs';
+
+const platform = 'qq-bot';
+const getQQBotConfig = () => {
+    const value = getConfigValue() || {};
+    return value[platform] || {};
+};
+const getMaster = (UserId) => {
+    const config = getQQBotConfig();
+    const master_key = config.master_key || [];
+    const master_id = config.master_id || [];
+    const UserKey = useUserHashKey({
+        Platform: platform,
+        UserId: UserId
+    });
+    const is = master_key.includes(UserKey) || master_id.includes(UserId);
+    return [is, UserKey];
+};
+
+export { getMaster, getQQBotConfig, platform };

package/lib/hook.d.ts

@@ -1,5 +1,39 @@
 import { EventKeys, Events } from 'alemonjs';
+import { GROUP_AT_MESSAGE_CREATE_TYPE } from './message/group/GROUP_AT_MESSAGE_CREATE.js';
+import { QQBotAPI } from './sdk/api.js';
 
+type MAP = {
+    'message.create': GROUP_AT_MESSAGE_CREATE_TYPE;
+    'private.message.create': undefined;
+    'interaction.create': undefined;
+    'private.interaction.create': undefined;
+    'message.update': undefined;
+    'message.delete': undefined;
+    'message.reaction.add': undefined;
+    'message.reaction.remove': undefined;
+    'channal.create': undefined;
+    'channal.delete': undefined;
+    'guild.join': undefined;
+    'guild.exit': undefined;
+    'member.add': undefined;
+    'member.remove': undefined;
+    'private.message.update': undefined;
+    'private.message.delete': undefined;
+    'private.friend.add': undefined;
+    'private.guild.add': undefined;
+};
+/**
+ *
+ * @param event
+ * @returns
+ */
+declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
+/**
+ *
+ * @param event
+ * @returns
+ */
+declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [QQBotAPI, MAP[T]];
 /**
  * 判断当前模式
  * @param event
@@ -7,4 +41,4 @@ import { EventKeys, Events } from 'alemonjs';
  */
 declare const useMode: <T extends EventKeys>(event: Events[T]) => (mode: "guild" | "group") => boolean;
 
-export { useMode };
+export { useClient, useMode, useValue };

package/lib/hook.js

@@ -1,3 +1,25 @@
+import { createEventValue, useClient as useClient$1 } from 'alemonjs';
+import { QQBotAPI } from './sdk/api.js';
+
+/**
+ *
+ * @param event
+ * @returns
+ */
+const useValue = (event) => {
+    const value = createEventValue(event);
+    return [value];
+};
+/**
+ *
+ * @param event
+ * @returns
+ */
+const useClient = (event) => {
+    const [client] = useClient$1(event, QQBotAPI);
+    const value = createEventValue(event);
+    return [client, value];
+};
 /**
  * 判断当前模式
  * @param event
@@ -32,4 +54,4 @@ const useMode = (event) => {
     return isMode;
 };
 
-export { useMode };
+export { useClient, useMode, useValue };

package/lib/index.d.ts

@@ -1,5 +1,6 @@
-export { platform } from './register.js';
-export { useMode } from './hook.js';
+export { platform } from './config.js';
+export { useClient, useMode, useValue } from './hook.js';
+export { QQBotAPI as API } from './sdk/api.js';
 
 declare const _default: () => void;
 

package/lib/index.group.js

@@ -1,5 +1,6 @@
 import { QQBotGroupClient } from './sdk/client.websoket.group.js';
-import { getQQBotConfig, register } from './register.js';
+import { register } from './register.js';
+import { getQQBotConfig } from './config.js';
 
 const start = () => {
     const config = getQQBotConfig();

package/lib/index.guild.js

@@ -1,4 +1,5 @@
-import { getQQBotConfig, register } from './register.js';
+import { getQQBotConfig } from './config.js';
+import { register } from './register.js';
 import { QQBotGuildClient } from './sdk/client.websoket.guild.js';
 
 const start = () => {

package/lib/index.js

@@ -3,9 +3,11 @@ import { start } from './index.group.js';
 import { start as start$1 } from './index.guild.js';
 import { start as start$2 } from './index.webhook.js';
 import { start as start$3 } from './index.websoket.js';
-import { platform } from './register.js';
-export { useMode } from './hook.js';
+import { platform } from './config.js';
+export { useClient, useMode, useValue } from './hook.js';
+export { QQBotAPI as API } from './sdk/api.js';
 
+// main
 var index = () => {
     let value = getConfigValue();
     if (!value)

package/lib/index.webhook.js

@@ -1,5 +1,6 @@
 import { QQBotClient } from './sdk/client.js';
-import { getQQBotConfig, register } from './register.js';
+import { register } from './register.js';
+import { getQQBotConfig } from './config.js';
 
 const start = () => {
     const config = getQQBotConfig();

package/lib/index.websoket.js

@@ -1,5 +1,6 @@
 import { QQBotClients } from './sdk/client.websoket.js';
-import { getQQBotConfig, register } from './register.js';
+import { register } from './register.js';
+import { getQQBotConfig } from './config.js';
 
 const start = () => {
     const config = getQQBotConfig();

package/lib/message/group/GROUP_AT_MESSAGE_CREATE.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 群消息事件 AT 事件
+ */
+interface GROUP_AT_MESSAGE_CREATE_TYPE {
+    author: {
+        id: string;
+        member_openid: string;
+    };
+    content: string;
+    group_openid: string;
+    group_id: string;
+    id: string;
+    timestamp: string;
+}
+
+export type { GROUP_AT_MESSAGE_CREATE_TYPE };

package/lib/register.js

@@ -1,13 +1,7 @@
-import { getConfigValue, cbpPlatform, useUserHashKey } from 'alemonjs';
+import { cbpPlatform, ResultCode, createResult } from 'alemonjs';
 import { GROUP_AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, AT_MESSAGE_CREATE, MESSAGE_CREATE } from './sends.js';
+import { getQQBotConfig, getMaster, platform } from './config.js';
 
-const platform = 'qq-bot';
-const getQQBotConfig = () => {
-    let value = getConfigValue();
-    if (!value)
-        value = {};
-    return value[platform] || {};
-};
 const register = (client) => {
     const config = getQQBotConfig();
     /**
@@ -28,22 +22,17 @@ const register = (client) => {
     };
     // 监听消息
     client.on('GROUP_AT_MESSAGE_CREATE', async (event) => {
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
-        const UserAvatar = createUserAvatarURL(event.author.id);
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatarURL(event.author.id);
         // 定义消
         const e = {
             name: 'message.create',
-            // 事件类型
             Platform: platform,
             // guild
             GuildId: event.group_id,
             ChannelId: event.group_id,
+            SpaceId: `GROUP:${event.group_id}`,
             // 用户Id
             UserId: event.author.id,
             UserKey,
@@ -53,7 +42,7 @@ const register = (client) => {
             // 格式化数据
             MessageId: event.id,
             MessageText: event.content?.trim(),
-            OpenId: event.author.member_openid,
+            OpenId: `C2C:${event.author.member_openid}`,
             CreateAt: Date.now(),
             tag: 'GROUP_AT_MESSAGE_CREATE',
             value: event
@@ -61,14 +50,9 @@ const register = (client) => {
         cbp.send(e);
     });
     client.on('C2C_MESSAGE_CREATE', async (event) => {
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
-        const UserAvatar = createUserAvatarURL(event.author.id);
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatarURL(event.author.id);
         // 定义消
         const e = {
             name: 'private.message.create',
@@ -84,7 +68,7 @@ const register = (client) => {
             MessageId: event.id,
             MessageText: event.content?.trim(),
             CreateAt: Date.now(),
-            OpenId: event.author.user_openid,
+            OpenId: `C2C:${event.author.user_openid}`,
             //
             tag: 'C2C_MESSAGE_CREATE',
             value: event
@@ -98,23 +82,15 @@ const register = (client) => {
         // 屏蔽其他机器人的消息
         if (event?.author?.bot)
             return;
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
         let msg = event?.content ?? '';
         const UserAvatar = event?.author?.avatar;
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'private.message.create',
             // 事件类型
             Platform: platform,
-            //
-            // GuildId: event.guild_id,
-            // ChannelId: event.channel_id,
             // 用户Id
             UserId: event?.author?.id ?? '',
             UserKey,
@@ -125,7 +101,7 @@ const register = (client) => {
             // message
             MessageId: event.id,
             MessageText: msg?.trim(),
-            OpenId: event.guild_id,
+            OpenId: `DIRECT:${event.guild_id}`,
             CreateAt: Date.now(),
             //
             tag: 'DIRECT_MESSAGE_CREATE',
@@ -138,15 +114,10 @@ const register = (client) => {
         // 屏蔽其他机器人的消息
         if (event?.author?.bot)
             return;
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
         let msg = getMessageContent(event);
         const UserAvatar = event?.author?.avatar;
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'message.create',
@@ -154,6 +125,7 @@ const register = (client) => {
             Platform: platform,
             GuildId: event.guild_id,
             ChannelId: event.channel_id,
+            SpaceId: `GUILD:${event.channel_id}`,
             IsMaster: isMaster,
             // 用户Id
             UserId: event?.author?.id ?? '',
@@ -164,7 +136,7 @@ const register = (client) => {
             // message
             MessageId: event.id,
             MessageText: msg?.trim(),
-            OpenId: event.guild_id,
+            OpenId: `DIRECT:${event.guild_id}`,
             CreateAt: Date.now(),
             //
             tag: 'AT_MESSAGE_CREATE',
@@ -203,15 +175,10 @@ const register = (client) => {
         // 撤回消息
         if (new RegExp(/DELETE$/).test(event.eventType))
             return;
-        const master_key = config?.master_key ?? [];
         const UserId = event.author.id;
-        const isMaster = master_key.includes(UserId);
         const msg = getMessageContent(event);
         const UserAvatar = event?.author?.avatar;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'message.create',
@@ -220,6 +187,7 @@ const register = (client) => {
             //
             GuildId: event.guild_id,
             ChannelId: event.channel_id,
+            SpaceId: `GUILD:${event.channel_id}`,
             UserId: event?.author?.id ?? '',
             UserKey,
             UserName: event?.author?.username ?? '',
@@ -229,7 +197,7 @@ const register = (client) => {
             // message
             MessageId: event.id,
             MessageText: msg?.trim(),
-            OpenId: event.guild_id,
+            OpenId: `DIRECT:${event.guild_id}`,
             CreateAt: Date.now(),
             //
             tag: 'MESSAGE_CREATE',
@@ -237,57 +205,196 @@ const register = (client) => {
         };
         cbp.send(e);
     });
-    client.on('ERROR', console.error);
-    const sendMesage = async (event, val) => {
-        if (val.length < 0)
-            Promise.all([]);
-        // 打  tag
-        const tag = event.tag;
-        // 群at
-        if (tag == 'GROUP_AT_MESSAGE_CREATE') {
-            return await GROUP_AT_MESSAGE_CREATE(client, event, val);
+    client.on('INTERACTION_CREATE', async (event) => {
+        // try {
+        //   if (event.scene === 'group' || event.scene === 'c2c') {
+        //     await client.interactionResponse('group', event.id)
+        //   }
+        //   else if (event.scene === 'guild') {
+        //     await client.interactionResponse('guild', event.id)
+        //   }
+        // } catch (err) {
+        //   createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
+        // }
+        if (event.scene === 'group') {
+            const UserAvatar = createUserAvatarURL(event.group_member_openid);
+            const UserId = event.group_member_openid;
+            const [isMaster, UserKey] = getMaster(UserId);
+            const MessageText = event.data.resolved.button_data?.trim() || '';
+            const e = {
+                name: 'interaction.create',
+                Platform: platform,
+                // guild
+                GuildId: event.group_openid,
+                ChannelId: event.group_openid,
+                SpaceId: `GROUP:${event.group_openid}`,
+                // 用户Id
+                UserId: event.group_member_openid,
+                UserKey,
+                UserAvatar: UserAvatar,
+                IsMaster: isMaster,
+                IsBot: false,
+                // 格式化数据
+                MessageId: `INTERACTION_CREATE:${event.id}`,
+                MessageText: MessageText,
+                OpenId: `C2C:${event.group_member_openid}`,
+                tag: 'INTERACTION_CREATE_GROUP',
+                CreateAt: Date.now(),
+                value: event
+            };
+            cbp.send(e);
         }
-        // 私聊
-        if (tag == 'C2C_MESSAGE_CREATE') {
-            return await C2C_MESSAGE_CREATE(client, event, val);
+        else if (event.scene === 'c2c') {
+            const UserAvatar = createUserAvatarURL(event.user_openid);
+            const UserId = event.user_openid;
+            const [isMaster, UserKey] = getMaster(UserId);
+            const MessageText = event.data.resolved.button_data?.trim() || '';
+            // 处理消息
+            const e = {
+                name: 'private.interaction.create',
+                Platform: platform,
+                // 用户Id
+                UserId: event.user_openid,
+                UserKey,
+                UserAvatar: UserAvatar,
+                IsMaster: isMaster,
+                IsBot: false,
+                // 格式化数据
+                MessageId: event.id,
+                MessageText: MessageText,
+                OpenId: `C2C:${event.user_openid}`,
+                CreateAt: Date.now(),
+                tag: 'INTERACTION_CREATE_C2C',
+                value: event
+            };
+            cbp.send(e);
         }
-        // 频道私聊
-        if (tag == 'DIRECT_MESSAGE_CREATE') {
-            return await DIRECT_MESSAGE_CREATE(client, event, val);
+        else if (event.scene === 'guild') {
+            const UserAvatar = createUserAvatarURL(event.data.resolved.user_id);
+            const UserId = event.data.resolved.user_id;
+            const [isMaster, UserKey] = getMaster(UserId);
+            const MessageText = event.data.resolved.button_data?.trim() || '';
+            // 处理消息
+            const e = {
+                name: 'interaction.create',
+                Platform: platform,
+                // guild
+                GuildId: event.guild_id,
+                ChannelId: event.channel_id,
+                SpaceId: `GUILD:${event.channel_id}`,
+                // 用户Id
+                UserId: event.data.resolved.user_id,
+                UserKey,
+                UserAvatar: UserAvatar,
+                IsMaster: isMaster,
+                IsBot: false,
+                // 格式化数据
+                MessageId: event.data.resolved.message_id,
+                MessageText: MessageText,
+                OpenId: `DIRECT:${event.guild_id}`,
+                CreateAt: Date.now(),
+                tag: 'INTERACTION_CREATE_GUILD',
+                value: event
+            };
+            cbp.send(e);
         }
-        // 频道at
-        if (tag == 'AT_MESSAGE_CREATE') {
-            return await AT_MESSAGE_CREATE(client, event, val);
-        }
-        // 频道消息
-        if (tag == 'MESSAGE_CREATE') {
-            return await MESSAGE_CREATE(client, event, val);
-        }
-        return Promise.all([]);
-    };
-    const getMesion = async (event) => {
-        event.value;
-        event.tag;
-        // const event = e.value
-        const Metions = [];
-        // group
-        return Metions;
-    };
-    const sendMessageChannel = async (channel_id, data) => {
-        if (!channel_id || typeof channel_id !== 'string') {
-            throw new Error('Invalid channel_id: channel_id must be a string');
+        else {
+            logger.warn({
+                code: ResultCode.Fail,
+                message: '暂未更新支持此类型的交互事件',
+                data: event
+            });
         }
-        return await AT_MESSAGE_CREATE(client, {
-            ChannelId: channel_id
-        }, data);
-    };
-    const sendMessageUser = async (user_id, data) => {
-        if (!user_id || typeof user_id !== 'string') {
-            throw new Error('Invalid user_id: user_id must be a string');
+    });
+    client.on('ERROR', console.error);
+    const api = {
+        active: {
+            send: {
+                channel: async (SpaceId, val) => {
+                    if (/^GUILD:/.test(SpaceId)) {
+                        const id = SpaceId.replace('GUILD:', '');
+                        return await AT_MESSAGE_CREATE(client, {
+                            ChannelId: id
+                        }, val);
+                    }
+                    if (/^GROUP:/.test(SpaceId)) {
+                        const id = SpaceId.replace('GROUP:', '');
+                        return await GROUP_AT_MESSAGE_CREATE(client, {
+                            ChannelId: id
+                        }, val);
+                    }
+                    return [];
+                },
+                user: async (OpenId, val) => {
+                    if (/^C2C:/.test(OpenId)) {
+                        const id = OpenId.replace('C2C:', '');
+                        return await C2C_MESSAGE_CREATE(client, {
+                            UserId: id
+                        }, val);
+                    }
+                    else if (/^DIRECT:/.test(OpenId)) {
+                        const id = OpenId.replace('DIRECT:', '');
+                        return await DIRECT_MESSAGE_CREATE(client, {
+                            UserId: id
+                        }, val);
+                    }
+                    else if (/^GUILD:/.test(OpenId)) {
+                        const id = OpenId.replace('GUILD:', '');
+                        return await AT_MESSAGE_CREATE(client, {
+                            ChannelId: id
+                        }, val);
+                    }
+                    return [];
+                }
+            }
+        },
+        use: {
+            send: async (event, val) => {
+                if (val.length < 0)
+                    return [];
+                // 打  tag
+                const tag = event.tag;
+                // 群at
+                if (tag == 'GROUP_AT_MESSAGE_CREATE') {
+                    return await GROUP_AT_MESSAGE_CREATE(client, event, val);
+                }
+                // 私聊
+                if (tag == 'C2C_MESSAGE_CREATE') {
+                    return await C2C_MESSAGE_CREATE(client, event, val);
+                }
+                // 频道私聊
+                if (tag == 'DIRECT_MESSAGE_CREATE') {
+                    return await DIRECT_MESSAGE_CREATE(client, event, val);
+                }
+                // 频道at
+                if (tag == 'AT_MESSAGE_CREATE') {
+                    return await AT_MESSAGE_CREATE(client, event, val);
+                }
+                // 频道消息
+                if (tag == 'MESSAGE_CREATE') {
+                    return await MESSAGE_CREATE(client, event, val);
+                }
+                // 交互
+                if (tag == 'INTERACTION_CREATE_GROUP') {
+                    return await GROUP_AT_MESSAGE_CREATE(client, event, val);
+                }
+                if (tag == 'INTERACTION_CREATE_C2C') {
+                    return await C2C_MESSAGE_CREATE(client, event, val);
+                }
+                if (tag == 'INTERACTION_CREATE_GUILD') {
+                    return await AT_MESSAGE_CREATE(client, event, val);
+                }
+                return [];
+            },
+            mention: async (event) => {
+                event.value || {};
+                event.tag;
+                // const event = e.value
+                const Metions = [];
+                // group
+                return Metions;
+            }
         }
-        return await C2C_MESSAGE_CREATE(client, {
-            OpenId: user_id
-        }, data);
     };
     // 处理行为
     cbp.onactions(async (data, consume) => {
@@ -296,31 +403,41 @@ const register = (client) => {
             const event = data.payload.event;
             const paramFormat = data.payload.params.format;
             // 消费
-            const res = await sendMesage(event, paramFormat);
+            const res = await api.use.send(event, paramFormat);
             consume(res);
         }
         else if (data.action === 'mention.get') {
             const event = data.payload.event;
             // 获取提及
-            const metions = await getMesion(event);
+            const metions = await api.use.mention(event);
             // 消费
-            consume(metions);
+            consume([createResult(ResultCode.Ok, '请求完成', metions)]);
         }
         else if (data.action === 'message.send.channel') {
             // 主动发送消息到频道
             const channel_id = data.payload.ChannelId;
             const paramFormat = data.payload.params.format;
-            const res = await sendMessageChannel(channel_id, paramFormat);
+            const res = await api.active.send.channel(channel_id, paramFormat);
             consume(res);
         }
         else if (data.action === 'message.send.user') {
             // 主动发送消息到用户
             const user_id = data.payload.UserId;
             const paramFormat = data.payload.params.format;
-            const res = await sendMessageUser(user_id, paramFormat);
+            const res = await api.active.send.user(user_id, paramFormat);
             consume(res);
         }
     });
+    // 处理 api 调用
+    cbp.onapis(async (data, consume) => {
+        const key = data.payload?.key;
+        if (client[key]) {
+            // 如果 client 上有对应的 key，直接调用。
+            const params = data.payload.params;
+            const res = await client[key](...params);
+            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        }
+    });
 };
 
-export { getQQBotConfig, platform, register };
+export { register };