@alemonjs/qq-bot 0.0.19 → 0.0.20

package/README.md

@@ -22,28 +22,24 @@ qq-bot:
   token: ''
   # 密钥
   secret: ''
-  # 模式(可选，置空将启用webhook模式)
-  mode: 'group'
 ```
 
-> 默认使用 webhook 模式，配置 mode 可选择 websocket 模式
+> 默认使用 1）websocket 模式，配置 route 可选择 webhook 模式
 
-> 配置 webhook 需 ip/域名，一旦生效官方将永久禁用 websocket 模式
+> 配置 webhook 需 ip/域名，一旦生效官方将禁用 websocket 模式
 
 ```sh
 qq-bot:
-  master_key:
-    - ''
   # 频道沙盒，默认false
   sandbox: false
   # 1）websocket 模式
-  # mode: 'all' # 暂未支持
   # mode: 'guild'
-  mode: 'group' # 不填将启动 webhook 模式
+  # mode: 'group'
   # 2）webhook 模式
   # 推荐nginx进行代理 http://localhost:17157/webhook
-  # port: 17157
-  # route: '/webhook'
+  # 填写将启动 webhook模式
+  port: 17157
+  route: '/webhook'
   # 当配置ws的时候，会连接另一台webhook机器人的消息。不会再启动本地端口。
   # 假设代理后的地址为 https://qqbotjs.com
   # ws: 'wss://qqbotjs.com/websocket'

package/lib/index.d.ts

@@ -1,11 +1,11 @@
 import * as alemonjs from 'alemonjs';
 import { QQBotAPI } from './sdk/api.js';
+export { platform } from './register.js';
 export { useMode } from './hook.js';
 
 type Client = typeof QQBotAPI.prototype;
 declare const client: Client;
-declare const platform = "qq-bot";
 
 declare const _default: alemonjs.DefinePlatformValue;
 
-export { type Client, client, _default as default, platform };
+export { type Client, client, _default as default };

package/lib/index.group.js

@@ -1,9 +1,7 @@
-import { getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
-import { AT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, MESSAGE_CREATE } from './send/index.js';
-import { QQBotGroupClient } from './sdk/websoket.group.js';
-import { isGuild } from './utils.js';
+import { getConfigValue } from 'alemonjs';
+import { QQBotGroupClient } from './sdk/client.websoket.group.js';
+import { platform, register, createClientAPI } from './register.js';
 
-const platform = 'qq-bot';
 var QQBotGroup = definePlatform(() => {
     let value = getConfigValue();
     if (!value)
@@ -22,205 +20,10 @@ var QQBotGroup = definePlatform(() => {
     });
     // 连接
     client.connect(config?.gatewayURL);
-    /**
-     * group
-     *
-     * GROUP_AT_MESSAGE_CREATE
-     * C2C_MESSAGE_CREATE
-     */
-    // 监听消息
-    client.on('GROUP_AT_MESSAGE_CREATE', async (event) => {
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
-        const url = `https://q.qlogo.cn/qqapp/${config.app_id}/${event.author.id}/640`;
-        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 = `https://q.qlogo.cn/qqapp/${config.app_id}/${event.author.id}/640`;
-        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);
-    });
-    client.on('ERROR', console.error);
+    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 {
-                        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);
-                        }
-                        if (tag == 'AT_MESSAGE_CREATE') {
-                            return await AT_MESSAGE_CREATE(client, event, val);
-                        }
-                        if (tag == '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 { QQBotGroup as default, platform };
+export { QQBotGroup as default };

package/lib/index.guild.js

@@ -1,9 +1,8 @@
-import { getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
-import { AT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, MESSAGE_CREATE } from './send/index.js';
-import { QQBotGuildClient } from './sdk/websoket.guild.js';
-import { isGuild } from './utils.js';
+import { getConfigValue } from 'alemonjs';
+import { register } from 'module';
+import { platform, createClientAPI } from './register.js';
+import { QQBotGuildClient } from './sdk/client.websoket.guild.js';
 
-const platform = 'qq-bot';
 var QQBotGuild = definePlatform(() => {
     let value = getConfigValue();
     if (!value)
@@ -12,12 +11,21 @@ var QQBotGuild = definePlatform(() => {
     // intents 需要默认值
     const client = new QQBotGuildClient({
         app_id: config?.app_id,
-        intents: config?.intents ?? [
-            'GUILDS', //频道进出
-            'GUILD_MEMBERS', //成员资料
-            'DIRECT_MESSAGE', //私信
-            'PUBLIC_GUILD_MESSAGES', //公域事件
-            'REACTIONS' // 表情表态
+        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',
         ],
         is_private: config?.is_private ?? false,
         sandbox: config?.sandbox ?? false,
@@ -28,293 +36,10 @@ var QQBotGuild = definePlatform(() => {
     });
     // 连接
     client.connect(config?.gatewayURL);
-    /**
-     * 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);
+    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 {
-                        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);
-                        }
-                        if (tag == 'AT_MESSAGE_CREATE') {
-                            return await AT_MESSAGE_CREATE(client, event, val);
-                        }
-                        if (tag == '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 { QQBotGuild as default, platform };
+export { QQBotGuild as default };