@alemonjs/qq-bot 0.0.18 → 0.0.20

package/lib/index.js

@@ -1,9 +1,10 @@
-import { getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
-import { QQBotClient } from './sdk/client.js';
-import { AT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, MESSAGE_CREATE } from './send/index.js';
+import { getConfigValue } from 'alemonjs';
 import QQBotGroup from './index.group.js';
 import QQBotGuild from './index.guild.js';
-import { isGuild } from './utils.js';
+import QQBotHook from './index.webhook.js';
+import { QQBotClients } from './sdk/client.websoket.js';
+import { platform, register, createClientAPI } from './register.js';
+export { useMode } from './hook.js';
 
 const client = new Proxy({}, {
     get: (_, prop) => {
@@ -15,13 +16,12 @@ const client = new Proxy({}, {
         return undefined;
     }
 });
-const platform = 'qq-bot';
 var index = definePlatform(() => {
     let value = getConfigValue();
     if (!value)
         value = {};
     const config = value[platform];
-    if (config.mode == 'guild') {
+    if (config?.mode == 'guild') {
         if (typeof QQBotGuild.callback == 'function') {
             return QQBotGuild.callback();
         }
@@ -29,7 +29,7 @@ var index = definePlatform(() => {
             return QQBotGuild.callback;
         }
     }
-    else if (config.mode == 'group') {
+    else if (config?.mode == 'group') {
         if (typeof QQBotGroup.callback == 'function') {
             return QQBotGroup.callback();
         }
@@ -37,408 +37,46 @@ var index = definePlatform(() => {
             return QQBotGroup.callback;
         }
     }
-    const client = new QQBotClient({
-        secret: config?.secret,
+    else if (config?.route || config?.port || config?.ws) {
+        if (typeof QQBotHook.callback == 'function') {
+            return QQBotHook.callback();
+        }
+        else {
+            return QQBotHook.callback;
+        }
+    }
+    const client = new QQBotClients({
         app_id: config?.app_id,
-        route: config?.route,
+        intents: config?.intents ?? config?.is_private ? [
+            'GUILDS', // base
+            'GUILD_MEMBERS', // base
+            'GUILD_MESSAGES',
+            'GUILD_MESSAGE_REACTIONS',
+            'DIRECT_MESSAGE',
+            'INTERACTION',
+            'FORUMS_EVENT',
+        ] : [
+            'GUILDS', // base
+            'GUILD_MEMBERS', // base
+            'GUILD_MESSAGE_REACTIONS',
+            'DIRECT_MESSAGE',
+            'INTERACTION',
+            'PUBLIC_GUILD_MESSAGES',
+            'GROUP_AND_C2C_EVENT',
+        ],
+        is_private: config?.is_private ?? false,
+        sandbox: config?.sandbox ?? false,
+        secret: config?.secret,
+        shard: config?.shard ?? [0, 1],
         token: config?.token,
-        port: config?.port,
-        ws: config?.ws
+        mode: config?.mode ?? 'group'
     });
     // 连接
-    client.connect();
-    /**
-     * group
-     *
-     * GROUP_AT_MESSAGE_CREATE
-     * C2C_MESSAGE_CREATE
-     */
-    const createUserAvatarURL = (author_id) => {
-        return `https://q.qlogo.cn/qqapp/${config.app_id}/${author_id}/ 640`;
-    };
-    // 监听消息
-    client.on('GROUP_AT_MESSAGE_CREATE', async (event) => {
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
-        const url = createUserAvatarURL(event.author.id);
-        const UserAvatar = {
-            toBuffer: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer);
-            },
-            toBase64: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer).toString('base64');
-            },
-            toURL: async () => {
-                return url;
-            }
-        };
-        const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        // 定义消
-        const e = {
-            name: 'message.create',
-            // 事件类型
-            Platform: platform,
-            // guild
-            GuildId: event.group_id,
-            ChannelId: event.group_id,
-            // 用户Id
-            UserId: event.author.id,
-            UserKey,
-            UserAvatar: UserAvatar,
-            IsMaster: isMaster,
-            IsBot: false,
-            // 格式化数据
-            MessageId: event.id,
-            MessageText: event.content?.trim(),
-            OpenId: event.author.member_openid,
-            CreateAt: Date.now(),
-            tag: 'GROUP_AT_MESSAGE_CREATE',
-            value: null
-        };
-        // 处理消息
-        onProcessor('message.create', e, event);
-    });
-    client.on('C2C_MESSAGE_CREATE', async (event) => {
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
-        const url = createUserAvatarURL(event.author.id);
-        const UserAvatar = {
-            toBuffer: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer);
-            },
-            toBase64: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer).toString('base64');
-            },
-            toURL: async () => {
-                return url;
-            }
-        };
-        const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        // 定义消
-        const e = {
-            name: 'private.message.create',
-            // 事件类型
-            Platform: platform,
-            // 用户Id
-            UserId: event.author.id,
-            UserKey,
-            UserAvatar: UserAvatar,
-            IsMaster: isMaster,
-            IsBot: false,
-            // 格式化数据
-            MessageId: event.id,
-            MessageText: event.content?.trim(),
-            CreateAt: Date.now(),
-            OpenId: event.author.user_openid,
-            //
-            tag: 'C2C_MESSAGE_CREATE',
-            value: null
-        };
-        // 处理消息
-        onProcessor('private.message.create', e, event);
-    });
-    /**
-     * guild
-     */
-    client.on('DIRECT_MESSAGE_CREATE', async (event) => {
-        // 屏蔽其他机器人的消息
-        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 = {
-            toBuffer: async () => {
-                const arrayBuffer = await fetch(event.author.avatar).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer);
-            },
-            toBase64: async () => {
-                const arrayBuffer = await fetch(event?.author?.avatar).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer).toString('base64');
-            },
-            toURL: async () => {
-                return event?.author?.avatar;
-            }
-        };
-        const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        // 定义消
-        const e = {
-            name: 'private.message.create',
-            // 事件类型
-            Platform: platform,
-            //
-            // GuildId: event.guild_id,
-            // ChannelId: event.channel_id,
-            // 用户Id
-            UserId: event?.author?.id ?? '',
-            UserKey,
-            UserName: event?.author?.username ?? '',
-            UserAvatar: UserAvatar,
-            IsMaster: isMaster,
-            IsBot: event.author?.bot,
-            // message
-            MessageId: event.id,
-            MessageText: msg?.trim(),
-            OpenId: event.guild_id,
-            CreateAt: Date.now(),
-            //
-            tag: 'DIRECT_MESSAGE_CREATE',
-            //
-            value: null
-        };
-        // 处理消息
-        onProcessor('private.message.create', e, event);
-    });
-    // 监听消息
-    client.on('AT_MESSAGE_CREATE', async (event) => {
-        // 屏蔽其他机器人的消息
-        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 = {
-            toBuffer: async () => {
-                const arrayBuffer = await fetch(event.author.avatar).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer);
-            },
-            toBase64: async () => {
-                const arrayBuffer = await fetch(event?.author?.avatar).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer).toString('base64');
-            },
-            toURL: async () => {
-                return event?.author?.avatar;
-            }
-        };
-        const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        // 定义消
-        const e = {
-            name: 'message.create',
-            // 事件类型
-            Platform: platform,
-            GuildId: event.guild_id,
-            ChannelId: event.channel_id,
-            IsMaster: isMaster,
-            // 用户Id
-            UserId: event?.author?.id ?? '',
-            UserKey,
-            UserName: event?.author?.username ?? '',
-            UserAvatar: UserAvatar,
-            IsBot: event.author?.bot,
-            // message
-            MessageId: event.id,
-            MessageText: msg?.trim(),
-            OpenId: event.guild_id,
-            CreateAt: Date.now(),
-            //
-            tag: 'AT_MESSAGE_CREATE',
-            //
-            value: null
-        };
-        // 处理消息
-        onProcessor('message.create', e, event);
-    });
-    /**
-     *
-     * @param event
-     * @returns
-     */
-    const getMessageContent = event => {
-        let msg = event?.content ?? '';
-        // 艾特消息处理
-        const at_users = [];
-        if (event.mentions) {
-            // 去掉@ 转为纯消息
-            for (const item of event.mentions) {
-                at_users.push({
-                    id: item.id
-                });
-            }
-            // 循环删除文本中的at信息并去除前后空格
-            at_users.forEach(item => {
-                msg = msg.replace(`<@!${item.id}>`, '').trim();
-            });
-        }
-        return msg;
-    };
-    // 私域 -
-    client.on('MESSAGE_CREATE', async (event) => {
-        // 屏蔽其他机器人的消息
-        if (event.author?.bot)
-            return;
-        // 撤回消息
-        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 = {
-            toBuffer: async () => {
-                const arrayBuffer = await fetch(event.author.avatar).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer);
-            },
-            toBase64: async () => {
-                const arrayBuffer = await fetch(event?.author?.avatar).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer).toString('base64');
-            },
-            toURL: async () => {
-                return event?.author?.avatar;
-            }
-        };
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        // 定义消
-        const e = {
-            name: 'message.create',
-            // 事件类型
-            Platform: platform,
-            //
-            GuildId: event.guild_id,
-            ChannelId: event.channel_id,
-            UserId: event?.author?.id ?? '',
-            UserKey,
-            UserName: event?.author?.username ?? '',
-            UserAvatar: UserAvatar,
-            IsMaster: isMaster,
-            IsBot: false,
-            // message
-            MessageId: event.id,
-            MessageText: msg?.trim(),
-            OpenId: event.guild_id,
-            CreateAt: Date.now(),
-            //
-            tag: 'MESSAGE_CREATE',
-            value: null
-        };
-        // 处理消息
-        onProcessor('message.create', e, event);
-    });
-    client.on('ERROR', console.error);
+    client.connect(config?.gatewayURL);
+    register(client);
     // FRIEND_ADD
     global.client = client;
-    return {
-        platform,
-        api: {
-            // 主动消息
-            active: {
-                send: {
-                    channel: async (channel_id, data) => {
-                        if (isGuild(channel_id)) {
-                            return await AT_MESSAGE_CREATE(client, {
-                                ChannelId: channel_id
-                            }, data);
-                        }
-                        else {
-                            // 需要message_id 。如果没有，则是主动消息，在group中，只能发送4条。
-                            return await GROUP_AT_MESSAGE_CREATE(client, {
-                                GuildId: channel_id
-                            }, data);
-                        }
-                    },
-                    user: async (user_id, data) => {
-                        if (isGuild(user_id)) {
-                            return await DIRECT_MESSAGE_CREATE(client, {
-                                OpenId: user_id
-                            }, data);
-                        }
-                        else {
-                            return await C2C_MESSAGE_CREATE(client, {
-                                OpenId: user_id
-                            }, data);
-                        }
-                    }
-                }
-            },
-            // 被动消息
-            use: {
-                send: async (event, val) => {
-                    if (val.length < 0)
-                        ;
-                    // 打  tag
-                    const tag = event.tag;
-                    try {
-                        // 群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);
-                        }
-                    }
-                    catch (error) {
-                        return [error];
-                    }
-                    return [];
-                },
-                mention: async (e) => {
-                    const event = e.value;
-                    const tag = e.tag;
-                    // const event = e.value
-                    const Metions = [];
-                    // group
-                    if (tag == 'GROUP_AT_MESSAGE_CREATE' || 'C2C_MESSAGE_CREATE')
-                        return Metions;
-                    // guild
-                    if (event.mentions) {
-                        const mentions = e.value['mentions'];
-                        // 艾特消息处理
-                        const MessageMention = mentions.map(item => {
-                            return {
-                                UserId: item.id,
-                                IsMaster: false,
-                                UserName: item.username,
-                                IsBot: item.bot,
-                                UserKey: useUserHashKey({
-                                    Platform: 'qq-guild-bot',
-                                    UserId: item.id
-                                })
-                            };
-                        }) ?? [];
-                        return MessageMention;
-                    }
-                    else {
-                        return Metions;
-                    }
-                }
-            }
-        }
-    };
+    return createClientAPI(client);
 });
 
 export { client, index as default, platform };

package/lib/index.webhook.js

@@ -0,0 +1,26 @@
+import { getConfigValue } from 'alemonjs';
+import { QQBotClient } from './sdk/client.js';
+import { platform, register, createClientAPI } from './register.js';
+
+var QQBotHook = definePlatform(() => {
+    let value = getConfigValue();
+    if (!value)
+        value = {};
+    const config = value[platform];
+    const client = new QQBotClient({
+        secret: config?.secret,
+        app_id: config?.app_id,
+        route: config?.route,
+        token: config?.token,
+        port: config?.port,
+        ws: config?.ws
+    });
+    // 连接
+    client.connect();
+    register(client);
+    // FRIEND_ADD
+    global.client = client;
+    return createClientAPI(client);
+});
+
+export { QQBotHook as default };

package/lib/register.d.ts

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